Fix slot-deps on gnome libs, remove old

(Portage version: 2.1.9.44/cvs/Linux x86_64)

5 files changed, 12 insertions, 151 deletions

diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index 3930cfeda1ae..20812ea5ba28 100644
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gtkhtml
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.235 2011/03/22 19:28:58 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.236 2011/03/23 08:16:40 nirbheek Exp $
+
+  23 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> gtkhtml-2.11.1.ebuild,
+  -gtkhtml-3.30.2.ebuild, -gtkhtml-3.30.3.ebuild, -gtkhtml-3.32.1.ebuild:
+  Fix slot-deps on gnome libs, remove old
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> gtkhtml-3.32.2.ebuild:
   Marking gtkhtml-3.32.2 ppc stable for bug 353436
diff --git a/gnome-extra/gtkhtml/gtkhtml-2.11.1.ebuild b/gnome-extra/gtkhtml/gtkhtml-2.11.1.ebuild
index 07fe08979b9f..7a3c993ebfe7 100644
--- a/gnome-extra/gtkhtml/gtkhtml-2.11.1.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-2.11.1.ebuild
@@ -1,6 +1,8 @@
-# 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-extra/gtkhtml/gtkhtml-2.11.1.ebuild,v 1.13 2010/07/20 02:20:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-2.11.1.ebuild,v 1.14 2011/03/23 08:16:40 nirbheek Exp $
+
+EAPI="1"
 
 inherit eutils gnome2 versionator autotools
 
@@ -19,9 +21,9 @@ IUSE="accessibility test"
 
 # gnome-vfs is only needed to run testgtkhtml (1/3 tests)
 
-RDEPEND=">=x11-libs/gtk+-2.13.0
-	>=dev-libs/libxml2-2.4.16
-	test? ( >=gnome-base/gnome-vfs-2 )"
+RDEPEND=">=x11-libs/gtk+-2.13.0:2
+	>=dev-libs/libxml2-2.4.16:2
+	test? ( >=gnome-base/gnome-vfs-2:2 )"
 DEPEND="${RDEPEND}
 	 >=dev-util/pkgconfig-0.12.0"
 
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.30.2.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.30.2.ebuild
deleted file mode 100644
index 9ce653e96016..000000000000
--- a/gnome-extra/gtkhtml/gtkhtml-3.30.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.30.2.ebuild,v 1.10 2010/10/17 14:57:27 armin76 Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="3.14"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE=""
-
-# We keep bonobo until we can make sure no apps in tree uses
-# the old composer code.
-RDEPEND=">=x11-libs/gtk+-2.18
-	>=x11-themes/gnome-icon-theme-2.22.0
-	>=gnome-base/orbit-2
-	>=app-text/enchant-1.1.7
-	gnome-base/gconf:2
-	>=app-text/iso-codes-0.49
-	>=net-libs/libsoup-2.26.0:2.4"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.40.0
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	ELTCONF="--reverse-deps"
-	G2CONF="${G2CONF}
-		--disable-static"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# XXX: This is fixed with --disable-deprecations in >=3.31.90
-	sed -e 's/CFLAGS="$CFLAGS $WARNING_FLAGS/CFLAGS="$CFLAGS/' \
-		-i configure.ac configure || die "Warning flags sed failed"
-}
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.30.3.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.30.3.ebuild
deleted file mode 100644
index 5c91b21afb8f..000000000000
--- a/gnome-extra/gtkhtml/gtkhtml-3.30.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.30.3.ebuild,v 1.5 2011/01/30 19:34:28 armin76 Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="3.14"
-KEYWORDS="alpha amd64 arm ia64 ~ppc ~ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE=""
-
-# We keep bonobo until we can make sure no apps in tree uses
-# the old composer code.
-RDEPEND=">=x11-libs/gtk+-2.20
-	>=x11-themes/gnome-icon-theme-2.22.0
-	>=gnome-base/orbit-2
-	>=app-text/enchant-1.1.7
-	gnome-base/gconf:2
-	>=app-text/iso-codes-0.49
-	>=net-libs/libsoup-2.26.0:2.4"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.40.0
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	ELTCONF="--reverse-deps"
-	G2CONF="${G2CONF}
-		--disable-static"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# XXX: This is fixed with --disable-deprecations in >=3.31.90
-	sed -e 's/CFLAGS="$CFLAGS $WARNING_FLAGS/CFLAGS="$CFLAGS/' \
-		-i configure.ac configure || die "Warning flags sed failed"
-}
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.32.1.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.32.1.ebuild
deleted file mode 100644
index 25b67e89cd56..000000000000
--- a/gnome-extra/gtkhtml/gtkhtml-3.32.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.32.1.ebuild,v 1.1 2010/11/28 14:43:21 pacho Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit gnome2 eutils
-
-DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="3.14"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.20:2
-	>=x11-themes/gnome-icon-theme-2.22.0
-	>=gnome-base/orbit-2
-	>=app-text/enchant-1.1.7
-	gnome-base/gconf:2
-	>=app-text/iso-codes-0.49
-	>=net-libs/libsoup-2.26.0:2.4"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	sys-devel/gettext
-	>=dev-util/intltool-0.40.0
-	>=dev-util/pkgconfig-0.9"
-
-pkg_setup() {
-	ELTCONF="--reverse-deps"
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-deprecated-warning-flags"
-	DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-	preserve_old_lib /usr/$(get_libdir)/libgtkhtml-editor.so.0
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	preserve_old_lib_notify /usr/$(get_libdir)/libgtkhtml-editor.so.0
-}
-
-src_install() {
-	gnome2_src_install
-	# Remove .la files since old will be removed anyway while updating
-	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
-}