Version bump for Gnome 3.6. Clean up old revisions.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key C6085806)

8 files changed, 44 insertions, 430 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index f2a5d4b69f81..df1a847cd9d2 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-client/epiphany
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.287 2012/08/09 08:42:41 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.288 2012/12/25 23:52:43 eva Exp $
+
+*epiphany-3.6.1 (25 Dec 2012)
+
+  25 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/epiphany-3.2.0-optional-networkmanager.patch, -epiphany-3.2.1.ebuild,
+  -epiphany-3.2.1-r1.ebuild, -files/epiphany-3.2.1-paxctl-introspection.patch,
+  -epiphany-3.2.2.ebuild, -epiphany-3.4.2.ebuild, epiphany-3.4.3.ebuild,
+  +epiphany-3.6.1.ebuild:
+  Version bump for Gnome 3.6. Clean up old revisions.
 
 *epiphany-3.4.3 (09 Aug 2012)
 
diff --git a/www-client/epiphany/epiphany-3.2.1-r1.ebuild b/www-client/epiphany/epiphany-3.2.1-r1.ebuild
deleted file mode 100644
index 946851d32858..000000000000
--- a/www-client/epiphany/epiphany-3.2.1-r1.ebuild
+++ /dev/null
@@ -1,89 +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-3.2.1-r1.ebuild,v 1.3 2012/05/03 06:01:03 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-
-inherit autotools eutils gnome2 pax-utils
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="http://projects.gnome.org/epiphany/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="avahi doc +introspection +networkmanager +nss test"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# XXX: Should we add seed support? Seed seems to be unmaintained now.
-# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
-# and 2.30.0
-COMMON_DEPEND=">=dev-libs/glib-2.30.0:2
-	>=x11-libs/gtk+-3.0.2:3[introspection?]
-	>=dev-libs/libxml2-2.6.12:2
-	>=dev-libs/libxslt-1.1.7
-	>=app-text/iso-codes-0.35
-	>=net-libs/webkit-gtk-1.6.1:3[introspection?]
-	>=net-libs/libsoup-gnome-2.33.1:2.4
-	>=gnome-base/gnome-keyring-2.26.0
-	>=gnome-base/gsettings-desktop-schemas-0.0.1
-	>=x11-libs/libnotify-0.5.1
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-
-	app-misc/ca-certificates
-	x11-themes/gnome-icon-theme
-
-	avahi? ( >=net-dns/avahi-0.6.22 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	nss? ( dev-libs/nss )"
-# networkmanager is used purely via dbus
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/gnome-icon-theme-symbolic
-	networkmanager? ( >=net-misc/networkmanager-0.8.997 )"
-# paxctl needed for bug #407085
-DEPEND="${COMMON_DEPEND}
-	app-text/gnome-doc-utils
-	>=dev-util/gdbus-codegen-2.30.0
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	sys-apps/paxctl
-	sys-devel/gettext
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-	G2CONF="${G2CONF}
-		--enable-shared
-		--disable-schemas-compile
-		--disable-scrollkeeper
-		--disable-static
-		--with-distributor-name=Gentoo
-		--with-ca-file=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
-		$(use_enable avahi zeroconf)
-		$(use_enable introspection)
-		$(use_enable nss)
-		$(use_enable test tests)"
-	# Upstream no longer makes networkmanager optional, but we still want
-	# to make it possible for prefix users to use epiphany
-	use networkmanager && CFLAGS="${CFLAGS} -DENABLE_NETWORK_MANAGER"
-}
-
-src_prepare() {
-	# Make networkmanager optional for prefix people
-	epatch "${FILESDIR}/${PN}-3.2.0-optional-networkmanager.patch"
-	# Build-time segfaults under PaX with USE=introspection
-	epatch "${FILESDIR}/${PN}-3.2.1-paxctl-introspection.patch"
-	cp "${FILESDIR}/gir-paxctl-lt-wrapper" \
-		"${FILESDIR}/paxctl.sh" "${S}/" || die
-	sed -e "s:@S@:${S}:" -i gir-paxctl-lt-wrapper || die
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	pax-mark m "${ED}usr/bin/epiphany"
-}
diff --git a/www-client/epiphany/epiphany-3.2.1.ebuild b/www-client/epiphany/epiphany-3.2.1.ebuild
deleted file mode 100644
index a8bb59c74f10..000000000000
--- a/www-client/epiphany/epiphany-3.2.1.ebuild
+++ /dev/null
@@ -1,76 +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-3.2.1.ebuild,v 1.3 2012/05/03 06:01:03 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="http://projects.gnome.org/epiphany/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="avahi doc +introspection +networkmanager +nss test"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# XXX: Should we add seed support? Seed seems to be unmaintained now.
-# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
-# and 2.30.0
-COMMON_DEPEND=">=dev-libs/glib-2.30.0:2
-	>=x11-libs/gtk+-3.0.2:3[introspection?]
-	>=dev-libs/libxml2-2.6.12:2
-	>=dev-libs/libxslt-1.1.7
-	>=app-text/iso-codes-0.35
-	>=net-libs/webkit-gtk-1.6.1:3[introspection?]
-	>=net-libs/libsoup-gnome-2.33.1:2.4
-	>=gnome-base/gnome-keyring-2.26.0
-	>=gnome-base/gsettings-desktop-schemas-0.0.1
-	>=x11-libs/libnotify-0.5.1
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-
-	app-misc/ca-certificates
-	x11-themes/gnome-icon-theme
-
-	avahi? ( >=net-dns/avahi-0.6.22 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	nss? ( dev-libs/nss )"
-# networkmanager is used purely via dbus
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/gnome-icon-theme-symbolic
-	networkmanager? ( >=net-misc/networkmanager-0.8.997 )"
-DEPEND="${COMMON_DEPEND}
-	app-text/gnome-doc-utils
-	>=dev-util/gdbus-codegen-2.30.0
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	sys-devel/gettext
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-	G2CONF="${G2CONF}
-		--enable-shared
-		--disable-schemas-compile
-		--disable-scrollkeeper
-		--disable-static
-		--with-distributor-name=Gentoo
-		--with-ca-file=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
-		$(use_enable avahi zeroconf)
-		$(use_enable introspection)
-		$(use_enable nss)
-		$(use_enable test tests)"
-	# Upstream no longer makes networkmanager optional, but we still want
-	# to make it possible for prefix users to use epiphany
-	use networkmanager && CFLAGS="${CFLAGS} -DENABLE_NETWORK_MANAGER"
-}
-
-src_prepare() {
-	# Make networkmanager optional for prefix people
-	epatch "${FILESDIR}/${PN}-3.2.0-optional-networkmanager.patch"
-	gnome2_src_prepare
-}
diff --git a/www-client/epiphany/epiphany-3.2.2.ebuild b/www-client/epiphany/epiphany-3.2.2.ebuild
deleted file mode 100644
index c2964ff6f04b..000000000000
--- a/www-client/epiphany/epiphany-3.2.2.ebuild
+++ /dev/null
@@ -1,89 +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-3.2.2.ebuild,v 1.2 2012/05/03 06:01:03 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-
-inherit autotools eutils gnome2 pax-utils
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="http://projects.gnome.org/epiphany/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="avahi doc +introspection +networkmanager +nss test"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# XXX: Should we add seed support? Seed seems to be unmaintained now.
-# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
-# and 2.30.0
-COMMON_DEPEND=">=dev-libs/glib-2.30.0:2
-	>=x11-libs/gtk+-3.0.2:3[introspection?]
-	>=dev-libs/libxml2-2.6.12:2
-	>=dev-libs/libxslt-1.1.7
-	>=app-text/iso-codes-0.35
-	>=net-libs/webkit-gtk-1.6.1:3[introspection?]
-	>=net-libs/libsoup-gnome-2.33.1:2.4
-	>=gnome-base/gnome-keyring-2.26.0
-	>=gnome-base/gsettings-desktop-schemas-0.0.1
-	>=x11-libs/libnotify-0.5.1
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-
-	app-misc/ca-certificates
-	x11-themes/gnome-icon-theme
-
-	avahi? ( >=net-dns/avahi-0.6.22 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	nss? ( dev-libs/nss )"
-# networkmanager is used purely via dbus
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/gnome-icon-theme-symbolic
-	networkmanager? ( >=net-misc/networkmanager-0.8.997 )"
-# paxctl needed for bug #407085
-DEPEND="${COMMON_DEPEND}
-	app-text/gnome-doc-utils
-	>=dev-util/gdbus-codegen-2.30.0
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	sys-apps/paxctl
-	sys-devel/gettext
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-	G2CONF="${G2CONF}
-		--enable-shared
-		--disable-schemas-compile
-		--disable-scrollkeeper
-		--disable-static
-		--with-distributor-name=Gentoo
-		--with-ca-file=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
-		$(use_enable avahi zeroconf)
-		$(use_enable introspection)
-		$(use_enable nss)
-		$(use_enable test tests)"
-	# Upstream no longer makes networkmanager optional, but we still want
-	# to make it possible for prefix users to use epiphany
-	use networkmanager && CFLAGS="${CFLAGS} -DENABLE_NETWORK_MANAGER"
-}
-
-src_prepare() {
-	# Make networkmanager optional for prefix people
-	epatch "${FILESDIR}/${PN}-3.2.0-optional-networkmanager.patch"
-	# Build-time segfaults under PaX with USE=introspection
-	epatch "${FILESDIR}/${PN}-3.2.1-paxctl-introspection.patch"
-	cp "${FILESDIR}/gir-paxctl-lt-wrapper" \
-		"${FILESDIR}/paxctl.sh" "${S}/" || die
-	sed -e "s:@S@:${S}:" -i gir-paxctl-lt-wrapper || die
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	pax-mark m "${ED}usr/bin/epiphany"
-}
diff --git a/www-client/epiphany/epiphany-3.4.3.ebuild b/www-client/epiphany/epiphany-3.4.3.ebuild
index 1a2ce387d0cb..3a96619b6a83 100644
--- a/www-client/epiphany/epiphany-3.4.3.ebuild
+++ b/www-client/epiphany/epiphany-3.4.3.ebuild
@@ -1,14 +1,11 @@
 # 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-3.4.3.ebuild,v 1.1 2012/08/09 08:42:41 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.4.3.ebuild,v 1.2 2012/12/25 23:52:43 eva Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
 
 inherit autotools eutils gnome2 pax-utils versionator virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="GNOME webbrowser based on Webkit"
 HOMEPAGE="http://projects.gnome.org/epiphany/"
