Bump to 2.32.3

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

3 files changed, 118 insertions, 5 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 4770045b6fda..0bbd500c9008 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gconf
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.248 2011/04/10 13:01:32 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.249 2011/04/29 19:10:34 nirbheek Exp $
+
+*gconf-2.32.3 (29 Apr 2011)
+
+  29 Apr 2011; Nirbheek Chauhan <nirbheek@gentoo.org> +gconf-2.32.3.ebuild:
+  Bump to 2.32.3
 
 *gconf-2.32.2 (10 Apr 2011)
 
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index 98e2ce1f524e..871ad87973b0 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -5,14 +5,26 @@ AUX gconf-2.24.0-no-gconfd.patch 787 RMD160 bbcd0e1dd0f49053522e703c33a9befb392b
 AUX gconf-2.28.0-entry-set-value-sigsegv.patch 533 RMD160 77e4fae8a19a57904d9e6706238a94172da5c223 SHA1 9deb172ce170e7333931e61e3cf2ae6ade24bb33 SHA256 e58c0981491e794de05dd71562e0a9675433469e87c7149088ebea432c9619b0
 DIST GConf-2.32.0.tar.bz2 1541688 RMD160 9ef6adca69e5ac8e2386f28f5af8e8c5c9fbb52e SHA1 2711c7b53761d2c789112bb1f989f1c1a6de5265 SHA256 54dd1dd7f49928a9cc42574bef6ef0481753770fc19986dc2004bbb7fac977a0
 DIST GConf-2.32.2.tar.bz2 1555612 RMD160 b373e27199b1bc390c98f81ef41636b0e3a90314 SHA1 7def3d52e63f722c6ac6291cbc587ea368d866d5 SHA256 6bff392b9d1ca52502f0c6dac5506260800e43d72ca1fa77a4524af1a3cc1330
+DIST GConf-2.32.3.tar.bz2 1558681 RMD160 d491165a58dd658987730aeebfdbf70f8b7c93d6 SHA1 efc7d451c5988207f708b75c01d1d228ba3deed6 SHA256 63e249d16b1b50820e9c32f1d85ff2c94498afdd45544fa5f37b8e1d084c5bae
 EBUILD gconf-2.32.0-r1.ebuild 2506 RMD160 f1b1eb55d1e0a518774c4100022f1b37b87afa1d SHA1 f262f42d2191aceace2c450c9af46db188165b7e SHA256 870b9628c8f899a17e21dc9cf8960c9d213928017735820d1636d25d20efbfa7
 EBUILD gconf-2.32.2.ebuild 2541 RMD160 06c388d30c26c03cf38a255f6b11d1059d44a604 SHA1 27ec20ed3a853b8ae3c117f980b2003c8e1ac8cf SHA256 fb27e1bcbf836f445b358e038ccc372c8d41990fabec67303e6b4648406fd0ed
