bump to 2.20.1

Package-Manager: portage-2.1.3.13

4 files changed, 109 insertions, 8 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index fa8a8ace8414..9b4c84dd5f14 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gconf
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.171 2007/09/25 18:29:55 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.172 2007/10/17 23:03:16 eva Exp $
+
+*gconf-2.20.1 (17 Oct 2007)
+
+  17 Oct 2007; Gilles Dartiguelongue <eva@gentoo.org> +gconf-2.20.1.ebuild:
+  bump to 2.20.1
 
   25 Sep 2007; Daniel Gryniewicz <dang@gentoo.org> ChangeLog:
   New series for Gnome 2.20
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index 585553528ae5..985098835d64 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -5,6 +5,7 @@ DIST GConf-2.14.0.tar.bz2 1895477 RMD160 4e281fc8046238df2056cbb1c1b068dc9663041
 DIST GConf-2.16.0.tar.bz2 1307732 RMD160 b3c429a45ac96cf79b7231666ecb8e1de645a4f8 SHA1 4fbd2aa7e0d6deb1673c3c6db64892491edcdb6a SHA256 d687ea919e20e08c42eeedf32e40f0845cd6799dbfa2edec9dbc644d386805c2
 DIST GConf-2.18.0.1.tar.bz2 1347765 RMD160 79bad5a19404277abfbd7f17b61e09274dcc1aa3 SHA1 6bbceafc636457ec14ec2d7b4358235ff6cf08d3 SHA256 58a738f34078de9b3906460a297e751e80a0846e4f3bf33e1884216d0da42bf1
 DIST GConf-2.20.0.tar.bz2 1403455 RMD160 54948f0df79fa1bd68cebb5aae97cace0c21d642 SHA1 4f0b8e308470ffd95742e0221c1867d62d7bcef6 SHA256 171b077190db67073379d464fa45ceacfcbe099a5c6c6c80ce5cd31ec665ab06
+DIST GConf-2.20.1.tar.bz2 1404919 RMD160 743bee341731402e5d4938ee030adf4f463d9a52 SHA1 c628e2645a91b15749f1ebacc62ea685cbfa681c SHA256 0fb446b87e71fe1089f43e671b5b7689ec91d781b5b2e8f0fc72d4a83a014838
 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
@@ -21,10 +22,14 @@ EBUILD gconf-2.20.0.ebuild 1983 RMD160 71d708a7941b47a8a4cd3b1d8ecce7bb470c2423
 MD5 8981c5ff59e77db676e71073702e245e gconf-2.20.0.ebuild 1983
 RMD160 71d708a7941b47a8a4cd3b1d8ecce7bb470c2423 gconf-2.20.0.ebuild 1983
 SHA256 7f58937f706177687f385c92e5d7d1a59b19fe4a67d3c5e5e0d88637377cddec gconf-2.20.0.ebuild 1983
-MISC ChangeLog 22321 RMD160 0610b7991d20d68a7c65a8d80350ce4bdd8db091 SHA1 9b05443f342f7c1f0db2a11d185504c49de665c5 SHA256 0e7c641447fc70363d4fa53c3ae5456809c5fa5ed6278f4f39ed19dbf1041b77
-MD5 9baae946380ae9666ad79b6af4ad0201 ChangeLog 22321
-RMD160 0610b7991d20d68a7c65a8d80350ce4bdd8db091 ChangeLog 22321
-SHA256 0e7c641447fc70363d4fa53c3ae5456809c5fa5ed6278f4f39ed19dbf1041b77 ChangeLog 22321
+EBUILD gconf-2.20.1.ebuild 1982 RMD160 03098ce49b5dce45839c5555fed67e339e949773 SHA1 dbbab9bd3853c06c8f11b22f7997e3da08b20468 SHA256 4434b155361009472957c65117d70ed1adeb72d8d18b3b69d3a163aed574b9d3
+MD5 cc76f7226cbddfe04d6b7b48139a61c8 gconf-2.20.1.ebuild 1982
+RMD160 03098ce49b5dce45839c5555fed67e339e949773 gconf-2.20.1.ebuild 1982
+SHA256 4434b155361009472957c65117d70ed1adeb72d8d18b3b69d3a163aed574b9d3 gconf-2.20.1.ebuild 1982
+MISC ChangeLog 22443 RMD160 22a8feb9305d5cd02e32470f67edf304a4c0e53b SHA1 6fc7bd8d9832b8ed28ae178afaeb54d68447df01 SHA256 afccf0d896d35b4a4b24e85f5750b0b6e44ea9c91612456890c328715cba2ef7
+MD5 66d14c09dee4b2d9a040afc5378fe3e8 ChangeLog 22443
+RMD160 22a8feb9305d5cd02e32470f67edf304a4c0e53b ChangeLog 22443
+SHA256 afccf0d896d35b4a4b24e85f5750b0b6e44ea9c91612456890c328715cba2ef7 ChangeLog 22443
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -41,10 +46,13 @@ SHA256 34a84f2a7e37d0b8d0399ca5922e79d75d1ac69143983e91e5cc9e1b2108ee34 files/di
 MD5 4f1320644f948785565396c213c3cba0 files/digest-gconf-2.20.0 244
 RMD160 69660c01e03285278f13df7b3855ed3a2cfa7b5a files/digest-gconf-2.20.0 244
 SHA256 fef99a7710146a46755f18a2e9c81e31bc29c35e84d32a74631f07281ca2eeaa files/digest-gconf-2.20.0 244
