Add missing ca-certificates to RDEPEND, bug #344539. Pin some dependencies to approriate slots. Use gnome2_src_compile instead of plain emake. Clean up old revisions.

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64

8 files changed, 31 insertions, 236 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index c8f49d388a8b..1ca2f53f03ef 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,15 @@
 # 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.256 2010/10/17 15:38:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.257 2010/11/23 22:35:48 eva Exp $
+
+  23 Nov 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/epiphany-2.22.3-CVE-2008-5985.patch,
+  -files/epiphany-2.22.3-firefox2.0-header-fix.patch,
+  -files/epiphany-2.22.3-notify-crash-fix.patch, -epiphany-2.28.2.ebuild,
+  -epiphany-2.30.5.ebuild, epiphany-2.30.6.ebuild:
+  Add missing ca-certificates to RDEPEND, bug #344539. Pin some dependencies to
+  approriate slots. Use gnome2_src_compile instead of plain emake. Clean up old
+  revisions.
 
   17 Oct 2010; Raúl Porcel <armin76@gentoo.org> epiphany-2.30.2-r1.ebuild:
   alpha/ia64/sparc stable wrt #324077
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 6d272a3ba366..881d536d27a9 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,6 +1,6 @@
-AUX epiphany-2.22.3-CVE-2008-5985.patch 311 RMD160 68e777f2273f5c1035dba7bfc94edd808f630236 SHA1 41c14365c22d28b451a6a02cad2f5e7e375d54f0 SHA256 871bedabf3b5c4013a2b0b2e69c9dc3cd21e43dc9a2a05ece57262a6c359e2ab
-AUX epiphany-2.22.3-firefox2.0-header-fix.patch 555 RMD160 53beacda1bfd919d8afa0bf652d91a3068ef1c07 SHA1 ce0e4a52ba0a2aad1ac9bc785540d0d49f9d689f SHA256 8a72057ad4e0434fb3f7c45c7336c1280d97aca092ff196bfbb56519900aabcc
-AUX epiphany-2.22.3-notify-crash-fix.patch 1589 RMD160 ae0f063db6c314f8f188bc24e9e8de2b019e46d2 SHA1 cc2f719ab3b7ad28464e3e22dbed40c9e25fd845 SHA256 09aab29054c53cbd07fc5d2a8bec29c8e02c830e3fec8f4af7a079216cc13d8b
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX epiphany-2.26-fix-sandbox-violations.patch 552 RMD160 a7902ab192b698c2edc79a3ff3b6f2476ec68031 SHA1 1db80a7f829e41d605b50dce6caecb35984a9d57 SHA256 94d66760b1c493093febcc399a0418eb37708da1a3bf1d3bc7c851a527b061f1
 AUX epiphany-2.26.0-xulrunner191.patch 491 RMD160 ae36fd6f67b9afb3c03413bed685f10816ac24d2 SHA1 b5ba78085dcf35677361af9008f3f8998788ddd8 SHA256 3c8804a9004ed27f4f2ad99f4e434d6d4050711d000ce73ce2c0fc8bc0d197df
 AUX epiphany-2.26.1-automagic-libcanberra.patch 1838 RMD160 b98c6a734f240ea000e8938ac690426c904ec37f SHA1 9a782c3c8babf1ae8ac18c2602e0eb2d46b6eb82 SHA256 9cc20da812e7a95e535e905efaedf05720e2e8c1828d644934636ccb05f77fa3
@@ -16,14 +16,17 @@ AUX epiphany-2.30.2-leave-fullscreen.patch 865 RMD160 b8c8cd507da9b08eb68ac14e44
 AUX epiphany-2.30.2-referer-downloads.patch 2230 RMD160 3609a8b336310000294fb443ae3c503c545926ae SHA1 ed9eff8c2b910f8f73154d867b76328152608879 SHA256 e6a85dfed6a5a83d559404d3f8ffcf6319a48a314b037b763e82684f8aad1122
 AUX epiphany-2.30.2-uri-crash.patch 782 RMD160 b5db55676c1c67582c8cfaad4f53cc19871e3f2c SHA1 4bf980a33f8864bd95ca83bd782e8edf661ab004 SHA256 3fa84fbaeaded14dae97be0c03cc1e42e85439259515bd4614b0452f5c52c3f4
 DIST epiphany-2.26.3.tar.bz2 5655997 RMD160 ef2474c8523a6787227d3dfa5e8fc9d443708a0c SHA1 d1143fd2f287efe3eab648e1feded9f4911e3236 SHA256 bc3e79cb0d62c30ef32c7cf9eef563b1de1af60f31729dae43c3795d214880ad
