Remove old versions

(Portage version: 2.1.2_rc2)
 (Signed Manifest commit)

8 files changed, 14 insertions, 350 deletions

diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index a49190f22146..bf818dfa5e99 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gconf-1.0.9-gcc4.patch 581 RMD160 ee224b9ece8c06d41437eff7c86b799823aefe95 SHA1 7ac15c54fde61df4be390f7b15d1d4680a5c5780 SHA256 4e0a6cbc44d96c8a1dbd870b936f2beebc385856f8afd91cfb8084cd70d1320f
 MD5 a00775eca77339f117c1edd3ae41ed32 files/gconf-1.0.9-gcc4.patch 581
 RMD160 ee224b9ece8c06d41437eff7c86b799823aefe95 files/gconf-1.0.9-gcc4.patch 581
@@ -10,42 +13,24 @@ AUX gconf-1.0.9-locallock_mdk.patch 1202 RMD160 5b9129acba9fbaef871830d0ff537839
 MD5 aaa79f3ad5c910cfa6f813112e66f79e files/gconf-1.0.9-locallock_mdk.patch 1202
 RMD160 5b9129acba9fbaef871830d0ff5378398d02393c files/gconf-1.0.9-locallock_mdk.patch 1202
 SHA256 98021a78c16f3f21a33c8705907cdfb485a11df1a4acddbd5dfbf40b0738ce23 files/gconf-1.0.9-locallock_mdk.patch 1202
-AUX gconf-2.12.1-gconf_unescape_key.patch 749 RMD160 5b5ec0389742c58be95e4fe9b75b2a7602517618 SHA1 656df9d0da734cebe731c1208bfd47b18bd88d62 SHA256 b12ff48a21304bd07ede4b84f88a363583d3010c7c31d98e3fb143bd6f36e758
-MD5 e7c4acb5295aa258799f05e3c33612b6 files/gconf-2.12.1-gconf_unescape_key.patch 749
-RMD160 5b5ec0389742c58be95e4fe9b75b2a7602517618 files/gconf-2.12.1-gconf_unescape_key.patch 749
-SHA256 b12ff48a21304bd07ede4b84f88a363583d3010c7c31d98e3fb143bd6f36e758 files/gconf-2.12.1-gconf_unescape_key.patch 749
 AUX gconfd-2-fix.patch 1820 RMD160 126c30484309dc60a72b843697ab0feb352cde67 SHA1 3aaba931f36cbffe6a66e4f0538e19ef41fb8176 SHA256 d311a969cfcfda29a1350c47b8a60068d4da37651a4485521b6889400ad584c4
 MD5 8485bd44122f283d1549e1f1cdddd03f files/gconfd-2-fix.patch 1820
 RMD160 126c30484309dc60a72b843697ab0feb352cde67 files/gconfd-2-fix.patch 1820
 SHA256 d311a969cfcfda29a1350c47b8a60068d4da37651a4485521b6889400ad584c4 files/gconfd-2-fix.patch 1820
 DIST GConf-1.0.9.tar.bz2 784363 RMD160 d5cb8ae92146c33bc6ea073b485c3ad6f12f6cc7 SHA256 863c3dd3e72cf7d35eff7497b833978cc28a9f9d12d7caeb9d61ea785731cb19
