summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2013-08-08 12:41:53 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2013-08-08 12:41:53 +0000
commite72c8076cc24840d11ba28641181b5cc32435c13 (patch)
treed880bb384c0204d3d3bbb16b84a66d209d9c8d79 /dev-libs/libusb
parentStable for x86, wrt bug #479396 (diff)
downloadhistorical-e72c8076cc24840d11ba28641181b5cc32435c13.tar.gz
historical-e72c8076cc24840d11ba28641181b5cc32435c13.tar.bz2
historical-e72c8076cc24840d11ba28641181b5cc32435c13.zip
Block revision of emul-linux-x86-baselibs that dropped the colliding files.
Package-Manager: portage-2.2.0_alpha191/cvs/Linux x86_64 Manifest-Sign-Key: 0x4868F14D
Diffstat (limited to 'dev-libs/libusb')
-rw-r--r--dev-libs/libusb/ChangeLog5
-rw-r--r--dev-libs/libusb/Manifest18
-rw-r--r--dev-libs/libusb/libusb-1.0.9-r2.ebuild12
3 files changed, 19 insertions, 16 deletions
diff --git a/dev-libs/libusb/ChangeLog b/dev-libs/libusb/ChangeLog
index a0676ddf3aaf..53f99523adf1 100644
--- a/dev-libs/libusb/ChangeLog
+++ b/dev-libs/libusb/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-libs/libusb
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/ChangeLog,v 1.150 2013/08/07 15:55:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/ChangeLog,v 1.151 2013/08/08 12:40:30 ssuominen Exp $
+
+ 08 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> libusb-1.0.9-r2.ebuild:
+ Block revision of emul-linux-x86-baselibs that dropped the colliding files.
*libusb-1.0.9-r2 (07 Aug 2013)
diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest
index 4f8cb2789827..e34326119f1a 100644
--- a/dev-libs/libusb/Manifest
+++ b/dev-libs/libusb/Manifest
@@ -3,18 +3,18 @@ Hash: SHA256
DIST libusb-1.0.9.tar.bz2 421971 SHA256 e920eedc2d06b09606611c99ec7304413c6784cba6e33928e78243d323195f9b SHA512 5eba3e9df2c1db71d685becebebf5b1310ee87e442f97a2553a430fd11655a2d9ce50e4ec2ffd62fe322286b0d6bc9e142ce552effc2466ee50424deba035ee5 WHIRLPOOL 9886cb6660d4530fe199441a8b5b76cb8a00012d69a13a40276bf3b880561eeb31301c186828b6fd08b687e038fac640475ba280473053e252cf23f15ca38372
EBUILD libusb-1.0.9-r1.ebuild 1070 SHA256 7380a11d1598cf24e7f97520982a93d87c9b68b9597a9054ab972921927945f3 SHA512 e44f356a65973c7ee7c18bce4b9fdc9887e717eedc9f2050ac0bd823fb3fb939ca6117186032aa1458ff0b3da0ed3680e8ff1e126d11b37127e5ed3026953544 WHIRLPOOL e082cf6f9ef0f9f3f0a68d73f1b261ed2d8c338e10ddb9c800b65eed6e582f60949e6137ad83818415d11b25d173a241a15acae90a5f01acb5a961896890e33c
-EBUILD libusb-1.0.9-r2.ebuild 1414 SHA256 aae336abdd6c4110da2ce1e5436ea449a0648d20370900484497fcfa48e9292d SHA512 134b45fb68f5d61941b4469365642627017c99d0ad50d32c96ae574bec86c51b82349bdaf6fdec38b6ddc89300304a135d5fd144f454a53a6611931fc4d5f544 WHIRLPOOL 7f75ca841a085780c28700d775bc2de6572a45507dea5d95f3770c2e07257756938ab5b8140af0a33e5bb166f07bd19983b27d14234321ce88d3874eaa469694
+EBUILD libusb-1.0.9-r2.ebuild 1416 SHA256 0d3a9600fec29b599295d0efd5f96f22b1ea3e3aa5a94e62cfb43447b4470dc6 SHA512 a4ab5c7fe2b9fee8c14c0f0c7b7c9646c8b4319ca7ca47010ecd233bc03fb0de41ee4a460943b68923a95cc6a4776e5b05ac1e7e3c963869e88b148ae0d2fbad WHIRLPOOL f1e02da4a4e067a0450327c4d9d2728ff09d468eb25c1455c7ef567e8e1f827b41a7f1f6aca8d1e8dd18ca732c457dc6ba5407f49ea690a1db26ae350f32bbeb
EBUILD libusb-1.0.9.ebuild 1000 SHA256 7d016e63df50d581e270756222955f081cfedd5cc968256028897f7b09a56424 SHA512 2d86b3696800aaa0bee43c77d4548d72a4cf005db418acb3e73dfd6acbdaff7ae00d6a6b9ce193336476b2cc0ceb1ff7ddd443f6ab0aef5ea427c143361dd043 WHIRLPOOL 97ec162cfcd567f0b2511a9cec9147ad784f0fa39403e585e6b59dc75ac874708659ba3b66e56b461cdd2edb34be9980997612225f0325e0b0c91bfdcb0dda89
-MISC ChangeLog 19427 SHA256 7c17d2b67353bd829b9ccf026dafdee362168b662fc0f95dbabe96d06f276ef5 SHA512 ab85a83643f906028754cf4d8390446f1dc70b308ea76c50b2ed1473166d547d9983e9c5434bd89c6327666d8ccae88dbf1fa787af37e7baa96689e4a9541ff8 WHIRLPOOL 2c19ca9ac01bc3d9891b09b9f213635988896cd77b88dd90e0140d9ce120d1ae57b948fd2cacfb3e65a36f49660048e352f45ae4461e3a66b073a638d3d27003
+MISC ChangeLog 19584 SHA256 6eb4a6cec9db30f7148ae073f25d0258faaeac0ffa90c3b370007d9895e0a9da SHA512 dbb6b6ac70c4fc6e8bfacdc98f8f43aed95b3f23ac7396cfeacf737424657fac3b97bf474c85c180d0904be1facc2f9fe789b12d985d7841045d098593b221d4 WHIRLPOOL 2372d09331ca229700e4c5789f3adeb4c477aa784d261adaaad208b7e4bb646f83f51da0ad69d1b118de4a0d12ccf0e3c2b65099878c23b972a1add35a3b9577
MISC metadata.xml 285 SHA256 8f3e4e1f792ef6a6f383ae0aac1627db7f536ff880da423bca1113cea6d06773 SHA512 10fc61b3654c9aee6e9ba9702cf6630928921d2670248b9e1356d417b205dabc959e3672eda071f5fa734b3a001992cecd514a920b6e37376db943266683e75d WHIRLPOOL e26de64dba56ea85587b9e7348a1be056f78a2e2f9f91ffb5faef242b7ced82496b40fe672b18c33491f40a124161ca47af0e80219ebe39a8b24e86557c36db1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)
-iQEcBAEBCAAGBQJSAm2LAAoJEEdUh39IaPFN2P8H/RcSM1CZFeW2gS8thOOgzHFL
-WdqGQBFbaXhFfzCtcLtpw1F35lk/8JoPhx9h3dup2mKRn6Yx+cje8cuCxlyh0h2O
-FBYVhCynDH8TWWDcs378Oa16+2FUHC27ESriUpfdHucKr0k3/jBNQJVaPSt55mHf
-KC+9j/aeMqXmCtTYVqMkEhbCRYpR9VFQiuq0UwZBk/Ngz0oQmAsBQMOFNfCEYlPd
-PdfJSVzM548HEW/VLVqbddzRs7I2yVJEeHpSnM05pkQPUR22p1Ea68N+QkpjH4e2
-bbJgQEtMUyVv43GUU90Tr9eo3u/hvvLh20JlVRfohzmv5xnJpY5vnGhJabrm/xM=
-=v5Hg
+iQEcBAEBCAAGBQJSA5FJAAoJEEdUh39IaPFNYm4H/1W8fn+VpJQ2DAyCZhGPa7tI
+D3ho9hazLnVv+rm99j0TH5NdGzfcEnCTvmqZ4xdTFlxSoQyszDXJxAFb6+K58z9D
+gSLIQGRkxMjBGZQyVuS3fnqBFjH/dmEJKhTgej6x4ncl6Lfg/ivySQQvMi58lbEj
+GnRuvu3j+S4quClvVEYKhNeSRDw+QJ/jvjUkEE/NzmD+B3Xlu5oR8nzgYNMomC+y
+xGM6/s9QjFwRnFZgqQ/BQiqtxu9+sDnZSwW4+0LjCkTRjP0thcfZNfjz0Y7JUTZx
+lTqvjEuJJZSZTyE4pX/LWcuUhMIstSr/KaNqNVG0eUyHaiNqlzm/8slrzpXHp2c=
+=hC9j
-----END PGP SIGNATURE-----
diff --git a/dev-libs/libusb/libusb-1.0.9-r2.ebuild b/dev-libs/libusb/libusb-1.0.9-r2.ebuild
index 8e0ee5015cd2..8f283a4fe925 100644
--- a/dev-libs/libusb/libusb-1.0.9-r2.ebuild
+++ b/dev-libs/libusb/libusb-1.0.9-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-1.0.9-r2.ebuild,v 1.1 2013/08/07 15:55:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-1.0.9-r2.ebuild,v 1.2 2013/08/08 12:40:30 ssuominen Exp $
EAPI=5
inherit eutils toolchain-funcs multilib-minimal
@@ -14,11 +14,11 @@ SLOT="1"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -amd64-fbsd -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="debug doc examples static-libs"
-RDEPEND="!dev-libs/libusbx:1"
-# abi_x86_32? (
-# !<=app-emulation/emul-linux-x86-baselibs-2013
-# !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-# )"
+RDEPEND="!dev-libs/libusbx:1
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20130224-r7
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )"
DEPEND="doc? ( app-doc/doxygen )"
multilib_src_configure() {