jpeg: upgraded package to upstream
Upgraded virtual/jpeg to latest versions for all.
Simple virtual update needed by icedtea-bin.
BUG=chromium:346369
TEST=`cbuildbot chromiumos-sdk` works
TEST=`cbuildbot {x86-alex,lumpy,daisy}-release` works
CQ-DEPEND=Id66433a847b79f7e376b6adbe5037bb5ea61b795
Change-Id: Ic3d5867f97025abb034de78fb73b6107505d6713
Reviewed-on: https://chromium-review.googlesource.com/189133
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Trybot-Ready: Mike Frysinger <vapier@chromium.org>
diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index 1b8b075..79d3454 100644
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -1,2 +1,2 @@
-DIST jpegsrc.v8b.tar.gz 965125 RMD160 18d31a26c447564c258a6f6357e9002536c9ab96 SHA1 15dc1939ea1a5b9d09baea11cceb13ca59e4f9df SHA256 36e6208edec591bae8f2fc370ea4f991447badb6377a125c211ffa7b503174a7
-DIST libjpeg7_7-1.diff.gz 11554 RMD160 193bcb5fdc7360707cbb450c16888499085dd2c6 SHA1 b346d8f7803d08feccade84a0012a48ee2b5f62e SHA256 e465ab295502c6db995780d3b2e38570794d0d31034f0065352bcbda63c3a094
+DIST jpegsrc.v9a.tar.gz 1000034 SHA256 3a753ea48d917945dd54a2d97de388aa06ca2eb1066cbfdc6652036349fe05a7 SHA512 9b21cc115e22c68bea46db462263c5c7a0d10beb192a919ecccbd801a25982b518ce44d8c301dd582ecaba1850e0e0f20e322be82b0e24ae917b9949b4f10d3b WHIRLPOOL cd92fd028c8f55c653d74ee74d0c744ebded578bdc7f415a5e8321bed638300c908d08e4129ebb031a6ed19560a2610942ed23cb0a075cc1a34319b9ebaa2265
+DIST libjpeg8_8d-1.debian.tar.gz 13676 SHA256 70ec6689b0ad85739802cf3ebbdcc12ea01e21edd8f931c614b25b44cf199057 SHA512 7def4f13524f0af3b9adf35a370027a18f43b9a635f56a17d5bb7883370db8b18b8a12737d0f0cb4b0287ccf8fb474eb5f754de6b398ffe7d522c54e5bf68040 WHIRLPOOL 94526c31d401eb14c9bf0f7115e13a27886ad58863e25d6653eba2b2f5ef260ec272368d2b9d9934bd75b1e5b5f1afc97230e540248efc24d6e85e5680399d27
diff --git a/media-libs/jpeg/files/Makefile.in.extra b/media-libs/jpeg/files/Makefile.in.extra
deleted file mode 100644
index df81038..0000000
--- a/media-libs/jpeg/files/Makefile.in.extra
+++ /dev/null
@@ -1,37 +0,0 @@
-CC = @CC@
-EXEEXT = @EXEEXT@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-datarootdir = @datarootdir@
-mandir = @mandir@
-man1dir = $(mandir)/man1
-
-MKDIR_P = @MKDIR_P@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-
-SCRIPTS = exifautotran
-PROGRAMS = jpegexiforient$(EXEEXT)
-
-all: $(SCRIPTS) $(PROGRAMS)
-
-jpegexiforient$(EXEEXT): jpegexiforient.c
- $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $<
-
-clean:
- rm -f $(PROGRAMS) *.o
-
-install: all
- $(MKDIR_P) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir)
- $(INSTALL_PROGRAM) $(PROGRAMS) $(DESTDIR)$(bindir)
- $(INSTALL_SCRIPT) $(SCRIPTS) $(DESTDIR)$(bindir)
- $(INSTALL_DATA) *.1 $(DESTDIR)$(man1dir)
-
-.PHONY: all clean install
diff --git a/media-libs/jpeg/jpeg-8b.ebuild b/media-libs/jpeg/jpeg-8b.ebuild
deleted file mode 100644
index c2e60e6..0000000
--- a/media-libs/jpeg/jpeg-8b.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-8b.ebuild,v 1.10 2011/01/06 00:03:56 ssuominen Exp $
-
-EAPI="3"
-
-DEB_PV="7-1"
-DEB_PN="libjpeg7"
-DEB="${DEB_PN}_${DEB_PV}"
-
-inherit eutils libtool multilib
-
-DESCRIPTION="Library to load, handle and manipulate images in the JPEG format"
-HOMEPAGE="http://jpegclub.org/ http://www.ijg.org/"
-SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
- mirror://debian/pool/main/libj/${DEB_PN}/${DEB}.diff.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="*"
-IUSE="static-libs"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${WORKDIR}"/${DEB}.diff
- cp "${FILESDIR}"/Makefile.in.extra debian/extra/Makefile.in
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-7-maxmem_sysconf.patch
- elibtoolize
- # hook the Debian extra dir into the normal jpeg build env
- sed -i '/all:/s:$:\n\t./config.status --file debian/extra/Makefile\n\t$(MAKE) -C debian/extra $@:' Makefile.in
-}
-
-src_configure() {
- econf \
- --disable-dependency-tracking \
- --enable-shared \
- $(use_enable static-libs static) \
- --enable-maxmem=64
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc change.log example.c README *.txt
-
- find "${ED}" -name '*.la' -exec rm -f '{}' +
-}
diff --git a/media-libs/jpeg/jpeg-9a.ebuild b/media-libs/jpeg/jpeg-9a.ebuild
new file mode 100644
index 0000000..159518f
--- /dev/null
+++ b/media-libs/jpeg/jpeg-9a.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-9a.ebuild,v 1.4 2014/06/09 23:22:19 vapier Exp $
+
+EAPI=5
+inherit eutils libtool toolchain-funcs multilib-minimal
+
+DESCRIPTION="Library to load, handle and manipulate images in the JPEG format"
+HOMEPAGE="http://jpegclub.org/ http://www.ijg.org/"
+SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
+ mirror://debian/pool/main/libj/lib${PN}8/lib${PN}8_8d-1.debian.tar.gz"
+
+LICENSE="IJG"
+SLOT="0"
+KEYWORDS="*"
+IUSE="static-libs"
+
+RDEPEND="!media-libs/libjpeg-turbo:0
+ abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-7-maxmem_sysconf.patch
+ elibtoolize
+}
+
+multilib_src_configure() {
+ # Fix building against this library on eg. Solaris and DragonFly BSD, see:
+ # http://mail-index.netbsd.org/pkgsrc-bugs/2010/01/18/msg035644.html
+ local ldverscript=
+ [[ ${CHOST} == *-solaris* ]] && ldverscript="--disable-ld-version-script"
+
+ ECONF_SOURCE=${S} \
+ econf \
+ $(use_enable static-libs static) \
+ --enable-maxmem=64 \
+ ${ldverscript}
+}
+
+multilib_src_compile() {
+ emake
+
+ if multilib_is_native_abi; then
+ # Build exifautotran and jpegexiforient
+ cd ../debian/extra
+ emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
+ fi
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+ prune_libtool_files
+
+ dodoc change.log example.c README *.txt
+
+ # Install exifautotran and jpegexiforient
+ newdoc ../debian/changelog changelog.debian
+ cd ../debian/extra
+ emake \
+ DESTDIR="${D}" prefix="${EPREFIX}"/usr \
+ INSTALL="install -m755" INSTALLDIR="install -d -m755" \
+ install
+}
diff --git a/virtual/jpeg/jpeg-0-r2.ebuild b/virtual/jpeg/jpeg-0-r2.ebuild
new file mode 100644
index 0000000..a077c87
--- /dev/null
+++ b/virtual/jpeg/jpeg-0-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/jpeg/jpeg-0-r2.ebuild,v 1.13 2014/02/20 14:16:44 ago Exp $
+
+EAPI=5
+
+inherit multilib-build
+
+DESCRIPTION="A virtual for selecting between libjpeg-turbo and IJG jpeg for source-based packages"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="*"
+IUSE="static-libs"
+
+RDEPEND="|| (
+ >=media-libs/libjpeg-turbo-1.3.0-r2:0[static-libs?,${MULTILIB_USEDEP}]
+ >=media-libs/jpeg-8d-r1:0[static-libs?,${MULTILIB_USEDEP}]
+ )"
+DEPEND=""
diff --git a/virtual/jpeg/jpeg-0.ebuild b/virtual/jpeg/jpeg-0.ebuild
deleted file mode 100644
index fc9eaf4..0000000
--- a/virtual/jpeg/jpeg-0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jpeg/jpeg-0.ebuild,v 1.5 2011/04/27 18:03:05 grobian Exp $
-
-EAPI=2
-
-DESCRIPTION="Virtual for jpeg library"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="*"
-IUSE="static-libs"
-
-RDEPEND="|| ( media-libs/libjpeg-turbo:0[static-libs?] media-libs/jpeg:0[static-libs?] )"
-DEPEND=""
diff --git a/virtual/jpeg/jpeg-62.ebuild b/virtual/jpeg/jpeg-62.ebuild
new file mode 100644
index 0000000..95303b6
--- /dev/null
+++ b/virtual/jpeg/jpeg-62.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/jpeg/jpeg-62.ebuild,v 1.12 2014/02/21 19:25:28 ssuominen Exp $
+
+EAPI=5
+
+inherit multilib-build
+
+DESCRIPTION="A virtual for the libjpeg.so.62 ABI for binary-only programs"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="62"
+KEYWORDS="*"
+IUSE=""
+
+RDEPEND="|| (
+ >=media-libs/libjpeg-turbo-1.3.0-r2:0[${MULTILIB_USEDEP}]
+ media-libs/jpeg:62[${MULTILIB_USEDEP}]
+ )"
+DEPEND=""
