Version bump.

Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64

3 files changed, 135 insertions, 9 deletions

diff --git a/media-libs/libjpeg-turbo/ChangeLog b/media-libs/libjpeg-turbo/ChangeLog
index 1af5a341388b..8b1d6305d35e 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.48 2012/07/04 18:24:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.49 2012/07/07 07:11:15 ssuominen Exp $
+
+*libjpeg-turbo-1.2.1 (07 Jul 2012)
+
+  07 Jul 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +libjpeg-turbo-1.2.1.ebuild:
+  Version bump.
 
   04 Jul 2012; Samuli Suominen <ssuominen@gentoo.org>
   libjpeg-turbo-1.2.0-r2.ebuild:
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 14a571334408..3637594bd8c9 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -4,19 +4,21 @@ Hash: SHA1
 AUX libjpeg-turbo-1.2.0-guard_against_bad_num_components_value.patch 889 SHA256 66bef73d49350d1bb173f27226aeb215d5c4b3729a5a23088a7dbbac5a2f960c SHA512 a886c57b0e6773a2b86e0cc9ef5a5800ca3024683d606e9a8e1f7ad27303795a61bfc4045ee08362e1da674fb1d062b272aa4db470f3f97ddb2319ab893c11f9 WHIRLPOOL c6cbd484ff8c1ecef92b4b1348262137500916a1a7be377ddbc1815ad4740709d7f9763b23b753be4f1484402d0d169a739a8c2f7a17cb1fe9dd4eb9cbb19704
 AUX libjpeg-turbo-1.2.0-x32.patch 1240 SHA256 b12ab8fbef2cd8ceafd2e26e8fca375894275b7a60216fabf23f4f1342e73347 SHA512 0aa26467b7c0f583d945619f9b1ad9f200d6ae6cb5c904873a047d955de43c0bfefbf0d9f83cf26b3758f780b530cc35825b57a98856138642dcd29d73e24e91 WHIRLPOOL 67c84aec436f41f318149b264e5a198ad8b4d4bd19483f404dce60a59b237715a38fd5e6108d0c745ab90b6ca3688d2d75d7d23aecff06a649db34bff4d1be2d
 DIST libjpeg-turbo-1.2.0.tar.gz 1752925 SHA256 629db2a9b1295a1b0e5fa8dddda36c5da61a90536bef8295e0b209cbcd50f98e SHA512 cdfebd83f95988ebf79451363acb46f57555eafe8d782ef1ab7ace2d2336698f804f9ce33de850cc5bc453e91cb24878a7a40143f2ffd39d6def3d28f6ff65bb WHIRLPOOL 3f3614f42ab3b8c45ab947bda09635015bcc4b562a4d16a272d86fccb50d5c47a8ad0170f1c03b793f275e6a9eac64ff30a9b5e473d00158ccc33654f1511cce
