Drop bluez-libs support wrt #301630.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 15 insertions, 11 deletions

diff --git a/net-analyzer/netcat6/ChangeLog b/net-analyzer/netcat6/ChangeLog
index 5a560e0881e7..cfbfee6bd345 100644
--- a/net-analyzer/netcat6/ChangeLog
+++ b/net-analyzer/netcat6/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/netcat6
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netcat6/ChangeLog,v 1.21 2009/09/08 21:22:03 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netcat6/ChangeLog,v 1.22 2010/06/11 11:33:04 ssuominen Exp $
+
+  11 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> netcat6-1.0-r1.ebuild,
+  netcat6-1.0-r2.ebuild:
+  Drop bluez-libs support wrt #301630.
 
 *netcat6-1.0-r2 (08 Sep 2009)
 
diff --git a/net-analyzer/netcat6/Manifest b/net-analyzer/netcat6/Manifest
index d0b404e28fc2..b74ecd2da258 100644
--- a/net-analyzer/netcat6/Manifest
+++ b/net-analyzer/netcat6/Manifest
@@ -1,7 +1,7 @@
 AUX netcat6-1.0-unix-sockets.patch 8798 RMD160 a34cde020b43acd0e96c946a6f549f36a4215e00 SHA1 63e976bdaa378825bd414fb0f975a5a4c73f9ef5 SHA256 c82d3ae349d7cf142a839066fef2fc1f98903260cec6e30d08aca375487a5c7b
 DIST nc6-1.0.tar.bz2 264257 RMD160 c5444976925ffece7f27fc1ff3c16ebe19998b78 SHA1 1c361a8060be427fe1b2209d7155e26670e0c1b9 SHA256 eb35e7a05a60bf94496075a3a246d7bf63fcdba2ca7ceb6844852a1ff6478206
-EBUILD netcat6-1.0-r1.ebuild 1023 RMD160 d0e2604138dfdf3f882458111604da4200cd4509 SHA1 7b01d113d9a7ddba3644bb79133a8475835e4184 SHA256 40ce14052a3ad2d5165aa09851013ca813850a0ab6e1d2536fa5562d4d650d9f
-EBUILD netcat6-1.0-r2.ebuild 1163 RMD160 074f4946a3e1232952b1e4dac2c468f943670fa7 SHA1 abc0e677002f14b96df98f3251ba9b487318cf87 SHA256 e7e8ee118f842777a7a33d0acb29df2e8017b68dfbdf8a6167dac95df9327426
+EBUILD netcat6-1.0-r1.ebuild 995 RMD160 fb66d6749e31b97d30a976bf878830a988ad0b47 SHA1 3a1bc1866b7958d92f0b788ec246ed9184746e1c SHA256 b38e798b581efea6e6c46ea79a8013e08c1fb84a6708e59d8d409d2313800456
+EBUILD netcat6-1.0-r2.ebuild 1134 RMD160 9dae2469116e9672fd1e122d53695133a6e87b2c SHA1 c26fc974a80588c82bf6fb78414a54461bc20bb1 SHA256 79d6b241b288408d4d2d87f0bfa18270498d5be4d878bcf71d08e27e4c1b65d2
 EBUILD netcat6-1.0.ebuild 760 RMD160 cb1587a4c877d88ca97f1686394342694bd8505c SHA1 be667d50898eadf8fbb42ed5505ba7c83b5566fe SHA256 522cb654f53d7faf750378ca50385c265493393e9635c84260120ef21c7eeee4
-MISC ChangeLog 2714 RMD160 7c356744b47fc887f3678ea7975f8325a22b8354 SHA1 fa4cd37f65ebda26980f429b958464fc439999b0 SHA256 d329725448f0492bc2977b24016088bed1ef08e9ee0402815d2a82cf7e820cfd
+MISC ChangeLog 2858 RMD160 f84f349cd6841f3d4622ff51e1efa10c1a2c44cd SHA1 0f962e1874d7a09f8122963f114403febf502d75 SHA256 4aafcc83ca1d9fa31a8861bd49d545a57ba2d0cfd002f0eae4211d9c18dbdb67
 MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
diff --git a/net-analyzer/netcat6/netcat6-1.0-r1.ebuild b/net-analyzer/netcat6/netcat6-1.0-r1.ebuild
index 01bac53bd634..fc5ad78aca82 100644
--- a/net-analyzer/netcat6/netcat6-1.0-r1.ebuild
+++ b/net-analyzer/netcat6/netcat6-1.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netcat6/netcat6-1.0-r1.ebuild,v 1.11 2009/07/19 18:53:52 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netcat6/netcat6-1.0-r1.ebuild,v 1.12 2010/06/11 11:33:04 ssuominen Exp $
 
 inherit eutils autotools
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ~ppc64 s390 sh sparc x86"
 IUSE="ipv6 nls bluetooth"
 
-DEPEND="bluetooth? ( || ( net-wireless/bluez net-wireless/bluez-libs ) )"
+DEPEND="bluetooth? ( net-wireless/bluez )"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/nc6-${PV}
diff --git a/net-analyzer/netcat6/netcat6-1.0-r2.ebuild b/net-analyzer/netcat6/netcat6-1.0-r2.ebuild
index b36a07854901..af8204ea8079 100644
--- a/net-analyzer/netcat6/netcat6-1.0-r2.ebuild
+++ b/net-analyzer/netcat6/netcat6-1.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netcat6/netcat6-1.0-r2.ebuild,v 1.1 2009/09/08 21:22:03 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netcat6/netcat6-1.0-r2.ebuild,v 1.2 2010/06/11 11:33:04 ssuominen Exp $
 
 inherit eutils autotools
 
@@ -14,7 +14,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE="ipv6 nls bluetooth"
 
 # need to block netcat as we provide the "nc" file now too
-DEPEND="bluetooth? ( || ( net-wireless/bluez net-wireless/bluez-libs ) )
+DEPEND="bluetooth? ( net-wireless/bluez )
 	!net-analyzer/netcat"
 RDEPEND="${DEPEND}"