stop using $IMAGE

Package-Manager: portage-2.1.2.2

diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index b637f4463153da990a1da2d62d016316e0796a3f..ff7c6d33a3202c265c0bdd0871f8c3a5631478c2 100644 (file)
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1,8 +1,11 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST GConf-2.14.0.tar.bz2 1895477 RMD160 4e281fc8046238df2056cbb1c1b068dc9663041b SHA1 97784779cbecb1f52e1728647889dd4b48f04f62 SHA256 040c512ebc39285bce78c177e9e434e7b6731fd53a001768ee3405a919837525
-EBUILD gconf-2.14.0.ebuild 1943 RMD160 aa804e277dd44f12e18715bfd665d6ce54c8ecd4 SHA1 4cceae5b01fa4fc79727e41f1b56892a178505f8 SHA256 6b7f2925d415ae4a17cf90bc5999dc0597d2119e7dad6af75a80a047972ea6e5
-MD5 b1d3b815925ce0b9a27efe47de695a89 gconf-2.14.0.ebuild 1943
-RMD160 aa804e277dd44f12e18715bfd665d6ce54c8ecd4 gconf-2.14.0.ebuild 1943
-SHA256 6b7f2925d415ae4a17cf90bc5999dc0597d2119e7dad6af75a80a047972ea6e5 gconf-2.14.0.ebuild 1943
+EBUILD gconf-2.14.0.ebuild 1925 RMD160 485f094f001fa7f6ee72ee57f58b26fff0bca467 SHA1 af7bcaa246c6c29258880cbb9691a6f36f577c85 SHA256 8cea00cd5efdc3f3571ab7eace1771e0c0c7b6926a6bf7dea4ee7dd84e762a58
+MD5 05382a74836328bfd9114e89be728755 gconf-2.14.0.ebuild 1925
+RMD160 485f094f001fa7f6ee72ee57f58b26fff0bca467 gconf-2.14.0.ebuild 1925
+SHA256 8cea00cd5efdc3f3571ab7eace1771e0c0c7b6926a6bf7dea4ee7dd84e762a58 gconf-2.14.0.ebuild 1925
 MISC ChangeLog 21050 RMD160 0617966fb10e6fbeb625de623ea3cf768a90dd0b SHA1 2c8e8c742de55e80f8ca784029d091ab8e12e718 SHA256 6090492ab1de926f1b050a0628cc0929964390419250cd28f15887a39914514c
 MD5 81b2a8436900d473f51e40e38ebac1b3 ChangeLog 21050
 RMD160 0617966fb10e6fbeb625de623ea3cf768a90dd0b ChangeLog 21050
@@ -14,3 +17,10 @@ SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata
 MD5 5dc9e65c9149f6afd374d60c243b8577 files/digest-gconf-2.14.0 244
 RMD160 dc7bbd4d128938abcc1caae0f4e66d1f140604bf files/digest-gconf-2.14.0 244
 SHA256 732b6991d53f6e4f74136993463746c114f2881e198c38ee914f259dbba0ae52 files/digest-gconf-2.14.0 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF8siD8bi6rjpTunYRAl79AJoDnjOiei6plripcQafjx/C9zkmEACgopdT
+/zSR4ct7WMbGMLtN4trgSrw=
+=jZfZ
+-----END PGP SIGNATURE-----

diff --git a/gnome-base/gconf/gconf-2.14.0.ebuild b/gnome-base/gconf/gconf-2.14.0.ebuild
index 5ca351f45f900e0dbe360b47248f3f90c7740827..96a48d51974c44f400a3dd668064aa6867fbd518 100644 (file)
--- a/gnome-base/gconf/gconf-2.14.0.ebuild
+++ b/gnome-base/gconf/gconf-2.14.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.14.0.ebuild,v 1.15 2007/01/16 13:45:55 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.14.0.ebuild,v 1.16 2007/03/10 15:02:17 vapier Exp $
 
 inherit gnome2
 
@@ -23,7 +23,6 @@ RDEPEND=">=dev-libs/glib-2.10
        >=gnome-base/orbit-2.4
        >=dev-libs/libxml2-2
        dev-libs/popt"
-
 DEPEND="${RDEPEND}
        >=dev-util/pkgconfig-0.9
        doc? ( >=dev-util/gtk-doc-1 )"
@@ -45,7 +44,8 @@ src_install() {
        touch "${D}"/etc/gconf/gconf.xml.mandatory/.keep${SLOT}
        touch "${D}"/etc/gconf/gconf.xml.defaults/.keep${SLOT}
 
-       dodir /etc/env.d
+       echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > 50gconf
+       doenvd 50gconf || die
        dodir /root/.gconfd
 }
 
@@ -70,8 +70,6 @@ kill_gconf() {
 
 pkg_preinst() {
        kill_gconf
-
-       echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > ${IMAGE}/etc/env.d/50gconf
 }
 
 pkg_postinst() {