Clean up old revision.

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

3 files changed, 8 insertions, 114 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 904b2e90bdeb..ca352cd7eda0 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-base/gconf
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.276 2013/02/25 09:07:15 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.277 2013/03/07 08:15:06 eva Exp $
+
+  07 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org> -gconf-3.2.5.ebuild:
+  Clean up old revision.
 
   25 Feb 2013; Zac Medico <zmedico@gentoo.org> gconf-3.2.5.ebuild,
   gconf-3.2.6.ebuild:
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index 30d14265006f..2003c20aa7a4 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -4,17 +4,15 @@ Hash: SHA256
 AUX gconf-2.24.0-no-gconfd.patch 787 SHA256 f8352648276d2a2dab162ddade55ec0371e7c4f8bc3834de246fda8c32c66d3c SHA512 c7f7437321d2afcbe75a8b8d819f04e5864cde3b2130f6dcff78c622b9bd336c66a30d666e0a4283d2fcf5c54afc741cc84f90401889127b03ef22b0752fb7b8 WHIRLPOOL 86c118fb0b571b5c47849fd4f7f09ade4ebf76324771fe9cccc64d95462cf3ab1a32de9a312412f843129025c41253d658a6546d7c3d9496451b9aacdf3b9451
 AUX gconf-2.28.0-entry-set-value-sigsegv.patch 533 SHA256 e58c0981491e794de05dd71562e0a9675433469e87c7149088ebea432c9619b0 SHA512 c0576004aa8c8b64750037183a5d3df5b4d8ba520c83f33a906a8549139e2167d08c1bcc56cbdfe202bb078a703bd561680af63588f7ee4eb42ad6077182a3fa WHIRLPOOL eddf3b88ddbec7e29f2a58e6ccf26859e0846ec9b01e821f28dc584a9ad297805f5313e29dca5e5d576cca704e1ddb458fd322a3380ed65ddd4bb7d6924d862c
 DIST GConf-2.32.4.tar.xz 1326600 SHA256 f36f4a01a5ac898b5ec49a04a43b051d3809f07c3d0841188fd6a5c512389025 SHA512 fabcd35ae9dd50969dc60219172e613fdb9f81ecaf182003a7e9d81745ffa9931fc279383dae9d6eb25817f594ab38e1ec2e910e14df402a1cb515eae258358f WHIRLPOOL 836491977e5af62a02fa8e70c92f2c2a07c350aabd44b75b0e9ab203c36d0fd53ed7605e26c81a01e498c8bb7d5e3089427ede8d7583964b65aecc46ddac7faf
-DIST GConf-3.2.5.tar.xz 1525188 SHA256 4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6 SHA512 d67427a275bc62531232d8cf9641135a03567aef7a97b014d86058df20279004b785b9bfaf11f4f5f88c7187c2b68a138074c5dd0d1e5e1347ebb2b394367926 WHIRLPOOL a1fc6a3bd1fe088438178cec9e891e2997abd1ffff6ddcec799c637dc2e2b7a57d1dbb939f281a28e7323ec9b5a31867ec21346919d963326583bafcb9226eb7
 DIST GConf-3.2.6.tar.xz 1559904 SHA256 1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c SHA512 35f5f659f9d03f7531a7102adacbda0eb310d8a55a831c768c91a82e07dae21247726e00e0e411f63b1de9ade0f042ded572a3ea4a4b2ad3135231f344540b58 WHIRLPOOL ef38b5fb25b3cf915052ce00f926a0a9bf8ecb5771c2db0fd6f5f11531a8edb1c098a036eaaa20490e3de87a0a5eb411542f86d8c6a2be8ac45dcae0b29d3414
 EBUILD gconf-2.32.4.ebuild 2410 SHA256 58d516de6b1a099754db979aa2404f4e8f42c850cc0e4b90a68cf1570220f05c SHA512 68266a5c973854d4d17fcc2c841891039efea845b6df161e1acb07a43a07a99470b7cebf1e5123855d269f91d8c131b93739fab8370f2dec1ea1c6706c4877d9 WHIRLPOOL d4464d649ca3b8392080ef4511aa0e3f88461055eb88657bc45e11a4751b154e07785cbcfa66aea6bb64ac3186e8441c6b24cc79320b8e30abaf39c8e82bfa4e
-EBUILD gconf-3.2.5.ebuild 3068 SHA256 30c287a61146aad69d9468eae09834920d3416eff70957dce195ceb4ef890bc1 SHA512 5558994d94b0cd8f06f5ed48372d27dbe5e77b20db378cbe36dcd0d5fc24c71c10a3d68218ac75235e63a31956387c4ded1945d57f90985544f677b47c4a8a23 WHIRLPOOL 053a44d97d788cf7c952622be12ee08c8e0cd488531c6e57ab7e42b9abea0a49d7419923ba5c249fce2e3ba3164279fd8a6bb9ba20e69d7deb03045e1fd256d3
 EBUILD gconf-3.2.6.ebuild 3038 SHA256 49b8345281667923863e808d72bf66367518c28e26ec83ec248645b175f27295 SHA512 9c87fd7a03fc930eaf5a4e64a5fe204a1dc2f64ba21a50ad5df16c82c9b6be6ee4a2bb24e25f2314ab8f66974af06ad18a049328ae25cc696d1f83906d8b2a00 WHIRLPOOL 65d1c155d04f28e2b81186dcb55603a4d1be3562c093fce28dcfe95bac99af1abe43372fe008f3f95600bf400d97eaee8b973b7a86e9776fdc042a9ba2328247
