Don't call dodir in pkg_*; it breaks binary packages. Also use $IMAGE

instead of $D in pkg_*
Package-Manager: portage-2.0.51.22-r1

10 files changed, 70 insertions, 62 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 1144c243e6a6..44efa13f656e 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gconf
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.107 2005/06/12 21:30:03 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.108 2005/06/24 22:12:06 agriffis Exp $
+
+  24 Jun 2005; Aron Griffis <agriffis@gentoo.org> gconf-2.4.0.1.ebuild,
+  gconf-2.6.0.ebuild, gconf-2.6.1.ebuild, gconf-2.6.2.ebuild,
+  gconf-2.8.0.1.ebuild, gconf-2.8.1-r1.ebuild, gconf-2.9.91.ebuild,
+  gconf-2.10.0.ebuild:
+  Don't call dodir in pkg_*; it breaks binary packages. Also use $IMAGE
+  instead of $D in pkg_*
 
   12 Jun 2005; Olivier Crête <tester@gentoo.org> gconf-1.0.9.ebuild:
   Stable on amd64
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index 8af96ecf48c7..ecd8208ac249 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1,38 +1,38 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1eece64fd6a9e9879809e8c95c81cbc9 gconf-2.9.91.ebuild 1950
+MD5 5c4dfd8a8dce3310e814782445b08804 gconf-2.4.0.1.ebuild 1950
+MD5 b88c5b82250054f5a9be8ea02903924d gconf-2.8.1-r1.ebuild 2107
+MD5 b467af7a27e0fafbccfa9050426da5af gconf-2.9.91.ebuild 1958
+MD5 ac7cff50ecafeb03d9e4f489cbbf037f gconf-1.0.8-r3.ebuild 1707
+MD5 61309715482a129d5926c2cdde170199 gconf-2.6.1.ebuild 2117
 MD5 60612133e89c152301f9203f8a78c01d gconf-1.0.9.ebuild 1865
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 289effe74344dfc2ed55009d040aee6d gconf-2.8.0.1.ebuild 1986
 MD5 7998f0e3fab48622265a6b5277bf28ed gconf-1.0.8-r5.ebuild 1872
-MD5 6d364f24ec487a9d9134abe5b12b1d2f gconf-2.8.1-r1.ebuild 2101
-MD5 b14e4fe291038b54ef676c1601aa7bd3 gconf-2.6.0.ebuild 1962
-MD5 4218926ede4a6d271b19270ed10b57c6 gconf-2.6.1.ebuild 2110
-MD5 f291ee7fdaa9ad15f48cdd6fbf0a8507 ChangeLog 14181
-MD5 dec660df21be20d7f05aa2e2d3874248 gconf-2.8.0.1.ebuild 1980
-MD5 b2d4c37fdd546858de8a30cf2157e0d9 gconf-2.4.0.1.ebuild 1944
-MD5 ac7cff50ecafeb03d9e4f489cbbf037f gconf-1.0.8-r3.ebuild 1707
-MD5 e0039d2fbc5336c9d29fb96332422161 gconf-2.6.2.ebuild 1952
-MD5 e37131d78d2167444073fa5d5f83e2f2 gconf-2.10.0.ebuild 1947
-MD5 4452461d5fcfd96e2d95e62712554c71 files/GConf-2.6.1-gcc2_fix.patch 420
+MD5 58e2b00701806759bfa7761835bef28b gconf-2.6.0.ebuild 1968
+MD5 eeccde1f24ae973dfac5740c982253b8 ChangeLog 14506
+MD5 b560edc44a014d1c4f1cae5bbc4c1b8e gconf-2.10.0.ebuild 1953
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 cdf995c461c328fe3e5c3dcd5514ba2d gconf-2.6.2.ebuild 1959
+MD5 8cfc79bc2dbac8f93a77df81c0a90bca files/digest-gconf-2.10.0 66
+MD5 8b7fe13c7bce05cb4221bfd7ca7eb42d files/digest-gconf-2.9.91 66
 MD5 aaa79f3ad5c910cfa6f813112e66f79e files/gconf-1.0.9-locallock_mdk.patch 1202
 MD5 8485bd44122f283d1549e1f1cdddd03f files/gconfd-2-fix.patch 1820
-MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r3 64
-MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r5 64
 MD5 8fa2949970b3612b9e06ce82dcd4b68a files/digest-gconf-2.4.0.1 67
-MD5 069b5d67ce4b6a0bb68130fc9b156597 files/digest-gconf-2.6.1 65
+MD5 00f3861e249d7220a7d0109b5d2c4e08 files/digest-gconf-2.8.0.1 67
+MD5 2d8f912a900d7e0525c34c4dd6eb3fc1 files/digest-gconf-2.8.1-r1 65
 MD5 75ba48464f725fab9e0546f4dc39c2a4 files/gconf-2-locale-c.patch 501
-MD5 8cfc79bc2dbac8f93a77df81c0a90bca files/digest-gconf-2.10.0 66
-MD5 a54671d9ce7e9f5abdf7b7e9d8c1a45d files/digest-gconf-2.6.2 65
-MD5 8b7fe13c7bce05cb4221bfd7ca7eb42d files/digest-gconf-2.9.91 66
 MD5 faf030a14a8782cfd512c48b4b0d3297 files/digest-gconf-1.0.9 64
-MD5 00f3861e249d7220a7d0109b5d2c4e08 files/digest-gconf-2.8.0.1 67
 MD5 cb328a03018fd32a8066856c5db76e13 files/digest-gconf-2.6.0 65
-MD5 2d8f912a900d7e0525c34c4dd6eb3fc1 files/digest-gconf-2.8.1-r1 65
+MD5 069b5d67ce4b6a0bb68130fc9b156597 files/digest-gconf-2.6.1 65
+MD5 a54671d9ce7e9f5abdf7b7e9d8c1a45d files/digest-gconf-2.6.2 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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCrKlmmOfEJZHYOKcRAleHAJ45zParFOPZKzHbZKNyAiSDsvx9QACffb43
-Beo5AiCqpWf+FBIxCcpY1xs=
-=BHsm
+iD8DBQFCvIVBBXaUFmZvwyMRAr/6AKClpQaSLSYtpqJvMOs9dBVqtAhXogCgt5D2
+6eWnkSztaIDbNL3VkzXl/Sc=
+=NdHt
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gconf/gconf-2.10.0.ebuild b/gnome-base/gconf/gconf-2.10.0.ebuild
index d72b39902d87..674e8aaef7ba 100644
--- a/gnome-base/gconf/gconf-2.10.0.ebuild
+++ b/gnome-base/gconf/gconf-2.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.10.0.ebuild,v 1.6 2005/06/12 18:18:03 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.10.0.ebuild,v 1.7 2005/06/24 22:12:06 agriffis Exp $
 
 inherit eutils gnome2
 
