diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-07-28 14:01:58 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-07-28 14:01:58 +0000 |
| commit | b209332c381af63b1bed9acd271a2dead576f47c (patch) | |
| tree | 44d84596f0ad7987cffda1f452d1265067f2e0e3 /sys-libs/zlib | |
| parent | Stable for ppc, wrt bug #477950 (diff) | |
| download | historical-b209332c381af63b1bed9acd271a2dead576f47c.tar.gz historical-b209332c381af63b1bed9acd271a2dead576f47c.tar.bz2 historical-b209332c381af63b1bed9acd271a2dead576f47c.zip | |
Fix blocker on emul-libs
Package-Manager: portage-2.2.0_alpha190/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A
Diffstat (limited to 'sys-libs/zlib')
| -rw-r--r-- | sys-libs/zlib/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-libs/zlib/Manifest | 12 | ||||
| -rw-r--r-- | sys-libs/zlib/zlib-1.2.8-r1.ebuild | 7 |
3 files changed, 15 insertions, 9 deletions
diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog index 24922478c193..d16d3a0fd7dc 100644 --- a/sys-libs/zlib/ChangeLog +++ b/sys-libs/zlib/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-libs/zlib # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.124 2013/06/23 07:43:53 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.125 2013/07/28 14:01:51 aballier Exp $ + + 28 Jul 2013; Alexis Ballier <aballier@gentoo.org> zlib-1.2.8-r1.ebuild: + Fix blocker on emul-libs *zlib-1.2.8-r1 (23 Jun 2013) diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest index 7e4d5eb0ee59..6f59842cce58 100644 --- a/sys-libs/zlib/Manifest +++ b/sys-libs/zlib/Manifest @@ -29,14 +29,14 @@ EBUILD zlib-1.2.5.1-r2.ebuild 2772 SHA256 7d976dd0132e208d8127d600fa6d6ce33cf419 EBUILD zlib-1.2.5.1.ebuild 1978 SHA256 daf91a9db719d6db404df3423b5c16e30e15bde7cb639ba4f4bdd5f595348bfd SHA512 1d6e0a1baff507bd9690daf9bea1eddb5c94faaeb710501fe686822a6c1f1dbfe9aece9d6350fde38ac8711ae17ded17b544448a5d28724b2158a7c8426ba065 WHIRLPOOL 0317a2841967a3c42ec9d2c9fb29059ae6aab7dd13cbb2d042932845eee02a86ce02fdfab185618bd60624249ff3cdf6b9b435ae619a6166b31938949ed53644 EBUILD zlib-1.2.6.ebuild 2384 SHA256 0a549e860c658f2eac688b4d956d101c10f85525626128a5bf9e826b9f220e49 SHA512 1310a3935d0fe11db4601ee61b3a14121e446036042b971e3a61305c68560f507d9dafa9799faaa9d5d6d4c7e4f8163df19fe6cb682e9feb13500f1e2cf22f21 WHIRLPOOL 0eb9c2e14fb33355cf717a93b8e25828524a3add9e8e068a6f47e2294e9ba9dac36a900387d851deebaaf22c820046eba83e255b380c65d33a5d603ae3f19df0 EBUILD zlib-1.2.7.ebuild 2521 SHA256 1d47bd9bd6bd7c1ef09ec4183032289c98c95bfc14bb2bc0c28336c333e627ca SHA512 7c19f08ee61380da9e9115a133d68b63f3ddd18f60c7c73fcf9824139e0f57ff488606e73dc9abe7defc333b0fb54d20ec955c3234d8ebebdeecd90e3d1d6c4d WHIRLPOOL 1b37518ac0f9dd653c6d574b945e1224175e9ff5a873905f40b2a2a77d68d5a2b411d6262298d0b77bbe4c7f76521be3bbba8ca407d1b509bc846692f2b67bc7 -EBUILD zlib-1.2.8-r1.ebuild 2842 SHA256 2b1771e92fbff85f749d49c5074deb87b988d3715132732d82ed2ef26f9cb957 SHA512 145cdb9a36d9c9ee8d13e21942e8bdc1cad22545571b80ff7bbbca584b907dbd3d01f5ae7105bd723da72feffa958ead922edf84231dc6660f7f6bb516e352a2 WHIRLPOOL ef01ffba3c335b09c96fe301e1d71020e95bc3b1934d41aa6778c0bae74ee2470c514d973e2c073f5e0cded4f38d27c508871864a8b2d9ecbcc4fbf386186181 +EBUILD zlib-1.2.8-r1.ebuild 2905 SHA256 b039b7224fad6424fa9d0d01b576608d74affd815ddcecfe2cc800d53b73d775 SHA512 d53789528469dc6188bc6c1732bc1e86e514a62937c65ef99273e7bc677889afd817a58ca9cd3311ec3135232a4243d72a1088c3a696bc5661feead7885e4549 WHIRLPOOL f7ce291ee0c164b8c7561ace2849496aaf149fac4d4e343f57c8b6dec8015736bb1311ff50c6497f1cc8dce23d365ef8556ab0719dd3798eb979844634c83197 EBUILD zlib-1.2.8.ebuild 2532 SHA256 103f8c24f7900e89f0e158b42449388c3b636a66867050bfb4f295448dcbb5bc SHA512 0e80382820823a7f150346f4d595ab2a5788e05f9e384dbc326d5dd53c7dd457fdb5491183735aa2dfa2aa64e0b6d21069f764f181d6b78beb708973ecd4037a WHIRLPOOL 2ed794a3b3051576f15e27c79baa8764936da8743ae6a8baa1c2847b05b81f49afd40fd858c5f9b250251aaf8e342d2be24f8d176371e1c89efdb9b60534081b -MISC ChangeLog 17285 SHA256 d4f2c4e9f93f349523844aafb091fc2cce084ba87cdac3d41d4eae7fbd5bc817 SHA512 b0fcbbd9007b0a49153aa75678a727b4497f60fd62796bee80520408012d895a2d85f23fc8d1ef2abd455fd3894af5c0df62029f34211b0663a07bff6a861677 WHIRLPOOL 3f72b022c4eefcd59c2e210bc6dbdd28e02bace89fbff471763ec818dbad590c926da2d5a32377565601cbe5e662a4554571df06d7ef27bc6954ad317fd6e228 +MISC ChangeLog 17390 SHA256 5d3eb4a0c3b65e1eeb7d46c96e2cef316bd07ee8b5fc2735dfd567ca6ed19a42 SHA512 8a2c1bd6acdabaf5aca6ac3e2d164b7a8813279dc598421b73754522fd4c7727b6fb40a1e1ab075c9a93588a3607832eef6c89a2206edd19b75a0ab97e4402cf WHIRLPOOL fb5fc4b4f6932b61cb30687123ea608efa14afd7472ac491a91c18e5bfb8961e2f2f8aee60780eff54ecee5a2255d05d87717ba800908ec0f895e154df4fb1c5 MISC metadata.xml 350 SHA256 4eb380d7bf14e79af8acffb3db2d71aeebf9f8859b60df89d068e455246aaae3 SHA512 4d9c036be5cfbb5ddb92df7dd64f41721baf96d1433429d3630f02454599278102d04d174d982c57fb84e6df00ebf6844ec562b24aaf3cb97538bf0b1eb9b4e2 WHIRLPOOL ea8c9d20dc5d46b0717994c8adf894c673bcaf898bbb532dd3c940c3de60e2a0cb7b26cb7c524c12b5befbb02a94bdf36669a87c2a06cce7bad6e0150ec787fe -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.20 (GNU/Linux) -iEYEAREIAAYFAlHGpzoACgkQCaWpQKGI+9TEKQCggGmcyGqjz1iYvxy84bSwAN2T -RqEAnR3/lfjE9mHwIhvnpPXr1I8UDCeY -=6+B8 +iEYEAREIAAYFAlH1JFAACgkQvFcC4BYPU0rR6wCgwC8PJDfRhPiYCwbDjr25UE2z +PYQAoMhQzV1NKClUnW+wmwlSRPtse3cU +=Breh -----END PGP SIGNATURE----- diff --git a/sys-libs/zlib/zlib-1.2.8-r1.ebuild b/sys-libs/zlib/zlib-1.2.8-r1.ebuild index 0c91f955dbb6..2b00773df37a 100644 --- a/sys-libs/zlib/zlib-1.2.8-r1.ebuild +++ b/sys-libs/zlib/zlib-1.2.8-r1.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/sys-libs/zlib/zlib-1.2.8-r1.ebuild,v 1.1 2013/06/23 07:43:53 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.8-r1.ebuild,v 1.2 2013/07/28 14:01:51 aballier Exp $ EAPI=4 AUTOTOOLS_AUTO_DEPEND="no" @@ -19,7 +19,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar IUSE="minizip static-libs" DEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )" -RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224 ) +RDEPEND="abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20130224 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + ) !<dev-libs/libxml2-2.7.7" #309623 src_prepare() { |