Convert to multilib-minimal.eclass to gain libjpeg.so.62 which is still used by binary-only apps. Thanks to Alexis Ballier for a build patch that made this possible.

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 62 insertions, 5 deletions

diff --git a/media-libs/jpeg/ChangeLog b/media-libs/jpeg/ChangeLog
index 72aefc381442..03df9a3fcc9f 100644
--- a/media-libs/jpeg/ChangeLog
+++ b/media-libs/jpeg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/jpeg
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.139 2013/07/31 16:10:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.140 2013/08/01 13:57:04 ssuominen Exp $
+
+*jpeg-6b-r10 (01 Aug 2013)
+
+  01 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> +jpeg-6b-r10.ebuild:
+  Convert to multilib-minimal.eclass to gain libjpeg.so.62 which is still used
+  by binary-only apps. Thanks to Alexis Ballier for a build patch that made
+  this possible.
 
   31 Jul 2013; Alexis Ballier <aballier@gentoo.org> jpeg-8d-r1.ebuild:
   add the blocker on emul-linux so that it is stacked for baselibs -r4
diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index a41c604e523d..567677886319 100644
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -3,20 +3,26 @@ Hash: SHA256
 
 AUX jpeg-7-maxmem_sysconf.patch 1313 SHA256 92d08b14ade2f42291d3de8074f5e4f9dd3c64dd9ec227bc770a0825187202de SHA512 42a3bccf20db20d1b0e9dee3b5a8b1733b81b5d3dcda83aae8e910d023af0fcbce920c010d11dc8b637935886eede05161393d8e594f48189f72a346f3f8fed8 WHIRLPOOL ac99c96457e83af5fe6a880701bb03312d08fac2dd38d5c0a7436a205f22bf3a8a3906162e6948f98f6af873b8a44e2b7674eec45ae939a400d6682df922527b
 DIST jpeg-6b-patches-2.tar.bz2 3703 SHA256 62d8496764330c57cc29137ee46c3cd76ce6463680f9e2e63af8bc4483439b2d SHA512 df507129c2d87e19dd524b212eae5168c72e591fec4c87bd5aa2a50ac47646ab62fcf23d3d08b5891f35c679733532c173ffe99e1e79764bfa19f73c9de742d2 WHIRLPOOL 00ec2f8ab1d5bae74ba5c92e13db6987de1c2be4ad46e19837ecd3a0e5b15c2e2a16d072bfac462c80183772c71402953a007fd4fcf1aab3af82b10fec6a30c5
+DIST jpeg-6b-patchset-1.tar.xz 2592 SHA256 533ef36e4ca8cdad81d0c931e486776983f60696779c07d11ed601febebec70d SHA512 6deb845a08f4ac6b88c47803b528842cedd145fb12295060d52553b8c803ba192478306496701a409c796c264ceaed0988575ae8f7717e2e7b24da5733bc9c2b WHIRLPOOL cdc42a1a68a090043ca95302f25979293197322f108f083cb16ba57c9bd20a56d21820590cd79f7c7f51836b133fc47a0948928d2d8f9e64bb270bf4ee11844a
 DIST jpegsrc.v6b.tar.gz 613261 SHA256 75c3ec241e9996504fe02a9ed4d12f16b74ade713972f3db9e65ce95cd27e35d SHA512 5d37d3695105fc345ca269ab98cd991472e5de72f702c9a8a652a7d114a40eb99670c69a87ecb24bf64e96318fc0ee2bcb44c497d9d3d2a67378c99e4eb348fe WHIRLPOOL ab649fd5ff29dfbcdf52f337b73c65e29d577c3fd0a1c910590177d83985115c8e8e4c392e196f7a497d6346072b40053999171f0cd74ee3325e74c005c5ba9b
 DIST jpegsrc.v8d.tar.gz 991456 SHA256 00029b1473f0f0ea72fbca3230e8cb25797fbb27e58ae2e46bb8bf5a806fe0b3 SHA512 7a8b4cff5b1caf6a7281c5dce4e1efa1b68360bd64dd2e619b60c9e1d49f22624bc8780b681bfab073e7b1d4b7f41008a464a58f0eeeacb0a40ff996d7eb5753 WHIRLPOOL 7489605809b43cfac02230b89013075806df32246b37eb12ac05ef890ee690f85744887e296f5a21fa64012570aa298d2aa54e4469066f4c21dd40141f3bd8a8
 DIST jpegsrc.v9.tar.gz 987900 SHA256 c4e29e9375aaf60b4b79db87a58b063fb5b84f923bee97a88280b3d159e7e535 SHA512 c6a2fa316fad8230ffd137469643276f1fef52667536712eae69b24afeea283415e8182a284c0457b54c6e49d6e93cf90d7ace1f2fed129c1e7f64b51c699c29 WHIRLPOOL e8b597539e10e68e085a750580b498320b664684d475cf75221a6643287d4e210ee3758f017149a3c2f461e0d9eb625d5930ae7c02862307761e62e4e2b57231
 DIST libjpeg8_8d-1.debian.tar.gz 13676 SHA256 70ec6689b0ad85739802cf3ebbdcc12ea01e21edd8f931c614b25b44cf199057 SHA512 7def4f13524f0af3b9adf35a370027a18f43b9a635f56a17d5bb7883370db8b18b8a12737d0f0cb4b0287ccf8fb474eb5f754de6b398ffe7d522c54e5bf68040 WHIRLPOOL 94526c31d401eb14c9bf0f7115e13a27886ad58863e25d6653eba2b2f5ef260ec272368d2b9d9934bd75b1e5b5f1afc97230e540248efc24d6e85e5680399d27