-MISC ChangeLog 32838 RMD160 b446ad2f55b4ccf2e3a255f7ea4bbf084c490fd1 SHA1 3e75dfe15127da3bed865d1f46001d9a4b73843c SHA256 09ef40618c1964f25c5932987bd78d030dafb2a708ecd1a74391043587664d6a
+EBUILD gconf-2.32.3.ebuild 2544 RMD160 278e3a291fa7e791700d23d36a70ff6972eebadd SHA1 05698f3a5c79835e7a21bc8939078dea2518a46a SHA256 94e55803985070cd89808498d92beac49166fa7ea466837ec9ef1780b596599f
+MISC ChangeLog 32964 RMD160 dcc93cf4ac869d82046ce3a0fcd4776c1ecbd404 SHA1 496d2b3bbdeb0575ee37b3843bd71c62bd798d55 SHA256 25a73b2205f4428478c708908b4f68740afcf3216d7b57a581e01f6c90e8b3cb
 MISC metadata.xml 438 RMD160 fd4466302f9275a9043a9ca04485809c4fa47f23 SHA1 86f6864ba00e0255d9d1b73ff3235ee33f196251 SHA256 f17968d494bc984a5f632b37e6dc606c80b603a4560cba45c4014ad23f083139
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2hqjMACgkQCaWpQKGI+9RKzACfWHF9uG2adSN6MIkCTyehm0pS
-eWcAn1m+NDZ7Wq/jE7rswAy5fSjuneV4
-=hi6m
+iQIcBAEBAgAGBQJNuw0wAAoJEO/kOhxWD91k0kkQALMf/xapyKpxm0IrHJDK2hhR
+pw6Qrq8+aTe1Mk7cz6UcVnV0O9JdEaq4xZ7wDx41I0PiJB6sTm0g4okMdU+T6I2A
+jzmywilzt/+5ZJyLbXmngMZVrZth8tA8NA7dQPLDpPeWUMbQbFTmiUGa7fRJ9Fg6
+hR/UlnPgjKMOiqQ2VQKduGXEteamBDr12WIJF8YmSPjxn6tg8myUm2ttk6a06DZR
+uXzwKTqqEmXrtjwLUiyi12Q2hItZOqlnHRlY0bDvg+0+4dbNDRhCQiv4MXac08Wd
+C7YcpfRlZIa6d817AtT4xzffdPIpyaqh2Av1IeU2oi9flrMZtmc+dO6Qh91ugY0o
+DZjyZ59mCR6hgfazsZQzKLcrDpVtCEtXUXIGjlBTG4LgqlpoDZsokJOEVK2+zXBJ
+QkT1dtP02k+w4yWhORFN2x9PsfayRnGCu+uyVxZgliAva0fwQeieEBYKgrgGPOsl
+DnBJmzyHE2Wi7gOdnoKKv/bxvokqgDWW3xJlquSv22oWtHnG/8N0S+QgS7LXJiyi
+6YsDnhtwTxAlfB/+LMowGzkjUc+8l9GugXqgzUFumfQcauZvIjw0B3mHmJ+H4rur
+pLTPeXJCxWekfih4hffH19BLHWDY6pQ9FqCla/QkV1wBhYiCxxDmfbfW9/x+ZReT
+CCAV2ynBeA/t5RLNm+KW
+=KFMh
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gconf/gconf-2.32.3.ebuild b/gnome-base/gconf/gconf-2.32.3.ebuild
new file mode 100644
index 000000000000..7f74ef6e8573
--- /dev/null
+++ b/gnome-base/gconf/gconf-2.32.3.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.32.3.ebuild,v 1.1 2011/04/29 19:10:34 nirbheek Exp $
+
+EAPI="3"
+GCONF_DEBUG="yes"
+GNOME_ORG_MODULE="GConf"
+
+inherit eutils gnome2
+
+DESCRIPTION="Gnome Configuration System and Daemon"
+HOMEPAGE="http://projects.gnome.org/gconf/"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc +introspection ldap policykit"
+
+RDEPEND=">=dev-libs/glib-2.25.9:2
+	>=x11-libs/gtk+-2.14:2
+	>=dev-libs/dbus-glib-0.74
+	>=sys-apps/dbus-1
+	>=gnome-base/orbit-2.4:2
+	>=dev-libs/libxml2-2:2
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+	ldap? ( net-nds/openldap )
+	policykit? ( sys-auth/polkit )"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.9
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+	G2CONF="${G2CONF}
+		--enable-gtk
+		--disable-static
+		--enable-gsettings-backend
+		--with-gtk=2.0
+		$(use_enable introspection)
+		$(use_with ldap openldap)
+		$(use_enable policykit defaults-service)"
+	kill_gconf
+
+	# Need host's IDL compiler for cross or native build, bug #262747
+	export EXTRA_EMAKE="${EXTRA_EMAKE} ORBIT_IDL=/usr/bin/orbit-idl-2"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Do not start gconfd when installing schemas, fix bug #238276, upstream #631983
+	epatch "${FILESDIR}/${PN}-2.24.0-no-gconfd.patch"
+
+	# Do not crash in gconf_entry_set_value() when entry pointer is NULL, upstream #631985
+	epatch "${FILESDIR}/${PN}-2.28.0-entry-set-value-sigsegv.patch"
+}
+
+src_install() {
+	gnome2_src_install
+
+	keepdir /etc/gconf/gconf.xml.mandatory
+	keepdir /etc/gconf/gconf.xml.defaults
+	# Make sure this directory exists, bug #268070, upstream #572027
+	keepdir /etc/gconf/gconf.xml.system
+
+	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > 50gconf
+	echo 'GSETTINGS_BACKEND="gconf"' >> 50gconf
+	doenvd 50gconf || die "doenv failed"
+	dodir /root/.gconfd || die
+}
+
+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-2 that could be causing troubles
+	if [ -x /usr/bin/gconftool-2 ]
+	then
+		/usr/bin/gconftool-2 --shutdown
+	fi
+
+	return 0
+}