a fix for the long-time annoyance of gconf started before gconf-2. now something for the past

5 files changed, 128 insertions, 3 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index ca6da159f315..39e48468fcbf 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,13 @@
 # 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.37 2003/06/03 11:13:31 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.38 2003/06/20 00:25:00 spider Exp $
+
+*gconf-1.0.8-r5 (20 Jun 2003)
+
+  20 Jun 2003; <spider@gentoo.org> gconf-1.0.8-r5.ebuild,
+  files/gconfd-2-fix.patch:
+  A fix for the problem with "gconf started before gconf2" , added an extra
+  searchpath.
 
 *gconf-2.2.1 (03 Jun 2003)
 
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index a51aeb13330a..a2e864271b29 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1,9 +1,10 @@
 MD5 caafc2baaeeda2786822ae034b2936ef gconf-1.0.8-r3.ebuild 1719
 MD5 022e7286c2ed0c055cf6254b60de9092 gconf-2.2.1.ebuild 1799
-MD5 22b3a3ecf98aa4ec9a7c88dae46ada44 gconf-1.0.8-r5.ebuild 1821
+MD5 f08d03f7aa85552b53a50daf06f2059d gconf-1.0.8-r5.ebuild 1891
 MD5 356552e8597c56673ae9e9acf85e817d gconf-2.2.0.ebuild 1799
-MD5 0e421df7ade5ec542d1c4f57abbc7a41 ChangeLog 6025
+MD5 626866ef27e81654460089dd9225a601 ChangeLog 6234
 MD5 22b3a3ecf98aa4ec9a7c88dae46ada44 gconf-1.0.8-r4.ebuild 1821
+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
 MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r3 64
diff --git a/gnome-base/gconf/files/digest-gconf-1.0.8-r5 b/gnome-base/gconf/files/digest-gconf-1.0.8-r5
new file mode 100644
index 000000000000..94b9f10e773b
--- /dev/null
+++ b/gnome-base/gconf/files/digest-gconf-1.0.8-r5
@@ -0,0 +1 @@
+MD5 b0d662f3fa1dbab01796efe695577c74 GConf-1.0.8.tar.gz 1240140
diff --git a/gnome-base/gconf/files/gconfd-2-fix.patch b/gnome-base/gconf/files/gconfd-2-fix.patch
new file mode 100644
index 000000000000..71b753006fb5
--- /dev/null
+++ b/gnome-base/gconf/files/gconfd-2-fix.patch
@@ -0,0 +1,36 @@
+diff -urw GConf-1.0.8.orig/gconf/gconf-internals.c GConf-1.0.8/gconf/gconf-internals.c
+--- GConf-1.0.8.orig/gconf/gconf-internals.c	2002-01-23 20:42:06.000000000 +0100
++++ GConf-1.0.8/gconf/gconf-internals.c	2003-06-20 02:14:49.000000000 +0200
+@@ -3038,7 +3038,9 @@
+           goto out;
+         }
+ 
+-      if (gconf_file_exists (GCONF_BINDIR"/gconfd-2"))
++      if (gconf_file_exists (GCONF_LIBEXECDIR"/gconfd-2"))
++        argv[0] = g_strconcat (GCONF_LIBEXECDIR, "/gconfd-2", NULL);
++			else if (gconf_file_exists (GCONF_BINDIR"/gconfd-2"))
+         argv[0] = g_strconcat (GCONF_BINDIR, "/gconfd-2", NULL);
+       else
+         argv[0] = g_strconcat (GCONF_BINDIR, "/" GCONFD, NULL);
+diff -urw GConf-1.0.8.orig/gconf/Makefile.am GConf-1.0.8/gconf/Makefile.am
+--- GConf-1.0.8.orig/gconf/Makefile.am	2001-09-27 20:09:49.000000000 +0200
++++ GConf-1.0.8/gconf/Makefile.am	2003-06-20 02:14:49.000000000 +0200
+@@ -16,6 +16,7 @@
+ 	-DGCONF_ETCDIR=\""$(sysconfdir)/gconf"\"			\
+ 	-DGCONF_BUILDDIR=\""$(top_builddir)"\"				\
+ 	-DGCONF_BINDIR=\""$(bindir)"\"					\
++	-DGCONF_LIBEXECDIR=\""$(libexecdir)"\"                          \
+ 	-DGCONF_BACKEND_DIR=\""$(pkglibdir)/$(MAJOR_VERSION)"\"		\
+ 	-DVERSION=\""$(VERSION)"\"					\
+ 	-DIID=\""OAFIID:gconfd:19991118"\"				\
+diff -urw GConf-1.0.8.orig/gconf/Makefile.in GConf-1.0.8/gconf/Makefile.in
+--- GConf-1.0.8.orig/gconf/Makefile.in	2002-02-05 00:37:13.000000000 +0100
++++ GConf-1.0.8/gconf/Makefile.in	2003-06-20 02:16:37.000000000 +0200
+@@ -161,6 +161,7 @@
+ 	-DGCONF_ETCDIR=\""$(sysconfdir)/gconf"\"			\
+ 	-DGCONF_BUILDDIR=\""$(top_builddir)"\"				\
+ 	-DGCONF_BINDIR=\""$(bindir)"\"					\
++	-DGCONF_LIBEXECDIR=\""$(libexecdir)"\"					\
+ 	-DGCONF_BACKEND_DIR=\""$(pkglibdir)/$(MAJOR_VERSION)"\"		\
+ 	-DVERSION=\""$(VERSION)"\"					\
+ 	-DIID=\""OAFIID:gconfd:19991118"\"				\
diff --git a/gnome-base/gconf/gconf-1.0.8-r5.ebuild b/gnome-base/gconf/gconf-1.0.8-r5.ebuild
new file mode 100644
index 000000000000..7329c3ef3a79
--- /dev/null
+++ b/gnome-base/gconf/gconf-1.0.8-r5.ebuild
@@ -0,0 +1,80 @@
+# 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 $
+
+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=">=sys-libs/db-3.2.3h 
+	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_unpack () {
+	unpack ${A}
+	epatch ${FILESDIR}/gconfd-2-fix.patch
+}
+
+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
+}