Version bump with bugfixes and translation updates, remove old.

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

3 files changed, 37 insertions, 32 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index ca80946aa522..4770045b6fda 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,12 @@
 # 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.247 2011/04/08 00:42:56 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.248 2011/04/10 13:01:32 pacho Exp $
+
+*gconf-2.32.2 (10 Apr 2011)
+
+  10 Apr 2011; Pacho Ramos <pacho@gentoo.org> -gconf-2.28.1.ebuild,
+  +gconf-2.32.2.ebuild:
+  Version bump with bugfixes and translation updates, remove old.
 
   08 Apr 2011; Mart Raudsepp <leio@gentoo.org> -gconf-2.26.2-r1.ebuild,
   gconf-2.32.0-r1.ebuild:
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index be543b8c082b..98e2ce1f524e 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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.28.1.tar.bz2 1476141 RMD160 9ee3b6e68553997a128ca2b49992ddfbe157609b SHA1 944e067a85b43e7a778b9ee244f85508931a49a0 SHA256 53c477f9086057b0c84816a1c979e01537b862fbcacb6af4b62f8cffec4b3000
 DIST GConf-2.32.0.tar.bz2 1541688 RMD160 9ef6adca69e5ac8e2386f28f5af8e8c5c9fbb52e SHA1 2711c7b53761d2c789112bb1f989f1c1a6de5265 SHA256 54dd1dd7f49928a9cc42574bef6ef0481753770fc19986dc2004bbb7fac977a0
-EBUILD gconf-2.28.1.ebuild 2728 RMD160 28c0c90c9c153539cde19148230aaaea3594bbb3 SHA1 7f77888f3827bf9c0de48d22b8506f1d7258f290 SHA256 3e71d7cd1a095b2b63899bb948fb83b28387ce134bd982e3966fe46fddbc4a9b
+DIST GConf-2.32.2.tar.bz2 1555612 RMD160 b373e27199b1bc390c98f81ef41636b0e3a90314 SHA1 7def3d52e63f722c6ac6291cbc587ea368d866d5 SHA256 6bff392b9d1ca52502f0c6dac5506260800e43d72ca1fa77a4524af1a3cc1330
 EBUILD gconf-2.32.0-r1.ebuild 2506 RMD160 f1b1eb55d1e0a518774c4100022f1b37b87afa1d SHA1 f262f42d2191aceace2c450c9af46db188165b7e SHA256 870b9628c8f899a17e21dc9cf8960c9d213928017735820d1636d25d20efbfa7
-MISC ChangeLog 32649 RMD160 7168eaebf828bcdb0ebe9f936db1534acf162c21 SHA1 2e76745098328804eddc4d575999ac6161b08d82 SHA256 780c5e361eeeafc412060b3eb790a0bf11551554ea34e56590252b0b673fb5fa
+EBUILD gconf-2.32.2.ebuild 2541 RMD160 06c388d30c26c03cf38a255f6b11d1059d44a604 SHA1 27ec20ed3a853b8ae3c117f980b2003c8e1ac8cf SHA256 fb27e1bcbf836f445b358e038ccc372c8d41990fabec67303e6b4648406fd0ed
+MISC ChangeLog 32838 RMD160 b446ad2f55b4ccf2e3a255f7ea4bbf084c490fd1 SHA1 3e75dfe15127da3bed865d1f46001d9a4b73843c SHA256 09ef40618c1964f25c5932987bd78d030dafb2a708ecd1a74391043587664d6a
 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
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gconf/gconf-2.28.1.ebuild b/gnome-base/gconf/gconf-2.32.2.ebuild
index bda2f18e4347..a5e0327ab0f6 100644
--- a/gnome-base/gconf/gconf-2.28.1.ebuild
+++ b/gnome-base/gconf/gconf-2.32.2.ebuild
@@ -1,46 +1,43 @@
 # 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.28.1.ebuild,v 1.10 2011/03/16 10:24:45 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.32.2.ebuild,v 1.1 2011/04/10 13:01:33 pacho Exp $
 
-EAPI="2"
+EAPI="3"
+GCONF_DEBUG="yes"
+GNOME_ORG_MODULE="GConf"
 
 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"
+HOMEPAGE="http://projects.gnome.org/gconf/"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="debug doc ldap policykit"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc +introspection ldap policykit"
 
-RDEPEND=">=dev-libs/glib-2.14:2
+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
-	>=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() {
+	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
@@ -52,22 +49,13 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 
-	# Do not start gconfd when installing schemas, fix bug #238276, upstream ?
+	# 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
+	# 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"
-
-	# 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
 
@@ -77,8 +65,9 @@ src_install() {
 	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
+	dodir /root/.gconfd || die
 }
 
 pkg_preinst() {