Added USE=doc support. Closes bug #117894.

Package-Manager: portage-2.1_pre7-r3

4 files changed, 69 insertions, 14 deletions

diff --git a/media-libs/libexif/ChangeLog b/media-libs/libexif/ChangeLog
index 0948c6632805..0db5daf2dbbe 100644
--- a/media-libs/libexif/ChangeLog
+++ b/media-libs/libexif/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libexif
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/ChangeLog,v 1.48 2006/04/01 04:27:29 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/ChangeLog,v 1.49 2006/04/01 05:23:55 eradicator Exp $
+
+  01 Apr 2006; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/libexif-0.6.13-doxygen.patch, libexif-0.6.13.ebuild:
+  Added USE=doc support.  Closes bug #117894.
 
 *libexif-0.6.13 (01 Apr 2006)
 
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index 7d6727f4b317..e2ca3ee7b1a1 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 472396721dc058e1deafc5f7485ee057 ChangeLog 6831
-RMD160 e147b30528876e386c52bc916a25a4d395a6462b ChangeLog 6831
-SHA256 cdaaf3840e94e94daec084d2487432e98adc0e58d5c3714cacec68a9460ec963 ChangeLog 6831
+MD5 4d0d1093497ec6ffbff3e54e13245a1f ChangeLog 6997
+RMD160 695cc97f963d7e9f697ec052073456dce31178f5 ChangeLog 6997
+SHA256 24b044416ba3423cd43a45c8d0363dd0dc8617e2edc44cc5ba52fc7dbfa2cb3c ChangeLog 6997
 MD5 c6e7ee4006cd2b5bd7cb0367f816fc8a files/digest-libexif-0.5.12-r2 66
 RMD160 4162cf85f3d192b52a9c4a08d96994242ae07db7 files/digest-libexif-0.5.12-r2 66
 SHA256 890b232ff29d997a3d8f1b86a817f8e8a4a9f105f5d891050744a43ea85b4495 files/digest-libexif-0.5.12-r2 66
@@ -34,6 +34,9 @@ SHA256 b0126183f19457a29b85d150989e13a7edaf11bc2ffef9a03875661081c52dbe files/li
 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
+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
 MD5 6cb6aaa6c49619c82d80ecd0df8e5468 libexif-0.5.12-r2.ebuild 1077
 RMD160 071fd317995bb5a4c42e9a4d32b396666aba65fc libexif-0.5.12-r2.ebuild 1077
 SHA256 58be5f92992605f1a5daef03495a503104741cd3b5bcd3546a5f769c6faf22f1 libexif-0.5.12-r2.ebuild 1077
@@ -43,16 +46,16 @@ SHA256 9fd83fe926cec0e85d2fa7880ee4f4992db346e29b376b5a7b56f33398675b88 libexif-
 MD5 c02a1894ffa6da56616a08f9d7fa7b44 libexif-0.6.12-r4.ebuild 1662
 RMD160 ec2a2a6ab87ce802b50a22804fda310a4fc01f6a libexif-0.6.12-r4.ebuild 1662
 SHA256 fda529739ea5b472295a77abebf95021e2aa5c6d05895d833dad1804bc68a2d4 libexif-0.6.12-r4.ebuild 1662
