summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2008-10-08 20:50:41 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2008-10-08 20:50:41 +0000
commite8462e352589e828f256364c5f64e55334678d55 (patch)
tree8d3f8d23c28d74a0eb9f3b71daf2bf6a19d4e27c /media-libs/libgphoto2
parentamd64/x86 stable, bug #239368 (diff)
downloadgentoo-2-e8462e352589e828f256364c5f64e55334678d55.tar.gz
gentoo-2-e8462e352589e828f256364c5f64e55334678d55.tar.bz2
gentoo-2-e8462e352589e828f256364c5f64e55334678d55.zip
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)
Diffstat (limited to 'media-libs/libgphoto2')
-rw-r--r--media-libs/libgphoto2/ChangeLog7
-rw-r--r--media-libs/libgphoto2/libgphoto2-2.4.2.ebuild16
2 files changed, 18 insertions, 5 deletions
diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index f1e42a8e661b..ba79d429265f 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -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@gentoo.org>
+ libgphoto2-2.4.2.ebuild:
+ Generate doxygen documentation, gtk-doc documentation is broken, bug
+ #235499.
04 Aug 2008; Gilles Dartiguelongue <eva@gentoo.org> ChangeLog:
bump to 2.4.2. Fixed udev rules generator.
diff --git a/media-libs/libgphoto2/libgphoto2-2.4.2.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.2.ebuild
index 6adbf8e6efc5..a41506d5e8d4 100644
--- a/media-libs/libgphoto2/libgphoto2-2.4.2.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.4.2.ebuild
@@ -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 @@ DEPEND="${RDEPEND}
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 @@ pkg_setup() {
src_unpack() {
unpack ${A}
cd "${S}"
+
epatch "${FILESDIR}"/${PN}-2.4.0-rpm.patch
# Fix pkgconfig file when USE="-exif"
@@ -114,11 +117,16 @@ src_compile() {
--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() {