Change order of preference for libusbx.

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

4 files changed, 23 insertions, 20 deletions

diff --git a/virtual/libusb/ChangeLog b/virtual/libusb/ChangeLog
index 0b42b4b39257..e69672ad46a3 100644
--- a/virtual/libusb/ChangeLog
+++ b/virtual/libusb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for virtual/libusb
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/libusb/ChangeLog,v 1.23 2012/05/22 18:37:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/libusb/ChangeLog,v 1.24 2012/05/27 18:05:50 ssuominen Exp $
+
+  27 May 2012; Samuli Suominen <ssuominen@gentoo.org> libusb-1.ebuild:
+  Change order of preference for libusbx.
 
   22 May 2012; Samuli Suominen <ssuominen@gentoo.org> libusb-0.ebuild:
   Change order of || ( ) to list dev-libs/libusb-compat first wrt #417135
diff --git a/virtual/libusb/Manifest b/virtual/libusb/Manifest
index 7d8eaafd8c19..7406fe6aebc9 100644
--- a/virtual/libusb/Manifest
+++ b/virtual/libusb/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA1
 
 EBUILD libusb-0.ebuild 614 RMD160 dd9bd3367dc0be5abc7bd67895dd67593e1fa148 SHA1 1b163045907f08709c13687336b76d90af19ba8d SHA256 c5a02b5d685e26e01ee7d424e3a6a5d3d6a26560f5fe547561d0071b7f46ae1c
-EBUILD libusb-1.ebuild 554 RMD160 d5655df36153e8621da718984fdf4873da71568f SHA1 d8f39c480f2585fc84b0fef6548422325c4061ca SHA256 c29b9c11a7cbd08588b4ecfb03e87410fd0384223a3f2d4af07260cb15437c24
-MISC ChangeLog 3487 RMD160 acabfc2216c12ed805d6d98e47375664e8703ca7 SHA1 11c1c0b65b3906003869e9bab223d28167685395 SHA256 1360e769272bc45304959e2f82ef9f19fabbadd32c52a01eeca8f5c3bdab928a
+EBUILD libusb-1.ebuild 554 RMD160 7fdc69e08053d1ad99abb3bb6e41c36d8931acae SHA1 4aba947ac85dbb54f9cda07aa33e67a80456cf54 SHA256 fad866071f5ca270495bf5e75a92967d6c915382e686f9c840b963a124da8653
+MISC ChangeLog 3601 RMD160 3009b1f9a36febcf44105bca5249fd19b891305f SHA1 519b1427499e9ef4c3e6349f86bd16675e89c94c SHA256 de1cb5f60f45bd5bb48eef03303224dc64e20d6994d53c2d535e9f8e09d38843
 MISC metadata.xml 204 RMD160 c8357c2cfd2ae4415ccd01ab839a3a4260fd8367 SHA1 7e046a19d6d3ac8caa658059c5c268630d1e99df SHA256 f3aeb60df346d19b4d43cea2b2916d51674d99dabfce252723548687909cbd6b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPu9xHAAoJEEdUh39IaPFNdCAH/04EsCUA5NSOrSWuit5kgrny
-gILQW/gx3wdgD13NpijREdkCAzVrBZZ5jqADqvqe3RLFMUrcp0un3H70HbtSwhKj
-aFzhlIXtVH3EOJIF7vHA1tr6zWBSnthidu7cY1IPsG5+yldxAGMhvALmXyOiEC2g
-OJlHdh7SVavyYGKJyqB13texEpPkblySn+YBcn6gUMOD3ksXwW6VkVrlpcchWs5E
-SsLUJv7qTgyktsB1wkEwFWH90C+BZbhgUaNiXzKxOz7I/ykpFINJTPAb/nwlBWSC
-qU5HyoimJh0K1rdmhIwOACMbEjzGYfySb8KyZaXObJPZUde0gI2kAlHYwFSyYE8=
-=2Z9b
+iQEcBAEBAgAGBQJPwmw1AAoJEEdUh39IaPFN+PgH/Rby5lSZnSI/2uzWKqMVCiuQ
+4H7L9esnruPvn+B1hrx1fKDia3ufZSpcwzWGCJIzqtHbP8H/q6ALcMzDBvLb0lEL
+Q0T8SPEJcE25IZapouK+pDFVtKASG8Wk+ZcBaw9gnqqy+ul4zsd/bIBNeM8/4rLd
+LGRmOrpSkMKESUYd02Wl8MGQfd5HqoBLrY05pDc0wOQE/GLujqJ/JYmk0dpRc3FF
+8umOOHAI0k+uq7x6zbdw+gnxZWBT86lkXCFVSavoIX8Mtxuf3OyeyHuy/Uw6x1/V
+K3PJNTcTlYwUlKp02Kk6FICFw3M0OD1Q1JmJ5MB27vkGJXVM6hVoNHTzTC/zPy0=
+=8K6W
 -----END PGP SIGNATURE-----
