Clean up old revisions. Make sure libsoup-gnome is in RDEPEND, bug #305423.

(Portage version: 2.2_rc65/cvs/Linux x86_64)

6 files changed, 13 insertions, 225 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index 7d3b292f11e2..f5203b8ed4dc 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/epiphany
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.227 2010/03/07 12:54:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.228 2010/03/11 00:17:56 eva Exp $
+
+  11 Mar 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  epiphany-2.24.3.ebuild, -epiphany-2.24.3-r10.ebuild,
+  -epiphany-2.26.3.ebuild, -epiphany-2.28.1.ebuild, epiphany-2.28.2.ebuild:
+  Clean up old revisions. Make sure libsoup-gnome is in RDEPEND, bug
+  #305423.
 
   07 Mar 2010; Pacho Ramos <pacho@gentoo.org> epiphany-2.26.3-r3.ebuild:
   amd64 stable, bug 308089
diff --git a/www-client/epiphany/epiphany-2.24.3-r10.ebuild b/www-client/epiphany/epiphany-2.24.3-r10.ebuild
deleted file mode 100644
index 7c454c98e350..000000000000
--- a/www-client/epiphany/epiphany-2.24.3-r10.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.24.3-r10.ebuild,v 1.10 2009/07/02 06:39:16 nirbheek Exp $
-
-EAPI="1"
-
-inherit gnome2 eutils multilib
-
-DESCRIPTION="GNOME webbrowser based on the mozilla rendering engine"
-HOMEPAGE="http://www.gnome.org/projects/epiphany/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="avahi doc networkmanager python spell"
-
-RDEPEND=">=dev-libs/glib-2.18.0
-	>=x11-libs/gtk+-2.14.0
-	>=dev-libs/libxml2-2.6.12
-	>=dev-libs/libxslt-1.1.7
-	>=gnome-base/libglade-2.3.1
-	>=gnome-base/libgnome-2.14
-	>=gnome-base/libgnomeui-2.14
-	>=gnome-base/gnome-desktop-2.9.91
-	>=x11-libs/startup-notification-0.5
-	>=x11-libs/libnotify-0.4
-	>=media-libs/libcanberra-0.3
-	>=dev-libs/dbus-glib-0.71
-	>=gnome-base/gconf-2
-	>=app-text/iso-codes-0.35
-	avahi? ( >=net-dns/avahi-0.6.22 )
-	networkmanager? ( net-misc/networkmanager )
-	=net-libs/xulrunner-1.9.0*
-	python? (
-		>=dev-lang/python-2.3
-		>=dev-python/pygtk-2.7.1
-		>=dev-python/gnome-python-2.6
-	)
-	spell? ( app-text/enchant )
-	x11-themes/gnome-icon-theme"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40
-	>=app-text/gnome-doc-utils-0.3.2
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-
-pkg_setup() {
-	# FIXME: I'm automagic
-	if ! built_with_use media-libs/libcanberra gtk; then
-		eerror "You need to rebuild media-libs/libcanberra with gtk support."
-		die "Rebuild media-libs/libcanberra with USE='gtk'"
-	fi
-
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--with-gecko=libxul-embedding
-		--enable-certificate-manager
-		--with-distributor-name=Gentoo
-		$(use_enable avahi zeroconf)
-		$(use_enable networkmanager network-manager)
-		$(use_enable spell spell-checker)
-		$(use_enable python)"
-}
-
-src_compile() {
-	addpredict /usr/$(get_libdir)/xulrunner-1.9/components/xpti.dat
-	addpredict /usr/$(get_libdir)/xulrunner-1.9/components/xpti.dat.tmp
-	addpredict /usr/$(get_libdir)/xulrunner-1.9/components/compreg.dat.tmp
-
-	# Why are these write-opened per bug #228589 and bug #253043
-	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat
-	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat.tmp
-	addpredict /usr/$(get_libdir)/mozilla/components/compreg.dat.tmp
-
-	gnome2_src_compile
-}
diff --git a/www-client/epiphany/epiphany-2.24.3.ebuild b/www-client/epiphany/epiphany-2.24.3.ebuild
index 9f7e61159e05..9c4a1bc70c0f 100644
--- a/www-client/epiphany/epiphany-2.24.3.ebuild
+++ b/www-client/epiphany/epiphany-2.24.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.24.3.ebuild,v 1.6 2009/04/12 20:34:25 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.24.3.ebuild,v 1.7 2010/03/11 00:17:56 eva Exp $
 
 inherit gnome2 eutils multilib
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/projects/epiphany/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 sparc ~x86 ~x86-fbsd"
+KEYWORDS="~x86-fbsd"
 IUSE="avahi doc networkmanager python spell xulrunner"
 
 RDEPEND=">=dev-libs/glib-2.18.0
