Fix multilib and Python support. Bug #474654.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 67 insertions, 49 deletions

diff --git a/media-gfx/exiv2/ChangeLog b/media-gfx/exiv2/ChangeLog
index b38f75ff28bc..72371fee29ad 100644
--- a/media-gfx/exiv2/ChangeLog
+++ b/media-gfx/exiv2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/exiv2
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/ChangeLog,v 1.119 2013/12/22 12:18:11 johu Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/ChangeLog,v 1.120 2014/04/30 14:28:29 mgorny Exp $
+
+  30 Apr 2014; Michał Górny <mgorny@gentoo.org> exiv2-0.23-r2.ebuild:
+  Fix multilib and Python support. Bug #474654.
 
   22 Dec 2013; Johannes Huber <johu@gentoo.org> exiv2-0.23-r2.ebuild:
   Fix src_install with USE contrib by Rafał Mużyło <galtgendo@o2.pl>, bug
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index d7340603399b..bc5ff748fdb7 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -4,23 +4,25 @@ Hash: SHA256
 AUX exiv2-0.23-boost-fs-contrib.patch 9558 SHA256 1734a14392e6706305582b9099a9ff781e3327fb86d4d0ed6c0cb6fe60b38f85 SHA512 3abc6ae75940de6960afcfeb382754ab9f48cd4e311cdd2e00c644774c1141d2bc9ff191e145f7d37362e3364446a32f4fdcc142f0e80ff5bf8880ed18c5af26 WHIRLPOOL 7164392d53fa5d18671269cf0c6c69813527ab046c19cfba2a1a97e0430ac617f1330f1d75e197e48a84d1fcb10942b79252a96e417bd1dd61cdc9fbf04cc1d3
 DIST exiv2-0.23.tar.gz 3524381 SHA256 81fa50900be7ab16e24c6551252c21fc97abcfe855fd32c8f7ec55f398786b11 SHA512 5719a9129f0c991c2966fc9bb65021d501ff7ac193f0b1eaabed9044e7dcc331cb41a149a989fc20417ea07ee20e35a8c91e0063a81b9e2d6c3fae033fdaf39a WHIRLPOOL c80e8f7cc988a5aed117cb8d545dd126e1a9f188efc3c364debf2601d49e0d166709c2ab0f7d8dedc439621fc4766bce731ceb9deb0fde35ecae563bd424cde9
 EBUILD exiv2-0.23-r1.ebuild 2971 SHA256 54408b5d3ead00b89fdb2d35a1e64ed23b3c7a0027c2b288cb9b62f828b98792 SHA512 6ae58afa22b3d8dde7d8e0b94393e31fd054825dc80c288baf44e30fa8d4ae1bd44bf697934d79ec2ec544f0ec527301d7acd1b2fac20d8562d33a0c24561a7b WHIRLPOOL 49a2083b8e8926e70714ac291983b1adfb48196bc76087e427c13b7f093440378cb07682d9fac19159b089baaabd5893a8e21a5dad6deae29473962ad9a6d197
