Version bump with various bugfixes.

Package-Manager: portage-2.2.0_alpha158/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

3 files changed, 124 insertions, 5 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 313409e87a72..8ffa64c5a53e 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gconf
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.274 2013/01/17 20:39:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.275 2013/01/22 03:59:59 tetromino Exp $
+
+*gconf-3.2.6 (22 Jan 2013)
+
+  22 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org> +gconf-3.2.6.ebuild:
+  Version bump with various bugfixes.
 
   17 Jan 2013; Pacho Ramos <pacho@gentoo.org> gconf-2.32.4.ebuild,
   gconf-3.2.5.ebuild:
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index 72db0f2e1fec..191c4e568ece 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -5,14 +5,20 @@ AUX gconf-2.24.0-no-gconfd.patch 787 SHA256 f8352648276d2a2dab162ddade55ec0371e7
 AUX gconf-2.28.0-entry-set-value-sigsegv.patch 533 SHA256 e58c0981491e794de05dd71562e0a9675433469e87c7149088ebea432c9619b0 SHA512 c0576004aa8c8b64750037183a5d3df5b4d8ba520c83f33a906a8549139e2167d08c1bcc56cbdfe202bb078a703bd561680af63588f7ee4eb42ad6077182a3fa WHIRLPOOL eddf3b88ddbec7e29f2a58e6ccf26859e0846ec9b01e821f28dc584a9ad297805f5313e29dca5e5d576cca704e1ddb458fd322a3380ed65ddd4bb7d6924d862c
 DIST GConf-2.32.4.tar.xz 1326600 SHA256 f36f4a01a5ac898b5ec49a04a43b051d3809f07c3d0841188fd6a5c512389025 SHA512 fabcd35ae9dd50969dc60219172e613fdb9f81ecaf182003a7e9d81745ffa9931fc279383dae9d6eb25817f594ab38e1ec2e910e14df402a1cb515eae258358f WHIRLPOOL 836491977e5af62a02fa8e70c92f2c2a07c350aabd44b75b0e9ab203c36d0fd53ed7605e26c81a01e498c8bb7d5e3089427ede8d7583964b65aecc46ddac7faf
 DIST GConf-3.2.5.tar.xz 1525188 SHA256 4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6 SHA512 d67427a275bc62531232d8cf9641135a03567aef7a97b014d86058df20279004b785b9bfaf11f4f5f88c7187c2b68a138074c5dd0d1e5e1347ebb2b394367926 WHIRLPOOL a1fc6a3bd1fe088438178cec9e891e2997abd1ffff6ddcec799c637dc2e2b7a57d1dbb939f281a28e7323ec9b5a31867ec21346919d963326583bafcb9226eb7
+DIST GConf-3.2.6.tar.xz 1559904 SHA256 1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c SHA512 35f5f659f9d03f7531a7102adacbda0eb310d8a55a831c768c91a82e07dae21247726e00e0e411f63b1de9ade0f042ded572a3ea4a4b2ad3135231f344540b58 WHIRLPOOL ef38b5fb25b3cf915052ce00f926a0a9bf8ecb5771c2db0fd6f5f11531a8edb1c098a036eaaa20490e3de87a0a5eb411542f86d8c6a2be8ac45dcae0b29d3414
 EBUILD gconf-2.32.4.ebuild 2410 SHA256 58d516de6b1a099754db979aa2404f4e8f42c850cc0e4b90a68cf1570220f05c SHA512 68266a5c973854d4d17fcc2c841891039efea845b6df161e1acb07a43a07a99470b7cebf1e5123855d269f91d8c131b93739fab8370f2dec1ea1c6706c4877d9 WHIRLPOOL d4464d649ca3b8392080ef4511aa0e3f88461055eb88657bc45e11a4751b154e07785cbcfa66aea6bb64ac3186e8441c6b24cc79320b8e30abaf39c8e82bfa4e
 EBUILD gconf-3.2.5.ebuild 2996 SHA256 75a1f379f8104d89a1cad98ef1c6c05279c4da26a763f05c97b24a515ff911fa SHA512 fe7ad53de8a1b024ac029a48d59a0454b27a5293e9249ea1a6043113422041484ad01207fc71fb3b2d879e69bcb7b16839528875f0eda917e3ab0245db9088c8 WHIRLPOOL ba77d65282a7cf1d7d66c6e96e5412ec427cd24f12b868bfc33bd32db11bda16ef961004629330cdb93fbe34f0f65e7bb8fc21452b4a1bcdc175195b011de741