@@ -43,6 +43,9 @@ src_install() {
 	touch ${D}/etc/gconf/gconf.xml.mandatory/.keep${SLOT}
 	touch ${D}/etc/gconf/gconf.xml.defaults/.keep${SLOT}
 
+	dodir /etc/env.d
+	dodir /root/.gconfd
+
 }
 
 kill_gconf() {
@@ -76,10 +79,7 @@ pkg_preinst() {
 
 	kill_gconf
 
-	dodir /etc/env.d
-	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > ${D}/etc/env.d/50gconf
-
-	dodir /root/.gconfd
+	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > ${IMAGE}/etc/env.d/50gconf
 
 }
 
diff --git a/gnome-base/gconf/gconf-2.4.0.1.ebuild b/gnome-base/gconf/gconf-2.4.0.1.ebuild
index 1c8b90dc9072..86737f7b0d34 100644
--- a/gnome-base/gconf/gconf-2.4.0.1.ebuild
+++ b/gnome-base/gconf/gconf-2.4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.4.0.1.ebuild,v 1.18 2005/01/08 23:26:55 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.4.0.1.ebuild,v 1.19 2005/06/24 22:12:06 agriffis Exp $
 
 inherit gnome2
 
@@ -41,6 +41,9 @@ src_install() {
 	touch ${D}/etc/gconf/gconf.xml.mandatory/.keep${SLOT}
 	touch ${D}/etc/gconf/gconf.xml.defaults/.keep${SLOT}
 
+	dodir /etc/env.d
+	dodir /root/.gconfd
+
 }
 
 kill_gconf () {
@@ -74,10 +77,7 @@ pkg_preinst () {
 
 	kill_gconf
 
-	dodir /etc/env.d
-	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > ${D}/etc/env.d/50gconf
-
-	dodir /root/.gconfd
+	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > ${IMAGE}/etc/env.d/50gconf
 
 }
 
diff --git a/gnome-base/gconf/gconf-2.6.0.ebuild b/gnome-base/gconf/gconf-2.6.0.ebuild
index db745130840f..aa3b79dfc5ea 100644
--- a/gnome-base/gconf/gconf-2.6.0.ebuild
+++ b/gnome-base/gconf/gconf-2.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.6.0.ebuild,v 1.12 2005/01/08 23:26:55 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.6.0.ebuild,v 1.13 2005/06/24 22:12:06 agriffis Exp $
 
 inherit gnome2
 
@@ -42,6 +42,9 @@ src_install() {
 	touch ${D}/etc/gconf/gconf.xml.mandatory/.keep${SLOT}
 	touch ${D}/etc/gconf/gconf.xml.defaults/.keep${SLOT}
 
+	dodir /etc/env.d
+	dodir /root/.gconfd
+
 }
 
 kill_gconf () {
@@ -75,10 +78,7 @@ pkg_preinst () {
 
 	kill_gconf
 
-	dodir /etc/env.d
-	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > ${D}/etc/env.d/50gconf
-
-	dodir /root/.gconfd
+	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > ${IMAGE}/etc/env.d/50gconf
 
 }
 
diff --git a/gnome-base/gconf/gconf-2.6.1.ebuild b/gnome-base/gconf/gconf-2.6.1.ebuild
index 2fd919bb0bf5..1e822c88f8bb 100644
--- a/gnome-base/gconf/gconf-2.6.1.ebuild
+++ b/gnome-base/gconf/gconf-2.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.6.1.ebuild,v 1.9 2005/01/08 23:26:55 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.6.1.ebuild,v 1.10 2005/06/24 22:12:06 agriffis Exp $
 
 inherit eutils gnome2
 
@@ -50,6 +50,9 @@ src_install() {
 	touch ${D}/etc/gconf/gconf.xml.mandatory/.keep${SLOT}
 	touch ${D}/etc/gconf/gconf.xml.defaults/.keep${SLOT}
 
+	dodir /etc/env.d
+	dodir /root/.gconfd
+
 }
 
 kill_gconf () {
@@ -83,10 +86,7 @@ pkg_preinst () {
 
 	kill_gconf
 
-	dodir /etc/env.d
-	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > ${D}/etc/env.d/50gconf
-
-	dodir /root/.gconfd
+	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > ${IMAGE}/etc/env.d/50gconf
 
 }
 
diff --git a/gnome-base/gconf/gconf-2.6.2.ebuild b/gnome-base/gconf/gconf-2.6.2.ebuild
index d1693be85259..a86d11a5c181 100644
--- a/gnome-base/gconf/gconf-2.6.2.ebuild
+++ b/gnome-base/gconf/gconf-2.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.6.2.ebuild,v 1.12 2005/01/08 23:26:55 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.6.2.ebuild,v 1.13 2005/06/24 22:12:06 agriffis Exp $
 
 inherit eutils gnome2
 
@@ -40,6 +40,8 @@ src_install() {
 	dodir /etc/gconf/gconf.xml.mandatory /etc/gconf/gconf.xml.defaults
 	touch ${D}/etc/gconf/gconf.xml.mandatory/.keep${SLOT} ${D}/etc/gconf/gconf.xml.defaults/.keep${SLOT}
 
+	dodir /etc/env.d /root/.gconfd
+
 }
 
 kill_gconf () {
@@ -72,8 +74,7 @@ pkg_setup () {
 pkg_preinst () {
 
 	kill_gconf
-	dodir /etc/env.d /root/.gconfd
-	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > ${D}/etc/env.d/50gconf
+	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > ${IMAGE}/etc/env.d/50gconf
 
 }
 
diff --git a/gnome-base/gconf/gconf-2.8.0.1.ebuild b/gnome-base/gconf/gconf-2.8.0.1.ebuild
index e3e42fa901ad..b39d3ad70c90 100644
--- a/gnome-base/gconf/gconf-2.8.0.1.ebuild
+++ b/gnome-base/gconf/gconf-2.8.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.8.0.1.ebuild,v 1.8 2005/01/08 23:26:55 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.8.0.1.ebuild,v 1.9 2005/06/24 22:12:06 agriffis Exp $
 
 inherit eutils gnome2
 
@@ -42,6 +42,9 @@ src_install() {
 	touch ${D}/etc/gconf/gconf.xml.mandatory/.keep${SLOT}
 	touch ${D}/etc/gconf/gconf.xml.defaults/.keep${SLOT}
 
+	dodir /etc/env.d
+	dodir /root/.gconfd
+
 }
 
 kill_gconf () {
@@ -75,10 +78,7 @@ pkg_preinst () {
 
 	kill_gconf
 
-	dodir /etc/env.d
-	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > ${D}/etc/env.d/50gconf
-
-	dodir /root/.gconfd
+	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > ${IMAGE}/etc/env.d/50gconf
 
 }
 
diff --git a/gnome-base/gconf/gconf-2.8.1-r1.ebuild b/gnome-base/gconf/gconf-2.8.1-r1.ebuild
index e9f07903ae6c..2927e95bbf05 100644
--- a/gnome-base/gconf/gconf-2.8.1-r1.ebuild
+++ b/gnome-base/gconf/gconf-2.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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-r1.ebuild,v 1.8 2005/04/02 04:16:24 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.8.1-r1.ebuild,v 1.9 2005/06/24 22:12:06 agriffis Exp $
 
 inherit eutils gnome2
 
@@ -51,6 +51,9 @@ src_install() {
 	touch ${D}/etc/gconf/gconf.xml.mandatory/.keep${SLOT}
 	touch ${D}/etc/gconf/gconf.xml.defaults/.keep${SLOT}
 
+	dodir /etc/env.d
+	dodir /root/.gconfd
+
 }
 
 kill_gconf() {
@@ -84,10 +87,7 @@ pkg_preinst() {
 
 	kill_gconf
 
-	dodir /etc/env.d
-	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > ${D}/etc/env.d/50gconf
-
-	dodir /root/.gconfd
+	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > ${IMAGE}/etc/env.d/50gconf
 
 }
 
diff --git a/gnome-base/gconf/gconf-2.9.91.ebuild b/gnome-base/gconf/gconf-2.9.91.ebuild
index 2e4a46b15cbc..6624768f49eb 100644
--- a/gnome-base/gconf/gconf-2.9.91.ebuild
+++ b/gnome-base/gconf/gconf-2.9.91.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.9.91.ebuild,v 1.1 2005/03/09 05:29:14 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.9.91.ebuild,v 1.2 2005/06/24 22:12:06 agriffis Exp $
 
 inherit eutils gnome2
 
@@ -43,6 +43,9 @@ src_install() {
 	touch ${D}/etc/gconf/gconf.xml.mandatory/.keep${SLOT}
 	touch ${D}/etc/gconf/gconf.xml.defaults/.keep${SLOT}
 
+	dodir /etc/env.d
+	dodir /root/.gconfd
+
 }
 
 kill_gconf() {
@@ -76,10 +79,7 @@ pkg_preinst() {
 
 	kill_gconf
 
-	dodir /etc/env.d
-	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > ${D}/etc/env.d/50gconf
-
-	dodir /root/.gconfd
+	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > ${IMAGE}/etc/env.d/50gconf
 
 }