diff --git a/virtual/libusb/libusb-1.ebuild b/virtual/libusb/libusb-1.ebuild
index af5d20b567f1..ea46ee9394d2 100644
--- a/virtual/libusb/libusb-1.ebuild
+++ b/virtual/libusb/libusb-1.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/virtual/libusb/libusb-1.ebuild,v 1.18 2012/05/22 16:14:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/libusb/libusb-1.ebuild,v 1.19 2012/05/27 18:05:50 ssuominen Exp $
 
 EAPI=2
 
@@ -14,4 +14,4 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-
 IUSE=""
 
 DEPEND=""
-RDEPEND="|| ( >=dev-libs/libusb-1.0.9_rc:1 dev-libs/libusbx:1 )"
+RDEPEND="|| ( dev-libs/libusbx:1 >=dev-libs/libusb-1.0.9_rc:1 )"
diff --git a/virtual/pkgconfig/Manifest b/virtual/pkgconfig/Manifest
index 5eec422ef107..c235497964bd 100644
--- a/virtual/pkgconfig/Manifest
+++ b/virtual/pkgconfig/Manifest
@@ -2,16 +2,16 @@
 Hash: SHA1
 
 EBUILD pkgconfig-0.ebuild 1012 RMD160 93e76d42f3548b3d51cb1202e54da3e839620cbe SHA1 1d9633b65505e77ea32f64686cde9de23adf1d40 SHA256 839f572ac33400c0fdfaa889ebcc34e2bdb9ffbfd450734bd33094589bd256ac
-MISC ChangeLog 1194 RMD160 2cb0c2187b348366f26067e0a4dab59b9de919bd SHA1 4597814310b05366ef60a0137f3325b25b6c91d0 SHA256 3064d5d64a405ba96e07a69fa5028603d4253ff050cbf359b63447a5da6a481e
+MISC ChangeLog 1193 RMD160 f2e5a123ab8dfc184d89e3605b02b15a7ac795ff SHA1 46f32b31b57d6b7fec0e0cb98f91bad1bd54c863 SHA256 30cf3f7f245a502523cbd008fddcaf7c7a12982a7da7182b81df36aeeb1cb70f
 MISC metadata.xml 186 RMD160 fb86db7f25b5c8f7bfc7a21dc0073386e0d1f750 SHA1 0d699e324d6660f78c77a780b9f9d9fc23ca10ab SHA256 c90e43cb0c7e54a082db47d3f0df110024139f524c5a1fd5c180b9b66a34d84e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPwmqxAAoJEEdUh39IaPFN/isH/0wSKzkKBY3luGsCXeTjb6gL
-hW+jhizrghwKmJKjlzo6YLiqYbMeLMDkqjod6K4O+jNnWZfrJ4mKQQPDJhNj2GCC
-MT6WuxVHJYeE4JjKLn7kfWhQoAE+xo5kQx2vOS8sX5t9/azvvVJq+xY8PJqgiIGi
-nTa6glPgWsT3VklGs5LTScsKJhpkkBAKJ0ZVfbTNzuYUTBgdkCjPRkiFe6EA8P2k
-WWKTOPwLM0I/PpqzJDvOjH+kAXqZ91m9DPoAO5DhN1mocAEG0bkS0oXzJbuTDDgc
-9O56k5k3x0zhjXcbCfjiCouz2hi/g6rkwUPFdwCCOs8Q+jsVm1/Dwl6kiwDJw6k=
-=/nVi
+iQEcBAEBAgAGBQJPwmxaAAoJEEdUh39IaPFNbkMH/AgNRzVHFvVt7DXvGyATZDYi
+bzE09zNY5Jcz16mjOY8NfKdjoe9+elFCErDS6MUXJk46MxdEwYdmzDhO4/5b0we2
+7R+tAxeQY69n7lwCaIsClV3QrQyqWfzolLfuXHpwCmVVnwvG3s57H0tUy+1VELXG
+9zjMqjMpF+VG4s4piWy13vq5ChC+Zq5fCF/5v7g+ro3Y0ND0kwYpalEZHGazzPDm
+6D23VlC4mc94exLgOwZXZ5POW1iaO4g1NE/wYaEekb6dmNsx7w3CJpGih6h4A1vi
+7I/+0/bWgkjQEMiShhZ7SXR3V43eXvD0FRO3sbYYDU10+i8Th9mXi3HDEwpCokk=
+=Uemo
 -----END PGP SIGNATURE-----