summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2010-07-27 15:26:07 +0000
committerPacho Ramos <pacho@gentoo.org>2010-07-27 15:26:07 +0000
commitbaa7bb81de3441807524048d62b69d278ad9e528 (patch)
treec951e3a11d2fc962b63410f73eac43e0a9f6ca9e /net-wireless
parentMarked ~x86-linux ~amd64-linux and ~ppc-macos, bug #324129, fixed src_compile... (diff)
downloadhistorical-baa7bb81de3441807524048d62b69d278ad9e528.tar.gz
historical-baa7bb81de3441807524048d62b69d278ad9e528.tar.bz2
historical-baa7bb81de3441807524048d62b69d278ad9e528.zip
It collides with gnome-bluetooth, thanks to Diego for reporting in bug #330083.
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/bluez-gnome/ChangeLog6
-rw-r--r--net-wireless/bluez-gnome/Manifest14
-rw-r--r--net-wireless/bluez-gnome/bluez-gnome-1.8.ebuild3
3 files changed, 19 insertions, 4 deletions
diff --git a/net-wireless/bluez-gnome/ChangeLog b/net-wireless/bluez-gnome/ChangeLog
index 45df58b78192..d7fa2b8e65b4 100644
--- a/net-wireless/bluez-gnome/ChangeLog
+++ b/net-wireless/bluez-gnome/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-wireless/bluez-gnome
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-gnome/ChangeLog,v 1.48 2010/07/19 22:11:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-gnome/ChangeLog,v 1.49 2010/07/27 15:26:07 pacho Exp $
+
+ 27 Jul 2010; Pacho Ramos <pacho@gentoo.org> bluez-gnome-1.8.ebuild:
+ It collides with gnome-bluetooth, thanks to Diego for reporting in bug
+ #330083.
19 Jul 2010; Jeroen Roovers <jer@gentoo.org> bluez-gnome-1.8.ebuild:
Drop HPPA keywording (bug #324511).
diff --git a/net-wireless/bluez-gnome/Manifest b/net-wireless/bluez-gnome/Manifest
index a8b99bfdf6de..a6453c3b5e02 100644
--- a/net-wireless/bluez-gnome/Manifest
+++ b/net-wireless/bluez-gnome/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX 1.8-ODS-API.patch 5294 RMD160 589b01881201bdc47004da1fe6ab5b514282953c SHA1 976a2f7663f5f42ee16d98b8e752dc1de76077e0 SHA256 93c42409f1d0940494571ed4da2032320c21846ce9b8975ea55d1ee5b02eae0b
DIST bluez-gnome-1.8.tar.gz 361145 RMD160 63719af09e90e44a8762699af58acbd48a026cff SHA1 9864301ca100292917a9bf59b2634a8e449fb629 SHA256 481b48f3cde1f896650195b75c25994df11eca05bb6e8d1951a46b603228811a
-EBUILD bluez-gnome-1.8.ebuild 1014 RMD160 84816d0afea3d3e833f0da1038e735e7214232aa SHA1 f3337d6a3640cc52128f8969c4d4920741f12954 SHA256 80c8eb603117332fbe5b0a21bf2432352bd838803bdcde846a2c55a6fd319c39
-MISC ChangeLog 7397 RMD160 5173f21f681852642dfe6e0461b0eceb53d6a9ee SHA1 e9d3b4c36d9d9fdbf4f97cab815044e33162296b SHA256 b74bf0cf3f515be5bd495f210c46847a27b437545065b93233fb45d3220b9837
+EBUILD bluez-gnome-1.8.ebuild 1048 RMD160 ac4e7cf7604121a1d848b1d9450170cc5bba3ac4 SHA1 cbd77589f94c08650b3a6517234f432acac43617 SHA256 8c892d2717370543451cc5dcf763a081a8819c297dcf23f6c9aa0e5f3ebcb840
+MISC ChangeLog 7554 RMD160 fc2156defc9ba0a4c06cfb7d4f74b70cab8527f6 SHA1 c85d8547d7675bb83439b29e252afb022cc6f8af SHA256 02f33912380ee511e94f7c7fc75ebb3e32f2af5535a77df62372c707ad4a7742
MISC metadata.xml 355 RMD160 114b0e663206f28501f2acdd0bfe73f75758782f SHA1 f7646c332998c85eabd5140dcb72bbd61df87471 SHA256 5782461caf09dbc482a95ac8762e5a5fcfcffe7df5419b843f2f22ed7a283c9d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkxO+pkACgkQCaWpQKGI+9R+HgCfcILshnVfNUjPq0hzh1CXcikW
+Is8AoIAFBhVIWPrHY2jZWVIbs06sOlv2
+=jann
+-----END PGP SIGNATURE-----
diff --git a/net-wireless/bluez-gnome/bluez-gnome-1.8.ebuild b/net-wireless/bluez-gnome/bluez-gnome-1.8.ebuild
index 74fe46a71176..9c155b53b0f5 100644
--- a/net-wireless/bluez-gnome/bluez-gnome-1.8.ebuild
+++ b/net-wireless/bluez-gnome/bluez-gnome-1.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-gnome/bluez-gnome-1.8.ebuild,v 1.9 2010/07/19 22:11:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-gnome/bluez-gnome-1.8.ebuild,v 1.10 2010/07/27 15:26:07 pacho Exp $
EAPI="2"
@@ -27,6 +27,7 @@ DEPEND="
RDEPEND="net-wireless/bluez
gnome? ( gnome-base/nautilus gnome-base/gvfs[bluetooth] )
>=app-mobilephone/obex-data-server-0.4
+ !net-wireless/gnome-bluetooth
${COMMON_DEPEND}"
G2CONF="--disable-desktop-update