New version: --toggle and --search-key-regexp support in gconftool-2; size and parsing speed improvements in saved gconf setting trees; bug fixes

Package-Manager: portage-2.2_rc22/cvs/Linux 2.6.29-gentoo-r1 x86_64

3 files changed, 111 insertions, 2 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 02e23cf21d76..dd70dcbcf5a6 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gconf
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.204 2009/04/12 20:41:22 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.205 2009/04/19 07:26:06 leio Exp $
+
+*gconf-2.26.0 (19 Apr 2009)
+
+  19 Apr 2009; Mart Raudsepp <leio@gentoo.org> +gconf-2.26.0.ebuild:
+  New version: --toggle and --search-key-regexp support in gconftool-2; size
+  and parsing speed improvements in saved gconf setting trees; bug fixes
 
   12 Apr 2009; Friedrich Oslage <bluebird@gentoo.org> gconf-2.24.0.ebuild:
   Stable on sparc, bug #260063
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index 40c93776a127..ac5b0015ecf7 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -6,8 +6,10 @@ AUX gconf-2.24.0-no-gconfd.patch 787 RMD160 bbcd0e1dd0f49053522e703c33a9befb392b
 DIST GConf-2.20.1.tar.bz2 1404919 RMD160 743bee341731402e5d4938ee030adf4f463d9a52 SHA1 c628e2645a91b15749f1ebacc62ea685cbfa681c SHA256 0fb446b87e71fe1089f43e671b5b7689ec91d781b5b2e8f0fc72d4a83a014838
 DIST GConf-2.22.0.tar.bz2 1416685 RMD160 71f0c6f20882681efdffc957f6d86affd4a29a80 SHA1 2a9ca649ef58394e425a030dc99b863b499a8a56 SHA256 54e40cf047eb431cdf994f763ae840107ed6e9b8f9521b2b2eb07c7a55f92ce0
 DIST GConf-2.24.0.tar.bz2 1467817 RMD160 b4016275e9dffa248620303bc2241f6c0081be06 SHA1 e93ff2609c0278075acabdf609f42aa406e20c8e SHA256 990003904ee13b2fd98a61d55fa4d0fcb30fb233454a036bb9465f42d1acbb1b
+DIST GConf-2.26.0.tar.bz2 1490741 RMD160 0673a347b42519f411a7ba247aad12e8249f754d SHA1 317fd4504cc4104b7b914326cbb3b73d61234b4c SHA256 2b9fe741f84d78d7c4f18835728facce81f7db656c2c37f669ee61785911da10
 EBUILD gconf-2.20.1-r1.ebuild 2226 RMD160 9589270ea56d087977acb66ef67d8344616ec21a SHA1 c065027e287bb24084b2fcb26770a0f8489988c1 SHA256 0648111360a1770ad9a007799097c82cc5d45bc7b114f366989e01a14ea9981f
 EBUILD gconf-2.22.0.ebuild 2005 RMD160 2fba83bdc5a2b10c8708e93f71d5c843da7d8ab5 SHA1 8bb6736a03ee5e0e09706bd317d02e208a7efa57 SHA256 09e157878999c561f15a6a9821a8bb6b84befdc4a4a07c5b270d38e64a2b41cf
 EBUILD gconf-2.24.0.ebuild 2277 RMD160 eb0b228384db1c209c22e00a554c85f5bdf35a8f SHA1 f880df57c32e4a16b7c8c5e3014668a875eea8ce SHA256 fc8789c43a446153e665129ea13f0ca94983f73046dabab68d142387c33e9f0b
-MISC ChangeLog 26528 RMD160 1cffac31c88dac9494af4097729c2ca4fe667772 SHA1 249c6ceb070a89784d98f660b51d158532971065 SHA256 0d6bc0d3fd93008cb97621b7d7e991d3cb16a0633ef03ae187087645748e0729
+EBUILD gconf-2.26.0.ebuild 2314 RMD160 74988740e9f18b9fd2a68fbddb81d4084a5ef350 SHA1 4ea5b21da9dc5959f54441f4056dec9bdfee7f82 SHA256 fbef074d5b056d253864baf812524632e32ef1530d5ad2bd2531adbc13fd7baa
+MISC ChangeLog 26773 RMD160 effce7b854e749e9f033febcdc865f7f3b7e5e7a SHA1 a8cc183a0a35639459b204007baf3815de657cac SHA256 7cfde051d105718b70f87af7fc5a482a12f325b0284edafffb75bf520d5b3bbb
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
diff --git a/gnome-base/gconf/gconf-2.26.0.ebuild b/gnome-base/gconf/gconf-2.26.0.ebuild
new file mode 100644
index 000000000000..06c9c4167211
--- /dev/null
+++ b/gnome-base/gconf/gconf-2.26.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.26.0.ebuild,v 1.1 2009/04/19 07:26:06 leio Exp $
+
+inherit autotools eutils 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 ~ppc64 ~sh ~sparc ~x86"
+IUSE="debug doc ldap policykit"
+
+RDEPEND=">=dev-libs/glib-2.14
+	>=x11-libs/gtk+-2.8.16
+	>=dev-libs/dbus-glib-0.74
+	>=sys-apps/dbus-1
+	>=gnome-base/orbit-2.4
+	>=dev-libs/libxml2-2
+	ldap? ( net-nds/openldap )
+	policykit? ( >=sys-auth/policykit-0.7 )"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/gtk-doc-am-1.10
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--enable-gtk
+		--disable-defaults-service
+		--disable-static
+		$(use_enable debug)
+		$(use_with ldap openldap)
+		$(use_enable policykit defaults-service)"
+	kill_gconf
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# fix bug #193442, GNOME bug #498934
+	epatch "${FILESDIR}/${PN}-2.24.0-automagic-ldap.patch"
+
+	# fix bug #238276
+	epatch "${FILESDIR}/${PN}-2.24.0-no-gconfd.patch"
+
+	eautoreconf
+}
+
+# Can't run tests, missing script.
+#src_test() {
+#	emake -C tests || die "make tests failed"
+#	sh "${S}"/tests/runtests.sh || die "running tests failed"
+#}
+
+src_install() {
+	gnome2_src_install
+
+	keepdir /etc/gconf/gconf.xml.mandatory
+	keepdir /etc/gconf/gconf.xml.defaults
+
+	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > 50gconf
+	doenvd 50gconf || die "doenv failed"
+	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-2 that could be causing troubles
+	if [ -x /usr/bin/gconftool-2 ]
+	then
+		/usr/bin/gconftool-2 --shutdown
+	fi
+
+	return 0
+}