Bug #247687 comment #21: We need to block libusb-compat in the libusb:0 ebuilds.

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

9 files changed, 49 insertions, 37 deletions

diff --git a/dev-libs/libusb/ChangeLog b/dev-libs/libusb/ChangeLog
index 7fee930029a1..e59e2b772bc7 100644
--- a/dev-libs/libusb/ChangeLog
+++ b/dev-libs/libusb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libusb
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/ChangeLog,v 1.84 2009/05/14 23:28:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/ChangeLog,v 1.85 2009/05/15 10:55:18 robbat2 Exp $
+
+  15 May 2009; Robin H. Johnson <robbat2@gentoo.org> libusb-0.1.11.ebuild,
+  libusb-0.1.12.ebuild, libusb-0.1.12-r1.ebuild, libusb-0.1.12-r2.ebuild,
+  libusb-0.1.12-r3.ebuild, libusb-0.1.12-r4.ebuild, libusb-0.1.12-r5.ebuild:
+  Bug #247687 comment #21: We need to block libusb-compat in the libusb:0
+  ebuilds.
 
 *libusb-1.0.1 (14 May 2009)
 
diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest
index 609d04caf5ce..420738b7d919 100644
--- a/dev-libs/libusb/Manifest
+++ b/dev-libs/libusb/Manifest
@@ -4,13 +4,13 @@ AUX libusb-0.1.12-nocpp.patch 572 RMD160 cdceb6a5550a6371401046fb26a9ccc67e4a3d5
 DIST libusb-0.1.11.tar.gz 377187 RMD160 326af5a58143a9bab9e5f3190fd3c70f19c8d061 SHA1 59e043bb92f8eb17a1172d01e365b0e042654356 SHA256 8d73f0d7074fc43e1003068668cbabf120ed8148db7b3d4ee54b25fd645923e4
 DIST libusb-0.1.12.tar.gz 389343 RMD160 63848df717e00fff67ab30ba86a85466370d4e8e SHA1 599a5168590f66bc6f1f9a299579fd8500614807 SHA256 37f6f7d9de74196eb5fc0bbe0aea9b5c939de7f500acba3af6fd643f3b538b44
 DIST libusb-1.0.1.tar.bz2 310554 RMD160 4ecc8262add54e5ba9defd6cd5d5819b60e38e10 SHA1 915d5a3538a6182d2eda845f91934c1ad718f19e SHA256 510b9c7339e878324066ec1cb74c0f67d5df858065155a3239999ff911257d45
-EBUILD libusb-0.1.11.ebuild 1057 RMD160 422a10490c31d9448983f0c517223175f69f2a39 SHA1 08d1f4928505a70b44c1abb197f0d11aff825ee1 SHA256 b4b1d113c64159ead308fe07c2eefd399c737a1433082aafdf39f34498e61074
-EBUILD libusb-0.1.12-r1.ebuild 1785 RMD160 b9c6c17a3e419437b54ff83fa22f98701836202b SHA1 09333cbea1aabd7728a6522473b55ce235aa1842 SHA256 e94ebdab3175dc192296c83258ce1ee1cae57a624b37447a35d04218d3a9fdb0
-EBUILD libusb-0.1.12-r2.ebuild 1844 RMD160 2a74195021a8afbabc431329cc42ce5822f6d6fd SHA1 1e071a0ea3079325b4fb0efddfbd8c270b9607c8 SHA256 f6330908600b012827e3d5ee939e37cbe0bff480f287e7b426d92f983e105d86
-EBUILD libusb-0.1.12-r3.ebuild 1935 RMD160 2f656c60618e6e8552aa9f81414497ff4abd348a SHA1 1b21f53ce7d43baa72953ec7bc59ee1f06e8c748 SHA256 fc7569f32dcbc088b2eb650721b18a24351c9567746da66e483df51c17cf7cf0
-EBUILD libusb-0.1.12-r4.ebuild 1992 RMD160 55400ceae7b580cef23f6ccffa54bb90f75fe998 SHA1 8174727e918aba83315333af3587221601a1b271 SHA256 fc58f107d6eb127d50b9b492953939598ecfc787860178836c5ac75e7a72ddb9
-EBUILD libusb-0.1.12-r5.ebuild 1646 RMD160 d086c05d56fec1b92aababc8fbb83f608bfbd460 SHA1 d6047e43fd98cdb45b51478c799c661c59db7ee8 SHA256 a7819776a13e1584ea417ae018d2d8af61703256e9ae301052e6b85536752468
-EBUILD libusb-0.1.12.ebuild 1479 RMD160 2f7eab3f81707b1ec795bd5ef52d930e3b9ddaef SHA1 d75b22c0bbbdaae4af7650ce746a37fc0e5f927f SHA256 628c8e0c045ff8df28b90c5182bda251e28a49c858de4d8ca77f4d383809f734
+EBUILD libusb-0.1.11.ebuild 1091 RMD160 bc5cab65fb40f25a277b39276aa9fbf5a1f977f4 SHA1 0e9fbcad0838de9faffa221a32d4ecb4f7124474 SHA256 6ee526847049d62158cec5668226774112a1149968c039de30667bcb89f1fcda
+EBUILD libusb-0.1.12-r1.ebuild 1821 RMD160 f85c876a3a5d0b25ce1c0004a00ecf38560b78e0 SHA1 eb4bc7661c1ba8265da3a59615913b7b623fc51b SHA256 dd70b932b7387a6259de6092fee0e90b2787e9eed6541e50eddd155135f6733b
+EBUILD libusb-0.1.12-r2.ebuild 1881 RMD160 62ff5c881696ebf8b89a16cb5d9c24fdd8e75117 SHA1 261988b73be83e662315b18d2ce2797b7f4a5747 SHA256 91bfa4cb6af361b2759d523c540bd9ff841d5614ad151db76c7319866905bc2c
+EBUILD libusb-0.1.12-r3.ebuild 1970 RMD160 2ab25a414b7e358ebc95815ff4236de0e5a00ce7 SHA1 28b65540cf709c4923ae4b111c67a92f437df5b3 SHA256 3310d4f54db61cc0712b21371df053abaa297ccdd7b0bef2b478fe8052fb508a
+EBUILD libusb-0.1.12-r4.ebuild 2027 RMD160 fbb29cf384cef4fa1fa5f0af40104e135648e497 SHA1 0f3b9ad19075ae227eb2b0d1ab384b5b8a579dc8 SHA256 2a4d39c39f0822b7ad8c066d67327605329ee907d8e65ac34297d03538b8a7ea
+EBUILD libusb-0.1.12-r5.ebuild 1682 RMD160 2fccef2fb6dd6355d634782abd96135bd7772bc6 SHA1 6811c574c65710ee66fde4a76b6b14eb5dd4f6d5 SHA256 4cf499a074147c626817e3059953654ee4a0864984548c66f21bab86ee9df91a
+EBUILD libusb-0.1.12.ebuild 1519 RMD160 e5e84678ed570a61220a746c4e822540b0634d6f SHA1 8098aa7a1de490f8accd1ce7fb0a8bf45d129e35 SHA256 6aaa212d9e61217ab17f5826ae0cf51b44146267ffba50ccaecafb0a6ce3f572
 EBUILD libusb-1.0.1.ebuild 963 RMD160 dcbe592d549b0abc2eedeb6a4f35fce55b7db8a4 SHA1 5ff4608d3d9f6c3213250691b521237736baa13c SHA256 6e1055b6d6c92c288a74aa4ddb7426f66a9095090a60cf6ee18a63d3e049b424
