add new version with patch from mandrake rpms (#28787).

5 files changed, 147 insertions, 2 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 6e76106a097b..687051d267e9 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,12 @@
 # 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.57 2003/11/15 23:57:15 gmsoft Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.58 2004/02/04 15:34:05 liquidx Exp $
+
+*gconf-1.0.9 (04 Feb 2004)
+
+  04 Feb 2004; Alastair Tse <liquidx@gentoo.org> gconf-1.0.9.ebuild,
+  files/gconf-1.0.9-locallock_mdk.patch:
+  add new version with patch from mandrake rpms (#28787).
 
   14 Nov 2003; Aron Griffis <agriffis@gentoo.org> gconf-2.4.0.1.ebuild:
   Stable on ia64
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index c86e3858e039..c1837d4233f0 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1,14 +1,17 @@
 MD5 57c98cfcb70c8585327f1d245cced1ca ChangeLog 8384
 MD5 3ee1c6b34c6813cee4984c171699b2b1 gconf-1.0.8-r3.ebuild 1713
 MD5 191ce55854537de718e039dbc4950f35 gconf-1.0.8-r5.ebuild 1873
+MD5 3d7163ee9ebe9bf73b0cb5ce80948c6b gconf-1.0.9.ebuild 1858
 MD5 423a82bbcd7364a6be65f532ba8324c2 gconf-2.2.0.ebuild 1803
 MD5 4123fc6f7296878eabe8c25f6ac581a0 gconf-2.2.1.ebuild 1870
 MD5 5bf7c6f2c53a6aeceffac021181aeab7 gconf-2.4.0.1.ebuild 1932
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r3 64
 MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r5 64
+MD5 faf030a14a8782cfd512c48b4b0d3297 files/digest-gconf-1.0.9 64
 MD5 f0a71242e14d4bae36c2e6dbc1b675b1 files/digest-gconf-2.2.0 65
 MD5 74dce531af7567e546dfd4f0f7dc7572 files/digest-gconf-2.2.1 65
 MD5 8fa2949970b3612b9e06ce82dcd4b68a files/digest-gconf-2.4.0.1 67
+MD5 aaa79f3ad5c910cfa6f813112e66f79e files/gconf-1.0.9-locallock_mdk.patch 1202
 MD5 52e623180b7b8b7336ca4c1977432da9 files/gconf-2.2.1-stdio.patch 361
 MD5 8485bd44122f283d1549e1f1cdddd03f files/gconfd-2-fix.patch 1820
diff --git a/gnome-base/gconf/files/digest-gconf-1.0.9 b/gnome-base/gconf/files/digest-gconf-1.0.9
new file mode 100644
index 000000000000..0c0a5f1316f3
--- /dev/null
+++ b/gnome-base/gconf/files/digest-gconf-1.0.9
@@ -0,0 +1 @@
+MD5 613aea1d9b7a9c504f52217451c7bf99 GConf-1.0.9.tar.bz2 784363
diff --git a/gnome-base/gconf/files/gconf-1.0.9-locallock_mdk.patch b/gnome-base/gconf/files/gconf-1.0.9-locallock_mdk.patch
new file mode 100644
index 000000000000..71dae2a61acf
--- /dev/null
+++ b/gnome-base/gconf/files/gconf-1.0.9-locallock_mdk.patch
@@ -0,0 +1,57 @@
+--- GConf-1.0.9/gconf/gconf-internals.c.locallock	2003-10-15 14:47:31.000000000 +0200
++++ GConf-1.0.9/gconf/gconf-internals.c	2003-10-28 15:40:15.000000000 +0100
+@@ -2957,10 +2957,53 @@
+     }
+ }
+ 
++enum { UNKNOWN, LOCAL, NORMAL };
++
++
++static gboolean
++gconf_use_local_locks (void)
++{
++  static int local_locks = UNKNOWN;
++   
++  if (local_locks == UNKNOWN)
++    {
++      const char *l =
++        g_getenv ("GCONF_GLOBAL_LOCKS");
++ 
++      if (l && atoi (l) == 1)
++        local_locks = NORMAL;
++      else
++        local_locks = LOCAL;
++    }
++ 
++  return local_locks == LOCAL;
++}
++
+ char*
+ gconf_get_daemon_dir (void)
+ {
+-  return g_strconcat (g_get_home_dir (), "/.gconfd", NULL);
++  if (gconf_use_local_locks ())
++    {
++      char *s;
++      char *subdir;
++      char *tmpdir;
++  
++      subdir = g_strconcat ("gconfd-", g_get_user_name (), NULL);
++        
++      if (g_getenv ("GCONF_TMPDIR")) {
++       tmpdir = g_getenv ("GCONF_TMPDIR");
++      } else {
++       tmpdir = g_get_tmp_dir ();
++      }
++
++      s = g_strconcat (tmpdir,"/", subdir, NULL);
++      
++      g_free (subdir);
++  
++      return s;
++  }
++  else
++    return g_strconcat (g_get_home_dir (), "/.gconfd", NULL);
+ }
+ 
+ char*
diff --git a/gnome-base/gconf/gconf-1.0.9.ebuild b/gnome-base/gconf/gconf-1.0.9.ebuild
new file mode 100644
index 000000000000..6ba61f1ec216
--- /dev/null
+++ b/gnome-base/gconf/gconf-1.0.9.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2004 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.9.ebuild,v 1.1 2004/02/04 15:34:05 liquidx Exp $
+
+inherit libtool gnome.org
+
+IUSE="nls"
+
+MY_PN=GConf
+MY_P=${MY_PN}-${PV}
+PVP=($(echo " $PV " | sed 's:[-\._]: :g'))
+S=${WORKDIR}/GConf-${PV}
+
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Gnome Configuration System and Daemon"
+HOMEPAGE="http://www.gnome.org/"
+SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.bz2"
+
+SLOT="1"
+LICENSE="LGPL-2.1"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
+
+DEPEND="dev-util/indent
+	=dev-libs/glib-1.2*
+	=x11-libs/gtk+-1.2*
+	dev-libs/libxml
+	dev-libs/popt
+	gnome-base/oaf
+	gnome-base/ORBit"
+
+RDEPEND="${DEPEND}
+	nls? ( sys-devel/gettext )"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_unpack () {
+	unpack ${A}
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/gconfd-2-fix.patch
+	epatch ${FILESDIR}/${P}-locallock_mdk.patch
+}
+
+src_compile() {
+	elibtoolize
+
+	use nls	\
+		&& mkdir intl			\
+		&& touch intl/libgettext.h
+		
+	econf $(use_enable nls)
+	emake || die "make failed"
+}
+
+src_install() {
+
+	make DESTDIR=${D} install || die "install failed"
+
+	# 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
+	keepdir /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
+}