old

(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)

4 files changed, 6 insertions, 255 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/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 $?
-}