dep fix 'n cleanup

6 files changed, 11 insertions, 83 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 09a9965b9d8c..6bb7af0d97bb 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,9 @@
 # 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.50 2003/10/05 12:11:13 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.51 2003/10/12 17:10:51 foser Exp $
+
+  12 Oct 2003; foser <foser@gentoo.org> gconf-1.0.5*.ebuild :
+  Add gtk+1 dep for (#29708)
 
   05 Oct 2003; Mike Gardiner <obz@gentoo.org> gconf-2.4.0.1.ebuild:
   Marked stable on x86
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index 252a862931ce..45c1a30ee6c2 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1,15 +1,13 @@
 MD5 a61f596838960e773d9ad93751402fae gconf-2.4.0.1.ebuild 1928
-MD5 2bdeb24eae8590fc7903478432c2d457 gconf-1.0.8-r3.ebuild 1695
+MD5 3ee1c6b34c6813cee4984c171699b2b1 gconf-1.0.8-r3.ebuild 1713
 MD5 a77a10df297f83492290d08826dcf845 gconf-2.2.1.ebuild 1787
-MD5 11738e3ca7931c556071056947914a9e gconf-1.0.8-r5.ebuild 1847
+MD5 b097aa8285ef3cc6e352751000cf5bee gconf-1.0.8-r5.ebuild 1865
 MD5 423a82bbcd7364a6be65f532ba8324c2 gconf-2.2.0.ebuild 1803
-MD5 0faf4f305f1746ee3b717bb1f8557bb0 ChangeLog 7700
+MD5 a2d88846c479b7405d19f9a4ef2b2fc5 ChangeLog 7794
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 87a34bd430e3fce09cc7b3acbcb50c99 gconf-1.0.8-r4.ebuild 1790
 MD5 8485bd44122f283d1549e1f1cdddd03f files/gconfd-2-fix.patch 1820
 MD5 8fa2949970b3612b9e06ce82dcd4b68a files/digest-gconf-2.4.0.1 67
 MD5 f0a71242e14d4bae36c2e6dbc1b675b1 files/digest-gconf-2.2.0 65
 MD5 74dce531af7567e546dfd4f0f7dc7572 files/digest-gconf-2.2.1 65
 MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r3 64
-MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r4 64
 MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r5 64
diff --git a/gnome-base/gconf/files/digest-gconf-1.0.8-r4 b/gnome-base/gconf/files/digest-gconf-1.0.8-r4
deleted file mode 100644
index 94b9f10e773b..000000000000
--- a/gnome-base/gconf/files/digest-gconf-1.0.8-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b0d662f3fa1dbab01796efe695577c74 GConf-1.0.8.tar.gz 1240140
diff --git a/gnome-base/gconf/gconf-1.0.8-r3.ebuild b/gnome-base/gconf/gconf-1.0.8-r3.ebuild
index f41417d7b62c..1481f8406226 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.13 2003/09/06 23:51:37 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-1.0.8-r3.ebuild,v 1.14 2003/10/12 17:10:51 foser Exp $
 
 IUSE="nls"
 
@@ -19,6 +19,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/guile-1.4
 	dev-util/indent
 	=dev-libs/glib-1.2*
+	=x11-libs/gtk+-1.2*
 	dev-libs/libxml
 	dev-libs/popt
 	gnome-base/oaf
diff --git a/gnome-base/gconf/gconf-1.0.8-r4.ebuild b/gnome-base/gconf/gconf-1.0.8-r4.ebuild
deleted file mode 100644
index b2cf4b960aa4..000000000000
--- a/gnome-base/gconf/gconf-1.0.8-r4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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.10 2003/09/08 02:29:57 msterret Exp $
-
-IUSE="nls"
-
-S=${WORKDIR}/GConf-${PV}
-DESCRIPTION="Gconf"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/sources/GConf/1.0/GConf-${PV}.tar.gz"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="1"
-LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~ppc ~sparc alpha"
-
-inherit libtool
-
-
-RDEPEND="nls? ( sys-devel/gettext )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/guile-1.4
-	dev-util/indent
-	=dev-libs/glib-1.2*
-	dev-libs/libxml
-	dev-libs/popt
-	gnome-base/oaf
-	gnome-base/ORBit"
-
-src_compile() {
-	local myconf
-
-	elibtoolize
-
-	use nls	\
-		|| myconf="--disable-nls"	\
-		&& mkdir intl			\
-		&& touch intl/libgettext.h
-
-	./configure --host=${CHOST}	\
-		    --prefix=/usr \
-		    --sysconfdir=/etc \
-		    --localstatedir=/var/lib \
-		    ${myconf} || die
-
-	make || die   # Doesn't work with -j 4 (hallski)
-}
-
-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}
-	# this fix closes bug #803
-	dodoc AUTHORS COPYING ChangeLog NEWS README* TODO
-
-}
-
-pkg_postinst() {
-	# this is to fix installations where the following dir
-	# has already been merged with incorrect permissions.
-	# We can remove this fix after gconf 1.0.8 is an ancient
-	# version.
-	if [ ! -e ${ROOT}/etc/gconf/gconf.xml.mandatory ]
-	then
-		#unmerge of older revisions nuke this one
-		mkdir -p ${ROOT}/etc/gconf/gconf.xml.mandatory
-	fi
-	chmod 0755 ${ROOT}/etc/gconf/gconf.xml.mandatory
-}
diff --git a/gnome-base/gconf/gconf-1.0.8-r5.ebuild b/gnome-base/gconf/gconf-1.0.8-r5.ebuild
index 9a44bfc43e69..ff2fd33a1b66 100644
--- a/gnome-base/gconf/gconf-1.0.8-r5.ebuild
+++ b/gnome-base/gconf/gconf-1.0.8-r5.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-r5.ebuild,v 1.6 2003/09/08 02:29:57 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-1.0.8-r5.ebuild,v 1.7 2003/10/12 17:10:51 foser Exp $
 
 inherit libtool
 
@@ -17,6 +17,7 @@ KEYWORDS="x86 ~ppc ~sparc alpha hppa amd64"
 
 DEPEND="dev-util/indent
 	=dev-libs/glib-1.2*
+	=x11-libs/gtk+-1.2*
 	dev-libs/libxml
 	dev-libs/popt
 	gnome-base/oaf