-MISC ChangeLog 37292 SHA256 f56040d704aa35eb82881623db980796c45d5a3905338efef28a92b080ad1c80 SHA512 134ff886d8dd75ec18981df8f6ee36c680ebabf14b77cdf0235ffcb245a0afce164a4879dbc1483cdc90ca0557493f78533d5f3d2497b06b305dd060195378ae WHIRLPOOL 7d7f02bd6279197e53a3ca83f729639d483f3b9f9ce0bb10e69d410648cc26029720bd134258c7a2f7bd14a5a7816507863d0106cbab4dcbe5184d794953563b
+MISC ChangeLog 37389 SHA256 3395a7bbe90661f12ba20e4409e427606c6734902b3bd6f2f32bff7a8a2839fa SHA512 b2fce233483480accaa3a1d3ddb8c87bb4bfeb14f008f061f0444880850f8c7dc3cbd4317cf78daa71f919b95ee7dd014d2f910522ba70350a3dc950511856ea WHIRLPOOL 1746c8aac9fa9a253880c800dfacfa8664a41d10b75fe0f0d6e916df0e67975967070973285a93f4d7de4391208d3774c4b464261e6f6e90be016ec5993b75c4
 MISC metadata.xml 429 SHA256 ff1cdff3275ccf7ecf64d87d5929fa31dcb9c6d16647e39bc45348a665e49cb6 SHA512 b911347c41a8957ba77c82f59f9a2d90c1f39b89b85457c157e7e164bdd9d545f12be95dfe10ac0fe10e57c327ef90be81ed67cbdf16f588242ef443c2d3c6a3 WHIRLPOOL dd892feb28b9320dc5bc7cb4e92cae26926e7a3d3b0201bd64c9c73417a214e12e2e3ea067d5670cfec80c4c719841d90601ea0d99ab6db4ffa9be6a9c8916f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlErKcUACgkQ/ejvha5XGaOUcwCgxVQV2L88255VKEKdChTWyf6C
-bWsAniUZT1YaFTOqQJLJVkjLYMvuxxxe
-=qdCe
+iEYEAREIAAYFAlE4TIoACgkQ1fmVwcYIWAYjVgCcCGW1Q/A6BvuVJEt/N7VZ57+4
+SGgAoMHsjRdLc5QlkBWx9yVX6TEeK8t7
+=WmM8
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gconf/gconf-3.2.5.ebuild b/gnome-base/gconf/gconf-3.2.5.ebuild
deleted file mode 100644
index f70b2d24abb4..000000000000
--- a/gnome-base/gconf/gconf-3.2.5.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-3.2.5.ebuild,v 1.9 2013/02/25 09:07:15 zmedico Exp $
-
-EAPI="5"
-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 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="debug gtk +introspection ldap orbit policykit"
-
-RDEPEND=">=dev-libs/glib-2.31:2
-	>=dev-libs/dbus-glib-0.74:=
-	>=sys-apps/dbus-1:=
-	>=dev-libs/libxml2-2:2
-	gtk? ( >=x11-libs/gtk+-2.90:3 )
-	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-libs/libxslt
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig"
-
-pkg_setup() {
-	kill_gconf
-}
-
-src_prepare() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--enable-gsettings-backend
-		$(use_enable gtk)
-		"$(usex gtk --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
-
-	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=\"${EPREFIX}/etc/gconf\"" > 50gconf
-	echo 'GSETTINGS_BACKEND="gconf"' >> 50gconf
-	doenvd 50gconf
-	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  "${EPREFIX}"/etc/gconf/ -type d -exec chmod ugo+rx "{}" \;
-
-	einfo "changing permissions for gconf files"
-	find  "${EPREFIX}"/etc/gconf/ -type f -exec chmod ugo+r "{}" \;
-
-	if ! use orbit; then
-		ewarn "You are using dbus for GConf's IPC. If you are upgrading from"
-		ewarn "<=gconf-3.2.3, or were previously using gconf with USE=orbit,"
-		ewarn "you will need to now restart your desktop session (for example,"
-		ewarn "by logging out and then back in)."
-		ewarn "Otherwise, gconf-based applications may crash with 'Method ..."
-		ewarn "on interface \"org.gnome.GConf.Server\" doesn't exist' errors."
-	fi
-}
-
-kill_gconf() {
-	# This function will kill all running gconfd-2 that could be causing troubles
-	if [ -x "${EPREFIX}"/usr/bin/gconftool-2 ]
-	then
-		"${EPREFIX}"/usr/bin/gconftool-2 --shutdown
-	fi
-
-	return 0
-}