Added libexif-0.6.13-r2 fixing bugs #150152, #160973 and #165240.

Package-Manager: portage-2.1.2-r6

7 files changed, 211 insertions, 18 deletions

diff --git a/media-libs/libexif/ChangeLog b/media-libs/libexif/ChangeLog
index e05cee25f91f..e9d0dddf973e 100644
--- a/media-libs/libexif/ChangeLog
+++ b/media-libs/libexif/ChangeLog
@@ -1,10 +1,23 @@
 # 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.62 2007/02/03 21:06:16 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/ChangeLog,v 1.63 2007/02/04 20:26:44 griffon26 Exp $
+
+*libexif-0.6.13-r2 (04 Feb 2007)
+
+  04 Feb 2007; Maurice van der Pot <griffon26@gentoo.org>
+  files/libexif-0.6.13-doxy-stamp-make.patch,
+  +files/libexif-0.6.13-library-versioning.patch,
+  +files/libexif-0.6.13-optional-apidocs.patch, +libexif-0.6.13-r2.ebuild:
+  Fixed a parallel make issue in the doxy-stamp-make patch of bug #160973.
+  Also really fixed #150152 this time, as well as #165240. Also corrected 
+  the library versioning patching that used to be done with sed.
+  Dropped ppc-macos keyword altogether because of bad dependencies.
+  I didn't want to make all these changes to an ebuild marked stable on so 
+  many archs, hence the -r2.
 
   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
+  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.
 
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index 2df87f3ff5ce..56e3f1cdff78 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -22,14 +22,22 @@ 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-doxy-stamp-make.patch 430 RMD160 32d7c152795ee763ea97269c25a150175483d92b SHA1 eb4b51e2991de3e62f9ff7a71bb675922a936fa2 SHA256 e2d3a6517b2b7aa25675719596be04a321cc6ed59a43fe471031fc29600c35bf
+MD5 a1d60c97c1f1458676bc7b0c56ee823c files/libexif-0.6.13-doxy-stamp-make.patch 430
+RMD160 32d7c152795ee763ea97269c25a150175483d92b files/libexif-0.6.13-doxy-stamp-make.patch 430
+SHA256 e2d3a6517b2b7aa25675719596be04a321cc6ed59a43fe471031fc29600c35bf files/libexif-0.6.13-doxy-stamp-make.patch 430
 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
 SHA256 c098d3844a2a4121dcc747822a0c25a97e81bebd983538409882dbca54dd8ade files/libexif-0.6.13-doxygen.patch 1631
+AUX libexif-0.6.13-library-versioning.patch 1297 RMD160 0b6b31f1a370f0ca287668e0b42662164ab84c46 SHA1 b155ebfc23ddfb1b81505e089a4e467e7850af48 SHA256 13a43b42dc6a3096676fd2a888e1968d4654022ae06031a4fc4ad5019be9ca0e
+MD5 ae711de7da8ef021f46f7a1f9267d2e4 files/libexif-0.6.13-library-versioning.patch 1297
+RMD160 0b6b31f1a370f0ca287668e0b42662164ab84c46 files/libexif-0.6.13-library-versioning.patch 1297
+SHA256 13a43b42dc6a3096676fd2a888e1968d4654022ae06031a4fc4ad5019be9ca0e files/libexif-0.6.13-library-versioning.patch 1297
+AUX libexif-0.6.13-optional-apidocs.patch 2214 RMD160 3c6c643a27c6a786c5fb3c1835681131c8ac37e0 SHA1 098936affe566aa44b287b511301f2f75d0a6b36 SHA256 41b30464910aa802e1d52756114e866f0f96688cf0992c2fbf93a70926cd6540
+MD5 1e5a393ced5635850cb9deae39c2b79f files/libexif-0.6.13-optional-apidocs.patch 2214
+RMD160 3c6c643a27c6a786c5fb3c1835681131c8ac37e0 files/libexif-0.6.13-optional-apidocs.patch 2214
+SHA256 41b30464910aa802e1d52756114e866f0f96688cf0992c2fbf93a70926cd6540 files/libexif-0.6.13-optional-apidocs.patch 2214
 AUX libexif-0.6.13-parallel-build.patch 1715 RMD160 b66b06e27b3c75d348bb61a4f1bea09af0beab12 SHA1 3780b02e728f70890d379fb82ffd5efeb83bbff1 SHA256 4be5e52b432894d0fa82e8e351b4ce410934edbbe6bd12ba55381ce6a45466e6
 MD5 e853e39125fc645848debd38075038ee files/libexif-0.6.13-parallel-build.patch 1715
 RMD160 b66b06e27b3c75d348bb61a4f1bea09af0beab12 files/libexif-0.6.13-parallel-build.patch 1715
