gnome 2.4 rc1 commit

3 files changed, 96 insertions, 7 deletions

diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index b0ee3b8b6f07..5222e4ea50ba 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1,13 +1,15 @@
-MD5 0493d665f08d02cfa191709f97324b7e ChangeLog 6895
 MD5 2bdeb24eae8590fc7903478432c2d457 gconf-1.0.8-r3.ebuild 1695
-MD5 172c9912a5a0f3ed6e4f9b25da80b37e gconf-1.0.8-r4.ebuild 1795
-MD5 423a82bbcd7364a6be65f532ba8324c2 gconf-2.2.0.ebuild 1803
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 40a6d540af0c5b1390f33f53b576a4e9 gconf-2.2.1.ebuild 1785
 MD5 bc7da314f612b1e8acb74672e1f9c0ce gconf-1.0.8-r5.ebuild 1855
+MD5 423a82bbcd7364a6be65f532ba8324c2 gconf-2.2.0.ebuild 1803
+MD5 aef350109c96a112c82ea63f551a0d29 gconf-2.3.3.ebuild 1792
+MD5 0493d665f08d02cfa191709f97324b7e ChangeLog 6895
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 172c9912a5a0f3ed6e4f9b25da80b37e gconf-1.0.8-r4.ebuild 1795
+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 3b633d5429f7f806b3625afb97888bd3 files/digest-gconf-2.3.3 65
 MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r3 64
 MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r4 64
-MD5 74dce531af7567e546dfd4f0f7dc7572 files/digest-gconf-2.2.1 65
-MD5 f0a71242e14d4bae36c2e6dbc1b675b1 files/digest-gconf-2.2.0 65
 MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r5 64
-MD5 8485bd44122f283d1549e1f1cdddd03f files/gconfd-2-fix.patch 1820
diff --git a/gnome-base/gconf/files/digest-gconf-2.3.3 b/gnome-base/gconf/files/digest-gconf-2.3.3
new file mode 100644
index 000000000000..20773efc740e
--- /dev/null
+++ b/gnome-base/gconf/files/digest-gconf-2.3.3
@@ -0,0 +1 @@
+MD5 f3f400482e9f9ac2ff0bef960664b8c6 GConf-2.3.3.tar.bz2 1269400
diff --git a/gnome-base/gconf/gconf-2.3.3.ebuild b/gnome-base/gconf/gconf-2.3.3.ebuild
new file mode 100644
index 000000000000..7488ab50a2ea
--- /dev/null
+++ b/gnome-base/gconf/gconf-2.3.3.ebuild
@@ -0,0 +1,86 @@
+# 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-2.3.3.ebuild,v 1.1 2003/09/07 23:31:39 foser Exp $
+
+PN=GConf
+P=${PN}-${PV}
+
+inherit gnome2
+
+DESCRIPTION="Gnome Configuration System and Daemon"
+HOMEPAGE="http://www.gnome.org/"
+
+IUSE="doc"
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
+
+RDEPEND=">=dev-libs/glib-2.0.1
+	>=gnome-base/ORBit2-2.8
+	>=dev-libs/libxml2-2.4.17
+	>=x11-libs/gtk+-2"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	doc? ( dev-util/gtk-doc )"
+
+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
+	gnome2_pkg_postinst
+
+	#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"