db fix, mark 1.0.8-r5 x86

5 files changed, 24 insertions, 24 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 39e48468fcbf..f723f3129566 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gconf
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.38 2003/06/20 00:25:00 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.39 2003/06/27 14:15:24 foser Exp $
+
+  27 Jun 2003; foser <foser@gentoo.org> gconf-1.0.8-r{3,4,5}.ebuild :
+  Removed db dep (#23582) 
+  removed guile dep as well in r5 and fixed R(DEP) order
 
 *gconf-1.0.8-r5 (20 Jun 2003)
 
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index a2e864271b29..2b7f6a8f4825 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1,9 +1,9 @@
-MD5 caafc2baaeeda2786822ae034b2936ef gconf-1.0.8-r3.ebuild 1719
+MD5 8fac29435bce62bf976c7864bc4b3fe8 gconf-1.0.8-r3.ebuild 1695
 MD5 022e7286c2ed0c055cf6254b60de9092 gconf-2.2.1.ebuild 1799
-MD5 f08d03f7aa85552b53a50daf06f2059d gconf-1.0.8-r5.ebuild 1891
+MD5 bdb1e7c0f5f72b60c41b5c7d31769d06 gconf-1.0.8-r5.ebuild 1844
 MD5 356552e8597c56673ae9e9acf85e817d gconf-2.2.0.ebuild 1799
-MD5 626866ef27e81654460089dd9225a601 ChangeLog 6234
-MD5 22b3a3ecf98aa4ec9a7c88dae46ada44 gconf-1.0.8-r4.ebuild 1821
+MD5 e95f98aa53134466c2a665ad21578b35 ChangeLog 6388
+MD5 08121c318dae121004878acd75e0bccf gconf-1.0.8-r4.ebuild 1796
 MD5 8485bd44122f283d1549e1f1cdddd03f files/gconfd-2-fix.patch 1820
 MD5 f0a71242e14d4bae36c2e6dbc1b675b1 files/digest-gconf-2.2.0 65
 MD5 74dce531af7567e546dfd4f0f7dc7572 files/digest-gconf-2.2.1 65
diff --git a/gnome-base/gconf/gconf-1.0.8-r3.ebuild b/gnome-base/gconf/gconf-1.0.8-r3.ebuild
index 0dd36d5a94cc..0ff3d6e48d2d 100644
--- a/gnome-base/gconf/gconf-1.0.8-r3.ebuild
+++ b/gnome-base/gconf/gconf-1.0.8-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-1.0.8-r3.ebuild,v 1.11 2003/02/13 12:05:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-1.0.8-r3.ebuild,v 1.12 2003/06/27 14:15:24 foser Exp $
 
 IUSE="nls"
 
@@ -13,8 +13,7 @@ SLOT="1"
 LICENSE="LGPL-2.1"
 KEYWORDS="x86 ppc sparc "
 
-RDEPEND=">=sys-libs/db-3.2.3h 
-	nls? ( sys-devel/gettext )"
+RDEPEND="nls? ( sys-devel/gettext )"
 
 DEPEND="${RDEPEND} 
 	>=dev-util/guile-1.4
diff --git a/gnome-base/gconf/gconf-1.0.8-r4.ebuild b/gnome-base/gconf/gconf-1.0.8-r4.ebuild
index 1a2fa1379e9a..0b82b5973539 100644
--- a/gnome-base/gconf/gconf-1.0.8-r4.ebuild
+++ b/gnome-base/gconf/gconf-1.0.8-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-1.0.8-r4.ebuild,v 1.7 2003/03/27 01:23:46 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-1.0.8-r4.ebuild,v 1.8 2003/06/27 14:15:24 foser Exp $
 
 IUSE="nls"
 
@@ -16,8 +16,7 @@ KEYWORDS="~x86 ~ppc ~sparc alpha"
 inherit libtool
 
 
-RDEPEND=">=sys-libs/db-3.2.3h 
-	nls? ( sys-devel/gettext )"
+RDEPEND="nls? ( sys-devel/gettext )"
 
 DEPEND="${RDEPEND} 
 	>=dev-util/guile-1.4
diff --git a/gnome-base/gconf/gconf-1.0.8-r5.ebuild b/gnome-base/gconf/gconf-1.0.8-r5.ebuild
index 7329c3ef3a79..2a2ff0c6cac2 100644
--- a/gnome-base/gconf/gconf-1.0.8-r5.ebuild
+++ b/gnome-base/gconf/gconf-1.0.8-r5.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-1.0.8-r5.ebuild,v 1.1 2003/06/20 00:25:00 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-1.0.8-r5.ebuild,v 1.2 2003/06/27 14:15:24 foser Exp $
+
+inherit libtool
 
 IUSE="nls"
 
@@ -11,23 +13,18 @@ HOMEPAGE="http://www.gnome.org/"
 
 SLOT="1"
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~ppc ~sparc alpha"
-
-inherit libtool
-
+KEYWORDS="x86 ~ppc ~sparc alpha"
 
-RDEPEND=">=sys-libs/db-3.2.3h 
-	nls? ( sys-devel/gettext )"
-
-DEPEND="${RDEPEND} 
-	>=dev-util/guile-1.4
-	dev-util/indent
+DEPEND="dev-util/indent
 	=dev-libs/glib-1.2*
 	dev-libs/libxml
 	dev-libs/popt
 	gnome-base/oaf
 	gnome-base/ORBit"
 
+RDEPEND="${DEPEND}
+	nls? ( sys-devel/gettext )"
+
 src_unpack () {
 	unpack ${A}
 	epatch ${FILESDIR}/gconfd-2-fix.patch
@@ -53,14 +50,15 @@ src_compile() {
 }
 
 src_install() {
+
 	make prefix=${D}/usr \
 	     sysconfdir=${D}/etc \
 	     localstatedir=${D}/var/lib \
 	     install || die
 	# gconf 1.0.8 seems to gets the perms wrong on this dir.
 	chmod 0755 ${D}/etc/gconf/gconf.xml.mandatory
-    # keep this mandatory dir
-    touch ${D}/etc/gconf/gconf.xml.mandatory/.keep${SLOT}
+    	# keep this mandatory dir
+    	touch ${D}/etc/gconf/gconf.xml.mandatory/.keep${SLOT}
 	# this fix closes bug #803
 	dodoc AUTHORS COPYING ChangeLog NEWS README* TODO