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

Package-Manager: portage-2.2_rc65/cvs/Linux x86_64

7 files changed, 19 insertions, 235 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/Manifest b/www-client/epiphany/Manifest
index 439fd0b124da..622d4423fcc5 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -12,22 +12,18 @@ AUX epiphany-2.26.3-revert-downloadir.patch 1265 RMD160 50b57adf30a1694d54edc2a9
 AUX epiphany-2.26.3-system-plugin.patch 1180 RMD160 d27462c6d352de40103ee843ddd1eafdccd0a367 SHA1 7d1fa738d302f45715ae2dd4b3546d59055b40ce SHA256 4df1a20abdcd3f1591ba5dad241f96d31d0bca8be91f6a20e7c586748ae949a7
 DIST epiphany-2.24.3.tar.bz2 5722991 RMD160 d27d511cf9f1cb6b5db94b1c821729c1dfc59b0b SHA1 945d7935273cf341f7c5445b31202ed257cfc9a6 SHA256 cc6ff7b30911bf80d8d72d6db7cc7ecbf51b2f5bb66796b79da33f8f680402ac
 DIST epiphany-2.26.3.tar.bz2 5655997 RMD160 ef2474c8523a6787227d3dfa5e8fc9d443708a0c SHA1 d1143fd2f287efe3eab648e1feded9f4911e3236 SHA256 bc3e79cb0d62c30ef32c7cf9eef563b1de1af60f31729dae43c3795d214880ad
-DIST epiphany-2.28.1.tar.bz2 5693411 RMD160 c3d6a33080711ec3c25c6418aba5eb2047b73384 SHA1 e15a404e52cdf4fded6a0075f27f46c2ae2a739c SHA256 95ccdd36bc7fdf95c6085da3b76cee6467f3c9a8745541cfb09fdd8d33a1f04d
 DIST epiphany-2.28.2.tar.bz2 5697393 RMD160 2cfde41e96ceace397bf42231dffd577353f8eeb SHA1 8f382e18dba2ca4292350f1c979986a68ee9b668 SHA256 98b7a60bb42fa5c8ebdec1bf623319ae730e5674ddbcfaf51649093adb079490
-EBUILD epiphany-2.24.3-r10.ebuild 2410 RMD160 76f47e3085e03ea7519b8d9e08ae545c324cdddc SHA1 30e86b5b74e58934acdcbeb87c2d5240b37e0e63 SHA256 fa37df1cdf0b11219c7f3ec6f0101f1223c3dc2ad3492c7b9901327dee26e68b
-EBUILD epiphany-2.24.3.ebuild 2756 RMD160 cc01f406e1380d82e10a8df44348cb330d83eef3 SHA1 cb36053f0eb8b124fef19954f8836a490d2212d5 SHA256 f1acd30586027c353982c4298c1704459bcdb9729f133fafd0495ef1dc60b862
+EBUILD epiphany-2.24.3.ebuild 2717 RMD160 b51d8062ca0f4157070e28d64187801954918f6d SHA1 3c5d995508b6c7b966fd10667560fd2480a5ff4c SHA256 9e433ffc9a4139d167f7dd16ae3c39d0e2a25b3d799b92f20ba2cc9fc7c5dec9
 EBUILD epiphany-2.26.3-r1.ebuild 2519 RMD160 04f49d18f90dee88ea90d5eea540451d7765e09d SHA1 1e4d06533f5c25d7665f1bfbe5a8f2d3fdbe95de SHA256 a3d58669e8e8a705952da1a90c17ce79f7f21055f249f462e3a80c33dec49cda
 EBUILD epiphany-2.26.3-r2.ebuild 2622 RMD160 6a97344fec3ef4850a614948bf777d8d29eb40ae SHA1 70e00ea82eda5649b114a61b8916691998a54257 SHA256 c02c9f1eba519d866be25ed29a6a7de9d9115aa8a7373075e4e5caa7e40c28b7
 EBUILD epiphany-2.26.3-r3.ebuild 2722 RMD160 d4bbc1587c545936d6a17dead0bc73dce71af615 SHA1 aa015e51461fe54d3bbe4c0d4c48ed7bcd4ca594 SHA256 8ddcf6b6d1c2a76f9d9245a59a29e1f03f60c2c60e3dd247842337a376d4c804
-EBUILD epiphany-2.26.3.ebuild 2245 RMD160 e09d82b971f20470f6bd90efe66b7344edddd42c SHA1 6e98d0403731f52a3cd55cfd5c072eb4dd7f484b SHA256 e5192108d7d4fb407b4d3ac2fccf09792d83db3dd5f13fabad98bc4f5830a7d2
-EBUILD epiphany-2.28.1.ebuild 1627 RMD160 d77a83d5c79eb3619dd02c4274471e3dbe38a617 SHA1 7e016571b024ea506079539736e5fcf9f80e9b99 SHA256 1d1db3e6d75f9e08a28c6af35ef37349abb433e832cc2932ae915626fb70971b
-EBUILD epiphany-2.28.2.ebuild 1627 RMD160 3aeb5f368ad1733e41536cfb7d9d2dc7fc3298e9 SHA1 0520ad80dd6198d0c6a9dec7527b748eda16c980 SHA256 ce566727a3e9d4d4f8bfcc78daf0462321ab1c35944967d82256fc281f6e3903
-MISC ChangeLog 45431 RMD160 186d8f777f427ed14290646816e7351a9859b905 SHA1 bf3f466d8f11081a01ab4397b146de3cda7953e7 SHA256 7ab7a6e16eb0bb0a36a71da9ab537f191016254f7caced70dc07643c72a70257
+EBUILD epiphany-2.28.2.ebuild 1661 RMD160 d548783f292664b15e2d1ae8c1ead069ecf662e2 SHA1 75ac137f8b4434a5f5868dd1d0e76dc85685aea0 SHA256 c60146a30ecedf5b0178bd5a0dd7f968c1d3b40d9b7cb866baa13b6f6e81e23f
+MISC ChangeLog 45695 RMD160 64b99d5102599a59d0a6c4fe12978ca0ceb8899f SHA1 b06e1698729f52c1ba8f5e84cdec2b0b3122b2fd SHA256 ff0a2eda229007838b6f939fe2d788b4623c4c4e9dd634905118a407a280d476
 MISC metadata.xml 276 RMD160 459f04368f1f1341a41c24a487a475b22e878228 SHA1 c296c95eafc63e398d5d203f4eaa26a3826b2b6c SHA256 9e2cf9fb8bee83947d19caa6b4610e82b916daa9f744661f19e4f8138e80490a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuToiYACgkQCaWpQKGI+9TsEACeOb34lLhaP+NaYZdxIY233BK1
-UKsAnjGBTosK9ipVG7MvT8aQEOYE5ZKG
-=MCw4
+iEYEARECAAYFAkuYNroACgkQ1fmVwcYIWAYRGQCg4wRnQO2F7cvgVK/w8aOvL7Zo
+wyQAoLMqCVWNIHAkjohrH7T4d8hYvYur
+=dK3b
 -----END PGP SIGNATURE-----
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