-MD5 bf3ac211372a9aca37474734dd4aebf8 libexif-0.6.13.ebuild 1452
-RMD160 cca28cea173b1d92d7832e7566a161ffbef19772 libexif-0.6.13.ebuild 1452
-SHA256 952c6c4914e2767f87d13ff3cc1f688ac44cb7669896971d210b307a2b86d23a libexif-0.6.13.ebuild 1452
+MD5 e8eb84b1fb10edb4472cc79a4ead90bd libexif-0.6.13.ebuild 1549
+RMD160 46355efda6dd3add3d24e6940b28ad9705c8c720 libexif-0.6.13.ebuild 1549
+SHA256 ea95813c94ea3260a16dc6323ba262d8c61b2d99a6f0b22aaba8ae6ff8e46aca libexif-0.6.13.ebuild 1549
 MD5 c1e212329f9083e2405b16dd382d6632 metadata.xml 259
 RMD160 d1f5ea37202987c54db9697175a55e5609386654 metadata.xml 259
 SHA256 14f1bab6a31d434eda6319b2783239e50179d75501edb6e255bb6c3e665418cf metadata.xml 259
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFELgE+OpjtAl+gMRURAhBAAKCRLsWCwixAh9bKcRXMoB03z4FbvQCg20mK
-iSihiBnQrhz4FnNi9JE3H8M=
-=tR4Z
+iD8DBQFELg6COpjtAl+gMRURAptdAKCkNsGyQy6GkUaW2pd/X+TLiroBpwCfTDQJ
+dsitLHMiUXcBVOT7cMPG46o=
+=HGzC
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libexif/files/libexif-0.6.13-doxygen.patch b/media-libs/libexif/files/libexif-0.6.13-doxygen.patch
new file mode 100644
index 000000000000..37dc6044d762
--- /dev/null
+++ b/media-libs/libexif/files/libexif-0.6.13-doxygen.patch
@@ -0,0 +1,46 @@
+Submitted By: Hugo Villeneuve <hugo at hugovil dot com>
+Date: 2006-03-04
+Initial Package Version: 0.6.13
+Origin: n/a
+Description: When doxygen is not installed, 'make install' aborts
+	     with the following error:
+	     "*** No rule to make target `install-apidocs', needed by `install-data-local'."
+
+diff -Naur libexif-0.6.13-orig/doc/Makefile.am libexif-0.6.13-patched/doc/Makefile.am
+--- libexif-0.6.13-orig/doc/Makefile.am	2005-07-18 16:34:04.000000000 -0400
++++ libexif-0.6.13-patched/doc/Makefile.am	2006-03-04 14:51:31.132839264 -0500
+@@ -74,12 +74,16 @@
+ 
+ all-local: $(DOXYGEN_STAMPS)
+ 
++if HAVE_DOXYGEN
++
+ install-data-local: install-apidocs install-apidocs-internals
+ 
+ uninstall-local: uninstall-apidocs uninstall-apidocs-internals
+ 
+ clean-local: clean-apidocs
+ 
++endif
++
+ upload: $(DOXYGEN_UPLOAD)
+ 
+ CLEANFILES = $(DOXYGEN_FILES) $(DOXYGEN_STAMPS)
+diff -Naur libexif-0.6.13-orig/doc/Makefile.in libexif-0.6.13-patched/doc/Makefile.in
+--- libexif-0.6.13-orig/doc/Makefile.in	2005-12-27 16:18:36.000000000 -0500
++++ libexif-0.6.13-patched/doc/Makefile.in	2006-03-04 14:51:18.138814656 -0500
+@@ -444,11 +444,11 @@
+ 
+ all-local: $(DOXYGEN_STAMPS)
+ 
+-install-data-local: install-apidocs install-apidocs-internals
++@HAVE_DOXYGEN_TRUE@install-data-local: install-apidocs install-apidocs-internals
+ 
+-uninstall-local: uninstall-apidocs uninstall-apidocs-internals
++@HAVE_DOXYGEN_TRUE@uninstall-local: uninstall-apidocs uninstall-apidocs-internals
+ 
+-clean-local: clean-apidocs
++@HAVE_DOXYGEN_TRUE@clean-local: clean-apidocs
+ 
+ upload: $(DOXYGEN_UPLOAD)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/media-libs/libexif/libexif-0.6.13.ebuild b/media-libs/libexif/libexif-0.6.13.ebuild
index 5f5cd151dc2b..5c0a4ff848bd 100644
--- a/media-libs/libexif/libexif-0.6.13.ebuild
+++ b/media-libs/libexif/libexif-0.6.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.ebuild,v 1.1 2006/04/01 04:27:29 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/libexif-0.6.13.ebuild,v 1.2 2006/04/01 05:23:55 eradicator Exp $
 
 inherit eutils
 
@@ -11,15 +11,17 @@ 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"
-IUSE="nls"
+IUSE="nls doc"
 
-DEPEND="dev-util/pkgconfig"
+DEPEND="dev-util/pkgconfig
+	doc? ( app-doc/doxygen )"
 RDEPEND=""
 
 src_unpack() {
 	unpack ${A}
 
 	cd ${S}
+	epatch ${FILESDIR}/libexif-0.6.13-doxygen.patch
 
 	# The libexif hackers made a goof on the soname versioning.
 	sed -i 's/^LIBEXIF_AGE=0$/LIBEXIF_AGE=2/' ${S}/configure
@@ -29,7 +31,7 @@ src_unpack() {
 }
 
 src_compile() {
-	econf $(use_enable nls) || die
+	econf $(use_enable nls) $(use_enable doc) || die
 	emake || die
 }