summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-libs/libjpeg-turbo/ChangeLog10
-rw-r--r--media-libs/libjpeg-turbo/libjpeg-turbo-1.1.90.ebuild77
2 files changed, 9 insertions, 78 deletions
diff --git a/media-libs/libjpeg-turbo/ChangeLog b/media-libs/libjpeg-turbo/ChangeLog
index daafd455b7a0..0df6156e80bf 100644
--- a/media-libs/libjpeg-turbo/ChangeLog
+++ b/media-libs/libjpeg-turbo/ChangeLog
@@ -1,6 +1,14 @@
# 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.22 2012/01/27 23:04:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.23 2012/01/27 23:07:19 ssuominen Exp $
+
+ 27 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+ -libjpeg-turbo-1.1.90.ebuild:
+ old
+
+ 27 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+ -libjpeg-turbo-1.1.90.ebuild:
+ old
*libjpeg-turbo-1.1.90_p20120128 (27 Jan 2012)
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.1.90.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.1.90.ebuild
deleted file mode 100644
index f0f264541596..000000000000
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.1.90.ebuild
+++ /dev/null
@@ -1,77 +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.1.90.ebuild,v 1.3 2012/01/18 16:18:36 jer Exp $
-
-EAPI=4
-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="mirror://sourceforge/${PN}/${P}.tar.gz
- mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8c-2.debian.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~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 )"
-
-src_prepare() {
- elibtoolize
-
- 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-jpeg8 \
- $(use_with java)
-}
-
-src_compile() {
- local _java_makeopts
- use java && _java_makeopts="-j1"
- emake ${_java_makeopts}
-
- cd ../debian/extra || die
- emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
-}
-
-src_test() {
- emake test
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- find "${D}" -name '*.la' -exec rm -f {} +
-
- dodoc ChangeLog.txt example.c README-turbo.txt
-
- if use java; then
- docinto java
- dodoc java/README
- rm -rf "${ED}"usr/classes
- java-pkg_dojar java/turbojpeg.jar
- fi
-
- cd ../debian/extra || die
- emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
- INSTALL="install -m755" INSTALLDIR="install -d -m755" \
- install
-}