New version for GNOME 2.26. Clean up old revisions.

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

9 files changed, 103 insertions, 463 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index 99356c59e547..b976ca988405 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for www-client/epiphany
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.207 2009/04/27 14:34:58 jer Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.208 2009/05/10 22:07:57 eva Exp $
+
+*epiphany-2.26.1 (10 May 2009)
+
+  10 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -epiphany-2.22.3-r1.ebuild, -epiphany-2.22.3-r2.ebuild,
+  -epiphany-2.22.3-r11.ebuild, -epiphany-2.22.3-r12.ebuild,
+  -epiphany-2.24.2.1.ebuild, -epiphany-2.24.2.1-r10.ebuild,
+  +files/epiphany-2.26.0-xulrunner191.patch, +epiphany-2.26.1.ebuild,
+  +files/epiphany-2.26.1-automagic-libcanberra.patch:
+  New version for GNOME 2.26. Clean up old revisions.
 
   27 Apr 2009; Jeroen Roovers <jer@gentoo.org> epiphany-2.24.3-r10:
   Stable for HPPA (bug #260063).
diff --git a/www-client/epiphany/epiphany-2.22.3-r1.ebuild b/www-client/epiphany/epiphany-2.22.3-r1.ebuild
deleted file mode 100644
index d01abb5575f1..000000000000
--- a/www-client/epiphany/epiphany-2.22.3-r1.ebuild
+++ /dev/null
@@ -1,96 +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/epiphany-2.22.3-r1.ebuild,v 1.8 2009/01/10 00:30:29 josejx Exp $
-
-inherit gnome2 eutils multilib
-
-DESCRIPTION="GNOME webbrowser based on the mozilla rendering engine"
-HOMEPAGE="http://www.gnome.org/projects/epiphany/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="avahi doc networkmanager python spell xulrunner"
-
-# This release should work with xulrunner 1.9, but this revision is a
-# stable candidate, so stick with 1.8 here.
-# xulrunner-1.9 can be achieved via --with-engine=xulrunner, while
-# --with-engine=mozilla goes with 1.8
-
-RDEPEND=">=dev-libs/glib-2.16.0
-	>=x11-libs/gtk+-2.12.0
-	>=dev-libs/libxml2-2.6.12
-	>=dev-libs/libxslt-1.1.7
-	>=gnome-base/libglade-2.3.1
-	>=gnome-base/libgnome-2.14
-	>=gnome-base/libgnomeui-2.14
-	>=gnome-base/gnome-desktop-2.9.91
-	>=x11-libs/startup-notification-0.5
-	>=x11-libs/libnotify-0.4
-	>=dev-libs/dbus-glib-0.71
-	>=gnome-base/gconf-2
-	>=app-text/iso-codes-0.35
-	avahi? ( >=net-dns/avahi-0.6.22 )
-	networkmanager? ( net-misc/networkmanager )
-	!xulrunner? ( =www-client/mozilla-firefox-2* )
-	xulrunner? ( =net-libs/xulrunner-1.8* )
-	python? (
-		>=dev-lang/python-2.3
-		>=dev-python/pygtk-2.7.1
-		>=dev-python/gnome-python-2.6
-	)
-	spell? ( app-text/enchant )
-	x11-themes/gnome-icon-theme"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	>=app-text/gnome-doc-utils-0.3.2
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--with-engine=mozilla
-		--enable-certificate-manager
-		--with-distributor-name=Gentoo
-		$(use_enable avahi zeroconf)
-		$(use_enable networkmanager network-manager)
-		$(use_enable spell spell-checker)
-		$(use_enable python)"
-
-	if use xulrunner; then
-		G2CONF="${G2CONF} --with-gecko=xulrunner"
-	else
-		G2CONF="${G2CONF} --with-gecko=firefox"
-	fi
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# build fix with firefox 2.0 (bug #230834)
-	epatch "${FILESDIR}/${P}-firefox2.0-header-fix.patch"
-
-	# fix libnotify crasher (bug #250031)
-	epatch "${FILESDIR}/${P}-notify-crash-fix.patch"
-}
-
-src_compile() {
-	addpredict /usr/$(get_libdir)/mozilla-firefox/components/xpti.dat
-	addpredict /usr/$(get_libdir)/mozilla-firefox/components/xpti.dat.tmp
-	addpredict /usr/$(get_libdir)/mozilla-firefox/components/compreg.dat.tmp
-
-	addpredict /usr/$(get_libdir)/xulrunner/components/xpti.dat
-	addpredict /usr/$(get_libdir)/xulrunner/components/xpti.dat.tmp
-	addpredict /usr/$(get_libdir)/xulrunner/components/compreg.dat.tmp
-
-	# Why are these write-opened per bug #228589 and bug #253043
-	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat
-	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat.tmp
-	addpredict /usr/$(get_libdir)/mozilla/components/compreg.dat.tmp
-
-	gnome2_src_compile
-}
diff --git a/www-client/epiphany/epiphany-2.22.3-r11.ebuild b/www-client/epiphany/epiphany-2.22.3-r11.ebuild
deleted file mode 100644
index 89ebe59ce4bc..000000000000
--- a/www-client/epiphany/epiphany-2.22.3-r11.ebuild
+++ /dev/null
@@ -1,80 +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/epiphany-2.22.3-r11.ebuild,v 1.3 2009/01/08 16:47:31 armin76 Exp $
-
-inherit gnome2 eutils multilib
-
-DESCRIPTION="GNOME webbrowser based on the mozilla rendering engine"
-HOMEPAGE="http://www.gnome.org/projects/epiphany/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86"
-IUSE="avahi doc networkmanager python spell"
-
-# This revision is meant to work with xulrunner 1.9, an earlier revision
-# is the earlier stable candidate against xulrunner-1.8 and co.
-
-RDEPEND=">=dev-libs/glib-2.16.0
-	>=x11-libs/gtk+-2.12.0
-	>=dev-libs/libxml2-2.6.12
-	>=dev-libs/libxslt-1.1.7
-	>=gnome-base/libglade-2.3.1
-	>=gnome-base/libgnome-2.14
-	>=gnome-base/libgnomeui-2.14
-	>=gnome-base/gnome-desktop-2.9.91
-	>=x11-libs/startup-notification-0.5
-	>=x11-libs/libnotify-0.4
-	>=dev-libs/dbus-glib-0.71
-	>=gnome-base/gconf-2
-	>=app-text/iso-codes-0.35
-	avahi? ( >=net-dns/avahi-0.6.22 )
-	networkmanager? ( net-misc/networkmanager )
-	=net-libs/xulrunner-1.9*
-	python? (
-		>=dev-lang/python-2.3
-		>=dev-python/pygtk-2.7.1
-		>=dev-python/gnome-python-2.6
-	)
-	spell? ( app-text/enchant )
-	x11-themes/gnome-icon-theme"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	>=app-text/gnome-doc-utils-0.3.2
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--with-gecko=libxul-embedding
-		--enable-certificate-manager
-		--with-distributor-name=Gentoo
-		$(use_enable avahi zeroconf)
-		$(use_enable networkmanager network-manager)
-		$(use_enable spell spell-checker)
-		$(use_enable python)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# fix libnotify crasher (bug #250031)
-	epatch "${FILESDIR}/${P}-notify-crash-fix.patch"
-}
-
-src_compile() {
-	addpredict /usr/$(get_libdir)/xulrunner-1.9/components/xpti.dat
-	addpredict /usr/$(get_libdir)/xulrunner-1.9/components/xpti.dat.tmp
-	addpredict /usr/$(get_libdir)/xulrunner-1.9/components/compreg.dat.tmp
-
-	# Why are these write-opened per bug #228589 and bug #253043
-	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat
-	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat.tmp
-	addpredict /usr/$(get_libdir)/mozilla/components/compreg.dat.tmp
-
-	gnome2_src_compile
-}
diff --git a/www-client/epiphany/epiphany-2.22.3-r12.ebuild b/www-client/epiphany/epiphany-2.22.3-r12.ebuild
deleted file mode 100644
index 1b6d9e9c2482..000000000000
--- a/www-client/epiphany/epiphany-2.22.3-r12.ebuild
+++ /dev/null
@@ -1,83 +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/epiphany-2.22.3-r12.ebuild,v 1.1 2009/02/24 16:59:08 dang Exp $
-
-inherit gnome2 eutils multilib
-
-DESCRIPTION="GNOME webbrowser based on the mozilla rendering engine"
-HOMEPAGE="http://www.gnome.org/projects/epiphany/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86"
-IUSE="avahi doc networkmanager python spell"
-
-# This revision is meant to work with xulrunner 1.9, an earlier revision
-# is the earlier stable candidate against xulrunner-1.8 and co.
-
-RDEPEND=">=dev-libs/glib-2.16.0
-	>=x11-libs/gtk+-2.12.0
-	>=dev-libs/libxml2-2.6.12
-	>=dev-libs/libxslt-1.1.7
-	>=gnome-base/libglade-2.3.1
-	>=gnome-base/libgnome-2.14
-	>=gnome-base/libgnomeui-2.14
-	>=gnome-base/gnome-desktop-2.9.91
-	>=x11-libs/startup-notification-0.5
-	>=x11-libs/libnotify-0.4
-	>=dev-libs/dbus-glib-0.71
-	>=gnome-base/gconf-2
-	>=app-text/iso-codes-0.35
-	avahi? ( >=net-dns/avahi-0.6.22 )
-	networkmanager? ( net-misc/networkmanager )
-	=net-libs/xulrunner-1.9*
-	python? (
-		>=dev-lang/python-2.3
-		>=dev-python/pygtk-2.7.1
-		>=dev-python/gnome-python-2.6
-	)
-	spell? ( app-text/enchant )
-	x11-themes/gnome-icon-theme"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	>=app-text/gnome-doc-utils-0.3.2
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--with-gecko=libxul-embedding
-		--enable-certificate-manager
-		--with-distributor-name=Gentoo
-		$(use_enable avahi zeroconf)
-		$(use_enable networkmanager network-manager)
-		$(use_enable spell spell-checker)
-		$(use_enable python)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# fix libnotify crasher (bug #250031)
-	epatch "${FILESDIR}/${P}-notify-crash-fix.patch"
-
-	# sanitize python path.  bug #257000
-	epatch "${FILESDIR}"/${P}-CVE-2008-5985.patch
-}
-
-src_compile() {
-	addpredict /usr/$(get_libdir)/xulrunner-1.9/components/xpti.dat
-	addpredict /usr/$(get_libdir)/xulrunner-1.9/components/xpti.dat.tmp
-	addpredict /usr/$(get_libdir)/xulrunner-1.9/components/compreg.dat.tmp
-
-	# Why are these write-opened per bug #228589 and bug #253043
-	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat
-	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat.tmp
-	addpredict /usr/$(get_libdir)/mozilla/components/compreg.dat.tmp
-
-	gnome2_src_compile
-}
diff --git a/www-client/epiphany/epiphany-2.22.3-r2.ebuild b/www-client/epiphany/epiphany-2.22.3-r2.ebuild
deleted file mode 100644
index 33102fc3341f..000000000000
--- a/www-client/epiphany/epiphany-2.22.3-r2.ebuild
+++ /dev/null
@@ -1,99 +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/epiphany-2.22.3-r2.ebuild,v 1.6 2009/02/26 17:31:07 ranger Exp $
-
-inherit gnome2 eutils multilib
-
-DESCRIPTION="GNOME webbrowser based on the mozilla rendering engine"
-HOMEPAGE="http://www.gnome.org/projects/epiphany/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="avahi doc networkmanager python spell xulrunner"
-
-# This release should work with xulrunner 1.9, but this revision is a
-# stable candidate, so stick with 1.8 here.
-# xulrunner-1.9 can be achieved via --with-engine=xulrunner, while
-# --with-engine=mozilla goes with 1.8
-
-RDEPEND=">=dev-libs/glib-2.16.0
-	>=x11-libs/gtk+-2.12.0
-	>=dev-libs/libxml2-2.6.12
-	>=dev-libs/libxslt-1.1.7
-	>=gnome-base/libglade-2.3.1
-	>=gnome-base/libgnome-2.14
-	>=gnome-base/libgnomeui-2.14
-	>=gnome-base/gnome-desktop-2.9.91
-	>=x11-libs/startup-notification-0.5
-	>=x11-libs/libnotify-0.4
-	>=dev-libs/dbus-glib-0.71
-	>=gnome-base/gconf-2
-	>=app-text/iso-codes-0.35
-	avahi? ( >=net-dns/avahi-0.6.22 )
-	networkmanager? ( net-misc/networkmanager )
-	!xulrunner? ( =www-client/mozilla-firefox-2* )
-	xulrunner? ( =net-libs/xulrunner-1.8* )
-	python? (
-		>=dev-lang/python-2.3
-		>=dev-python/pygtk-2.7.1
-		>=dev-python/gnome-python-2.6
-	)
-	spell? ( app-text/enchant )
-	x11-themes/gnome-icon-theme"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	>=app-text/gnome-doc-utils-0.3.2
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--with-engine=mozilla
-		--enable-certificate-manager
-		--with-distributor-name=Gentoo
-		$(use_enable avahi zeroconf)
-		$(use_enable networkmanager network-manager)
-		$(use_enable spell spell-checker)
-		$(use_enable python)"
-
-	if use xulrunner; then
-		G2CONF="${G2CONF} --with-gecko=xulrunner"
-	else
-		G2CONF="${G2CONF} --with-gecko=firefox"
-	fi
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# build fix with firefox 2.0 (bug #230834)
-	epatch "${FILESDIR}/${P}-firefox2.0-header-fix.patch"
-
-	# fix libnotify crasher (bug #250031)
-	epatch "${FILESDIR}/${P}-notify-crash-fix.patch"
-
-	# sanitize python path.  bug #257000
-	epatch "${FILESDIR}"/${P}-CVE-2008-5985.patch
-}
-
-src_compile() {
-	addpredict /usr/$(get_libdir)/mozilla-firefox/components/xpti.dat
-	addpredict /usr/$(get_libdir)/mozilla-firefox/components/xpti.dat.tmp
-	addpredict /usr/$(get_libdir)/mozilla-firefox/components/compreg.dat.tmp
-
-	addpredict /usr/$(get_libdir)/xulrunner/components/xpti.dat
-	addpredict /usr/$(get_libdir)/xulrunner/components/xpti.dat.tmp
-	addpredict /usr/$(get_libdir)/xulrunner/components/compreg.dat.tmp
-
-	# Why are these write-opened per bug #228589 and bug #253043
-	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat
-	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat.tmp
-	addpredict /usr/$(get_libdir)/mozilla/components/compreg.dat.tmp
-
-	gnome2_src_compile
-}
diff --git a/www-client/epiphany/epiphany-2.24.2.1.ebuild b/www-client/epiphany/epiphany-2.24.2.1.ebuild
deleted file mode 100644
index aaef638c9643..000000000000
--- a/www-client/epiphany/epiphany-2.24.2.1.ebuild
+++ /dev/null
@@ -1,87 +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/epiphany-2.24.2.1.ebuild,v 1.3 2009/01/29 17:03:45 jer Exp $
-
-inherit gnome2 eutils multilib
-
-DESCRIPTION="GNOME webbrowser based on the mozilla rendering engine"
-HOMEPAGE="http://www.gnome.org/projects/epiphany/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~sparc ~x86"
-IUSE="avahi doc networkmanager python spell xulrunner"
-
-RDEPEND=">=dev-libs/glib-2.18.0
-	>=x11-libs/gtk+-2.14.0
-	>=dev-libs/libxml2-2.6.12
-	>=dev-libs/libxslt-1.1.7
-	>=gnome-base/libglade-2.3.1
-	>=gnome-base/libgnome-2.14
-	>=gnome-base/libgnomeui-2.14
-	>=gnome-base/gnome-desktop-2.9.91
-	>=x11-libs/startup-notification-0.5
-	>=x11-libs/libnotify-0.4
-	>=media-libs/libcanberra-0.3
-	>=dev-libs/dbus-glib-0.71
-	>=gnome-base/gconf-2
-	>=app-text/iso-codes-0.35
-	avahi? ( >=net-dns/avahi-0.6.22 )
-	networkmanager? ( net-misc/networkmanager )
-	!xulrunner? ( =www-client/mozilla-firefox-2* )
-	xulrunner? ( =net-libs/xulrunner-1.8* )
-	python? (
-		>=dev-lang/python-2.3
-		>=dev-python/pygtk-2.7.1
-		>=dev-python/gnome-python-2.6
-	)
-	spell? ( app-text/enchant )
-	x11-themes/gnome-icon-theme"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40
-	>=app-text/gnome-doc-utils-0.3.2
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-
-pkg_setup() {
-	# FIXME: I'm automagic
-	if ! built_with_use media-libs/libcanberra gtk; then
-		eerror "You need to rebuild media-libs/libcanberra with gtk support."
-		die "Rebuild media-libs/libcanberra with USE='gtk'"
-	fi
-
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--enable-certificate-manager
-		--with-distributor-name=Gentoo
-		$(use_enable avahi zeroconf)
-		$(use_enable networkmanager network-manager)
-		$(use_enable spell spell-checker)
-		$(use_enable python)"
-
-	if use xulrunner; then
-		G2CONF="${G2CONF} --with-gecko=xulrunner"
-	else
-		G2CONF="${G2CONF} --with-gecko=firefox"
-	fi
-}
-
-src_compile() {
-	addpredict /usr/$(get_libdir)/mozilla-firefox/components/xpti.dat
-	addpredict /usr/$(get_libdir)/mozilla-firefox/components/xpti.dat.tmp
-	addpredict /usr/$(get_libdir)/mozilla-firefox/components/compreg.dat.tmp
-
-	addpredict /usr/$(get_libdir)/xulrunner/components/xpti.dat
-	addpredict /usr/$(get_libdir)/xulrunner/components/xpti.dat.tmp
-	addpredict /usr/$(get_libdir)/xulrunner/components/compreg.dat.tmp
-
-	# Why are these write-opened per bug #228589 and bug #253043
-	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat
-	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat.tmp
-	addpredict /usr/$(get_libdir)/mozilla/components/compreg.dat.tmp
-
-	gnome2_src_compile
-}
diff --git a/www-client/epiphany/epiphany-2.24.2.1-r10.ebuild b/www-client/epiphany/epiphany-2.26.1.ebuild
index d7c5c17eeadd..22a1e73ec05e 100644
--- a/www-client/epiphany/epiphany-2.24.2.1-r10.ebuild
+++ b/www-client/epiphany/epiphany-2.26.1.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.24.2.1-r10.ebuild,v 1.3 2009/01/08 16:47:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.26.1.ebuild,v 1.1 2009/05/10 22:07:57 eva Exp $
 
