[patch] fix building w/ USE=doc

exiv2-proper-multilib.patch (text/plain), 1.68 KB, created by Alex Turbov on 2013-12-21 04:10:11 UTC

--- exiv2-0.23-r2.ebuild	2013-12-20 15:34:40.000000000 +0400
+++ exiv2-0.23-r3.ebuild	2013-12-21 07:55:00.629901339 +0400
@@ -4,8 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} )
-inherit eutils multilib toolchain-funcs python-single-r1 autotools-multilib
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+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/"
@@ -49,7 +49,8 @@
 	if use doc; then
 		einfo "Updating doxygen config"
 		doxygen 2>&1 >/dev/null -u config/Doxyfile
-		python_convert_shebangs -r 2 doc/templates
+		python-any-r1_pkg_setup
+		epatch ${FILESDIR}/${P}-python3-ready.patch
 	fi
 
 	if use contrib; then
@@ -73,6 +74,7 @@
 		$(use_enable nls)
 		$(use_enable xmp)
 		$(use_enable static-libs static)
+		--disable-dependency-tracking
 	)
 
 	# plain 'use_with' fails
@@ -95,7 +97,12 @@
 			CPPFLAGS="${CPPFLAGS} -I\$(BOOST_INC_DIR) -I. -DEXV_HAVE_STDINT_H"
 	fi
 
-	use doc && multilib_for_best_abi emake doc
+	if use doc; then
+		emake_docs() {
+			emake -C ${BUILD_DIR}/doc doc
+		}
+		multilib_for_best_abi emake_docs
+	fi
 }
 
 src_install() {
@@ -107,10 +114,19 @@
 	fi
 
 	use xmp && dodoc doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt}
-	use doc && multilib_for_best_abi dohtml -r doc/html/.
+	if use doc; then
+		install_docs() {
+			dohtml -r ${BUILD_DIR}/doc/html/.
+		}
+		multilib_for_best_abi install_docs
+	fi
 	if use examples; then
+		# Install examples only once!
+		install_examples() {
 		insinto /usr/share/doc/${PF}/examples
 		docompress -x /usr/share/doc/${PF}/examples
 		doins samples/*.cpp
+		}
+		multilib_for_best_abi install_examples
 	fi
 }