New version for GNOME 2.26. Clean up old revisions.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

4 files changed, 16 insertions, 190 deletions

diff --git a/www-client/epiphany-extensions/ChangeLog b/www-client/epiphany-extensions/ChangeLog
index a8a00d6e4844..2d372d720d4d 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/ChangeLog,v 1.109 2009/04/12 20:34:14 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/ChangeLog,v 1.110 2009/05/10 22:10:50 eva Exp $
+
+*epiphany-extensions-2.26.1 (10 May 2009)
+
+  10 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -epiphany-extensions-2.22.2-r10.ebuild,
+  -epiphany-extensions-2.24.1.ebuild,
+  -epiphany-extensions-2.24.1-r10.ebuild,
+  +epiphany-extensions-2.26.1.ebuild:
+  New version for GNOME 2.26. Clean up old revisions.
 
   12 Apr 2009; Friedrich Oslage <bluebird@gentoo.org>
   epiphany-extensions-2.24.3.ebuild, epiphany-extensions-2.24.3-r10.ebuild:
diff --git a/www-client/epiphany-extensions/epiphany-extensions-2.22.2-r10.ebuild b/www-client/epiphany-extensions/epiphany-extensions-2.22.2-r10.ebuild
deleted file mode 100644
index 036b1ac0e6ce..000000000000
--- a/www-client/epiphany-extensions/epiphany-extensions-2.22.2-r10.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2009 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.22.2-r10.ebuild,v 1.2 2009/01/08 16:50:55 armin76 Exp $
-
-inherit autotools eutils gnome2 python versionator
-
-MY_MAJORV=$(get_version_component_range 1-2)
-
-DESCRIPTION="Extensions for the Epiphany web browser"
-HOMEPAGE="http://www.gnome.org/projects/epiphany/extensions.html"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc -sparc ~x86"
-IUSE="dbus examples pcre python"
-
-RDEPEND=">=www-client/epiphany-${MY_MAJORV}
-	app-text/opensp
-	>=dev-libs/glib-2.15.5
-	>=gnome-base/gconf-2.0
-	>=dev-libs/libxml2-2.6
-	>=x11-libs/gtk+-2.11.6
-	>=gnome-base/libglade-2
-	=net-libs/xulrunner-1.9*
-	dbus? ( >=dev-libs/dbus-glib-0.34 )
-	pcre? ( >=dev-libs/libpcre-3.9-r2 )
-	python? ( >=dev-python/pygtk-2.11 )"
-DEPEND="${RDEPEND}
-	  gnome-base/gnome-common
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.20
-	>=app-text/gnome-doc-utils-0.3.2"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
-	local extensions=""
-
-	extensions="actions auto-reload auto-scroller certificates \
-				error-viewer extensions-manager-ui gestures java-console \
-				livehttpheaders page-info permissions push-scroller \
-				select-stylesheet sessionsaver sidebar smart-bookmarks \
-				tab-groups tab-states"
-
-	use dbus && extensions="${extensions} rss"
-
-	use pcre && extensions="${extensions} adblock greasemonkey"
-
-	use python && extensions="${extensions} python-console favicon cc-license-viewer epilicious"
-	use python && use examples && extensions="${extensions} sample-python"
-
-	use examples && extensions="${extensions} sample sample-mozilla"
-
-	G2CONF="${G2CONF} --with-extensions=$(echo "${extensions}" | sed -e 's/[[:space:]]\+/,/g')"
-
-	G2CONF="${G2CONF} --with-gecko=libxul-embedding"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-
-	# Don't remove sessionsaver, please.  -dang
-	epatch "${FILESDIR}"/${PN}-2.21.92-sessionsaver-v4.patch.gz
-	echo "extensions/sessionsaver/ephy-sessionsaver-extension.c" >> po/POTFILES.in
-	eautoreconf
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if use python; then
-		python_mod_optimize /usr/$(get_libdir)/epiphany/${MY_MAJORV}/extensions
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if use python; then
-		python_mod_cleanup /usr/$(get_libdir)/epiphany/${MY_MAJORV}/extensions
-	fi
-}
diff --git a/www-client/epiphany-extensions/epiphany-extensions-2.24.1.ebuild b/www-client/epiphany-extensions/epiphany-extensions-2.24.1.ebuild
deleted file mode 100644
index c9f8f44b3529..000000000000
--- a/www-client/epiphany-extensions/epiphany-extensions-2.24.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2009 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.24.1.ebuild,v 1.2 2009/02/02 05:58:14 jer Exp $
-
-inherit autotools eutils gnome2 python versionator
-
-MY_MAJORV=$(get_version_component_range 1-2)
-
-DESCRIPTION="Extensions for the Epiphany web browser"
-HOMEPAGE="http://www.gnome.org/projects/epiphany/extensions.html"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~sparc ~x86"
-IUSE="dbus examples pcre python xulrunner"
-
-RDEPEND=">=www-client/epiphany-${MY_MAJORV}
-	app-text/opensp
-	>=dev-libs/glib-2.15.5
-	>=gnome-base/gconf-2.0
-	>=dev-libs/libxml2-2.6
-	>=x11-libs/gtk+-2.11.6
-	>=gnome-base/libglade-2
-	xulrunner? ( =net-libs/xulrunner-1.8* )
-	!xulrunner? ( =www-client/mozilla-firefox-2* )
-	dbus? ( >=dev-libs/dbus-glib-0.34 )
-	pcre? ( >=dev-libs/libpcre-3.9-r2 )
-	python? ( >=dev-python/pygtk-2.11 )"
-DEPEND="${RDEPEND}
-	  gnome-base/gnome-common
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.20
-	>=app-text/gnome-doc-utils-0.3.2"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
-	local extensions=""
-
-	extensions="actions auto-reload auto-scroller certificates \
-				error-viewer extensions-manager-ui gestures java-console \
-				livehttpheaders page-info permissions push-scroller \
-				select-stylesheet sessionsaver sidebar smart-bookmarks \
-				tab-groups tab-states"
-
-	use dbus && extensions="${extensions} rss"
-
-	use pcre && extensions="${extensions} adblock greasemonkey"
-
-	use python && extensions="${extensions} python-console favicon cc-license-viewer epilicious"
-	use python && use examples && extensions="${extensions} sample-python"
-
-	use examples && extensions="${extensions} sample sample-mozilla"
-
-	G2CONF="${G2CONF} --with-extensions=$(echo "${extensions}" | sed -e 's/[[:space:]]\+/,/g')"
-
-	if use xulrunner; then
-		G2CONF="${G2CONF} --with-gecko=xulrunner"
-	else
-		G2CONF="${G2CONF} --with-gecko=firefox"
-
-		if ! built_with_use =www-client/mozilla-firefox-2* filepicker; then
-			ewarn "If you want the Certificate Management extension, please"
-			ewarn "rebuild www-client/mozilla-firefox with USE='filepicker'"
-		fi
-	fi
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-
-	# Don't remove sessionsaver, please.  -dang
-	epatch "${FILESDIR}"/${PN}-2.21.92-sessionsaver-v4.patch.gz
-	echo "extensions/sessionsaver/ephy-sessionsaver-extension.c" >> po/POTFILES.in
-
-	eautoreconf
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if use python; then
-		python_mod_optimize /usr/$(get_libdir)/epiphany/${MY_MAJORV}/extensions
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if use python; then
-		python_mod_cleanup /usr/$(get_libdir)/epiphany/${MY_MAJORV}/extensions
-	fi
-}
diff --git a/www-client/epiphany-extensions/epiphany-extensions-2.24.1-r10.ebuild b/www-client/epiphany-extensions/epiphany-extensions-2.26.1.ebuild
index a545f9959e9d..e0366664a503 100644
--- a/www-client/epiphany-extensions/epiphany-extensions-2.24.1-r10.ebuild
+++ b/www-client/epiphany-extensions/epiphany-extensions-2.26.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.24.1-r10.ebuild,v 1.3 2009/01/08 16:50:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/epiphany-extensions-2.26.1.ebuild,v 1.1 2009/05/10 22:10:50 eva Exp $
 
 inherit autotools eutils gnome2 python versionator
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnome.org/projects/epiphany/extensions.html"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 -sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 IUSE="dbus examples pcre python"
 
 RDEPEND=">=www-client/epiphany-${MY_MAJORV}
@@ -67,6 +67,9 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-2.21.92-sessionsaver-v4.patch.gz
 	echo "extensions/sessionsaver/ephy-sessionsaver-extension.c" >> po/POTFILES.in
 
+	# Fix building with libtool-1  bug #257337
+	rm m4/lt* m4/libtool.m4 m4/ltmain.m4
+
 	eautoreconf
 }
 
@@ -80,8 +83,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-
-	if use python; then
-		python_mod_cleanup /usr/$(get_libdir)/epiphany/${MY_MAJORV}/extensions
-	fi
+	python_mod_cleanup /usr/$(get_libdir)/epiphany/${MY_MAJORV}/extensions
 }