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

(Portage version: 2.1.2-r6)

6 files changed, 188 insertions, 10 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/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
+}