+EBUILD jpeg-6b-r10.ebuild 1115 SHA256 b16e0c9b1479824daadbb65a9e465e9e5a99d6aa00707dda9219f5dc846bae0b SHA512 0f72990db63db7fa2860ff1c64fc2bf684704ba3dc30941c3b520a9554ac76e259288580363c28d48b3b8dcd27fedbbd1d038124c634609cdaf52532978e6c29 WHIRLPOOL 8b01b9436d71e58ca0f02c5b9d417080b885efef9e744ada9efbea7b15248ee2935e9f3b0423c01ddcc08ef6b75608dda11ed961ba1ad898ef8870bec9c1b783
 EBUILD jpeg-6b-r9.ebuild 1029 SHA256 881c863315fc55c042a97f544d156bdc0ce4a35a064199fe1364b5f0e9cdda27 SHA512 ebe66ae2058dcca128c3fd3f98f71077908804b00e6e69242cc426cf1d895e0af6fa2e49e09d0873db4efbf0077fbe7c78b6cf2a86e3d3f30d8725c2cdcc682d WHIRLPOOL 92b0d6b876399c5d68f34e1d882599a763ecd89a62bf9363b9bfe3946c50e88ac5ff5287a982b36e6e508171e085d52e8d6222295845bcf3c0233c0c198d18f4
 EBUILD jpeg-8d-r1.ebuild 2301 SHA256 1ed66f2121dd886b7cf005c60d4d271d473c8c261e8980de0ecc4f086325cfe3 SHA512 13e0ffb05c0c9fa7944b00c314ef73e661396699bd0bf0de6036be75015553a3be04cba74ca801787353fd19937e4017bf445dca9813a1ca45adbc57328a60ff WHIRLPOOL 10650af17ada9fb70d65dbccc37e8e30bb2994cc20899474234f89a0847d74af228783d2b346904d3b20ba7ed696c3b3a5ab38d3500b308494d4efc496471166
 EBUILD jpeg-8d.ebuild 2005 SHA256 ae6e19520cbbf02c0797fc93d211a51ded7c8e6ba51e6040c69efbd701df2368 SHA512 a8d56cbea40e314cc740efc14e29e8f6eb7dc22ddb802bfe88a453ca095d830b401c37aada1ba0e6c5d066b1160dec0daf146062a007e92eb8ec8c4316395fbd WHIRLPOOL 356b760b3375b921f79690e35d9eb0975f72caf42faa3d7e3f6e9aec41e780ee4ddf5b34189cd7c5196f5b444e6463de703999fefbe8aac37937e7dd3c51420b
 EBUILD jpeg-9.ebuild 2186 SHA256 5b281782782aa436b27cd68ebf7aff8ae99c2e74b347fc41fc9d7fcaaaa92793 SHA512 5f865b236c682cfa0b2b10fdd76941d89d584570c75ec2e8ae2f10b3867b31c8e7d43e73a661e81f5909db6dc33db8ebb04a5d6fbda3e0b35808c58205ca8515 WHIRLPOOL 7290f47aeeb46cd9706dda8cf6245bfdf5dc18b8763e7bfd73c226e2db8ddb001e0e5f945c41cc3661b0933a5004714f57e6b7c7a77b212718cc9f26c2614cbe
