Convert to multilib, bug #459820

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

3 files changed, 82 insertions, 9 deletions

diff --git a/media-libs/tiff/ChangeLog b/media-libs/tiff/ChangeLog
index d14179fce783..212afbf06ddd 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.235 2013/08/05 09:44:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.236 2013/08/10 17:12:02 aballier Exp $
+
+*tiff-4.0.3-r3 (10 Aug 2013)
+
+  10 Aug 2013; Alexis Ballier <aballier@gentoo.org> +tiff-4.0.3-r3.ebuild:
+  Convert to multilib, bug #459820
 
   05 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> tiff-4.0.3-r2.ebuild:
   Pull in correct SLOT of libjpeg for headers.
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index d0805b5d4c6c..3e6d00bb26e7 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -24,17 +24,14 @@ EBUILD tiff-3.9.7.ebuild 1903 SHA256 1fb8829e88efee4827555610d50e6e0c9cafc5e87f9
 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 2093 SHA256 3eea2331e4d3e7197b6f54e94f187dc8e18df9a3fc151482f9862707b4d6d246 SHA512 38c84e8135b592969acd65eecdf5376c1914f57ca5c11d1a8306fdfb20efcc0142c7d01b092d9e15b34eae9a5a575f19e2ba3181cf883a9bc55d09d4e2644da2 WHIRLPOOL 4f9827fe111ed2ee26ab9a223f2e28081532dce8ea398ca1d4577c37062d6ae4f3bf53670327808c5e195d3e2373b8b4c934b466ae2963dd6fcb60db6f1ecbaa
 EBUILD tiff-4.0.3.ebuild 1353 SHA256 ae60d4451163f8fde953b0ba1120f3a10d01601a23d457ecf05f2ea0007c477f SHA512 a5aabfa782dc9c97e9a93e7f1a224152d7a561d0c8131042ca24e5ab40744125be8fc1e1a892a4f6f808003bd2d8c881ccaafd1165522f829adf15956d9d3689 WHIRLPOOL 4841ce497247a05952c1b83f718983422b819642a133acea9ab5daa6daeccc2ceb6f6faa2b26957fa9f965751d99ed533575c550e93205386d0c427965745eb2
-MISC ChangeLog 32799 SHA256 dbadd04a669dcdf26e0c6fb35209fa0ce43a2f6412b00607bd8b8d51b3a8fb9e SHA512 0079373765bae79f563fe5478d7f9596122f034cc1a399314e1de3b25c73028adc7f8d07465e3934d7015bf2de61a2e9a0e8226d17c98878ae89cc1f96e761af WHIRLPOOL d2091516aea9b1e6792374bdf419131b2f1bf17140d2fa62f61157bd71705f3bd40af2bcf82ae7f95a51e6aa49fa8eee0d930f8a1947ee3f5047bc6c5473c0dc
+MISC ChangeLog 32939 SHA256 f9536a72214e026ffba59ae4f8d366a5f9da4e1d0ca90334455a99d01a60fa81 SHA512 2e67676a802c74b537dfbf3f96c6b800039465967c9fb525acb1d973603d92cac5bb463e39b05fbae16c772cad260f350aa190cc1b2ba3a60764468aec419124 WHIRLPOOL 6cc702db1112d363f60f64252f46a4a48120edd82515323fa90c7c58cbadee2893b728a41634d1c57cfcf93956b411267ccdc789f89240001d905bc5e4b6c932
 MISC metadata.xml 309 SHA256 c1893fd7aaa763da14257353ceca7356500d8c8112f635f587c4ef407bd6ca51 SHA512 435eddb4a4280b37dd5948f305f88c5b3c8d193d50776a4c608132addcff03016fb00b218ad8be93a59dfdde28b57fc9d1327b18dc772344057147a5d3826f4b WHIRLPOOL b3323fa861535082bd475896c3cd5490c584cfe0262ffa25288bcda76e36ee58c42c825811ccc34078ed624e48467842012750cd650cf91398313cf4c6b60892
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR/3ORAAoJEEdUh39IaPFNq2sH/3wITsvA34zGn8AbCIv00Yyo
-QpBmIYH+wsu52UmiEm97XV7xVDTrRvQi/Z8hFo0T8Qn/sjSNXeyE01D8ioH8m3uF
-zzCSoKbM1WxtQ8BAX1Rour6uMWHAAFqavVG6FCygqBgalg1UeGWjHYeWHNDRYO/j
-CZnK4eXLQ9naJL7X4H1XSMMQiUquVD2EHz0GvXCGG5ywHFlBP9h4JR8kuw7/10U/
-4nICammT8jYX5wlyy/vPQY7duEVQsHnFSoZJfIVlDPcXo4uER/ivIvfD+u3Qa6qz
-KafgtVXn7MUtXaWhiOx+2lqemaJmG00FhA7AiNU7WyeW+btFuCX7LFTFJtX1oEk=
-=lqJc
+iEYEAREIAAYFAlIGdGQACgkQvFcC4BYPU0rbAQCfWMFHLRSDkOuEOPRkt2uLFF2u
+np0An0QrV0o6HiMmeRONqseQs/3Jnzrs
+=sysg
 -----END PGP SIGNATURE-----
diff --git a/media-libs/tiff/tiff-4.0.3-r3.ebuild b/media-libs/tiff/tiff-4.0.3-r3.ebuild
new file mode 100644
index 000000000000..b46d21ed528c
--- /dev/null
+++ b/media-libs/tiff/tiff-4.0.3-r3.ebuild
@@ -0,0 +1,71 @@
+# 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-4.0.3-r3.ebuild,v 1.1 2013/08/10 17:12:02 aballier Exp $
+
+EAPI=5
+inherit eutils libtool multilib-minimal
+
+DESCRIPTION="Tag Image File Format (TIFF) library"
+HOMEPAGE="http://www.remotesensing.org/libtiff/"
+SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
+	ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz"
+
+LICENSE="libtiff"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cxx jbig jpeg lzma static-libs zlib"
+
+RDEPEND="jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	jbig? ( media-libs/jbigkit:=[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/tiffconf.h
+)
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.0.3-tiff2pdf-colors.patch #145055
+	epatch "${FILESDIR}"/${P}-CVE-2012-{4447,4564}.patch #440944
+	epatch "${FILESDIR}"/${P}-CVE-2013-{1960,1961}.patch #468334
+	epatch "${FILESDIR}"/${P}-libjpeg-turbo.patch
+
+	elibtoolize
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable static-libs static) \
+		$(use_enable zlib) \
+		$(use_enable jpeg) \
+		$(use_enable jbig) \
+		$(use_enable lzma) \
+		$(use_enable cxx) \
+		--without-x \
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
+
+	# remove useless subdirs
+	if ! multilib_is_native_abi ; then
+		sed -i \
+			-e 's/ tools//' \
+			-e 's/ contrib//' \
+			-e 's/ man//' \
+			-e 's/ html//' \
+			Makefile || die
+	fi
+}
+
+multilib_src_test() {
+	if ! multilib_is_native_abi ; then
+		cd tools
+		emake
+		cd "${BUILD_DIR}"
+	fi
+	emake check
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --all
+	rm -f "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION}
+}