+DIST libjpeg-turbo-1.2.1.tar.gz 1755264 SHA256 cb3323f054a02cedad193bd0ca418d46934447f995d19e678ea64f78e4903770 SHA512 1ea3d2cfcc24ebe83b669417b86c59563781e74ef5358bf44fc380d4379bd200965aed7390cbfd269cac9f6abd21b3bcb156cb7f3deb5d0e9bfe0a07347d45f6 WHIRLPOOL 70e19e40c218e6ed9583ea5903a130db2fb18491c1c08da8a8989d6fcdf19bf846737ea1660d45107c03ee0a2b7406cefd5ee22533a839c49c2526acc4578d10
 DIST libjpeg8_8d-1.debian.tar.gz 13676 SHA256 70ec6689b0ad85739802cf3ebbdcc12ea01e21edd8f931c614b25b44cf199057 SHA512 7def4f13524f0af3b9adf35a370027a18f43b9a635f56a17d5bb7883370db8b18b8a12737d0f0cb4b0287ccf8fb474eb5f754de6b398ffe7d522c54e5bf68040 WHIRLPOOL 94526c31d401eb14c9bf0f7115e13a27886ad58863e25d6653eba2b2f5ef260ec272368d2b9d9934bd75b1e5b5f1afc97230e540248efc24d6e85e5680399d27
 EBUILD libjpeg-turbo-1.2.0-r1.ebuild 2685 SHA256 01facfbf8e95e2d2c31e278c139183f445814ced72fae27445085e9f4c37b03f SHA512 973c6eea3c56037a7a6610727edb66804890540077a901f91659078e4f4443d2c2c6134b6f15ec9dbca545231406f47f7bb5501e147edfd1a8b54548aead5632 WHIRLPOOL 14c664605170c520335bdce18cf12d9d7dfe11ec69eae93e291ba43f269033f275855f46bd53c7ee9882bdffd1a955864e08d842d85adfd43cbb14863026b448
 EBUILD libjpeg-turbo-1.2.0-r2.ebuild 2954 SHA256 a11cf05ecbfe425e57d51e010a8551d960f9970bc3629ce178694ac699e60857 SHA512 5fb28a3e65416add444ad38a90b63d912cbcd8d029fc482f5fa448af8034b41f1ef49b7ea7a9fbb4a48fbd2c2405d2ac531d635e418b5d5a483d4c947f4747be WHIRLPOOL 4837809e204dde426ce2e0b78cbc3a1577e9d129eeb8aa586c6bcd2adfbe47e8a0011da6e685f8d2a80d57ac1454c0683e006b3c8b5e8275253c175cbfd765ba
