fixed annoying bugs 150152 and 160973

Package-Manager: portage-2.1.2-r4

4 files changed, 43 insertions, 16 deletions

diff --git a/media-libs/libexif/ChangeLog b/media-libs/libexif/ChangeLog
index fd278457e9d2..e05cee25f91f 100644
--- a/media-libs/libexif/ChangeLog
+++ b/media-libs/libexif/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libexif
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/ChangeLog,v 1.61 2007/01/05 20:01:58 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/ChangeLog,v 1.62 2007/02/03 21:06:16 nerdboy Exp $
+
+  03 Feb 2007; Steve Arnold <nerdboy@gentoo.org>
+  +files/libexif-0.6.13-doxy-stamp-make.patch, libexif-0.6.13-r1.ebuild:
+  Fixed annoying bugs 150152 and 160973 (thanks to Ed Catmur and Jozsef Daniel
+  for diagnosing and posting the patch, as well as the people on the other bug).
+  Tested with all USE flags disabled and no doxygen present.
 
   05 Jan 2007; Robin H. Johnson <robbat2@gentoo.org>
   +files/libexif-0.6.13-parallel-build.patch, libexif-0.6.13-r1.ebuild:
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index 3469bc06170c..2df87f3ff5ce 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -22,6 +22,10 @@ AUX libexif-0.6.12-recurse.patch 2333 RMD160 f76c6c80022c473fd582ffe62e5a3cf3bcc
 MD5 8bf2206b6b7c7c447b7bc296288fc815 files/libexif-0.6.12-recurse.patch 2333
 RMD160 f76c6c80022c473fd582ffe62e5a3cf3bccd492d files/libexif-0.6.12-recurse.patch 2333
 SHA256 82b331e21fb6aa6f31dbd7b8797c3d922cc1bd357dd5c0ee09f7b3e1c40b41b5 files/libexif-0.6.12-recurse.patch 2333
+AUX libexif-0.6.13-doxy-stamp-make.patch 472 RMD160 cea52714dfeb604076b713a010fd6b312699a424 SHA1 cd0d4a7e34e750f3ad1032b6b65f95cd523a3575 SHA256 befb038f660f7e5be816357a16ec909a23eb1bad8591002b049218863b17b273
+MD5 d8d325c000f9a99392061c2d1b54e56e files/libexif-0.6.13-doxy-stamp-make.patch 472
+RMD160 cea52714dfeb604076b713a010fd6b312699a424 files/libexif-0.6.13-doxy-stamp-make.patch 472
+SHA256 befb038f660f7e5be816357a16ec909a23eb1bad8591002b049218863b17b273 files/libexif-0.6.13-doxy-stamp-make.patch 472
 AUX libexif-0.6.13-doxygen.patch 1631 RMD160 251b5595d4eefbde0e3ef7cd8e9f8fc1dd2cb32c SHA1 813fec831bf900c99ff013f809a8c19634b91d37 SHA256 c098d3844a2a4121dcc747822a0c25a97e81bebd983538409882dbca54dd8ade
 MD5 a800917ad4cc954929a950eb7a726f18 files/libexif-0.6.13-doxygen.patch 1631
 RMD160 251b5595d4eefbde0e3ef7cd8e9f8fc1dd2cb32c files/libexif-0.6.13-doxygen.patch 1631
@@ -45,14 +49,14 @@ EBUILD libexif-0.6.12-r4.ebuild 1658 RMD160 5a51e7d39438cdddfffad27c7d64c1e8da1c
 MD5 a2c5f1931effc7fed2e8377cecfa2067 libexif-0.6.12-r4.ebuild 1658
 RMD160 5a51e7d39438cdddfffad27c7d64c1e8da1cc972 libexif-0.6.12-r4.ebuild 1658
 SHA256 da589ec4995802006ab22258c408e9b8e55e27d05decaee89c05d5d94f5ae7ab libexif-0.6.12-r4.ebuild 1658
-EBUILD libexif-0.6.13-r1.ebuild 1721 RMD160 3211b2d98fd0543f7d0be15ed22aff99636213a7 SHA1 b7430160f1b9a9a87f3650dbc5b13e1c1dcc85f5 SHA256 057aac6d9fb3eab2c9e74d934e3425e8d63014c1ae08c919ccd4e4620c098444
-MD5 c2916e836d32c2a44fc511d34d11e07b libexif-0.6.13-r1.ebuild 1721
-RMD160 3211b2d98fd0543f7d0be15ed22aff99636213a7 libexif-0.6.13-r1.ebuild 1721
-SHA256 057aac6d9fb3eab2c9e74d934e3425e8d63014c1ae08c919ccd4e4620c098444 libexif-0.6.13-r1.ebuild 1721
-MISC ChangeLog 8412 RMD160 a8542bca914a6b1672a54a09a890d1744399d45a SHA1 afefeb0527cdf6b7fc10b6ab6579ad66c09d325b SHA256 d72a983d86d0f9f14183ce81980161f1a12b725e893b07c611b02d6661985c43
-MD5 39637edacaaa46f890434cf5c36cfdea ChangeLog 8412
-RMD160 a8542bca914a6b1672a54a09a890d1744399d45a ChangeLog 8412
-SHA256 d72a983d86d0f9f14183ce81980161f1a12b725e893b07c611b02d6661985c43 ChangeLog 8412
+EBUILD libexif-0.6.13-r1.ebuild 1985 RMD160 ba0930bc62a855079edd874eab397654d7f84a22 SHA1 d6ada73a8daa0a3fab476f52bf40b1fb199362b5 SHA256 ae3b08e8b3a5e298b16264bee122865ab9da6b1b3fb3dd5aa3b8500cf351821d
+MD5 5647259512be7c90af8b90a1e56ff26a libexif-0.6.13-r1.ebuild 1985
+RMD160 ba0930bc62a855079edd874eab397654d7f84a22 libexif-0.6.13-r1.ebuild 1985
+SHA256 ae3b08e8b3a5e298b16264bee122865ab9da6b1b3fb3dd5aa3b8500cf351821d libexif-0.6.13-r1.ebuild 1985
+MISC ChangeLog 8756 RMD160 edcb1ee6996da6ead3b0c7d6a52752be4305214e SHA1 87a5642dd1bca2c1b6d886ebec906eb8631f4de8 SHA256 3ab0b3b4a5c98a5c7db9ee2b33c320cdfa311df8bfea99fd1855b33d88b1b81b
+MD5 8c1445658f612d3187d5a700089a41e1 ChangeLog 8756
+RMD160 edcb1ee6996da6ead3b0c7d6a52752be4305214e ChangeLog 8756
+SHA256 3ab0b3b4a5c98a5c7db9ee2b33c320cdfa311df8bfea99fd1855b33d88b1b81b ChangeLog 8756
 MISC metadata.xml 259 RMD160 d1f5ea37202987c54db9697175a55e5609386654 SHA1 d7234631415b27fa166f13d440f0ea6e4d3f1044 SHA256 14f1bab6a31d434eda6319b2783239e50179d75501edb6e255bb6c3e665418cf
 MD5 c1e212329f9083e2405b16dd382d6632 metadata.xml 259
 RMD160 d1f5ea37202987c54db9697175a55e5609386654 metadata.xml 259
