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-compat
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-compat')
-rw-r--r--dev-libs/libusb-compat/ChangeLog6
-rw-r--r--dev-libs/libusb-compat/Manifest18
-rw-r--r--dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild12
3 files changed, 20 insertions, 16 deletions
diff --git a/dev-libs/libusb-compat/ChangeLog b/dev-libs/libusb-compat/ChangeLog
index 8e707f7cf13a..c000fbd428a1 100644
--- a/dev-libs/libusb-compat/ChangeLog
+++ b/dev-libs/libusb-compat/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/libusb-compat
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb-compat/ChangeLog,v 1.38 2013/08/07 16:12:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb-compat/ChangeLog,v 1.39 2013/08/08 12:41:49 ssuominen Exp $
+
+ 08 Aug 2013; Samuli Suominen <ssuominen@gentoo.org>
+ libusb-compat-0.1.5-r2.ebuild:
+ Block revision of emul-linux-x86-baselibs that dropped the colliding files.
07 Aug 2013; Samuli Suominen <ssuominen@gentoo.org>
libusb-compat-0.1.5-r2.ebuild:
diff --git a/dev-libs/libusb-compat/Manifest b/dev-libs/libusb-compat/Manifest
index 308ca79b6579..924a51eb6584 100644
--- a/dev-libs/libusb-compat/Manifest
+++ b/dev-libs/libusb-compat/Manifest
@@ -6,18 +6,18 @@ DIST libusb-compat-0.1.4.tar.bz2 242379 SHA256 ed5bdd160c7b01ef767fb931a81b454f4
DIST libusb-compat-0.1.5.tar.bz2 276769 SHA256 404ef4b6b324be79ac1bfb3d839eac860fbc929e6acb1ef88793a6ea328bc55a SHA512 fe63bd1c65e67588a83ebfdd329025ecf75f33f877fb80dd83eb528df057efb591e010416027f9054294504562299166e8e2811a7681fa1967a03baae9b88857 WHIRLPOOL 2f84934c28980bee9e8ca69d284303cdbaf4cb72cee02108825bd7366bfff7f6365db5ffee8de024eb85dee571eccc47acea6a25d6835f0fefb0ad8a77d05045
EBUILD libusb-compat-0.1.4.ebuild 1032 SHA256 283e508f7e1181773583484014570971982a39bfc96f2c409be38e9d2262c95d SHA512 99d5253c2b63b16b2a3b8b9873c5e678aab60038fc40c266c809c0a419f9a3dfbab34bb859acdeb00624280e962b6f7005147a68bd3e665adb9aac13530af63f WHIRLPOOL a092775978bafe5d52738a715b8066345f664d9514175d5577e2ac126010a8b7a25e566e86e0f06731f8bf8859c1aad93481d31e96f9cb40abd28e63732eac91
EBUILD libusb-compat-0.1.5-r1.ebuild 1090 SHA256 7699d33e40484e4ee3fa129ccd0f32d0c9bd5b582e18e1a7a50c3bedb4b0c1e8 SHA512 ecae18dad80cc53de2256444372a3ea05591091d8b65e1e572714fd837ca9884f070a33782b8506e84ddabb24b0c832a21f92bbda647bb7a9bcdb819ae1d9e28 WHIRLPOOL 407d2a444d5cde0083e802d97b67219ee5366e1ca95175503a2111dade3e696bdd2433ec19be50e14e31c9ff331bcdabab4d24999d435396259b61fca33fa7eb
-EBUILD libusb-compat-0.1.5-r2.ebuild 1410 SHA256 a29d85ceeb3cbf8c698a08baf1ac6c707ebae5c3adac17b702a68114d764acf3 SHA512 325bcbd0445ccd08d1a5b4e487e8cc1c78705eeb3fbb7d42aa3f7fd8f596cb71744de58dfe975134ae209cef94215cffea61ee525230906bba37e386f361efb1 WHIRLPOOL 63c640605374690185cb517468181084d7afaca8b0950b8b60132dc49c086b07813ce843942c14ee1b94587948620af0fab3984db7786b3f742278297bbaf458
+EBUILD libusb-compat-0.1.5-r2.ebuild 1412 SHA256 92b48a1b8a8a77b21498e8b0cf4a3a5d0d7b1535d5e95518c8c7dc8edb54db37 SHA512 0d15c36870d311c52e2e277213f71b3dcdd66feac3e5e73b9137188fa434d73f0ed7f2f0281746695a5afae169ed1a9df1593cd22384f94336db7524e3bb5bef WHIRLPOOL a7ecbefbc57737d8cb2aa3f55d50df7d386e8640b9939965d4ee820bbe49164ee462f0b438855f124209f39b1bf34a5f4e8d2ecbb776c72f112bbdc008904787
EBUILD libusb-compat-0.1.5.ebuild 1029 SHA256 fb1cca5cf7db139581bfd277987e3e3c9001c0472ac41551c1834a7d17492be2 SHA512 39e685e683063c9298a986bc16ecf0c5f21013610908631f9ee89784fae139f44dcd5164125d441cc6fdf39dcd20581df7a380bf289a51140210060d20affd93 WHIRLPOOL 782d9a49f746ab5d295562a10ffd9b6aedabdcda7f3db4600dce0eb4403675666d7f3361b50b276781bb3dfe4e07323e5484b1c4a063a3c38442057730d4d5e3
-MISC ChangeLog 5647 SHA256 f66eb24eda2df7ad9635fb906b95d3219dea7893096f54a7f1d4f079c2258c4b SHA512 8484f14373f2f71b34781626ff8a2ac0b3456d3521e604616b5b19c0aa29ccfb711c350fecafe7d7d444ee0bc3f1112dcba02fcb3b98719b16b4447eec18e6ee WHIRLPOOL 39fcb47044fc29a42fbd281f7f8ea6f0094835f0e7c8272233ed5735d7db10e37b94ed3b4264a0b2fded97a151ae87a9e836f5418dc9221dadc6541e4466ca69
+MISC ChangeLog 5813 SHA256 ceb07579d255979b6c16d91b4cae04379079746b58b8fea781f40f5fd9f63032 SHA512 33c80ee3dfd7b38bf5dac3ce81a5066895c459d1ddf3dbd743fbb0b1bb59b32ab8db934089d1e612d8ea19c5209cbe55ef7fb1802c27f60be7e454180e704f49 WHIRLPOOL 1dd04c8b97448d72e3f87c954b681cbb5c17aae64cdb5449d493aa6a794f24339bd0d08e7bd176b27b71a861bcf3bbcace96149b9d5c6a270355d8afa004a557
MISC metadata.xml 285 SHA256 8f3e4e1f792ef6a6f383ae0aac1627db7f536ff880da423bca1113cea6d06773 SHA512 10fc61b3654c9aee6e9ba9702cf6630928921d2670248b9e1356d417b205dabc959e3672eda071f5fa734b3a001992cecd514a920b6e37376db943266683e75d WHIRLPOOL e26de64dba56ea85587b9e7348a1be056f78a2e2f9f91ffb5faef242b7ced82496b40fe672b18c33491f40a124161ca47af0e80219ebe39a8b24e86557c36db1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)
-iQEcBAEBCAAGBQJSAnF7AAoJEEdUh39IaPFN/YwH/iiyItSKfN/1SJLR0uZAmmwb
-1QZuz7dnSrB/XYLgk5wo0e80MuFYo/lto+oMnN6evdyNjTiViJoB2o2uJDcbCeLW
-G2wZCFtoqLYTrM1qnBaWF37PS6kLA5fPlDdrCbnvEpVzReylwDo52IOIVprXEjWX
-BwCd4Zf2GFXeKqENr5OcMI7sgWtfS8FZJGWULz9kUcbt5/xdlZH66Esk7z0YX0LK
-1850JS+DrV5UVFnvzJYiCci1mZhhpM+ga2buJ9UVKhyTKYsAzryY/MsmBfF987ty
-uMAF757UZGtngHrcckrSgpJ9MizBWRIUbhV0boO47vpzfFFPw7GGAQ6onVQYfAg=
-=uLFE
+iQEcBAEBCAAGBQJSA5GYAAoJEEdUh39IaPFNVy0H/16hCKXmo8vAl263sWYElEYq
+kj1iO3vl0bvAgSE+EwlQOMUZgyFCwf7yTEdLBMRdBYevo68AdoIeAwIBEuIKB24Q
+OqqCRo5nR0TyLqNtJHlmyQ5edJjV+xhiqcT+WUkV4RS2X3fGCLRyPwNSHJBmfJwo
+/MJX25+vbLp7w0EPJiEdEoDcyWCgDMCt9dmiGtvLAQvysMYJwKTh4BzsFkCi1/po
+JDfGA79hsi1zAPkfpnd0EU+o2SSjtrvhV1vlsNeeR5HD3oKLQp3dGdpbNKzFr4MP
+OgcdjAaYXHHlFv/twI9mpIjPoz6EDCXWOHg2AhRl7MX/zvdWlOG2A89sqPu/56Y=
+=xLLT
-----END PGP SIGNATURE-----
diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild
index b1b92b9a52e0..0ce2082f33e4 100644
--- a/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild
+++ b/dev-libs/libusb-compat/libusb-compat-0.1.5-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-compat/libusb-compat-0.1.5-r2.ebuild,v 1.2 2013/08/07 16:12:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild,v 1.3 2013/08/08 12:41:49 ssuominen Exp $
EAPI=5
inherit eutils toolchain-funcs multilib-minimal
@@ -15,11 +15,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
IUSE="debug examples static-libs"
RDEPEND="virtual/libusb:1[${MULTILIB_USEDEP}]
- !dev-libs/libusb:0"
-# abi_x86_32? (
-# !<=app-emulation/emul-linux-x86-baselibs-2013
-# !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-# )"
+ !dev-libs/libusb:0
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20130224-r7
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )"
DEPEND="${RDEPEND}
virtual/pkgconfig"