old

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

4 files changed, 6 insertions, 358 deletions

diff --git a/media-libs/libjpeg-turbo/ChangeLog b/media-libs/libjpeg-turbo/ChangeLog
index ca937b4bb1f2..c4055105c89d 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.89 2014/02/20 14:16:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.90 2014/02/21 19:20:41 ssuominen Exp $
+
+  21 Feb 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -libjpeg-turbo-1.2.1.ebuild, -libjpeg-turbo-1.3.0-r2.ebuild,
+  -libjpeg-turbo-1.3.0.ebuild:
+  old
 
   20 Feb 2014; Agostino Sarubbo <ago@gentoo.org> libjpeg-turbo-1.3.0-r3.ebuild:
   Stable for sparc, wrt bug #491150
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.1.ebuild
deleted file mode 100644
index a7a5a19154ff..000000000000
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2013 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.9 2013/02/17 20:40:32 zmedico Exp $
-
-EAPI=4
-
-JPEG_ABI=8
-
-if [[ ${PV} == *_p20* ]]; then
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	inherit autotools
-elif [[ ${PV} != "9999" ]]; then
-	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 IJG"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 $?
-}
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r2.ebuild
deleted file mode 100644
index 308cf020d058..000000000000
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2013 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.3.0-r2.ebuild,v 1.4 2013/08/05 18:14:51 ssuominen Exp $
-
-EAPI=5
-
-inherit autotools eutils java-pkg-opt-2 libtool toolchain-funcs multilib-minimal
-
-DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
-HOMEPAGE="http://libjpeg-turbo.virtualgl.org/ http://sourceforge.net/projects/libjpeg-turbo/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8d-1.debian.tar.gz"
-
-LICENSE="BSD IJG"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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
-	!media-libs/jpeg:62
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-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 )"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
-
-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
-}
-
-multilib_src_configure() {
-	local myconf=()
-	if multilib_is_native_abi; then
-		myconf+=( $(use_with java) )
-		if use java; then
-			export JAVACFLAGS="$(java-pkg_javac-args)"
-			export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
-		fi
-	else
-		myconf+=( --without-java )
-	fi
-	[[ ${ABI} == "x32" ]] && myconf+=( --without-simd ) #420239
-
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		--with-mem-srcdst \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	local _java_makeopts
-	use java && _java_makeopts="-j1"
-	emake ${_java_makeopts}
-
-	if multilib_is_native_abi; then
-		pushd ../debian/extra >/dev/null
-		emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
-		popd >/dev/null
-	fi
-}
-
-multilib_src_test() {
-	emake test
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		exampledir="${EPREFIX}"/usr/share/doc/${PF} \
-		install
-
-	if multilib_is_native_abi; then
-		pushd "${WORKDIR}"/debian/extra >/dev/null
-		emake \
-			DESTDIR="${D}" prefix="${EPREFIX}"/usr \
-			INSTALL="install -m755" INSTALLDIR="install -d -m755" \
-			install
-		popd >/dev/null
-
-		if use java; then
-			rm -rf "${ED}"/usr/classes
-			java-pkg_dojar java/turbojpeg.jar
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-
-	insinto /usr/share/doc/${PF}/html
-	doins -r "${S}"/doc/html/*
-	newdoc "${WORKDIR}"/debian/changelog changelog.debian
-	if use java; then
-		insinto /usr/share/doc/${PF}/html/java
-		doins -r "${S}"/java/doc/*
-		newdoc "${S}"/java/README README.java
-	fi
-}
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0.ebuild
deleted file mode 100644
index 07057b7e29f6..000000000000
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2013 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.3.0.ebuild,v 1.11 2013/08/18 13:28:24 ago Exp $
-
-EAPI=5
-
-JPEG_ABI=8
-
-if [[ ${PV} == *_p20* ]]; then
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	inherit autotools
-elif [[ ${PV} != "9999" ]]; then
-	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 IJG"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 $?
-}