Add support for adblock extension as reported by Jani Kananen in bug #370081, the problem was fixed by upstream in newer glib versions time ago, RDEPENDing then on glib version I have used to confirm the original problem went away. Remove old.

Package-Manager: portage-2.1.9.50/cvs/Linux x86_64

3 files changed, 32 insertions, 27 deletions

diff --git a/www-client/epiphany-extensions/ChangeLog b/www-client/epiphany-extensions/ChangeLog
index e164bc91d2d4..184553eb7ecf 100644
--- a/www-client/epiphany-extensions/ChangeLog
+++ b/www-client/epiphany-extensions/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-client/epiphany-extensions
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/ChangeLog,v 1.147 2011/04/28 18:47:12 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/ChangeLog,v 1.148 2011/06/05 09:56:32 pacho Exp $
+
+*epiphany-extensions-2.32.0-r1 (05 Jun 2011)
+
+  05 Jun 2011; Pacho Ramos <pacho@gentoo.org>
+  -epiphany-extensions-2.30.2.ebuild, +epiphany-extensions-2.32.0-r1.ebuild:
+  Add support for adblock extension as reported by Jani Kananen in bug #370081,
+  the problem was fixed by upstream in newer glib versions time ago, RDEPENDing
+  then on glib version I have used to confirm the original problem went away.
+  Remove old.
 
   28 Apr 2011; Mark Loeser <halcy0n@gentoo.org>
   -epiphany-extensions-2.26.1-r1.ebuild:
diff --git a/www-client/epiphany-extensions/Manifest b/www-client/epiphany-extensions/Manifest
index af6393728a54..2ad07faeae8b 100644
--- a/www-client/epiphany-extensions/Manifest
+++ b/www-client/epiphany-extensions/Manifest
@@ -3,17 +3,16 @@ Hash: SHA1
 
 AUX epiphany-extensions-2.30.1-fix-es_ES.patch 4792 RMD160 47b5f80b0cfafba3b57877bbeb17d7798e86cd78 SHA1 6c73ee8fbfc5ab8871470cfa7065ca7c11d87666 SHA256 a2a8a073c2092cfdb1ecb82e6591109657a35f844553cef27bf5a91545679346
 DIST epiphany-extensions-2.30.1.tar.bz2 1565963 RMD160 47fec6abc2afc771282e9e80751e7cdca665f751 SHA1 b6ac443ab9fcf82dab53518a4af2f43828fd781a SHA256 2f91b34e5854df382bb30bf93ae469490a5321d1ad006ff45032e3127eddb63d
-DIST epiphany-extensions-2.30.2.tar.bz2 1565280 RMD160 4d96f8f180d861a00e4a7391a0cd1f45c0aef773 SHA1 e62bb53d17bf1ffc755c91061d4d8ea8eb880550 SHA256 bdd0aad473262f2ac780d34c09644d0dd0066cb01f2cc66b3d200b946fd2db27
 DIST epiphany-extensions-2.32.0.tar.bz2 1045984 RMD160 f4ff2a8b937486e8d5ac8571c52b1c8f34e9516e SHA1 20541ea312d1860886a8d377f26779a9bbc99ca6 SHA256 1d6ac9f24050f409812a1653156033c6c005c27bc590f2a54164715771a1e16e
 EBUILD epiphany-extensions-2.30.1.ebuild 2085 RMD160 f7f6365b489d25290ce6f31a0c8b5768881d9d3c SHA1 0d47ba3c94d98691c834df704cc92116b40bba61 SHA256 a8c640e67f703a61766426303388bec3da58ca5f9b15b06727c4f2f65586f99b
-EBUILD epiphany-extensions-2.30.2.ebuild 1958 RMD160 7ae79e7427dcc70b05b0123d059a7dc29df5fddb SHA1 28ad2bbd07c038bf125ae6f81f858a383bd6ab13 SHA256 9b1b90d9bbf4261e2f3bf279afd81a983830f64aa7043097d58254f110074765
+EBUILD epiphany-extensions-2.32.0-r1.ebuild 1841 RMD160 fb5dc57c6eb915ca124be872a1a983801dfb9149 SHA1 64c565a8ae5836a64780096b1b32b5edec35e52c SHA256 ee4f4e28e24106e34da62c79d0c3d954a19618a20558e28680320fd1eaf24d50
 EBUILD epiphany-extensions-2.32.0.ebuild 2033 RMD160 ff70d5f7f1f0e344fe6e99c8f33d4a04efc44809 SHA1 d8af66b45da39ea7b184f9720605fa0e975e38d9 SHA256 f0cb65b9c80c5cccc4f9d3a5199054d48df19b83955f3f5f3e3227c1ab873c43
