Version bump.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 139 insertions, 9 deletions

diff --git a/media-libs/libjpeg-turbo/ChangeLog b/media-libs/libjpeg-turbo/ChangeLog
index c4055105c89d..da852d0ad536 100644
--- a/media-libs/libjpeg-turbo/ChangeLog
+++ b/media-libs/libjpeg-turbo/ChangeLog
@@ -1,6 +1,12 @@
 # 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.90 2014/02/21 19:20:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.91 2014/03/27 21:49:06 ssuominen Exp $
+
+*libjpeg-turbo-1.3.1 (27 Mar 2014)
+
+  27 Mar 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +libjpeg-turbo-1.3.1.ebuild:
+  Version bump.
 
   21 Feb 2014; Samuli Suominen <ssuominen@gentoo.org>
   -libjpeg-turbo-1.2.1.ebuild, -libjpeg-turbo-1.3.0-r2.ebuild,
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 3efa012cb72e..ff720d1ca072 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -4,18 +4,21 @@ Hash: SHA256
 AUX libjpeg-turbo-1.2.0-x32.patch 1240 SHA256 b12ab8fbef2cd8ceafd2e26e8fca375894275b7a60216fabf23f4f1342e73347 SHA512 0aa26467b7c0f583d945619f9b1ad9f200d6ae6cb5c904873a047d955de43c0bfefbf0d9f83cf26b3758f780b530cc35825b57a98856138642dcd29d73e24e91 WHIRLPOOL 67c84aec436f41f318149b264e5a198ad8b4d4bd19483f404dce60a59b237715a38fd5e6108d0c745ab90b6ca3688d2d75d7d23aecff06a649db34bff4d1be2d
 AUX libjpeg-turbo-1.3.0-CVE-2013-6629-and-6630.patch 1017 SHA256 7fe595af3a0518376e0a209c4732a8e2832c0caa4a937741300b3440575f66ab SHA512 ca01e4680267cfc79b8517c1ac55f15ef52b82299dad70b31eb18393be800fb524a12fe04048a63ad0f9881eaa7cefc879ad7f6bce04bb213ed0c4bfa6dd7040 WHIRLPOOL 3d7b95a7d0ed5cb263642e5e4cedfdaf0b74a516eae29b745e37763bd47b01ed2aac16d2ef6f9cd4d12fdb4691aea2afd3adb303024413ee2eec26df6ec5a3ed
 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 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 f20663b194cfc922baf2d719aa372541dd9fbdcb795d3183b7ecb448c65853e9 SHA512 7129d8e9160dd17d2bf0e45e741d13a790818f5fe1e2c5d8a49d04df33f6620d3bfd31ce70b38f37827f31ae74f5f4a24127dd4923eb8902f0ff5234faf7f9f4 WHIRLPOOL 8356c1b6e0eadf0f2e6ee77148518ee1e0b18d7d43f0f721d9608089b30c2d3678804e2d6fe03be45bfd147042f5c1e86c47826cb0e0d2bf755f14439ef8638a