-MISC ChangeLog 36994 SHA256 33d0c10082ba26a56a48b0e814f45df518ba9b828b38f53c363d6f3aaaa44ae6 SHA512 45ce5f2bbb4648207914a5b38110f9f88a175bba61653749c8e807bb6732d4cd4084bbb8c7511bbadafce953c52ac35c320d43acd1d727a6806316752b22c4e5 WHIRLPOOL 569ba9ed43e28af7c897519aab2fc3d621c8ef60d0ee5a81e7c25f9da63841cb2e29de7ce2b644cf7ee2f4e904a4da7b8e01a32cead3e663d23584ca4e7fb1c0
+EBUILD gconf-3.2.6.ebuild 2970 SHA256 c5ddb00084c95a84e1b28ca7a12325ab7b808bd4715c27b990752f36badb5eee SHA512 7e5f4d2a4496289e12b2de57fe402daa312d471be0373f3dcc0d871542eb2a133139dfdf54f441b691212c3a69d3748fcd7b5e4607bf72700f19afda94a85538 WHIRLPOOL 5c4a206baccf12b4ae10525826b82f9b093479ceae1261046667b1e87664e4d64cafdda8ddb8a87ccc113fe2c136765e31801c65c2163c528c51441c89785227
+MISC ChangeLog 37145 SHA256 2a52f80c28185b6f314e1aea4a1f398229808f2fbc75518c061c041e36009eee SHA512 fb180e4a2126e08b1b2f2f354ba4cc30c58b564ee181a4287c71a89fefdeeb253cbba7dd2742c6d177e0777e2d7e47670fb63c916adfb1cfb57c739f251c2809 WHIRLPOOL 16f29f89150e78c0f47c8392f7106bc4e206d64680f1fba222994f1055ba5b0f5d5f5a2b6eba4b258d52d41a5bf3ef061cca022dcf6f625b306a388eb223f015
 MISC metadata.xml 429 SHA256 ff1cdff3275ccf7ecf64d87d5929fa31dcb9c6d16647e39bc45348a665e49cb6 SHA512 b911347c41a8957ba77c82f59f9a2d90c1f39b89b85457c157e7e164bdd9d545f12be95dfe10ac0fe10e57c327ef90be81ed67cbdf16f588242ef443c2d3c6a3 WHIRLPOOL dd892feb28b9320dc5bc7cb4e92cae26926e7a3d3b0201bd64c9c73417a214e12e2e3ea067d5670cfec80c4c719841d90601ea0d99ab6db4ffa9be6a9c8916f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlD4YXgACgkQCaWpQKGI+9T6ZgCfT+XRE2EicF0obIKAMCRlpT0E
-JBkAnRlL0DP7C1Z8Ex47lNfdiZwVRTUG
-=v58Y
+iQEcBAEBCAAGBQJQ/g7AAAoJEJ0WA1zPCt1ht2sH/2IAbD28pYAT4sK3MUJvk77E
+yxNEwwJas4aC59URNBGXwU4KpfFT2dDtbN6/kCBrMz5eMkVAyrUL4tEFEYK/Hu7Q
+GOxwFNuquK6AA5neMiHVB42t8N3aRi3eA0zpnBgaHIGWa1Laba/ne4s/j587qKu5
+jaPtN3gPT2G2GvjhTFrX5jOES5GZcvnLV3gzai0j7YyEX9KL6EYEQIUMIzmb0S8z
+iET3VBuET+R9yK83jL9gJVnQOKcSKTD1LEEqFmF1SxP0/EuvnOKGO/2Mv781bqWY
+wNDgZ4XPBebiuYpofxqYdKZN9VAuJhqJCIYAGGGIMugt1LRlIWQ0RpIt5YpRMAs=
+=voj/
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gconf/gconf-3.2.6.ebuild b/gnome-base/gconf/gconf-3.2.6.ebuild
new file mode 100644
index 000000000000..b6ac68c49d92
--- /dev/null
+++ b/gnome-base/gconf/gconf-3.2.6.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-3.2.6.ebuild,v 1.1 2013/01/22 03:59:59 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME_ORG_MODULE="GConf"
+GNOME2_LA_PUNT="yes"
+
+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 ~amd64-fbsd ~x86-fbsd"
+IUSE="debug gtk +introspection ldap orbit policykit"
+
+RDEPEND=">=dev-libs/glib-2.31:2
+	>=dev-libs/dbus-glib-0.74:=
+	>=sys-apps/dbus-1:=
+	>=dev-libs/libxml2-2:2
+	gtk? ( >=x11-libs/gtk+-2.90:3 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	ldap? ( net-nds/openldap:= )
+	orbit? ( >=gnome-base/orbit-2.4:2 )
+	policykit? ( sys-auth/polkit:= )"
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig"
+
+pkg_setup() {
+	kill_gconf
+}
+
+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"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-gsettings-backend \
+		$(use_enable gtk) \
+		$(usex gtk --with-gtk=3.0 "") \
+		$(use_enable introspection) \
+		$(use_with ldap openldap) \
+		$(use_enable orbit) \
+		$(use_enable policykit defaults-service) \
+		ORBIT_IDL=$(type -P orbit-idl-2)
+}
+
+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=\"${EPREFIX}/etc/gconf\"" > 50gconf
+	echo 'GSETTINGS_BACKEND="gconf"' >> 50gconf
+	doenvd 50gconf
+	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 "{}" \;
+
+	if ! use orbit; then
+		ewarn "You are using dbus for GConf's IPC. If you are upgrading from"
+		ewarn "<=gconf-3.2.3, or were previously using gconf with USE=orbit,"
+		ewarn "you will need to now restart your desktop session (for example,"
+		ewarn "by logging out and then back in)."
+		ewarn "Otherwise, gconf-based applications may crash with 'Method ..."
+		ewarn "on interface \"org.gnome.GConf.Server\" doesn't exist' errors."
+	fi
+}
+
+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
+}