diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-05-22 18:37:54 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-05-22 18:37:54 +0000 |
| commit | e8c1b14c269505a1aa03ef34709e988b79a05dd8 (patch) | |
| tree | c1ca328555c301113063e88e3e40736e0c8be119 /virtual/libusb | |
| parent | old (diff) | |
| download | historical-e8c1b14c269505a1aa03ef34709e988b79a05dd8.tar.gz historical-e8c1b14c269505a1aa03ef34709e988b79a05dd8.tar.bz2 historical-e8c1b14c269505a1aa03ef34709e988b79a05dd8.zip | |
Change order of || ( ) to list dev-libs/libusb-compat first wrt #417135
Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64
Diffstat (limited to 'virtual/libusb')
| -rw-r--r-- | virtual/libusb/ChangeLog | 5 | ||||
| -rw-r--r-- | virtual/libusb/Manifest | 18 | ||||
| -rw-r--r-- | virtual/libusb/libusb-0.ebuild | 4 |
3 files changed, 15 insertions, 12 deletions
diff --git a/virtual/libusb/ChangeLog b/virtual/libusb/ChangeLog index 34e8cc49e48b..0b42b4b39257 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.22 2012/05/22 16:00:39 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/libusb/ChangeLog,v 1.23 2012/05/22 18:37:54 ssuominen Exp $ + + 22 May 2012; Samuli Suominen <ssuominen@gentoo.org> libusb-0.ebuild: + Change order of || ( ) to list dev-libs/libusb-compat first wrt #417135 22 May 2012; Samuli Suominen <ssuominen@gentoo.org> libusb-1.ebuild: Include dev-libs/libusbx:1 as secondary alternative. diff --git a/virtual/libusb/Manifest b/virtual/libusb/Manifest index 6b58f3af2327..7d8eaafd8c19 100644 --- a/virtual/libusb/Manifest +++ b/virtual/libusb/Manifest @@ -1,18 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -EBUILD libusb-0.ebuild 605 RMD160 5369b58cad747e07470a583a64ce5cc8ccaa9a4f SHA1 6a560349b3b9c6a027c4c0b0935ee4e132c8a8d5 SHA256 eb3ac3e61ff7bc1ff73d28e347123d4d60c9fb4ff9259af08ca8e45be934a34f +EBUILD libusb-0.ebuild 614 RMD160 dd9bd3367dc0be5abc7bd67895dd67593e1fa148 SHA1 1b163045907f08709c13687336b76d90af19ba8d SHA256 c5a02b5d685e26e01ee7d424e3a6a5d3d6a26560f5fe547561d0071b7f46ae1c EBUILD libusb-1.ebuild 554 RMD160 d5655df36153e8621da718984fdf4873da71568f SHA1 d8f39c480f2585fc84b0fef6548422325c4061ca SHA256 c29b9c11a7cbd08588b4ecfb03e87410fd0384223a3f2d4af07260cb15437c24 -MISC ChangeLog 3341 RMD160 3ee0566695b5129ad4b5ade828556d51ae28a7c6 SHA1 4ac8a6c7377bb603978f9db18c79166bd1c4ed4c SHA256 e279f99aff4b7cc5465a0fbbdd674a573f4dd1631d830035edbd3629b6c4c3c3 +MISC ChangeLog 3487 RMD160 acabfc2216c12ed805d6d98e47375664e8703ca7 SHA1 11c1c0b65b3906003869e9bab223d28167685395 SHA256 1360e769272bc45304959e2f82ef9f19fabbadd32c52a01eeca8f5c3bdab928a MISC metadata.xml 204 RMD160 c8357c2cfd2ae4415ccd01ab839a3a4260fd8367 SHA1 7e046a19d6d3ac8caa658059c5c268630d1e99df SHA256 f3aeb60df346d19b4d43cea2b2916d51674d99dabfce252723548687909cbd6b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBAgAGBQJPu7qvAAoJEEdUh39IaPFNcdkH/jcl2LZ/z94bdQl8lDDbQI73 -KYs28XFeemOVe29JSWqHc1Xif5Vehk+DtQOhZ5NwHw/HyowTRoL0bslFukmHwMNB -OPv8oYVrpzGDypOJdwokOKW8UAIF+yC8R6o4JRuIf4LJVE3w0uEst5Sf6SNAvpXF -J3SqWb/mwVgSP6Vv2JzbAJHtFNeKQDO+H2vryGdXQpirfIcm8PnG77Mvy6iwGpq6 -62J4n5dEk+GMF5N7QZdakAJeLcE5mgDwwFYv3W4mavj3q+24dZuXy7PveD6e+PWp -3ZmJ+y9DiDUQqqnFqp2cs5aE0bcc5YZAMQp36d7+6n+C9q7QnC3EHzurFH+rxCQ= -=MoE3 +iQEcBAEBAgAGBQJPu9xHAAoJEEdUh39IaPFNdCAH/04EsCUA5NSOrSWuit5kgrny +gILQW/gx3wdgD13NpijREdkCAzVrBZZ5jqADqvqe3RLFMUrcp0un3H70HbtSwhKj +aFzhlIXtVH3EOJIF7vHA1tr6zWBSnthidu7cY1IPsG5+yldxAGMhvALmXyOiEC2g +OJlHdh7SVavyYGKJyqB13texEpPkblySn+YBcn6gUMOD3ksXwW6VkVrlpcchWs5E +SsLUJv7qTgyktsB1wkEwFWH90C+BZbhgUaNiXzKxOz7I/ykpFINJTPAb/nwlBWSC +qU5HyoimJh0K1rdmhIwOACMbEjzGYfySb8KyZaXObJPZUde0gI2kAlHYwFSyYE8= +=2Z9b -----END PGP SIGNATURE----- diff --git a/virtual/libusb/libusb-0.ebuild b/virtual/libusb/libusb-0.ebuild index cbf3ffa6ec9e..347cc9a04a2e 100644 --- a/virtual/libusb/libusb-0.ebuild +++ b/virtual/libusb/libusb-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/virtual/libusb/libusb-0.ebuild,v 1.10 2012/05/06 00:40:32 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/libusb/libusb-0.ebuild,v 1.11 2012/05/22 18:37:54 ssuominen Exp $ EAPI=2 @@ -14,4 +14,4 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd6 IUSE="" DEPEND="" -RDEPEND="|| ( >=dev-libs/libusb-0.1.12-r1:0 dev-libs/libusb-compat >=sys-freebsd/freebsd-lib-8.0[usb] )" +RDEPEND="|| ( >=dev-libs/libusb-compat-0.1.4 >=dev-libs/libusb-0.1.12-r7:0 >=sys-freebsd/freebsd-lib-8.0[usb] )" |