diff --git a/www-client/epiphany/epiphany-3.4.2.ebuild b/www-client/epiphany/epiphany-3.6.1.ebuild
index 5277c3c95c9b..615432823feb 100644
--- a/www-client/epiphany/epiphany-3.4.2.ebuild
+++ b/www-client/epiphany/epiphany-3.6.1.ebuild
@@ -1,70 +1,55 @@
 # 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-3.4.2.ebuild,v 1.2 2012/05/19 21:58:10 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.6.1.ebuild,v 1.1 2012/12/25 23:52:43 eva Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes"
 
 inherit autotools eutils gnome2 pax-utils versionator virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="GNOME webbrowser based on Webkit"
 HOMEPAGE="http://projects.gnome.org/epiphany/"
 
+# TODO: coverage
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="avahi doc +introspection +jit +nss test"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+introspection +jit +nss test"
+KEYWORDS="~amd64 ~x86"
 
-# XXX: Should we add seed support? Seed seems to be unmaintained now.
 RDEPEND="
+	>=app-crypt/gcr-3.5.5
+	>=app-text/iso-codes-0.35
 	>=dev-libs/glib-2.31.2:2
-	>=x11-libs/gtk+-3.3.14:3[introspection?]
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
-	>=app-text/iso-codes-0.35
-	>=net-libs/webkit-gtk-1.7.92:3[introspection?]
-	>=net-libs/libsoup-gnome-2.37.1:2.4
 	>=gnome-base/gnome-keyring-2.26.0
 	>=gnome-base/gsettings-desktop-schemas-0.0.1