+MD5 02066683a19787df7c66726b61e25912 files/digest-gconf-2.20.1 244
+RMD160 4c4736f447a805acdbe8413928105d0ce4692373 files/digest-gconf-2.20.1 244
+SHA256 115c0245feda9039e0f55bdab2588f0b48dde6c105e833cc7fd7f82cd9c06d13 files/digest-gconf-2.20.1 244
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG+VOwomPajV0RnrERAmpPAJ9IUjCOLnvhXlWWACFV3F3J2A4lmQCfVpjU
-/ucB37vCaLxitnTFnkLCK+U=
-=m3sG
+iD8DBQFHFpTB1fmVwcYIWAYRAoHoAKCIoHNdoxyoinCUlmbjNb2p5IVGVgCeLpNe
+AlLBFBXjdDHUkPowQe5at8E=
+=qdQU
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gconf/files/digest-gconf-2.20.1 b/gnome-base/gconf/files/digest-gconf-2.20.1
new file mode 100644
index 000000000000..4b902210b04c
--- /dev/null
+++ b/gnome-base/gconf/files/digest-gconf-2.20.1
@@ -0,0 +1,3 @@
+MD5 646fc896c6282a8f103365af0fa2e303 GConf-2.20.1.tar.bz2 1404919
+RMD160 743bee341731402e5d4938ee030adf4f463d9a52 GConf-2.20.1.tar.bz2 1404919
+SHA256 0fb446b87e71fe1089f43e671b5b7689ec91d781b5b2e8f0fc72d4a83a014838 GConf-2.20.1.tar.bz2 1404919
diff --git a/gnome-base/gconf/gconf-2.20.1.ebuild b/gnome-base/gconf/gconf-2.20.1.ebuild
new file mode 100644
index 000000000000..c5f9d9b6c442
--- /dev/null
+++ b/gnome-base/gconf/gconf-2.20.1.ebuild
@@ -0,0 +1,85 @@
+# 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.20.1.ebuild,v 1.1 2007/10/17 23:03:16 eva Exp $
+
+inherit gnome2
+
+MY_PN=GConf
+MY_P=${MY_PN}-${PV}
+PVP=(${PV//[-\._]/ })
+
+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 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc"
+
+RDEPEND=">=dev-libs/glib-2.10
+		 >=x11-libs/gtk+-2.8.16
+		 >=gnome-base/orbit-2.4
+		 >=dev-libs/libxml2-2"
+DEPEND="${RDEPEND}
+		>=dev-util/intltool-0.35
+		>=dev-util/pkgconfig-0.9
+		doc? ( >=dev-util/gtk-doc-1 )"
+
+# FIXME : consider merging the tree (?)
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	G2CONF="${G2CONF} --enable-gtk $(use_enable debug)"
+	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}
+
+	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > 50gconf
+	doenvd 50gconf || die
+	dodir /root/.gconfd
+}
+
+pkg_preinst() {
+	kill_gconf
+}
+
+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 "{}" \;
+}
+
+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
+}