Version bump for Gnome 3.6.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key C6085806)

4 files changed, 26 insertions, 157 deletions

diff --git a/www-client/epiphany-extensions/ChangeLog b/www-client/epiphany-extensions/ChangeLog
index 700c8a4a087e..bf99a9063523 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/ChangeLog,v 1.159 2012/05/19 21:50:59 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/ChangeLog,v 1.160 2012/12/25 23:57:49 eva Exp $
+
+*epiphany-extensions-3.6.0 (25 Dec 2012)
+
+  25 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  -epiphany-extensions-2.30.1.ebuild, -epiphany-extensions-2.32.0.ebuild,
+  -epiphany-extensions-3.2.0-r1.ebuild, +epiphany-extensions-3.6.0.ebuild:
+  Version bump for Gnome 3.6.
 
 *epiphany-extensions-3.4.0 (19 May 2012)
 
diff --git a/www-client/epiphany-extensions/epiphany-extensions-2.30.1.ebuild b/www-client/epiphany-extensions/epiphany-extensions-2.30.1.ebuild
deleted file mode 100644
index 479c2424799d..000000000000
--- a/www-client/epiphany-extensions/epiphany-extensions-2.30.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2012 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.1.ebuild,v 1.9 2012/05/03 06:01:04 jdhore Exp $
-
-EAPI="2"
-
-inherit gnome2 eutils 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 ia64 ppc sparc x86"
-IUSE="dbus examples pcre"
-
-RDEPEND=">=www-client/epiphany-${MY_MAJORV}
-	app-text/opensp
-	>=dev-libs/glib-2.15.5:2
-	>=gnome-base/gconf-2.0:2
-	>=dev-libs/libxml2-2.6:2
-	>=x11-libs/gtk+-2.19.5:2
-	>=net-libs/webkit-gtk-1.1:2
-
-	dbus? ( >=dev-libs/dbus-glib-0.34 )
-	pcre? ( >=dev-libs/libpcre-3.9-r2 )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	>=app-text/gnome-doc-utils-0.3.2"
-# 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 examples && extensions="${extensions} sample"
-
-	G2CONF="${G2CONF}
-		--disable-maintainer-mode
-		--with-extensions=$(echo "${extensions}" | sed -e 's/[[:space:]]\+/,/g')"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Updated Spanish translation, fixes bug #323753
-	epatch "${FILESDIR}/${P}-fix-es_ES.patch"
-}
-
-src_install() {
-	gnome2_src_install
-	find "${D}" -name "*.la" -delete || die "remove of la files failed"
-}
diff --git a/www-client/epiphany-extensions/epiphany-extensions-2.32.0.ebuild b/www-client/epiphany-extensions/epiphany-extensions-2.32.0.ebuild
deleted file mode 100644
index 9936dd39b3e2..000000000000
--- a/www-client/epiphany-extensions/epiphany-extensions-2.32.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2012 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.32.0.ebuild,v 1.9 2012/05/03 06:01:04 jdhore Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-PYTHON_DEPEND="2"
-
-inherit gnome2 python
-
-DESCRIPTION="Extensions for the Epiphany web browser"
-HOMEPAGE="http://www.gnome.org/projects/epiphany/extensions.html"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ~ppc64 sparc x86"
-IUSE="dbus examples pcre"
-
-RDEPEND=">=www-client/epiphany-2.30.0
-	app-text/opensp
-	>=dev-libs/glib-2.15.5:2
-	>=gnome-base/gconf-2.0:2
-	>=dev-libs/libxml2-2.6:2
-	>=x11-libs/gtk+-2.21.6:2
-	>=net-libs/webkit-gtk-1.1:2
-
-	dbus? ( >=dev-libs/dbus-glib-0.34 )
-	pcre? ( >=dev-libs/libpcre-3.9-r2 )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	>=app-text/gnome-doc-utils-0.3.2"
-# eautoreconf dependencies:
-#	  gnome-base/gnome-common
-
-# 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 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_prepare() {
-	gnome2_src_prepare
-	python_convert_shebangs -r 2 .
-}
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
-}
diff --git a/www-client/epiphany-extensions/epiphany-extensions-3.2.0-r1.ebuild b/www-client/epiphany-extensions/epiphany-extensions-3.6.0.ebuild
index a0a2405d02a3..5c5ad12d683a 100644
--- a/www-client/epiphany-extensions/epiphany-extensions-3.2.0-r1.ebuild
+++ b/www-client/epiphany-extensions/epiphany-extensions-3.6.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 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.2.0-r1.ebuild,v 1.2 2012/05/03 06:01:04 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/epiphany-extensions-3.6.0.ebuild,v 1.1 2012/12/25 23:57:49 eva Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
@@ -16,7 +16,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="dbus examples pcre"
 
-RDEPEND=">=www-client/epiphany-3.2.0
+RDEPEND="
+	>=www-client/epiphany-3.6
 	app-text/opensp
 	>=dev-libs/glib-2.26.0:2
 	>=dev-libs/libxml2-2.6:2
@@ -26,17 +27,25 @@ RDEPEND=">=www-client/epiphany-3.2.0
 	dbus? (
 		>=dev-libs/dbus-glib-0.34
 		sys-apps/dbus )
-	pcre? ( >=dev-libs/libpcre-3.9-r2 )"
+	pcre? ( >=dev-libs/libpcre-3.9-r2 )
+"
 DEPEND="${RDEPEND}
+	>=app-text/gnome-doc-utils-0.3.2
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig
-	>=app-text/gnome-doc-utils-0.3.2
-
-	gnome-base/gnome-common"
+	gnome-base/gnome-common
+"
 # eautoreconf dependencies:
 #	  gnome-base/gnome-common
 
-pkg_setup() {
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=664369; needs eautoreconf
+	epatch "${FILESDIR}/${PN}-3.2.0-dbus-libs.patch"
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
 	local extensions=""
 	# XXX: Only enable default/useful extensions?
 	extensions="actions adblock auto-reload certificates \
@@ -49,14 +58,7 @@ pkg_setup() {
 	use examples && extensions="${extensions} sample"
 
 	G2CONF="${G2CONF}
-		--disable-schemas-compile
 		--with-extensions=$(echo "${extensions}" | sed -e 's/[[:space:]]\+/,/g')"
 	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-}
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=664369; needs eautoreconf
-	epatch "${FILESDIR}/${PN}-3.2.0-dbus-libs.patch"
-	eautoreconf
-	gnome2_src_prepare
+	gnome2_src_configure
 }