New beta version, remove adblock from old version as it was unstable

(Portage version: 2.0.51.22-r2)

6 files changed, 142 insertions, 6 deletions

diff --git a/www-client/epiphany-extensions/ChangeLog b/www-client/epiphany-extensions/ChangeLog
index 9ee63994b5e9..6ad39565a0da 100644
--- a/www-client/epiphany-extensions/ChangeLog
+++ b/www-client/epiphany-extensions/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/epiphany-extensions
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/ChangeLog,v 1.8 2005/07/07 09:01:48 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/ChangeLog,v 1.9 2005/08/19 20:19:22 joem Exp $
+
+*epiphany-extensions-1.7.4 (19 Aug 2005)
+
+  19 Aug 2005; Joe McCann <joem@gentoo.org>
+  +files/epiphany-extensions-1.7.4-fix_includes.patch,
+  epiphany-extensions-1.6.4.ebuild, +epiphany-extensions-1.7.4.ebuild:
+  new version, remove adblock extension from previous build
 
   07 Jul 2005; David Holm <dholm@gentoo.org>
   epiphany-extensions-1.6.4.ebuild:
diff --git a/www-client/epiphany-extensions/Manifest b/www-client/epiphany-extensions/Manifest
index 28ac59248e3e..a2caf785970b 100644
--- a/www-client/epiphany-extensions/Manifest
+++ b/www-client/epiphany-extensions/Manifest
@@ -1,8 +1,11 @@
-MD5 94f57c29256d28ccb8d42d932f47ce31 ChangeLog 1972
+MD5 adba9a5a39ecd1550da987157d2452b6 ChangeLog 2245
 MD5 82452a5693e265225e96d4222547dafa epiphany-extensions-1.6.0.ebuild 1210
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 7061b94b8add1b1d7d6e490efa38d48d epiphany-extensions-1.6.4.ebuild 1980
+MD5 b116a7c5559b2d9511ab47d5cde7d8ef epiphany-extensions-1.6.4.ebuild 1972
+MD5 74e3d27f056363ecf5e6c9467ea2e72a epiphany-extensions-1.7.4.ebuild 1990
 MD5 707f7a46f60ea0b7cf60bda490cdbf9e files/digest-epiphany-extensions-1.6.0 78
+MD5 372d4cda16db1e3215081c3a6d513141 files/digest-epiphany-extensions-1.6.4 78
 MD5 cc94941ad96bbbd969542ee260c77e4c files/epiphany-extensions-1.6.0-disable_bookmarks-tray_label.patch 1034
 MD5 6b4caa4057fe795d71689814affe5100 files/epiphany-extensions-1.6.0-fix_includes.patch 1412
-MD5 372d4cda16db1e3215081c3a6d513141 files/digest-epiphany-extensions-1.6.4 78
+MD5 62eba0080b13e7b9650d12374138a2de files/digest-epiphany-extensions-1.7.4 78
+MD5 facd371dca75721b247923b903369a05 files/epiphany-extensions-1.7.4-fix_includes.patch 2504
diff --git a/www-client/epiphany-extensions/epiphany-extensions-1.6.4.ebuild b/www-client/epiphany-extensions/epiphany-extensions-1.6.4.ebuild
index 1238e2f9e092..6d4abe8bc77d 100644
--- a/www-client/epiphany-extensions/epiphany-extensions-1.6.4.ebuild
+++ b/www-client/epiphany-extensions/epiphany-extensions-1.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/epiphany-extensions-1.6.4.ebuild,v 1.2 2005/07/07 09:01:48 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/epiphany-extensions-1.6.4.ebuild,v 1.3 2005/08/19 20:19:22 joem Exp $
 
 inherit eutils gnome2
 