-	>=x11-libs/libnotify-0.5.1
+	>=net-dns/avahi-0.6.22
+	>=net-libs/webkit-gtk-1.9.6:3[jit?,introspection?]
+	>=net-libs/libsoup-gnome-2.39.6:2.4
+	>=x11-libs/gtk+-3.5.2:3[introspection?]
+	>=x11-libs/libnotify-0.5.1:=
+	gnome-base/gnome-desktop:3=
 
 	dev-db/sqlite:3
-	x11-libs/libICE
-	x11-libs/libSM
 	x11-libs/libX11
 
 	x11-themes/gnome-icon-theme
 	x11-themes/gnome-icon-theme-symbolic
 
-	avahi? ( >=net-dns/avahi-0.6.22 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	!jit? ( net-libs/webkit-gtk[-jit] )
-	nss? ( dev-libs/nss )"
+	nss? ( dev-libs/nss )
+"
 # paxctl needed for bug #407085
+# eautoreconf requires gnome-common-3.5.5
 DEPEND="${RDEPEND}
-	app-text/gnome-doc-utils
-	>=dev-util/intltool-0.40
+	introspection? ( jit? ( >=gnome-base/gnome-common-3.5.5 ) )
+	>=dev-util/gtk-doc-am-1
+	>=dev-util/intltool-0.50
+	sys-apps/paxctl
 	sys-devel/gettext
 	virtual/pkgconfig
-	jit? ( sys-apps/paxctl )
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-	G2CONF="${G2CONF}
-		--enable-shared
-		--disable-schemas-compile
-		--disable-scrollkeeper
-		--disable-static
-		--with-distributor-name=Gentoo
-		$(use_enable avahi zeroconf)
-		$(use_enable introspection)
-		$(use_enable nss)
-		$(use_enable test tests)"
-}
+"
 
 src_prepare() {
 	# Build-time segfaults under PaX with USE=introspection when building
@@ -77,6 +62,18 @@ src_prepare() {
 	gnome2_src_prepare
 }
 
+src_configure() {
+	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
+	G2CONF="${G2CONF}
+		--enable-shared
+		--disable-static
+		--with-distributor-name=Gentoo
+		$(use_enable introspection)
+		$(use_enable nss)
+		$(use_enable test tests)"
+	gnome2_src_configure
+}
+
 src_compile() {
 	# needed to avoid "Command line `dbus-launch ...' exited with non-zero exit status 1"
 	unset DISPLAY
diff --git a/www-client/epiphany/files/epiphany-3.2.0-optional-networkmanager.patch b/www-client/epiphany/files/epiphany-3.2.0-optional-networkmanager.patch
deleted file mode 100644
index 0ac61120449b..000000000000
--- a/www-client/epiphany/files/epiphany-3.2.0-optional-networkmanager.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From c29d0825816a541c98a3b0b7f1d6bae454cba2b5 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Wed, 7 Sep 2011 17:17:42 -0400
-Subject: [PATCH] Make networkmanager optional
-
-Some people cannot use it for various reasons (e.g. prefix).
----
- src/ephy-shell.c |   14 ++++++++++++++
- 1 files changed, 14 insertions(+), 0 deletions(-)
-
-diff --git a/src/ephy-shell.c b/src/ephy-shell.c
-index c436da1..29b79e6 100644
---- a/src/ephy-shell.c
-+++ b/src/ephy-shell.c
-@@ -63,7 +63,9 @@ struct _EphyShellPrivate {
-   EggToolbarsModel *toolbars_model;
-   EggToolbarsModel *fs_toolbars_model;
-   EphyExtensionsManager *extensions_manager;
-+#ifdef ENABLE_NETWORK_MANAGER
-   EphyNetworkManager *nm_proxy;
-+#endif
-   GtkWidget *bme;
-   GtkWidget *history_window;
-   GObject *pdm_dialog;
-@@ -435,6 +437,8 @@ ephy_shell_new_window_cb (EphyEmbedSingle *single,
-      NULL, NULL, flags, chromemask, is_popup, 0);
- }
- 
-+#ifdef ENABLE_NETWORK_MANAGER
-+
- static void
- ephy_shell_sync_network_status (EphyNetworkManager *nm_proxy,
-                                 NMState state,
-@@ -452,6 +456,8 @@ ephy_shell_sync_network_status (EphyNetworkManager *nm_proxy,
-   ephy_embed_single_set_network_status (single, net_status);
- }
- 
-+#endif /* ENABLE_NETWORK_MANAGER */
-+
- static GObject*
- impl_get_embed_single (EphyEmbedShell *embed_shell)
- {
-@@ -469,12 +475,14 @@ impl_get_embed_single (EphyEmbedShell *embed_shell)
- 
-     priv->embed_single_connected = TRUE;
- 
-+#ifdef ENABLE_NETWORK_MANAGER
-     /* Now we need the net monitor   */
-     if (ephy_shell_get_net_monitor (shell)) {
-         ephy_shell_sync_network_status (priv->nm_proxy,
-                                         ephy_network_manager_get_state (priv->nm_proxy),
-                                         shell);
-     }
-+#endif
-   }
- 
-   return embed_single;
-@@ -563,6 +571,7 @@ ephy_shell_dispose (GObject *object)
-     priv->bookmarks = NULL;
-   }
- 
-+#ifdef ENABLE_NETWORK_MANAGER
-   if (priv->nm_proxy != NULL) {
-     LOG ("Unref net monitor ");
-     g_signal_handlers_disconnect_by_func
-@@ -570,6 +579,7 @@ ephy_shell_dispose (GObject *object)
-     g_object_unref (priv->nm_proxy);
-     priv->nm_proxy = NULL;
-   }
-+#endif /* ENABLE_NETWORK_MANAGER */
- 
-   G_OBJECT_CLASS (ephy_shell_parent_class)->dispose (object);
- }
-@@ -915,6 +925,7 @@ ephy_shell_get_extensions_manager (EphyShell *es)
- GObject *
- ephy_shell_get_net_monitor (EphyShell *shell)
- {
-+#ifdef ENABLE_NETWORK_MANAGER
-   EphyShellPrivate *priv = shell->priv;
- 
-   if (priv->nm_proxy == NULL) {
-@@ -929,6 +940,9 @@ ephy_shell_get_net_monitor (EphyShell *shell)
-   }
- 
-   return G_OBJECT (priv->nm_proxy);
-+#else
-+  return NULL;
-+#endif /* ENABLE_NETWORK_MANAGER */
- }
- 
- static void
--- 
-1.7.6.1
-
diff --git a/www-client/epiphany/files/epiphany-3.2.1-paxctl-introspection.patch b/www-client/epiphany/files/epiphany-3.2.1-paxctl-introspection.patch
deleted file mode 100644
index ba5eab47ef0b..000000000000
--- a/www-client/epiphany/files/epiphany-3.2.1-paxctl-introspection.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From f9ba4d6428f06f717eb16e83a728f82b314383f1 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 4 Mar 2012 19:47:17 -0500
-Subject: [PATCH] Add libtool wrapper for building introspection under PaX
-
----
- src/Makefile.am |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index c46160c..2aa94d1 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -299,7 +299,7 @@ EPHY_GIR_C_FILES = \
- 
- EphyEgg-$(EPIPHANY_API_VERSION).gir: $(INTROSPECTION_SCANNER)
- 	$(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \
--	$(INTROSPECTION_SCANNER) -v --warn-all \
-+	LIBTOOL="$(LIBTOOL)" $(INTROSPECTION_SCANNER) -v --warn-all \
- 		--identifier-prefix=Egg \
- 		--symbol-prefix=egg \
- 		--namespace=EphyEgg \
-@@ -307,6 +307,7 @@ EphyEgg-$(EPIPHANY_API_VERSION).gir: $(INTROSPECTION_SCANNER)
- 		--include=Gtk-3.0 \
- 		--include=libxml2-2.0 \
- 		--library=$(top_builddir)/lib/egg/libegg.la \
-+		--libtool="bash $(top_srcdir)/gir-paxctl-lt-wrapper -m" \
- 		--pkg=gtk+-3.0 \
- 		--pkg=libxml-2.0 \
- 		--output=$@ \
-@@ -318,6 +319,7 @@ EphyEgg-$(EPIPHANY_API_VERSION).gir: $(INTROSPECTION_SCANNER)
- 
- Epiphany-$(EPIPHANY_API_VERSION).gir: EphyEgg-$(EPIPHANY_API_VERSION).gir $(INTROSPECTION_SCANNER) $(EPHY_GIR_H_FILES) \
-                                       $(EPHY_GIR_C_FILES) epiphany
-+	bash $(top_srcdir)/paxctl.sh -m ./epiphany
- 	$(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \
- 	$(INTROSPECTION_SCANNER) -v --warn-all \
- 		--identifier-prefix=Ephy \
--- 
-1.7.8.5
-