diff --git a/media-libs/libexif/files/libexif-0.6.13-doxy-stamp-make.patch b/media-libs/libexif/files/libexif-0.6.13-doxy-stamp-make.patch
new file mode 100644
index 000000000000..bd45dd1f5f12
--- /dev/null
+++ b/media-libs/libexif/files/libexif-0.6.13-doxy-stamp-make.patch
@@ -0,0 +1,11 @@
+--- doc/Makefile.am	2007/01/08 20:02:30	1.1
++++ doc/Makefile.am	2007/01/08 20:05:54
+@@ -16,7 +16,7 @@ $(HTML_APIDOC_INTERNALS_DIR).stamp: Doxy
+ 
+ # FIXME: Depending on the source files would be sufficient...
+ # This generates HTML_APIDOC_DIR as well as DOXYGEN_OUTPUT_DIR
+-$(DOXYGEN_OUTPUT_DIR).stamp: Doxyfile $(top_builddir)/libexif/libexif.la
++$(DOXYGEN_OUTPUT_DIR).stamp $(HTML_APIDOC_DIR).stamp: Doxyfile $(top_builddir)/libexif/libexif.la
+ 	doxygen $<
+ 	echo > $@
+ 
diff --git a/media-libs/libexif/libexif-0.6.13-r1.ebuild b/media-libs/libexif/libexif-0.6.13-r1.ebuild
index 5322424c2e19..15ed301b78f2 100644
--- a/media-libs/libexif/libexif-0.6.13-r1.ebuild
+++ b/media-libs/libexif/libexif-0.6.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/libexif-0.6.13-r1.ebuild,v 1.8 2007/01/05 20:01:58 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/libexif-0.6.13-r1.ebuild,v 1.9 2007/02/03 21:06:16 nerdboy Exp $
 
 inherit eutils libtool
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc-macos ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="nls doc"
+IUSE="doc nls static"
 
 DEPEND="dev-util/pkgconfig
 	doc? ( app-doc/doxygen )
@@ -22,9 +22,10 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	epatch ${FILESDIR}/libexif-0.6.13-doxygen.patch
-	epatch ${FILESDIR}/libexif-0.6.13-parallel-build.patch
-	epatch "${FILESDIR}/${P}-pkgconfig.patch"
+	epatch ${FILESDIR}/${P}-doxygen.patch
+	epatch ${FILESDIR}/${P}-parallel-build.patch
+	epatch ${FILESDIR}/${P}-doxy-stamp-make.patch
+	epatch ${FILESDIR}/${P}-pkgconfig.patch
 
 	# The libexif hackers made a goof on the soname versioning.
 	sed -i 's/^LIBEXIF_AGE=0$/LIBEXIF_AGE=2/' ${S}/configure
@@ -36,7 +37,11 @@ src_unpack() {
 }
 
 src_compile() {
-	econf $(use_enable nls) $(use_enable doc) || die
+	local my_conf
+	use doc && my_conf="--with-doc-dir=/usr/share/doc/${PF}"
+	use nls || my_conf="${my_conf} --without-libintl-prefix"
+	econf $(use_enable nls) $(use_enable doc) $(use_enable static) \
+		--with-pic --disable-rpath ${my_conf} || die
 	emake || die
 }
 
@@ -44,6 +49,7 @@ src_install() {
 	dodir /usr/$(get_libdir)
 	dodir /usr/include/libexif
 	use nls && dodir /usr/share/locale
+	use doc && dodir /usr/share/doc/${PF}
 	dodir /usr/$(get_libdir)/pkgconfig
 
 	make DESTDIR="${D}" install || die
@@ -51,7 +57,7 @@ src_install() {
 	dodoc ChangeLog README
 
 	# installs a blank directory for whatever broken reason
-	use nls || rm -rf ${D}/usr/share/locale
+	use nls || rm -rf ${D}usr/share/locale
 
 	# Keep around old lib
 	preserve_old_lib /usr/$(get_libdir)/libexif.so.9