-DIST epiphany-2.28.2.tar.bz2 5697393 RMD160 2cfde41e96ceace397bf42231dffd577353f8eeb SHA1 8f382e18dba2ca4292350f1c979986a68ee9b668 SHA256 98b7a60bb42fa5c8ebdec1bf623319ae730e5674ddbcfaf51649093adb079490
 DIST epiphany-2.30.2.tar.bz2 5881032 RMD160 c0bb5e1a14ccbe72531cbf3f0f416c5172437a86 SHA1 76b55e002131ffc00f5b1f244d77e2b75e3fcf1b SHA256 cd0124e71e72142593cfeb442d58d97e99ba94ace6e31d94717fe977c0bfb98a
-DIST epiphany-2.30.5.tar.bz2 5915763 RMD160 0c75dde55ecb3cc6188b7326ab415851ead06ce8 SHA1 40d06fd3c7650653b53bd2313f3403855c0db981 SHA256 dce631547d841a8e6ff5f676c2f41bf8995584b78856391293ea0272742d0e74
 DIST epiphany-2.30.6.tar.bz2 5927938 RMD160 60f2c7d699dd8728dc79cce012475972943c4007 SHA1 a4bde975f9b2b97d6aad14b4b8a715b40d19a155 SHA256 278a5c00ce07e6a3ea440d289de22dbec3ebec4ded4ff3b4c48b580f469c2dcc
 EBUILD epiphany-2.26.3-r4.ebuild 3344 RMD160 36626fac6aee7092e34981c0acc4c0de0ef12b19 SHA1 01ac31f800d5ab13542beada8e9666b8dd3bf95c SHA256 01da9dc81e160dd7b83bd03dc392f6dc9c1bcd4ff7e2a8920479d98f955d267a
-EBUILD epiphany-2.28.2.ebuild 1654 RMD160 6a2816b6d7670602d6e2fb471dc00fa135e73d70 SHA1 67a40d7ddb972c537f01e9eb69f5f73f7c857f0a SHA256 25c69182e40ca6e2ff79f0003980a27673ac65234d98ff653bb993575a8f006c
 EBUILD epiphany-2.30.2-r1.ebuild 2410 RMD160 206ec7409733bd1b9f9751f4988083129dfe2b44 SHA1 46a201a99525df33ec0cc42cce3ed32af6bd61c7 SHA256 fa914e918376d405f0e8d5398f9761842507d11b8c98974b2989e315968172ea
-EBUILD epiphany-2.30.5.ebuild 1860 RMD160 ea68e2c063a3955debd43ef70ce1cfd41a4c11bc SHA1 cb702e8ab9ef2a3d097c0d891ebf8242acc21b17 SHA256 da4b4d6501ec1b0a4b2ddf916549d2a4c178ec13b1efb1db4e4f9c30326c86ca
-EBUILD epiphany-2.30.6.ebuild 1858 RMD160 b4fc7aaa7bfbb37a8e3fde87f3cb28b163787601 SHA1 71088da54313c53c2eaf341f698738df8bef4c59 SHA256 940a2cd19b88f9aab0dc4c1d0c432d2049dd2b7986992587c654fb46e2713a51
-MISC ChangeLog 50014 RMD160 e9b6137ce324e63f597df24747ead73c2f083b69 SHA1 fe1391a43dceeb060c04fb56ed9c9054664f9d6f SHA256 f13f845d1a3a0c82177c263f5c0aac34f8d5d75138e3423bbb6652408a9b1f9e
+EBUILD epiphany-2.30.6.ebuild 1876 RMD160 dfaee9ba0637675da5e6f1bf7802a66c6f2c5373 SHA1 6e13644b66e1a1bc3657f23b5d03a0413f5854be SHA256 1db0866b1442af15adb2abdd5df44ee60d08a3256cb9f61244c9b14b2ebc78ae
+MISC ChangeLog 50463 RMD160 b7e317097fc03b3b1b9cd0271e3cb9d7e1c79063 SHA1 9e0c0b3741ba586d5cd04c2972421a285b08bb3e SHA256 d0429fcd06477e2ea98feeaea1fb5492ee563881fad3decea351354a0b9f14a7
 MISC metadata.xml 276 RMD160 459f04368f1f1341a41c24a487a475b22e878228 SHA1 c296c95eafc63e398d5d203f4eaa26a3826b2b6c SHA256 9e2cf9fb8bee83947d19caa6b4610e82b916daa9f744661f19e4f8138e80490a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzsQfgACgkQ1fmVwcYIWAZ5qwCdFuTZpwE3DBIS9nkVRzQH2iu4
