Switch libusb depend to use the correct virtual, Bug #287261.

Package-Manager: portage-2.2_rc42/cvs/Linux i686

7 files changed, 28 insertions, 23 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 1969c651d5a3..3193d1188c44 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.495 2009/09/29 22:43:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.496 2009/10/02 11:30:20 zzam Exp $
+
+  02 Oct 2009; Matthias Schwarzott <zzam@gentoo.org> udev-145.ebuild,
+  udev-145-r1.ebuild, udev-145-r2.ebuild, udev-146.ebuild, udev-9999.ebuild:
+  Switch libusb depend to use the correct virtual, Bug #287261.
 
   29 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org> udev-146.ebuild:
   Fix libusb dependency (it would fail configure otherwise).
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index b96b4565696c..5bdfdf4dfd03 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -58,17 +58,17 @@ EBUILD udev-124-r1.ebuild 10678 RMD160 6b6267b7bbc071d5f36f7197badc7d8ac646e671
 EBUILD udev-124-r2.ebuild 11035 RMD160 6d17242ff354b614312f6033d19e82a982cf1d7f SHA1 8157db46b65cf6e8de606f1345e4873974efeec9 SHA256 eeee3f1060b90828326f5ed63226769fc6e20aa91299e15d7983a9d2c54a1a57
 EBUILD udev-141-r1.ebuild 13023 RMD160 ac7e1148dd14ee5315e7d3d2da45cd3a31b52abb SHA1 5803d0b73f84d2c0e24a3580cc8459c4d24656fe SHA256 0d6868c0ac752a3d86d4d0598dda40d20c17282c8ef098e292d41e0b4ab6aefd
 EBUILD udev-141.ebuild 12466 RMD160 c26b96b03e66a274f7ef990d0fe82fd45b683f15 SHA1 f8219f44bbeffb532d35aa5e9d1129ef46cbb9af SHA256 d7702783f853acde088cf63c16677a674a428a39227d2eac13db67a739493d8b
