New snapshot.

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

3 files changed, 126 insertions, 16 deletions

diff --git a/media-libs/libjpeg-turbo/ChangeLog b/media-libs/libjpeg-turbo/ChangeLog
index 82aa97c4c44c..6484adaa4ddf 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.26 2012/02/09 20:16:19 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.27 2012/02/10 11:25:43 ssuominen Exp $
+
+*libjpeg-turbo-1.1.90_p20120210 (10 Feb 2012)
+
+  10 Feb 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +libjpeg-turbo-1.1.90_p20120210.ebuild:
+  New snapshot.
 
   09 Feb 2012; Matt Turner <mattst88@gentoo.org>
   libjpeg-turbo-1.1.90_p20120129.ebuild:
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index ce7e56fbeafe..92d3ba7f467a 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -4,27 +4,23 @@ Hash: SHA1
 DIST libjpeg-turbo-1.1.1.tar.gz 1444529 RMD160 d70979dabe05b8eb74cddaaf0ffbd4b9fbaba41a SHA1 131cef514c34e0b3f6952000968796d5a87a59e9 SHA256 553b1f5a968fb9efc089623ed99be2aa6bc21586be92eb04848489c91a63f1e2
 DIST libjpeg-turbo-1.1.90_p20120128.tar.xz 828660 RMD160 74d29493e6b5f883c9ba904e5d5191dbb636282b SHA1 ce1464f981807e1b24f23bf974fb91a7be6ccecf SHA256 d4843ad3a2ca856ec4e71a12f30df442221e85b7dc2447b2e4928b8bd2205612
 DIST libjpeg-turbo-1.1.90_p20120129.tar.xz 830352 RMD160 2f31a85b4a4bb18f48a325574b0e22e3ac9d321c SHA1 692a3ae95ddd261e716000ddd13b8882ef6d8d56 SHA256 50eeaf9aadec53e20d7cc508755a2bc1535d2815576aae4c5ce5224722e05559
+DIST libjpeg-turbo-1.1.90_p20120210.tar.xz 898568 RMD160 0b6f462cdfff4c32c8195cbd6ab7fa7146761c44 SHA1 302154276c2d5c39d856c71dfcfe2cfde1a1a9ed SHA256 733067b3f53c27776a29b5aa75c1b7822a1b0fddde41be59e17de905a689b0e8
 DIST libjpeg8_8c-1.debian.tar.gz 13756 RMD160 7ceb995b47678bc841e217deaa32f05d70f8d80e SHA1 0c95ebe091e3d535d9d6d8c128ec8bd07e0542fb SHA256 2d45eb7302d2c9a5b6cf12784629ec1bdbbb271a10d600532e5fbde3c19ea765
 DIST libjpeg8_8c-2.debian.tar.gz 13762 RMD160 b7667ccf6d15381d21a08ea359ce88040689c160 SHA1 da0bdf4310454d32a4e3749eb0ff9e0548bb57dd SHA256 079cd7dccdeede2115415b87fb7e8bbd7ace4e96ef9abb30a2aed5e26ac3d1bb
 EBUILD libjpeg-turbo-1.1.1.ebuild 1394 RMD160 2d1502066ad8d7a2664d441a64aca14f5469a6e4 SHA1 b244af8e60eb9ec84cf14baf9102740f7f6d05e9 SHA256 9f58313d95cb4ce6eb83400519186c0cfb89854d9b32eb62a38023a165efb401
 EBUILD libjpeg-turbo-1.1.90_p20120128.ebuild 2602 RMD160 159c5d7a9dd19f6e4ec14740748656c35e0423c9 SHA1 e9bed93e356a4429ec013bb0386ab57f9de2222d SHA256 e97fcd1080a5685a7530cb8f8a731a4d704ecc14def13d74227660e1cbea98f7
 EBUILD libjpeg-turbo-1.1.90_p20120129.ebuild 2607 RMD160 5ba90ba0d14e09f588952d259ce4d6273cd4f0c3 SHA1 b15292af892cfe595f5b89d85684d0949d27da12 SHA256 6022e7fec503ce43a2c38385d3bd4ac46c161e188efbc0aab11e67f42b3ab775
