old

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

5 files changed, 14 insertions, 267 deletions

diff --git a/media-libs/libjpeg-turbo/ChangeLog b/media-libs/libjpeg-turbo/ChangeLog
index 456e822a77ff..0af54c649381 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.55 2012/07/31 04:14:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.56 2012/07/31 04:16:14 ssuominen Exp $
+
+  31 Jul 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -libjpeg-turbo-1.2.0-r1.ebuild, -libjpeg-turbo-1.2.0-r2.ebuild,
+  -files/libjpeg-turbo-1.2.0-guard_against_bad_num_components_value.patch:
+  old
 
   31 Jul 2012; Samuli Suominen <ssuominen@gentoo.org>
   libjpeg-turbo-1.2.1.ebuild:
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 66a59b7f7190..f3a5055e3ee1 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -1,24 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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
 EBUILD libjpeg-turbo-1.2.1.ebuild 2876 SHA256 306f2faf800bc3b9c3971a1aa13dda338ca118e9fe1837cce88fb17ad5960c0c SHA512 df5bd118d9bbd8a9a14fa291b491f54f693e027c4d4f1eebea0d98579641a46e4d1f206b41361f43cc5aaeb902a0efa8a424360c61607e2bde076471ecae4919 WHIRLPOOL 3a25fa221725188a96627d2ee769ca3405245e749f6ac70028203897022ec87c38aacbe3f86ca1448923cafc7e1b44ff0bbef75d91c38f7042d4f7802afe40c8
-MISC ChangeLog 8298 SHA256 b507b57e61e6859a07392d416b166a61383994cd1e484d33f17b22c8fc30b413 SHA512 662e630107443ff1e8c5d72d04104a09f96f38f177d77eeaded6edbe38af7bb589e5204b812290817e38421bd7904da8e5df2f56014b9d5a73ee01cf34301ae0 WHIRLPOOL 099e9544116bbd9a06a000e3cfeeb2e8bb0e79f27ffca4da15936ac567bd8d49c305dad03ee301c8eb9558b50fa38d84aeac24f86d6ea605a8364431a8c72f77
+MISC ChangeLog 8500 SHA256 589b895f64dc015bfa4973ad2600042e58e6c2604605c3f6676308b559103bea SHA512 2b94fc5ff47f5ce15fc17072b5d02af0e42670144367940bf8a6c4c38ded31a8c75e8cd8e3992f1cd4fee2e6b2134e6afd0b60bab1067892ef3c0e3365249629 WHIRLPOOL 0ea658e3c247fdea5996b4a9523d53c02bdf1d278159ab3c2079e36d2c15d64aef506e9068fc2b763c6d10f1df69e9f38bf26e9855b7dfe58799d9ac2177b545
 MISC metadata.xml 367 SHA256 6b8c81649360de8af20a434749d90a9ee689026f959c814e22dac83513c5b0d4 SHA512 0dc1a5f70e560471119207724bc0015d1ae6b80c7da5d2305479b681ae9dca487dc0a58b5db45cc033d3c12ec997902b1c42c664efbfdff8cf3e1570259d0835 WHIRLPOOL 5686f917bfedc7f73923a18e99e8fa64eadda2cbe476d8b6c527be83f283acad01e0fedb5d4c9deb1dbf4f21538b69b3446db3304af782fb76e4b009c6bd3822
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJQF1t1AAoJEEdUh39IaPFN2JgH/RWZDSysO79qdMPyAxrM6tzI
-AGqLTLeXmLdG1R0S9XsFZ5SLxPsyXGA03n9B6HAFC6IWMKbBgOiF4/lp2KzeYs8l
-uUGETwYcOZJgMxAu4oal+K2bC/Z9QOA69IUnjm+sQOxjpquEC34IpD5gxtrtTGKK
-bF/XpYieTzTwDdI4pnr3soXGkvgp3HRb/5ikeaEBuPbJOpISjsC51qLdMro77ix8
-6c4+l5SRtU5tOFt5rh3ze95ahU103bcIqtHCQ7PTaRwbmsktUrvMyg9WJcnc3wMW
-6KwuILtahlWXpT9lsuSZGuLYcVImibdDkelKs3CjR79ZxcTxH1x0LWTqp1w6n0M=
-=ASHJ
+iQEcBAEBAgAGBQJQF1vnAAoJEEdUh39IaPFN9lUIAI5DiLnGN7cDqc3XZKkxGrZy
+TnhaT4aQqGA1tCg2EmaG2Q3ymVQLfO5AauqAN9mzHJ5q/HI8fjRMPQXLs27GwFIw
+CklnEGPODAysZZjlpd9grjJjZC/4uVSQxeBBh/+yQxdduiSURy/CD29lDCS5MD6p
+RKV3qZim7hSbP5M944fGZVJZFWNa/MOG6n8ARlBW5c2f/voI6zwUOpm84SHLDMZ0
+JCl9ZOr+IBzxpafEARG7JEttJRfJbv5NW2iR4MStENhsQaemvlsreoNSX05g9eW3
+PcnW6fWnQLdm7PVsta90BKiDysrTi8cvZq7LdV8cb3DxI3CJfpekoxSlAPB9jg0=
+=wL5K
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-guard_against_bad_num_components_value.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-guard_against_bad_num_components_value.patch
deleted file mode 100644
index 7c6b7ad45176..000000000000
--- a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-guard_against_bad_num_components_value.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Wed May 30 20:36:42 2012 UTC by dcommander with message:
-
-"Guard against num_components being a ridiculous value due to a corrupt header"
-
-http://libjpeg-turbo.svn.sourceforge.net/viewvc/libjpeg-turbo/branches/1.2.x/jdmarker.c?r1=751&r2=831&pathrev=831
-
---- jdmarker.c
-+++ jdmarker.c
-@@ -323,14 +323,15 @@
- 
-   /* Collect the component-spec parameters */
- 
--  for (i = 0; i < cinfo->num_components; i++)
-+  for (i = 0; i < MAX_COMPS_IN_SCAN; i++)
-     cinfo->cur_comp_info[i] = NULL;
- 
-   for (i = 0; i < n; i++) {
-     INPUT_BYTE(cinfo, cc, return FALSE);
-     INPUT_BYTE(cinfo, c, return FALSE);
-     
--    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-+    for (ci = 0, compptr = cinfo->comp_info;
-+	 ci < cinfo->num_components && ci < MAX_COMPS_IN_SCAN;
- 	 ci++, compptr++) {
-       if (cc == compptr->component_id && !cinfo->cur_comp_info[ci])
- 	goto id_found;
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r1.ebuild
deleted file mode 100644
index 30009e48b2dc..000000000000
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# 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-r1.ebuild,v 1.13 2012/06/09 00:05:35 zmedico Exp $
-
-EAPI=4
-
-JPEG_ABI=8
-
-if [[ ${PV} == *_p20* ]]; then
-	SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.xz"
-	inherit autotools
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-fi
-
-inherit 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} )
-	java? ( >=virtual/jdk-1.5 )"
-
-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() {
-	emake \
-		DESTDIR="${D}" \
-		docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		exampledir="${EPREFIX}"/usr/share/doc/${PF} \
-		install
-
-	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 $?
-}
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild
deleted file mode 100644
index 2783b617b05b..000000000000
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# 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-r2.ebuild,v 1.6 2012/07/04 18:24:10 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}"/${P}-guard_against_bad_num_components_value.patch
-	epatch "${FILESDIR}"/${P}-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
-
-	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 $?
-}