-MISC ChangeLog 10649 RMD160 757144adc960ccffcfdaf142860c808a52582a4e SHA1 4e5da1f29019ecdf7298ba1f53b6a9fdee4fad08 SHA256 f54deaa195c23820e6906c4036ccfc5a3b18f36ba066822935d075a6c372877d
+MISC ChangeLog 10961 RMD160 5b955931cf7544dd7ca6ff7c57505a2c4783d69f SHA1 3a93eb92b23eaacb655e81316700b05cec70b5de SHA256 2f141e300c15130256d8411461152a551b109dceb55eed93af15cb7651bd0d63
 MISC metadata.xml 226 RMD160 648b1f4c4f30d91596a8bb5ee6713abbe558d1ee SHA1 454eb537623437bf8d58ae3cd0418e6a898bac61 SHA256 32bd7ea3d52eaade1cad03a261cd0f75ae3b0d10787fe646ece11c752b1cdfd2
diff --git a/dev-libs/libusb/libusb-0.1.11.ebuild b/dev-libs/libusb/libusb-0.1.11.ebuild
index 983db2ff60f0..d856f0042554 100644
--- a/dev-libs/libusb/libusb-0.1.11.ebuild
+++ b/dev-libs/libusb/libusb-0.1.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.11.ebuild,v 1.15 2007/03/01 17:26:18 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.11.ebuild,v 1.16 2009/05/15 10:55:18 robbat2 Exp $
 
 inherit eutils libtool autotools
 
@@ -13,9 +13,9 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="debug doc"
 
-RDEPEND=""
-
-DEPEND="sys-devel/libtool
+RDEPEND="!dev-libs/libusb-compat"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
 	doc? ( app-text/openjade
 		app-text/docbook-sgml-utils
 		~app-text/docbook-sgml-dtd-4.2 )"
diff --git a/dev-libs/libusb/libusb-0.1.12-r1.ebuild b/dev-libs/libusb/libusb-0.1.12-r1.ebuild
index 09fa857b7588..68e4e11ae614 100644
--- a/dev-libs/libusb/libusb-0.1.12-r1.ebuild
+++ b/dev-libs/libusb/libusb-0.1.12-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.12-r1.ebuild,v 1.10 2008/04/20 11:34:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.12-r1.ebuild,v 1.11 2009/05/15 10:55:18 robbat2 Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -16,8 +16,9 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-f
 IUSE="debug doc"
 RESTRICT="test"
 
-RDEPEND=""
-DEPEND="doc? ( app-text/openjade
+RDEPEND="!dev-libs/libusb-compat"
+DEPEND="${RDEPEND}
+	doc? ( app-text/openjade
 	app-text/docbook-dsssl-stylesheets
 	app-text/docbook-sgml-utils
 	~app-text/docbook-sgml-dtd-4.2 )"