-EAPI="1"
+EAPI="2"
 
-inherit gnome2 eutils multilib
+inherit gnome2 eutils multilib autotools
 
 DESCRIPTION="GNOME webbrowser based on the mozilla rendering engine"
 HOMEPAGE="http://www.gnome.org/projects/epiphany/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 -sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="avahi doc networkmanager python spell"
 
 RDEPEND=">=dev-libs/glib-2.18.0
-	>=x11-libs/gtk+-2.14.0
+	>=x11-libs/gtk+-2.16.0
 	>=dev-libs/libxml2-2.6.12
 	>=dev-libs/libxslt-1.1.7
 	>=gnome-base/libglade-2.3.1
@@ -24,7 +24,7 @@ RDEPEND=">=dev-libs/glib-2.18.0
 	>=gnome-base/gnome-desktop-2.9.91
 	>=x11-libs/startup-notification-0.5
 	>=x11-libs/libnotify-0.4
-	>=media-libs/libcanberra-0.3
+	>=media-libs/libcanberra-0.3[gtk]
 	>=dev-libs/dbus-glib-0.71
 	>=gnome-base/gconf-2
 	>=app-text/iso-codes-0.35
@@ -34,8 +34,7 @@ RDEPEND=">=dev-libs/glib-2.18.0
 	python? (
 		>=dev-lang/python-2.3
 		>=dev-python/pygtk-2.7.1
-		>=dev-python/gnome-python-2.6
-	)
+		>=dev-python/gnome-python-2.6 )
 	spell? ( app-text/enchant )
 	x11-themes/gnome-icon-theme"
 DEPEND="${RDEPEND}
