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

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

10 files changed, 16 insertions, 318 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/Manifest b/www-client/epiphany/Manifest
index 96518901653c..fc4c078915b7 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -7,35 +7,16 @@ AUX epiphany-2.30.6-introspection-prefix.patch 710 SHA256 19f273f7e193c27d667f0b
 AUX epiphany-2.30.6-libnotify-0.7.patch 1048 SHA256 c1a59a9df78db07c2cf23d47d881d8d4edf6e55af3d655f8ec9870adf9255390 SHA512 57dbabbceef0d7a7dc6a5002aaf6730dfabed0d528b2c2bd1d17a46881e0005b8e1b6612a8a6fa964a24b6e741b7a9435da761a1ab2e2d209f5ef0ac345f8286 WHIRLPOOL cc24a425a295075589adaebe4a92a10799f27c13e3d578df5045e8ff879e10836f36697f9a791f1b9ceda9a06e0dc3e43f1e7314b2441e221829b047663d65a3
 AUX epiphany-2.30.6-mime-handler.patch 844 SHA256 768a092f315c905f18c554616a07eb5595c7d512289c280ea435ea482f0820aa SHA512 81f986209ddacd076027fcb8bcb4c77476a282a63cc0058f6a4e4121690254e699294173f9bf7a432bb245a95e74d034d3be3627437a0218fa38994655d54193 WHIRLPOOL f09181d1339068d1c4728849b05f0d3ce4f8ab7055a07a0a53141ff07bb2b1f0c1297f4a45af3a78b4ee440b89bb8daa4d8a0c500077e5623fab53727e60ed0e
 AUX epiphany-3.12.0-missing-symbol.patch 1432 SHA256 804822f48ed9ee6f48d60477601c715a7d73013b6030ec70e5dab06062854bd8 SHA512 980ad30fdc665b05601e0d5eb1a0cf451a2bbbddaebf34ad4cff3bd7e0b07e7961527844be6b3f16f81e22952058d691e731d00d05274e908bade75d63d7bd5a WHIRLPOOL 6d0cfa4db6b08318e73b481aa57fdabe001aad73d37a6444006d9ed22547d57105c0403ab8312951cc135f767b5710fd81a5bd80cdc3400c7a34d2474faca59f
-AUX epiphany-3.3.90-paxctl-introspection.patch 835 SHA256 c7670baab442a5475e33a614d2f71fb4601398a1fc1bc898e6b9359d35d3d6b3 SHA512 c08efa9c4d3f0cc759a758355b5cf32cc4e4101a7a5d2eb03672b72a80829e29058e2561a7e752caa842686f3618dd6f6d0fd68c28b593967b1b596459a5fa07 WHIRLPOOL e45f0e658c636c437068d99e9317c93e90081920e2c1bdb31012e5f6a8c232deac4b7906ee13f635a3cdc878cc83806eb3a5375a138d16014dfcce9c9543642f
-AUX epiphany-3.6.1-test-gwarning.patch 604 SHA256 79ac35fd0eed7333fc26d2ce68ba5be9d91d9a3e44f0da882a870a96552cd196 SHA512 dc8cff14505cae85a6c474ec498de723375a0bad11d1b2434fa9d9560391cbcdcec4c4227065d0aa532e403ba3946c7a0cb0c5b9deff3f51a3fbfea099cf0284 WHIRLPOOL 3f15398c3042fb93292025ce624051bf9af8cc138b856df7cda355a062cff2144b514c62cc6b0a8db336b16c163f60bae8e551a9163b1fcbcc69d901f1ff941c
-AUX epiphany-3.7.5-test-gwarning.patch 976 SHA256 d2d6c70e0271902f534809c9995bd99d276d0b211f0c67c0a170ccf5166b000d SHA512 a91e4540577ed3f418be216af4b728d350ad8206593ad5968737ec49a4865917470a120d07b08580410694d43fd8434464aaf40a62d50abf5ea0071bf02eb3d4 WHIRLPOOL 9ecd3d435d1a0076dbc35aed15d49b460ce198e20370858fc1623a918749f269b0525ef8b41240cfab724304ddaf5a86db5d3ed5a0b69a8b1b62fb276a2caf97
-AUX gir-paxctl-lt-wrapper 276 SHA256 28569b4c59e620bc2ed11fa8c8adc553c7bae98d32d4fc2cd8b2780aee52c090 SHA512 4169122fe1cac52cefefe63d0060aa891ee7f993df714aa9fe823abc5b51ff6c7664b70e875d308f277feb18b1f08d50de985df27774496ecedef8838c9e87fa WHIRLPOOL efed452ad405071fe2d9e81b55425f2c999fc1fe4d43154da313a6bacd55184b7a511998eca582cf730d7986d8eb5a942ec129a8f368e0dcd6845047939324cc
-AUX paxctl.sh 787 SHA256 f55473f2b044d25598195b6676175bad9531d4374fff65505d7c717d90d0897e SHA512 bbe21688544d3718af5c201212f3b0ae12e91c1119026e967b0cd8acc5200fad483c06e57a24bf83e1839def01dbbbe2d31e7ad4625e8be5ae9bc29e4534a343 WHIRLPOOL 66db2b4101a35aeae40e217465f74ae410733a390cb55dd056bc1f26c245a6f75d124687d1efe8b0f01b5e038fa28ebeeb67367974979fefbf1001defb09ba2e
 DIST epiphany-2.30.6.tar.bz2 5927938 SHA256 278a5c00ce07e6a3ea440d289de22dbec3ebec4ded4ff3b4c48b580f469c2dcc SHA512 0057ad94bfba73c3957da185ce087fdcfc621df7e7818fbf46aea63a288de8df7c63b41eafb412a5d8ba3cfafbd3159f0dcda26b66a16c0dca3e0fe54dc84525 WHIRLPOOL 7cf994100bae0a4f9f2fcb13fbbcf47aeb49815910bd51ff05feff369a619aed09079f9c627b7fecad2cb76be9ba15db1791bd0fe42297a60d3730e093f47201
