Add DEPEND on dev-util/gtk-doc-am due to use of GTK_DOC_CHECK M4 macro.

Remove redundant IUSE expansion.
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

6 files changed, 42 insertions, 13 deletions

diff --git a/gpe-base/libcontactsdb/ChangeLog b/gpe-base/libcontactsdb/ChangeLog
index 177c88fb6ad7..359748950138 100644
--- a/gpe-base/libcontactsdb/ChangeLog
+++ b/gpe-base/libcontactsdb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gpe-base/libcontactsdb
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gpe-base/libcontactsdb/ChangeLog,v 1.2 2009/07/15 00:05:54 miknix Exp $
+# $Header: /var/cvsroot/gentoo-x86/gpe-base/libcontactsdb/ChangeLog,v 1.3 2009/08/26 16:27:30 miknix Exp $
+
+  26 Aug 2009; Angelo Arrifano <miknix@gentoo.org> libcontactsdb-0.5.ebuild:
+  Add DEPEND on dev-util/gtk-doc-am due to use of GTK_DOC_CHECK M4 macro.
+  Remove redundant IUSE expansion.
 
   15 Jul 2009; Angelo Arrifano <miknix@gentoo.org> libcontactsdb-0.5.ebuild:
   Add doc use flag.
diff --git a/gpe-base/libcontactsdb/libcontactsdb-0.5.ebuild b/gpe-base/libcontactsdb/libcontactsdb-0.5.ebuild
index c46cd6aceb49..4a82ac099eaf 100644
--- a/gpe-base/libcontactsdb/libcontactsdb-0.5.ebuild
+++ b/gpe-base/libcontactsdb/libcontactsdb-0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gpe-base/libcontactsdb/libcontactsdb-0.5.ebuild,v 1.2 2009/07/15 00:05:54 miknix Exp $
+# $Header: /var/cvsroot/gentoo-x86/gpe-base/libcontactsdb/libcontactsdb-0.5.ebuild,v 1.3 2009/08/26 16:27:30 miknix Exp $
 
 GPE_TARBALL_SUFFIX="bz2"
 
@@ -11,7 +11,7 @@ DESCRIPTION="Database access library for GPE calendar"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~arm ~amd64 ~x86"
-IUSE="${IUSE} doc"
+IUSE="doc"
 GPE_DOCS="ChangeLog"
 GPECONF="${GPECONF} $(use_enable doc gtk-doc)"
 
@@ -21,4 +21,5 @@ RDEPEND="${RDEPEND}
 
 DEPEND="${DEPEND}
 	${RDEPEND}
-	doc? ( >=dev-util/gtk-doc-1.2 )"
+	doc? ( >=dev-util/gtk-doc-1.2 )
+	dev-util/gtk-doc-am"
diff --git a/gpe-base/libgpevtype/ChangeLog b/gpe-base/libgpevtype/ChangeLog
index f7694fb38a00..72f9b765f92c 100644
--- a/gpe-base/libgpevtype/ChangeLog
+++ b/gpe-base/libgpevtype/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gpe-base/libgpevtype
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gpe-base/libgpevtype/ChangeLog,v 1.2 2009/07/15 02:04:23 miknix Exp $
+# $Header: /var/cvsroot/gentoo-x86/gpe-base/libgpevtype/ChangeLog,v 1.3 2009/08/26 16:32:25 miknix Exp $
+
+  26 Aug 2009; Angelo Arrifano <miknix@gentoo.org> libgpevtype-0.50.ebuild:
+  Add DEPEND on dev-util/gtk-doc-am due to use of GTK_DOC_CHECK M4 macro.
+  Remove redundant IUSE expansion.
 
   15 Jul 2009; Angelo Arrifano <miknix@gentoo.org> libgpevtype-0.50.ebuild:
   Prevent gtk-doc being always installed, add doc use flag.
