Drop .la files, bug #386665 by Ago. Drop old.

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

4 files changed, 13 insertions, 107 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 9e8dea5bf71f..7f18b8f146ce 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,10 @@
 # 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.255 2011/10/05 17:16:38 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.256 2011/10/10 19:28:52 pacho Exp $
+
+  10 Oct 2011; Pacho Ramos <pacho@gentoo.org> -gconf-2.32.0-r1.ebuild,
+  gconf-2.32.4.ebuild:
+  Drop .la files, bug #386665 by Ago. Drop old.
 
   05 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org> gconf-2.32.3.ebuild:
   ppc/ppc64 stable wrt #369909
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index 629ac396f1bb..6c2c2b985e6b 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -3,20 +3,16 @@ 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.32.0.tar.bz2 1541688 RMD160 9ef6adca69e5ac8e2386f28f5af8e8c5c9fbb52e SHA1 2711c7b53761d2c789112bb1f989f1c1a6de5265 SHA256 54dd1dd7f49928a9cc42574bef6ef0481753770fc19986dc2004bbb7fac977a0
 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
-EBUILD gconf-2.32.0-r1.ebuild 2506 RMD160 f1b1eb55d1e0a518774c4100022f1b37b87afa1d SHA1 f262f42d2191aceace2c450c9af46db188165b7e SHA256 870b9628c8f899a17e21dc9cf8960c9d213928017735820d1636d25d20efbfa7
 EBUILD gconf-2.32.3.ebuild 2537 RMD160 81bc873b8b755589eabcd5c756774a6b7ff40a72 SHA1 7c557ab2fe8ddfda45bf205e317582e00daaea58 SHA256 b6bbbfc6c7cc019ad3bc522d518509a5015b984a29e40f9bf5c99ef9a33adc7e
-EBUILD gconf-2.32.4.ebuild 2541 RMD160 f219fd7f0cfb2f30af4a14a358cfc29d2c12744e SHA1 9d98602c45176701017a2fbc9f7b86dc12312a15 SHA256 a6206e9fea24e26fb92d9a3c815947a0c680e7c82656fad1fe6bab778b052b43
-MISC ChangeLog 33637 RMD160 d2415be516bb0b57939f8156487e5e5e859c73e0 SHA1 56615d427be1219f04e39d1323ab043fb028b800 SHA256 fdb749d360ed2d4fea9b6871f2da70a36c28a7020d51729889430aa523a7c976
+EBUILD gconf-2.32.4.ebuild 2562 RMD160 128676ccd5570bc499b918a8ba85c1ffb924295a SHA1 d151c8cf7aa23485c7be7368fa251e7fc6ec2ae4 SHA256 48d143f654468dd55991dd757d1e8e6ed2e88f255f1504b6eb021e663c4d4335
+MISC ChangeLog 33775 RMD160 683d60f553b1cc58a57af713783403ec053cb077 SHA1 5d26b3bf21c2a0abb1810090b78c238060ce053e SHA256 0afbb98349a79ec781aeeaad0baee01dd5bd1a0a43d09d46ad8ae9211a06a450
 MISC metadata.xml 438 RMD160 fd4466302f9275a9043a9ca04485809c4fa47f23 SHA1 86f6864ba00e0255d9d1b73ff3235ee33f196251 SHA256 f17968d494bc984a5f632b37e6dc606c80b603a4560cba45c4014ad23f083139
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk6MkPwACgkQIiMqcbOVdxQivAP/bKk2zAcWJI/wLuSAx6iS12x6
-GegSQhKj1WkcOu+TBuAS+UH8Ey/K7BH/+GFjrmTBAYFeo0U9OFiCaBR62h41g97v
-MR5abcKaX5xo7EXHfnQTQ6DH5/W828UqSz1zXEscnbwnx7PiO/Xoa54KEX2jkp+f
-pvFnsdVAuup1Vu7X+Ps=
-=8DC8
+iEYEARECAAYFAk6TR3sACgkQCaWpQKGI+9SmLwCdF2XtxXdz6/affCdQCTBQgSpC
+zaMAnRZl9VvCwHT8aio4xbh8jvPyr451
+=KBDV
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gconf/gconf-2.32.0-r1.ebuild b/gnome-base/gconf/gconf-2.32.0-r1.ebuild
deleted file mode 100644
index 22e5b9043b3c..000000000000
--- a/gnome-base/gconf/gconf-2.32.0-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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.32.0-r1.ebuild,v 1.9 2011/04/08 00:42:56 leio Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-GNOME_ORG_MODULE="GConf"
-
-inherit eutils gnome2
-
-DESCRIPTION="Gnome Configuration System and Daemon"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="debug doc +introspection ldap policykit"
-
-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
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	G2CONF="${G2CONF}
-		--enable-gtk
-		--disable-static
-		--enable-gsettings-backend
-		$(use_enable introspection)
-		$(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 #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/gconf-2.32.4.ebuild b/gnome-base/gconf/gconf-2.32.4.ebuild
index e002233d920c..c112d92d2bea 100644
--- a/gnome-base/gconf/gconf-2.32.4.ebuild
+++ b/gnome-base/gconf/gconf-2.32.4.ebuild
@@ -1,9 +1,10 @@
 # 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.32.4.ebuild,v 1.1 2011/06/20 10:37:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.32.4.ebuild,v 1.2 2011/10/10 19:28:52 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
 GNOME_ORG_MODULE="GConf"
 
 inherit eutils gnome2