-DIST epiphany-3.10.3.tar.xz 3088664 SHA256 c18235ecceaa9c76e7d90d370861cb2bba45019e1e14391a00dac3d2e94a0db7 SHA512 732e53ce67af886e164f16107e46a6000fe8f9a0b2b828c489f19bdd232d6450c32daadbf4c5c422e563e49727cbffd99371c9fab52d435412fc817dd1200b5d WHIRLPOOL ceeffa612d3315733c63bf4b6e808fee17da4aa1c541ae84bc878f0751ff61b8906954aa133198f7d34f059157dfedc9d0e87b742e2f591a0fbd6fb308cb1fa2
-DIST epiphany-3.12.0.tar.xz 3023172 SHA256 c1872e38854b01320d5b8fc17179ebd0ae5ee247c92d3d3cdb7f2b9f54c90d25 SHA512 b28bf7ed9090025d18a9b797c5ac268564038166675dbd998c3534074724a1796be4b55f7b7c56f6308807410929963d5c3c2d9524b586e949482f6c7850d5bf WHIRLPOOL 7b95a3dbee784d62590304fc2e3bca673d33cada5ad3d9cd8cc65d883c329594589894e1d37a661b58c4662bfdc84a217b6243b53bc8e4e9b288f4aa39fd99dc
 DIST epiphany-3.12.1.tar.xz 3026432 SHA256 16d9f8f10443328b2f226c2da545e75c8433f50f103af8aeb692b098d5fbbf93 SHA512 fd87ea87b3f599eb78f21fd6c2e03dc2c7579c1fb459b60e04d593acabbfc08206fb59996df72db0d2ee532e1d2848c238cb8491a9737f961a131450730b400a WHIRLPOOL 977659b0211a0ee0b233ea33a449d6c9d5173281674cb05173742546efa8a567d6274090b3bbfb6caa09eac8bd69406369733e76f414dee96348b70596061eba
 EBUILD epiphany-2.30.6-r1.ebuild 2555 SHA256 c33e1fbb5b7e1eab17635dfe1366e700f7ec3d52c20baa4607f2222c4880680b SHA512 04439f27370575106ed9fee4353761fb2aab9e429c2c4631d6e367178c9b636eaee37152091e82f03726713c6655ad404f263724dc2a91ec49a1f9ffc6035349 WHIRLPOOL 597effacf7ed5d5f881ede096afc9f9b2077908eb4432c170dd26dc290573333e5f2d50dc5444ad692be40a1c68e6b5fbe851067a625766ce55af239ee169204
