Fix slot-deps on gtk+ and other libs, remove old, drop keywords on 2.26.2-r1

(Portage version: 2.1.9.42/cvs/Linux x86_64)

5 files changed, 23 insertions, 118 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 0bcdab3bc9a4..e05d8cf2922a 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.242 2011/03/12 16:05:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.243 2011/03/16 10:24:45 nirbheek Exp $
+
+  16 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  gconf-2.26.2-r1.ebuild, gconf-2.28.1.ebuild, -gconf-2.32.0.ebuild,
+  gconf-2.32.0-r1.ebuild:
+  Fix slot-deps on gtk+ and other libs, remove old, drop keywords on
+  2.26.2-r1
 
   12 Mar 2011; Raúl Porcel <armin76@gentoo.org> gconf-2.32.0-r1.ebuild:
   alpha/arm/ia64/sh/sparc stable wrt #353436
diff --git a/gnome-base/gconf/gconf-2.26.2-r1.ebuild b/gnome-base/gconf/gconf-2.26.2-r1.ebuild
index 598699931442..da4b8040d949 100644
--- a/gnome-base/gconf/gconf-2.26.2-r1.ebuild
+++ b/gnome-base/gconf/gconf-2.26.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.11 2010/12/18 23:13:40 ssuominen Exp $
+# $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"
 
@@ -16,15 +16,15 @@ SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="~mips"
 IUSE="debug doc ldap"
 
-RDEPEND=">=dev-libs/glib-2.14
-	>=x11-libs/gtk+-2.8.16
+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
-	>=dev-libs/libxml2-2
+	>=gnome-base/orbit-2.4:2
+	>=dev-libs/libxml2-2:2
 	ldap? ( net-nds/openldap )"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35
diff --git a/gnome-base/gconf/gconf-2.28.1.ebuild b/gnome-base/gconf/gconf-2.28.1.ebuild
index 6e86b9e5be04..bda2f18e4347 100644
--- a/gnome-base/gconf/gconf-2.28.1.ebuild
+++ b/gnome-base/gconf/gconf-2.28.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.9 2010/10/08 19:43:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.28.1.ebuild,v 1.10 2011/03/16 10:24:45 nirbheek Exp $
 
 EAPI="2"
 
@@ -19,12 +19,12 @@ SLOT="2"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="debug doc ldap policykit"
 
-RDEPEND=">=dev-libs/glib-2.14
-	>=x11-libs/gtk+-2.14
+RDEPEND=">=dev-libs/glib-2.14:2
+	>=x11-libs/gtk+-2.14:2
 	>=dev-libs/dbus-glib-0.74
 	>=sys-apps/dbus-1
-	>=gnome-base/orbit-2.4
-	>=dev-libs/libxml2-2
+	>=gnome-base/orbit-2.4:2
+	>=dev-libs/libxml2-2:2
 	ldap? ( net-nds/openldap )
 	policykit? ( sys-auth/polkit )"
 DEPEND="${RDEPEND}
diff --git a/gnome-base/gconf/gconf-2.32.0-r1.ebuild b/gnome-base/gconf/gconf-2.32.0-r1.ebuild
index ce7c538b2c0b..30f0c452765c 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.4 2011/03/12 16:05:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.32.0-r1.ebuild,v 1.5 2011/03/16 10:24:45 nirbheek Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -24,8 +24,8 @@ 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
-	>=dev-libs/libxml2-2
+	>=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 )"
diff --git a/gnome-base/gconf/gconf-2.32.0.ebuild b/gnome-base/gconf/gconf-2.32.0.ebuild
deleted file mode 100644
index 20a42f54a05a..000000000000
--- a/gnome-base/gconf/gconf-2.32.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2010 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.ebuild,v 1.2 2010/10/22 18:06:13 eva Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-
-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 ~ia64 ~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
-	>=dev-libs/libxml2-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 )"
-
-S="${WORKDIR}/${MY_P}"
-
-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
-	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
-}