+r+8AoKPxuLL0SMB8xpEla3GP6IYaxKTv
+=uAqk
+-----END PGP SIGNATURE-----
diff --git a/www-client/epiphany/epiphany-2.28.2.ebuild b/www-client/epiphany/epiphany-2.28.2.ebuild
deleted file mode 100644
index 8a7f41b12072..000000000000
--- a/www-client/epiphany/epiphany-2.28.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.5 2010/08/11 16:45:02 josejx Exp $
-
-EAPI="2"
-
-inherit gnome2
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="http://www.gnome.org/projects/epiphany/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~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-gnome-2.27.91
-	>=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.30.5.ebuild b/www-client/epiphany/epiphany-2.30.5.ebuild
deleted file mode 100644
index 6ae1a4176e6a..000000000000
--- a/www-client/epiphany/epiphany-2.30.5.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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.30.5.ebuild,v 1.1 2010/08/31 18:33:53 eva Exp $
-
-EAPI="2"
-
-inherit eutils gnome2
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="http://www.gnome.org/projects/epiphany/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-
-# We are not ready for introspection yet
-IUSE="avahi doc networkmanager +nss test"
-
-# TODO: add seed support
-RDEPEND=">=dev-libs/glib-2.19.7
-	>=x11-libs/gtk+-2.19.5
-	>=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.2.3
-	>=net-libs/libsoup-gnome-2.29.91
-	>=gnome-base/gnome-keyring-2.26.0
-
-	x11-libs/libICE
-	x11-libs/libSM
-
-	avahi? ( >=net-dns/avahi-0.6.22 )
-	networkmanager? ( net-misc/networkmanager )
-	nss? ( dev-libs/nss )
-	x11-themes/gnome-icon-theme"
-#       introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
-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 )"
-# eautoreconf needs:
-#	gnome-base/gnome-common
-
-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)"
-}
-
-src_compile() {
-	# Fix sandbox error with USE="introspection" and "doc"
-	# https://bugs.webkit.org/show_bug.cgi?id=35471
-	addpredict "$(unset HOME; echo ~)/.local"
-	emake || die "Compile failed"
-}
diff --git a/www-client/epiphany/epiphany-2.30.6.ebuild b/www-client/epiphany/epiphany-2.30.6.ebuild
index 14ceca6c89bd..8b7735927296 100644
--- a/www-client/epiphany/epiphany-2.30.6.ebuild
+++ b/www-client/epiphany/epiphany-2.30.6.ebuild
@@ -1,6 +1,6 @@
 # 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.30.6.ebuild,v 1.1 2010/09/16 21:37:08 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.30.6.ebuild,v 1.2 2010/11/23 22:35:48 eva Exp $
 
 EAPI="2"
 
@@ -17,8 +17,8 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE="avahi doc networkmanager +nss test"
 
 # TODO: add seed support
-RDEPEND=">=dev-libs/glib-2.19.7
-	>=x11-libs/gtk+-2.19.5
+RDEPEND=">=dev-libs/glib-2.19.7:2
+	>=x11-libs/gtk+-2.19.5:2
 	>=dev-libs/libxml2-2.6.12
 	>=dev-libs/libxslt-1.1.7
 	>=x11-libs/startup-notification-0.5
@@ -27,17 +27,19 @@ RDEPEND=">=dev-libs/glib-2.19.7
 	>=gnome-base/gconf-2
 	>=app-text/iso-codes-0.35
 	>=net-libs/webkit-gtk-1.2.3
-	>=net-libs/libsoup-gnome-2.29.91
+	>=net-libs/libsoup-gnome-2.29.91:2.4
 	>=gnome-base/gnome-keyring-2.26
 
 	x11-libs/libICE
 	x11-libs/libSM
 
+	app-misc/ca-certificates
 	x11-themes/gnome-icon-theme
+
 	avahi? ( >=net-dns/avahi-0.6.22 )
 	networkmanager? ( net-misc/networkmanager )
 	nss? ( dev-libs/nss )"
-#       introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+#	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
 DEPEND="${RDEPEND}
 	app-text/scrollkeeper
 	>=dev-util/pkgconfig-0.9
