Add missing DEPEND on yelp-tools (#517462 by John Bowler), drop old

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

9 files changed, 11 insertions, 294 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index d382d48e46d3..e78b32886cc9 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,13 @@
 # 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.310 2014/07/23 15:38:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.311 2014/10/28 19:42:35 pacho Exp $
+
+  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,
+  -files/epiphany-3.6.1-test-gwarning.patch,
+  -files/epiphany-3.7.5-test-gwarning.patch, -files/gir-paxctl-lt-wrapper,
+  -files/paxctl.sh, epiphany-3.12.1.ebuild:
+  Add missing DEPEND on yelp-tools (#517462 by John Bowler), drop old
 
   23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> epiphany-3.12.1.ebuild:
   Stable for x86, wrt bug #512012
diff --git a/www-client/epiphany/epiphany-3.10.3.ebuild b/www-client/epiphany/epiphany-3.10.3.ebuild
deleted file mode 100644
index 16f9e47f4585..000000000000
--- a/www-client/epiphany/epiphany-3.10.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.10.3.ebuild,v 1.5 2014/03/12 02:49:01 tetromino Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 pax-utils versionator virtualx
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="http://projects.gnome.org/epiphany/"
-
-# TODO: coverage
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+jit +nss test"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-COMMON_DEPEND="
-	>=app-crypt/gcr-3.5.5
-	>=app-crypt/libsecret-0.14
-	>=app-text/iso-codes-0.35
-	>=dev-libs/glib-2.35.6:2
-	>=dev-libs/libxml2-2.6.12:2
-	>=dev-libs/libxslt-1.1.7
-	>=gnome-base/gsettings-desktop-schemas-0.0.1
-	>=net-dns/avahi-0.6.22[dbus]
-	>=net-libs/webkit-gtk-2.2.2:3[jit?]
-	>=net-libs/libsoup-2.42.1:2.4
-	>=x11-libs/gtk+-3.9.12:3
-	>=x11-libs/libnotify-0.5.1:=
-	gnome-base/gnome-desktop:3=
-
-	dev-db/sqlite:3
-	x11-libs/libwnck:3
-	x11-libs/libX11
-
-	x11-themes/gnome-icon-theme
-	x11-themes/gnome-icon-theme-symbolic
-
-	nss? ( dev-libs/nss )
-"
-# epiphany-extensions support was removed in 3.7; let's not pretend it still works
-RDEPEND="${COMMON_DEPEND}
-	!www-client/epiphany-extensions
-"
-# paxctl needed for bug #407085
-# eautoreconf requires gnome-common-3.5.5
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50
-	sys-apps/paxctl
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-# Tests refuse to run with the gsettings trick for some reason
-RESTRICT="test"
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-shared \
-		--disable-static \
-		--with-distributor-name=Gentoo \
-		$(use_enable nss) \
-		$(use_enable test tests) \
-		ITSTOOL=$(type -P true)
-}
-
-src_compile() {
-	# needed to avoid "Command line `dbus-launch ...' exited with non-zero exit status 1"
-	unset DISPLAY
-	gnome2_src_compile
-}
-
-src_test() {
-	# FIXME: this should be handled at eclass level
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
-	unset DISPLAY
-	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-	gnome2_src_install
-	use jit && pax-mark m "${ED}usr/bin/epiphany"
-}
diff --git a/www-client/epiphany/epiphany-3.12.0.ebuild b/www-client/epiphany/epiphany-3.12.0.ebuild
deleted file mode 100644
index f62438ac3792..000000000000
--- a/www-client/epiphany/epiphany-3.12.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.12.0.ebuild,v 1.2 2014/07/18 05:11:15 leio Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 pax-utils versionator virtualx
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="http://projects.gnome.org/epiphany/"
-
-# TODO: coverage
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+jit +nss test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-COMMON_DEPEND="
-	>=app-crypt/gcr-3.5.5
-	>=app-crypt/libsecret-0.14
-	>=app-text/iso-codes-0.35
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/libxml2-2.6.12:2
-	>=dev-libs/libxslt-1.1.7
-	>=gnome-base/gsettings-desktop-schemas-0.0.1
-	>=net-dns/avahi-0.6.22[dbus]
-	>=net-libs/webkit-gtk-2.4:3[jit?]
-	>=net-libs/libsoup-2.42.1:2.4
-	>=x11-libs/gtk+-3.11.6:3
-	>=x11-libs/libnotify-0.5.1:=
-	gnome-base/gnome-desktop:3=
-
-	dev-db/sqlite:3
-	x11-libs/libwnck:3
-	x11-libs/libX11
-
-	x11-themes/gnome-icon-theme
-	x11-themes/gnome-icon-theme-symbolic
-
-	nss? ( dev-libs/nss )
-"
-# epiphany-extensions support was removed in 3.7; let's not pretend it still works
-RDEPEND="${COMMON_DEPEND}
-	!www-client/epiphany-extensions
-"
-# paxctl needed for bug #407085
-# eautoreconf requires gnome-common-3.5.5
-DEPEND="${COMMON_DEPEND}
-	gnome-base/gnome-common
-	>=dev-util/intltool-0.50
-	sys-apps/paxctl
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-# Tests refuse to run with the gsettings trick for some reason
-RESTRICT="test"
-
-src_prepare() {
-	# Fix missing symbol in webextensio.so
-	epatch "${FILESDIR}"/${P}-missing-symbol.patch
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-shared \
-		--disable-static \
-		--with-distributor-name=Gentoo \
-		$(use_enable nss) \
-		$(use_enable test tests) \
-		ITSTOOL=$(type -P true)
-}
-
-src_compile() {
-	# needed to avoid "Command line `dbus-launch ...' exited with non-zero exit status 1"
-	unset DISPLAY
-	gnome2_src_compile
-}
-
-src_test() {
-	# FIXME: this should be handled at eclass level
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
-	unset DISPLAY
-	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-	gnome2_src_install
-	use jit && pax-mark m "${ED}usr/bin/epiphany"
-}
diff --git a/www-client/epiphany/epiphany-3.12.1.ebuild b/www-client/epiphany/epiphany-3.12.1.ebuild
index 48609b66b945..fb2e661b2a7c 100644
--- a/www-client/epiphany/epiphany-3.12.1.ebuild
+++ b/www-client/epiphany/epiphany-3.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.12.1.ebuild,v 1.4 2014/07/23 15:38:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.12.1.ebuild,v 1.5 2014/10/28 19:42:35 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -46,13 +46,14 @@ RDEPEND="${COMMON_DEPEND}
 	!www-client/epiphany-extensions
 "
 # paxctl needed for bug #407085
-# eautoreconf requires gnome-common-3.5.5
+# eautoreconf requires gnome-common and yelp-tools
 DEPEND="${COMMON_DEPEND}
 	gnome-base/gnome-common
 	>=dev-util/intltool-0.50
 	sys-apps/paxctl
 	sys-devel/gettext
 	virtual/pkgconfig
+	app-text/yelp-tools
 "
 
 # Tests refuse to run with the gsettings trick for some reason
diff --git a/www-client/epiphany/files/epiphany-3.3.90-paxctl-introspection.patch b/www-client/epiphany/files/epiphany-3.3.90-paxctl-introspection.patch
deleted file mode 100644
index f9e06164b2c4..000000000000
--- a/www-client/epiphany/files/epiphany-3.3.90-paxctl-introspection.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 1eee9260eba23a7fc17df49c5a0e24a99f88482a Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 4 Mar 2012 21:55:20 -0500
-Subject: [PATCH] Add PaX marking to allow building introspection under PaX
-
----
- src/Makefile.am |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index d6bf77f..ce52591 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -277,6 +277,7 @@ EPHY_GIR_C_FILES = \
- 
- Epiphany-$(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
-
diff --git a/www-client/epiphany/files/epiphany-3.6.1-test-gwarning.patch b/www-client/epiphany/files/epiphany-3.6.1-test-gwarning.patch
deleted file mode 100644
index 70fbe9b0ba1c..000000000000
--- a/www-client/epiphany/files/epiphany-3.6.1-test-gwarning.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-g_warning makes gtester abort tests. We do not care about this
-particular one because it actually is in ${T} which is a safe directory
-with regard to live system.
-
---- a/tests/ephy-file-helpers-test.c	2012-09-10 17:39:58.000000000 +0200
-+++ b/tests/ephy-file-helpers-test.c	2013-01-20 22:22:27.409706652 +0100
-@@ -96,8 +96,6 @@
-        * prefixed with /tmp. */
-       if (g_str_has_prefix (tmp_dir, "/tmp"))
-         g_assert (ephy_file_delete_dir_recursively (file, NULL));
--      else
--        g_warning ("INIT: dangerous path returned as tmp_dir: %s", tmp_dir);
- 
-       g_object_unref (file);
-     }
diff --git a/www-client/epiphany/files/epiphany-3.7.5-test-gwarning.patch b/www-client/epiphany/files/epiphany-3.7.5-test-gwarning.patch
deleted file mode 100755
index efe0f6e3d49f..000000000000
--- a/www-client/epiphany/files/epiphany-3.7.5-test-gwarning.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d1a7d0348ad8aa0ede756d5e24501c21d3e99d57 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
-Date: Mon, 18 Feb 2013 16:23:08 +0330
-Subject: [PATCH] epiphany-3.7.5-test-gwarning
-
-g_warning makes gtester abort tests. We do not care about this
-particular one because it actually is in ${T} which is a safe directory
-with regard to live system.
-
----
- tests/ephy-file-helpers-test.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/tests/ephy-file-helpers-test.c b/tests/ephy-file-helpers-test.c
-index c33c1da..2762daf 100644
---- a/tests/ephy-file-helpers-test.c
-+++ b/tests/ephy-file-helpers-test.c
-@@ -96,8 +96,6 @@ test_ephy_file_helpers_init (void)
-        * prefixed with /tmp. */
-       if (g_str_has_prefix (tmp_dir, "/tmp"))
-         g_assert (ephy_file_delete_dir_recursively (file, NULL));
--      else
--        g_warning ("INIT: dangerous path returned as tmp_dir: %s", tmp_dir);
- 
-       g_object_unref (file);
-     }
--- 
-1.8.1.2
-
diff --git a/www-client/epiphany/files/gir-paxctl-lt-wrapper b/www-client/epiphany/files/gir-paxctl-lt-wrapper
deleted file mode 100755
index c0e606be2c67..000000000000
--- a/www-client/epiphany/files/gir-paxctl-lt-wrapper
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-# Wrapper for $(LIBTOOL) that performs PaX marking on the dumper binary
-# generated by g-ir-scanner.
-
-flags=${1//-}; shift
-
-echo ${LIBTOOL} "$@"
-${LIBTOOL} "$@"
-
-retval=$?
-
-bash "@S@/paxctl.sh" "${flags}" $(find . -path "*tmp-introspect*/.libs/*")
-
-exit ${retval}
diff --git a/www-client/epiphany/files/paxctl.sh b/www-client/epiphany/files/paxctl.sh
deleted file mode 100755
index bb1b6e072f21..000000000000
--- a/www-client/epiphany/files/paxctl.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-# PaX marking code stolen from pax-utils.eclass
-
-flags=${1//-}; shift
-
-if type -p paxctl > /dev/null; then
-	echo "PT PaX marking -${flags} $@"
-	for f in "$@"; do
-		# First, try modifying the existing PAX_FLAGS header
-		paxctl -q${flags} "${f}" && continue
-		# Second, try stealing the (unused under PaX) PT_GNU_STACK header
-		paxctl -qc${flags} "${f}" && continue
-		# Third, try pulling the base down a page, to create space and
-		# insert a PT_GNU_STACK header (works on ET_EXEC)
-		paxctl -qC${flags} "${f}" && continue
-	done
-elif type -p scanelf > /dev/null; then
-	# Try scanelf, the Gentoo swiss-army knife ELF utility
-	# Currently this sets PT if it can, no option to control what it does.
-	echo "Fallback PaX marking -${flags} $@"
-	scanelf -Xxz ${flags} "$@"
-fi
-
-exit 0