diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-07-31 16:10:57 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-07-31 16:10:57 +0000 |
| commit | 6dff4ed2fdf0a698b6efee8d75f0d1701a84c51c (patch) | |
| tree | 9c3dc9302149328bb38a33cddc0800adfffa6345 /media-libs/libjpeg-turbo | |
| parent | Unmask system-ffmpeg USE flag for www-client/chromium now that there is a sta... (diff) | |
| download | historical-6dff4ed2fdf0a698b6efee8d75f0d1701a84c51c.tar.gz historical-6dff4ed2fdf0a698b6efee8d75f0d1701a84c51c.tar.bz2 historical-6dff4ed2fdf0a698b6efee8d75f0d1701a84c51c.zip | |
add the blocker on emul-linux so that it is stacked for baselibs -r4
Package-Manager: portage-2.2.0_alpha191/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A
Diffstat (limited to 'media-libs/libjpeg-turbo')
| -rw-r--r-- | media-libs/libjpeg-turbo/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libjpeg-turbo/Manifest | 14 | ||||
| -rw-r--r-- | media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild | 6 |
3 files changed, 14 insertions, 12 deletions
diff --git a/media-libs/libjpeg-turbo/ChangeLog b/media-libs/libjpeg-turbo/ChangeLog index c10f6e4e7464..f115859bd6a1 100644 --- a/media-libs/libjpeg-turbo/ChangeLog +++ b/media-libs/libjpeg-turbo/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libjpeg-turbo # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.62 2013/07/31 10:07:13 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.63 2013/07/31 16:07:28 aballier Exp $ + + 31 Jul 2013; Alexis Ballier <aballier@gentoo.org> + libjpeg-turbo-1.3.0-r1.ebuild: + add the blocker on emul-linux so that it is stacked for baselibs -r4 31 Jul 2013; Samuli Suominen <ssuominen@gentoo.org> libjpeg-turbo-1.3.0-r1.ebuild: diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest index c06ffa483032..52f8a387a088 100644 --- a/media-libs/libjpeg-turbo/Manifest +++ b/media-libs/libjpeg-turbo/Manifest @@ -8,18 +8,14 @@ DIST libjpeg-turbo-1.3.0.tar.gz 1361603 SHA256 2657008cfc08aadbaca065bd9f8964b8a DIST libjpeg8_8d-1.debian.tar.gz 13676 SHA256 70ec6689b0ad85739802cf3ebbdcc12ea01e21edd8f931c614b25b44cf199057 SHA512 7def4f13524f0af3b9adf35a370027a18f43b9a635f56a17d5bb7883370db8b18b8a12737d0f0cb4b0287ccf8fb474eb5f754de6b398ffe7d522c54e5bf68040 WHIRLPOOL 94526c31d401eb14c9bf0f7115e13a27886ad58863e25d6653eba2b2f5ef260ec272368d2b9d9934bd75b1e5b5f1afc97230e540248efc24d6e85e5680399d27 EBUILD libjpeg-turbo-1.2.1.ebuild 2889 SHA256 298967f7a84c7426d48e6ae9a4c1455c5d7f83a0119a74a21c0ce189593daa17 SHA512 840fb7c42ce77f77074571b5b999bc328ec0957680b1528d8177dee72ad33cdcd12087093f2b4d1e204f3cf5896706b43e906d70f71477659b5a4a42fe74e309 WHIRLPOOL a9b0908eaa1d63c077d2dca8a5116a1d9c7e5baf91edccdcd3fc88d3d8458b62f765a48ee4936708c3cf3b6e801cc09aedc50cfa0aa27bb952c2b27f32ce0e40 EBUILD libjpeg-turbo-1.2.90.ebuild 2904 SHA256 d39e74705d97a0a33b67c8dde2863b54e831b1917fb2a334693c02433c3c167c SHA512 8c9a264dacaf530768c1859b9f8a1a4b1b16fb4621b55d6b6838e2426c6bc281d05c25f74176637c018a674c06b82301a246bdd4cd3f67e282c6bdc57eea38d9 WHIRLPOOL 53fb002f1b9da95e7979ce7877f471f7e6a0d57c98d12eda8cb235872ae6a2f872df2ea2137bd2d817de4947c27d4fde19d20cb51540e39874d5aa44c3be0968 -EBUILD libjpeg-turbo-1.3.0-r1.ebuild 3155 SHA256 1c21f4c9903ddcec3b8cf5a987c0dbac92cdf980086c934e0a503790e836b0d1 SHA512 563efabdbcd09f8611dfab0ceb4b7669442b20cb60feda8d64454ef29b61a8bd7bcf1820c84e60c630ee8ed57487c2fed10438ddb35ddcd1e7dfb22f53652b28 WHIRLPOOL ac6e6d0a8bafd86b05379cf351078d574914b41ffe0dc30445983a8e2d98df094d69153ce3bae2ac2265df191b9b40a95de5faeda09cb3ba175602e9ef48742b +EBUILD libjpeg-turbo-1.3.0-r1.ebuild 3281 SHA256 af32bb4145a20db260f2fe75f24c3ec15092b9ee75fad4c62af2d1581b36b6d2 SHA512 490869f7aed5ec2cbd9bb518274776b57cb3a4cf104faf105d1fe83e2e505c9921031a2d6d6b7e30f157b6b5ed9f7f5667e953f3f06b9bd4d18a474599791cf8 WHIRLPOOL 5f5e59fd231d6a30cb798766573805551e7164ef833222a0b3fbc0fbc9e3ad073e7f5295e2736952d3f111efed2be19dc071be46e9689840c12a414961971754 EBUILD libjpeg-turbo-1.3.0.ebuild 2903 SHA256 a1642943dcdb52ba4960b06f222f299262012b3e98c77069fe41a9d5bf320599 SHA512 963766cdb1b807dcde0a1dd70dfee47dea67db83d027ba0e826591c0eb362d98dcc379b50e6ddb0c6ff25d603d8e84f02cb5616378ac004bc8ec0c2f8c623bdf WHIRLPOOL 45939a2fef5371bc59bc15b9dc82fdb4d6a8a6708dac06f6535a96118477cf25fb1515c38a817c69e692295ec59be6890ada7d136af86ea6fbad4ddbf6970927 -MISC ChangeLog 9341 SHA256 b682f177018749e1111dbaada52e7b115ff98d8ca5e7b1d47fb0f4527952e61e SHA512 86cfa7f37aea51063fca8e53d43213a71308c6046d309d7988359ebd1440571b337b261cc2461c7e417b4812346e6e9c4487796b453b1a7c67c11726cb570f5b WHIRLPOOL 1d59952ae1c6b47280e08d86758ff5773dc2a5a65f52c7676561ee8716fb94fed721499fee63b68a64863685fd593d97009c0bd4fdaefdce892ad3a3eb684b64 +MISC ChangeLog 9497 SHA256 f1271fe68cf3c513e8c5525aad8acc7e9a7765f1d28f21988c1004871851e879 SHA512 a8788abfea58c7e058e2e958821f1d968938e4aa7a341a94d9910883988b1ac230858741ab6c3ac03bc3f4256b8ca6e7773d7ad1d64833e9e15ae204f53dbf50 WHIRLPOOL 8e6326341bf356f4feea29aba70d7cc215b0c9a3db04fac3447e708a9f6656cb40eb9c9169c9110ad8e7ac75555a1bae3b3477e5f4e00afc96420ca8c204fce2 MISC metadata.xml 367 SHA256 6b8c81649360de8af20a434749d90a9ee689026f959c814e22dac83513c5b0d4 SHA512 0dc1a5f70e560471119207724bc0015d1ae6b80c7da5d2305479b681ae9dca487dc0a58b5db45cc033d3c12ec997902b1c42c664efbfdff8cf3e1570259d0835 WHIRLPOOL 5686f917bfedc7f73923a18e99e8fa64eadda2cbe476d8b6c527be83f283acad01e0fedb5d4c9deb1dbf4f21538b69b3446db3304af782fb76e4b009c6bd3822 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) -iQEcBAEBCAAGBQJR+OGBAAoJEEdUh39IaPFNDsEIAIHAQFc/MgsZvI8mcMrx7aFs -p9KQ+God3c3sO+SntbilhQgy+LNTyx2+vdpc181zxA9EYjg9XT72moYnWe47ODZq -k+N/9wIaGkU6ggPLgc2MLifDGGX+0al4s4sbyCi1ph97LFBg9TkHUqcvQpNNC+8r -3+9TXAfL526XIeVXKnG3oBrPxlgfe6E+DsAENWkgaoLM7F78vuQtO4kygxQ9Fc56 -TzppxelI5A4IlZWaSaVHLe6uCVWLLzByF3PHAfDMLHX1f60qM3bUQ+pR7nQk+pS8 -qaCoFQ1TUc+Qimc6Pxc94UfaDCho31/Qz7Cfku2yMuj7X998mfZNmfebGY+Pud0= -=TEGZ +iEYEAREIAAYFAlH5NkIACgkQvFcC4BYPU0o2ggCgnLjm9NUIWZDQWlGHEJxYvnem +T3cAoIr5GNRfhZOCegwgYXZhkZikRFs9 +=6T63 -----END PGP SIGNATURE----- diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild index dc58d79a1db7..e8a16049dcf1 100644 --- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild +++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-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/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild,v 1.2 2013/07/31 10:07:13 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild,v 1.3 2013/07/31 16:07:28 aballier Exp $ EAPI=5 @@ -28,7 +28,9 @@ IUSE="java static-libs" ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )" COMMON_DEPEND="!media-libs/jpeg:0" RDEPEND="${COMMON_DEPEND} - java? ( >=virtual/jre-1.5 )" + java? ( >=virtual/jre-1.5 ) + abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r3 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" DEPEND="${COMMON_DEPEND} amd64? ( ${ASM_DEPEND} ) x86? ( ${ASM_DEPEND} ) |