-MISC ChangeLog 13081 SHA256 a7fe393d9aca2de509ce3773d5a8f9cff4e64fa3dcb9965598944e20ede1a215 SHA512 d11ba3d38fc555f4682d9759c2dd780a6b60a9558ff9921333379a076c1f1935dfa597c8d64eb072a6895de088d642ca2601ea0396d9bf5ab671973449e93ce0 WHIRLPOOL 1d68671a3ac6e56988b99a38ca086c31d4dfb9b9845476301975b24989f6beccc35152fe70b58080fd661098c76a8ffce416ec25c480f24a1d2b9652b6c67b87
+EBUILD libjpeg-turbo-1.3.1.ebuild 3121 SHA256 8057671b53c9f0fe0bb1673f72f299affd88d31c2a1be213eb114f9c6553afe7 SHA512 43cce2df7b7153d2b293cacda05f886daca10fae5ccd50133b01cf55a796695eabc874ad39fc1cf09ce22b8b16e99c23faf0d271c8aa698623ba5aa825c02ee0 WHIRLPOOL 112e87eb735adfc0579dad2626161b0356060269a5b01893e5cd729f7fcee849efe2d77d54aca0783b0e69eb4e8ba80d7bf46860ee3a5de2fc7533fab58be652
+MISC ChangeLog 13219 SHA256 9937821eeb02554633a6142c6ca8f04a382ea5fc2c89753a51afb04d6d23c495 SHA512 ce6fe9c8993d757862684eefafa31a1c3a4c1086702c28a78a54a77e72d9afd7f36e5b3c53e1d2b438d4c20b40ed515d8dc1f0e42f80e2052812a6152fd6b898 WHIRLPOOL f8c62f8060d096b2e4c89e3bc91b51cb2e1949e3b81d8c06b4cd7e6f7c31833725f41a859b5d322b44c29584f33f186118a227aa762e473e6ec231e91aa64263
 MISC metadata.xml 367 SHA256 6b8c81649360de8af20a434749d90a9ee689026f959c814e22dac83513c5b0d4 SHA512 0dc1a5f70e560471119207724bc0015d1ae6b80c7da5d2305479b681ae9dca487dc0a58b5db45cc033d3c12ec997902b1c42c664efbfdff8cf3e1570259d0835 WHIRLPOOL 5686f917bfedc7f73923a18e99e8fa64eadda2cbe476d8b6c527be83f283acad01e0fedb5d4c9deb1dbf4f21538b69b3446db3304af782fb76e4b009c6bd3822
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTB6aKAAoJEEdUh39IaPFNBi8H/itCVIuamoRGPqbawaD6iJ6L
-NznFm6xHoVbXDoTzR9sf24mplmR4hc6HlHLOEA8T+6Nu1WiCmMgb0Nq3EZJ3Xqkz
-PvtZ23vJdWI2tkayMXS7KDRFNj3k2eOF00ZjDd/2Hsi2K5GUNRGW2KNRMnRPGkMI
-T7IFX3M/DMcsZQxrTHH5y02+QeR7PiP+p6q+FOrVeGZIpJ5c9mS7TBFJPMj1riiF
-x73NT0/y+N2xC5iaF1WpfdaYWLMYtwq9bIEyTKzFq8tjUcsFWoA+AOWZ9HgnYutO
-d7Z8HD2AjW5HppD0x5F4+vk5xRRzxtnuAeVdTb1GBVgW2QUXgs7lF0eFGlWLu80=
-=/ayH
+iQEcBAEBCAAGBQJTNJunAAoJEEdUh39IaPFNuH8H/0PG6uBYzz44dyTUo4BioQTm
+JiXRJsvSIEIbA1zzpih5u+kh8fghQk9DQ1Nqq3xRiHSB5NUXVqENyOuCjT21mmrn
+x5pMKzWU2C2RLzKkKBwwzTaDiClvkYxQR40Yd5zBxPuf6au8C6KfH4oALX1dRipv
+JN96TscGhF8/RAjtjB4C5pYdJ59CuxLKkUBZhCpcvMK6sfqRI//eYikqKUfZFJ8a
+iat3kZL2Kvf9BOhvYoh7pb2m/xXesghQZLCIC7UOedJSXoU6XnZy/2q1fX60p2xs
+hL9YZ3jOqNCou2lhfXnslFxDKmhkAvekT4eaS1Qd7yE0eEkbLqSPIY3uh4SWfzY=
+=/Pba
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.1.ebuild
new file mode 100644
index 000000000000..a0a581793eb9
--- /dev/null
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2014 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.ebuild,v 1.1 2014/03/27 21:49:06 ssuominen 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://debian/pool/main/libj/libjpeg8/libjpeg8_8d-2.debian.tar.gz"
+
+LICENSE="BSD IJG"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~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.2.0-x32.patch #420239
+
+	if [[ -x ./configure ]]; then
+		elibtoolize
+	else
+		eautoreconf
+	fi
+
+	epunt_cxx #424689
+
+	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
+}