-DIST GConf-2.10.1.tar.bz2 1797862 RMD160 5f13846cda3f4e13268de51f3c467057aad012be SHA1 a28f95b9162e71083386ea13f5a4c9bc42c4fdf3 SHA256 319cf475ebe96d974beda572f53528b2bbd4bb9a085aca9f843458689ecdc9c1
-DIST GConf-2.12.1.tar.bz2 1945241 RMD160 f5c664c619ca069801dc8b1147454a1544c14b74 SHA1 bfcb6283b32361df05b245ae2ff65a9ec79d4c6c SHA256 2e3c72ecc66348be6edecfbb2e424adc8d4e5a4afb92443e98cd2e50de7cf68e
 DIST GConf-2.14.0.tar.bz2 1895477 RMD160 4e281fc8046238df2056cbb1c1b068dc9663041b SHA1 97784779cbecb1f52e1728647889dd4b48f04f62 SHA256 040c512ebc39285bce78c177e9e434e7b6731fd53a001768ee3405a919837525
 EBUILD gconf-1.0.9.ebuild 1890 RMD160 e4cf46cb942fdaf511a793c2601b44e3c8b74ab3 SHA1 89c99e14a977cdd0fc99af8d45c4a96159611795 SHA256 6454e7ac366d3f5980073319c7a009aef26a917dadf941c879d934bd3e829fd9
 MD5 a8cdd6bb8a7c6ab1e5cdf6a5cb334ccb gconf-1.0.9.ebuild 1890
 RMD160 e4cf46cb942fdaf511a793c2601b44e3c8b74ab3 gconf-1.0.9.ebuild 1890
 SHA256 6454e7ac366d3f5980073319c7a009aef26a917dadf941c879d934bd3e829fd9 gconf-1.0.9.ebuild 1890
-EBUILD gconf-2.10.1-r1.ebuild 2008 RMD160 5f9422a9201a34e7505d8fafdaf77ffed89a8278 SHA1 3ee4fbac1e07f2b7daa77d2ba32bc35029ca1032 SHA256 e86c5d335f81d3bc89c6a1dacb96a9f0887bf32d60220e547309ad4ee3e5c5a6
-MD5 096c24c84ff12a0dd9a02b3621a9d79f gconf-2.10.1-r1.ebuild 2008
-RMD160 5f9422a9201a34e7505d8fafdaf77ffed89a8278 gconf-2.10.1-r1.ebuild 2008
-SHA256 e86c5d335f81d3bc89c6a1dacb96a9f0887bf32d60220e547309ad4ee3e5c5a6 gconf-2.10.1-r1.ebuild 2008
-EBUILD gconf-2.12.1-r1.ebuild 2143 RMD160 081078a7e43973b1de82fc9d28e968827289c305 SHA1 8a33b3e02e4e016bbe9735ce1e5f8149c57af9c2 SHA256 6b98a0bdd1b8d316d18e4d8cc94f8f757413075925082b39e2588f30dde72551
-MD5 e78d291fac1bfa543a61a788cedb62ef gconf-2.12.1-r1.ebuild 2143
-RMD160 081078a7e43973b1de82fc9d28e968827289c305 gconf-2.12.1-r1.ebuild 2143
-SHA256 6b98a0bdd1b8d316d18e4d8cc94f8f757413075925082b39e2588f30dde72551 gconf-2.12.1-r1.ebuild 2143
-EBUILD gconf-2.12.1.ebuild 1966 RMD160 f4c6a6c5ec2935f9c4ad91339bd9add8f310744b SHA1 144ec9f441b9d694fef3f20d9ff286306f9fe8e6 SHA256 b9a3bd099a7c26f9dc5776571bc499857e697ad5788a5af88a1cfbf9f1a55e12
-MD5 4b8a3cc9436760722410738516249c2d gconf-2.12.1.ebuild 1966
-RMD160 f4c6a6c5ec2935f9c4ad91339bd9add8f310744b gconf-2.12.1.ebuild 1966
-SHA256 b9a3bd099a7c26f9dc5776571bc499857e697ad5788a5af88a1cfbf9f1a55e12 gconf-2.12.1.ebuild 1966
 EBUILD gconf-2.14.0.ebuild 1933 RMD160 cb930e6a12c13472094b9b732da349912edb10b1 SHA1 d420c596a5b1d203c2c125c0cae091d4bf076331 SHA256 f9eb52765cc92f997678d014c07e800a6d273f5ef94b5be276007ca82f8355af
 MD5 b050d092f779acb5d18b8f6aaeb2aa6a gconf-2.14.0.ebuild 1933
 RMD160 cb930e6a12c13472094b9b732da349912edb10b1 gconf-2.14.0.ebuild 1933
 SHA256 f9eb52765cc92f997678d014c07e800a6d273f5ef94b5be276007ca82f8355af gconf-2.14.0.ebuild 1933
