Block dev-libs/libusbx because dev-libs/libusb is blocked as well.

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

6 files changed, 26 insertions, 27 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index 913eca1bcb9c..8fb1e2e5d9c4 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.136 2012/05/21 23:20:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.137 2012/05/22 16:04:30 ssuominen Exp $
+
+  22 May 2012; Samuli Suominen <ssuominen@gentoo.org> freebsd-lib-8.0.ebuild,
+  freebsd-lib-8.2-r1.ebuild, freebsd-lib-9.0-r1.ebuild,
+  freebsd-lib-9.0-r2.ebuild:
+  Block dev-libs/libusbx because dev-libs/libusb is blocked as well.
 
   21 May 2012; Mike Frysinger <vapier@gentoo.org> freebsd-lib-7.2-r1.ebuild,
   freebsd-lib-8.0.ebuild, freebsd-lib-8.2-r1.ebuild, freebsd-lib-9.0-r1.ebuild,
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 4a58f27a7ecc..9237cd534b8f 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -58,26 +58,20 @@ DIST freebsd-usbin-8.0.tar.bz2 2411151 RMD160 f162437ab2e3c89c6635e5c567e39b6097
 DIST freebsd-usbin-8.2.tar.bz2 2443024 RMD160 972723becd1ab16615bc45f9beab8483533cbf81 SHA1 16bcb5528f14cfeccb9f4c913a629b01d9873ebf SHA256 aa7cabf10f5c3a9daabea32e4de24d04ec312247842981476da666eff5054603
 DIST freebsd-usbin-9.0.tar.bz2 2608252 RMD160 fb070b602615289a849ec19d35b670bc2290423b SHA1 db82960e36f7585b25b09fa686328bcd9f7cfcb3 SHA256 384ab18281aa1afb39a0f98bcef0fc734840fd294b22b7d405b0d3eee8f835ea
 EBUILD freebsd-lib-7.2-r1.ebuild 12031 RMD160 7ed76ca70dbca490d9e222c6200a825b82a88764 SHA1 1284cead9714572ff395254ed17f2e688a04c93d SHA256 90e8cc58e6e8c1739af88cc52921a4cb71f89657188dd6a34161fdfd5b1b1361
-EBUILD freebsd-lib-8.0.ebuild 14629 RMD160 e6277b30425a99a3fc5f75fa97abe069f78e10df SHA1 23bd8d6dd45a0f43dbed19c6b4cafb923c47c65d SHA256 2a4ae19111b56b049bc18acafdcff539615c1b60286471d02df53cb6ec7e2690
-EBUILD freebsd-lib-8.2-r1.ebuild 15699 RMD160 ab6bfac180bc59e002a87c207d7a07acda9d5eaa SHA1 de03e1afde3dd0278f035f257cc15d6de1a32fdf SHA256 b961bddd7c68337762f0a8aaa67a9385e335b941c2eb2a27c2f347012afbcd8a
-EBUILD freebsd-lib-9.0-r1.ebuild 15971 RMD160 acf4fb3ea8db84bb3ea3bf2b429f85571a9ac34f SHA1 7096407910f4aac812be4e065e0be7f98580d8c4 SHA256 e61bb8588e3688a5c3d25a32573871f7263faaa4070e24fbc75203e41f025400
-EBUILD freebsd-lib-9.0-r2.ebuild 13963 RMD160 c2dc2f491b79c247298ae5ebe4a962ed067f7872 SHA1 07ef5fcaac985ee785e7716ad00cea69a06fea74 SHA256 73ad0b32c8ca3475d7e9f551ededfc78cf010e98259f7c2741babfbf6da06a25
-MISC ChangeLog 28574 RMD160 c76a10686f7f28b05a460db14aafc176a2cbd322 SHA1 8af0b52ad4add77f0428512bd10c2e38301e8a0b SHA256 d9bb6504828171584ce50969c8db5a479d58fc97babfecfb8aa755377eb842ee
+EBUILD freebsd-lib-8.0.ebuild 14650 RMD160 9315f3fdbc10260a689bc31a3f1fb9cdf0ce9850 SHA1 0a0accc4560d8a027354bc49fa41123cf744ae34 SHA256 d3ffddcdb184748b83f4e4d0e2cd2f1f284d269a27dee6d52985c8536f0360ab
+EBUILD freebsd-lib-8.2-r1.ebuild 15720 RMD160 55f2f6b7619bc710a0fde6c29ace66066eb3659e SHA1 1a12bafa65b4a2856b5e85b6316e816bda56b06a SHA256 288e958c28ecf74587cafef199e94bd0c76b65898a337356ad3a791041aecaf2
+EBUILD freebsd-lib-9.0-r1.ebuild 15992 RMD160 a9e046d071c2331358ac1700911dcf605d63156b SHA1 b13f5c8c9f5d57fd13c7ee5363fb50b6365634e0 SHA256 ec540417c64298bc72466d605a3a5a7b87c79f815d850322a0e4d3ab1680f1e0
+EBUILD freebsd-lib-9.0-r2.ebuild 13984 RMD160 3569608d776939ccb63d15959acf84596fee444e SHA1 ec8ed9fe82ada474901a2ca7d6059e149b970660 SHA256 c6dd486f5c8f9f39b6789508681b77196bbf8531f7dee461258f73c52cd32227
+MISC ChangeLog 28810 RMD160 e097b9e68c2037c3e06e61088cf3681762e6c3aa SHA1 dbf0a625659a5ce48c2fde6565543eaadfb8daa1 SHA256 94af74c18584321802a4bd45c3300ece6258d83765828f6992ad821b3ba5dc55
 MISC metadata.xml 410 RMD160 f5d6157462d32d3397c8f69ed4d1ff37f2bd5165 SHA1 067425a31e0d87fc9e911ae203cce0fced8da77d SHA256 0ea0a391db3018afdf230e293ffedbc313b4a20db703c8c83fdf144a28c6c246
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPus3qAAoJELEHsLL7fEFWwTMQALETVwcLX+8+gNEP/98Zz0rX
-aYyB7ItVaG3NgmfdxSeW+XSImdsuiZB6Iw2PQwexBjL2KBMIOqxHrGXZHH3POg+r
-2n6sQL9IZBno4sg6NKI9njM1iWilQWhLi3iIJ727od4yf1QoaGucUmXPG7Ju8SJK
-6k9M2zX1p2Bb5krIW2YzS4QXEIic2J/nGVRrcAhY9kVHzOKN1J1gNXWIZsqngE6J
-jGK/r3qH4Ct1KA2fNij9SoAjjOgyHAA1xeBmTB7LdU7B/BJYp3xiX2TNRAOx146G
-loil80WYOq+UADwczKoefQnvwiOTM3gabJy/H7YfESFCRSwwzZeyabophSHe69Vn
-fVYxqTyULc2TSohyGYJg9w1nJZWFkbezD8YBjwIJioD8KOI9kQuJxCB341+w/070
-DORP23GkLTJnVrzTshFF4owjGMx0PfzE+P+olVPThQBSNreXkducwtcvR1MG5z25
-R6CaaWO+oLUsip1P3A0LEktMTt8CFpEqi9O2RitBXkmYZbJNnWWOPyf8m7ADThTs
-k7rtEtaB8F7C7MFLBGZlWQ8A/MY756eiqLwdXhWCr3j3DEHJwbT8vJpYEQ1kSVFX
-1JUuR/QAVb9jeQImKgevb9D/PN1gjOPmELEMe+w2Ounx+rjeatFcyPFm7l/0mQH+
-W9DIEO2NdGxOey8k8Q21
-=OB6a
+iQEcBAEBAgAGBQJPu7hUAAoJEEdUh39IaPFNuqIIAJOtcGa1jQuo4E04F8z52svU
+ib5h9Xg+Fl+sFmeMtP951xjTnhT0ppCNykWHPNVqn59+lsgk5l0JViai4KdlS96+
+kJU+4tzm4TM9TV6IADKl2RADnaBj8RLV1hYQgVCKuDpX0cgbXUPTQ+amaBQydRtH
+kGGOLIeR766LGwcKlioSdSTM7C5t1Pkg0ucahjgMdzmZ9wqR1apqd9eRhAJfg5F6
+4+d5G5on9eVg7cW5//jkriOSnNChIytzCci4pLj9wPua3vbeIrpWvdb2Of5W6uYD
+iFb/hTrlEoKyAJ/mH+SQFO+4vrqQv+ZkDvA/GiFpMxusG0frX1UqnyHiFCpK7Xg=
+=uNrw
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-8.0.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-8.0.ebuild
index 39e65712da3f..1f861fa17738 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-8.0.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-8.0.ebuild,v 1.10 2012/05/21 23:20:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-8.0.ebuild,v 1.11 2012/05/22 16:04:30 ssuominen Exp $
 
 EAPI=2
 
