Drop old (#508854)

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

8 files changed, 9 insertions, 311 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index e78b32886cc9..1e8c4d2607ee 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-client/epiphany
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.311 2014/10/28 19:42:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.312 2014/11/13 12:39:54 pacho Exp $
+
+  13 Nov 2014; Pacho Ramos <pacho@gentoo.org> -epiphany-2.30.6-r1.ebuild,
+  -files/epiphany-2.30.6-clearing-passwd.patch,
+  -files/epiphany-2.30.6-dbus-fix.patch,
+  -files/epiphany-2.30.6-introspection-prefix.patch,
+  -files/epiphany-2.30.6-libnotify-0.7.patch,
+  -files/epiphany-2.30.6-mime-handler.patch, metadata.xml:
+  Drop old (#508854)
 
   28 Oct 2014; Pacho Ramos <pacho@gentoo.org> -epiphany-3.10.3.ebuild,
   -epiphany-3.12.0.ebuild, -files/epiphany-3.3.90-paxctl-introspection.patch,
diff --git a/www-client/epiphany/epiphany-2.30.6-r1.ebuild b/www-client/epiphany/epiphany-2.30.6-r1.ebuild
deleted file mode 100644
index 01d2761444f4..000000000000
--- a/www-client/epiphany/epiphany-2.30.6-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2012 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-r1.ebuild,v 1.8 2012/05/03 06:01:03 jdhore Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-
-inherit eutils gnome2 autotools
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="http://projects.gnome.org/epiphany/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="avahi doc +introspection networkmanager +nss test"
-
-# TODO: add seed support
-RDEPEND=">=dev-libs/glib-2.19.7:2
-	>=x11-libs/gtk+-2.19.5:2[introspection?]
-	>=dev-libs/libxml2-2.6.12:2
-	>=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:2
-	>=app-text/iso-codes-0.35
-	>=net-libs/webkit-gtk-1.2.3:2[introspection?]
-	>=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-20080514-r2
-	x11-themes/gnome-icon-theme
-
-	avahi? ( >=net-dns/avahi-0.6.22 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
-	networkmanager? ( net-misc/networkmanager )
-	nss? ( dev-libs/nss )"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-	>=app-text/gnome-doc-utils-0.3.2
-	doc? ( >=dev-util/gtk-doc-1 )
-	gnome-base/gnome-common"
-# eautoreconf needs:
-#	gnome-base/gnome-common
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--disable-maintainer-mode
-		--with-distributor-name=Gentoo
-		$(use_enable avahi zeroconf)
-		$(use_enable introspection)
-		$(use_enable networkmanager network-manager)
-		$(use_enable nss)
-		$(use_enable test tests)"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
-
-	# introspection: Fix build by telling g-ir-scanner what the prefix is
-	epatch "${FILESDIR}"/${P}-introspection-prefix.patch
-
-	# DBUS_LIBS is needed for libephymain.la
-	epatch "${FILESDIR}"/${P}-dbus-fix.patch
-
-	# Declare ability to handle http and https
-	epatch "${FILESDIR}"/${P}-mime-handler.patch
-
-	# Do not crash when clearing the passwords from prefs dialog, upstream bug #606933
-	epatch "${FILESDIR}"/${P}-clearing-passwd.patch
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_compile() {
-	# Fix sandbox error with USE="introspection" and "doc"
-	# https://bugs.webkit.org/show_bug.cgi?id=35471
-	addpredict "$(unset HOME; echo ~)/.local"
-	gnome2_src_compile
-}
diff --git a/www-client/epiphany/files/epiphany-2.30.6-clearing-passwd.patch b/www-client/epiphany/files/epiphany-2.30.6-clearing-passwd.patch
deleted file mode 100644
index e4bee1ea1c22..000000000000
--- a/www-client/epiphany/files/epiphany-2.30.6-clearing-passwd.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From: Artur Rona <ari-tczew@ubuntu.com>
-Description: Do not crash when clearing the passwords from prefs dialog.
- The code (wrongly) assumed we could only be called from withing the PDM dialog. Do some refactoring to make it more generic.
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=606933
-Bug-Ubuntu: https://launchpad.net/bugs/562538
-Origin: upstream, http://git.gnome.org/browse/epiphany/commit/?id=479f0a9a7ec095a8457e7d5b70695207e81f40c6
-Author: Xan Lopez <xan@gnome.org>
-
-diff -pruN -x '*~' epiphany-2.30.2.orig/src/pdm-dialog.c epiphany-2.30.2/src/pdm-dialog.c
---- epiphany-2.30.2.orig/src/pdm-dialog.c	2010-01-08 19:21:01.000000000 +0100
-+++ epiphany-2.30.2/src/pdm-dialog.c	2010-10-05 00:09:58.000000000 +0200
-@@ -224,27 +224,44 @@ clear_all_cookies (SoupCookieJar *jar)
- }
- 
- static void
--pdm_dialog_password_remove_cb (GnomeKeyringResult result,
-+get_info_full_cb (GnomeKeyringResult result,
-+		  GnomeKeyringItemInfo *info,
-+		  gpointer data)
-+{
-+	if (result != GNOME_KEYRING_RESULT_OK)
-+		return;
-+
-+	if (gnome_keyring_item_info_get_type (info) == GNOME_KEYRING_ITEM_NETWORK_PASSWORD)
-+		gnome_keyring_item_delete (GNOME_KEYRING_DEFAULT,
-+					   GPOINTER_TO_UINT (data),
-+					   NULL, NULL, NULL);
-+}
-+
-+static void
-+got_network_passwords_list_cb (GnomeKeyringResult result,
-+			       GList *list,
- 			       gpointer data)
- {
--	GtkTreeRowReference *rowref = (GtkTreeRowReference *)data;
-+	GList *l;
- 
--	if (result == GNOME_KEYRING_RESULT_OK) {
--		GtkTreeIter iter;
--		GtkTreePath *path;
--		GtkTreeModel *model;
--
--		if (!gtk_tree_row_reference_valid (rowref))
--			return;
--
--		path = gtk_tree_row_reference_get_path (rowref);
--		model = gtk_tree_row_reference_get_model (rowref);
--
--		if (path != NULL && gtk_tree_model_get_iter (model, &iter, path)) {
--			gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
--			gtk_tree_path_free (path);
--		}
--	}
-+	if (result != GNOME_KEYRING_RESULT_OK)
-+		return;
-+
-+	for (l = list; l != NULL; l = l->next)
-+		gnome_keyring_item_get_info_full (GNOME_KEYRING_DEFAULT,
-+						  GPOINTER_TO_UINT (l->data),
-+						  GNOME_KEYRING_ITEM_INFO_BASICS,
-+						  (GnomeKeyringOperationGetItemInfoCallback) get_info_full_cb,
-+						  l->data,
-+						  NULL);
-+}
-+
-+static void
-+_ephy_pdm_delete_all_passwords ()
-+{
-+	gnome_keyring_list_item_ids (GNOME_KEYRING_DEFAULT,
-+				     got_network_passwords_list_cb,
-+				     NULL, NULL);
- }
- 
- static void
-@@ -282,35 +299,15 @@ clear_all_dialog_response_cb (GtkDialog
- 		if (gtk_toggle_button_get_active
- 			(GTK_TOGGLE_BUTTON (checkbuttons->checkbutton_passwords)))
- 		{
--			GtkTreeIter iter;
--			PdmDialog *pdialog = EPHY_PDM_DIALOG (checkbuttons->dialog);
--			PdmActionInfo *pinfo = pdialog->priv->passwords;
--
--			gboolean valid = gtk_tree_model_get_iter_first (pinfo->model, &iter);
--
--			while (valid) {
--				GtkTreePath *path;
--				EphyPasswordInfo *info;
--				GtkTreeRowReference *row;
--
--				path = gtk_tree_model_get_path (pinfo->model, &iter);
--				row = gtk_tree_row_reference_new (pinfo->model, path);
--
--				gtk_tree_model_get (pinfo->model, &iter,
--						    COL_PASSWORDS_DATA, &info,
--						    -1);
--
--				gnome_keyring_item_delete (GNOME_KEYRING_DEFAULT,
--							   info->keyring_id,
--							   (GnomeKeyringOperationDoneCallback) pdm_dialog_password_remove_cb,
--							   row,
--							   (GDestroyNotify) gtk_tree_row_reference_free);
--
--				valid = gtk_tree_model_iter_next (pinfo->model, &iter);
--
--				g_slice_free (EphyPasswordInfo, info);
--				gtk_tree_path_free (path);
-+			/* Clear UI if we are the PDM dialog */
-+			if (EPHY_IS_PDM_DIALOG (checkbuttons->dialog))
-+			{
-+				PdmDialog *pdialog = EPHY_PDM_DIALOG (checkbuttons->dialog);
-+				PdmActionInfo *pinfo = pdialog->priv->passwords;
-+				gtk_list_store_clear (GTK_LIST_STORE (pinfo->model));
- 			}
-+
-+			_ephy_pdm_delete_all_passwords ();
- 		}
- 		if (gtk_toggle_button_get_active
- 			(GTK_TOGGLE_BUTTON (checkbuttons->checkbutton_cache)))
diff --git a/www-client/epiphany/files/epiphany-2.30.6-dbus-fix.patch b/www-client/epiphany/files/epiphany-2.30.6-dbus-fix.patch
deleted file mode 100644
index c50be67a2c60..000000000000
--- a/www-client/epiphany/files/epiphany-2.30.6-dbus-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 174a51819570a975cc61e642f7f26cb4bc2f9c57 Mon Sep 17 00:00:00 2001
-From: Diego Escalante Urrelo <descalante@igalia.com>
-Date: Mon, 01 Nov 2010 05:56:51 +0000
-Subject: tests: DBUS_LIBS is needed for libephymain.la
-
----
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index bd2c378..b973214 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -23,6 +23,7 @@ LDADD = \
- 	$(top_builddir)/lib/widgets/libephywidgets.la \
- 	$(top_builddir)/lib/libephymisc.la \
- 	$(top_builddir)/lib/egg/libegg.la \
-+	$(DBUS_LIBS) \
- 	$(DEPENDENCIES_LIBS) 
- 
- if ENABLE_NSS
---
-cgit v0.8.3.4
diff --git a/www-client/epiphany/files/epiphany-2.30.6-introspection-prefix.patch b/www-client/epiphany/files/epiphany-2.30.6-introspection-prefix.patch
deleted file mode 100644
index 2fe761a44482..000000000000
--- a/www-client/epiphany/files/epiphany-2.30.6-introspection-prefix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 78b9eac0fca36e27c83c7678b18962ba286f041b Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vuntz@gnome.org>
-Date: Fri, 01 Oct 2010 16:36:23 +0000
-Subject: introspection: Fix build by telling g-ir-scanner what the prefix is
-
-https://bugzilla.gnome.org/show_bug.cgi?id=631119
----
-diff --git a/src/Makefile.am b/src/Makefile.am
-index e9d3715..acbf8ff 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -350,6 +350,7 @@ Epiphany-$(EPIPHANY_API_VERSION).gir: $(INTROSPECTION_SCANNER) $(EPHY_GIR_H_FILE
- 		--include=WebKit-1.0 \
- 		--program=./epiphany \
- 		--output $@ \
-+		--strip-prefix=Ephy \
- 		--pkg epiphany-$(EPIPHANY_API_VERSION) \
- 		-DEPIPHANY_COMPILATION \
- 		-I$(top_srcdir)/embed \
---
-cgit v0.8.3.4
diff --git a/www-client/epiphany/files/epiphany-2.30.6-libnotify-0.7.patch b/www-client/epiphany/files/epiphany-2.30.6-libnotify-0.7.patch
deleted file mode 100644
index a0c5f8ee1e7c..000000000000
--- a/www-client/epiphany/files/epiphany-2.30.6-libnotify-0.7.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- embed/downloader-view.c
-+++ embed/downloader-view.c
-@@ -36,6 +36,9 @@
- 
- #ifdef HAVE_LIBNOTIFY
- #include <libnotify/notify.h>
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
- #endif
- 
- enum
-@@ -337,7 +340,12 @@
- 	g_object_ref (dv);
- 
- 	notification = notify_notification_new (title, msg,
--						GTK_STOCK_INFO, NULL);
-+						GTK_STOCK_INFO
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+						);
-+#else
-+						, NULL);
-+#endif
- 
- 	g_signal_connect_after (notification, "closed",
- 				G_CALLBACK (notification_closed_cb), dv);
-@@ -346,7 +354,11 @@
- 	notify_notification_set_timeout (notification, NOTIFY_EXPIRES_DEFAULT);
- 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
- 
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+	/* notify_notification_attach_to_status_icon was removed */
-+#else
- 	notify_notification_attach_to_status_icon (notification, status_icon);
-+#endif
- 
- 	/* There are some visual glitches when the notification is shown and
- 	 * the GtkStatusIcon is still not visible. To avoid that, we delay the
diff --git a/www-client/epiphany/files/epiphany-2.30.6-mime-handler.patch b/www-client/epiphany/files/epiphany-2.30.6-mime-handler.patch
deleted file mode 100644
index e2b51f81466a..000000000000
--- a/www-client/epiphany/files/epiphany-2.30.6-mime-handler.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 6375ebd3361a02e6c996140b33979fc1061ef734 Mon Sep 17 00:00:00 2001
-From: Diego Escalante Urrelo <descalante@igalia.com>
-Date: Sun, 10 Oct 2010 19:28:24 -0500
-Subject: [PATCH] epiphany.desktop: declare ability to handle http and https
-
-Bug #631450
----
- data/epiphany.desktop.in.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/data/epiphany.desktop.in.in b/data/epiphany.desktop.in.in
-index 1c93f4c..fdf5ffe 100644
---- a/data/epiphany.desktop.in.in
-+++ b/data/epiphany.desktop.in.in
-@@ -13,4 +13,4 @@ X-GNOME-Bugzilla-Product=epiphany
- X-GNOME-Bugzilla-Component=BugBuddyBugs
- X-GNOME-Bugzilla-Version=@VERSION@
- Categories=Network;GNOME;GTK;WebBrowser;
--MimeType=text/html;text/xml;application/xhtml+xml;
-+MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;
--- 
-1.7.1
diff --git a/www-client/epiphany/metadata.xml b/www-client/epiphany/metadata.xml
index 06046e905c82..72b304a074f2 100644
--- a/www-client/epiphany/metadata.xml
+++ b/www-client/epiphany/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <use>
-	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
 	<flag name="nss">Import passwords from older gecko based <pkg>www-client/epiphany</pkg> keyring.</flag>
 </use>
 </pkgmetadata>