-EBUILD epiphany-3.10.3.ebuild 2196 SHA256 557de820a7ba646fe02c9515af975a32d582eb170db13763572050a535c03051 SHA512 f0b75972ce64027ad2c39c8bc427958dd31719e07147e2a047d2b586df39dea6bde72d91834a52a6e68a7d67f83745d6a9bc6fd79a8bb5c2242dc5b4583d9580 WHIRLPOOL df9e053715e1c936b987b8163e04fb6076da92904fcffaba3ad1c8c210ef945c195a737751bc20c0bb86ed1d9fc633fdf6857770ff9ea47b08ce7746f07823e4
-EBUILD epiphany-3.12.0.ebuild 2365 SHA256 322489a8fa93cf6e9b4862bb8557e2a4d6f1e8b9b6a0d8f6710dfdddb56e83c7 SHA512 11bf51c10e3b9a967e267824ecc715cafadd3a29a6438c23c5977994e5651a2814c1f85ad50d112f7e043627f56704b34d70f5de04e96c020aef3c24ca09db29 WHIRLPOOL 98f8d9b9cf1b635e42b6d5861ce31d618b0a20f66e0f240f3994938d939e491cc2a058eed5a88de55d4a777ff6d2aa5fed0e678aae37d7a7859ed87d253153e6
-EBUILD epiphany-3.12.1.ebuild 2366 SHA256 82837698bcadb489a4231176ee02fa49c32b0b88b3008521a6b01c7804ec4091 SHA512 aaaeb00787d7d837ad1a1203ec1aebc17daa268183f220479b0dc09cfc816b833feb2a4fcf858f410df9a165be6be62add75692a62f5671e894b9f40a9462928 WHIRLPOOL 8548f85dc2c9c52ba6a310083f5d134ba1e3b5d69294c4df3a0fb8a9523370ee6d5fced27757c39c170f93f56b9f2fc5c1327c3f4b22653f6a1e1cafa8b92838
-MISC ChangeLog 59767 SHA256 d5ed658ff11feee7e99e3e9b916b761e1b831baaf980d71b72782dd053af7951 SHA512 78cdf541f03a96c85e0c55da7c9b066791ed02ed3111fd4b2a2db8d779c6f81010c5864cbe394eceac90952f14c94f5b62c569b6a4916d501bd5a6abf4a2de0f WHIRLPOOL 7319761f37ae836461b9f84adc391862d31d93407d64a07f65ee01716b75d474d9a708f735dbdf74eafcca604a35721cd869b21a2e1d8c7c185f4c4860386314
+EBUILD epiphany-3.12.1.ebuild 2398 SHA256 4cf16efcbd3d5f6ebcf068242ee4526eefc5ace0f7b783c876fecd1baf3deef7 SHA512 b31596f6361575b00a961848c9d7e7ec808a600ee4f4c4f19a1368c6605e54ba4dc03a1be7dcee21625c19333a16e113cdce50b9210e7b793a3a5648dcd12d2c WHIRLPOOL eb32c41675083bbd7908f45efa68f47c3347b59935b98c914cd1995ebc1944ae968c51b71c1d70488e291a7b0d0f6f8bccb2cc8cad71e47c17a4f51f4a555339
+MISC ChangeLog 60153 SHA256 b98e94852f01701eada55eb2b479e916457eb61bb8851a5f45d4bc181357b34e SHA512 c14f570e7ae96bff61c564bf44326277630b79854c20b69f594996e7538aa3a3d7c44763dd36fd510c80048b1cbc73f7a89dd41846301d78704e4103f721cf50 WHIRLPOOL c620d0c1de7c367545da5b4c73e275b732c3e532ce774043a0241cf3cb4805d1e8555e9551c06e475a5cb7a0096be607ffa5afc3f9fb1c161aa73b334036c48e
 MISC metadata.xml 375 SHA256 34a7f30e213476622090d9d1cbbe640a48f365d7e418686d6c855006b9db14f9 SHA512 a2b21d647ee71d004b28a7e3058155955493bab0241b33b970f5ad1c25376e3d8b922d654bb15f4820d53c6856eda469aa9ad793b8ad4335e1c74957afa09bf3 WHIRLPOOL 997d8a11ae22c881d74ac708d7908c062672fb4fbca76f87aa2770df74f18a1ce02c3ba6567b2d925395532a68347d70e878542950b623806d14481681d566a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTz9byAAoJELp701BxlEWfYisQAKhZ/5Az6Lejfr5MclEKbale
-6z8Ukz1W0dOvqskTQ0tP+DMc/OjBuhoPFPFrqwcIjml+UTWjndi+joo69LzEn2l2
-K3rEbiaO/PFYECvBQ/uPvFFlXzqJKp/kY07TUv+lzBjEp/hwFVyVaQYCqjkBk+vU
-0kpR8fNPhRtCiOHvNC2V9c0CHbLYnRJsypHLUSIpJt7OVqlEIeYzDA50HWKCeREI
-osr+6UkJ6cIenLpxpLZjiThMy86vACPN/Bl4oS1QuO87V37ObHgl1KH6PCLJO5ad
-1T45F8/A8OuaP8lJZmUQiAX3teWPr40yfET/p9V7eZlXPp6HQKsLo+lpfoBFyKDK
-hYtyh4hdcMvKAJuV5ZDByVp3AeW4pNx0VZvqJzA2vz4tRHVsfkqCbPKFFabQjpF8
-HGsR3KXz+6lCIPWx56vRtT0hqqYBlvmbc2V3MX1po/xs580+KTb1XseSJL7DZmqc
-O6+FXQ1edQCu1PMlNY0/5S2nq0oiEe9k7ZdYSED6VWhRT1/m3h1K7HyKORP/viW3
-mEUmFubFA4mL/UapIIBWvSv1oZGDClwsB4jbfqcL1jXXG2p4x/XNmjITDG3pX5l+
-KGt3pErWrRIeZ+/XoG8Aziht+5ftfWuTkCTMfYCufM2cev80w1vbhdu7dlgNK23E
-dWQoqR5A1Q4htYZQcFxG
-=UQPq
+iEYEAREIAAYFAlRP8awACgkQCaWpQKGI+9TidgCeIaxBGJgcg1NTJ0witoJpyNxX
+WpEAn3+91CNWozzj3eOBBwZofpC/UVGl
+=9O0O
 -----END PGP SIGNATURE-----
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