-MISC ChangeLog 7456 SHA256 0a4a610ad401bb5bc0edd1890c3782855673e72968bf6afb0fbc5da779583425 SHA512 e5671ebfe752b5f46be7694943550f54711d83f19e8df4be6d18f2ca7f8474158dabb493585a008aa08331a1d2f4563127becadf1261608033dac497d7723cc5 WHIRLPOOL d6503e58b3379f6893537ba18b0758aab398e888248b67f13304834f86c6e1ac790787ab0b14aa5333016cca8c56a0e4dd62d3f57d106d0b694c674f06b82f9f
+EBUILD libjpeg-turbo-1.2.1.ebuild 2860 SHA256 e48cb87d6e0c9e39e71c85e5bd279b872bfc2c927d6732f3f6802dc541d4a760 SHA512 aea5c046d02b4b90c658a1a6608fa8f65ffa1f3ae8676d4cef92c8945367fd8a00a61f51c795cbbab426f8763d0ee9a627fd974340d62d7c8838c8bc9beba3dc WHIRLPOOL 9611838b5c4c8ced17dc06b96d8c6ffbede8bd0420e5de385b19fccec5a7252072089d2570e01855cb3e4770b1f40f5114102875efb4d84a732b76ca122a9e5f
+MISC ChangeLog 7594 SHA256 aa22a26be143caa44ebc75415525691becfc00b12fcbca5a4962ebcadbb792ba SHA512 28057323e46cdb5b8593986fc0b7639a60c7d68e6514091bc3d467fdc4a6b893645495f167d2bc7f8c6eeaa4db416c975dcf7ae430c80ff3af305fe1badce1fc WHIRLPOOL 783bfa2de4dfaa2d0c0f3518d66bce43de792dabe91b6406226f679a9dd786ba601a3ebb167764c958c0eb1cc50cdc7f820fe623c3cc7057c3b0d4b345a2f3a7
 MISC metadata.xml 367 SHA256 6b8c81649360de8af20a434749d90a9ee689026f959c814e22dac83513c5b0d4 SHA512 0dc1a5f70e560471119207724bc0015d1ae6b80c7da5d2305479b681ae9dca487dc0a58b5db45cc033d3c12ec997902b1c42c664efbfdff8cf3e1570259d0835 WHIRLPOOL 5686f917bfedc7f73923a18e99e8fa64eadda2cbe476d8b6c527be83f283acad01e0fedb5d4c9deb1dbf4f21538b69b3446db3304af782fb76e4b009c6bd3822
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP9IkBAAoJEEdUh39IaPFNP/gH/i8Chy8+Gb9jwdpk25u4o3pP
-orJA8uZm7HUR0jTCQTUd9tFZvfZ4gutNDEQTariCoZWFDsCMI4DJWpk1k1pqpbdN
-axvmzIY4URfyF1pn/Cy0NZCgJZ/Hr4W1QfA/pv3kHK7cgNJWdD9LGLye2re9zLRX
-7+LBS3f8ssFdNiwR9PB5X5zzlwe/k/sER6i0ztNdyRvqGm0HZJUxPRDJIjh55Mk4
-Q4UbRNkUicnnbv9tyTYCCi3Q31q1AkZXH2day+sJ/+s9uTuFjBiT5ypFnUD2vWx9
-o30RP80mVkmLm3GWwfuCUoV0I6LJFzKhxlDLw2YgR1T44PwlLqi9pucamw5vDY8=
-=jHRR
+iQEcBAEBAgAGBQJP99++AAoJEEdUh39IaPFNPcAIAJphMsKIhuwCmMtBAepcdRGm
+pGJPJpjycKZbNcBSsOI8jFeopBRzw68CpkKkum2dUloFwNcCb47UTydXUcDY8+Pn
+Dya9exH+J2ScxHuPNMHMcbTf24vxI910vE4KDzqzdjhEJI3qY2eWqXY3OpeTCfty
+/U+wBOsPK5DjIGxOjAsNFTTKkbH5XJpFOciABHIgSSAbbpNlHUHbOgXYC8FhDaRn
+cOod7grTSEv3iJJk9IMD15OoHgRwsOnZWtbyY+ZZGdboWM/Bq33fteiWZHy663qs
+BZjLAOpeXdA5aWvpis4UI4zthamY+M+g4TvLSNc8YVDo1fojRar0ph/WpyplqI4=
+=GzE7
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.1.ebuild
new file mode 100644
index 000000000000..33bee5ca0360
--- /dev/null
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2012 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.2.1.ebuild,v 1.1 2012/07/07 07:11:15 ssuominen Exp $
+
+EAPI=4
+
+JPEG_ABI=8
+
+if [[ ${PV} == *_p20* ]]; then
+	SRC_URI="mirror://gentoo/${P}.tar.xz"
+	inherit autotools
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+fi
+
+inherit eutils java-pkg-opt-2 libtool toolchain-funcs
+
+DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
+HOMEPAGE="http://libjpeg-turbo.virtualgl.org/ http://sourceforge.net/projects/libjpeg-turbo/"
+SRC_URI="${SRC_URI}
+	mirror://debian/pool/main/libj/libjpeg${JPEG_ABI}/libjpeg${JPEG_ABI}_${JPEG_ABI}d-1.debian.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-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"
+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 )"
+
+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
+}
+
+src_configure() {
+	if use java; then
+		export JAVACFLAGS="$(java-pkg_javac-args)"
+		export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
+	fi
+	local myconf=()
+	[[ ${ABI} == "x32" ]] && myconf+=( --without-simd ) #420239
+
+	econf \
+		$(use_enable static-libs static) \
+		--with-jpeg${JPEG_ABI} \
+		$(use_with java) \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	local _java_makeopts
+	use java && _java_makeopts="-j1"
+	emake ${_java_makeopts}
+
+	ebegin "Building exifautotran and jpegexiforient extra tools"
+	pushd ../debian/extra >/dev/null
+	emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
+	popd >/dev/null
+	eend $?
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		exampledir="${EPREFIX}"/usr/share/doc/${PF} \
+		install
+
+	prune_libtool_files
+
+	insinto /usr/share/doc/${PF}/html
+	doins -r doc/html/*
+
+	if use java; then
+		insinto /usr/share/doc/${PF}/html/java
+		doins -r java/doc/*
+		newdoc java/README README.java
+
+		rm -rf "${ED}"usr/classes
+		java-pkg_dojar java/turbojpeg.jar
+	fi
+
+	ebegin "Installing exifautotran and jpegexiforient extra tools"
+	pushd ../debian/extra >/dev/null
+	newdoc ../changelog changelog.debian
+
+	emake \
+		DESTDIR="${D}" prefix="${EPREFIX}"/usr \
+		INSTALL="install -m755" INSTALLDIR="install -d -m755" \
+		install
+	popd >/dev/null
+	eend $?
+}