Hacked around gconf permissions, killing gconf in the emerge and pkg_install turns

11 files changed, 78 insertions, 167 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 23c168c2a43d..395a992e5f75 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gconf
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.15 2002/06/28 07:16:45 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.16 2002/07/06 23:08:45 spider Exp $
+
+
+gconf-1.2.0-r3 (06 Jul 2002)
+  06 Jul 2002; Spider <spider@gentoo.org> gconf-1.2.0-r3.ebuild :
+  added a hack to parse all installed gconf files and fix permissions.
+  killing gconfd  almost everywhere installing  
 
 gconf-1.2.0-r2 (28 jun 2002)
   28 Jun 2002; Spider <spider@gentoo.org> gconf-1.2.0-r2.ebuild :
diff --git a/gnome-base/gconf/files/digest-gconf-1.1.11 b/gnome-base/gconf/files/digest-gconf-1.1.11
deleted file mode 100644
index 566b1bd9b6b3..000000000000
--- a/gnome-base/gconf/files/digest-gconf-1.1.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c1107d92e7e3b0837af49b7273897c74 GConf-1.1.11.tar.bz2 921907
diff --git a/gnome-base/gconf/files/digest-gconf-1.1.11-r1 b/gnome-base/gconf/files/digest-gconf-1.1.11-r1
deleted file mode 100644
index 566b1bd9b6b3..000000000000
--- a/gnome-base/gconf/files/digest-gconf-1.1.11-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c1107d92e7e3b0837af49b7273897c74 GConf-1.1.11.tar.bz2 921907
diff --git a/gnome-base/gconf/files/digest-gconf-1.1.11-r2 b/gnome-base/gconf/files/digest-gconf-1.1.11-r2
deleted file mode 100644
index 566b1bd9b6b3..000000000000
--- a/gnome-base/gconf/files/digest-gconf-1.1.11-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c1107d92e7e3b0837af49b7273897c74 GConf-1.1.11.tar.bz2 921907
diff --git a/gnome-base/gconf/files/digest-gconf-1.1.11-r3 b/gnome-base/gconf/files/digest-gconf-1.1.11-r3
deleted file mode 100644
index 566b1bd9b6b3..000000000000
--- a/gnome-base/gconf/files/digest-gconf-1.1.11-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c1107d92e7e3b0837af49b7273897c74 GConf-1.1.11.tar.bz2 921907
diff --git a/gnome-base/gconf/files/digest-gconf-1.2.0-r3 b/gnome-base/gconf/files/digest-gconf-1.2.0-r3
new file mode 100644
index 000000000000..04dc91a16097
--- /dev/null
+++ b/gnome-base/gconf/files/digest-gconf-1.2.0-r3
@@ -0,0 +1 @@
+MD5 9815ca4ee765e86047d0f096baf8783b GConf-1.2.0.tar.bz2 935782
diff --git a/gnome-base/gconf/gconf-1.1.11-r1.ebuild b/gnome-base/gconf/gconf-1.1.11-r1.ebuild
deleted file mode 100644
index 6357b3c33568..000000000000
--- a/gnome-base/gconf/gconf-1.1.11-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-1.1.11-r1.ebuild,v 1.1 2002/06/04 07:39:51 blocke Exp $
-
-inherit gnome2
-
-MY_PN=GConf
-S=${WORKDIR}/${MY_PN}-${PV}
-DESCRIPTION="Gnome Configuration System and Daemon"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/${MY_PN}/${MY_PN}-${PV}.tar.bz2 ftp://archive.progeny.com/GNOME/pre-gnome2/sources/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="2"
-
-RDEPEND=">=dev-libs/glib-2.0.1
-		>=gnome-base/ORBit2-2.3.106
-		>=dev-libs/libxml2-2.4.17
-		>=net-libs/linc-0.1.19"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0"
-
-LIBTOOL_FIX="1"
-
-DOCS="ABOUT-NLS AUTHORS ChangeLog COPYING README* INSTALL NEWS TODO"
-
-
diff --git a/gnome-base/gconf/gconf-1.1.11-r2.ebuild b/gnome-base/gconf/gconf-1.1.11-r2.ebuild
deleted file mode 100644
index 75cbb5881396..000000000000
--- a/gnome-base/gconf/gconf-1.1.11-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-1.1.11-r2.ebuild,v 1.1 2002/06/10 20:57:52 spider Exp $
-
-inherit gnome2
-
-MY_PN=GConf
-S=${WORKDIR}/${MY_PN}-${PV}
-DESCRIPTION="Gnome Configuration System and Daemon"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/${MY_PN}/${MY_PN}-${PV}.tar.bz2 ftp://archive.progeny.com/GNOME/pre-gnome2/sources/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="2"
-
-RDEPEND=">=dev-libs/glib-2.0.1
-		>=gnome-base/ORBit2-2.3.106
-		>=dev-libs/libxml2-2.4.17
-		>=net-libs/linc-0.1.19"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0"
-
-LIBTOOL_FIX="1"
-
-pkg_preinst () {
-	# hack hack
-	dodir /etc/gconf/gconf.xml.mandatory 
-}
-DOCS="ABOUT-NLS AUTHORS ChangeLog COPYING README* INSTALL NEWS TODO"
-
-
diff --git a/gnome-base/gconf/gconf-1.1.11-r3.ebuild b/gnome-base/gconf/gconf-1.1.11-r3.ebuild
deleted file mode 100644
index c920ff9302d6..000000000000
--- a/gnome-base/gconf/gconf-1.1.11-r3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-1.1.11-r3.ebuild,v 1.1 2002/06/11 23:52:07 spider Exp $
-
-inherit gnome2
-
-MY_PN=GConf
-S=${WORKDIR}/${MY_PN}-${PV}
-DESCRIPTION="Gnome Configuration System and Daemon"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/${MY_PN}/${MY_PN}-${PV}.tar.bz2 ftp://archive.progeny.com/GNOME/pre-gnome2/sources/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="2"
-
-RDEPEND=">=dev-libs/glib-2.0.1
-		>=gnome-base/ORBit2-2.3.106
-		>=dev-libs/libxml2-2.4.17
-		>=net-libs/linc-0.1.19"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0"
-
-LIBTOOL_FIX="1"
-
-pkg_preinst () {
-	# hack hack
-	dodir /etc/gconf/gconf.xml.mandatory
-	dodir /etc/gconf/gconf.xml.defaults
-    touch ${D}/etc/gconf/gconf.xml.mandatory/.keep
-	touch ${D}/etc/gconf/gconf.xml.defaults/.keep
-		
-}
-DOCS="ABOUT-NLS AUTHORS ChangeLog COPYING README* INSTALL NEWS TODO"
-
-
diff --git a/gnome-base/gconf/gconf-1.1.11.ebuild b/gnome-base/gconf/gconf-1.1.11.ebuild
deleted file mode 100644
index ba1519ef01b6..000000000000
--- a/gnome-base/gconf/gconf-1.1.11.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-1.1.11.ebuild,v 1.1 2002/06/03 13:49:29 stroke Exp $
-
-# Do _NOT_ strip symbols in the build! Need both lines for Portage 1.8.9+
-DEBUG="yes"
-RESTRICT="nostrip"
-# force debug information
-CFLAGS="${CFLAGS} -g"
-CXXFLAGS="${CXXFLAGS} -g"
-
-MY_PN=GConf
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-DESCRIPTION="Gnome Configuration System and Daemon"
-
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/${MY_PN}/${MY_PN}-${PV}.tar.bz2
-         ftp://archive.progeny.com/GNOME/pre-gnome2/sources/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
-
-HOMEPAGE="http://www.gnome.org/"
-SLOT="2"
-
-RDEPEND=">=dev-libs/glib-2.0.1
-		>=gnome-base/ORBit2-2.3.106
-		>=dev-libs/libxml2-2.4.17
-		>=net-libs/linc-0.1.19"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0"
-src_compile() {
-	local myconf
-
-	./configure --host=${CHOST} \
-		    --prefix=/usr \
-			--sysconfdir=/etc \
-		    --infodir=/usr/share/info \
-		    --mandir=/usr/share/man \
-		    --localstatedir=/var/lib \
-			--enable-debug=yes || die "configure failed" 
-
-	emake || die "emake failed" 
-}
-
-src_install() {
-#	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		infodir=${D}/usr/share/info \
-		mandir=${D}/usr/share/man \
-		localstatedir=${D}/var/lib \
-		install || die "install failed" 
-#	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING README* INSTALL NEWS  TODO
-}
-
-
-
-#pkg_postinst() {
-#	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-#	for SCHEMA in desktop.schemas; do
-#		/usr/bin/gconftool-2  --makefile-install-rule \
-#			/etc/gconf/schemas/${SCHEMA}
-#	done
-#	
-#}
-	
-
-
diff --git a/gnome-base/gconf/gconf-1.2.0-r3.ebuild b/gnome-base/gconf/gconf-1.2.0-r3.ebuild
new file mode 100644
index 000000000000..081b469035b4
--- /dev/null
+++ b/gnome-base/gconf/gconf-1.2.0-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-1.2.0-r3.ebuild,v 1.1 2002/07/06 23:08:45 spider Exp $
+
+inherit gnome2
+
+MY_PN=GConf
+S=${WORKDIR}/${MY_PN}-${PV}
+DESCRIPTION="Gnome Configuration System and Daemon"
+SRC_URI="ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/${MY_PN}/${MY_PN}-${PV}.tar.bz2 ftp://archive.progeny.com/GNOME/pre-gnome2/sources/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
+HOMEPAGE="http://www.gnome.org/"
+LICENSE="LGPL-2.1"
+SLOT="2"
+
+RDEPEND=">=dev-libs/glib-2.0.1
+		>=gnome-base/ORBit2-2.4.0
+		>=dev-libs/libxml2-2.4.17
+		>=net-libs/linc-0.5.0"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	doc? ( dev-util/gtk-doc )"
+
+LIBTOOL_FIX="1"
+
+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
+	if [ -x /usr/bin/gconftool-2 ]
+	then
+		/usr/bin/gconftool-1 --shutdown
+	fi
+}
+
+pkg_setup () {
+  kill_gconf
+}
+pkg_preinst () {
+	kill_gconf 
+	# hack hack
+	dodir /etc/gconf/gconf.xml.mandatory
+	dodir /etc/gconf/gconf.xml.defaults
+    touch ${D}/etc/gconf/gconf.xml.mandatory/.keep
+	touch ${D}/etc/gconf/gconf.xml.defaults/.keep
+
+	dodir /etc/env.d
+	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' >${D}/etc/env.d/50gconf
+}
+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"
+
+