-EBUILD udev-145-r1.ebuild 15062 RMD160 0662eaa7cc5c027220ac9d21e7f16c77dbfb13df SHA1 f45f6aa65b5936ca660fc879cf0b26430ad71498 SHA256 c8154b035ada7961953e0cb16de38dba6fcb4f6ed365fea471345a166bc3f5b8
-EBUILD udev-145-r2.ebuild 15441 RMD160 5663e50df08194c617cb2a3f812637ab06b05cc6 SHA1 110ae070243a10382225b0c82dd0e7307f28f2d5 SHA256 1db0682f54f495ba4f9be4486d04c8e907efbd40808ece15a2333d4884650455
-EBUILD udev-145.ebuild 13606 RMD160 fab631da610b3ba193ce97f29caaf24083eb89ea SHA1 ee38a7b3d6e9814a6838d012ec1a6bf9cf681a11 SHA256 d7ab28cfcda0ef870c9c613a6ecb0acb8e626dfb90d427aebd64eb180d3ce92f
-EBUILD udev-146.ebuild 15355 RMD160 8abff2d52d60c5a81d81d45e10649a7514eef8fb SHA1 dd27931cd1a6058608ff5f58801426ac799ac788 SHA256 bba8d0da4bf9f1baabc977c20838dd0550e78df5321653eec1ae09fabf279368
-EBUILD udev-9999.ebuild 15101 RMD160 35a9ed3f528793f8c0d04efe2ecd024538f414a3 SHA1 94adbe5a7771d7cbaad7026428243df2a3fe1be6 SHA256 edb2e18f6af296c09588b87cb3e551a066cf01702ad3633b7c381cdd657ce00c
-MISC ChangeLog 101254 RMD160 6c0543229e62852a23f382a3a9bbb6ce0336a1f6 SHA1 6f7231047d37f77a431550a8eed19b1c90b73b8b SHA256 96de01ce88a15339736ccc11c63b6de7a6c355c9c576a001f7f3fed100fa9892
+EBUILD udev-145-r1.ebuild 15060 RMD160 c49274a740813fd5e02790af521428f7cbedb82d SHA1 692804318cdb54ddeec5945c947421e38a9d0a71 SHA256 51ca4c0f56f138bd72212581cf99a515276378004b60d4c6e67158fd7e5f0b3f
+EBUILD udev-145-r2.ebuild 15404 RMD160 00377f1c12f81fb59273ebe3125fe0f6ca0eba07 SHA1 0e909982ed344e811a43f84838564d7eaf0e0b7e SHA256 ca99eda6e1d62c88212bc4d7a1d6dc5bc3cfb1ee1752064bfa0f3cc6c522ad17
+EBUILD udev-145.ebuild 13607 RMD160 b0895ed911a6d6c4d45d14364e8c11259f52a463 SHA1 011bcbe8eadfd05385c2a39b96c9776ff7bdc34a SHA256 d4f95324a07c0a53df1397719b7aef06b10538a67ddf46a68549b1eff4d551d3
+EBUILD udev-146.ebuild 15340 RMD160 d2d6ac34af9271ecba096607e01e679547b7df3c SHA1 c1d1cd2e96a395065b93315af38412d5f1c5f6ea SHA256 ea450be06bf24a677a89c89b89d8a04c49acae66c77a4d71aed92c998d1f8103
+EBUILD udev-9999.ebuild 15102 RMD160 958d2ad6b2e4e31c2b9ba35be80e7b5ddb3f0d2b SHA1 2e912b4c4e04722e2d180190e56faf7d28e92853 SHA256 db7514aecaca06c86b9908d657b269d2ae2540333d48cd60c8ed4a8d4cb5888e
+MISC ChangeLog 101461 RMD160 651898fbc5425a5ff36384e94867d70fea84e8be SHA1 8cb8ab42789e45f519a91992e99948559bdb528a SHA256 f178b29849e4a475d77c63d7935deed2c1cb659a011ac2ed7077ea17fb7fe1c9
 MISC metadata.xml 402 RMD160 fad8844286866f47eadb2fd958f54f650976fe2a SHA1 c966d4e9e509d399523d1ba6ef54277e750334de SHA256 1c524286463bf115615462e9504c27710331f1d82a0828de5d78686f5e303ed5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkrCjXEACgkQAiZjviIA2XgTYgCgmO1twsqx9CV9R1wcr/xkpVFj
-2osAn1l7zb06PT3S3xwABv1EXoU3AcIS
-=c1ZW
+iEYEARECAAYFAkrF5FQACgkQt2vP6XvVdOej0ACfWTENLiXAP+JD6ud602PJtcrh
+1SQAoI/p0NcgVWIramwx+15YufG2w/LG
+=LqC3
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-145-r1.ebuild b/sys-fs/udev/udev-145-r1.ebuild
index 31a79342b35a..9ab534265d07 100644
--- a/sys-fs/udev/udev-145-r1.ebuild
+++ b/sys-fs/udev/udev-145-r1.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/sys-fs/udev/udev-145-r1.ebuild,v 1.6 2009/09/06 23:38:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-145-r1.ebuild,v 1.7 2009/10/02 11:30:20 zzam Exp $
 
 EAPI="1"
 
@@ -25,7 +25,7 @@ COMMON_DEPEND="selinux? ( sys-libs/libselinux )
 	extras? (
 		sys-apps/acl
 		>=sys-apps/usbutils-0.82
-		dev-libs/libusb
+		virtual/libusb:0
 		sys-apps/pciutils
 		dev-libs/glib:2
 	)