@@ -53,10 +61,14 @@ EBUILD libexif-0.6.13-r1.ebuild 1985 RMD160 ba0930bc62a855079edd874eab397654d7f8
 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
+EBUILD libexif-0.6.13-r2.ebuild 1896 RMD160 e0a2a12f882d09f37bd0b769b8084c1c5d8cc3cd SHA1 98fd4566974eb98ca406c5f951b73ea99345dcc6 SHA256 b45caed4f0409e5d2b059c98ecf4287a377f38211b440f3a78fadfa42e6b989e
+MD5 359a1c510adef04d4b8a4df3427a28e6 libexif-0.6.13-r2.ebuild 1896
+RMD160 e0a2a12f882d09f37bd0b769b8084c1c5d8cc3cd libexif-0.6.13-r2.ebuild 1896
+SHA256 b45caed4f0409e5d2b059c98ecf4287a377f38211b440f3a78fadfa42e6b989e libexif-0.6.13-r2.ebuild 1896
+MISC ChangeLog 9412 RMD160 f46882c1f9f8c55363f70489e19dcca54ab8d6c9 SHA1 d1f472e633c7675ef0dd059e57e79fa7c383ac48 SHA256 f8c1f663579c7c412faf3146a19b098b7df8ab456d53e8124c273832101c81fe
+MD5 5aa81aefa1a3ef53d0bd27b5efcafd9f ChangeLog 9412
+RMD160 f46882c1f9f8c55363f70489e19dcca54ab8d6c9 ChangeLog 9412
+SHA256 f8c1f663579c7c412faf3146a19b098b7df8ab456d53e8124c273832101c81fe ChangeLog 9412
 MISC metadata.xml 259 RMD160 d1f5ea37202987c54db9697175a55e5609386654 SHA1 d7234631415b27fa166f13d440f0ea6e4d3f1044 SHA256 14f1bab6a31d434eda6319b2783239e50179d75501edb6e255bb6c3e665418cf
 MD5 c1e212329f9083e2405b16dd382d6632 metadata.xml 259
 RMD160 d1f5ea37202987c54db9697175a55e5609386654 metadata.xml 259
@@ -70,3 +82,6 @@ SHA256 a721d2469892986314a8beef62ffb84107c2e9f0848b24b31c9e213a190b6b1b files/di
 MD5 71a29ea4c5ef7e414ab84bd5a2034bac files/digest-libexif-0.6.13-r1 247
 RMD160 2bf3f9c1ecf43d26db3de4c6efe68536db395043 files/digest-libexif-0.6.13-r1 247
 SHA256 cc40bb596055061fa461e6808cbc5166d426cfc0b8e8533a7c3d05262fbd4e35 files/digest-libexif-0.6.13-r1 247
+MD5 71a29ea4c5ef7e414ab84bd5a2034bac files/digest-libexif-0.6.13-r2 247
+RMD160 2bf3f9c1ecf43d26db3de4c6efe68536db395043 files/digest-libexif-0.6.13-r2 247
+SHA256 cc40bb596055061fa461e6808cbc5166d426cfc0b8e8533a7c3d05262fbd4e35 files/digest-libexif-0.6.13-r2 247
diff --git a/media-libs/libexif/files/digest-libexif-0.6.13-r2 b/media-libs/libexif/files/digest-libexif-0.6.13-r2
new file mode 100644
index 000000000000..026f41c64342
--- /dev/null
+++ b/media-libs/libexif/files/digest-libexif-0.6.13-r2
@@ -0,0 +1,3 @@
+MD5 1b1e2b495c5aa20c08725f30545a110b libexif-0.6.13.tar.bz2 519803
+RMD160 19160314c1656c72234640074e1e1739f1a67f38 libexif-0.6.13.tar.bz2 519803
+SHA256 830802525700e65809afdd56ccdb5cd9950747044ab50666257bbb3d59a82754 libexif-0.6.13.tar.bz2 519803
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
index bd45dd1f5f12..0ddf6a1a85e6 100644
--- 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
@@ -1,11 +1,13 @@
---- 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
+diff -ruN libexif-0.6.13/doc/Makefile.am libexif-0.6.13-fixed/doc/Makefile.am
+--- libexif-0.6.13/doc/Makefile.am	2007-02-04 15:10:39.692419000 +0100
++++ libexif-0.6.13-fixed/doc/Makefile.am	2007-02-04 15:12:54.920870250 +0100
+@@ -21,6 +21,9 @@
  	doxygen $<
  	echo > $@
  
