Convert to multilib and stack it for baselib r11

Package-Manager: portage-2.2.0_alpha196/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 78 insertions, 5 deletions

diff --git a/media-libs/tiff/ChangeLog b/media-libs/tiff/ChangeLog
index 0862408dcd4a..669ed729755b 100644
--- a/media-libs/tiff/ChangeLog
+++ b/media-libs/tiff/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/tiff
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.237 2013/08/10 17:15:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.238 2013/08/10 23:13:32 aballier Exp $
+
+*tiff-3.9.7-r1 (10 Aug 2013)
+
+  10 Aug 2013; Alexis Ballier <aballier@gentoo.org> +tiff-3.9.7-r1.ebuild:
+  Convert to multilib and stack it for baselib r11
 
   10 Aug 2013; Alexis Ballier <aballier@gentoo.org> tiff-4.0.3-r3.ebuild:
   Add blockers on emul-libs so that it is stacked for baselibs r10
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 3356e6b4d5b2..cc93ce173b52 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -20,18 +20,19 @@ DIST tiff-3.9.7.tar.gz 1468097 SHA256 f5d64dd4ce61c55f5e9f6dc3920fbe5a41e02c2e60
 DIST tiff-4.0.2.tar.gz 2022814 SHA256 aa29f1f5bfe3f443c3eb4dac472ebde15adc8ff0464b83376f35e3b2fef935da SHA512 bfc82b2780f2a7d89b1cd6d73ba45091fc74de996b2dad616cfdba59770b192449d6a9effba305f478a8e527d7246443a4e2bc1c5e2e6673a0037972f4a13413 WHIRLPOOL 1c89f2760413035f37dfde47d7c8884fa899e86b7911fd6b52b2920c830898b8f26f8d9a287ed6dc3820feb7fa21c50fb1dba278c57fb548806e8700c23e1ec9
 DIST tiff-4.0.3.tar.gz 2051630 SHA256 ea1aebe282319537fb2d4d7805f478dd4e0e05c33d0928baba76a7c963684872 SHA512 d80e18b00e9e696a30b954c0d92e5f2f773fd9a7a0a944cf6cabb69c1798e671506580daa1cd2ebf493ae922000170c2491dfc6d4c0a9cd0b865684070595a73 WHIRLPOOL 762ace7c66dec7a6f350bc8c000a9e1f4b775e7b148b1d923eb3f7c015f47bda65a54bc0b5974ce665c7d836ec0b275c9307d1f18f3b6bee8b0949a6cceb319e
 EBUILD tiff-3.9.5-r3.ebuild 1799 SHA256 10fc18a8ada9f8763ff295b6f42326b0f6866e235aeac1261f42dd1ad62a12fd SHA512 9434a31ccb4603d0278cfa0b51df4d902a627466f8243045585064db73627418ea871ea4a6f749acbe9f4792bddb6b7f2d28bc3a035da5daea8067338ae8d157 WHIRLPOOL 1cbc9bd3e518d48c8b42420c7db495bd95810ed571dc13ee4be5378c816383f75ae19e2d02f711c61a95642777458840340b15e8e438bc48cd2d72309955ce15
