[gentoo-commits] gentoo-x86 commit in media-libs/libgphoto2: libgphoto2-2.4.2.ebuild ChangeLog

[Gilles Dartiguelongue (eva)]

eva         08/10/08 20:50:41

  Modified:             libgphoto2-2.4.2.ebuild ChangeLog
  Log:
  Generate doxygen documentation, gtk-doc documentation is broken, bug #235499.
  (Portage version: 2.2_rc11/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64)

Revision  Changes    Path
1.2                  media-libs/libgphoto2/libgphoto2-2.4.2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.2.ebuild?r1=1.1&r2=1.2

Index: libgphoto2-2.4.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libgphoto2-2.4.2.ebuild	4 Aug 2008 22:02:27 -0000	1.1
+++ libgphoto2-2.4.2.ebuild	8 Oct 2008 20:50:41 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.2.ebuild,v 1.1 2008/08/04 22:02:27 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.2.ebuild,v 1.2 2008/10/08 20:50:41 eva Exp $
 
 # TODO
 # 1. Track upstream bug --disable-docs does not work.
@@ -47,6 +47,8 @@
 	sys-devel/flex
 	sys-devel/libtool
 	doc? ( app-doc/doxygen )"
+# FIXME: gtk-doc is broken
+#		>=dev-util/gtk-doc-1.10 )"
 
 RDEPEND="${RDEPEND}
 	!<sys-fs/udev-114"
@@ -69,6 +71,7 @@
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+
 	epatch "${FILESDIR}"/${PN}-2.4.0-rpm.patch
 
 	# Fix pkgconfig file when USE="-exif"
@@ -114,11 +117,16 @@
 		--with-rpmbuild=/bin/true \
 		--disable-docs \
 		udevscriptdir=/lib/udev \
-		GTKDOC=/bin/true \
-		${myconf} || die "econf failed"
-# FIXME:		$(use_enable doc docs) \
+		${myconf}
+
+# FIXME: gtk-doc is currently broken
+#		$(use_enable doc docs)
 
 	emake || die "make failed"
+
+	if use doc; then
+		doxygen doc/Doxyfile || die "Documentation generation failed"
+	fi
 }
 
 src_install() {



1.136                media-libs/libgphoto2/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libgphoto2/ChangeLog?rev=1.136&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libgphoto2/ChangeLog?rev=1.136&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libgphoto2/ChangeLog?r1=1.135&r2=1.136

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- ChangeLog	4 Aug 2008 22:02:27 -0000	1.135
+++ ChangeLog	8 Oct 2008 20:50:41 -0000	1.136
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libgphoto2
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.135 2008/08/04 22:02:27 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.136 2008/10/08 20:50:41 eva Exp $
+
+  08 Oct 2008; Gilles Dartiguelongue <eva@g.o>
+  libgphoto2-2.4.2.ebuild:
+  Generate doxygen documentation, gtk-doc documentation is broken, bug
+  #235499.
 
   04 Aug 2008; Gilles Dartiguelongue <eva@g.o> ChangeLog:
   bump to 2.4.2. Fixed udev rules generator.