summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-07-30 08:06:05 +0000
committerMike Frysinger <vapier@gentoo.org>2015-07-30 08:06:05 +0000
commit29e15f2827ab4d14489f9587f3412cd98e0e23e2 (patch)
tree1f3dfa27bfc2313fe5dc2f3b68fde5cced5115fc /media-libs
parentKeep and package batik-all.jar so that other ebuilds can potentially make use... (diff)
downloadhistorical-29e15f2827ab4d14489f9587f3412cd98e0e23e2.tar.gz
historical-29e15f2827ab4d14489f9587f3412cd98e0e23e2.tar.bz2
historical-29e15f2827ab4d14489f9587f3412cd98e0e23e2.zip
Set CONFIG_SHELL directly instead of regenerating autotools as it will be faster and less flaky (like libtool version mismatches) #533902 by Rémi Cardona.
Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0xD2E96200
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/libjpeg-turbo/ChangeLog7
-rw-r--r--media-libs/libjpeg-turbo/Manifest20
-rw-r--r--media-libs/libjpeg-turbo/libjpeg-turbo-1.4.1.ebuild9
3 files changed, 26 insertions, 10 deletions
diff --git a/media-libs/libjpeg-turbo/ChangeLog b/media-libs/libjpeg-turbo/ChangeLog
index 944cff342943..e5b175eef676 100644
--- a/media-libs/libjpeg-turbo/ChangeLog
+++ b/media-libs/libjpeg-turbo/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-libs/libjpeg-turbo
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.106 2015/07/18 15:52:01 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.107 2015/07/30 08:06:04 vapier Exp $
+
+ 30 Jul 2015; Mike Frysinger <vapier@gentoo.org> libjpeg-turbo-1.4.1.ebuild:
+ Set CONFIG_SHELL directly instead of regenerating autotools as it will be
+ faster and less flaky (like libtool version mismatches) #533902 by Rémi
+ Cardona.
*libjpeg-turbo-1.4.1 (18 Jul 2015)
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 93db8e04fe47..9f2b3817715d 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -15,13 +15,23 @@ EBUILD libjpeg-turbo-1.3.0-r3.ebuild 3166 SHA256 d2658a5ed6c87f1ca4ff939198f3b36
EBUILD libjpeg-turbo-1.3.1-r1.ebuild 3218 SHA256 84e7b7a04d282c8443e2f205fd857b645f66f66e030f4cb9f44f64930dff09b6 SHA512 df89aea579886015860fbf12bb9741a78eb8ce870d0f0732c8daceeaaa771546caca31ea672cedb5ce94ec7652dc14bd57ececcb2f4259a97aa7d7d10f7d9407 WHIRLPOOL c97b98773c3b9898622ab294b2050e347d9a5da90bd6a939bb9245bd795be44eeb280f20c32fa14afd2e1ce05d5101e25993787b0489f2ca4fcd02c7b64c90ac
EBUILD libjpeg-turbo-1.3.1.ebuild 3112 SHA256 0e75b30674263e07fbc5a0948d99e81402df49ce36a6a86f6ac9ed45214752bf SHA512 d2f2ac4a8791b64a035d3b539ff77b2248cd982ca8e6265960d477ffec84c7646c4b80b0741be0f4a364707488b4a85575d5e7c9d0da4639345decb3bc30a4d1 WHIRLPOOL 4f0915e5c4e0e5b213f2a66ff4908a0c4303d2fe0378313aebb70ae213df9b743273cd0ad1571b4e456760b855aa72d319d80a1c5645550673ee0c5af9ee64eb
EBUILD libjpeg-turbo-1.4.0.ebuild 3102 SHA256 2bdc934605a91af1b45a3c3d81a7996be00875bfe5bd07729b943da6caa174f8 SHA512 a49334bea2c5379da7976c69b64f2711c1bc4d23ed751702e684995c8f08de5c9b3cdb02a1d14c3f4cb0b6209f192294d0b328ab51107c5477bb29f71423da80 WHIRLPOOL 896f864eeb31e20ee632bd4471c2d062442b558bcec388ae88386533f3758bf69a7777a3a5c94bccadaf0732fdd3b658b0bf2c574df1c0e2b2e4f0e781a95b21
-EBUILD libjpeg-turbo-1.4.1.ebuild 3096 SHA256 740c8417446060f70ce2773201fb7f9d5eec6afa58163839c9c39bb42ab00ca5 SHA512 b0289067ebf4907342a3599a56850915d35b21b36d6ef42abd7887d2236dc0ca4afbbdab7df36da610bdfd31ac8ccfa146d8e3d79143991832cab43231831d89 WHIRLPOOL 525f3a752f4f8f96f9e37d49c57d5700b8374fc064fd06cb8657057ad421e5312524f3f82e418e6813ff0d70b0cc3b1501c391e7f21ea2685dbfb619967e0b66
-MISC ChangeLog 15322 SHA256 168b0fd7bf92c75aa5ae9bd962a34bb22a94270c1e343c146deb6dbefec94a15 SHA512 9e19b14d54997c3aedbef606590e6b2f094d0772d9b515cede80c8fb3e407f597e8d0b47769ad0ee8db071c282424e9bc2c4a220ba87925df2ac9f2da263d01d WHIRLPOOL 8b33562e83b2b9acf064e767b9e4d1513fc54ab30c7c43a7583b5dad31bf0df2dee803fcbad0b51dfc1d53730cf59caf388e636797a4eeb121cd219da01b7b82
+EBUILD libjpeg-turbo-1.4.1.ebuild 3116 SHA256 f82b96d4b5a9a714fd2a7968e7729fe13df1cf918e79996cbc4cb43a94d44203 SHA512 66a574ab2be8944b4a064ab7436a7a9f63e890109e2631e29396733a34190be68ac404bcd3b0e322c7454817d519e8fd7b22eb8e40179ca979fcb4fad0f46832 WHIRLPOOL 344c4d67808acdcb137a04a7dcd507376029775c3cfd3a3af4239e41bd158ac1fb067334e2a9f0b45ef1e3007413ce9de7e8fd234a7f243e85125072691156a3
+MISC ChangeLog 15563 SHA256 4b26f85d95e968cbe633ce71e86e29d285251f700ea1dcaa0f7a61dc37039438 SHA512 6755d1cdef54a317378dd091d1e9bb815044d54e81da64e78a826932ebf7fa70e627f31b395949ec4b5d30424f1529346488cfe16e0a8493cbaf3d10b8acda44 WHIRLPOOL 798e89f559d7f4482b773399e9e0806affc523b49d77683457ae860ba61d109427d0284ab63cdbfe1744770ebb3cc289ac995ce7735e9eb32fbfdb983a4574bc
MISC metadata.xml 454 SHA256 ad6a7f81f3498f65c072b43467674fe43e5cc578cb632f3982a4e60e4dad6b40 SHA512 c6173b6680e213fc41c656d32f909832df8a09244b89b4dc4fd503b452da49ead2119f4dd8585fe6ee8ac50efe88367c61026e2be983ece5fe92b3480bb068e0 WHIRLPOOL ae99811e02b7eddc2c7862efd746eb036cd01709f63171b4e39c2618c5f9a6dacb071d4bdaa4f72b58e2933aa849d642de93f717f570e39c2702bf3cb85ca24f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iEYEAREIAAYFAlWqdjgACgkQkKaRLQcq0GK/EgCfTctxsG8Nfi0aS+QD/4Bp5/dF
-798Anie7fWUIKxf7gfFkdj95zaFtkJWM
-=BJZP
+iQIcBAEBCAAGBQJVudrxAAoJEPGu1DbS6WIA+/AP/jRUEa6TQkm1dpKWgZD5jwj9
+s2QFrAwl6AhcFQEnA1HVtffcaWp2pxerNW/qZ3bqUkEr11Dr2Ag9/ZUn/jt/YajL
+YXSC1EdfrFzetBtRs4zXhuc900RfVRkPs2LcOEbFyriE9fBOND3piLr3h8o91xT3
+B9JZ7Sxgu6Gx9xo8VdBosKnORnOaZKXwTu0VqcF9znPF24YV6J1tdBbunVqVgU9D
+b9g5iY0XgjyfrkjkI0w/sIjCl3q/rGTDsh/c+L6OhjhjKBePRqNQZ8RHzR1EqL1o
+ngCRsU44a5Icl84YS8hdJmKUCk2JLCbX+zijUlwLhJtNzZEmG8jgrqJnpfRrs1yY
+2bcek+jpH80LokfXKUTqZsHKTEoqdeoxiejkzS8SPBowZG+j/ZGhO9Os1AP+kvHR
+lp4H0DP0erM40eRs+vvZogWzPgtGmNaOTndnCNDqoM7ILA6Yge+n+5ltwiV6DSkt
+yz39f1ZwNFkmRhepI04MLHeTI96tk60DAoSxL/w4CdYkMw4i1kPaVOk0lZ2HbO5J
+ak6Otpq974lXBjpRe+MdXgxpfvsjUiR3buBXDgXLkvvkRf2lfib9IZe3ZjyNxpN9
+fxAjoU9JwSl2rwa0XuFFrAXa03RkRNHQ6sadt+hfd7jUNA9jsN8uiX8p37TRt5eP
+s23uoezlwCJUQO5hBLbq
+=3Cko
-----END PGP SIGNATURE-----
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.1.ebuild
index a4086aad0395..c2dd9272c2cc 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.1.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.1.ebuild
@@ -1,10 +1,10 @@
# 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.4.1.ebuild,v 1.1 2015/07/18 15:52:01 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.1.ebuild,v 1.2 2015/07/30 08:06:04 vapier Exp $
EAPI=5
-inherit autotools eutils java-pkg-opt-2 libtool toolchain-funcs multilib-minimal
+inherit libtool eutils java-pkg-opt-2 libtool toolchain-funcs multilib-minimal
DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
HOMEPAGE="http://libjpeg-turbo.virtualgl.org/ http://sourceforge.net/projects/libjpeg-turbo/"
@@ -38,8 +38,7 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.2.0-x32.patch #420239
- # generate a new ./configure compatible with non-bash shells, #533902
- eautoreconf
+ elibtoolize
java-pkg-opt-2_src_prepare
}
@@ -57,6 +56,8 @@ multilib_src_configure() {
fi
[[ ${ABI} == "x32" ]] && myconf+=( --without-simd ) #420239
+ # Force /bin/bash until upstream generates a new version. #533902
+ CONFIG_SHELL=/bin/bash \
ECONF_SOURCE=${S} \
econf \
$(use_enable static-libs static) \