+EBUILD tiff-3.9.7-r1.ebuild 2159 SHA256 abee4235665f3818b6c0029aa850d71b50a54e33b369566be9698f30f3fa98a6 SHA512 3cb37f13a1b18c388af62f89e330b4685ffb53851c3ece32308b2a296741916da7ef5eecfb4f3aea5e8fcf36c7c654e6d9fba07bef65cc1920117f2b28f09c71 WHIRLPOOL ae5d03e060f646ecfcb4740ee816dcbacaa616f8cb2e609ddf1a222c78924c9a2dc7a7126bad2eff4be04ed445d49db75c16606f5b1219d0e783c0d60798fb7c
 EBUILD tiff-3.9.7.ebuild 1903 SHA256 1fb8829e88efee4827555610d50e6e0c9cafc5e87f95ad7ea6a0667d2985cf89 SHA512 205893a1fc4460746b5821a3d73b063f9d736ca9cbb16beef69969f9c7f542bb19a069edf953b4c25d57fc2d2db7ea8ec395fd6f026c6228445ccb936536fbad WHIRLPOOL aa53c763f198bc9f10aca670192da8ca40bf29f127bbae01829af76733a8f48420adbcdee30daa66bcbf869d5b7099fc2457ff0c6115a6e83ae3c6b1f0074749
 EBUILD tiff-4.0.2-r1.ebuild 1446 SHA256 4301e356a342b75d9425d94ca7fc0f29eb956265136d23219851cbd7532c9c86 SHA512 f3f5ccd83c300a3acd445e9fe420c9c3150ad3933a80db1a315ff55afd73ca0829f6848bca49e0dab44246c506c12d8595eeb6d442cf414f28d20397da8034ea WHIRLPOOL ebe9c1d649335cdedf6630fb943cd916f2a64898a18015c0a389e3299b850b9a2c50ccc54a93519c7f2e72988bfa492969db52afe1068429cbca7b3cab049941
 EBUILD tiff-4.0.3-r1.ebuild 1429 SHA256 2fc720bbe56409b73d782a68bd2476caf5e0eb4449f5df775088cb24e989ada0 SHA512 d53620a858fbd774b36723d33f0c129edd634ef4913647319d76e60d3a87edb3cbe52c42b1e2e7a7155c9ce14540e158a3d1081f2046f6677c03570dae121ee4 WHIRLPOOL 021e573bc100640b1efceac2f42635645bb79bd729d113dd200676decaa863febb45bca37c721575043e23e60aa203419927c7aae7736f01e946ecb35fe10e00
 EBUILD tiff-4.0.3-r2.ebuild 1602 SHA256 745db9df119c066bf90f0dad327600ce575324272e9adb688a939be0d50e8320 SHA512 b1565cd640e3d30bcc5ac3df9516889a72152b7f36850d71c2fc1d2014d3c9e5103f27f6d2b607d0845eb9554af0f453aaab8d134d8b8609e61a7604d3fe7346 WHIRLPOOL f006d4e7770615e663c27013dbc65fc8c9608964dcdb011a6140e1f1b0041562472685a46a84836f81e780ab838713ec7ed079a8aef924edfcbccb137387b26c
 EBUILD tiff-4.0.3-r3.ebuild 2223 SHA256 b20e62cfc132093ae0a8fec6ab7ef8bbc21ce6c626572d259895f8818dbf4f55 SHA512 e0142b19b1ccf2a64f92c5a8d07cb6332ecb2cd742bef686dac21ba3435ac75f3d6a6e58c0f2b60f721734d11f0f5a7a04824db4289a25697cec911fbdbdf870 WHIRLPOOL a96667e99a31ef0c5583655b5b21a624baf294da15a3d909d9f2854a3f053d5af35b2be83f58f33479a8fdb4aa5a25af9b64028981b1a3c8bc56b19b5597e305
 EBUILD tiff-4.0.3.ebuild 1353 SHA256 ae60d4451163f8fde953b0ba1120f3a10d01601a23d457ecf05f2ea0007c477f SHA512 a5aabfa782dc9c97e9a93e7f1a224152d7a561d0c8131042ca24e5ab40744125be8fc1e1a892a4f6f808003bd2d8c881ccaafd1165522f829adf15956d9d3689 WHIRLPOOL 4841ce497247a05952c1b83f718983422b819642a133acea9ab5daa6daeccc2ceb6f6faa2b26957fa9f965751d99ed533575c550e93205386d0c427965745eb2
