removed sed from global scope, concatenated dodir and touch in latest version

7 files changed, 27 insertions, 25 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 14a6eb21bfe1..b23af34a1871 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,13 @@
 # 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.79 2004/07/31 03:51:02 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.80 2004/07/31 06:38:55 spider Exp $
+
+  31 Jul 2004; <spider@gentoo.org> gconf-2.6.2.ebuild:
+  dodir and touch concatenated some
+
+  31 Jul 2004; <spider@gentoo.org> gconf-1.0.9.ebuild, gconf-2.4.0.1.ebuild,
+  gconf-2.6.0.ebuild, gconf-2.6.1.ebuild, gconf-2.6.2.ebuild:
+  Removed a lot of sed expressions from global scope
 
   31 Jul 2004; <spider@gentoo.org> gconf-2.6.2.ebuild:
   stable on x86 for gnome 2.6.2
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index 24e41cbdf554..8d2c189ff37b 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1,12 +1,12 @@
-MD5 afd7c9597889a517276c094a4a31fa65 ChangeLog 11223
+MD5 f2d58a16cde441b8bd8c0d9ee673a331 ChangeLog 11416
 MD5 b8257ec44062f1749ae3a7108a2665b7 gconf-1.0.8-r3.ebuild 1706
 MD5 9e193ede22931c15cf5009584f5a3eaf gconf-1.0.8-r5.ebuild 1871
-MD5 19b4e18cb12a6034622680b0e5a09750 gconf-1.0.9.ebuild 1885
-MD5 c3c143d266c026ee8bf16d86cd0394dc gconf-2.4.0.1.ebuild 1964
-MD5 c3a073a17685f2a9e1fe1ff241c9b576 gconf-2.6.0.ebuild 1980
-MD5 205ea2d65aa35761d9f8f12e87100c78 gconf-2.6.1.ebuild 2126
+MD5 d1a5fc0bfc3b1f15b43d4ec6af3f4ce7 gconf-1.0.9.ebuild 1864
+MD5 7521c20dd87132cf7a09f99696e00449 gconf-2.4.0.1.ebuild 1943
+MD5 565106b1cf06ea9bc43c7c86d8055e45 gconf-2.6.0.ebuild 1959
+MD5 883a5c1fd49fc6134cd6d5faf11ca319 gconf-2.6.1.ebuild 2105
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 78040e10244ca34b5e13e1fa04fb59bb gconf-2.6.2.ebuild 1998
+MD5 6ab3790de283a7e0976ca925966e38fb gconf-2.6.2.ebuild 1954
 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/gconf-1.0.9.ebuild b/gnome-base/gconf/gconf-1.0.9.ebuild
index a74935718990..3fd3dd238422 100644
--- a/gnome-base/gconf/gconf-1.0.9.ebuild
+++ b/gnome-base/gconf/gconf-1.0.9.ebuild
@@ -1,6 +1,6 @@
 # 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-1.0.9.ebuild,v 1.10 2004/06/24 21:55:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-1.0.9.ebuild,v 1.11 2004/07/31 06:38:55 spider Exp $
 
 inherit libtool gnome.org eutils
 
@@ -8,7 +8,7 @@ IUSE="nls"
 
 MY_PN=GConf
 MY_P=${MY_PN}-${PV}
-PVP=($(echo " $PV " | sed 's:[-\._]: :g'))
+PVP=(${PV//[-\._]/ })
 S=${WORKDIR}/GConf-${PV}
 
 S=${WORKDIR}/${MY_P}
diff --git a/gnome-base/gconf/gconf-2.4.0.1.ebuild b/gnome-base/gconf/gconf-2.4.0.1.ebuild
index ce6eb45eb3a6..c303b589396f 100644
--- a/gnome-base/gconf/gconf-2.4.0.1.ebuild
+++ b/gnome-base/gconf/gconf-2.4.0.1.ebuild
@@ -1,12 +1,12 @@
 # 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.4.0.1.ebuild,v 1.14 2004/06/24 21:55:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.4.0.1.ebuild,v 1.15 2004/07/31 06:38:55 spider Exp $
 
 inherit gnome2
 
 MY_PN=GConf
 MY_P=${MY_PN}-${PV}
-PVP=($(echo " $PV " | sed 's:[-\._]: :g'))
+PVP=(${PV//[-\._]/ })
 S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="Gnome Configuration System and Daemon"
diff --git a/gnome-base/gconf/gconf-2.6.0.ebuild b/gnome-base/gconf/gconf-2.6.0.ebuild
index d4ce757a9618..6dffe9af62f5 100644
--- a/gnome-base/gconf/gconf-2.6.0.ebuild
+++ b/gnome-base/gconf/gconf-2.6.0.ebuild
@@ -1,12 +1,12 @@
 # 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.6.0.ebuild,v 1.8 2004/07/05 17:53:47 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.6.0.ebuild,v 1.9 2004/07/31 06:38:55 spider Exp $
 
 inherit gnome2
 
 MY_PN=GConf
 MY_P=${MY_PN}-${PV}
-PVP=($(echo " $PV " | sed 's:[-\._]: :g'))
+PVP=(${PV//[-\._]/ })
 S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="Gnome Configuration System and Daemon"
diff --git a/gnome-base/gconf/gconf-2.6.1.ebuild b/gnome-base/gconf/gconf-2.6.1.ebuild
index b5415f2749dd..6ccd20a64ecc 100644
--- a/gnome-base/gconf/gconf-2.6.1.ebuild
+++ b/gnome-base/gconf/gconf-2.6.1.ebuild
@@ -1,12 +1,12 @@
 # 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.6.1.ebuild,v 1.5 2004/07/01 20:19:48 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.6.1.ebuild,v 1.6 2004/07/31 06:38:55 spider Exp $
 
 inherit eutils gnome2
 
 MY_PN=GConf
 MY_P=${MY_PN}-${PV}
-PVP=($(echo " $PV " | sed 's:[-\._]: :g'))
+PVP=(${PV//[-\._]/ })
 S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="Gnome Configuration System and Daemon"
diff --git a/gnome-base/gconf/gconf-2.6.2.ebuild b/gnome-base/gconf/gconf-2.6.2.ebuild
index fd76db2064b8..497c03873be7 100644
--- a/gnome-base/gconf/gconf-2.6.2.ebuild
+++ b/gnome-base/gconf/gconf-2.6.2.ebuild
@@ -1,12 +1,12 @@
 # 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.6.2.ebuild,v 1.3 2004/07/31 03:51:02 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.6.2.ebuild,v 1.4 2004/07/31 06:38:55 spider Exp $
 
 inherit eutils gnome2
 
 MY_PN=GConf
 MY_P=${MY_PN}-${PV}
-PVP=($(echo " $PV " | sed 's:[-\._]: :g'))
+PVP=(${PV//[-\._]/ })
 S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="Gnome Configuration System and Daemon"
@@ -37,10 +37,8 @@ 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}
+	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}
 
 }
 
@@ -74,12 +72,9 @@ pkg_setup () {
 pkg_preinst () {
 
 	kill_gconf
-
-	dodir /etc/env.d
+	dodir /etc/env.d /root/.gconfd
 	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > ${D}/etc/env.d/50gconf
 
-	dodir /root/.gconfd
-
 }
 
 pkg_postinst () {