@@ -39,7 +39,7 @@ USE_DESTDIR="1"
 DOCS="AUTHORS ChangeLog HACKING NEWS README"
 
 src_compile() {
-	local extensions="actions adblock bookmarks-tray certificates dashboard
+	local extensions="actions bookmarks-tray certificates dashboard
 	error-viewer extensions-manager-ui gestures page-info sample sample-mozilla
 	select-stylesheet sidebar smart-bookmarks tab-groups tab-states tabsmenu"
 
diff --git a/www-client/epiphany-extensions/epiphany-extensions-1.7.4.ebuild b/www-client/epiphany-extensions/epiphany-extensions-1.7.4.ebuild
new file mode 100644
index 000000000000..c364906ddc46
--- /dev/null
+++ b/www-client/epiphany-extensions/epiphany-extensions-1.7.4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/epiphany-extensions-1.7.4.ebuild,v 1.1 2005/08/19 20:19:22 joem Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Extensions for the Epiphany web browser"
+HOMEPAGE="http://www.gnome.org/projects/epiphany/extensions.html"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="debug firefox static"
+
+RDEPEND=">=www-client/epiphany-1.7.4
+	>=dev-libs/libxml2-2.6
+	>=dev-libs/glib-2.6
+	>=x11-libs/gtk+-2.6
+	>=gnome-base/libglade-2
+	app-text/opensp
+	!firefox? ( >=www-client/mozilla-1.7.3 )
+	firefox? ( >=www-client/mozilla-firefox-1.0.2-r1 )
+	dev-libs/libpcre
+	>=sys-apps/dbus-0.22"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.29"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-fix_includes.patch
+}
+
+USE_DESTDIR="1"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+src_compile() {
+	local extensions="actions adblock bookmarks-tray certificates dashboard
+	error-viewer extensions-manager-ui gestures greasemonkey page-info sample
+	sample-mozilla rss select-stylesheet sidebar python-console smart-bookmarks
+	tab-groups tab-states tabsmenu"
+
+	# The find extension doesn't compile against mozilla
+	#use firefox && extensions="${extensions} find"
+
+	if built_with_use www-client/epiphany dbus; then
+		extensions="${extensions} net-monitor"
+	else
+		ewarn
+		ewarn "In order to install the net-monitor extension, you need to"
+		ewarn "emerge www-client/epiphany with the 'dbus' USE flag enabled."
+		ewarn
+		ewarn "Skipping for now."
+		ewarn
+	fi
+
+	local list_exts=""
+	for ext in $extensions; do
+		[ "x${list_exts}" != "x" ] && list_exts="${list_exts},"
+		list_exts="${list_exts}${ext}"
+	done
+
+	G2CONF="${G2CONF} $(use_enable static) --with-extensions=${list_exts}"
+
+	if use firefox; then
+		G2CONF="${G2CONF} --with-mozilla=firefox"
+	else
+		G2CONF="${G2CONF} --with-mozilla=mozilla"
+	fi
+
+	gnome2_src_compile
+}
diff --git a/www-client/epiphany-extensions/files/digest-epiphany-extensions-1.7.4 b/www-client/epiphany-extensions/files/digest-epiphany-extensions-1.7.4
new file mode 100644
index 000000000000..633b0400ea6b
--- /dev/null
+++ b/www-client/epiphany-extensions/files/digest-epiphany-extensions-1.7.4
@@ -0,0 +1 @@
+MD5 d175f0747254595d369aa75baa64a0a4 epiphany-extensions-1.7.4.tar.bz2 592327
diff --git a/www-client/epiphany-extensions/files/epiphany-extensions-1.7.4-fix_includes.patch b/www-client/epiphany-extensions/files/epiphany-extensions-1.7.4-fix_includes.patch
new file mode 100644
index 000000000000..274701bab135
--- /dev/null
+++ b/www-client/epiphany-extensions/files/epiphany-extensions-1.7.4-fix_includes.patch
@@ -0,0 +1,49 @@
+diff -ur ../../epiphany-extensions-1.7.1/work/epiphany-extensions-1.7.1/extensions/adblock/mozilla/Makefile.in epiphany-extensions-1.7.1/extensions/adblock/mozilla/Makefile.in
+--- ../../epiphany-extensions-1.7.1/work/epiphany-extensions-1.7.1/extensions/adblock/mozilla/Makefile.in	2005-06-05 15:01:37.000000000 +0200
++++ epiphany-extensions-1.7.1/extensions/adblock/mozilla/Makefile.in	2005-06-20 23:59:23.000000000 +0200
+@@ -271,6 +271,8 @@
+ 	content		\
+ 	docshell	\
+ 	dom		\
++	necko\
++	webbrwsr\
+ 	xpcom
+ 
+ libadblockmozilla_la_CPPFLAGS = \
+Only in epiphany-extensions-1.7.1/extensions/adblock/mozilla: Makefile.in~
+diff -ur ../../epiphany-extensions-1.7.1/work/epiphany-extensions-1.7.1/extensions/error-viewer/mozilla/Makefile.in epiphany-extensions-1.7.1/extensions/error-viewer/mozilla/Makefile.in
+--- ../../epiphany-extensions-1.7.1/work/epiphany-extensions-1.7.1/extensions/error-viewer/mozilla/Makefile.in	2005-06-05 15:01:44.000000000 +0200
++++ epiphany-extensions-1.7.1/extensions/error-viewer/mozilla/Makefile.in	2005-06-20 23:58:12.000000000 +0200
+@@ -280,6 +280,7 @@
+ 	.		\
+ 	dom		\
+ 	jsconsole	\
++	webbrwsr\
+ 	necko
+ 
+ liberrorviewermozilla_la_CPPFLAGS = \
+Only in epiphany-extensions-1.7.1/extensions/error-viewer/mozilla: Makefile.in~
+diff -ur ../../epiphany-extensions-1.7.1/work/epiphany-extensions-1.7.1/extensions/page-info/mozilla/Makefile.in epiphany-extensions-1.7.1/extensions/page-info/mozilla/Makefile.in
+--- ../../epiphany-extensions-1.7.1/work/epiphany-extensions-1.7.1/extensions/page-info/mozilla/Makefile.in	2005-06-05 15:01:46.000000000 +0200
++++ epiphany-extensions-1.7.1/extensions/page-info/mozilla/Makefile.in	2005-06-20 23:58:33.000000000 +0200
+@@ -273,6 +273,7 @@
+ 	dom		\
+ 	layout		\
+ 	nkcache		\
++	pref\
+ 	necko		\
+ 	uconv		\
+ 	webbrwsr
+Only in epiphany-extensions-1.7.1/extensions/page-info/mozilla: Makefile.in~
+diff -ur ../../epiphany-extensions-1.7.1/work/epiphany-extensions-1.7.1/extensions/select-stylesheet/mozilla/Makefile.in epiphany-extensions-1.7.1/extensions/select-stylesheet/mozilla/Makefile.in
+--- ../../epiphany-extensions-1.7.1/work/epiphany-extensions-1.7.1/extensions/select-stylesheet/mozilla/Makefile.in	2005-06-05 15:01:48.000000000 +0200
++++ epiphany-extensions-1.7.1/extensions/select-stylesheet/mozilla/Makefile.in	2005-06-20 23:58:57.000000000 +0200
+@@ -267,6 +267,7 @@
+ mozilla_include_subdirs = \
+ 	.		\
+ 	necko		\
++	dom\
+ 	nkcache		\
+ 	webbrwsr
+ 
+Only in epiphany-extensions-1.7.1/extensions/select-stylesheet/mozilla: Makefile.in~