Re-add ~mips keyword for newest version, bug 296548. Remove old ~mips version

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

4 files changed, 9 insertions, 110 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index a695914abe5b..ca80946aa522 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.246 2011/03/22 19:08:11 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.247 2011/04/08 00:42:56 leio Exp $
+
+  08 Apr 2011; Mart Raudsepp <leio@gentoo.org> -gconf-2.26.2-r1.ebuild,
+  gconf-2.32.0-r1.ebuild:
+  Re-add ~mips keyword for newest version, bug 296548. Remove old ~mips version
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> gconf-2.32.0-r1.ebuild:
   Marking gconf-2.32.0-r1 ppc stable for bug 353436
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index f8c0fbe44038..be543b8c082b 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1,10 +1,8 @@
 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.26.2.tar.bz2 1474738 RMD160 280cd55dc3562445c716b88dfddba4ddd2508786 SHA1 bf5323d974fa22165de2144100234647fd50ef17 SHA256 717af270db891088394d154e3e22acc01af382306624c83679a4f8d6ba8467ed
 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.26.2-r1.ebuild 2493 RMD160 a43630d90e584d7a2c51b9723442ff87a1bcf47f SHA1 da9eedbc8898bfaf6469a3f86ec3e2f7a611778d SHA256 e3dd308d1ac36619797c70c684288018ea3f70d25a96661a2527d09c233d589d
 EBUILD gconf-2.28.1.ebuild 2728 RMD160 28c0c90c9c153539cde19148230aaaea3594bbb3 SHA1 7f77888f3827bf9c0de48d22b8506f1d7258f290 SHA256 3e71d7cd1a095b2b63899bb948fb83b28387ce134bd982e3966fe46fddbc4a9b
-EBUILD gconf-2.32.0-r1.ebuild 2502 RMD160 321f013f6c2a022e9c8fb135fffa0f3c755c653d SHA1 e8d681ae40c60a2a4f4bc71064ea2abd0ab7ff2e SHA256 b663cf35637a4b98087b0f560fa7931bd241619ee90e353eaa8dc2d2f406d7ef
-MISC ChangeLog 32472 RMD160 655a864abe6a1605220ed7207f0371f5d96b72f0 SHA1 c4cbaa13687513a84c1157b55e38a221c136619f SHA256 36a2b5540a17a620982409d526901a0c20b48357e91640c020e52fcb8edc56a8
+EBUILD gconf-2.32.0-r1.ebuild 2506 RMD160 f1b1eb55d1e0a518774c4100022f1b37b87afa1d SHA1 f262f42d2191aceace2c450c9af46db188165b7e SHA256 870b9628c8f899a17e21dc9cf8960c9d213928017735820d1636d25d20efbfa7
+MISC ChangeLog 32649 RMD160 7168eaebf828bcdb0ebe9f936db1534acf162c21 SHA1 2e76745098328804eddc4d575999ac6161b08d82 SHA256 780c5e361eeeafc412060b3eb790a0bf11551554ea34e56590252b0b673fb5fa
 MISC metadata.xml 438 RMD160 fd4466302f9275a9043a9ca04485809c4fa47f23 SHA1 86f6864ba00e0255d9d1b73ff3235ee33f196251 SHA256 f17968d494bc984a5f632b37e6dc606c80b603a4560cba45c4014ad23f083139
diff --git a/gnome-base/gconf/gconf-2.26.2-r1.ebuild b/gnome-base/gconf/gconf-2.26.2-r1.ebuild
deleted file mode 100644
index da4b8040d949..000000000000
--- a/gnome-base/gconf/gconf-2.26.2-r1.ebuild
+++ /dev/null
@@ -1,103 +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.26.2-r1.ebuild,v 1.12 2011/03/16 10:24:45 nirbheek 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="~mips"
-IUSE="debug doc ldap"
-
-RDEPEND=">=dev-libs/glib-2.14:2
-	>=x11-libs/gtk+-2.8.16:2
-	>=dev-libs/dbus-glib-0.74
-	>=sys-apps/dbus-1
-	>=gnome-base/orbit-2.4:2
-	>=dev-libs/libxml2-2:2
-	ldap? ( net-nds/openldap )"
-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)
-		--disable-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
-}
diff --git a/gnome-base/gconf/gconf-2.32.0-r1.ebuild b/gnome-base/gconf/gconf-2.32.0-r1.ebuild
index c5c6eae0ce91..22e5b9043b3c 100644
--- a/gnome-base/gconf/gconf-2.32.0-r1.ebuild
+++ b/gnome-base/gconf/gconf-2.32.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.8 2011/03/22 19:08:11 ranger Exp $
+# $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"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
+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