@@ -48,24 +47,35 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
 
 pkg_setup() {
-	# FIXME: I'm automagic
-	if ! built_with_use media-libs/libcanberra gtk; then
-		eerror "You need to rebuild media-libs/libcanberra with gtk support."
-		die "Rebuild media-libs/libcanberra with USE='gtk'"
-	fi
-
 	G2CONF="${G2CONF}
 		--disable-scrollkeeper
 		--with-gecko=libxul-embedding
 		--enable-certificate-manager
 		--with-distributor-name=Gentoo
+		--enable-canberra
 		$(use_enable avahi zeroconf)
 		$(use_enable networkmanager network-manager)
 		$(use_enable spell spell-checker)
 		$(use_enable python)"
 }
 
-src_compile() {
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix compilation with xulrunner 1.9.1, bug #263990
+	epatch "${FILESDIR}/${PN}-2.26.0-xulrunner191.patch"
+
+	# Fix libcanberra automagic support, bug #266232
+	epatch "${FILESDIR}/${P}-automagic-libcanberra.patch"
+
+	# Make it libtool-1 compatible
+	rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+}
+
+src_configure() {
 	addpredict /usr/$(get_libdir)/xulrunner-1.9/components/xpti.dat
 	addpredict /usr/$(get_libdir)/xulrunner-1.9/components/xpti.dat.tmp
 	addpredict /usr/$(get_libdir)/xulrunner-1.9/components/compreg.dat.tmp
@@ -75,5 +85,5 @@ src_compile() {
 	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat.tmp
 	addpredict /usr/$(get_libdir)/mozilla/components/compreg.dat.tmp
 
-	gnome2_src_compile
+	gnome2_src_configure
 }
diff --git a/www-client/epiphany/files/epiphany-2.26.0-xulrunner191.patch b/www-client/epiphany/files/epiphany-2.26.0-xulrunner191.patch
new file mode 100644
index 000000000000..c3ba4d4a588d
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-2.26.0-xulrunner191.patch
@@ -0,0 +1,17 @@
+---
+https://bugs.gentoo.org/show_bug.cgi?id=263990
+
+Fix compilation against xulrunner 1.9.1_beta3
+
+diff --git a/embed/mozilla/MozRegisterComponents.cpp b/embed/mozilla/MozRegisterComponents.cpp
+index 81cd2fa..dfdef4e 100644
+--- a/embed/mozilla/MozRegisterComponents.cpp
++++ b/embed/mozilla/MozRegisterComponents.cpp
+@@ -46,6 +46,7 @@
+ #include <nsIClassInfoImpl.h>
+ #include <nsXULAppAPI.h>
+ #include <nsToolkitCompsCID.h>
++#include <nsXPCOMCIDInternal.h>
+ #endif
+ 
+ #ifdef HAVE_MOZILLA_PSM
diff --git a/www-client/epiphany/files/epiphany-2.26.1-automagic-libcanberra.patch b/www-client/epiphany/files/epiphany-2.26.1-automagic-libcanberra.patch
new file mode 100644
index 000000000000..095dc2577ffc
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-2.26.1-automagic-libcanberra.patch
@@ -0,0 +1,48 @@
+---
+ Fix automagic libcanberra detection.
+
+ Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=266232
+ Gnome: https://bugzilla.gnome.org/show_bug.cgi?id=579031
+
+ configure.ac |   20 ++++++++++++++++----
+ 1 files changed, 16 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 90ed936..61b10de 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -118,13 +118,24 @@ LIBCANBERRA_GTK_REQUIRED=0.3
+ DBUS_GLIB_REQUIRED=0.35
+ 
+ PKG_CHECK_EXISTS([libnotify >= $LIBNOTIFY_REQUIRED],[have_libnotify=yes],[have_libnotify=no])
+-PKG_CHECK_EXISTS([libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED],[have_libcanberra_gtk=yes],[have_libcanberra_gtk=no])
++
++AC_ARG_ENABLE([canberra],
++	AC_HELP_STRING([--enable-canberra],
++	[Enable canberra support @<:@default=yes@:>@]),
++	enable_canberra=$enableval, enable_canberra=yes)
+ 
+ LIBCANBERRA_GTK_PACKAGE=
+-if test "$have_libcanberra_gtk" = "yes"; then
+-  LIBCANBERRA_GTK_PACKAGE="libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED"
+-  AC_DEFINE([HAVE_LIBCANBERRA_GTK],[1],[Define if libcanberra-gtk is available])
++have_libcanberra_gtk=no
++if test "$enable_canberra" = "yes"; then
++   PKG_CHECK_EXISTS([libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED],[have_libcanberra_gtk=yes],
++   [have_libcanberra_gtk=no])
++
++   if test "$have_libcanberra_gtk" = "yes"; then
++      LIBCANBERRA_GTK_PACKAGE="libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED"
++      AC_DEFINE([HAVE_LIBCANBERRA_GTK],[1],[Define if libcanberra-gtk is available])
++   fi
+ fi
++
+ LIBNOTIFY_PACKAGE=
+ if test "$have_libnotify" = "yes"; then
+   LIBNOTIFY_PACKAGE="libnotify >= $LIBNOTIFY_REQUIRED"
+@@ -772,4 +783,5 @@ Epiphany was configured with the following options:
+  
+ 	Gecko backend              : $gecko_cv_gecko version $gecko_cv_gecko_version
+ 	PSM support                : $enable_psm
++	Canberra support	   : $have_libcanberra_gtk
+ "