-MISC ChangeLog 33081 SHA256 604494fa92db92cb6a02f072d81d0ec76575e755a568f1e321e2b943c5656ae5 SHA512 a077b77064dd80c702df7a507f62a7c36a1de143baee64975280584e3de7c7a4050dd5b10045db5a8e750509e91fdc83524c14090908e54a8cac1c8b91301809 WHIRLPOOL f7f65ae7484fd042a27d1c2d57ac357229779458a7a94afdfc13d3495069a0bd4508abd2afd006ed3cc276ebc5d17b9540d7223b4f09ac4671139867bac44a91
+MISC ChangeLog 33238 SHA256 d4c33d0f3979ba76a8fa45a8952194147768de495d7b149f57415211e3a28e2c SHA512 3db24ef0673567f52b57f82fa8ac594353db1e30c4869e77bd8c10f2d9eacd877ed385e417d07c71a5ffda4750b419ce3ad8b342e136535fc28f594f13aaa8e9 WHIRLPOOL c9f4ffcffc9f0d819e7d5e2bab2f621ba5d95ec12397245871452a40943787ddc98da87dd37fe1db4c7c8a37e2af733f6468fb2571ba7fd7a358c9887de3e848
 MISC metadata.xml 309 SHA256 c1893fd7aaa763da14257353ceca7356500d8c8112f635f587c4ef407bd6ca51 SHA512 435eddb4a4280b37dd5948f305f88c5b3c8d193d50776a4c608132addcff03016fb00b218ad8be93a59dfdde28b57fc9d1327b18dc772344057147a5d3826f4b WHIRLPOOL b3323fa861535082bd475896c3cd5490c584cfe0262ffa25288bcda76e36ee58c42c825811ccc34078ed624e48467842012750cd650cf91398313cf4c6b60892
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIGdTMACgkQvFcC4BYPU0qI6ACeLOao2ouUYB+GPoGT8TcqGZXO
-+30An2jL2UAMijZ8mvKusFGBijSilmQT
-=aYCt
+iEYEAREIAAYFAlIGyR0ACgkQvFcC4BYPU0pJuACfZ2AP92Usnee4ENCKoB+jgdEj
+LV8AnA+iSgHXHIQTP6bM5OikGL1bp08/
+=WEyy
 -----END PGP SIGNATURE-----
diff --git a/media-libs/tiff/tiff-3.9.7-r1.ebuild b/media-libs/tiff/tiff-3.9.7-r1.ebuild
new file mode 100644
index 000000000000..31e1b03ac1e6
--- /dev/null
+++ b/media-libs/tiff/tiff-3.9.7-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.9.7-r1.ebuild,v 1.1 2013/08/10 23:13:32 aballier Exp $
+
+EAPI=5
+
+# this ebuild is only for the libtiff.so.3 (+ 4) and libtiffxx.so.3 (+ 4) SONAME for ABI compat
+
+inherit eutils libtool multilib multilib-minimal
+
+DESCRIPTION="Library for manipulation of TIFF (Tag Image File Format) images"
+HOMEPAGE="http://www.remotesensing.org/libtiff/"
+SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz"
+
+LICENSE="libtiff"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cxx jbig jpeg zlib"
+
+RDEPEND="jpeg? ( virtual/jpeg[${MULTILIB_USEDEP}] )
+	jbig? ( media-libs/jbigkit[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	!media-libs/tiff-compat
+	!=media-libs/tiff-3*:0
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20130224-r10
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-CVE-2012-{4447,4564,5581}.patch \
+		"${FILESDIR}"/${P}-tiffinfo-exif.patch \
+		"${FILESDIR}"/${P}-printdir-width.patch
+
+	elibtoolize
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--libdir=/libdir \
+		--disable-static \
+		$(use_enable cxx) \
+		$(use_enable zlib) \
+		$(use_enable jpeg) \
+		$(use_enable jbig) \
+		--without-x
+}
+
+multilib_src_install() {
+	# Let `make install` and libtool handle insecure runpath(s)
+	dodir tmp
+	emake DESTDIR="${ED}/tmp" install
+
+	# .so.3 (upstream) is used by sci-chemistry/icm
+	# .so.4 (Debian) is used by net-im/skype
+	exeinto /usr/$(get_libdir)
+	doexe "${ED}"/tmp/libdir/libtiff$(get_libname 3)
+	dosym libtiff$(get_libname 3) /usr/$(get_libdir)/libtiff$(get_libname 4)
+	if use cxx; then
+		doexe "${ED}"/tmp/libdir/libtiffxx$(get_libname 3)
+		dosym libtiffxx$(get_libname 3) /usr/$(get_libdir)/libtiffxx$(get_libname 4)
+	fi
+
+	rm -rf "${ED}"/tmp
+}