summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2013-08-01 15:47:10 +0000
committerAlexis Ballier <aballier@gentoo.org>2013-08-01 15:47:10 +0000
commit00f45d2ecfae2eb3d646766c334eba9d25d6bac5 (patch)
tree0c2e7f2d792bff7077067ecaf235ac9a0033126b /media-libs/jpeg
parentBumping to 5.1.0, to help fix #479396 (diff)
downloadhistorical-00f45d2ecfae2eb3d646766c334eba9d25d6bac5.tar.gz
historical-00f45d2ecfae2eb3d646766c334eba9d25d6bac5.tar.bz2
historical-00f45d2ecfae2eb3d646766c334eba9d25d6bac5.zip
add blockers on emul libs and stack it for baselibs -r5
Package-Manager: portage-2.2.0_alpha191/cvs/Linux x86_64 Manifest-Sign-Key: 0x160F534A
Diffstat (limited to 'media-libs/jpeg')
-rw-r--r--media-libs/jpeg/ChangeLog5
-rw-r--r--media-libs/jpeg/Manifest14
-rw-r--r--media-libs/jpeg/jpeg-6b-r10.ebuild4
3 files changed, 12 insertions, 11 deletions
diff --git a/media-libs/jpeg/ChangeLog b/media-libs/jpeg/ChangeLog
index 03df9a3fcc9f..70fb398d19d1 100644
--- a/media-libs/jpeg/ChangeLog
+++ b/media-libs/jpeg/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/jpeg
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.140 2013/08/01 13:57:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.141 2013/08/01 15:47:03 aballier Exp $
+
+ 01 Aug 2013; Alexis Ballier <aballier@gentoo.org> jpeg-6b-r10.ebuild:
+ add blockers on emul libs and stack it for baselibs -r5
*jpeg-6b-r10 (01 Aug 2013)
diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index 567677886319..99e15ba51797 100644
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -8,21 +8,17 @@ DIST jpegsrc.v6b.tar.gz 613261 SHA256 75c3ec241e9996504fe02a9ed4d12f16b74ade7139
DIST jpegsrc.v8d.tar.gz 991456 SHA256 00029b1473f0f0ea72fbca3230e8cb25797fbb27e58ae2e46bb8bf5a806fe0b3 SHA512 7a8b4cff5b1caf6a7281c5dce4e1efa1b68360bd64dd2e619b60c9e1d49f22624bc8780b681bfab073e7b1d4b7f41008a464a58f0eeeacb0a40ff996d7eb5753 WHIRLPOOL 7489605809b43cfac02230b89013075806df32246b37eb12ac05ef890ee690f85744887e296f5a21fa64012570aa298d2aa54e4469066f4c21dd40141f3bd8a8
DIST jpegsrc.v9.tar.gz 987900 SHA256 c4e29e9375aaf60b4b79db87a58b063fb5b84f923bee97a88280b3d159e7e535 SHA512 c6a2fa316fad8230ffd137469643276f1fef52667536712eae69b24afeea283415e8182a284c0457b54c6e49d6e93cf90d7ace1f2fed129c1e7f64b51c699c29 WHIRLPOOL e8b597539e10e68e085a750580b498320b664684d475cf75221a6643287d4e210ee3758f017149a3c2f461e0d9eb625d5930ae7c02862307761e62e4e2b57231
DIST libjpeg8_8d-1.debian.tar.gz 13676 SHA256 70ec6689b0ad85739802cf3ebbdcc12ea01e21edd8f931c614b25b44cf199057 SHA512 7def4f13524f0af3b9adf35a370027a18f43b9a635f56a17d5bb7883370db8b18b8a12737d0f0cb4b0287ccf8fb474eb5f754de6b398ffe7d522c54e5bf68040 WHIRLPOOL 94526c31d401eb14c9bf0f7115e13a27886ad58863e25d6653eba2b2f5ef260ec272368d2b9d9934bd75b1e5b5f1afc97230e540248efc24d6e85e5680399d27
-EBUILD jpeg-6b-r10.ebuild 1115 SHA256 b16e0c9b1479824daadbb65a9e465e9e5a99d6aa00707dda9219f5dc846bae0b SHA512 0f72990db63db7fa2860ff1c64fc2bf684704ba3dc30941c3b520a9554ac76e259288580363c28d48b3b8dcd27fedbbd1d038124c634609cdaf52532978e6c29 WHIRLPOOL 8b01b9436d71e58ca0f02c5b9d417080b885efef9e744ada9efbea7b15248ee2935e9f3b0423c01ddcc08ef6b75608dda11ed961ba1ad898ef8870bec9c1b783
+EBUILD jpeg-6b-r10.ebuild 1250 SHA256 8869e094930e07a779d3c667e3dc0c8942aa6f3290025f484d6a3e6a3b2b46c5 SHA512 67b400dd5c54c86d6c572178ab78bf436c8012ebeb60bd81871fcb47793b0b2e47a767a672fbb8ac33a910a89c39302bf05c6a949ed99c30900f693774c527f6 WHIRLPOOL c65f94d0c7fd699c6502d91b79d76405004efd573dffc8d0636533366ea784f62710ea1fb4ad930a668dc11b92ff44c42269ed42874ea8a9555b4c62597ca409
EBUILD jpeg-6b-r9.ebuild 1029 SHA256 881c863315fc55c042a97f544d156bdc0ce4a35a064199fe1364b5f0e9cdda27 SHA512 ebe66ae2058dcca128c3fd3f98f71077908804b00e6e69242cc426cf1d895e0af6fa2e49e09d0873db4efbf0077fbe7c78b6cf2a86e3d3f30d8725c2cdcc682d WHIRLPOOL 92b0d6b876399c5d68f34e1d882599a763ecd89a62bf9363b9bfe3946c50e88ac5ff5287a982b36e6e508171e085d52e8d6222295845bcf3c0233c0c198d18f4
EBUILD jpeg-8d-r1.ebuild 2301 SHA256 1ed66f2121dd886b7cf005c60d4d271d473c8c261e8980de0ecc4f086325cfe3 SHA512 13e0ffb05c0c9fa7944b00c314ef73e661396699bd0bf0de6036be75015553a3be04cba74ca801787353fd19937e4017bf445dca9813a1ca45adbc57328a60ff WHIRLPOOL 10650af17ada9fb70d65dbccc37e8e30bb2994cc20899474234f89a0847d74af228783d2b346904d3b20ba7ed696c3b3a5ab38d3500b308494d4efc496471166
EBUILD jpeg-8d.ebuild 2005 SHA256 ae6e19520cbbf02c0797fc93d211a51ded7c8e6ba51e6040c69efbd701df2368 SHA512 a8d56cbea40e314cc740efc14e29e8f6eb7dc22ddb802bfe88a453ca095d830b401c37aada1ba0e6c5d066b1160dec0daf146062a007e92eb8ec8c4316395fbd WHIRLPOOL 356b760b3375b921f79690e35d9eb0975f72caf42faa3d7e3f6e9aec41e780ee4ddf5b34189cd7c5196f5b444e6463de703999fefbe8aac37937e7dd3c51420b
EBUILD jpeg-9.ebuild 2186 SHA256 5b281782782aa436b27cd68ebf7aff8ae99c2e74b347fc41fc9d7fcaaaa92793 SHA512 5f865b236c682cfa0b2b10fdd76941d89d584570c75ec2e8ae2f10b3867b31c8e7d43e73a661e81f5909db6dc33db8ebb04a5d6fbda3e0b35808c58205ca8515 WHIRLPOOL 7290f47aeeb46cd9706dda8cf6245bfdf5dc18b8763e7bfd73c226e2db8ddb001e0e5f945c41cc3661b0933a5004714f57e6b7c7a77b212718cc9f26c2614cbe
-MISC ChangeLog 17128 SHA256 5ec78691ce7b349cb7f61ec5ab47af71755f8d785b12c65a474960391614275f SHA512 d824d220a3e113bc722a254a72f8537db173dfacf53d0847e28219e4e093bce78c8bd5172ee67e8ea36a019300f8611dbe1e4cabbd81bc992a7f034335db4439 WHIRLPOOL 99709de104d45c140a3b27224d967b56e9ae233e1cc80517fadb3df1fcb29d478720d2eb63adb902b329f16800e58b26e08c045026dab89f6a51c9d079b99c15
+MISC ChangeLog 17258 SHA256 b574ea9994d42273fc95bf7496d32f46128ce3297f875c8f5aef373a95024ada SHA512 938949eb8bae002dfb1394c8eec63c4cf8027b16dba8fb72ef55e3997c13cbb6ce60a02309395d1cb556509f4506bd56bd43263a3946406c89f3d874043e88c6 WHIRLPOOL f02df18f1cb8b06c0e4c8e49fffea5d9f8bba9e9e6bbc9b5fd6b10b444a200103a26ba8144361b4abd145f32edcfc9a5b46afe0313806cad51b5127d10253640
MISC metadata.xml 161 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1 SHA512 425caf0160f1410ce7bf1d4639020be7f6335152c339edbce80676bff4166f1cab3ae9e13161c47b98dc00741dab3bfa45e9572a3314844476e480f5c2b58d7d WHIRLPOOL ad7cdd3352dbc12cb4181fb5d63b5aee5ce3a151b975c12a96c4a5c91f751736d27282ad22633c7e768230266bce5d17947735d33ef5c5c2341c3f9435b9ebb0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)
-iQEcBAEBCAAGBQJR+mjaAAoJEEdUh39IaPFNoQsH/02j+30L8tDdTGtNVTPYF1Id
-KVLFcsjubpNTPzfUH76HnHKktk8kAKVoSJNIIjv2QvU1QLDVjhaNyEfP/Pp/I+km
-85HiUbRz/BWCv/YLA4/Z6m5JjXo9wWyGYApylJdyXD2vI7GIp1j1BIRE1Fv8mz1A
-y5XlruTE6qNVlDytc9xrlFW+vyghlxfrSN84HLuVw0AizxDdAh1Mc56iMyUG+paR
-R1ODHFHIQTpQB25Zzcl+qYwCsVTv30zVbWdqsAkZlP0xxkNrs1+w4YmmjhhoN6v4
-K7O1uyQZxUuboWmqKvNb5iNjvI9iV9UhdrmLIFMHX0KNiFp3SWeAWGAq96HliGU=
-=wV0Q
+iEYEAREIAAYFAlH6gvgACgkQvFcC4BYPU0pABACeL5+eJHllEbGa4QQWlG3lEAZs
+X+cAn2DnRwxclDPGAXx7UBQDpRguaWNp
+=ddLh
-----END PGP SIGNATURE-----
diff --git a/media-libs/jpeg/jpeg-6b-r10.ebuild b/media-libs/jpeg/jpeg-6b-r10.ebuild
index 2ab3c656b45e..ac81eb7a0592 100644
--- a/media-libs/jpeg/jpeg-6b-r10.ebuild
+++ b/media-libs/jpeg/jpeg-6b-r10.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/media-libs/jpeg/jpeg-6b-r10.ebuild,v 1.1 2013/08/01 13:57:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-6b-r10.ebuild,v 1.2 2013/08/01 15:47:03 aballier Exp $
EAPI=5
@@ -18,6 +18,8 @@ LICENSE="IJG"
SLOT="62"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE=""
+RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r4
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
DOCS=""