summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemi Cardona <remi@gentoo.org>2015-01-08 00:15:54 +0000
committerRemi Cardona <remi@gentoo.org>2015-01-08 00:15:54 +0000
commit6dc7866122e2a08e03b3930ad98b3eef52becbf2 (patch)
treeafff9b6b03a3ac17a07da5d484b67b5d59325659 /media-libs
parentVersion bump (diff)
downloadhistorical-6dc7866122e2a08e03b3930ad98b3eef52becbf2.tar.gz
historical-6dc7866122e2a08e03b3930ad98b3eef52becbf2.tar.bz2
historical-6dc7866122e2a08e03b3930ad98b3eef52becbf2.zip
media-libs/libjpeg-turbo: fix build with non-bash /bin/sh
Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x901AB08A
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/libjpeg-turbo/ChangeLog8
-rw-r--r--media-libs/libjpeg-turbo/Manifest23
-rw-r--r--media-libs/libjpeg-turbo/libjpeg-turbo-1.3.1-r1.ebuild13
3 files changed, 16 insertions, 28 deletions
diff --git a/media-libs/libjpeg-turbo/ChangeLog b/media-libs/libjpeg-turbo/ChangeLog
index 70a4aa414512..2c3db57934c5 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.100 2014/12/17 14:47:55 kensington Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.101 2015/01/08 00:15:53 remi Exp $
+
+ 08 Jan 2015; Rémi Cardona <remi@gentoo.org> libjpeg-turbo-1.3.1-r1.ebuild:
+ Always run eautoreconf to generate a non-bash compatible configure script
+ (epunt_cxx is no longer needed with recent autoconf), see bug #533902.
*libjpeg-turbo-1.3.1-r1 (17 Dec 2014)
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index ba8f127acedb..f458e52ff48f 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -10,25 +10,14 @@ DIST libjpeg-turbo-1.3.1.tar.gz 1390282 SHA256 c132907417ddc40ed552fe53d6b91d5fe
DIST libjpeg8_8d-1.debian.tar.gz 13676 SHA256 70ec6689b0ad85739802cf3ebbdcc12ea01e21edd8f931c614b25b44cf199057 SHA512 7def4f13524f0af3b9adf35a370027a18f43b9a635f56a17d5bb7883370db8b18b8a12737d0f0cb4b0287ccf8fb474eb5f754de6b398ffe7d522c54e5bf68040 WHIRLPOOL 94526c31d401eb14c9bf0f7115e13a27886ad58863e25d6653eba2b2f5ef260ec272368d2b9d9934bd75b1e5b5f1afc97230e540248efc24d6e85e5680399d27
DIST libjpeg8_8d-2.debian.tar.gz 14764 SHA256 9b36468b2aba24d63d3c87625de89f31834ac429e6dec7d68d86a52b5110219c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675 WHIRLPOOL bda41c37f3f57733fcd86969126f6dbede2fbf633b0168265a7fe353fb7f3cd995a94e7987bac472957ec6fb0b2dc34d5dd646f0de79e06bc94e59d7cf440939
EBUILD libjpeg-turbo-1.3.0-r3.ebuild 3166 SHA256 d2658a5ed6c87f1ca4ff939198f3b36f129a6be28c855db91b7930a0b82c20e9 SHA512 9e89708eddbdf5c70d70395c3ddab8aee776ea28fc6f18f98e2755ac12dd85467f872b3b5a89fa462f4990a8f718d864d628ae00b3577e614cc8fedcfad78f2c WHIRLPOOL 0fb19a29ec010cd3c6a9eeb5200e3495268ed4a0fa9124b352a1fb05ec2bda4699155944d7af0b100fab53d8b5a5db231311b89825d0c9f21bae5e2111908ed6
-EBUILD libjpeg-turbo-1.3.1-r1.ebuild 3229 SHA256 6ef16eef90313389e8b319e06c05ca38f0f676dfe88987b62430d8e6df797858 SHA512 6fe53f4232cec34a29f14786468079863ddcadba1a70f096f8f26bf72344b6d93d6f24a8e16f9b8719e85dda0c7e31536c8ab284d853202c058be0b1926d3648 WHIRLPOOL 8e28f1c16419edb0f03d4d6621a0f7e553bff35a1359e4fd0448dc390dc250b5df6711eacc8daac4d38c000aff7c0f8c14b7d9b09936e9d85afb4c1356600bfc
+EBUILD libjpeg-turbo-1.3.1-r1.ebuild 3218 SHA256 84e7b7a04d282c8443e2f205fd857b645f66f66e030f4cb9f44f64930dff09b6 SHA512 df89aea579886015860fbf12bb9741a78eb8ce870d0f0732c8daceeaaa771546caca31ea672cedb5ce94ec7652dc14bd57ececcb2f4259a97aa7d7d10f7d9407 WHIRLPOOL c97b98773c3b9898622ab294b2050e347d9a5da90bd6a939bb9245bd795be44eeb280f20c32fa14afd2e1ce05d5101e25993787b0489f2ca4fcd02c7b64c90ac
EBUILD libjpeg-turbo-1.3.1.ebuild 3113 SHA256 e9a62cdd14d42c531d22f81ce08cce3df527d65d08455a2f2572a0599031ae1c SHA512 5848aecc33e897b5ccfecbf171a3f9ec2343c38747dc2b86432ccb5df4a2bd9717d443c56b312b620ede94638458a94ba563be5decfa84904f1144a642156bcd WHIRLPOOL 32199f6f760e8504c6e3e5b115a40e6432ac6c3b4b9f9df5eb2b876b41c1fa04196de7e98657fc211a0c15981053cdbb55f55ad714ddbac2b3a5834e18141c27
-MISC ChangeLog 14449 SHA256 b5f1a53a153310157dab1aa53b3378d6834d1985fa7cef42f710a685f2380b23 SHA512 51b60894e6d897ecdc53bd84f3572389043287a82e1a3d525146208e6260d548c6c86b95ba9f353a5b8aaaabbe8f529a41660cf0545c21ffa7a9d2e05cc57f6a WHIRLPOOL fb5a8ed619c3d81b348d57b2a30bd5a309d1417c86092e4b22d9dc69826d8f6e66680d6b2a0a29112235ffe5f0e331c5c085bc1e4f20769e4c50d01b4a737614
+MISC ChangeLog 14671 SHA256 52ac605cf85091166aef195ffe5bf3e7b0e1ee8eeca259a8ecf63df34cbf21ab SHA512 18fa5d3d9bcde1a6043d12acce13df0d7ff8ffd19e5c90bfd5562c7faf19ba3b5a34d25839ad8fe0811c4a695833b5d471d45529866e948fc03cbf3b97f22587 WHIRLPOOL 30882d2f16bfe09275d3fda03214beb3db13a46c873490c313fc46aa8cbc44516f8e709c81174b845003da1a2866c17b9c2338b7866a3577f9ff175634067867
MISC metadata.xml 367 SHA256 6b8c81649360de8af20a434749d90a9ee689026f959c814e22dac83513c5b0d4 SHA512 0dc1a5f70e560471119207724bc0015d1ae6b80c7da5d2305479b681ae9dca487dc0a58b5db45cc033d3c12ec997902b1c42c664efbfdff8cf3e1570259d0835 WHIRLPOOL 5686f917bfedc7f73923a18e99e8fa64eadda2cbe476d8b6c527be83f283acad01e0fedb5d4c9deb1dbf4f21538b69b3446db3304af782fb76e4b009c6bd3822
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
-iQJiBAEBCABMBQJUkZeuRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7NXAEACFwB9aISd4M2kDXvCaxHSWrRxG8J/mfv5wQdA+NHExY3AP59BB7hmNphJD
-clzOnquPFh01M+u7/pdkW+4m6v+gpxxnmrkv7QkgdQ5M+56+SVWMIN4hibNSFmj5
-pYjDpaoy2FMhbgZqvo7xfTxyKRFYz+M93/yVhyFnyDgv3pNtJmRw+ExyyoAcLlRI
-4SektONXTw+R6h8Pz3RvYAGAzOXiVudJ6ws39fXkmwa5N0qLQuxGYCKNtUEVTH66
-QnoQbrnM0btacEQIPSEH8xl8CYahbDAFDYHtYxCryqsjLIGxrL6iOZs1ghQ39qE1
-TXNUubvw9Uv92IkaF4WWBW2dF4eUPGBpWK3Q1kXaaLNvGdgQJs3L85VRTh9MrK70
-z2eoBp66XfDztnJeFbJWe4xLEyEgDEWTzAccYJGlLrDw/fniiV2hjGh61ztg9OZZ
-1BuUszq1dMaKN93/HIQ9i+l8uKseZT9OFGN7F/ZA4PGvQoj345As5Up0qasoq6HJ
-iTFAdf3bP16cNV/RGSmgN1VOSBZrKZUbBWKXu6OUKaslfjqI0HFWGIW/sz6olgMc
-6hI8/65019aTsVewdnoAK96czsGaMNH0iT9cOVvL1Un5fDBUfn59Vd4nhJTF8ul4
-bmSHQTq5b0i8rcWKzmmvaS1v9/Kz5SNQ2peIO0XK7wcAcXpRKA==
-=H1Xx
+iEYEAREIAAYFAlStzDoACgkQfUU/I5AasIoNlwCfYO2u+cURMFTmZPV0BXnhj76Q
+/nYAoMM5O4xLnQvXu9IEMNVfme2p3rC0
+=8NWh
-----END PGP SIGNATURE-----
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.1-r1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.1-r1.ebuild
index 13986dc37117..90618533ff37 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.1-r1.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.1-r1.ebuild,v 1.1 2014/12/17 14:47:55 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.1-r1.ebuild,v 1.2 2015/01/08 00:15:53 remi Exp $
EAPI=5
@@ -40,13 +40,8 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-1.3.1-jstdhuff.patch
epatch "${FILESDIR}"/${PN}-1.3.1-overrun.patch
- if [[ -x ./configure ]]; then
- elibtoolize
- else
- eautoreconf
- fi
-
- epunt_cxx #424689
+ # generate a new ./configure compatible with non-bash shells, #533902
+ eautoreconf
java-pkg-opt-2_src_prepare
}