-MISC ChangeLog 20524 RMD160 22c8dd3b8f5ab08c69999d51aa0085219d9e9234 SHA1 0fac413dcbebf670149bbc0c38515bdb9a75b169 SHA256 502bee5b03f53b64fef82263b2e075de90e2cba732099f4248a8099b85a8d053
-MD5 846daee6fdcefe5552fee6522c6b4a2c ChangeLog 20524
-RMD160 22c8dd3b8f5ab08c69999d51aa0085219d9e9234 ChangeLog 20524
-SHA256 502bee5b03f53b64fef82263b2e075de90e2cba732099f4248a8099b85a8d053 ChangeLog 20524
+MISC ChangeLog 20712 RMD160 30f774d525155d75ae90fb6ae4b7e3e9d630fea1 SHA1 aecdf8290a3ecc8eb0a09a5719030e1134e8ec2c SHA256 ffd8e51f64d03e4ba8519d316216e7a22c43ade450619ad5c9d648fdaa0f1528
+MD5 ecd2ceb8eaf5d075501d913b2b8db9b7 ChangeLog 20712
+RMD160 30f774d525155d75ae90fb6ae4b7e3e9d630fea1 ChangeLog 20712
+SHA256 ffd8e51f64d03e4ba8519d316216e7a22c43ade450619ad5c9d648fdaa0f1528 ChangeLog 20712
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -53,15 +38,13 @@ SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata
 MD5 b7e93a52522be76daa1603400d61ba52 files/digest-gconf-1.0.9 238
 RMD160 e9beb9df147ffd6f8d50649b4ee4cc6228a38c0a files/digest-gconf-1.0.9 238
 SHA256 65e197a6a7288d97cdbb02678e21562fff201c70d528bdfe2074641896acf45f files/digest-gconf-1.0.9 238
-MD5 8066a44d056c502f66dcd17e138655d0 files/digest-gconf-2.10.1-r1 244
-RMD160 bb88f61029f32da5dc5e88fd89ac010f7f24aa4d files/digest-gconf-2.10.1-r1 244
-SHA256 76a854d3216c219ac1bc68df3640de513ff51412d6fe8947ad38d84583ef5f6e files/digest-gconf-2.10.1-r1 244
-MD5 c0206532a622fd40ced4bed0815de00e files/digest-gconf-2.12.1 244
-RMD160 978091a0bb1ef985a6d5bfb16d57578f7562a38b files/digest-gconf-2.12.1 244
-SHA256 37c882259f034501e14219e40aadf285f30511cefb90b772ea80031854892229 files/digest-gconf-2.12.1 244
-MD5 c0206532a622fd40ced4bed0815de00e files/digest-gconf-2.12.1-r1 244
-RMD160 978091a0bb1ef985a6d5bfb16d57578f7562a38b files/digest-gconf-2.12.1-r1 244
-SHA256 37c882259f034501e14219e40aadf285f30511cefb90b772ea80031854892229 files/digest-gconf-2.12.1-r1 244
 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 v1.4.5 (GNU/Linux)