-MISC ChangeLog 16851 SHA256 b7fa04c08ddfa22967f038fab5a6e3442b23bc65eb41e847602e7d2ef0b8b975 SHA512 d6a43b36d73c63540ad9b158ecd076e731c4d4468a191dd2c609c89a03040cc8bae2174c421d8bd7b74fa67f59f5672a3bc040c1cc8d8f5ae03d7dbd94f97a59 WHIRLPOOL 2e4fe2ac62a281b45c4fcfb279dfaf79a9ec11312f9adfc9117caad2bc2f65848d493afa397017c9fe952ccab03e87b94cc3b82e45065c0d144f9f6e30d114af
+MISC ChangeLog 17128 SHA256 5ec78691ce7b349cb7f61ec5ab47af71755f8d785b12c65a474960391614275f SHA512 d824d220a3e113bc722a254a72f8537db173dfacf53d0847e28219e4e093bce78c8bd5172ee67e8ea36a019300f8611dbe1e4cabbd81bc992a7f034335db4439 WHIRLPOOL 99709de104d45c140a3b27224d967b56e9ae233e1cc80517fadb3df1fcb29d478720d2eb63adb902b329f16800e58b26e08c045026dab89f6a51c9d079b99c15
 MISC metadata.xml 161 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1 SHA512 425caf0160f1410ce7bf1d4639020be7f6335152c339edbce80676bff4166f1cab3ae9e13161c47b98dc00741dab3bfa45e9572a3314844476e480f5c2b58d7d WHIRLPOOL ad7cdd3352dbc12cb4181fb5d63b5aee5ce3a151b975c12a96c4a5c91f751736d27282ad22633c7e768230266bce5d17947735d33ef5c5c2341c3f9435b9ebb0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlH5NwwACgkQvFcC4BYPU0p/FACdGSXFGufAlgFMI2hCN65Aiv+B
-E2UAoMcZ5etPE1XsVRRpPaSF3Uaer1Be
-=Yc/c
+iQEcBAEBCAAGBQJR+mjaAAoJEEdUh39IaPFNoQsH/02j+30L8tDdTGtNVTPYF1Id
+KVLFcsjubpNTPzfUH76HnHKktk8kAKVoSJNIIjv2QvU1QLDVjhaNyEfP/Pp/I+km
+85HiUbRz/BWCv/YLA4/Z6m5JjXo9wWyGYApylJdyXD2vI7GIp1j1BIRE1Fv8mz1A
+y5XlruTE6qNVlDytc9xrlFW+vyghlxfrSN84HLuVw0AizxDdAh1Mc56iMyUG+paR
+R1ODHFHIQTpQB25Zzcl+qYwCsVTv30zVbWdqsAkZlP0xxkNrs1+w4YmmjhhoN6v4
+K7O1uyQZxUuboWmqKvNb5iNjvI9iV9UhdrmLIFMHX0KNiFp3SWeAWGAq96HliGU=
+=wV0Q
 -----END PGP SIGNATURE-----
diff --git a/media-libs/jpeg/jpeg-6b-r10.ebuild b/media-libs/jpeg/jpeg-6b-r10.ebuild
new file mode 100644
index 000000000000..2ab3c656b45e
--- /dev/null
+++ b/media-libs/jpeg/jpeg-6b-r10.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-6b-r10.ebuild,v 1.1 2013/08/01 13:57:04 ssuominen Exp $
+
+EAPI=5
+
+# this ebuild is only for the libjpeg.so.62 SONAME for ABI compat
+
+PATCH_VER=1
+inherit eutils libtool toolchain-funcs multilib-minimal
+
+DESCRIPTION="library to load, handle and manipulate images in the JPEG format (transition package)"
+HOMEPAGE="http://www.ijg.org/"
+SRC_URI="mirror://gentoo/jpegsrc.v${PV}.tar.gz
+	http://dev.gentoo.org/~ssuominen/${P}-patchset-${PATCH_VER}.tar.xz"
+
+LICENSE="IJG"
+SLOT="62"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+DOCS=""
+
+src_prepare() {
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
+	elibtoolize
+}
+
+multilib_src_configure() {
+	tc-export CC
+	ECONF_SOURCE=${S} \
+	econf \
+		--enable-shared \
+		--disable-static \
+		--enable-maxmem=64
+}
+
+multilib_src_compile() {
+	emake libjpeg.la
+}
+
+multilib_src_install() {
+	newlib.so .libs/libjpeg.so.62.0.0 libjpeg.so.62
+}