diff --git a/www-client/epiphany/epiphany-2.26.3.ebuild b/www-client/epiphany/epiphany-2.26.3.ebuild
deleted file mode 100644
index feef25bca378..000000000000
--- a/www-client/epiphany/epiphany-2.26.3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.26.3.ebuild,v 1.1 2009/07/06 22:08:22 eva Exp $
-
-EAPI="2"
-
-inherit gnome2 eutils multilib autotools
-
-DESCRIPTION="GNOME webbrowser based on the mozilla rendering engine"
-HOMEPAGE="http://www.gnome.org/projects/epiphany/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="avahi doc networkmanager python spell"
-
-RDEPEND=">=dev-libs/glib-2.18.0
-	>=x11-libs/gtk+-2.16.0
-	>=dev-libs/libxml2-2.6.12
-	>=dev-libs/libxslt-1.1.7
-	>=gnome-base/libglade-2.3.1
-	>=gnome-base/libgnome-2.14
-	>=gnome-base/libgnomeui-2.14
-	>=gnome-base/gnome-desktop-2.9.91
-	>=x11-libs/startup-notification-0.5
-	>=x11-libs/libnotify-0.4
-	>=media-libs/libcanberra-0.3[gtk]
-	>=dev-libs/dbus-glib-0.71
-	>=gnome-base/gconf-2
-	>=app-text/iso-codes-0.35
-	avahi? ( >=net-dns/avahi-0.6.22 )
-	networkmanager? ( net-misc/networkmanager )
-	=net-libs/xulrunner-1.9*
-	python? (
-		>=dev-lang/python-2.3
-		>=dev-python/pygtk-2.7.1
-		>=dev-python/gnome-python-2.6 )
-	spell? ( app-text/enchant )
-	x11-themes/gnome-icon-theme"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40
-	>=app-text/gnome-doc-utils-0.3.2
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--with-gecko=libxul-embedding
-		--with-distributor-name=Gentoo
-		--enable-canberra
-		$(use_enable avahi zeroconf)
-		$(use_enable networkmanager network-manager)
-		$(use_enable spell spell-checker)
-		$(use_enable python)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix compilation with xulrunner 1.9.1, bug #263990
-	epatch "${FILESDIR}/${PN}-2.26.0-xulrunner191.patch"
-
-	# Fix libcanberra automagic support, bug #266232
-	epatch "${FILESDIR}/${PN}-2.26.1-automagic-libcanberra.patch"
-
-	# Fix sandbox violations, bug 263585
-	epatch "${FILESDIR}/${PN}-2.26-fix-sandbox-violations.patch"
-
-	# Make it libtool-1 compatible
-	rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
diff --git a/www-client/epiphany/epiphany-2.28.1.ebuild b/www-client/epiphany/epiphany-2.28.1.ebuild
deleted file mode 100644
index 59d6dfbc6062..000000000000
--- a/www-client/epiphany/epiphany-2.28.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.28.1.ebuild,v 1.1 2009/10/29 21:39:14 eva Exp $
-
-EAPI="2"
-
-inherit gnome2
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="http://www.gnome.org/projects/epiphany/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="avahi doc networkmanager +nss test"
-# introspection
-
-# TODO: add seed support
-# not mature enough
-#	introspection? ( >=dev-libs/gobject-introspection-0.6.2 )
-RDEPEND=">=dev-libs/glib-2.19.7
-	>=x11-libs/gtk+-2.16
-	>=dev-libs/libxml2-2.6.12
-	>=dev-libs/libxslt-1.1.7
-	>=x11-libs/startup-notification-0.5
-	>=x11-libs/libnotify-0.4
-	>=dev-libs/dbus-glib-0.71
-	>=gnome-base/gconf-2
-	>=app-text/iso-codes-0.35
-	>=net-libs/webkit-gtk-1.1.15
-	>=net-libs/libsoup-2.27.91[gnome]
-	>=gnome-base/gnome-keyring-2.26.0
-
-	x11-libs/libICE
-	x11-libs/libSM
-
-	nss? ( dev-libs/nss )
-	avahi? ( >=net-dns/avahi-0.6.22 )
-	networkmanager? ( net-misc/networkmanager )
-	x11-themes/gnome-icon-theme"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40
-	>=app-text/gnome-doc-utils-0.3.2
-	gnome-base/gnome-common
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-introspection
-		--disable-scrollkeeper
-		--disable-maintainer-mode
-		--with-distributor-name=Gentoo
-		$(use_enable avahi zeroconf)
-		$(use_enable networkmanager network-manager)
-		$(use_enable nss)
-		$(use_enable test tests)"
-#		$(use_enable introspection)
-}
diff --git a/www-client/epiphany/epiphany-2.28.2.ebuild b/www-client/epiphany/epiphany-2.28.2.ebuild
index 4d189a99397d..18b9ea5c09b3 100644
--- a/www-client/epiphany/epiphany-2.28.2.ebuild
+++ b/www-client/epiphany/epiphany-2.28.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.28.2.ebuild,v 1.1 2009/12/21 23:11:11 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.28.2.ebuild,v 1.2 2010/03/11 00:17:56 eva Exp $
 
 EAPI="2"
 
@@ -29,6 +29,7 @@ RDEPEND=">=dev-libs/glib-2.19.7
 	>=app-text/iso-codes-0.35
 	>=net-libs/webkit-gtk-1.1.15
 	>=net-libs/libsoup-2.27.91[gnome]
+	>=net-libs/libsoup-gnome-2.27.91
 	>=gnome-base/gnome-keyring-2.26.0
 
 	x11-libs/libICE