-MISC ChangeLog 4182 RMD160 a9b69c3ae247aa06be29ed4520956ea45dd672a2 SHA1 905d1719e59fe48c59dccc2a6344aac29a43883a SHA256 6c0e3049eec47e9a121e4a28feaccc0d77d01e6f7bf22eb0db3da4196ad0611a
+EBUILD libjpeg-turbo-1.1.90_p20120210.ebuild 2608 RMD160 706c6cf13e5c2d5419f13188f25a26bc32df78d8 SHA1 6a6048933d273dbcbe9ed46d97ffc7fff82a8c9e SHA256 db5b8194a8fab3fcff8aeaa28149158d200256018236f452a1a0b1e5fd629d3e
+MISC ChangeLog 4343 RMD160 be3d37f0304aaed9517fa0360c8fe544491d0462 SHA1 a855ad07969b72991bf820ca5d9c4edf857e35ba SHA256 a74131d8ba36fc1f78f85e84046f774b244eb37b7a4fd29bc9c1efeecab8abf1
 MISC metadata.xml 367 RMD160 904c022029879a401ebec35c5a94e8092cf2f5ad SHA1 86a0413cf0356331eda8202c54241c7f712a4d1f SHA256 6b8c81649360de8af20a434749d90a9ee689026f959c814e22dac83513c5b0d4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPNCmWAAoJEA/daC2XTKcq75YQALXl4vuVCWjSH4YCeu749hgn
-vWP4XogEPwtEy9ULWr4VLgJ7uTq/IJ7eqH580OIIn/px1Cjt1py7H4DD0d9J4kng
-4WXN9ldiQ1NhnXGg91aKG48aaYG2Pc1dPG4OZMTYDapOQm7F0NuQ9kZno06yuCHr
-XHFncf/605I8QGQnYq6dtbQ06Ydv9OTMhXHAiR72P8JZum3ZqDwo+om0gB8foYPp
-q2XRza+iJoPg9UnPPmY+VZyXuzQEHhJQxKWpZSPW+Rq0YdqvYgV9gBVCfNtCpbFG
-whZTqXGclKWde9s4u760+C/6fLaOlxsFcR5kk1vJyT8jH336reXgfSHMKcV1BrLf
-rDwba+KfIvqsWJQLYQZyKzvHvYxYJAjP/q7Izi8g9g4lJ/+C5ZT0zTttM4/VpvD/
-a0VOum9aTxuhsngDh67xZvFL9bO945Ic2r8gKrNeteNtYsGxBim1S0DpiO9WtBpi
-pUNR1STuapNPrZZaQbM2oYx+36JOg0HdRJA9+6WVLmWasYcwoFZZ0GhjiHzveYX5
-KYcgatVkX5tOYuosFSgsx8etFm/gw2dVDqWVscZWYkQzqgsO4zE0Jaetzgz0FND1
-DSJO19GczF6HzqIt/B1RttvmcjPUOSFUZq0S1VgFcY/yOP3/sRK+Nmem9MrHZJdB
-V4wH+2XV/EEZUAeo5GJt
-=tdFJ
+iQEcBAEBAgAGBQJPNP3wAAoJEEdUh39IaPFNd20H/RQ6MSLr+gvB0FxWfTazuMy1
+PpckvHRsyFd7BcdWUhrg3E7kq4qOKhJqvbseavClX2G7Ar6M3sF0/XbMbvLB583G
+/1uAYxFNLM4BHdHvJ+R9AQiHJNQejdGMXGCOmuhGKyFgaqlG3KW7Ag/B33QY+MhN
+maB2IPr32qpSqYGq6eXD8OB83CaUcmZPtHlah83IE3rZFSBTltLCgbeKFi67KNZo
+g/x3Th3hYB2X/jitADbWaiGR2V+kRAi59cP77r19SUsNneNrndC5rx8//RPsgfay
+yVorQeOX7s+4H+kQVkfrwS8eh2KFezAXPF2RYLjG7wQVTaF1+kUisj7oSw+o5xQ=
+=TBUD
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.1.90_p20120210.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.1.90_p20120210.ebuild
new file mode 100644
index 000000000000..be16c85e3ee3
--- /dev/null
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.1.90_p20120210.ebuild
@@ -0,0 +1,108 @@
+# 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.1.90_p20120210.ebuild,v 1.1 2012/02/10 11:25:43 ssuominen Exp $
+
+# http://libjpeg-turbo.svn.sourceforge.net/viewvc/libjpeg-turbo/branches/1.2.x/?view=tar
+
+EAPI=4
+
+unset _inherits
+
+JPEG_ABI=8
+
+if [[ ${PV} == *_p20* ]]; then
+	SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.xz"
+	_inherits=autotools
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+fi
+
+inherit ${_inherits} 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}c-2.debian.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+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-linux? ( ${ASM_DEPEND} )
+	x86-linux? ( ${ASM_DEPEND} )
+	java? ( >=virtual/jdk-1.5 )"
+
+DOCS="*.txt change.log example.c README"
+
+src_prepare() {
+	if [[ -x ./configure ]]; then
+		elibtoolize
+	else
+		eautoreconf
+	fi
+	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
+
+	econf \
+		$(use_enable static-libs static) \
+		--with-jpeg${JPEG_ABI} \
+		$(use_with java)
+}
+
+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() {
+	default
+	find "${ED}"usr -name '*.la' -exec rm -f {} +
+
+	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 $?
+}