-MISC ChangeLog 25108 RMD160 d38ad4aadd5e713d33b82a8502b80ae17bb5341a SHA1 09dc6e4396940d40b0fbe471c34d7f6cd0096ad5 SHA256 870189dfc1ff4b5cd0c4f515e07277fe21cf83b9369f6fcc1e5d20cc48a77189
+MISC ChangeLog 25528 RMD160 e034acc68cbcbf01b5d35642be6ec35a8a3da3a7 SHA1 3e54295ca41f55b295b361682df2ef118ac10af8 SHA256 35514954a75801f1f9f42197f9b7aa98a9c311545ca77e66f5f6bf07c12581d0
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk25tjUACgkQCRZPokWLroQYGgCgyuiVT4LpXtMI92rFIkspxC72
-y9oAn3fpj9YhmsLj9bsuSg+7ay+PADF5
-=d4O7
+iEYEARECAAYFAk3rUtUACgkQCaWpQKGI+9SP7QCfRnhnBAmpBHPJ51M8pIzDWk3T
+uswAn2tRRCm5iWG22G3Jg/oodCqSaAul
+=XjZo
 -----END PGP SIGNATURE-----
diff --git a/www-client/epiphany-extensions/epiphany-extensions-2.30.2.ebuild b/www-client/epiphany-extensions/epiphany-extensions-2.32.0-r1.ebuild
index 7c8e3bbd2d91..4df2de1af7fe 100644
--- a/www-client/epiphany-extensions/epiphany-extensions-2.30.2.ebuild
+++ b/www-client/epiphany-extensions/epiphany-extensions-2.32.0-r1.ebuild
@@ -1,27 +1,28 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/epiphany-extensions-2.30.2.ebuild,v 1.4 2011/03/21 23:24:54 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/epiphany-extensions-2.32.0-r1.ebuild,v 1.1 2011/06/05 09:56:32 pacho Exp $
 
-EAPI="2"
+EAPI="3"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+PYTHON_DEPEND="2"
 
-inherit gnome2 versionator
-
-MY_MAJORV=$(get_version_component_range 1-2)
+inherit gnome2 python
 
 DESCRIPTION="Extensions for the Epiphany web browser"
-HOMEPAGE="http://www.gnome.org/projects/epiphany/extensions.html"
+HOMEPAGE="http://projects.gnome.org/epiphany/extensions.html"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="dbus examples pcre"
 
-RDEPEND=">=www-client/epiphany-${MY_MAJORV}
+RDEPEND=">=www-client/epiphany-2.30.0
 	app-text/opensp
-	>=dev-libs/glib-2.15.5:2
+	>=dev-libs/glib-2.28.7:2
 	>=gnome-base/gconf-2.0:2
 	>=dev-libs/libxml2-2.6:2
-	>=x11-libs/gtk+-2.19.5:2
+	>=x11-libs/gtk+-2.21.6:2
 	>=net-libs/webkit-gtk-1.1:2
 
 	dbus? ( >=dev-libs/dbus-glib-0.34 )
@@ -33,33 +34,29 @@ DEPEND="${RDEPEND}
 # eautoreconf dependencies:
 #	  gnome-base/gnome-common
 
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-# FIXME: Open security issues:
-# FIXME: - adblock        ( https://bugzilla.gnome.org/show_bug.cgi?id=595255 )
 # FIXME: broken extensions:
 # FIXME: - session-saver  ( https://bugzilla.gnome.org/show_bug.cgi?id=316245 )
 
 pkg_setup() {
 	local extensions=""
-
 	extensions="actions auto-reload auto-scroller certificates \
 			   error-viewer extensions-manager-ui gestures html5tube \
 			   java-console livehttpheaders page-info permissions \
 			   push-scroller select-stylesheet \
 			   smart-bookmarks soup-fly tab-groups tab-states"
 	use dbus && extensions="${extensions} rss"
-
-	use pcre && extensions="${extensions} greasemonkey"
-
+	use pcre && extensions="${extensions} adblock greasemonkey"
 	use examples && extensions="${extensions} sample"
 
 	G2CONF="${G2CONF}
 		--disable-maintainer-mode
 		--with-extensions=$(echo "${extensions}" | sed -e 's/[[:space:]]\+/,/g')"
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+	python_set_active_version 2
 }
 
-src_install() {
-	gnome2_src_install
-	find "${D}" -name "*.la" -delete || die "remove of la files failed"
+src_prepare() {
+	gnome2_src_prepare
+	python_convert_shebangs -r 2 .
 }