+
+iD8DBQFFYRDEkeYb6olFHJcRAoeRAJ9M3Id3rSZfd1llxOpIJ8POm36oxgCfe3iI
+eFSkUbdW9D+Qo2cZSK/kj4s=
+=pLwM
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gconf/files/digest-gconf-2.10.1-r1 b/gnome-base/gconf/files/digest-gconf-2.10.1-r1
deleted file mode 100644
index 1b7851c7e562..000000000000
--- a/gnome-base/gconf/files/digest-gconf-2.10.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c411bd6e9e25362ea613bb9a084be904 GConf-2.10.1.tar.bz2 1797862
-RMD160 5f13846cda3f4e13268de51f3c467057aad012be GConf-2.10.1.tar.bz2 1797862
-SHA256 319cf475ebe96d974beda572f53528b2bbd4bb9a085aca9f843458689ecdc9c1 GConf-2.10.1.tar.bz2 1797862
diff --git a/gnome-base/gconf/files/digest-gconf-2.12.1 b/gnome-base/gconf/files/digest-gconf-2.12.1
deleted file mode 100644
index 1e57a90a685b..000000000000
--- a/gnome-base/gconf/files/digest-gconf-2.12.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 247110de013ed24b17cf4191eb6daec5 GConf-2.12.1.tar.bz2 1945241
-RMD160 f5c664c619ca069801dc8b1147454a1544c14b74 GConf-2.12.1.tar.bz2 1945241
-SHA256 2e3c72ecc66348be6edecfbb2e424adc8d4e5a4afb92443e98cd2e50de7cf68e GConf-2.12.1.tar.bz2 1945241
diff --git a/gnome-base/gconf/files/digest-gconf-2.12.1-r1 b/gnome-base/gconf/files/digest-gconf-2.12.1-r1
deleted file mode 100644
index 1e57a90a685b..000000000000
--- a/gnome-base/gconf/files/digest-gconf-2.12.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 247110de013ed24b17cf4191eb6daec5 GConf-2.12.1.tar.bz2 1945241
-RMD160 f5c664c619ca069801dc8b1147454a1544c14b74 GConf-2.12.1.tar.bz2 1945241
-SHA256 2e3c72ecc66348be6edecfbb2e424adc8d4e5a4afb92443e98cd2e50de7cf68e GConf-2.12.1.tar.bz2 1945241
diff --git a/gnome-base/gconf/files/gconf-2.12.1-gconf_unescape_key.patch b/gnome-base/gconf/files/gconf-2.12.1-gconf_unescape_key.patch
deleted file mode 100644
index 6dbd5a2ce04b..000000000000
--- a/gnome-base/gconf/files/gconf-2.12.1-gconf_unescape_key.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-===================================================================
-RCS file: /cvs/gnome/gconf/gconf/gconf.c,v
-retrieving revision 1.150
-retrieving revision 1.151
-diff -u -r1.150 -r1.151
---- gconf/gconf.c 2005/11/11 13:33:01  1.150
-+++ gconf/gconf.c 2005/12/08 13:00:58  1.151
-@@ -2749,10 +2749,11 @@
-           if (*p == '@')
-             {
-               /* *p is the @ that ends a seq */
-+              char *end_seq;
-               guchar val;
-               
--              val = strtoul (start_seq, &end, 10);
--              if (start_seq != end)
-+              val = strtoul (start_seq, &end_seq, 10);
-+              if (start_seq != end_seq)
-                 g_string_append_c (retval, val);
-               
-               start_seq = NULL;
diff --git a/gnome-base/gconf/gconf-2.10.1-r1.ebuild b/gnome-base/gconf/gconf-2.10.1-r1.ebuild
deleted file mode 100644
index 741b75925e37..000000000000
--- a/gnome-base/gconf/gconf-2.10.1-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.10.1-r1.ebuild,v 1.12 2006/09/05 01:58:52 kumba Exp $
-
-inherit eutils gnome2
-
-MY_PN=GConf
-MY_P=${MY_PN}-${PV}
-PVP=(${PV//[-\._]/ })
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Gnome Configuration System and Daemon"
-HOMEPAGE="http://www.gnome.org/"
-SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="doc static"
-
-RDEPEND=">=dev-libs/glib-2.0.1
-	>=gnome-base/orbit-2.4
-	>=dev-libs/libxml2-2
-	dev-libs/popt
-	>=x11-libs/gtk+-2"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-# FIXME : consider merging the tree (?)
-DOCS="ABOUT-NLS AUTHORS ChangeLog NEWS README TODO"
-USE_DESTDIR="1"
-MAKEOPTS="${MAKEOPTS} -j1"
-G2CONF="${G2CONF} $(use_enable static) --enable-gtk"
-
-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/env.d
-	dodir /root/.gconfd
-
-}
-
-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
-
-	# and for gconf 2
-	if [ -x /usr/bin/gconftool-2 ]
-	then
-		/usr/bin/gconftool-2 --shutdown
-	fi
-	return 0
-
-}
-
-pkg_setup() {
-
-	kill_gconf
-
-}
-
-pkg_preinst() {
-
-	kill_gconf
-
-	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > ${IMAGE}/etc/env.d/50gconf
-
-}
-
-pkg_postinst() {
-
-	kill_gconf
-
-	#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 "{}" \;
-
-}
diff --git a/gnome-base/gconf/gconf-2.12.1-r1.ebuild b/gnome-base/gconf/gconf-2.12.1-r1.ebuild
deleted file mode 100644
index 38f7dbd03b65..000000000000
--- a/gnome-base/gconf/gconf-2.12.1-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.12.1-r1.ebuild,v 1.5 2006/09/05 01:58:52 kumba Exp $
-
-inherit gnome2 eutils
-
-MY_PN=GConf
-MY_P=${MY_PN}-${PV}
-PVP=(${PV//[-\._]/ })
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Gnome Configuration System and Daemon"
-HOMEPAGE="http://www.gnome.org/"
-SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/glib-2.7
-	>=gnome-base/orbit-2.4
-	>=dev-libs/libxml2-2
-	dev-libs/popt
-	>=x11-libs/gtk+-2"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-# FIXME : consider merging the tree (?)
-
-DOCS="ABOUT-NLS AUTHORS ChangeLog NEWS README TODO"
-USE_DESTDIR="1"
-MAKEOPTS="${MAKEOPTS} -j1"
-
-
-pkg_setup() {
-	G2CONF="--enable-gtk"
-	kill_gconf
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Patch to prevent stomping of the last character (bug #120398)
-	epatch ${FILESDIR}/gconf-2.12.1-gconf_unescape_key.patch
-}
-
-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/env.d
-	dodir /root/.gconfd
-}
-
-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
-
-	# and for gconf 2
-	if [ -x /usr/bin/gconftool-2 ]
-	then
-		/usr/bin/gconftool-2 --shutdown
-	fi
-	return 0
-}
-
-pkg_preinst() {
-	kill_gconf
-
-	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > ${IMAGE}/etc/env.d/50gconf
-}
-
-pkg_postinst() {
-	kill_gconf
-
-	#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 "{}" \;
-}
diff --git a/gnome-base/gconf/gconf-2.12.1.ebuild b/gnome-base/gconf/gconf-2.12.1.ebuild
deleted file mode 100644
index ee08f3cae42e..000000000000
--- a/gnome-base/gconf/gconf-2.12.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.12.1.ebuild,v 1.11 2006/09/05 01:58:52 kumba Exp $
-
-inherit gnome2
-
-MY_PN=GConf
-MY_P=${MY_PN}-${PV}
-PVP=(${PV//[-\._]/ })
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Gnome Configuration System and Daemon"
-HOMEPAGE="http://www.gnome.org/"
-SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/glib-2.7
-	>=gnome-base/orbit-2.4
-	>=dev-libs/libxml2-2
-	dev-libs/popt
-	>=x11-libs/gtk+-2"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-# FIXME : consider merging the tree (?)
-
-DOCS="ABOUT-NLS AUTHORS ChangeLog NEWS README TODO"
-USE_DESTDIR="1"
-MAKEOPTS="${MAKEOPTS} -j1"
-
-
-pkg_setup() {
-	G2CONF="--enable-gtk"
-	kill_gconf
-}
-
-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/env.d
-	dodir /root/.gconfd
-
-}
-
-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
-
-	# and for gconf 2
-	if [ -x /usr/bin/gconftool-2 ]
-	then
-		/usr/bin/gconftool-2 --shutdown
-	fi
-	return 0
-
-}
-
-pkg_preinst() {
-
-	kill_gconf
-
-	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > ${IMAGE}/etc/env.d/50gconf
-
-}
-
-pkg_postinst() {
-	kill_gconf
-
-	#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 "{}" \;
-}