@@ -28,7 +28,7 @@ if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
 	RDEPEND="ssl? ( dev-libs/openssl )
 		hesiod? ( net-dns/hesiod )
 		kerberos? ( virtual/krb5 )
-		usb? ( !dev-libs/libusb )
+		usb? ( !dev-libs/libusb !dev-libs/libusbx )
 		!sys-freebsd/freebsd-headers"
 	DEPEND="${RDEPEND}
 		>=sys-devel/flex-2.5.31-r2
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild
index 1ba00525be46..f0321e4dfb97 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild,v 1.7 2012/05/21 23:20:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild,v 1.8 2012/05/22 16:04:30 ssuominen Exp $
 
 EAPI=2
 
@@ -28,7 +28,7 @@ if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
 	RDEPEND="ssl? ( dev-libs/openssl )
 		hesiod? ( net-dns/hesiod )
 		kerberos? ( virtual/krb5 )
-		usb? ( !dev-libs/libusb )
+		usb? ( !dev-libs/libusb !dev-libs/libusbx )
 		>=dev-libs/expat-2.0.1
 		!sys-freebsd/freebsd-headers"
 	DEPEND="${RDEPEND}
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r1.ebuild
index 8f30abbfb1a2..359ee78f3204 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r1.ebuild,v 1.5 2012/05/21 23:20:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r1.ebuild,v 1.6 2012/05/22 16:04:30 ssuominen Exp $
 
 EAPI=2
 
@@ -30,7 +30,7 @@ if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
 	RDEPEND="ssl? ( dev-libs/openssl )
 		hesiod? ( net-dns/hesiod )
 		kerberos? ( virtual/krb5 )
-		usb? ( !dev-libs/libusb )
+		usb? ( !dev-libs/libusb !dev-libs/libusbx )
 		zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
 		>=dev-libs/expat-2.0.1
 		!sys-libs/libutempter
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild
index 35f7fed18fdb..633e91afc55b 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.22 2012/05/21 23:20:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.23 2012/05/22 16:04:30 ssuominen Exp $
 
 EAPI=2
 
@@ -30,7 +30,7 @@ if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
 	RDEPEND="ssl? ( dev-libs/openssl )
 		hesiod? ( net-dns/hesiod )
 		kerberos? ( virtual/krb5 )
-		usb? ( !dev-libs/libusb )
+		usb? ( !dev-libs/libusb !dev-libs/libusbx )
 		zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
 		>=dev-libs/expat-2.0.1
 		!sys-libs/libutempter