@@ -47,9 +49,8 @@ DEPEND="${RDEPEND}
 # eautoreconf needs:
 #	gnome-base/gnome-common
 
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-
 pkg_setup() {
+	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
 	G2CONF="${G2CONF}
 		--disable-introspection
 		--disable-scrollkeeper
@@ -65,5 +66,5 @@ src_compile() {
 	# Fix sandbox error with USE="introspection" and "doc"
 	# https://bugs.webkit.org/show_bug.cgi?id=35471
 	addpredict "$(unset HOME; echo ~)/.local"
-	emake || die "Compile failed"
+	gnome2_src_compile
 }
diff --git a/www-client/epiphany/files/epiphany-2.22.3-CVE-2008-5985.patch b/www-client/epiphany/files/epiphany-2.22.3-CVE-2008-5985.patch
deleted file mode 100644
index 1f4a12e8fa0e..000000000000
--- a/www-client/epiphany/files/epiphany-2.22.3-CVE-2008-5985.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- epiphany-browser-2.22.3.orig/src/ephy-python.c
-+++ epiphany-browser-2.22.3/src/ephy-python.c
-@@ -51,6 +51,8 @@
- 
- 	argv[0] = g_get_prgname ();
- 	PySys_SetArgv (1, argv);
-+	/* Sanitize sys.path */
-+	PyRun_SimpleString("import sys; sys.path = filter(None, sys.path)");
- 
- 	init_pygobject ();
- 	init_pygtk ();
diff --git a/www-client/epiphany/files/epiphany-2.22.3-firefox2.0-header-fix.patch b/www-client/epiphany/files/epiphany-2.22.3-firefox2.0-header-fix.patch
deleted file mode 100644
index 206f0003dd08..000000000000
--- a/www-client/epiphany/files/epiphany-2.22.3-firefox2.0-header-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur epiphany-2.22.3-old/embed/mozilla/MozRegisterComponents.cpp epiphany-2.22.3/embed/mozilla/MozRegisterComponents.cpp
---- epiphany-2.22.3-old/embed/mozilla/MozRegisterComponents.cpp	2008-07-05 17:45:42.000000000 +0200
-+++ epiphany-2.22.3/embed/mozilla/MozRegisterComponents.cpp	2008-07-05 17:44:58.000000000 +0200
-@@ -31,6 +31,7 @@
- #include <nsCOMPtr.h>
- #include <nsCURILoader.h>
- #include <nsDocShellCID.h>
-+#include <nsIBadCertListener.h>
- #include <nsICategoryManager.h>
- #include <nsIComponentManager.h>
- #include <nsIComponentRegistrar.h>
diff --git a/www-client/epiphany/files/epiphany-2.22.3-notify-crash-fix.patch b/www-client/epiphany/files/epiphany-2.22.3-notify-crash-fix.patch
deleted file mode 100644
index 1cd12088e50c..000000000000
--- a/www-client/epiphany/files/epiphany-2.22.3-notify-crash-fix.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-3cc902d2fd203127a98e027f42175db35dafa579
-diff --git a/embed/downloader-view.c b/embed/downloader-view.c
-index 66de70b..68ce1af 100644
---- a/embed/downloader-view.c
-+++ b/embed/downloader-view.c
-@@ -141,11 +141,6 @@ downloader_view_class_init (DownloaderViewClass *klass)
- 	object_class->finalize = downloader_view_finalize;
- 
- 	g_type_class_add_private (object_class, sizeof(DownloaderViewPrivate));
--
--#ifdef HAVE_LIBNOTIFY
--	notify_init (PACKAGE);
--#endif
--
- }
- 
- static void
-@@ -289,13 +284,6 @@ downloader_view_finalize (GObject *object)
- 
- 	G_OBJECT_CLASS (downloader_view_parent_class)->finalize (object);
- 
--#ifdef HAVE_LIBNOTIFY	
--	if (notify_is_initted ())
--	{
--		notify_uninit ();
--	}
--#endif
--
- 	if (idle_unref)
- 	{
- 		ephy_object_idle_unref (embed_shell);
-diff --git a/src/ephy-main.c b/src/ephy-main.c
-index 13c8f9e..4e92d42 100644
---- a/src/ephy-main.c
-+++ b/src/ephy-main.c
-@@ -50,6 +50,10 @@
- #include <errno.h>
- #include <string.h>
- 
-+#ifdef HAVE_LIBNOTIFY
-+#include <libnotify/notify.h>
-+#endif
-+
- static GQuark startup_error_quark = 0;
- #define STARTUP_ERROR_QUARK	(startup_error_quark)
- 
-@@ -737,9 +741,18 @@ main (int argc,
- 	g_object_weak_ref (G_OBJECT (ephy_shell), shell_weak_notify, NULL);
- 	ephy_object_idle_unref (ephy_shell);
- 
-+#ifdef HAVE_LIBNOTIFY	
-+	/* Init notifications for the download manager */
-+	notify_init (PACKAGE);
-+#endif
-+
- 	gtk_main ();
- 
- 	/* Shutdown */
-+#ifdef HAVE_LIBNOTIFY	
-+	if (notify_is_initted ())
-+		notify_uninit ();
-+#endif
- 	eel_gconf_monitor_remove ("/apps/epiphany/general");
- 	gnome_accelerators_sync ();
- 	ephy_state_save ();