[gentoo-dev] Gnome 2 .eclass testing required

[gentoo-dev] Gnome 2 .eclass testing required

[Spider]

[-- Attachment #1.1: Type: text/plain, Size: 408 bytes --]

okay, this is a patch towards gnome2.eclass that should work (worked
locally at least) and brings it up to display less erorr messages, and
makes it work with binary packages.

please test before I commit, I dont want any dangerous things in
portage.

//Spider


--
begin  .signature
This is a .signature virus! Please copy me into your .signature!
See Microsoft KB Article Q265230 for more information.
end

[-- Attachment #1.2: gnome2.eclass.diff --]
[-- Type: application/octet-stream, Size: 1832 bytes --]

Index: gnome2.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/gnome2.eclass,v
retrieving revision 1.19
diff -u -b -B -r1.19 gnome2.eclass
--- gnome2.eclass	2002/07/18 13:08:37	1.19
+++ gnome2.eclass	2002/07/30 23:58:12
@@ -23,7 +23,7 @@
 fi
 
 ELTCONF=""
-SCROLLKEEPER_UPDATE="0"
+SCROLLKEEPER_UPDATE="1"
 
 gnome2_src_configure() {
 	elibtoolize ${ELTCONF}
@@ -57,25 +57,31 @@
 	fi
 
 	# only update scrollkeeper if this package needs it
-	[ -d ${D}/var/lib/scrollkeeper ] && SCROLLKEEPER_UPDATE="1"
+	[ ! -d ${D}/var/lib/scrollkeeper ] && SCROLLKEEPER_UPDATE="0"
 }
 
-gnome2_pkg_postinst() {
-	# No more SCHEMAS variable :)
+
+gnome2_gconf_install() {
+	if [ -x ${ROOT}/usr/bin/gconftool-2 ]
+	then
         unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-	export GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source`
+		export GCONF_CONFIG_SOURCE=`${ROOT}/usr/bin/gconftool-2 --get-default-source`
 	einfo "installing gnome2 gconf schemas"	
-	cat ${WORKDIR}/../build-info/CONTENTS | grep "obj /etc/gconf/schemas" | sed 's:obj \([^ ]*\) .*:\1:' |while read F; do
+		cat ${ROOT}/var/db/pkg/*/${PN}-${PVR}/CONTENTS | grep "obj /etc/gconf/schemas" | sed 's:obj \([^ ]*\) .*:\1:' |while read F; do
 		echo "DEBUG::gconf install  ${F}"
-		/usr/bin/gconftool-2  --makefile-install-rule ${F}
+				${ROOT}/usr/bin/gconftool-2  --makefile-install-rule ${F}
 	done
-	
+	fi
 	# schema installation
+}
+
+gnome2_pkg_postinst() {
+	gnome2_gconf_install
 
-	if [ -x /usr/bin/scrollkeeper-update ] && [ SCROLLKEEPER_UPDATE = "1" ]
+	if [ -x ${ROOT}/usr/bin/scrollkeeper-update ] && [ SCROLLKEEPER_UPDATE = "1" ]
 	then
 		echo ">>> Updating Scrollkeeper"
-		scrollkeeper-update -p /var/lib/scrollkeeper
+		scrollkeeper-update -p ${ROOT}/var/lib/scrollkeeper
 	fi
 }
 

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]