Bump to 3.2.3 from the gnome overlay. Notable changes: optional support for the new dbus-based IPC (build with USE=-orbit to enable it). Note that the traditional orbit IPC is still the default choice since it has received far more testing.

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

4 files changed, 118 insertions, 8 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 1944947acb41..a18ad8feaf6c 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,14 @@
 # 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.261 2011/10/30 15:54:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.262 2011/11/07 01:11:55 tetromino Exp $
+
+*gconf-3.2.3 (07 Nov 2011)
+
+  07 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org> +gconf-3.2.3.ebuild:
+  Bump to 3.2.3 from the gnome overlay. Notable changes: optional support for
+  the new dbus-based IPC (build with USE=-orbit to enable it). Note that the
+  traditional orbit IPC is still the default choice since it has received far
+  more testing.
 
   30 Oct 2011; Raúl Porcel <armin76@gentoo.org> gconf-2.32.4.ebuild:
   alpha/ia64/sh/sparc stable wrt #385699
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index 0c00609da6da..c113c5d7c027 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX gconf-2.24.0-no-gconfd.patch 787 RMD160 bbcd0e1dd0f49053522e703c33a9befb392b2203 SHA1 ccc94c4766a29f1bb3f16c1d1995996ba682686a SHA256 f8352648276d2a2dab162ddade55ec0371e7c4f8bc3834de246fda8c32c66d3c
 AUX gconf-2.28.0-entry-set-value-sigsegv.patch 533 RMD160 77e4fae8a19a57904d9e6706238a94172da5c223 SHA1 9deb172ce170e7333931e61e3cf2ae6ade24bb33 SHA256 e58c0981491e794de05dd71562e0a9675433469e87c7149088ebea432c9619b0
 DIST GConf-2.32.3.tar.bz2 1558681 RMD160 d491165a58dd658987730aeebfdbf70f8b7c93d6 SHA1 efc7d451c5988207f708b75c01d1d228ba3deed6 SHA256 63e249d16b1b50820e9c32f1d85ff2c94498afdd45544fa5f37b8e1d084c5bae
 DIST GConf-2.32.4.tar.xz 1326600 RMD160 d17c34f41179e8273ad05a5af3eb8207684f1fc6 SHA1 ff48bf293c59140f6bc585f2b036033c668fc38b SHA256 f36f4a01a5ac898b5ec49a04a43b051d3809f07c3d0841188fd6a5c512389025
+DIST GConf-3.2.3.tar.xz 1535476 RMD160 93b381dcf7879efd8bac52c6edb76e20ec15c13f SHA1 dfa87a2df31f87ce9370bd38a1790827892a77be SHA256 9eb55dd1d009b6eba9c32e3fae87d3aa45a33629a5e2031ed9f5acb05efaa149
 EBUILD gconf-2.32.3.ebuild 2537 RMD160 81bc873b8b755589eabcd5c756774a6b7ff40a72 SHA1 7c557ab2fe8ddfda45bf205e317582e00daaea58 SHA256 b6bbbfc6c7cc019ad3bc522d518509a5015b984a29e40f9bf5c99ef9a33adc7e
 EBUILD gconf-2.32.4.ebuild 2555 RMD160 4ec34f6ad5af84d6f4d41489f8ed82c382f64fe7 SHA1 07b0fb6932c43b66f1501109964dbe50b887274d SHA256 64a3b1824dddb4cc826982aa517fd278ce04e5474efb298d2e4bb6f6aa80e46e
-MISC ChangeLog 34301 RMD160 7612eb65ac77e36a9c1c202173449d1e67399da4 SHA1 828b0a327110e7f2c6680da33e541408296337e6 SHA256 8bbf202ee04d4daf622cee22c5e67a8c84c2f54b1c6b5a1d075dcb61bc431eee
-MISC metadata.xml 438 RMD160 fd4466302f9275a9043a9ca04485809c4fa47f23 SHA1 86f6864ba00e0255d9d1b73ff3235ee33f196251 SHA256 f17968d494bc984a5f632b37e6dc606c80b603a4560cba45c4014ad23f083139
+EBUILD gconf-3.2.3.ebuild 2639 RMD160 8a19856a0f753e991ddee55bfd6562d61ab3569b SHA1 805dd42c718f4dbed4a4a40fbdac02d02048b404 SHA256 28543af6d1987501d6d6df437083cb17bdeb6b4d7c114112717bf033cd8bf02b
+MISC ChangeLog 34661 RMD160 393587390deeb350b04060e72b3b8879af1b39af SHA1 16739fd95b617af7e0fa8db1b2ce8c2fa34814f1 SHA256 b28efe3ded2bdd206039cf226d30000d05fc6ce945f3bfc769bca26dd2297869
+MISC metadata.xml 528 RMD160 72ffb555ed2893ad4cab16e98a8b78ac234efb3b SHA1 8260846fab125a9132012ac5de4f217af97c8370 SHA256 ea091b9834e15c95b73eb692468c72deca61f4e2170ce5cdad77c175cbeb7aa9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEUEARECAAYFAk6tcycACgkQuQc30/atMkAkbQCYgxHND5iWeieE0OttNiGPQ3s5
-FgCdFgRnbDmPrD/dO9oZynr6YFF2y2o=
-=cugb
+iF4EAREIAAYFAk63MGEACgkQdjK8w9WeBnACuQD/Z4NYqjla7I8LWq1i6+Wn3i0X
+pXjv6Qc68fOtBCdVDGwA/3DolHGzegkAEp7m3KLz6zVq6A9kaTphs7/yvfgChyTb
+=oni8
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gconf/gconf-3.2.3.ebuild b/gnome-base/gconf/gconf-3.2.3.ebuild
new file mode 100644
index 000000000000..44252a311472
--- /dev/null
+++ b/gnome-base/gconf/gconf-3.2.3.ebuild
@@ -0,0 +1,98 @@
+# 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-3.2.3.ebuild,v 1.1 2011/11/07 01:11:55 tetromino Exp $
+
+EAPI="4"
+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 ~x86-fbsd"
+IUSE="debug doc +introspection ldap +orbit policykit"
+# orbit IPC is default for now (dbus IPC is somewhat experimental)
+
+RDEPEND=">=dev-libs/glib-2.25.9:2
+	>=x11-libs/gtk+-2.90:3
+	>=dev-libs/dbus-glib-0.74
+	>=sys-apps/dbus-1
+	>=dev-libs/libxml2-2:2
+	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-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=3.0
+		$(use_enable introspection)
+		$(use_with ldap openldap)
+		$(use_enable orbit)
+		$(use_enable policykit defaults-service)
+		ORBIT_IDL=$(type -P orbit-idl-2)"
+		# Need host's IDL compiler for cross or native build, bug #262747
+	kill_gconf
+}
+
+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
+}
diff --git a/gnome-base/gconf/metadata.xml b/gnome-base/gconf/metadata.xml
index dc0fcef258a3..c4841b9bc944 100644
--- a/gnome-base/gconf/metadata.xml
+++ b/gnome-base/gconf/metadata.xml
@@ -7,5 +7,7 @@
 	<flag name="ldap">Build backend which enables default mail accounts,
 	addressbooks and calendars for Evolution to be configured using each
 	user's LDAP entry."</flag>
+	<flag name="orbit">Use <pkg>gnome-base/orbit</pkg> for IPC, same as in
+	gconf-2.x</flag>
 </use>
 </pkgmetadata>