++$(HTML_APIDOC_DIR).stamp: $(DOXYGEN_OUTPUT_DIR).stamp
++	echo > $@
++
+ $(top_builddir)/libexif/libexif.la:
+ 	cd $(top_builddir)/libexif && $(MAKE) libexif.la
+ 
diff --git a/media-libs/libexif/files/libexif-0.6.13-library-versioning.patch b/media-libs/libexif/files/libexif-0.6.13-library-versioning.patch
new file mode 100644
index 000000000000..fc547fa4628f
--- /dev/null
+++ b/media-libs/libexif/files/libexif-0.6.13-library-versioning.patch
@@ -0,0 +1,30 @@
+diff -ruN libexif-0.6.13/configure.ac libexif-0.6.13-fixed/configure.ac
+--- libexif-0.6.13/configure.ac	2007-02-02 23:35:23.064441750 +0100
++++ libexif-0.6.13-fixed/configure.ac	2007-02-02 23:39:51.129194750 +0100
+@@ -37,13 +37,14 @@
+ dnl			 0 if you incremented CURRENT.
+ dnl  - CURRENT (Major):  Increment if the interface has changes or removals.
+ dnl ---------------------------------------------------------------------------
+-LIBEXIF_AGE=1
+-LIBEXIF_REVISION=0
++LIBEXIF_AGE=0
++LIBEXIF_REVISION=1
+ LIBEXIF_CURRENT=12
+ AC_SUBST([LIBEXIF_AGE])
+ AC_SUBST([LIBEXIF_REVISION])
+ AC_SUBST([LIBEXIF_CURRENT])
+-LIBEXIF_VERSION_INFO=`expr $LIBEXIF_CURRENT + $LIBEXIF_REVISION`:$LIBEXIF_AGE:$LIBEXIF_REVISION
++AC_SUBST([LIBEXIF_CURRENT_MIN],[`expr $LIBEXIF_CURRENT - $LIBEXIF_AGE`])
++LIBEXIF_VERSION_INFO=$LIBEXIF_CURRENT:$LIBEXIF_REVISION:$LIBEXIF_AGE
+ AC_SUBST([LIBEXIF_VERSION_INFO])
+ 
+ AC_PROG_CC
+@@ -129,7 +130,7 @@
+ # ---------------------------------------------------------------------------
+ # i18n support
+ # ---------------------------------------------------------------------------
+-GP_GETTEXT_HACK([${PACKAGE}-${LIBEXIF_CURRENT}],
++GP_GETTEXT_HACK([${PACKAGE}-${LIBEXIF_CURRENT_MIN}],
+                 [Lutz Müller and others])
+ ALL_LINGUAS="de es fr pl"
+ AM_GNU_GETTEXT_VERSION([0.14.1])
diff --git a/media-libs/libexif/files/libexif-0.6.13-optional-apidocs.patch b/media-libs/libexif/files/libexif-0.6.13-optional-apidocs.patch
new file mode 100644
index 000000000000..95fa835425f4
--- /dev/null
+++ b/media-libs/libexif/files/libexif-0.6.13-optional-apidocs.patch
@@ -0,0 +1,62 @@
+diff -ruN libexif-0.6.13/configure.ac libexif-0.6.13-fixed/configure.ac
+--- libexif-0.6.13/configure.ac	2005-12-27 22:17:23.000000000 +0100
++++ libexif-0.6.13-fixed/configure.ac	2007-02-02 22:19:20.387292250 +0100
+@@ -75,6 +75,22 @@
+ GP_CONFIG_MSG([Ship binaries in tarball],[$ship_binaries])
+ 
+ 
++dnl ------------------------------------------------------------------------
++dnl Whether to install api documentation
++dnl ------------------------------------------------------------------------
++
++install_apidocs=false
++AC_ARG_ENABLE([doc],
++[AS_HELP_STRING([--enable-doc],
++[Whether to install API documentation [default=no]])],[
++	if test x$enableval = xyes; then
++		install_apidocs=true
++	fi
++])
++AM_CONDITIONAL([INSTALL_APIDOCS],[$install_apidocs])
++GP_CONFIG_MSG([Install API documentation],[$install_apidocs])
++
++
+ dnl ---------------------------------------------------------------------------
+ dnl Whether -lm is required for our math functions
+ dnl ---------------------------------------------------------------------------
+diff -ruN libexif-0.6.13/doc/Makefile.am libexif-0.6.13-fixed/doc/Makefile.am
+--- libexif-0.6.13/doc/Makefile.am	2007-02-02 22:18:07.878760750 +0100
++++ libexif-0.6.13-fixed/doc/Makefile.am	2007-02-02 22:19:54.889448500 +0100
+@@ -2,6 +2,7 @@
+ # Conditional rules, depending on tool availability
+ ########################################################################
+ 
++if INSTALL_APIDOCS
+ if HAVE_DOXYGEN
+ 
+ DOXYGEN_FILES =
+@@ -62,7 +63,7 @@
+ 	ssh "sf" "find /home/groups/l/li/libexif/htdocs/internals /home/groups/l/li/libexif/htdocs/api \( -type d -exec chgrp libexif {} \; -exec chmod g+rwxs,a+rx {} \; \) -or \( -type f -exec chgrp libexif {} \; -exec chmod g+rw {} \; \( -name '*.html' -or -name '*.png' -or -name '*.php' -or -name '*.jpg' -or -name '*.css' -name '*.dot' -name '*.map' \) -exec chmod a+r {} \; \)"
+ 
+ endif
+-
++endif
+ 
+ ########################################################################
+ # Common part
+@@ -74,6 +75,7 @@
+ 
+ all-local: $(DOXYGEN_STAMPS)
+ 
++if INSTALL_APIDOCS
+ if HAVE_DOXYGEN
+ 
+ install-data-local: install-apidocs install-apidocs-internals
+@@ -83,6 +85,7 @@
+ clean-local: clean-apidocs
+ 
+ endif
++endif
+ 
+ upload: $(DOXYGEN_UPLOAD)
+ 
diff --git a/media-libs/libexif/libexif-0.6.13-r2.ebuild b/media-libs/libexif/libexif-0.6.13-r2.ebuild
new file mode 100644
index 000000000000..c2a3add1b0a5
--- /dev/null
+++ b/media-libs/libexif/libexif-0.6.13-r2.ebuild
@@ -0,0 +1,68 @@
+# 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-r2.ebuild,v 1.1 2007/02/04 20:26:44 griffon26 Exp $
+
+inherit autotools eutils
+
+DESCRIPTION="Library for parsing, editing, and saving EXIF data"
+HOMEPAGE="http://libexif.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc nls static"
+
+DEPEND="dev-util/pkgconfig
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )"
+RDEPEND="nls? ( virtual/libintl )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-doxygen.patch
+	epatch ${FILESDIR}/${P}-parallel-build.patch
+	epatch ${FILESDIR}/${P}-doxy-stamp-make.patch		# bug #160973
+	epatch ${FILESDIR}/${P}-pkgconfig.patch
+	epatch ${FILESDIR}/${P}-optional-apidocs.patch		# bug #150152
+
+	# See upstream commits of configure.ac from 1.13 to 1.15
+	epatch "${FILESDIR}/${P}-library-versioning.patch"
+
+	AT_M4DIR="m4m" eautoreconf
+}
+
+src_compile() {
+	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
+}
+
+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
+
+	dodoc ChangeLog README
+
+	# installs a blank directory for whatever broken reason
+	use nls || rm -rf ${D}usr/share/locale
+}
+
+pkg_preinst() {
+	# Keep around old lib
+	preserve_old_lib /usr/$(get_libdir)/libexif.so.9
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/libexif.so.9
+}