Include gtk-doc dep. Resolves bug #56292.

7 files changed, 12 insertions, 87 deletions

diff --git a/net-libs/gnet/ChangeLog b/net-libs/gnet/ChangeLog
index 6f17b231389c..17c69651da7d 100644
--- a/net-libs/gnet/ChangeLog
+++ b/net-libs/gnet/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-libs/gnet
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnet/ChangeLog,v 1.29 2004/06/24 23:11:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnet/ChangeLog,v 1.30 2004/07/07 20:15:12 leonardop Exp $
+
+  07 Jul 2004; L. Boshell <leonardop@gentoo.org> gnet-2.0.5.ebuild:
+  Include the gtk-doc dependency explicitly. Related to bug #56292.
 
   20 Apr 2004; Guy Martin <gmsoft@gentoo.org> gnet-2.0.5.ebuild:
   Marked stable on hppa.
@@ -8,13 +11,13 @@
   12 Apr 2004; L. Boshell <leonardop@gentoo.org> gnet-2.0.5.ebuild,
   gnet-2.0.4.ebuild, gnet-2.0.3.ebuild, gnet-1.1.5.ebuild:
   Inherit from eutils when necessary. Added IUSE statement.
-  
+
   11 Apr 2004; Gustavo Zacarias <gustavoz@gentoo.org> gnet-2.0.5.ebuild:
   stable on sparc
 
   07 Apr 2004; L. Boshell <leonardop@gentoo.org> gnet-2.0.5.ebuild:
   Marked stable on x86.
-  
+
   09 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org> gnet-1.1.9.ebuild,
   gnet-2.0.4.ebuild:
   marked stable on sparc
@@ -23,7 +26,7 @@
   gnet-2.0.5-gtkdoc_fix.patch:
   Patch to build the API docs correctly with gtk-doc-1.2. Closes bug
   #43942.
-  
+
 *gnet-2.0.5 (06 Mar 2004)
 
   06 Mar 2004; L. Boshell <leonardop@gentoo.org> gnet-2.0.5.ebuild:
diff --git a/net-libs/gnet/files/digest-gnet-1.1.5 b/net-libs/gnet/files/digest-gnet-1.1.5
deleted file mode 100644
index 057e8aa5e767..000000000000
--- a/net-libs/gnet/files/digest-gnet-1.1.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 974b29929725afc494ee8c9c21f074de /files/gnet-docdir-gentoo.diff 452
-MD5 16f4d8a31ccc6c9fe8fe50650c725b85 /gnet-1.1.5.ebuild 956
-MD5 78716aa9a76f0b68272151c6dcda60b6 gnet-1.1.5.tar.gz 368142
diff --git a/net-libs/gnet/files/digest-gnet-2.0.3 b/net-libs/gnet/files/digest-gnet-2.0.3
deleted file mode 100644
index b6ab1a47d9f2..000000000000
--- a/net-libs/gnet/files/digest-gnet-2.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 547e36985eabcd931d8ee63449bd04ad gnet-2.0.3.tar.gz 448530
diff --git a/net-libs/gnet/files/gnet-docdir-gentoo.diff b/net-libs/gnet/files/gnet-docdir-gentoo.diff
deleted file mode 100644
index 80a6ca3bf273..000000000000
--- a/net-libs/gnet/files/gnet-docdir-gentoo.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile	Sat Dec 29 21:12:17 2001
-+++ doc/gentoo-Makefile	Sat Dec 29 21:33:17 2001
-@@ -97,7 +97,7 @@
- # The directory containing the source code (if it contains documentation).
- DOC_SOURCE_DIR = ..
- 
--HTML_DIR = $(prefix)/share/doc/libgnet$(GNET_MAJOR_VERSION).$(GNET_MINOR_VERSION)-dev/html
-+HTML_DIR = $(prefix)/share/doc/gnet-$(GNET_MAJOR_VERSION).$(GNET_MINOR_VERSION).$(GNET_MICRO_VERSION)/html
- 
- TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
- 
diff --git a/net-libs/gnet/gnet-1.1.5.ebuild b/net-libs/gnet/gnet-1.1.5.ebuild
deleted file mode 100644
index b61cea6b677f..000000000000
--- a/net-libs/gnet/gnet-1.1.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnet/gnet-1.1.5.ebuild,v 1.11 2004/06/24 23:11:08 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="GNet network library."
-SRC_URI="http://www.gnetlibrary.org/src/${P}.tar.gz"
-HOMEPAGE="http://www.gnetlibrary.org/"
-
-IUSE=""
-SLOT="1"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 ppc sparc"
-
-# yes, the >= is correct, this software can use both glib 1.2 and 2.0!
-RDEPEND=">=dev-libs/glib-1.2.0"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_compile() {
-	econf \
-		--sysconfdir=/etc \
-		--localstatedir=/var/lib || die
-
-	epatch ${FILESDIR}/${PN}-docdir-gentoo.diff
-
-	emake || die
-}
-
-src_install() {
-	make \
-		prefix=${D}/usr \
-		datadir=${D}/usr/share \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		sysconfdir=${D}/etc \
-		localstatedir=${D}/var/lib \
-		install || die
-
-	dodoc AUTHORS BUGS ChangeLog COPYING NEWS README TODO
-}
diff --git a/net-libs/gnet/gnet-2.0.3.ebuild b/net-libs/gnet/gnet-2.0.3.ebuild
deleted file mode 100644
index 0ec676ea4df9..000000000000
--- a/net-libs/gnet/gnet-2.0.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnet/gnet-2.0.3.ebuild,v 1.9 2004/06/24 23:11:08 agriffis Exp $
-
-inherit gnome2
-
-DESCRIPTION="GNet network library."
-SRC_URI="http://www.gnetlibrary.org/src/${P}.tar.gz"
-HOMEPAGE="http://www.gnetlibrary.org/"
-
-IUSE=""
-SLOT="2"
-LICENSE="LGPL-2"
-KEYWORDS="x86 hppa sparc ppc"
-
-# yes, the >= is correct, this software can use both glib 1.2 and 2.0!
-RDEPEND=">=dev-libs/glib-1.2.0"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-G2CONF=" --with-html-dir=${D}/usr/share/doc/${PF}"
-
-DOCS="AUTHORS BUGS ChangeLog COPYING NEWS README TODO"
diff --git a/net-libs/gnet/gnet-2.0.5.ebuild b/net-libs/gnet/gnet-2.0.5.ebuild
index 661fb83dd8b2..6edb29487921 100644
--- a/net-libs/gnet/gnet-2.0.5.ebuild
+++ b/net-libs/gnet/gnet-2.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnet/gnet-2.0.5.ebuild,v 1.9 2004/07/07 19:28:51 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnet/gnet-2.0.5.ebuild,v 1.10 2004/07/07 20:15:12 leonardop Exp $
 
 inherit eutils gnome2
 
@@ -12,10 +12,12 @@ LICENSE="LGPL-2"
 SLOT="2"
 KEYWORDS="x86 ppc sparc ~alpha hppa ~ia64 amd64"
 
-IUSE=""
+IUSE="doc"
+
 RDEPEND=">=dev-libs/glib-1.2"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	doc? ( dev-util/gtk-doc )"
 
 G2CONF=" --with-html-dir=${D}/usr/share/gtk-doc/html"