diff --git a/gpe-base/libgpevtype/libgpevtype-0.50.ebuild b/gpe-base/libgpevtype/libgpevtype-0.50.ebuild
index 544dc1e3ca9f..06a10a86ea13 100644
--- a/gpe-base/libgpevtype/libgpevtype-0.50.ebuild
+++ b/gpe-base/libgpevtype/libgpevtype-0.50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gpe-base/libgpevtype/libgpevtype-0.50.ebuild,v 1.4 2009/07/16 00:44:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gpe-base/libgpevtype/libgpevtype-0.50.ebuild,v 1.5 2009/08/26 16:32:25 miknix Exp $
 
 GPE_TARBALL_SUFFIX="bz2"
 inherit gpe autotools
@@ -10,7 +10,7 @@ DESCRIPTION="Data interchange library for the GPE Palmtop Environment"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~arm ~amd64 ~x86"
-IUSE="${IUSE} doc"
+IUSE="doc"
 GPE_DOCS="ChangeLog"
 GPECONF="${GPECONF} $(use_enable doc gtk-doc)"
 
@@ -22,7 +22,8 @@ RDEPEND="${RDEPEND}
 
 DEPEND="${DEPEND}
 	${RDEPEND}
-	doc? ( >=dev-util/gtk-doc-1.2 )"
+	doc? ( >=dev-util/gtk-doc-1.2 )
+	dev-util/gtk-doc-am"
 
 src_unpack() {
 	gpe_src_unpack "$@"
diff --git a/gpe-base/libtododb/ChangeLog b/gpe-base/libtododb/ChangeLog
index 06816cde99f7..d516b66fcf03 100644
--- a/gpe-base/libtododb/ChangeLog
+++ b/gpe-base/libtododb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gpe-base/libtododb
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gpe-base/libtododb/ChangeLog,v 1.2 2009/03/01 01:05:31 miknix Exp $
+# $Header: /var/cvsroot/gentoo-x86/gpe-base/libtododb/ChangeLog,v 1.3 2009/08/26 16:36:57 miknix Exp $
+
+  26 Aug 2009; Angelo Arrifano <miknix@gentoo.org> libtododb-0.11.ebuild:
+  Add DEPEND on dev-util/gtk-doc-am due to use of GTK_DOC_CHECK M4 macro.
+  Remove redundant IUSE expansion.
 
   01 Mar 2009; <miknix@gentoo.org> libtododb-0.11.ebuild:
   Fix ebuild to use GPE_DOCS from the new gpe eclass.
diff --git a/gpe-base/libtododb/libtododb-0.11.ebuild b/gpe-base/libtododb/libtododb-0.11.ebuild
index 2e928bf9f115..65ea6aef2ab2 100644
--- a/gpe-base/libtododb/libtododb-0.11.ebuild
+++ b/gpe-base/libtododb/libtododb-0.11.ebuild
@@ -1,21 +1,36 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gpe-base/libtododb/libtododb-0.11.ebuild,v 1.2 2009/03/01 01:05:31 miknix Exp $
+# $Header: /var/cvsroot/gentoo-x86/gpe-base/libtododb/libtododb-0.11.ebuild,v 1.3 2009/08/26 16:36:57 miknix Exp $
 
 GPE_TARBALL_SUFFIX="bz2"
-inherit gpe
+inherit gpe autotools
 
 DESCRIPTION="Database access library for GPE to-do list"
 
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~arm ~amd64 ~x86"
-IUSE="${IUSE}"
+IUSE="doc"
 GPE_DOCS="ChangeLog"
+GPECONF="${GPECONF} $(use_enable doc gtk-doc)"
 
 RDEPEND="${RDEPEND}
 	>=gpe-base/libgpewidget-0.113
 	>=gpe-base/libgpepimc-0.6
 	=dev-db/sqlite-2.8*"
 
-DEPEND="${DEPEND} ${RDEPEND}"
+DEPEND="${DEPEND}
+	${RDEPEND}
+	doc? ( >=dev-util/gtk-doc-1.2 )
+	dev-util/gtk-doc-am"
+
+src_unpack() {
+	gpe_src_unpack "$@"
+
+	if ! use doc; then
+		sed -i -e 's;SUBDIRS = doc;SUBDIRS = ;' Makefile.am \
+		|| die "sed failed"
+	fi
+
+	eautoreconf
+}