Bump to 3.2.1 from the gnome overlay, drop old. Drop python dependency (epiphany-extensions have not used python since gnome-2 days). Notable changes: fixes adblock crash.

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

3 files changed, 24 insertions, 23 deletions

diff --git a/www-client/epiphany-extensions/ChangeLog b/www-client/epiphany-extensions/ChangeLog
index 44152e8928a2..306a1ea3f50a 100644
--- a/www-client/epiphany-extensions/ChangeLog
+++ b/www-client/epiphany-extensions/ChangeLog
@@ -1,6 +1,14 @@
 # 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.154 2011/10/30 17:36:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/ChangeLog,v 1.155 2011/11/06 05:02:41 tetromino Exp $
+
+*epiphany-extensions-3.2.0 (06 Nov 2011)
+
+  06 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -epiphany-extensions-3.0.0-r1.ebuild, +epiphany-extensions-3.2.0.ebuild:
+  Bump to 3.2.1 from the gnome overlay, drop old. Drop python dependency
+  (epiphany-extensions have not used python since gnome-2 days). Notable
+  changes: fixes adblock crash.
 
   30 Oct 2011; Raúl Porcel <armin76@gentoo.org>
   epiphany-extensions-2.32.0-r1.ebuild:
diff --git a/www-client/epiphany-extensions/Manifest b/www-client/epiphany-extensions/Manifest
index 5d28a6c5ab3a..f0ccc4dd8ac7 100644
--- a/www-client/epiphany-extensions/Manifest
+++ b/www-client/epiphany-extensions/Manifest
@@ -1,20 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 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.32.0.tar.bz2 1045984 RMD160 f4ff2a8b937486e8d5ac8571c52b1c8f34e9516e SHA1 20541ea312d1860886a8d377f26779a9bbc99ca6 SHA256 1d6ac9f24050f409812a1653156033c6c005c27bc590f2a54164715771a1e16e
-DIST epiphany-extensions-3.0.0.tar.bz2 1598864 RMD160 bb0d2a3d3ab8f4150fce6b1f9562185510555b48 SHA1 0603cb954532265fa2f3b9765109a79216c91199 SHA256 c9984de0912b307fecd0232135c0e3d8c7f0859867b9693221ff12d1c483b724
+DIST epiphany-extensions-3.2.0.tar.xz 1403132 RMD160 9692e18ace17f40ac5ef506bfc67c561619678ec SHA1 0e9eb9f176e3c7c45d57f7885661af986f458eee SHA256 0707c9109bc6070f5f4e6ef3a9653e18ad5200eb57f396852b4c13cbac69baae
 EBUILD epiphany-extensions-2.30.1.ebuild 2085 RMD160 f7f6365b489d25290ce6f31a0c8b5768881d9d3c SHA1 0d47ba3c94d98691c834df704cc92116b40bba61 SHA256 a8c640e67f703a61766426303388bec3da58ca5f9b15b06727c4f2f65586f99b
 EBUILD epiphany-extensions-2.32.0-r1.ebuild 1837 RMD160 af01dde8ae6d830323ea16acce946d3eed983025 SHA1 1328d8b6b7c8daf80cfec1c227dd8dbcfa393f45 SHA256 6bc1e23ffcdce5abc167be7270986b595d167ad7cbc60d065aed94673e8efc3c
 EBUILD epiphany-extensions-2.32.0.ebuild 2032 RMD160 a4a7a9f530b48caf6e531fce4863f79652b9224c SHA1 a605d90fd7722d2a61cde6ae052e1a646c1e8a14 SHA256 f6a9578217fa8a55436f4dfca7daf83644a5cba22925e3cae2cd641554e2b4b8
-EBUILD epiphany-extensions-3.0.0-r1.ebuild 1743 RMD160 86088d7d9c73bd11833947101b1b403b57b90c4b SHA1 e1d92afc291fa36284d764df7032bd2d54ae9599 SHA256 28293a5376ff203edbaac809921e94604472b106c24695f7a7be6ba0958efbdc
-MISC ChangeLog 26330 RMD160 1cf36750ca68fb1fec890cbc64aa5aebe37c2842 SHA1 3948a520fef0b8157b5e418b2fdf2002ba6a52d7 SHA256 90909103cf189e0ca27eb544f22b2a9275f0a98cf81bc9f36f1ee2889e4c117a
+EBUILD epiphany-extensions-3.2.0.ebuild 1605 RMD160 aee9949cfd93947f3c9bcb436aa541e068cf5f9d SHA1 e02618589ea9de92b0aa8dc0e91f8fc77b8ef058 SHA256 3760a32d8e77d99a682dcd53c507adfd1fc0656268d60bc6d4f3321125e91eb1
+MISC ChangeLog 26687 RMD160 6e133ec72df3d7d881ffdb0797dc67fdf091599a SHA1 467cd0bc66e6f3f5d0c478817feb3b7b5f7fd2cf SHA256 44f4fa99ef08753eff30344175fe3a97e147ea63b829a2690fd318b59c9d68bc
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6tizMACgkQuQc30/atMkCHigCfT+RAioStdzt0XEv+MNIvnJNj
-7YQAnjElGJ/f1vXTlJkadnJklTH/ZdZN
-=xv//
+iF4EAREIAAYFAk62FPcACgkQdjK8w9WeBnCYBgEAhyHQDC7PHBWLHliJTMN8M54T
+QnucqRufnOWPaPZdvfcA/ie8qCMLrCzPWV1NmaJlhvax5Vk95P45hYSQteyL2xcz
+=XJSq
 -----END PGP SIGNATURE-----
diff --git a/www-client/epiphany-extensions/epiphany-extensions-3.0.0-r1.ebuild b/www-client/epiphany-extensions/epiphany-extensions-3.2.0.ebuild
index 24ffad04048b..688cd130f277 100644
--- a/www-client/epiphany-extensions/epiphany-extensions-3.0.0-r1.ebuild
+++ b/www-client/epiphany-extensions/epiphany-extensions-3.2.0.ebuild
@@ -1,13 +1,12 @@
 # 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-3.0.0-r1.ebuild,v 1.1 2011/08/19 14:55:28 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/epiphany-extensions-3.2.0.ebuild,v 1.1 2011/11/06 05:02:41 tetromino Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2"
 
-inherit gnome2 python
+inherit gnome2
 
 DESCRIPTION="Extensions for the Epiphany web browser"
 HOMEPAGE="http://www.gnome.org/projects/epiphany/extensions.html"
@@ -17,14 +16,16 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="dbus examples pcre"
 
-RDEPEND=">=www-client/epiphany-3.0.0
+RDEPEND=">=www-client/epiphany-3.2.0
 	app-text/opensp
 	>=dev-libs/glib-2.26.0:2
 	>=dev-libs/libxml2-2.6:2
 	>=x11-libs/gtk+-2.90.4:3
 	net-libs/webkit-gtk:3
 
-	dbus? ( >=dev-libs/dbus-glib-0.34 )
+	dbus? (
+		>=dev-libs/dbus-glib-0.34
+		sys-apps/dbus )
 	pcre? ( >=dev-libs/libpcre-3.9-r2 )"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
@@ -47,14 +48,6 @@ pkg_setup() {
 
 	G2CONF="${G2CONF}
 		--disable-schemas-compile
-		--disable-maintainer-mode
 		--with-extensions=$(echo "${extensions}" | sed -e 's/[[:space:]]\+/,/g')"
 	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-	python_set_active_version 2
-}
-
-src_prepare() {
-	gnome2_src_prepare
-	python_convert_shebangs -r 2 .
 }