Version bump.

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

3 files changed, 126 insertions, 9 deletions

diff --git a/media-libs/libjpeg-turbo/ChangeLog b/media-libs/libjpeg-turbo/ChangeLog
index 93e941a5eaea..63698c0c3314 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.28 2012/02/10 11:27:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.29 2012/02/11 19:09:25 ssuominen Exp $
+
+*libjpeg-turbo-1.2.0 (11 Feb 2012)
+
+  11 Feb 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +libjpeg-turbo-1.2.0.ebuild:
+  Version bump.
 
   10 Feb 2012; Samuli Suominen <ssuominen@gentoo.org>
   -libjpeg-turbo-1.1.90_p20120128.ebuild,
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index d36b9c930c2e..264c37f1a3b5 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -3,20 +3,23 @@ Hash: SHA1
 
 DIST libjpeg-turbo-1.1.1.tar.gz 1444529 RMD160 d70979dabe05b8eb74cddaaf0ffbd4b9fbaba41a SHA1 131cef514c34e0b3f6952000968796d5a87a59e9 SHA256 553b1f5a968fb9efc089623ed99be2aa6bc21586be92eb04848489c91a63f1e2
 DIST libjpeg-turbo-1.1.90_p20120210.tar.xz 898568 RMD160 0b6f462cdfff4c32c8195cbd6ab7fa7146761c44 SHA1 302154276c2d5c39d856c71dfcfe2cfde1a1a9ed SHA256 733067b3f53c27776a29b5aa75c1b7822a1b0fddde41be59e17de905a689b0e8
+DIST libjpeg-turbo-1.2.0.tar.gz 1752925 RMD160 d60a7de07c3164aeb1800ba21a86782e195f00f8 SHA1 4ab00afc9a8d54cd2e7a67aacb9c49e01a8bccac SHA256 629db2a9b1295a1b0e5fa8dddda36c5da61a90536bef8295e0b209cbcd50f98e
 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
+DIST libjpeg8_8d-1.debian.tar.gz 13676 RMD160 9a60fe29a866b76935f8e26c7bf90324e1dc0ce6 SHA1 00b45ec61555c86da250f3a73823c7d46cfd81aa SHA256 70ec6689b0ad85739802cf3ebbdcc12ea01e21edd8f931c614b25b44cf199057
 EBUILD libjpeg-turbo-1.1.1.ebuild 1394 RMD160 2d1502066ad8d7a2664d441a64aca14f5469a6e4 SHA1 b244af8e60eb9ec84cf14baf9102740f7f6d05e9 SHA256 9f58313d95cb4ce6eb83400519186c0cfb89854d9b32eb62a38023a165efb401
 EBUILD libjpeg-turbo-1.1.90_p20120210.ebuild 2608 RMD160 706c6cf13e5c2d5419f13188f25a26bc32df78d8 SHA1 6a6048933d273dbcbe9ed46d97ffc7fff82a8c9e SHA256 db5b8194a8fab3fcff8aeaa28149158d200256018236f452a1a0b1e5fd629d3e
-MISC ChangeLog 4488 RMD160 45f24802cb1f82e1f93683f15050e1d2241688a0 SHA1 037ddde0062a1b3b400d24c8772eac95b4d2ed68 SHA256 2aa56377cc33542bcbb1fb9eb17481800ce1c21dd9bbfcd465b4e6ec43f300d1
+EBUILD libjpeg-turbo-1.2.0.ebuild 2597 RMD160 9e3c9dfa8f226289ecbfa5e1989bfccc2e372ed7 SHA1 eed23ea6311228c213fe429d9f787c8f498f7bb1 SHA256 f260832defc974ff2f75ae4cfcd9d373f46f0b3ef92b245559680f4a43fd0132
+MISC ChangeLog 4626 RMD160 62d956c53a59247596cfaa9e6ee00fda65c3a567 SHA1 da6b9865cef3eb3f267555aa3563483d2518ab7d SHA256 7e7629d9f327159187b8912ddea0455335af88ba1405499ba4ca13099f2d64db
 MISC metadata.xml 367 RMD160 904c022029879a401ebec35c5a94e8092cf2f5ad SHA1 86a0413cf0356331eda8202c54241c7f712a4d1f SHA256 6b8c81649360de8af20a434749d90a9ee689026f959c814e22dac83513c5b0d4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPNP5BAAoJEEdUh39IaPFNcTQH/2f2xl9P1vIig7MXbWmm6uMr
-yDO7mDsQiepi6ihlOr/9wPWC8se3wX5gkHjJSkCJJljOM0RnzfMJCRm+lvmG5nwC
-f/5nVKKa7YXc5U6P5GjQhwdQazKvCbn4WYF42BEDl8vh1hfHL4zgwsvVqFJLma+n
-/EUO/ciJmO6bALefeQhWLBQFpc9ad3dbemwYQOBOylyLR2E0YgZJFjdUSygERAU8
-kcARKSZs8RWd3C0LqW/9BkIhDgNrFNfRg/loY6jSqM2JfGr7N00m1xlvZX1kHQow
-IxZW+HYbCW9C8iVyvcCvvEXlNhQGr1nNlLZj0pA0gZdiTFpzX///fCQwqDCPl2Q=
-=Ui4/
+iQEcBAEBAgAGBQJPNrwXAAoJEEdUh39IaPFNpQ4H/1idOXPus8mOt4a7l7JQwxGJ
+FEax+IFVMtMy8YK+pXYb1FkbxzjoWdnJ6CpfgqfSwdZV3KAZsVr2t3MkjuIvqwLv
+XFV3zuPxGA+Woyn7TyIebUNJSTNRZCzxEJY3MfgeIC1f0DSY6veflDxOWH4xPAxl
+YyB/1jKyC+TYqn+jsm4Yv8uG6UaGtcryvtTO3Lb0pMMfI0IdOA//l9/5K3pXvaGl
+1GxJK1lxcHJH4Pe/qPhHdTtYkfQi6l+eRZwVA/W7sT3lC/dc3EDW0gBsvYeWwChA
+8Uiv2f6hF7wvQRpXkGIa8nRbfCV0EfG56vd5uUhqkW9+Eijg/5evDhPcIhX3650=
+=czKM
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0.ebuild
new file mode 100644
index 000000000000..51d5e4d8c80a
--- /dev/null
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0.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.2.0.ebuild,v 1.1 2012/02/11 19:09:25 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}d-1.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 $?
+}