New version

4 files changed, 120 insertions, 13 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index f9e80f26dd88..3adfb3372c56 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gconf
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.90 2004/11/12 02:06:03 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.91 2004/11/24 16:46:59 obz Exp $
+
+*gconf-2.8.1 (25 Nov 2004)
+
+  25 Nov 2004; Mike Gardiner <obz@gentoo.org> +gconf-2.8.1.ebuild:
+  New version
 
   11 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> gconf-2.8.0.1.ebuild:
   Stable on sparc
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index c1048a2a8a9b..5b533f2d2fa2 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1,21 +1,23 @@
-MD5 536d2303403ec552d9aac0de89e461d9 ChangeLog 12361
+MD5 3fdee6893008ef16b07b0013411788e7 gconf-2.4.0.1.ebuild 1944
 MD5 a98553ecda0f10474c4c8e69409572eb gconf-1.0.8-r3.ebuild 1707
-MD5 624f0865a66ebaecd9de1916b8b37473 gconf-1.0.8-r5.ebuild 1872
+MD5 403a06f672a0056d5e6afda5e8e7f59a gconf-2.6.1.ebuild 2110
 MD5 66df185efd44a40a10eb49af9973d764 gconf-1.0.9.ebuild 1867
-MD5 3fdee6893008ef16b07b0013411788e7 gconf-2.4.0.1.ebuild 1944
+MD5 194ca74566dbe03adac554baf64ced42 gconf-2.8.0.1.ebuild 1983
+MD5 624f0865a66ebaecd9de1916b8b37473 gconf-1.0.8-r5.ebuild 1872
 MD5 eb42a4f7745d16b68c597f8fe6f77ccb gconf-2.6.0.ebuild 1962
-MD5 403a06f672a0056d5e6afda5e8e7f59a gconf-2.6.1.ebuild 2110
+MD5 eec87690b0de9465a18110f561381ad3 gconf-2.8.1.ebuild 1980
+MD5 3170285c6a0a0b4e83f8f987fc096786 ChangeLog 12466
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 a133b18a1f153018000805ea62e11b5e gconf-2.6.2.ebuild 1952
-MD5 194ca74566dbe03adac554baf64ced42 gconf-2.8.0.1.ebuild 1983
-MD5 4452461d5fcfd96e2d95e62712554c71 files/GConf-2.6.1-gcc2_fix.patch 420
-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 aaa79f3ad5c910cfa6f813112e66f79e files/gconf-1.0.9-locallock_mdk.patch 1202
+MD5 8485bd44122f283d1549e1f1cdddd03f files/gconfd-2-fix.patch 1820
 MD5 8fa2949970b3612b9e06ce82dcd4b68a files/digest-gconf-2.4.0.1 67
+MD5 00f3861e249d7220a7d0109b5d2c4e08 files/digest-gconf-2.8.0.1 67
+MD5 faf030a14a8782cfd512c48b4b0d3297 files/digest-gconf-1.0.9 64
 MD5 cb328a03018fd32a8066856c5db76e13 files/digest-gconf-2.6.0 65
 MD5 069b5d67ce4b6a0bb68130fc9b156597 files/digest-gconf-2.6.1 65
-MD5 aaa79f3ad5c910cfa6f813112e66f79e files/gconf-1.0.9-locallock_mdk.patch 1202
-MD5 8485bd44122f283d1549e1f1cdddd03f files/gconfd-2-fix.patch 1820
 MD5 a54671d9ce7e9f5abdf7b7e9d8c1a45d files/digest-gconf-2.6.2 65
-MD5 00f3861e249d7220a7d0109b5d2c4e08 files/digest-gconf-2.8.0.1 67
+MD5 2d8f912a900d7e0525c34c4dd6eb3fc1 files/digest-gconf-2.8.1 65
+MD5 4452461d5fcfd96e2d95e62712554c71 files/GConf-2.6.1-gcc2_fix.patch 420
+MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r3 64
+MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r5 64
diff --git a/gnome-base/gconf/files/digest-gconf-2.8.1 b/gnome-base/gconf/files/digest-gconf-2.8.1
new file mode 100644
index 000000000000..21df6c26f28c
--- /dev/null
+++ b/gnome-base/gconf/files/digest-gconf-2.8.1
@@ -0,0 +1 @@
+MD5 b1173cbe33404bcbcc15710ce2a28f67 GConf-2.8.1.tar.bz2 1730812
diff --git a/gnome-base/gconf/gconf-2.8.1.ebuild b/gnome-base/gconf/gconf-2.8.1.ebuild
new file mode 100644
index 000000000000..0909c77e0883
--- /dev/null
+++ b/gnome-base/gconf/gconf-2.8.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.8.1.ebuild,v 1.1 2004/11/24 16:46:59 obz Exp $
+
+inherit eutils gnome2
+
+MY_PN=GConf
+MY_P=${MY_PN}-${PV}
+PVP=(${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"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips ~ppc64 ~arm"
+IUSE="doc"
+
+RDEPEND=">=dev-libs/glib-2.0.1
+	>=gnome-base/orbit-2.4
+	>=dev-libs/libxml2-2
+	dev-libs/popt
+	>=x11-libs/gtk+-2"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	doc? ( dev-util/gtk-doc )"
+
+# FIXME : consider merging the tree (?)
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_install() {
+
+	gnome2_src_install
+
+	# hack hack
+	dodir /etc/gconf/gconf.xml.mandatory
+	dodir /etc/gconf/gconf.xml.defaults
+	touch ${D}/etc/gconf/gconf.xml.mandatory/.keep${SLOT}
+	touch ${D}/etc/gconf/gconf.xml.defaults/.keep${SLOT}
+
+}
+
+kill_gconf () {
+
+	# this function will kill all running gconfd that could be causing troubles
+	if [ -x /usr/bin/gconftool ]
+	then
+		/usr/bin/gconftool --shutdown
+	fi
+	if [ -x /usr/bin/gconftool-1 ]
+	then
+		/usr/bin/gconftool-1 --shutdown
+	fi
+
+	# and for gconf 2
+	if [ -x /usr/bin/gconftool-2 ]
+	then
+		/usr/bin/gconftool-2 --shutdown
+	fi
+	return 0
+
+}
+
+pkg_setup () {
+
+	kill_gconf
+
+}
+
+pkg_preinst () {
+
+	kill_gconf
+
+	dodir /etc/env.d
+	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > ${D}/etc/env.d/50gconf
+
+	dodir /root/.gconfd
+
+}
+
+pkg_postinst () {
+
+	kill_gconf
+
+	#change the permissions to avoid some gconf bugs
+	einfo "changing permissions for gconf dirs"
+	find  /etc/gconf/ -type d -exec chmod ugo+rx "{}" \;
+	einfo "changing permissions for gconf files"
+	find  /etc/gconf/ -type f -exec chmod ugo+r "{}" \;
+
+}
+
+DOCS="ABOUT-NLS AUTHORS ChangeLog COPYING README INSTALL NEWS TODO"
+
+USE_DESTDIR="1"