-EBUILD exiv2-0.23-r2.ebuild 3019 SHA256 c3d21009a2065f29823bd5a85c062e7a2a5fbc2c17ff98feb4d09407fd4aa60a SHA512 7fdbda64030ddf9c845ac1162642c0d324690d112226bdd2f6533f6b975681041951e9eaabb004511181026a145bd8c7507889fb7203e5fae407b61f046fbb1b WHIRLPOOL bd3e957c7719fc0c5e12d357b598ecec8cdef6e18906814dee06d0e4da9945154a1f7b90f4be972f0de7cc48953e0602a992c53e75f96878e01df274f654dd5b
-MISC ChangeLog 15443 SHA256 8eda5132c5ec6a21cf200c1a9a15358880643f8854f1a0d66f5d1ccd85cc0de4 SHA512 db7d3488ea2c3c61d693a5d5c89a59653f91bc3a12a39d096936c769190daba351b8f95b57cbbdcd66368f444bc11ed61567e7f812a29f2ae4b9cf9af4df5ee0 WHIRLPOOL 88bce83cd0ff473a4ded4fa93f48201371f81132ca4e78d084aa52f8ea403ced16ab50d7d41576a27a0c5da3837293fa5d1e2d7cc05ede8b69b3b83c5b0050c2
+EBUILD exiv2-0.23-r2.ebuild 3198 SHA256 1b0508146f2ae264cd5c84da9b2d19e7694172f2f14df08d0ec0620f33359f17 SHA512 d1405f88834e8faaf7a6bd7203cbf52af16d55198edbecd4643f6e14dba55683750a6c834ae2988c50a4f8c6116cb4db883d36b5b2a7f093644f0431da1093cf WHIRLPOOL 760cce328614d97dec9323574dee166ecf47c0dfe889d0545848119e9f420db57f17d07797eb42d426671e60468a03e3e545e1ca68f98d4c5b9c0333bbaab103
+MISC ChangeLog 15566 SHA256 1ec0ed0c3969585add55b810b3601b6165611c956944e48912c01eb9ad35370f SHA512 621b6347f1ea022e38ee12e96921824fac7ed9b60798a7a0e27b34c1c2f577eeaac19fc9a32b28dc5c499cd9051b976fa1bdebb62205fde177d140e523b79a18 WHIRLPOOL 4f4db5abab2bf9bc4caa1ea9846969639ccaad86cb65a7dcbb380e08df2b193cd665225d1ea2d861244ea028d829ee3a0eadfdb8c7325d6aeb3f9046ba0ac553
 MISC metadata.xml 419 SHA256 b23b53944ad27145ff517ae6e120a7788b6417358e340aaba5322897b697c810 SHA512 020bb5dd8b13580d300d7931e0d3acc9ef3d43881e06a3548dd887c05a4867493b9ee20464327d007841a5d793576008c464fed384d9dbe25a4ae6be0ccaf073 WHIRLPOOL 46b25df6e357034b8ddbe150cbd9c2da15f65866c4b8ce360d88941be536e39cde8c6189f7c18355dc15ef782ff96d3c7a387d92f28c01137d48aeb90509ae51
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSttiEAAoJEGVpnaTzz9K9/JcP/iqShCj1yXmPhUEW6elEzbde
-qAH4PKqaheUOkStG6C3bdmcrUcdPZuhGmymvOF//XH37USIcLhrzZhKqnEfo0aYa
-L8aTbUIl/IYuFJ+/M6VkzQ/QoW1z0Eu2HZxqq+hCOfcl3Sa7HhKP33t7GwMlcTDi
-qh64U7Ea7anUlXWWMVqMVZIzEUPeSd+PyXwCNgIzoWtpXyHDcf1vG3q4WS99mFAH
-ZAk3RdICHBkphQm+jpw4mzMaH/quCWfkeHtGnbCQCqVPEuFV+V1Tyr3cO1o+8CFK
-Grr9o0rn6WjGW8JH7KcDTXWsqiNwbza27hyR/PquMTBvSb1Ev0IHzQ+GQzZliOJZ
-EPc/Mr0sFjjvLWyHmeBxamE1v0huFLIL+F6cAeOUIwJP92io9Z7yNolVdS2RAW1R
-rg2cUpsu7prJeITgkTh9di4F0C1EfNrDODgewU5vYp4RL9VfuvZbsfvAF/xFdVHk
-vBl27i32C6ZfIBmHxi98tCA7O9Jw1mJq3KHkHYg3SH3LIjMIBVUskSW4w0JAQovS
-02K6RlYCLI8oMybuxYLMtV89Kqq6wBB7ha1Km6A6+wEL87XI7lpH3AegO30OFLEm
-8HRFg0ftY28vIhZZnzJBGMkaeqg1j+X2eU3H484OnooP3xzeOxCxr2+vXSp+B7IT
-r27DJmlzIxIoIO0cSJfo
-=s1Kv
+iQJ8BAEBCABmBQJTYQiPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO5dUP/3Ek+PD4pO7YQPARpK4D672Q
+pjG4PeUm1+lnpuqEAssySrpF5O1S1GJWbjI5xLdRFFP6E8rzu7hH3ev55tByC1a/
+MRQCz6HjDx64akstgTL5EXKHehlc6DATDuFImKQXxloAKZ/4Vo9gcfi3F8QUQB/Q
+DIiWtR26fmJSoEPQq8jQO9sPv7KwWgVQpWfPxtvvsvy65qMFssT34ozKAVilDQCp
+G46N8D18hrPpcixBcEz4bLCfRxDCEnX1hvsBZmOErrOTIPBUR9CGJgiKtP2G/uT/
+S3ZFZIZuqYwWfl6TsKUa8eN3skVb/ZoE4W8G9TxvQ9Zj+7vdaj2reiEg43zF1KH6
+3i81Yy+Mco0Eb5UCkVwmfSzfz/5YaGrk/qvAQXHPCqA0sp+ua1s1rSnr7hx5V49q
+TUE1+WK4J155m/kownwjN2sNTg9/vcHL80bRZYrgItx+MkwEaYHf95749oNICF1W
+FxnPKs4LwD1R0W6IcwmnldLyZ3JVxwCCzVt0dW3dAMOk1o9I1BPuhpw1+g1po6tF
+R6WoCyvHw1oIazP7kHhUC33g89Xumu6Izulm3FYY5iwbcecpsnfVQOmC98HPaZW2
+UpTi6GZJMzYFau4+tLWYFlBpbtGVJIyB7onIpsxrJklKLa+e9ucNs+j0nAcXTRNG
+7eE8WmFlrhRvX2PWQMBo
+=ke6Y
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/exiv2/exiv2-0.23-r2.ebuild b/media-gfx/exiv2/exiv2-0.23-r2.ebuild
index 7b5c131ab272..72e8a21df4ce 100644
--- a/media-gfx/exiv2/exiv2-0.23-r2.ebuild
+++ b/media-gfx/exiv2/exiv2-0.23-r2.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/exiv2-0.23-r2.ebuild,v 1.2 2013/12/22 12:18:11 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/exiv2-0.23-r2.ebuild,v 1.3 2014/04/30 14:28:29 mgorny Exp $
 
 EAPI=5
