Prevent totaly disabling debug mode, some apps can crash in the worst case

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 112 insertions, 12 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 22b3e14b4852..a82e89197767 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gconf
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.210 2009/05/16 09:47:56 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.211 2009/06/16 20:31:19 mrpouet Exp $
+
+*gconf-2.26.2-r1 (16 Jun 2009)
+
+  16 Jun 2009; <mrpouet@gentoo.org> +gconf-2.26.2-r1.ebuild:
+  Prevent totaly disabling debug mode, some apps can crash in the worst case
 
 *gconf-2.26.2 (16 May 2009)
 
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index 1042098db89a..9cad22dc9b2d 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gconf-2.24.0-automagic-ldap.patch 2442 RMD160 adc1d7e7f8209da674fca5ac6ad91628887535b3 SHA1 ddf6759e0316b811f1d152294cd7de3b3330f62d SHA256 d960ab342d8224853ac689256e910ad8855031a721c73304aa32d5810443798d
 AUX gconf-2.24.0-no-gconfd.patch 787 RMD160 bbcd0e1dd0f49053522e703c33a9befb392b2203 SHA1 ccc94c4766a29f1bb3f16c1d1995996ba682686a SHA256 f8352648276d2a2dab162ddade55ec0371e7c4f8bc3834de246fda8c32c66d3c
 DIST GConf-2.24.0.tar.bz2 1467817 RMD160 b4016275e9dffa248620303bc2241f6c0081be06 SHA1 e93ff2609c0278075acabdf609f42aa406e20c8e SHA256 990003904ee13b2fd98a61d55fa4d0fcb30fb233454a036bb9465f42d1acbb1b
@@ -8,13 +5,7 @@ DIST GConf-2.26.0.tar.bz2 1490741 RMD160 0673a347b42519f411a7ba247aad12e8249f754
 DIST GConf-2.26.2.tar.bz2 1474738 RMD160 280cd55dc3562445c716b88dfddba4ddd2508786 SHA1 bf5323d974fa22165de2144100234647fd50ef17 SHA256 717af270db891088394d154e3e22acc01af382306624c83679a4f8d6ba8467ed
 EBUILD gconf-2.24.0.ebuild 2406 RMD160 8b3f7d019811d87874c68f0ac57723c6e525440c SHA1 91d4fcbd135f2f4f190e01b1b367d62bdc169a76 SHA256 347994f0ab08deaa90299c12eb5f622a021c22a379fb56bce3bceaaa9d3b97a3
 EBUILD gconf-2.26.0.ebuild 2573 RMD160 71997fd4439ac1e41ed566fcc83ba9cd7560022c SHA1 8a69b9ff46f2d9a635fbc8413c17cce226a00e72 SHA256 24093fb4035e56eef3e32545601a399c69a34d1b9913eb917b52415520cfbdc1
+EBUILD gconf-2.26.2-r1.ebuild 2617 RMD160 7fb39cec0af3b110408292139e18d9bf8a03198c SHA1 f6bc8baf0091d1611bbd459ba7f26028c9b9ca32 SHA256 0c7ed0533afa17940cec0ab77872830705593410eb56ad823ad43f73610fc31e
 EBUILD gconf-2.26.2.ebuild 2632 RMD160 9dacbe37a2d2fecf98ff6640e44b6b02c61f4553 SHA1 9b13c42c9f27a0c29763920465c87a19ff2ce5e2 SHA256 9d5b50904797ef3b0fa7dd51ba61c5fd11286886fe4d3bfc3863f7beb1a096ed
-MISC ChangeLog 27579 RMD160 6a78ef670ddbed4acf5d8c6576d108d99620818e SHA1 c4068137c6eada2eb6a545a183adfb2b49917eaa SHA256 8a405d7a5ab8ce92cc5c39ad17152901fe555cfef80ce5a8ecaa6811bbee58bb
+MISC ChangeLog 27754 RMD160 1fdd6e87a9e4c3c538dd36fef939aa5901a29403 SHA1 2177378ec66f84e8d2f0118eeff24fcc20825b10 SHA256 539f8612cce93529ac284d1e7249b78da09a35cf024831801928f1e529c27410
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoOi9sACgkQ1fmVwcYIWAZnywCZAZwoWrFJQfEfQf22hf+Gd4Tg
-acAAoKnYFhNfp+U4wbyhq25S77EesPp7
-=OT5R
------END PGP SIGNATURE-----
diff --git a/gnome-base/gconf/gconf-2.26.2-r1.ebuild b/gnome-base/gconf/gconf-2.26.2-r1.ebuild
new file mode 100644
index 000000000000..a3ab1a8f2f1f
--- /dev/null
+++ b/gnome-base/gconf/gconf-2.26.2-r1.ebuild
@@ -0,0 +1,104 @@
+# 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.2-r1.ebuild,v 1.1 2009/06/16 20:31:19 mrpouet Exp $
+
+EAPI="2"
+
+inherit 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 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+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-static
+		$(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 ?
+	epatch "${FILESDIR}/${PN}-2.24.0-no-gconfd.patch"
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
+}
+
+# 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
+	# Make sure this directory exists, bug #268070, upstream #572027
+	keepdir /etc/gconf/gconf.xml.system
+
+	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
+}