diff --git a/dev-libs/libusb/libusb-0.1.12-r2.ebuild b/dev-libs/libusb/libusb-0.1.12-r2.ebuild
index c4ed950aea08..140f35e2dc26 100644
--- a/dev-libs/libusb/libusb-0.1.12-r2.ebuild
+++ b/dev-libs/libusb/libusb-0.1.12-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.12-r2.ebuild,v 1.1 2008/05/11 02:28:05 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.12-r2.ebuild,v 1.2 2009/05/15 10:55:18 robbat2 Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -16,8 +16,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 IUSE="debug doc"
 RESTRICT="test"
 
-RDEPEND=""
-DEPEND="doc? ( app-text/openjade
+RDEPEND="!dev-libs/libusb-compat"
+DEPEND="${RDEPEND}
+	doc? ( app-text/openjade
 	app-text/docbook-dsssl-stylesheets
 	app-text/docbook-sgml-utils
 	~app-text/docbook-sgml-dtd-4.2 )"
diff --git a/dev-libs/libusb/libusb-0.1.12-r3.ebuild b/dev-libs/libusb/libusb-0.1.12-r3.ebuild
index 784c0e6e41b1..0927e45e7135 100644
--- a/dev-libs/libusb/libusb-0.1.12-r3.ebuild
+++ b/dev-libs/libusb/libusb-0.1.12-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.12-r3.ebuild,v 1.1 2008/06/07 00:59:04 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.12-r3.ebuild,v 1.2 2009/05/15 10:55:18 robbat2 Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -16,8 +16,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 IUSE="debug doc nocxx"
 RESTRICT="test"
 
-RDEPEND=""
-DEPEND="doc? ( app-text/openjade
+RDEPEND="!dev-libs/libusb-compat"
+DEPEND="${RDEPEND}
+	doc? ( app-text/openjade
 	app-text/docbook-dsssl-stylesheets
 	app-text/docbook-sgml-utils
 	~app-text/docbook-sgml-dtd-4.2 )"
diff --git a/dev-libs/libusb/libusb-0.1.12-r4.ebuild b/dev-libs/libusb/libusb-0.1.12-r4.ebuild
index e48b88a2f102..46108e8b7f1c 100644
--- a/dev-libs/libusb/libusb-0.1.12-r4.ebuild
+++ b/dev-libs/libusb/libusb-0.1.12-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.12-r4.ebuild,v 1.1 2008/06/25 03:25:44 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.12-r4.ebuild,v 1.2 2009/05/15 10:55:18 robbat2 Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -16,8 +16,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 IUSE="debug doc nocxx"
 RESTRICT="test"
 
-RDEPEND=""
-DEPEND="doc? ( app-text/openjade
+RDEPEND="!dev-libs/libusb-compat"
+DEPEND="${RDEPEND}
+	doc? ( app-text/openjade
 	app-text/docbook-dsssl-stylesheets
 	app-text/docbook-sgml-utils
 	~app-text/docbook-sgml-dtd-4.2 )"
diff --git a/dev-libs/libusb/libusb-0.1.12-r5.ebuild b/dev-libs/libusb/libusb-0.1.12-r5.ebuild
index 0774dfe198f6..2578a1629de5 100644
--- a/dev-libs/libusb/libusb-0.1.12-r5.ebuild
+++ b/dev-libs/libusb/libusb-0.1.12-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.12-r5.ebuild,v 1.2 2009/03/28 11:30:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.12-r5.ebuild,v 1.3 2009/05/15 10:55:18 robbat2 Exp $
 
 inherit eutils libtool autotools toolchain-funcs
 
@@ -14,8 +14,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 IUSE="debug doc nocxx"
 RESTRICT="test"
 
-RDEPEND=""
-DEPEND="doc? ( app-text/openjade
+RDEPEND="!dev-libs/libusb-compat"
+DEPEND="${RDEPEND}
+	doc? ( app-text/openjade
 	app-text/docbook-dsssl-stylesheets
 	app-text/docbook-sgml-utils
 	~app-text/docbook-sgml-dtd-4.2 )"
diff --git a/dev-libs/libusb/libusb-0.1.12.ebuild b/dev-libs/libusb/libusb-0.1.12.ebuild
index c0388f19ef11..9bfaa51e08b4 100644
--- a/dev-libs/libusb/libusb-0.1.12.ebuild
+++ b/dev-libs/libusb/libusb-0.1.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.12.ebuild,v 1.20 2007/05/12 02:52:00 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.12.ebuild,v 1.21 2009/05/15 10:55:18 robbat2 Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -16,8 +16,9 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-f
 IUSE="debug doc"
 RESTRICT="test"
 
-RDEPEND=""
-DEPEND="doc? ( app-text/openjade
+RDEPEND="!dev-libs/libusb-compat"
+DEPEND="${RDEPEND}
+    doc? ( app-text/openjade
 	app-text/docbook-dsssl-stylesheets
 	app-text/docbook-sgml-utils
 	~app-text/docbook-sgml-dtd-4.2 )"