-
+AUTOTOOLS_IN_SOURCE_BUILD=1
 PYTHON_COMPAT=( python{2_6,2_7} )
-inherit eutils multilib toolchain-funcs python-single-r1 autotools-multilib
+
+inherit eutils multilib toolchain-funcs python-any-r1 autotools-multilib
 
 DESCRIPTION="EXIF and IPTC metadata C++ library and command line utility"
 HOMEPAGE="http://www.exiv2.org/"
@@ -18,10 +19,10 @@ IUSE_LINGUAS="de es fi fr pl ru sk"
 IUSE="contrib doc examples nls xmp zlib static-libs $(printf 'linguas_%s ' ${IUSE_LINGUAS})"
 
 RDEPEND="
-	virtual/libiconv
-	nls? ( virtual/libintl )
-	xmp? ( dev-libs/expat )
-	zlib? ( sys-libs/zlib )
+	virtual/libiconv[${MULTILIB_USEDEP}]
+	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
+	xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
 "
 
 DEPEND="${RDEPEND}
@@ -31,13 +32,17 @@ DEPEND="${RDEPEND}
 		dev-libs/libxslt
 		virtual/pkgconfig
 		media-gfx/graphviz
-		${PYTHON_DEPEND}
+		${PYTHON_DEPS}
 	)
 	nls? ( sys-devel/gettext )
 "
 
 DOCS=( README doc/ChangeLog doc/cmd.txt )
 
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
 src_prepare() {
 	# convert docs to UTF-8
 	local i
@@ -49,7 +54,6 @@ src_prepare() {
 	if use doc; then
 		einfo "Updating doxygen config"
 		doxygen 2>&1 >/dev/null -u config/Doxyfile
-		python_convert_shebangs -r 2 doc/templates
 	fi
 
 	if use contrib; then
@@ -59,16 +63,16 @@ src_prepare() {
 		ln -snf ../../src contrib/organize/exiv2
 		sed -i -e 's:/usr/local/include/.*:/usr/include:g' \
 			-e 's:/usr/local/lib/lib:-l:g' -e 's:-gcc..-mt-._..\.a::g' \
-			contrib/organize/boost.mk
+			contrib/organize/boost.mk || die
 	fi
 
 	# set locale to safe value for the sed commands (bug #382731)
-	sed -i -r "s,(\s+)sed\s,\1LC_ALL="C" sed ,g" src/Makefile
+	sed -i -r "s,(\s+)sed\s,\1LC_ALL="C" sed ,g" src/Makefile || die
 
-	multilib_copy_sources
+	autotools-multilib_src_prepare
 }
 
-src_configure() {
+multilib_src_configure() {
 	local myeconfargs=(
 		$(use_enable nls)
 		$(use_enable xmp)
@@ -76,38 +80,47 @@ src_configure() {
 	)
 
 	# plain 'use_with' fails
-	use zlib || myeconfargs+=("${myconf} --without-zlib")
+	use zlib || myeconfargs+=( --without-zlib )
 
 	# Bug #78720. amd64/gcc-3.4/-fvisibility* fail.
-	if [ $(gcc-major-version) -lt 4 ]; then
-		use amd64 && myeconfargs+=("${myconf} --disable-visibility")
+	if [[ ${ABI} == amd64 && $(gcc-major-version) -lt 4 ]]; then
+		myeconfargs+=( --disable-visibility )
 	fi
 
-	autotools-multilib_src_configure
+	autotools-utils_src_configure
 }
 
-src_compile() {
-	autotools-multilib_src_compile
+multilib_src_compile() {
+	emake
 
-	if use contrib; then
-		autotools-multilib_src_compile -C contrib/organize \
-			LDFLAGS="\$(BOOST_LIBS) -L../../src -lexiv2 ${LDFLAGS}" \
-			CPPFLAGS="${CPPFLAGS} -I\$(BOOST_INC_DIR) -I. -DEXV_HAVE_STDINT_H"
-	fi
+	if multilib_is_native_abi; then
+		if use contrib; then
+			emake -C contrib/organize \
+				LDFLAGS="\$(BOOST_LIBS) -L../../src -lexiv2 ${LDFLAGS}" \
+				CPPFLAGS="${CPPFLAGS} -I\$(BOOST_INC_DIR) -I. -DEXV_HAVE_STDINT_H"
+		fi
 
-	use doc && multilib_for_best_abi emake doc
+		use doc && emake doc
+	fi
 }
 
-src_install() {
-	autotools-multilib_src_install
+multilib_src_install() {
+	autotools-utils_src_install
 
-	if use contrib; then
-		autotools-multilib_src_install -C contrib/organize \
-			DESTDIR="${D}" install
+	if multilib_is_native_abi; then
+		if use contrib; then
+			emake DESTDIR="${D}" -C contrib/organize install
+		fi
+
+		use doc && dohtml -r doc/html/.
 	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
 
 	use xmp && dodoc doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt}
-	use doc && multilib_for_best_abi dohtml -r doc/html/.
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
 		docompress -x /usr/share/doc/${PF}/examples