new version

5 files changed, 29 insertions, 14 deletions

diff --git a/gnome-base/gnome-libs/ChangeLog b/gnome-base/gnome-libs/ChangeLog
index 326bfdd49b81..cc183d5385f7 100644
--- a/gnome-base/gnome-libs/ChangeLog
+++ b/gnome-base/gnome-libs/ChangeLog
@@ -1,6 +1,8 @@
 # ChangeLog for gnome-base/gnome-libs
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-libs/ChangeLog,v 1.8 2002/04/28 00:55:36 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-libs/ChangeLog,v 1.9 2002/04/28 23:47:56 azarah Exp $
+
+*gnome-libs-1.4.1.6 (29 Apr 2002)
 
 *gnome-libs-1.4.1.5-r1 (27 Apr 2002)
 
diff --git a/gnome-base/gnome-libs/files/digest-gnome-libs-1.4.1.5 b/gnome-base/gnome-libs/files/digest-gnome-libs-1.4.1.5
deleted file mode 100644
index 650e669828e8..000000000000
--- a/gnome-base/gnome-libs/files/digest-gnome-libs-1.4.1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a28b852859ca8ae5d9cba62898dfa935 gnome-libs-1.4.1.5.tar.bz2 2864454
diff --git a/gnome-base/gnome-libs/files/digest-gnome-libs-1.4.1.6 b/gnome-base/gnome-libs/files/digest-gnome-libs-1.4.1.6
new file mode 100644
index 000000000000..0ca96054f789
--- /dev/null
+++ b/gnome-base/gnome-libs/files/digest-gnome-libs-1.4.1.6
@@ -0,0 +1 @@
+MD5 6a629eb2b5cfebf26f3d5b59d51ee83b gnome-libs-1.4.1.6.tar.bz2 2867024
diff --git a/gnome-base/gnome-libs/gnome-libs-1.4.1.5-r1.ebuild b/gnome-base/gnome-libs/gnome-libs-1.4.1.5-r1.ebuild
index 921fb01aab93..1365d9f951cb 100644
--- a/gnome-base/gnome-libs/gnome-libs-1.4.1.5-r1.ebuild
+++ b/gnome-base/gnome-libs/gnome-libs-1.4.1.5-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-libs/gnome-libs-1.4.1.5-r1.ebuild,v 1.1 2002/04/28 00:55:36 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-libs/gnome-libs-1.4.1.5-r1.ebuild,v 1.2 2002/04/28 23:47:56 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GNOME Core Libraries"
@@ -17,6 +17,7 @@ DEPEND=">=media-libs/imlib-1.9.10
 
 RDEPEND="nls? ( >=sys-devel/gettext-0.10.40 >=dev-util/intltool-0.11 )"
 
+SLOT="1.4"
 
 src_compile() {                           
 	CFLAGS="$CFLAGS -I/usr/include/db1"
diff --git a/gnome-base/gnome-libs/gnome-libs-1.4.1.5.ebuild b/gnome-base/gnome-libs/gnome-libs-1.4.1.6.ebuild
index 2884e9d4c11d..bc28b1a9256b 100644
--- a/gnome-base/gnome-libs/gnome-libs-1.4.1.5.ebuild
+++ b/gnome-base/gnome-libs/gnome-libs-1.4.1.6.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-libs/gnome-libs-1.4.1.5.ebuild,v 1.1 2002/04/05 23:24:34 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-libs/gnome-libs-1.4.1.6.ebuild,v 1.1 2002/04/28 23:47:56 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GNOME Core Libraries"
@@ -13,8 +13,12 @@ DEPEND=">=media-libs/imlib-1.9.10
 		>=gnome-base/ORBit-0.5.12
 		>=x11-libs/gtk+-1.2.10-r4
 		<sys-libs/db-2
-		nls? ( >=sys-devel/gettext-0.10.40 >=dev-util/intltool-0.11 )"
+		doc? ( app-text/docbook-sgml 
+		       dev-util/gtk-doc )"
 
+RDEPEND="nls? ( >=sys-devel/gettext-0.10.40 >=dev-util/intltool-0.11 )"
+
+SLOT="1.4"
 
 src_compile() {                           
 	CFLAGS="$CFLAGS -I/usr/include/db1"
@@ -23,6 +27,7 @@ src_compile() {
 
 	use nls || myconf="${myconf} --disable-nls"
 	use kde && myconf="${myconf} --with-kde-datadir=/usr/share"
+	use doc || myconf="${myconf} --disable-gtk-doc"
 
 	# libtoolize
 	libtoolize --copy --force
@@ -40,9 +45,12 @@ src_compile() {
 
 	#do the docs (maby add a use variable or put in seperate
 	#ebuild since it is mostly developer docs?)
-	cd ${S}/devel-docs
-	emake || die
-	cd ${S}
+	if [ -n "`use doc`" ]
+	then
+		cd ${S}/devel-docs
+		emake || die
+		cd ${S}
+	fi
 }
 
 src_install() {
@@ -56,14 +64,18 @@ src_install() {
 		install || die
 
 	#do the docs
-	cd ${S}/devel-docs
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		docdir=${D}/usr/share/doc \
-		install || die
-	cd ${S}
+	if [ -n "`use doc`" ]
+	then
+		cd ${S}/devel-docs
+		make prefix=${D}/usr \
+			mandir=${D}/usr/share/man \
+			docdir=${D}/usr/share/doc \
+			install || die
+		cd ${S}
+	fi
 
 	rm ${D}/usr/share/gtkrc*
 
 	dodoc AUTHORS COPYING* ChangeLog README NEWS HACKING
 }
+