Re-add previous keywords to the ebuild. Removing old ebuilds.

(Portage version: 2.0.51.22-r2)

6 files changed, 42 insertions, 109 deletions

diff --git a/www-client/epiphany-extensions/ChangeLog b/www-client/epiphany-extensions/ChangeLog
index 6ad39565a0da..4750cf4bc952 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/ChangeLog,v 1.9 2005/08/19 20:19:22 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/ChangeLog,v 1.10 2005/08/22 00:32:01 leonardop Exp $
+
+*epiphany-extensions-1.7.4-r1 (22 Aug 2005)
+
+  22 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  -epiphany-extensions-1.7.4.ebuild, +epiphany-extensions-1.7.4-r1.ebuild:
+  Re-added previous keywords. Added 'pcre', 'dbus' and 'python' USE flags to
+  control compilation of special extensions. Removed the adblock extension
+  (bug #100618).
 
 *epiphany-extensions-1.7.4 (19 Aug 2005)
 
diff --git a/www-client/epiphany-extensions/Manifest b/www-client/epiphany-extensions/Manifest
index 47b1aa9bf1f6..b07e964b28c9 100644
--- a/www-client/epiphany-extensions/Manifest
+++ b/www-client/epiphany-extensions/Manifest
@@ -1,13 +1,11 @@
 MD5 47b1ec62015c10ed7ae23a33341e63d1 ChangeLog 2244
 MD5 82452a5693e265225e96d4222547dafa epiphany-extensions-1.6.0.ebuild 1210
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 e2281d1a43dee1f005d07cb43110aeb1 epiphany-extensions-1.6.4.ebuild 1971
-MD5 d1883b0297778d7f0cdcbbc01a6f198f epiphany-extensions-1.7.4.ebuild 1989
+MD5 eb8ca0e88debae720cad324d8692d375 epiphany-extensions-1.7.4-r1.ebuild 2152
 MD5 dd6a344b8baf9337432adbd7be531860 epiphany-extensions-1.6.4-r1.ebuild 1974
+MD5 62eba0080b13e7b9650d12374138a2de files/digest-epiphany-extensions-1.7.4-r1 78
 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 62eba0080b13e7b9650d12374138a2de files/digest-epiphany-extensions-1.7.4 78
 MD5 facd371dca75721b247923b903369a05 files/epiphany-extensions-1.7.4-fix_includes.patch 2504
 MD5 372d4cda16db1e3215081c3a6d513141 files/digest-epiphany-extensions-1.6.4-r1 78
diff --git a/www-client/epiphany-extensions/epiphany-extensions-1.6.4.ebuild b/www-client/epiphany-extensions/epiphany-extensions-1.7.4-r1.ebuild
index 6d4abe8bc77d..13d8ed844ffd 100644
--- a/www-client/epiphany-extensions/epiphany-extensions-1.6.4.ebuild
+++ b/www-client/epiphany-extensions/epiphany-extensions-1.7.4-r1.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.3 2005/08/19 20:19:22 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/epiphany-extensions-1.7.4-r1.ebuild,v 1.1 2005/08/22 00:32:01 leonardop Exp $
 
 inherit eutils gnome2
 
@@ -10,9 +10,9 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="debug firefox static"
+IUSE="dbus debug firefox pcre python static"
 
-RDEPEND=">=www-client/epiphany-1.6
+RDEPEND=">=www-client/epiphany-1.7.3
 	>=dev-libs/libxml2-2.6
 	>=dev-libs/glib-2.6
 	>=x11-libs/gtk+-2.6
@@ -20,56 +20,60 @@ RDEPEND=">=www-client/epiphany-1.6
 	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"
+	pcre? ( dev-libs/libpcre )
+	dbus? ( >=sys-apps/dbus-0.22 )
+	python? ( >=dev-lang/python-2.3 )"
 
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
+	>=dev-util/pkgconfig-0.9
 	>=dev-util/intltool-0.29"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${PN}-1.6.0-fix_includes.patch
-}
-
 USE_DESTDIR="1"
-
 DOCS="AUTHORS ChangeLog HACKING NEWS README"
 
-src_compile() {
-	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"
 
-	# The find extension doesn't compile against mozilla
-	use firefox && extensions="${extensions} find"
+pkg_setup() {
+	G2CONF="$(use_enable static)"
 
-	if built_with_use www-client/epiphany dbus; then
-		extensions="${extensions} net-monitor"
-	else
+	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"
+
+	if use dbus && ! built_with_use www-client/epiphany dbus; then
 		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 "To enable the extensions using dbus you neet to emerge"
+		ewarn "www-client/epiphany with the 'dbus' USE flag enabled as well."
 		ewarn
 		ewarn "Skipping for now."
 		ewarn
+	else
+		use dbus && extensions="${extensions} net-monitor rss"
 	fi
 
+	use pcre && extensions="${extensions} greasemonkey"
+	# adblock causes segmentation faults. See bug #100618.
+
+	use python && extensions="${extensions} python-console sample-python"
+
 	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}"
+	G2CONF="${G2CONF} --with-extensions=${list_exts}"
 
 	if use firefox; then
 		G2CONF="${G2CONF} --with-mozilla=firefox"
 	else
 		G2CONF="${G2CONF} --with-mozilla=mozilla"
 	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
 
-	gnome2_src_compile
+	epatch ${FILESDIR}/${P}-fix_includes.patch
 }
diff --git a/www-client/epiphany-extensions/epiphany-extensions-1.7.4.ebuild b/www-client/epiphany-extensions/epiphany-extensions-1.7.4.ebuild
deleted file mode 100644
index c364906ddc46..000000000000
--- a/www-client/epiphany-extensions/epiphany-extensions-1.7.4.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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.6.4 b/www-client/epiphany-extensions/files/digest-epiphany-extensions-1.6.4
deleted file mode 100644
index 3d8c8cdfe4d6..000000000000
--- a/www-client/epiphany-extensions/files/digest-epiphany-extensions-1.6.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0bc858d08d3f3a4609367505011787d9 epiphany-extensions-1.6.4.tar.bz2 563798
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-r1
index 633b0400ea6b..633b0400ea6b 100644
--- a/www-client/epiphany-extensions/files/digest-epiphany-extensions-1.7.4
+++ b/www-client/epiphany-extensions/files/digest-epiphany-extensions-1.7.4-r1