diff --git a/sys-fs/udev/udev-145-r2.ebuild b/sys-fs/udev/udev-145-r2.ebuild
index c7693303ac23..2751ffa7ddd3 100644
--- a/sys-fs/udev/udev-145-r2.ebuild
+++ b/sys-fs/udev/udev-145-r2.ebuild
@@ -1,18 +1,20 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-145-r2.ebuild,v 1.1 2009/09/23 14:10:37 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-145-r2.ebuild,v 1.2 2009/10/02 11:30:20 zzam Exp $
 
 EAPI="1"
 
 inherit eutils flag-o-matic multilib toolchain-funcs linux-info
 
+PATCHSET=${P}-gentoo-patchset
+
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git"
 	EGIT_BRANCH="master"
 	inherit git autotools
 else
 	SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2
-		mirror://gentoo/${P}-gentoo-patchset.tar.bz2"
+		mirror://gentoo/${PATCHSET}.tar.bz2"
 fi
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
@@ -26,7 +28,7 @@ COMMON_DEPEND="selinux? ( sys-libs/libselinux )
 	extras? (
 		sys-apps/acl
 		>=sys-apps/usbutils-0.82
-		dev-libs/libusb
+		virtual/libusb:0
 		sys-apps/pciutils
 		dev-libs/glib:2
 	)
@@ -133,9 +135,8 @@ src_unpack() {
 	# patches go here...
 
 	# backport some patches
-	EPATCH_SOURCE="${WORKDIR}/${P}-gentoo-patchset" EPATCH_SUFFIX="patch" \
+	EPATCH_SOURCE="${WORKDIR}/${PATCHSET}" EPATCH_SUFFIX="patch" \
 	        EPATCH_FORCE="yes" epatch
-	#epatch "${WORKDIR}/${P}-gentoo-patchset"/*.patch
 
 	if ! use devfs-compat; then
 		# see Bug #269359
diff --git a/sys-fs/udev/udev-145.ebuild b/sys-fs/udev/udev-145.ebuild
index 206e4c53ccc2..1ec391605a65 100644
--- a/sys-fs/udev/udev-145.ebuild
+++ b/sys-fs/udev/udev-145.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/sys-fs/udev/udev-145.ebuild,v 1.4 2009/09/01 09:39:09 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-145.ebuild,v 1.5 2009/10/02 11:30:20 zzam Exp $
 
 EAPI="1"
 
@@ -25,7 +25,7 @@ COMMON_DEPEND="selinux? ( sys-libs/libselinux )
 	extras? (
 		sys-apps/acl
 		>=sys-apps/usbutils-0.82
-		dev-libs/libusb
+		virtual/libusb:0
 		sys-apps/pciutils
 		dev-libs/glib:2
 	)
diff --git a/sys-fs/udev/udev-146.ebuild b/sys-fs/udev/udev-146.ebuild
index 5e07173f82cf..81537873bc95 100644
--- a/sys-fs/udev/udev-146.ebuild
+++ b/sys-fs/udev/udev-146.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/sys-fs/udev/udev-146.ebuild,v 1.2 2009/09/29 22:43:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-146.ebuild,v 1.3 2009/10/02 11:30:20 zzam Exp $
 
 EAPI="1"
 
@@ -25,7 +25,7 @@ COMMON_DEPEND="selinux? ( sys-libs/libselinux )
 	extras? (
 		sys-apps/acl
 		>=sys-apps/usbutils-0.82
-		>=dev-libs/libusb-0.1.12:0
+		virtual/libusb:0
 		sys-apps/pciutils
 		dev-libs/glib:2
 	)
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index c4f285cda3cc..ebb51d1daac9 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.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/sys-fs/udev/udev-9999.ebuild,v 1.14 2009/09/19 21:36:48 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.15 2009/10/02 11:30:20 zzam Exp $
 
 EAPI="1"
 
@@ -25,7 +25,7 @@ COMMON_DEPEND="selinux? ( sys-libs/libselinux )
 	extras? (
 		sys-apps/acl
 		>=sys-apps/usbutils-0.82
-		dev-libs/libusb
+		virtual/libusb:0
 		sys-apps/pciutils
 		dev-libs/glib:2
 	)