version bump for #536250, approved by ssuominen

Package-Manager: portage-2.2.16/cvs/Linux x86_64
Manifest-Sign-Key: 0x30C46538

3 files changed, 128 insertions, 5 deletions

diff --git a/media-libs/libjpeg-turbo/ChangeLog b/media-libs/libjpeg-turbo/ChangeLog
index 2c3db57934c5..c3ae6f8268a5 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.101 2015/01/08 00:15:53 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.102 2015/02/09 17:02:11 williamh Exp $
+
+*libjpeg-turbo-1.4.0 (09 Feb 2015)
+
+  09 Feb 2015; William Hubbs <williamh@gentoo.org> +libjpeg-turbo-1.4.0.ebuild:
+  version bump for #536250, approved by ssuominen
 
   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
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index f458e52ff48f..c6278e241d57 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -7,17 +7,19 @@ AUX libjpeg-turbo-1.3.1-jstdhuff.patch 11750 SHA256 a787c3768e11ca3287c36f87860c
 AUX libjpeg-turbo-1.3.1-overrun.patch 876 SHA256 7521a75d9cd9b054b2a9e69098e5a1a903fdee56a43964275c4c5f5598246d85 SHA512 727c981988d13740fb14617e189e4d7bec423f06a186f4d41f47d48e4cb6679edae62e9bcf79ba1a169e9bbf374f69f82cf4415ed00abbb5d8cf19489dd32113 WHIRLPOOL efaba4a00fee68b9e059cd1e6d8f8efb8b3a03da7c74a597403ce472e4e0f7f4653fb61610d03cc3011e3f4112778096ad87ef5f019e35410a6b438a98c615ae
 DIST libjpeg-turbo-1.3.0.tar.gz 1361603 SHA256 2657008cfc08aadbaca065bd9f8964b8a2c0abd03e73da5b5f09c1216be31234 SHA512 4d34c3c5f2cdd70b2a3d1b55eeb4ce59cb3d4b8d22bb6d43c2ec844b7eb5685b55a9b1b46ad2bc5f2756b5f5535ccad032791c3b932af9c1efc502aa5e701053 WHIRLPOOL 13c1366b9bef87cab42c88f75d1ff7eddb4ea745e0056154f1f3fb27deedee077d662395bada3bd5c18d6f8bf744d0b1f3d465967d33b453ea2acc327a6f166f
 DIST libjpeg-turbo-1.3.1.tar.gz 1390282 SHA256 c132907417ddc40ed552fe53d6b91d5fecbb14a356a60ddc7ea50d6be9666fb9 SHA512 6b02dc617e291b357230ef3e8cfcd27f9acc8c3e9f1c869ab0a08e9e13711b87156c6cd1aaa1a6406a873fc6732f44c8a7d94a5d6688d24b14ac63a96ee52081 WHIRLPOOL f978b24d0a4e63a421822c2114c0cfc87cbc1dedd648ddc2e97e24ee19dc5584433b1da7d41a64f0ae37b50799a273165aaec6f1377ed35a7971dbe8a0b6a8d5
+DIST libjpeg-turbo-1.4.0.tar.gz 1524645 SHA256 d93ad8546b510244f863b39b4c0da0fa4c0d53a77b61a8a3880f258c232bbbee SHA512 60d038413acee43a23bb81d18309eed16e771d48b839b7aea52f582bbf9f99f04b3cc991e13cafc3d5df1441b726ea0792e7ad593ce4e52c96792c3b1df42c09 WHIRLPOOL 5f6c15bee87d9f9b82013801a8c6cd42c725ba4d65c0d60f990d4d0aec3c0b9334a5be832b34ae71d8606c801fc621de965c17b8b3067f7eef061f0155cbaa19
 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 3218 SHA256 84e7b7a04d282c8443e2f205fd857b645f66f66e030f4cb9f44f64930dff09b6 SHA512 df89aea579886015860fbf12bb9741a78eb8ce870d0f0732c8daceeaaa771546caca31ea672cedb5ce94ec7652dc14bd57ececcb2f4259a97aa7d7d10f7d9407 WHIRLPOOL c97b98773c3b9898622ab294b2050e347d9a5da90bd6a939bb9245bd795be44eeb280f20c32fa14afd2e1ce05d5101e25993787b0489f2ca4fcd02c7b64c90ac
 EBUILD libjpeg-turbo-1.3.1.ebuild 3113 SHA256 e9a62cdd14d42c531d22f81ce08cce3df527d65d08455a2f2572a0599031ae1c SHA512 5848aecc33e897b5ccfecbf171a3f9ec2343c38747dc2b86432ccb5df4a2bd9717d443c56b312b620ede94638458a94ba563be5decfa84904f1144a642156bcd WHIRLPOOL 32199f6f760e8504c6e3e5b115a40e6432ac6c3b4b9f9df5eb2b876b41c1fa04196de7e98657fc211a0c15981053cdbb55f55ad714ddbac2b3a5834e18141c27
-MISC ChangeLog 14671 SHA256 52ac605cf85091166aef195ffe5bf3e7b0e1ee8eeca259a8ecf63df34cbf21ab SHA512 18fa5d3d9bcde1a6043d12acce13df0d7ff8ffd19e5c90bfd5562c7faf19ba3b5a34d25839ad8fe0811c4a695833b5d471d45529866e948fc03cbf3b97f22587 WHIRLPOOL 30882d2f16bfe09275d3fda03214beb3db13a46c873490c313fc46aa8cbc44516f8e709c81174b845003da1a2866c17b9c2338b7866a3577f9ff175634067867
+EBUILD libjpeg-turbo-1.4.0.ebuild 3094 SHA256 5dc5551ff4dde1bf1e08a359c70b416717a0c1996dd2e0ece9254820b6031b34 SHA512 bc371514d45e77208d8cb17d56d936a6d2f281e29faf3f88d424e57015d12be625256de4fbd473c0cf5273c1a52566bbf7f8221bb58d2c02374a6907b2839286 WHIRLPOOL be44b556366982ee3915bd4d62ce9f474272d4c837b9540b07739cccf35fa01c0315d1a5ca0a66445137e368a7a4f58bfa92bc7c1acf028d2b512d543d42a4b5
+MISC ChangeLog 14842 SHA256 f67209ef78240a206629fd17dd4db1396c02db2423ec179167d4b3884516e211 SHA512 da61b23cf43c61afae71f512a8879d8ebf7d0de2a74642cd5947d7454621d1b5f729f6797dee7f794acd62068d97ef290cc4b0330404ce562ec295797f39fbee WHIRLPOOL 0808fbf5053901c568614c6711454e27933a7ac4354967062a42e281c533bef08a3ed62e0ddf92542244249fdf94cbcf5b27a0e2d4c1110bb4216dbc3568e43d
 MISC metadata.xml 367 SHA256 6b8c81649360de8af20a434749d90a9ee689026f959c814e22dac83513c5b0d4 SHA512 0dc1a5f70e560471119207724bc0015d1ae6b80c7da5d2305479b681ae9dca487dc0a58b5db45cc033d3c12ec997902b1c42c664efbfdff8cf3e1570259d0835 WHIRLPOOL 5686f917bfedc7f73923a18e99e8fa64eadda2cbe476d8b6c527be83f283acad01e0fedb5d4c9deb1dbf4f21538b69b3446db3304af782fb76e4b009c6bd3822
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlStzDoACgkQfUU/I5AasIoNlwCfYO2u+cURMFTmZPV0BXnhj76Q
-/nYAoMM5O4xLnQvXu9IEMNVfme2p3rC0
-=8NWh
+iEYEAREIAAYFAlTY6B4ACgkQblQW9DDEZThbbwCdFAQTJn3QXcKSJi34EwKQycN7
+9n8An2MOJk8qVUPVCpHSQTWtSr8tb0cH
+=gHq+
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.0.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.0.ebuild
new file mode 100644
index 000000000000..0a707ec0017b
--- /dev/null
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.0.ebuild
@@ -0,0 +1,116 @@
+# 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.0.ebuild,v 1.1 2015/02/09 17:02:11 williamh Exp $
+
+EAPI=5
+
+inherit autotools 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/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
+
+LICENSE="BSD IJG"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="java static-libs"
+
+ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
+COMMON_DEPEND="!media-libs/jpeg:0
+	!media-libs/jpeg:62
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.5 )"
+DEPEND="${COMMON_DEPEND}
+	amd64? ( ${ASM_DEPEND} )
+	x86? ( ${ASM_DEPEND} )
+	amd64-fbsd? ( ${ASM_DEPEND} )
+	x86-fbsd? ( ${ASM_DEPEND} )
+	amd64-linux? ( ${ASM_DEPEND} )
+	x86-linux? ( ${ASM_DEPEND} )
+	x64-macos? ( ${ASM_DEPEND} )
+	java? ( >=virtual/jdk-1.5 )"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3.1-overrun.patch
+
+	# generate a new ./configure compatible with non-bash shells, #533902
+	eautoreconf
+
+	java-pkg-opt-2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=()
+	if multilib_is_native_abi; then
+		myconf+=( $(use_with java) )
+		if use java; then
+			export JAVACFLAGS="$(java-pkg_javac-args)"
+			export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
+		fi
+	else
+		myconf+=( --without-java )
+	fi
+	[[ ${ABI} == "x32" ]] && myconf+=( --without-simd ) #420239
+
+	ECONF_SOURCE=${S} \
+	econf \
+		$(use_enable static-libs static) \
+		--with-mem-srcdst \
+		"${myconf[@]}"
+}
+
+multilib_src_compile() {
+	local _java_makeopts
+	use java && _java_makeopts="-j1"
+	emake ${_java_makeopts}
+
+	if multilib_is_native_abi; then
+		pushd ../debian/extra >/dev/null
+		emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
+		popd >/dev/null
+	fi
+}
+
+multilib_src_test() {
+	emake test
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		exampledir="${EPREFIX}"/usr/share/doc/${PF} \
+		install
+
+	if multilib_is_native_abi; then
+		pushd "${WORKDIR}"/debian/extra >/dev/null
+		emake \
+			DESTDIR="${D}" prefix="${EPREFIX}"/usr \
+			INSTALL="install -m755" INSTALLDIR="install -d -m755" \
+			install
+		popd >/dev/null
+
+		if use java; then
+			rm -rf "${ED}"/usr/classes
+			java-pkg_dojar java/turbojpeg.jar
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+
+	insinto /usr/share/doc/${PF}/html
+	doins -r "${S}"/doc/html/*
+	newdoc "${WORKDIR}"/debian/changelog changelog.debian
+	if use java; then
+		insinto /usr/share/doc/${PF}/html/java
+		doins -r "${S}"/java/doc/*
+		newdoc "${S}"/java/README README.java
+	fi
+}