[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Alexandre Restovtsev]

commit:     d4ba19879e933e0efd942b602af597b5e8b94332
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 14 04:10:31 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sat Apr 14 04:10:31 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d4ba1987

www-client/epiphany: moved to gx86; sync with gx86

---
 www-client/epiphany/epiphany-3.4.0.1.ebuild |   90 ---------------------------
 www-client/epiphany/epiphany-9999.ebuild    |   16 +++--
 2 files changed, 10 insertions(+), 96 deletions(-)

diff --git a/www-client/epiphany/epiphany-3.4.0.1.ebuild b/www-client/epiphany/epiphany-3.4.0.1.ebuild
deleted file mode 100644
index 310e70a..0000000
--- a/www-client/epiphany/epiphany-3.4.0.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.2.1.ebuild,v 1.1 2011/11/06 04:57:01 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-
-inherit autotools eutils gnome2 pax-utils versionator virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="http://projects.gnome.org/epiphany/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="avahi doc +introspection +nss test"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-# XXX: Should we add seed support? Seed seems to be unmaintained now.
-RDEPEND="
-	>=dev-libs/glib-2.31.2:2
-	>=x11-libs/gtk+-3.3.14:3[introspection?]
-	>=dev-libs/libxml2-2.6.12:2
-	>=dev-libs/libxslt-1.1.7
-	>=app-text/iso-codes-0.35
-	>=net-libs/webkit-gtk-1.7.92:3[introspection?]
-	>=net-libs/libsoup-gnome-2.37.1:2.4
-	>=gnome-base/gnome-keyring-2.26.0
-	>=gnome-base/gsettings-desktop-schemas-0.0.1
-	>=x11-libs/libnotify-0.5.1
-
-	dev-db/sqlite:3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-
-	x11-themes/gnome-icon-theme
-	x11-themes/gnome-icon-theme-symbolic
-
-	avahi? ( >=net-dns/avahi-0.6.22 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	nss? ( dev-libs/nss )"
-# paxctl needed for bug #407085
-DEPEND="${RDEPEND}
-	app-text/gnome-doc-utils
-	>=dev-util/intltool-0.40
-	dev-util/pkgconfig
-	sys-apps/paxctl
-	sys-devel/gettext
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-	G2CONF="${G2CONF}
-		--enable-shared
-		--disable-schemas-compile
-		--disable-scrollkeeper
-		--disable-static
-		--with-distributor-name=Gentoo
-		$(use_enable avahi zeroconf)
-		$(use_enable introspection)
-		$(use_enable nss)
-		$(use_enable test tests)"
-}
-
-src_prepare() {
-	# Build-time segfaults under PaX with USE=introspection
-	epatch "${FILESDIR}/${PN}-3.3.90-paxctl-introspection.patch"
-	cp "${FILESDIR}/paxctl.sh" "${S}/" || die
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_test() {
-	# FIXME: this should be handled at eclass level
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
-	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
-
-src_install() {
-	gnome2_src_install
-	pax-mark m "${ED}usr/bin/epiphany"
-}

diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-9999.ebuild
index 310e70a..4ad81e0 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-9999.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://projects.gnome.org/epiphany/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="avahi doc +introspection +nss test"
+IUSE="avahi doc +introspection +jit +nss test"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
@@ -45,6 +45,7 @@ RDEPEND="
 
 	avahi? ( >=net-dns/avahi-0.6.22 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+	!jit? ( net-libs/webkit-gtk[-jit] )
 	nss? ( dev-libs/nss )"
 # paxctl needed for bug #407085
 DEPEND="${RDEPEND}
@@ -70,10 +71,13 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Build-time segfaults under PaX with USE=introspection
-	epatch "${FILESDIR}/${PN}-3.3.90-paxctl-introspection.patch"
-	cp "${FILESDIR}/paxctl.sh" "${S}/" || die
-	eautoreconf
+	# Build-time segfaults under PaX with USE=introspection when building
+	# against webkit-gtk[introspection,jit]
+	if use introspection && use jit; then
+		epatch "${FILESDIR}/${PN}-3.3.90-paxctl-introspection.patch"
+		cp "${FILESDIR}/paxctl.sh" "${S}/" || die
+		[[ ${PV} != 9999 ]] && eautoreconf
+	fi
 	gnome2_src_prepare
 }
 
@@ -86,5 +90,5 @@ src_test() {
 
 src_install() {
 	gnome2_src_install
-	pax-mark m "${ED}usr/bin/epiphany"
+	use jit && pax-mark m "${ED}usr/bin/epiphany"
 }

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Mart Raudsepp]

commit:     399cfe36f4b13852e0653d08f872bf0b2aeffe5c
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  5 08:30:06 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Aug  5 08:30:06 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=399cfe36

www-client/epiphany-3.26.7: remove, available with fixes in ::gentoo

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 www-client/epiphany/epiphany-3.26.7.ebuild | 68 ------------------------------
 1 file changed, 68 deletions(-)

diff --git a/www-client/epiphany/epiphany-3.26.7.ebuild b/www-client/epiphany/epiphany-3.26.7.ebuild
deleted file mode 100644
index 8000e3bb..00000000
--- a/www-client/epiphany/epiphany-3.26.7.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome-meson virtualx
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="https://wiki.gnome.org/Apps/Web"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="test"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.52.0:2[dbus]
-	>=dev-libs/json-glib-1.2.4
-	>=x11-libs/gtk+-3.22.13:3
-	>=net-libs/webkit-gtk-2.17.4:4=
-	>=x11-libs/cairo-1.2
-	>=app-crypt/gcr-3.5.5:=[gtk]
-	>=x11-libs/gdk-pixbuf-2.36.5:2
-	>=gnome-base/gnome-desktop-2.91.2:3=
-	dev-libs/icu:=
-	>=x11-libs/libnotify-0.5.1:=
-	>=app-crypt/libsecret-0.14
-	>=net-libs/libsoup-2.48:2.4
-	>=dev-libs/libxml2-2.6.12:2
-	>=dev-libs/libxslt-1.1.7
-	>=dev-libs/nettle-3.2
-	dev-db/sqlite:3
-	dev-libs/gmp:0
-	>=app-text/iso-codes-0.35
-	>=gnome-base/gsettings-desktop-schemas-0.0.1
-"
-# epiphany-extensions support was removed in 3.7; let's not pretend it still works
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/adwaita-icon-theme
-	!www-client/epiphany-extensions
-"
-# paxctl needed for bug #407085
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	sys-apps/paxctl
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# https://bugzilla.gnome.org/show_bug.cgi?id=751593
-	"${FILESDIR}"/${PN}-3.14.0-unittest-2.patch
-)
-
-# FIXME: it seems it can't use newer libhttpseverywhere
-src_configure() {
-	gnome-meson_src_configure \
-		-Ddistributor_name=Gentoo \
-		-Dhttps_everywhere=false \
-		$(meson_use test unit_tests)
-}
-
-src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-	GSETTINGS_SCHEMA_DIR="${S}/data" virtx meson_src_test
-}

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Gilles Dartiguelongue]

commit:     53c44130749d7a7aa5a5185938ec5173b04709fd
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 24 15:15:13 2018 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Jun 24 19:17:21 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=53c44130

www-client/epiphany: sync live ebuild

Package-Manager: Portage-2.3.40, Repoman-2.3.9
Manifest-Sign-Key: 0x5A56C8CD0C13248A

 www-client/epiphany/epiphany-3.26.7.ebuild |   3 +-
 www-client/epiphany/epiphany-9999.ebuild   | 100 +++++++++++------------------
 www-client/epiphany/metadata.xml           |   3 -
 3 files changed, 41 insertions(+), 65 deletions(-)

diff --git a/www-client/epiphany/epiphany-3.26.7.ebuild b/www-client/epiphany/epiphany-3.26.7.ebuild
index 3e6846dc..8000e3bb 100644
--- a/www-client/epiphany/epiphany-3.26.7.ebuild
+++ b/www-client/epiphany/epiphany-3.26.7.ebuild
@@ -53,7 +53,8 @@ PATCHES=(
 	# https://bugzilla.gnome.org/show_bug.cgi?id=751593
 	"${FILESDIR}"/${PN}-3.14.0-unittest-2.patch
 )
-#FIXME: it seems it can't use newer libhttpseverywhere
+
+# FIXME: it seems it can't use newer libhttpseverywhere
 src_configure() {
 	gnome-meson_src_configure \
 		-Ddistributor_name=Gentoo \

diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-9999.ebuild
index 711609a0..4ee03e5d 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-9999.ebuild
@@ -1,99 +1,77 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI="5"
-GCONF_DEBUG="yes"
+EAPI=6
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2 pax-utils versionator virtualx
+inherit gnome-meson virtualx
 if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
+	SRC_URI=""
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/epiphany.git"
+	inherit git-r3
 fi
 
 DESCRIPTION="GNOME webbrowser based on Webkit"
 HOMEPAGE="https://wiki.gnome.org/Apps/Web"
 
-# TODO: coverage
-LICENSE="GPL-2"
+LICENSE="GPL-3+"
 SLOT="0"
-IUSE="+jit +nss test"
+IUSE="test"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 COMMON_DEPEND="
-	>=app-crypt/gcr-3.5.5
+	>=dev-libs/glib-2.52.0:2[dbus]
+	>=dev-libs/json-glib-1.2.4
+	>=x11-libs/gtk+-3.22.13:3
+	>=net-libs/webkit-gtk-2.17.4:4=
+	>=x11-libs/cairo-1.2
+	>=app-crypt/gcr-3.5.5:=[gtk]
+	>=x11-libs/gdk-pixbuf-2.36.5:2
+	>=gnome-base/gnome-desktop-2.91.2:3=
+	dev-libs/icu:=
+	>=x11-libs/libnotify-0.5.1:=
 	>=app-crypt/libsecret-0.14
-	>=app-text/iso-codes-0.35
-	>=dev-libs/glib-2.38:2
+	>=net-libs/libsoup-2.48:2.4
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
-	>=gnome-base/gsettings-desktop-schemas-0.0.1
-	>=net-dns/avahi-0.6.22[dbus]
-	>=net-libs/webkit-gtk-2.7.4:4[jit?]
-	>=net-libs/libsoup-2.48:2.4
-	>=x11-libs/gtk+-3.13:3
-	>=x11-libs/libnotify-0.5.1:=
-	gnome-base/gnome-desktop:3=
-
+	>=dev-libs/nettle-3.2
 	dev-db/sqlite:3
-	x11-libs/libwnck:3
-	x11-libs/libX11
-
-	x11-themes/gnome-icon-theme
-	x11-themes/gnome-icon-theme-symbolic
-
-	nss? ( dev-libs/nss )
+	dev-libs/gmp:0
+	>=app-text/iso-codes-0.35
+	>=gnome-base/gsettings-desktop-schemas-0.0.1
 "
 # epiphany-extensions support was removed in 3.7; let's not pretend it still works
 RDEPEND="${COMMON_DEPEND}
+	x11-themes/adwaita-icon-theme
 	!www-client/epiphany-extensions
 "
 # paxctl needed for bug #407085
-# eautoreconf requires gnome-common-3.5.5
 DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50
+	app-text/yelp-tools
+	dev-libs/appstream-glib
 	sys-apps/paxctl
-	sys-devel/gettext
+	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 "
-if [[ ${PV} == 9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/yelp-tools
-		>=gnome-base/gnome-common-3.6"
-fi
 
-src_configure() {
-	local myconf=""
-	[[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)"
-	gnome2_src_configure \
-		--enable-shared \
-		--disable-static \
-		--with-distributor-name=Gentoo \
-		$(use_enable nss) \
-		$(use_enable test tests) \
-		${myconf}
-}
+PATCHES=(
+	# https://bugzilla.gnome.org/show_bug.cgi?id=751593
+	"${FILESDIR}"/${PN}-3.14.0-unittest-2.patch
+)
 
-src_compile() {
-	# needed to avoid "Command line `dbus-launch ...' exited with non-zero exit status 1"
-	unset DISPLAY
-	gnome2_src_compile
+# FIXME: it seems it can't use newer libhttpseverywhere
+src_configure() {
+	gnome-meson_src_configure \
+		-Ddistributor_name=Gentoo \
+		-Dhttps_everywhere=false \
+		$(meson_use test unit_tests)
 }
 
 src_test() {
-	# FIXME: this should be handled at eclass level
 	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
-	unset DISPLAY
-	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-	gnome2_src_install
-	use jit && pax-mark m "${ED}usr/bin/epiphany"
+	GSETTINGS_SCHEMA_DIR="${S}/data" virtx meson_src_test
 }

diff --git a/www-client/epiphany/metadata.xml b/www-client/epiphany/metadata.xml
index bdde0187..39980802 100644
--- a/www-client/epiphany/metadata.xml
+++ b/www-client/epiphany/metadata.xml
@@ -5,7 +5,4 @@
 	<email>gnome@gentoo.org</email>
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
-<use>
-	<flag name="nss">Import passwords from older gecko based <pkg>www-client/epiphany</pkg> keyring.</flag>
-</use>
 </pkgmetadata>

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Gilles Dartiguelongue]

commit:     07f2661ed9fd6426bd2427cd727d7baca38559da
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 24 15:04:01 2018 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Jun 24 19:17:21 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=07f2661e

www-client/epiphany: drop unused eclass

 www-client/epiphany/epiphany-3.26.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-client/epiphany/epiphany-3.26.6.ebuild b/www-client/epiphany/epiphany-3.26.6.ebuild
index 5ff6de88..f6302742 100644
--- a/www-client/epiphany/epiphany-3.26.6.ebuild
+++ b/www-client/epiphany/epiphany-3.26.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 GNOME2_LA_PUNT="yes"
 
-inherit flag-o-matic gnome-meson virtualx
+inherit gnome-meson virtualx
 
 DESCRIPTION="GNOME webbrowser based on Webkit"
 HOMEPAGE="https://wiki.gnome.org/Apps/Web"

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Gilles Dartiguelongue]

commit:     4b775a791c36c3c70d68e918b0333c7316b16cb4
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 24 15:06:33 2018 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Jun 24 19:17:21 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=4b775a79

www-client/epiphany: 3.26.6 → 3.26.7

Fix several crashers. Add missing dependency on gmp.

Package-Manager: Portage-2.3.40, Repoman-2.3.9
Manifest-Sign-Key: 0x5A56C8CD0C13248A

 www-client/epiphany/{epiphany-3.26.6.ebuild => epiphany-3.26.7.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www-client/epiphany/epiphany-3.26.6.ebuild b/www-client/epiphany/epiphany-3.26.7.ebuild
similarity index 99%
rename from www-client/epiphany/epiphany-3.26.6.ebuild
rename to www-client/epiphany/epiphany-3.26.7.ebuild
index f6302742..3e6846dc 100644
--- a/www-client/epiphany/epiphany-3.26.6.ebuild
+++ b/www-client/epiphany/epiphany-3.26.7.ebuild
@@ -31,6 +31,7 @@ COMMON_DEPEND="
 	>=dev-libs/libxslt-1.1.7
 	>=dev-libs/nettle-3.2
 	dev-db/sqlite:3
+	dev-libs/gmp:0
 	>=app-text/iso-codes-0.35
 	>=gnome-base/gsettings-desktop-schemas-0.0.1
 "

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Sobhan Mohammadpour]

commit:     04e5c9eeb34b27cd0807f1d19b7046dfdc7f8d71
Author:     Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 16 15:47:35 2018 +0000
Commit:     Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
CommitDate: Fri Feb 16 15:47:35 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=04e5c9ee

www-client/epiphany: bump

fix https_everywhere disable flag typo

Package-Manager: Portage-2.3.24, Repoman-2.3.6
Manifest-Sign-Key: 0x7DF238CF0AA182E1

 www-client/epiphany/{epiphany-3.26.2.ebuild => epiphany-3.26.6.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-client/epiphany/epiphany-3.26.2.ebuild b/www-client/epiphany/epiphany-3.26.6.ebuild
similarity index 98%
rename from www-client/epiphany/epiphany-3.26.2.ebuild
rename to www-client/epiphany/epiphany-3.26.6.ebuild
index fe54b55c..5ff6de88 100644
--- a/www-client/epiphany/epiphany-3.26.2.ebuild
+++ b/www-client/epiphany/epiphany-3.26.6.ebuild
@@ -56,7 +56,7 @@ PATCHES=(
 src_configure() {
 	gnome-meson_src_configure \
 		-Ddistributor_name=Gentoo \
-		-Dhttpps_everywhere=false \
+		-Dhttps_everywhere=false \
 		$(meson_use test unit_tests)
 }
 

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Sobhan Mohammadpour]

commit:     cda9733d7b95fd2a6332dd0339464ef4e226447d
Author:     Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  1 10:37:06 2018 +0000
Commit:     Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
CommitDate: Thu Feb  1 10:37:06 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=cda9733d

www-client/epiphany: version bump to 3.26.2

Package-Manager: Portage-2.3.21, Repoman-2.3.6
Manifest-Sign-Key: 0x7DF238CF0AA182E1

 www-client/epiphany/epiphany-3.26.2.ebuild | 66 ++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/www-client/epiphany/epiphany-3.26.2.ebuild b/www-client/epiphany/epiphany-3.26.2.ebuild
new file mode 100644
index 00000000..fe54b55c
--- /dev/null
+++ b/www-client/epiphany/epiphany-3.26.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit flag-o-matic gnome-meson virtualx
+
+DESCRIPTION="GNOME webbrowser based on Webkit"
+HOMEPAGE="https://wiki.gnome.org/Apps/Web"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="test"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.52.0:2[dbus]
+	>=dev-libs/json-glib-1.2.4
+	>=x11-libs/gtk+-3.22.13:3
+	>=net-libs/webkit-gtk-2.17.4:4=
+	>=x11-libs/cairo-1.2
+	>=app-crypt/gcr-3.5.5:=[gtk]
+	>=x11-libs/gdk-pixbuf-2.36.5:2
+	>=gnome-base/gnome-desktop-2.91.2:3=
+	dev-libs/icu:=
+	>=x11-libs/libnotify-0.5.1:=
+	>=app-crypt/libsecret-0.14
+	>=net-libs/libsoup-2.48:2.4
+	>=dev-libs/libxml2-2.6.12:2
+	>=dev-libs/libxslt-1.1.7
+	>=dev-libs/nettle-3.2
+	dev-db/sqlite:3
+	>=app-text/iso-codes-0.35
+	>=gnome-base/gsettings-desktop-schemas-0.0.1
+"
+# epiphany-extensions support was removed in 3.7; let's not pretend it still works
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/adwaita-icon-theme
+	!www-client/epiphany-extensions
+"
+# paxctl needed for bug #407085
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	sys-apps/paxctl
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# https://bugzilla.gnome.org/show_bug.cgi?id=751593
+	"${FILESDIR}"/${PN}-3.14.0-unittest-2.patch
+)
+#FIXME: it seems it can't use newer libhttpseverywhere
+src_configure() {
+	gnome-meson_src_configure \
+		-Ddistributor_name=Gentoo \
+		-Dhttpps_everywhere=false \
+		$(meson_use test unit_tests)
+}
+
+src_test() {
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+	GSETTINGS_SCHEMA_DIR="${S}/data" virtx meson_src_test
+}

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Gilles Dartiguelongue]

commit:     f523cc08c338d976054b944f343d77f1216e169d
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue May 12 19:18:30 2015 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue May 12 19:18:30 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=f523cc08

www-client/epiphany: 3.16.0 → 3.16.1

 www-client/epiphany/{epiphany-3.16.0.ebuild => epiphany-3.16.1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/www-client/epiphany/epiphany-3.16.0.ebuild b/www-client/epiphany/epiphany-3.16.1.ebuild
similarity index 100%
rename from www-client/epiphany/epiphany-3.16.0.ebuild
rename to www-client/epiphany/epiphany-3.16.1.ebuild

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Gilles Dartiguelongue]

commit:     fe444c8ad28fd5a458c1f92c2237885a0b25328b
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 26 21:50:17 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri Dec 26 21:50:17 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=fe444c8a

www-client/epiphany: moved to gentoo-x86

---
 www-client/epiphany/epiphany-3.14.2.ebuild | 96 ------------------------------
 1 file changed, 96 deletions(-)

diff --git a/www-client/epiphany/epiphany-3.14.2.ebuild b/www-client/epiphany/epiphany-3.14.2.ebuild
deleted file mode 100644
index eeb397d..0000000
--- a/www-client/epiphany/epiphany-3.14.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 pax-utils versionator virtualx
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="http://projects.gnome.org/epiphany/"
-
-# TODO: coverage
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+jit +nss test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-COMMON_DEPEND="
-	>=app-crypt/gcr-3.5.5
-	>=app-crypt/libsecret-0.14
-	>=app-text/iso-codes-0.35
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/libxml2-2.6.12:2
-	>=dev-libs/libxslt-1.1.7
-	>=gnome-base/gsettings-desktop-schemas-0.0.1
-	>=net-dns/avahi-0.6.22[dbus]
-	>=net-libs/webkit-gtk-2.5.90:4[jit?]
-	>=net-libs/libsoup-2.48:2.4
-	>=x11-libs/gtk+-3.13:3
-	>=x11-libs/libnotify-0.5.1:=
-	gnome-base/gnome-desktop:3=
-
-	dev-db/sqlite:3
-	x11-libs/libwnck:3
-	x11-libs/libX11
-
-	x11-themes/gnome-icon-theme
-	x11-themes/gnome-icon-theme-symbolic
-
-	nss? ( dev-libs/nss )
-"
-# epiphany-extensions support was removed in 3.7; let's not pretend it still works
-RDEPEND="${COMMON_DEPEND}
-	!www-client/epiphany-extensions
-"
-# paxctl needed for bug #407085
-# eautoreconf requires gnome-common-3.5.5
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50
-	sys-apps/paxctl
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Fix missing symbol in webextension.so, bug #728972
-	epatch "${FILESDIR}"/${PN}-3.14.0-missing-symbol.patch
-
-	# Fix unittests
-	epatch "${FILESDIR}"/${PN}-3.14.0-unittest-*.patch
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-shared \
-		--disable-static \
-		--with-distributor-name=Gentoo \
-		$(use_enable nss) \
-		$(use_enable test tests) \
-		ITSTOOL=$(type -P true)
-}
-
-src_compile() {
-	# needed to avoid "Command line `dbus-launch ...' exited with non-zero exit status 1"
-	unset DISPLAY
-	gnome2_src_compile
-}
-
-src_test() {
-	# FIXME: this should be handled at eclass level
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
-	unset DISPLAY
-	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-	gnome2_src_install
-	use jit && pax-mark m "${ED}usr/bin/epiphany"
-}

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Gilles Dartiguelongue]

commit:     e03a5dd5d866d28ccc3363ea2bc873d30d353a24
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 23 23:17:22 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Nov 23 23:17:22 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e03a5dd5

www-client/epiphany: 3.14.1 → 3.14.2

---
 www-client/epiphany/{epiphany-3.14.1.ebuild => epiphany-3.14.2.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/www-client/epiphany/epiphany-3.14.1.ebuild b/www-client/epiphany/epiphany-3.14.2.ebuild
similarity index 100%
rename from www-client/epiphany/epiphany-3.14.1.ebuild
rename to www-client/epiphany/epiphany-3.14.2.ebuild

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Gilles Dartiguelongue]

commit:     6acf741827de724604b5bdca6faa531412c8a317
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 12 20:33:17 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Apr 21 13:20:05 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6acf7418

www-client/epiphany: 3.10.3 → 3.12.0

---
 ...epiphany-9999.ebuild => epiphany-3.12.0.ebuild} | 28 ++++++++--------------
 www-client/epiphany/epiphany-9999.ebuild           | 12 ++++++----
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-3.12.0.ebuild
similarity index 80%
copy from www-client/epiphany/epiphany-9999.ebuild
copy to www-client/epiphany/epiphany-3.12.0.ebuild
index 6924f26..a98962b 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-3.12.0.ebuild
@@ -7,9 +7,6 @@ GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
 inherit eutils gnome2 pax-utils versionator virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="GNOME webbrowser based on Webkit"
 HOMEPAGE="http://projects.gnome.org/epiphany/"
@@ -18,22 +15,18 @@ HOMEPAGE="http://projects.gnome.org/epiphany/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+jit +nss test"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
-RDEPEND="
+COMMON_DEPEND="
 	>=app-crypt/gcr-3.5.5
 	>=app-crypt/libsecret-0.14
 	>=app-text/iso-codes-0.35
-	>=dev-libs/glib-2.38.0:2
+	>=dev-libs/glib-2.38:2
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
 	>=gnome-base/gsettings-desktop-schemas-0.0.1
 	>=net-dns/avahi-0.6.22[dbus]
-	>=net-libs/webkit-gtk-2.3.90:3[jit?]
+	>=net-libs/webkit-gtk-2.4:3[jit?]
 	>=net-libs/libsoup-2.42.1:2.4
 	>=x11-libs/gtk+-3.11.6:3
 	>=x11-libs/libnotify-0.5.1:=
@@ -48,31 +41,30 @@ RDEPEND="
 
 	nss? ( dev-libs/nss )
 "
+# epiphany-extensions support was removed in 3.7; let's not pretend it still works
+RDEPEND="${COMMON_DEPEND}
+	!www-client/epiphany-extensions
+"
 # paxctl needed for bug #407085
 # eautoreconf requires gnome-common-3.5.5
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.50
 	sys-apps/paxctl
 	sys-devel/gettext
 	virtual/pkgconfig
 "
-if [[ ${PV} == 9999 ]]; then
-	DEPEND="${DEPEND} app-text/yelp-tools"
-fi
 
 # Tests refuse to run with the gsettings trick for some reason
 RESTRICT="test"
 
 src_configure() {
-	local myconf=""
-	[[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)"
 	gnome2_src_configure \
 		--enable-shared \
 		--disable-static \
 		--with-distributor-name=Gentoo \
 		$(use_enable nss) \
 		$(use_enable test tests) \
-		${myconf}
+		ITSTOOL=$(type -P true)
 }
 
 src_compile() {

diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-9999.ebuild
index 6924f26..2f8c547 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-9999.ebuild
@@ -24,16 +24,16 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-RDEPEND="
+COMMON_DEPEND="
 	>=app-crypt/gcr-3.5.5
 	>=app-crypt/libsecret-0.14
 	>=app-text/iso-codes-0.35
-	>=dev-libs/glib-2.38.0:2
+	>=dev-libs/glib-2.38:2
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
 	>=gnome-base/gsettings-desktop-schemas-0.0.1
 	>=net-dns/avahi-0.6.22[dbus]
-	>=net-libs/webkit-gtk-2.3.90:3[jit?]
+	>=net-libs/webkit-gtk-2.4:3[jit?]
 	>=net-libs/libsoup-2.42.1:2.4
 	>=x11-libs/gtk+-3.11.6:3
 	>=x11-libs/libnotify-0.5.1:=
@@ -48,9 +48,13 @@ RDEPEND="
 
 	nss? ( dev-libs/nss )
 "
+# epiphany-extensions support was removed in 3.7; let's not pretend it still works
+RDEPEND="${COMMON_DEPEND}
+	!www-client/epiphany-extensions
+"
 # paxctl needed for bug #407085
 # eautoreconf requires gnome-common-3.5.5
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.50
 	sys-apps/paxctl
 	sys-devel/gettext

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Priit Laes]

commit:     f83ba4e1eade50a780c7f094d4bda400f4139f2b
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Wed Feb 26 15:04:40 2014 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Wed Feb 26 15:04:40 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f83ba4e1

www-client/epiphany: Sync 9999 version

---
 www-client/epiphany/epiphany-9999.ebuild | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-9999.ebuild
index edc4549..6924f26 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-9999.ebuild
@@ -28,14 +28,14 @@ RDEPEND="
 	>=app-crypt/gcr-3.5.5
 	>=app-crypt/libsecret-0.14
 	>=app-text/iso-codes-0.35
-	>=dev-libs/glib-2.35.6:2
+	>=dev-libs/glib-2.38.0:2
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
 	>=gnome-base/gsettings-desktop-schemas-0.0.1
 	>=net-dns/avahi-0.6.22[dbus]
-	>=net-libs/webkit-gtk-2.2.2:3[jit?]
+	>=net-libs/webkit-gtk-2.3.90:3[jit?]
 	>=net-libs/libsoup-2.42.1:2.4
-	>=x11-libs/gtk+-3.9.12:3
+	>=x11-libs/gtk+-3.11.6:3
 	>=x11-libs/libnotify-0.5.1:=
 	gnome-base/gnome-desktop:3=
 
@@ -60,6 +60,9 @@ if [[ ${PV} == 9999 ]]; then
 	DEPEND="${DEPEND} app-text/yelp-tools"
 fi
 
+# Tests refuse to run with the gsettings trick for some reason
+RESTRICT="test"
+
 src_configure() {
 	local myconf=""
 	[[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)"

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Gilles Dartiguelongue]

commit:     5adb66c0371e335316b9c7cf9a9f265c681cf78f
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 12 23:32:20 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Feb 12 23:32:20 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5adb66c0

www-client/epiphany: moved to gentoo-x86 + sync live ebuild

---
 www-client/epiphany/epiphany-3.10.3.ebuild | 84 ------------------------------
 www-client/epiphany/epiphany-9999.ebuild   |  3 +-
 2 files changed, 2 insertions(+), 85 deletions(-)

diff --git a/www-client/epiphany/epiphany-3.10.3.ebuild b/www-client/epiphany/epiphany-3.10.3.ebuild
deleted file mode 100644
index 4517641..0000000
--- a/www-client/epiphany/epiphany-3.10.3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 pax-utils versionator virtualx
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="http://projects.gnome.org/epiphany/"
-
-# TODO: coverage
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+jit +nss test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	>=app-crypt/gcr-3.5.5
-	>=app-crypt/libsecret-0.14
-	>=app-text/iso-codes-0.35
-	>=dev-libs/glib-2.35.6:2
-	>=dev-libs/libxml2-2.6.12:2
-	>=dev-libs/libxslt-1.1.7
-	>=gnome-base/gsettings-desktop-schemas-0.0.1
-	>=net-dns/avahi-0.6.22[dbus]
-	>=net-libs/webkit-gtk-2.2.2:3[jit?]
-	>=net-libs/libsoup-2.42.1:2.4
-	>=x11-libs/gtk+-3.9.12:3
-	>=x11-libs/libnotify-0.5.1:=
-	gnome-base/gnome-desktop:3=
-
-	dev-db/sqlite:3
-	x11-libs/libwnck:3
-	x11-libs/libX11
-
-	x11-themes/gnome-icon-theme
-	x11-themes/gnome-icon-theme-symbolic
-
-	nss? ( dev-libs/nss )
-"
-# paxctl needed for bug #407085
-# eautoreconf requires gnome-common-3.5.5
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.50
-	sys-apps/paxctl
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-# Tests refuse to run with the gsettings trick for some reason
-RESTRICT="test"
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-shared \
-		--disable-static \
-		--with-distributor-name=Gentoo \
-		$(use_enable nss) \
-		$(use_enable test tests) \
-		ITSTOOL=$(type -P true)
-}
-
-src_compile() {
-	# needed to avoid "Command line `dbus-launch ...' exited with non-zero exit status 1"
-	unset DISPLAY
-	gnome2_src_compile
-}
-
-src_test() {
-	# FIXME: this should be handled at eclass level
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
-	unset DISPLAY
-	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-	gnome2_src_install
-	use jit && pax-mark m "${ED}usr/bin/epiphany"
-}

diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-9999.ebuild
index 1d95286..edc4549 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -82,6 +82,7 @@ src_test() {
 	# FIXME: this should be handled at eclass level
 	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
 
+	unset DISPLAY
 	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
 }
 

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Gilles Dartiguelongue]

commit:     7d60d65f55f21b2d4e26aaa12197dd2814d6f49b
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 12 22:59:26 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Dec 12 23:20:46 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=7d60d65f

www-client/epiphany: 3.10.2 → 3.10.3

---
 www-client/epiphany/{epiphany-3.10.2.ebuild => epiphany-3.10.3.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/www-client/epiphany/epiphany-3.10.2.ebuild b/www-client/epiphany/epiphany-3.10.3.ebuild
similarity index 100%
rename from www-client/epiphany/epiphany-3.10.2.ebuild
rename to www-client/epiphany/epiphany-3.10.3.ebuild

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Gilles Dartiguelongue]

commit:     02e27f600fcf704844b8321141b2adca8357a312
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 22:02:19 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec  1 23:04:15 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=02e27f60

www-client/epiphany: 3.8.2 → 3.10.2

---
 ...iphany-3.7.91.ebuild => epiphany-3.10.2.ebuild} | 36 ++++++++++----------
 www-client/epiphany/epiphany-9999.ebuild           | 38 +++++++++++++---------
 www-client/epiphany/metadata.xml                   |  1 -
 3 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/www-client/epiphany/epiphany-3.7.91.ebuild b/www-client/epiphany/epiphany-3.10.2.ebuild
similarity index 73%
rename from www-client/epiphany/epiphany-3.7.91.ebuild
rename to www-client/epiphany/epiphany-3.10.2.ebuild
index 0d22fc4..4517641 100644
--- a/www-client/epiphany/epiphany-3.7.91.ebuild
+++ b/www-client/epiphany/epiphany-3.10.2.ebuild
@@ -4,11 +4,9 @@
 
 EAPI="5"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2 pax-utils versionator virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
+inherit eutils gnome2 pax-utils versionator virtualx
 
 DESCRIPTION="GNOME webbrowser based on Webkit"
 HOMEPAGE="http://projects.gnome.org/epiphany/"
@@ -16,30 +14,26 @@ HOMEPAGE="http://projects.gnome.org/epiphany/"
 # TODO: coverage
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+nss test"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
+IUSE="+jit +nss test"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
-	>=app-crypt/libsecret-0.14
 	>=app-crypt/gcr-3.5.5
+	>=app-crypt/libsecret-0.14
 	>=app-text/iso-codes-0.35
 	>=dev-libs/glib-2.35.6:2
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
 	>=gnome-base/gsettings-desktop-schemas-0.0.1
-	>=net-dns/avahi-0.6.22
-	>=net-libs/webkit-gtk-1.11.5:3
-	>=net-libs/libsoup-2.41.3:2.4
-	>=x11-libs/gtk+-3.7.10:3
+	>=net-dns/avahi-0.6.22[dbus]
+	>=net-libs/webkit-gtk-2.2.2:3[jit?]
+	>=net-libs/libsoup-2.42.1:2.4
+	>=x11-libs/gtk+-3.9.12:3
 	>=x11-libs/libnotify-0.5.1:=
 	gnome-base/gnome-desktop:3=
 
 	dev-db/sqlite:3
-	x11-libs/libwnck
+	x11-libs/libwnck:3
 	x11-libs/libX11
 
 	x11-themes/gnome-icon-theme
@@ -56,13 +50,17 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+# Tests refuse to run with the gsettings trick for some reason
+RESTRICT="test"
+
 src_configure() {
 	gnome2_src_configure \
 		--enable-shared \
 		--disable-static \
 		--with-distributor-name=Gentoo \
-		$(use_enable nss)
-		$(use_enable test tests)
+		$(use_enable nss) \
+		$(use_enable test tests) \
+		ITSTOOL=$(type -P true)
 }
 
 src_compile() {
@@ -75,10 +73,12 @@ src_test() {
 	# FIXME: this should be handled at eclass level
 	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
 
+	unset DISPLAY
 	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
 }
 
 src_install() {
 	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
 	gnome2_src_install
+	use jit && pax-mark m "${ED}usr/bin/epiphany"
 }

diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-9999.ebuild
index 7e6cdeb..1d95286 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-9999.ebuild
@@ -4,8 +4,9 @@
 
 EAPI="5"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2 pax-utils versionator virtualx
+inherit eutils gnome2 pax-utils versionator virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -16,30 +17,30 @@ HOMEPAGE="http://projects.gnome.org/epiphany/"
 # TODO: coverage
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+nss test"
+IUSE="+jit +nss test"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 RDEPEND="
 	>=app-crypt/gcr-3.5.5
+	>=app-crypt/libsecret-0.14
 	>=app-text/iso-codes-0.35
 	>=dev-libs/glib-2.35.6:2
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
-	>=gnome-base/gnome-keyring-2.26.0
 	>=gnome-base/gsettings-desktop-schemas-0.0.1
-	>=net-dns/avahi-0.6.22
-	>=net-libs/webkit-gtk-1.11.5:3
-	>=net-libs/libsoup-2.41.3:2.4
-	>=x11-libs/gtk+-3.5.4:3
+	>=net-dns/avahi-0.6.22[dbus]
+	>=net-libs/webkit-gtk-2.2.2:3[jit?]
+	>=net-libs/libsoup-2.42.1:2.4
+	>=x11-libs/gtk+-3.9.12:3
 	>=x11-libs/libnotify-0.5.1:=
 	gnome-base/gnome-desktop:3=
 
 	dev-db/sqlite:3
-	x11-libs/libwnck
+	x11-libs/libwnck:3
 	x11-libs/libX11
 
 	x11-themes/gnome-icon-theme
@@ -55,15 +56,20 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
 "
+if [[ ${PV} == 9999 ]]; then
+	DEPEND="${DEPEND} app-text/yelp-tools"
+fi
 
 src_configure() {
-	G2CONF="${G2CONF}
-		--enable-shared
-		--disable-static
-		--with-distributor-name=Gentoo
-		$(use_enable nss)
-		$(use_enable test tests)"
-	gnome2_src_configure
+	local myconf=""
+	[[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)"
+	gnome2_src_configure \
+		--enable-shared \
+		--disable-static \
+		--with-distributor-name=Gentoo \
+		$(use_enable nss) \
+		$(use_enable test tests) \
+		${myconf}
 }
 
 src_compile() {

diff --git a/www-client/epiphany/metadata.xml b/www-client/epiphany/metadata.xml
index 9421843..3833156 100644
--- a/www-client/epiphany/metadata.xml
+++ b/www-client/epiphany/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
   <herd>gnome</herd>
   <use>
-    <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
     <flag name="nss">Import passwords from older gecko based <pkg>www-client/epiphany</pkg> keyring.</flag>
   </use>
 </pkgmetadata>

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Gilles Dartiguelongue]

commit:     05fd1ba4e14c65fdd14baf3c11db8548a83b8bbf
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 22:02:19 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri Nov 15 00:39:12 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=05fd1ba4

www-client/epiphany: 3.8.2 → 3.10.0

---
 ...iphany-3.7.91.ebuild => epiphany-3.10.0.ebuild} | 32 +++++++++----------
 www-client/epiphany/epiphany-9999.ebuild           | 36 +++++++++++++---------
 2 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/www-client/epiphany/epiphany-3.7.91.ebuild b/www-client/epiphany/epiphany-3.10.0.ebuild
similarity index 76%
rename from www-client/epiphany/epiphany-3.7.91.ebuild
rename to www-client/epiphany/epiphany-3.10.0.ebuild
index 0d22fc4..74dd421 100644
--- a/www-client/epiphany/epiphany-3.7.91.ebuild
+++ b/www-client/epiphany/epiphany-3.10.0.ebuild
@@ -4,11 +4,9 @@
 
 EAPI="5"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2 pax-utils versionator virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
+inherit eutils gnome2 pax-utils versionator virtualx
 
 DESCRIPTION="GNOME webbrowser based on Webkit"
 HOMEPAGE="http://projects.gnome.org/epiphany/"
@@ -16,30 +14,26 @@ HOMEPAGE="http://projects.gnome.org/epiphany/"
 # TODO: coverage
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+nss test"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
+IUSE="+jit +nss test"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
-	>=app-crypt/libsecret-0.14
 	>=app-crypt/gcr-3.5.5
+	>=app-crypt/libsecret-0.14
 	>=app-text/iso-codes-0.35
 	>=dev-libs/glib-2.35.6:2
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
 	>=gnome-base/gsettings-desktop-schemas-0.0.1
-	>=net-dns/avahi-0.6.22
-	>=net-libs/webkit-gtk-1.11.5:3
-	>=net-libs/libsoup-2.41.3:2.4
-	>=x11-libs/gtk+-3.7.10:3
+	>=net-dns/avahi-0.6.22[dbus]
+	>=net-libs/webkit-gtk-2.1.4:3[jit?]
+	>=net-libs/libsoup-2.42.1:2.4
+	>=x11-libs/gtk+-3.9.12:3
 	>=x11-libs/libnotify-0.5.1:=
 	gnome-base/gnome-desktop:3=
 
 	dev-db/sqlite:3
-	x11-libs/libwnck
+	x11-libs/libwnck:3
 	x11-libs/libX11
 
 	x11-themes/gnome-icon-theme
@@ -61,8 +55,9 @@ src_configure() {
 		--enable-shared \
 		--disable-static \
 		--with-distributor-name=Gentoo \
-		$(use_enable nss)
-		$(use_enable test tests)
+		$(use_enable nss) \
+		$(use_enable test tests) \
+		ITSTOOL=$(type -P true)
 }
 
 src_compile() {
@@ -81,4 +76,5 @@ src_test() {
 src_install() {
 	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
 	gnome2_src_install
+	use jit && pax-mark m "${ED}usr/bin/epiphany"
 }

diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-9999.ebuild
index 7e6cdeb..1c6bd50 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-9999.ebuild
@@ -4,8 +4,9 @@
 
 EAPI="5"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2 pax-utils versionator virtualx
+inherit eutils gnome2 pax-utils versionator virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -16,7 +17,7 @@ HOMEPAGE="http://projects.gnome.org/epiphany/"
 # TODO: coverage
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+nss test"
+IUSE="+jit +nss test"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
@@ -25,21 +26,21 @@ fi
 
 RDEPEND="
 	>=app-crypt/gcr-3.5.5
+	>=app-crypt/libsecret-0.14
 	>=app-text/iso-codes-0.35
 	>=dev-libs/glib-2.35.6:2
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
-	>=gnome-base/gnome-keyring-2.26.0
 	>=gnome-base/gsettings-desktop-schemas-0.0.1
-	>=net-dns/avahi-0.6.22
-	>=net-libs/webkit-gtk-1.11.5:3
-	>=net-libs/libsoup-2.41.3:2.4
-	>=x11-libs/gtk+-3.5.4:3
+	>=net-dns/avahi-0.6.22[dbus]
+	>=net-libs/webkit-gtk-2.1.4:3[jit?]
+	>=net-libs/libsoup-2.42.1:2.4
+	>=x11-libs/gtk+-3.9.12:3
 	>=x11-libs/libnotify-0.5.1:=
 	gnome-base/gnome-desktop:3=
 
 	dev-db/sqlite:3
-	x11-libs/libwnck
+	x11-libs/libwnck:3
 	x11-libs/libX11
 
 	x11-themes/gnome-icon-theme
@@ -55,15 +56,20 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
 "
+if [[ ${PV} == 9999 ]]; then
+	DEPEND="${DEPEND} app-text/yelp-tools"
+fi
 
 src_configure() {
-	G2CONF="${G2CONF}
-		--enable-shared
-		--disable-static
-		--with-distributor-name=Gentoo
-		$(use_enable nss)
-		$(use_enable test tests)"
-	gnome2_src_configure
+	local myconf=""
+	[[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)"
+	gnome2_src_configure \
+		--enable-shared \
+		--disable-static \
+		--with-distributor-name=Gentoo \
+		$(use_enable nss) \
+		$(use_enable test tests) \
+		${myconf}
 }
 
 src_compile() {

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Gilles Dartiguelongue]

commit:     85489b9017301b3da044dd50116324d31847f760
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 25 22:15:29 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Dec 25 23:55:45 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=85489b90

www-client/epiphany: moved to gx86

    * Sync live ebuild with gx86 changes.
    * Add metadata.xml.

---
 www-client/epiphany/epiphany-3.6.1.ebuild |   93 -----------------------------
 www-client/epiphany/epiphany-9999.ebuild  |   52 ++++++++++------
 www-client/epiphany/metadata.xml          |    9 +++
 3 files changed, 42 insertions(+), 112 deletions(-)

diff --git a/www-client/epiphany/epiphany-3.6.1.ebuild b/www-client/epiphany/epiphany-3.6.1.ebuild
deleted file mode 100644
index f6c8d34..0000000
--- a/www-client/epiphany/epiphany-3.6.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.2.1.ebuild,v 1.1 2011/11/06 04:57:01 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-
-inherit autotools eutils gnome2 pax-utils versionator virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="http://projects.gnome.org/epiphany/"
-
-# TODO: coverage
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc +introspection +jit +nss test"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-RDEPEND="
-	>=app-crypt/gcr-3.5.5
-	>=app-text/iso-codes-0.35
-	>=dev-libs/glib-2.31.2:2
-	>=dev-libs/libxml2-2.6.12:2
-	>=dev-libs/libxslt-1.1.7
-	>=gnome-base/gnome-keyring-2.26.0
-	>=gnome-base/gsettings-desktop-schemas-0.0.1
-	>=net-dns/avahi-0.6.22
-	>=net-libs/webkit-gtk-1.9.6:3[introspection?]
-	>=net-libs/libsoup-gnome-2.39.6:2.4
-	>=x11-libs/gtk+-3.5.2:3[introspection?]
-	>=x11-libs/libnotify-0.5.1
-	gnome-base/gnome-desktop:3
-
-	dev-db/sqlite:3
-	x11-libs/libX11
-
-	x11-themes/gnome-icon-theme
-	x11-themes/gnome-icon-theme-symbolic
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	!jit? ( net-libs/webkit-gtk[-jit] )
-	nss? ( dev-libs/nss )"
-# paxctl needed for bug #407085
-# eautoreconf requires gnome-common-3.5.5
-DEPEND="${RDEPEND}
-	introspection? ( jit? ( >=gnome-base/gnome-common-3.5.5 ) )
-	>=dev-util/intltool-0.50
-	sys-apps/paxctl
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-	G2CONF="${G2CONF}
-		--enable-shared
-		--disable-schemas-compile
-		--disable-static
-		--with-distributor-name=Gentoo
-		$(use_enable introspection)
-		$(use_enable nss)
-		$(use_enable test tests)"
-}
-
-src_prepare() {
-	# Build-time segfaults under PaX with USE=introspection when building
-	# against webkit-gtk[introspection,jit]
-	if use introspection && use jit; then
-		epatch "${FILESDIR}/${PN}-3.3.90-paxctl-introspection.patch"
-		cp "${FILESDIR}/paxctl.sh" "${S}/" || die
-		[[ ${PV} != 9999 ]] && eautoreconf
-	fi
-	gnome2_src_prepare
-}
-
-src_test() {
-	# FIXME: this should be handled at eclass level
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
-	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
-
-src_install() {
-	gnome2_src_install
-	use jit && pax-mark m "${ED}usr/bin/epiphany"
-}

diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-9999.ebuild
index f6c8d34..fe0c26a 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.2.1.ebuild,v 1.1 2011/11/06 04:57:01 tetromino Exp $
+# $Header: $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes"
 
 inherit autotools eutils gnome2 pax-utils versionator virtualx
@@ -16,8 +16,9 @@ HOMEPAGE="http://projects.gnome.org/epiphany/"
 # TODO: coverage
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="doc +introspection +jit +nss test"
+IUSE="+introspection +jit +nss test"
 if [[ ${PV} = 9999 ]]; then
+	IUSE="${IUSE} doc"
 	KEYWORDS=""
 else
 	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
@@ -35,8 +36,8 @@ RDEPEND="
 	>=net-libs/webkit-gtk-1.9.6:3[introspection?]
 	>=net-libs/libsoup-gnome-2.39.6:2.4
 	>=x11-libs/gtk+-3.5.2:3[introspection?]
-	>=x11-libs/libnotify-0.5.1
-	gnome-base/gnome-desktop:3
+	>=x11-libs/libnotify-0.5.1:=
+	gnome-base/gnome-desktop:3=
 
 	dev-db/sqlite:3
 	x11-libs/libX11
@@ -46,44 +47,57 @@ RDEPEND="
 
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 	!jit? ( net-libs/webkit-gtk[-jit] )
-	nss? ( dev-libs/nss )"
+	nss? ( dev-libs/nss )
+"
 # paxctl needed for bug #407085
 # eautoreconf requires gnome-common-3.5.5
 DEPEND="${RDEPEND}
 	introspection? ( jit? ( >=gnome-base/gnome-common-3.5.5 ) )
+	>=dev-util/gtk-doc-am-1
 	>=dev-util/intltool-0.50
 	sys-apps/paxctl
 	sys-devel/gettext
 	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1 )"
+"
+if [[ ${PV} = 9999 ]]; then
+	DEPEND="${DEPEND}
+		doc? ( >=dev-util/gtk-doc-1 )"
+fi
+
+src_prepare() {
+	# Build-time segfaults under PaX with USE=introspection when building
+	# against webkit-gtk[introspection,jit]
+	if use introspection && use jit; then
+		epatch "${FILESDIR}/${PN}-3.3.90-paxctl-introspection.patch"
+		cp "${FILESDIR}/paxctl.sh" "${S}/" || die
+		[[ ${PV} != 9999 ]] && eautoreconf
+	fi
+	gnome2_src_prepare
+}
 
-pkg_setup() {
+src_configure() {
 	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
 	G2CONF="${G2CONF}
 		--enable-shared
-		--disable-schemas-compile
 		--disable-static
 		--with-distributor-name=Gentoo
 		$(use_enable introspection)
 		$(use_enable nss)
 		$(use_enable test tests)"
+	gnome2_src_configure
 }
 
-src_prepare() {
-	# Build-time segfaults under PaX with USE=introspection when building
-	# against webkit-gtk[introspection,jit]
-	if use introspection && use jit; then
-		epatch "${FILESDIR}/${PN}-3.3.90-paxctl-introspection.patch"
-		cp "${FILESDIR}/paxctl.sh" "${S}/" || die
-		[[ ${PV} != 9999 ]] && eautoreconf
-	fi
-	gnome2_src_prepare
+src_compile() {
+	# needed to avoid "Command line `dbus-launch ...' exited with non-zero exit status 1"
+	unset DISPLAY
+	gnome2_src_compile
 }
 
 src_test() {
 	# FIXME: this should be handled at eclass level
 	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
 
+	use jit && pax-mark m $(list-paxables tests/test*) #415801
 	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
 }
 

diff --git a/www-client/epiphany/metadata.xml b/www-client/epiphany/metadata.xml
new file mode 100644
index 0000000..9421843
--- /dev/null
+++ b/www-client/epiphany/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+  <use>
+    <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
+    <flag name="nss">Import passwords from older gecko based <pkg>www-client/epiphany</pkg> keyring.</flag>
+  </use>
+</pkgmetadata>

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Priit Laes]

commit:     5c92c1212e469a1902f7736269203771ce7457ff
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Thu Oct 18 14:12:48 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Thu Oct 18 14:12:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5c92c121

www-client/epiphany: 3.6.0 → 3.6.1

---
 ...epiphany-3.6.0.ebuild => epiphany-3.6.1.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/www-client/epiphany/epiphany-3.6.0.ebuild b/www-client/epiphany/epiphany-3.6.1.ebuild
similarity index 100%
rename from www-client/epiphany/epiphany-3.6.0.ebuild
rename to www-client/epiphany/epiphany-3.6.1.ebuild

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Priit Laes]

commit:     7a73c6bed5159ed5545016b8ab84e3738028f410
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Thu Sep  6 10:24:55 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Thu Sep  6 10:24:55 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=7a73c6be

www-client/epiphany: 3.5.90 → 3.5.91.1

---
 ...hany-3.5.90.ebuild => epiphany-3.5.91.1.ebuild} |    6 +++++-
 www-client/epiphany/epiphany-9999.ebuild           |    6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/www-client/epiphany/epiphany-3.5.90.ebuild b/www-client/epiphany/epiphany-3.5.91.1.ebuild
similarity index 92%
rename from www-client/epiphany/epiphany-3.5.90.ebuild
rename to www-client/epiphany/epiphany-3.5.91.1.ebuild
index dcf5345..f6c8d34 100644
--- a/www-client/epiphany/epiphany-3.5.90.ebuild
+++ b/www-client/epiphany/epiphany-3.5.91.1.ebuild
@@ -13,6 +13,7 @@ fi
 DESCRIPTION="GNOME webbrowser based on Webkit"
 HOMEPAGE="http://projects.gnome.org/epiphany/"
 
+# TODO: coverage
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="doc +introspection +jit +nss test"
@@ -31,10 +32,11 @@ RDEPEND="
 	>=gnome-base/gnome-keyring-2.26.0
 	>=gnome-base/gsettings-desktop-schemas-0.0.1
 	>=net-dns/avahi-0.6.22
-	>=net-libs/webkit-gtk-1.9.90:3[introspection?]
+	>=net-libs/webkit-gtk-1.9.6:3[introspection?]
 	>=net-libs/libsoup-gnome-2.39.6:2.4
 	>=x11-libs/gtk+-3.5.2:3[introspection?]
 	>=x11-libs/libnotify-0.5.1
+	gnome-base/gnome-desktop:3
 
 	dev-db/sqlite:3
 	x11-libs/libX11
@@ -46,7 +48,9 @@ RDEPEND="
 	!jit? ( net-libs/webkit-gtk[-jit] )
 	nss? ( dev-libs/nss )"
 # paxctl needed for bug #407085
+# eautoreconf requires gnome-common-3.5.5
 DEPEND="${RDEPEND}
+	introspection? ( jit? ( >=gnome-base/gnome-common-3.5.5 ) )
 	>=dev-util/intltool-0.50
 	sys-apps/paxctl
 	sys-devel/gettext

diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-9999.ebuild
index dcf5345..f6c8d34 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-9999.ebuild
@@ -13,6 +13,7 @@ fi
 DESCRIPTION="GNOME webbrowser based on Webkit"
 HOMEPAGE="http://projects.gnome.org/epiphany/"
 
+# TODO: coverage
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="doc +introspection +jit +nss test"
@@ -31,10 +32,11 @@ RDEPEND="
 	>=gnome-base/gnome-keyring-2.26.0
 	>=gnome-base/gsettings-desktop-schemas-0.0.1
 	>=net-dns/avahi-0.6.22
-	>=net-libs/webkit-gtk-1.9.90:3[introspection?]
+	>=net-libs/webkit-gtk-1.9.6:3[introspection?]
 	>=net-libs/libsoup-gnome-2.39.6:2.4
 	>=x11-libs/gtk+-3.5.2:3[introspection?]
 	>=x11-libs/libnotify-0.5.1
+	gnome-base/gnome-desktop:3
 
 	dev-db/sqlite:3
 	x11-libs/libX11
@@ -46,7 +48,9 @@ RDEPEND="
 	!jit? ( net-libs/webkit-gtk[-jit] )
 	nss? ( dev-libs/nss )"
 # paxctl needed for bug #407085
+# eautoreconf requires gnome-common-3.5.5
 DEPEND="${RDEPEND}
+	introspection? ( jit? ( >=gnome-base/gnome-common-3.5.5 ) )
 	>=dev-util/intltool-0.50
 	sys-apps/paxctl
 	sys-devel/gettext

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Priit Laes]

commit:     858b596cfe1886818d5ccdf978635f9ca77e6a73
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Sat Aug 25 08:20:49 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sat Aug 25 08:20:49 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=858b596c

www-client/epiphany: 3.5.3 → 3.5.90

---
 ...piphany-3.5.3.ebuild => epiphany-3.5.90.ebuild} |   19 +++++++------------
 www-client/epiphany/epiphany-9999.ebuild           |   19 +++++++------------
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/www-client/epiphany/epiphany-3.5.3.ebuild b/www-client/epiphany/epiphany-3.5.90.ebuild
similarity index 85%
rename from www-client/epiphany/epiphany-3.5.3.ebuild
rename to www-client/epiphany/epiphany-3.5.90.ebuild
index 3371cf4..dcf5345 100644
--- a/www-client/epiphany/epiphany-3.5.3.ebuild
+++ b/www-client/epiphany/epiphany-3.5.90.ebuild
@@ -15,41 +15,38 @@ HOMEPAGE="http://projects.gnome.org/epiphany/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="avahi doc +introspection +jit +nss test"
+IUSE="doc +introspection +jit +nss test"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
 	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-# XXX: Should we add seed support? Seed seems to be unmaintained now.
 RDEPEND="
+	>=app-crypt/gcr-3.5.5
+	>=app-text/iso-codes-0.35
 	>=dev-libs/glib-2.31.2:2
-	>=x11-libs/gtk+-3.5.2:3[introspection?]
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
-	>=app-text/iso-codes-0.35
-	>=net-libs/webkit-gtk-1.7.92:3[introspection?]
-	>=net-libs/libsoup-gnome-2.37.1:2.4
 	>=gnome-base/gnome-keyring-2.26.0
 	>=gnome-base/gsettings-desktop-schemas-0.0.1
+	>=net-dns/avahi-0.6.22
+	>=net-libs/webkit-gtk-1.9.90:3[introspection?]
+	>=net-libs/libsoup-gnome-2.39.6:2.4
+	>=x11-libs/gtk+-3.5.2:3[introspection?]
 	>=x11-libs/libnotify-0.5.1
 
 	dev-db/sqlite:3
-	x11-libs/libICE
-	x11-libs/libSM
 	x11-libs/libX11
 
 	x11-themes/gnome-icon-theme
 	x11-themes/gnome-icon-theme-symbolic
 
-	avahi? ( >=net-dns/avahi-0.6.22 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 	!jit? ( net-libs/webkit-gtk[-jit] )
 	nss? ( dev-libs/nss )"
 # paxctl needed for bug #407085
 DEPEND="${RDEPEND}
-	app-text/gnome-doc-utils
 	>=dev-util/intltool-0.50
 	sys-apps/paxctl
 	sys-devel/gettext
@@ -61,10 +58,8 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--enable-shared
 		--disable-schemas-compile
-		--disable-scrollkeeper
 		--disable-static
 		--with-distributor-name=Gentoo
-		$(use_enable avahi zeroconf)
 		$(use_enable introspection)
 		$(use_enable nss)
 		$(use_enable test tests)"

diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-9999.ebuild
index 3371cf4..dcf5345 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-9999.ebuild
@@ -15,41 +15,38 @@ HOMEPAGE="http://projects.gnome.org/epiphany/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="avahi doc +introspection +jit +nss test"
+IUSE="doc +introspection +jit +nss test"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
 	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-# XXX: Should we add seed support? Seed seems to be unmaintained now.
 RDEPEND="
+	>=app-crypt/gcr-3.5.5
+	>=app-text/iso-codes-0.35
 	>=dev-libs/glib-2.31.2:2
-	>=x11-libs/gtk+-3.5.2:3[introspection?]
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
-	>=app-text/iso-codes-0.35
-	>=net-libs/webkit-gtk-1.7.92:3[introspection?]
-	>=net-libs/libsoup-gnome-2.37.1:2.4
 	>=gnome-base/gnome-keyring-2.26.0
 	>=gnome-base/gsettings-desktop-schemas-0.0.1
+	>=net-dns/avahi-0.6.22
+	>=net-libs/webkit-gtk-1.9.90:3[introspection?]
+	>=net-libs/libsoup-gnome-2.39.6:2.4
+	>=x11-libs/gtk+-3.5.2:3[introspection?]
 	>=x11-libs/libnotify-0.5.1
 
 	dev-db/sqlite:3
-	x11-libs/libICE
-	x11-libs/libSM
 	x11-libs/libX11
 
 	x11-themes/gnome-icon-theme
 	x11-themes/gnome-icon-theme-symbolic
 
-	avahi? ( >=net-dns/avahi-0.6.22 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 	!jit? ( net-libs/webkit-gtk[-jit] )
 	nss? ( dev-libs/nss )"
 # paxctl needed for bug #407085
 DEPEND="${RDEPEND}
-	app-text/gnome-doc-utils
 	>=dev-util/intltool-0.50
 	sys-apps/paxctl
 	sys-devel/gettext
@@ -61,10 +58,8 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--enable-shared
 		--disable-schemas-compile
-		--disable-scrollkeeper
 		--disable-static
 		--with-distributor-name=Gentoo
-		$(use_enable avahi zeroconf)
 		$(use_enable introspection)
 		$(use_enable nss)
 		$(use_enable test tests)"

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Priit Laes]

commit:     193b1e40f7b1b1d9cdbbcbe66dbfa0b174ed86ca
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Fri Jul 13 10:40:40 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Fri Jul 13 10:40:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=193b1e40

www-client/epiphany: Add 3.5.3 to overlay

---
 ...{epiphany-9999.ebuild => epiphany-3.5.3.ebuild} |    4 ++--
 www-client/epiphany/epiphany-9999.ebuild           |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-3.5.3.ebuild
similarity index 97%
copy from www-client/epiphany/epiphany-9999.ebuild
copy to www-client/epiphany/epiphany-3.5.3.ebuild
index 9999583..3371cf4 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-3.5.3.ebuild
@@ -25,7 +25,7 @@ fi
 # XXX: Should we add seed support? Seed seems to be unmaintained now.
 RDEPEND="
 	>=dev-libs/glib-2.31.2:2
-	>=x11-libs/gtk+-3.3.14:3[introspection?]
+	>=x11-libs/gtk+-3.5.2:3[introspection?]
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
 	>=app-text/iso-codes-0.35
@@ -50,7 +50,7 @@ RDEPEND="
 # paxctl needed for bug #407085
 DEPEND="${RDEPEND}
 	app-text/gnome-doc-utils
-	>=dev-util/intltool-0.40
+	>=dev-util/intltool-0.50
 	sys-apps/paxctl
 	sys-devel/gettext
 	virtual/pkgconfig

diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-9999.ebuild
index 9999583..3371cf4 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-9999.ebuild
@@ -25,7 +25,7 @@ fi
 # XXX: Should we add seed support? Seed seems to be unmaintained now.
 RDEPEND="
 	>=dev-libs/glib-2.31.2:2
-	>=x11-libs/gtk+-3.3.14:3[introspection?]
+	>=x11-libs/gtk+-3.5.2:3[introspection?]
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
 	>=app-text/iso-codes-0.35
@@ -50,7 +50,7 @@ RDEPEND="
 # paxctl needed for bug #407085
 DEPEND="${RDEPEND}
 	app-text/gnome-doc-utils
-	>=dev-util/intltool-0.40
+	>=dev-util/intltool-0.50
 	sys-apps/paxctl
 	sys-devel/gettext
 	virtual/pkgconfig

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Nirbheek Chauhan]

commit:     f7d55820e33e5a381b4fb21b6270becceb8488e8
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 30 19:06:39 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Mar 30 19:06:39 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f7d55820

www-client/epiphany: 3.3.92 → 3.4.0

---
 ...phany-3.3.92.ebuild => epiphany-3.4.0.1.ebuild} |    0
 www-client/epiphany/epiphany-9999.ebuild           |   18 +++++++-----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/www-client/epiphany/epiphany-3.3.92.ebuild b/www-client/epiphany/epiphany-3.4.0.1.ebuild
similarity index 100%
rename from www-client/epiphany/epiphany-3.3.92.ebuild
rename to www-client/epiphany/epiphany-3.4.0.1.ebuild

diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-9999.ebuild
index 8cd77ed..310e70a 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-9999.ebuild
@@ -23,18 +23,19 @@ else
 fi
 
 # XXX: Should we add seed support? Seed seems to be unmaintained now.
-RDEPEND="dev-db/sqlite
+RDEPEND="
 	>=dev-libs/glib-2.31.2:2
 	>=x11-libs/gtk+-3.3.14:3[introspection?]
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
 	>=app-text/iso-codes-0.35
-	>=net-libs/webkit-gtk-1.7.3:3[introspection?]
+	>=net-libs/webkit-gtk-1.7.92:3[introspection?]
 	>=net-libs/libsoup-gnome-2.37.1:2.4
 	>=gnome-base/gnome-keyring-2.26.0
 	>=gnome-base/gsettings-desktop-schemas-0.0.1
 	>=x11-libs/libnotify-0.5.1
 
+	dev-db/sqlite:3
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
@@ -77,15 +78,10 @@ src_prepare() {
 }
 
 src_test() {
-	# Tests require gsettings schemas from >=epiphany-3.3.5 to be installed
-	local v=$(best_version www-client/epiphany)
-	v=${v/www-client\/epiphany-/}
-	if version_is_at_least 3.3.5 "${v}"; then
-		Xemake check
-	else
-		ewarn "Skipping tests. To run tests, >=${PN}-3.3.5 needs to be already"
-		ewarn "installed on the system."
-	fi
+	# FIXME: this should be handled at eclass level
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+
+	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
 }
 
 src_install() {

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Nirbheek Chauhan]

commit:     4af04068dda80e01546518d7ebb56b2a45560fe1
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 25 12:19:03 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Mar 26 08:19:38 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4af04068

www-client/epiphany: 3.3.91 → 3.3.92

---
 ...iphany-3.3.91.ebuild => epiphany-3.3.92.ebuild} |   27 +++++++++++---------
 1 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/www-client/epiphany/epiphany-3.3.91.ebuild b/www-client/epiphany/epiphany-3.3.92.ebuild
similarity index 80%
rename from www-client/epiphany/epiphany-3.3.91.ebuild
rename to www-client/epiphany/epiphany-3.3.92.ebuild
index 1355b92..310e70a 100644
--- a/www-client/epiphany/epiphany-3.3.91.ebuild
+++ b/www-client/epiphany/epiphany-3.3.92.ebuild
@@ -6,6 +6,9 @@ EAPI="4"
 GCONF_DEBUG="yes"
 
 inherit autotools eutils gnome2 pax-utils versionator virtualx
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+fi
 
 DESCRIPTION="GNOME webbrowser based on Webkit"
 HOMEPAGE="http://projects.gnome.org/epiphany/"
@@ -13,21 +16,26 @@ HOMEPAGE="http://projects.gnome.org/epiphany/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="avahi doc +introspection +nss test"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
 
 # XXX: Should we add seed support? Seed seems to be unmaintained now.
-RDEPEND="dev-db/sqlite
+RDEPEND="
 	>=dev-libs/glib-2.31.2:2
 	>=x11-libs/gtk+-3.3.14:3[introspection?]
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
 	>=app-text/iso-codes-0.35
-	>=net-libs/webkit-gtk-1.7.3:3[introspection?]
+	>=net-libs/webkit-gtk-1.7.92:3[introspection?]
 	>=net-libs/libsoup-gnome-2.37.1:2.4
 	>=gnome-base/gnome-keyring-2.26.0
 	>=gnome-base/gsettings-desktop-schemas-0.0.1
 	>=x11-libs/libnotify-0.5.1
 
+	dev-db/sqlite:3
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
@@ -70,15 +78,10 @@ src_prepare() {
 }
 
 src_test() {
-	# Tests require gsettings schemas from >=epiphany-3.3.5 to be installed
-	local v=$(best_version www-client/epiphany)
-	v=${v/www-client\/epiphany-/}
-	if version_is_at_least 3.3.5 "${v}"; then
-		Xemake check
-	else
-		ewarn "Skipping tests. To run tests, >=${PN}-3.3.5 needs to be already"
-		ewarn "installed on the system."
-	fi
+	# FIXME: this should be handled at eclass level
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+
+	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
 }
 
 src_install() {

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Priit Laes]

commit:     df4380c5c545732fcd798e148e9fa91a75d20e2f
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Sat Mar 10 07:34:48 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sat Mar 10 07:34:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=df4380c5

www-client/epiphany: 3.3.90 → 3.3.91

---
 ...any-3.3.90-r1.ebuild => epiphany-3.3.91.ebuild} |    3 ++-
 www-client/epiphany/epiphany-9999.ebuild           |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/www-client/epiphany/epiphany-3.3.90-r1.ebuild b/www-client/epiphany/epiphany-3.3.91.ebuild
similarity index 97%
rename from www-client/epiphany/epiphany-3.3.90-r1.ebuild
rename to www-client/epiphany/epiphany-3.3.91.ebuild
index 5138a7d..1355b92 100644
--- a/www-client/epiphany/epiphany-3.3.90-r1.ebuild
+++ b/www-client/epiphany/epiphany-3.3.91.ebuild
@@ -16,7 +16,8 @@ IUSE="avahi doc +introspection +nss test"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # XXX: Should we add seed support? Seed seems to be unmaintained now.
-RDEPEND=">=dev-libs/glib-2.31.2:2
+RDEPEND="dev-db/sqlite
+	>=dev-libs/glib-2.31.2:2
 	>=x11-libs/gtk+-3.3.14:3[introspection?]
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7

diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-9999.ebuild
index c285a47..8cd77ed 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-9999.ebuild
@@ -23,7 +23,8 @@ else
 fi
 
 # XXX: Should we add seed support? Seed seems to be unmaintained now.
-RDEPEND=">=dev-libs/glib-2.31.2:2
+RDEPEND="dev-db/sqlite
+	>=dev-libs/glib-2.31.2:2
 	>=x11-libs/gtk+-3.3.14:3[introspection?]
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Alexandre Restovtsev]

commit:     97dc4791c6de898efcce3cf856db2c90a96b9db0
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 26 22:01:37 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Feb 26 22:23:58 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=97dc4791

www-client/epiphany: 3.3.5 → 3.3.90

Bump and clean up ebuild. Test suite requires gsettings schemas from
epiphany-3.3.5.

---
 ...piphany-3.3.5.ebuild => epiphany-3.3.90.ebuild} |   21 +++++++++++---
 www-client/epiphany/epiphany-9999.ebuild           |   28 +++++++++++++------
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/www-client/epiphany/epiphany-3.3.5.ebuild b/www-client/epiphany/epiphany-3.3.90.ebuild
similarity index 76%
rename from www-client/epiphany/epiphany-3.3.5.ebuild
rename to www-client/epiphany/epiphany-3.3.90.ebuild
index 37028b7..7196555 100644
--- a/www-client/epiphany/epiphany-3.3.5.ebuild
+++ b/www-client/epiphany/epiphany-3.3.90.ebuild
@@ -5,7 +5,7 @@
 EAPI="4"
 GCONF_DEBUG="yes"
 
-inherit eutils gnome2
+inherit eutils gnome2 versionator virtualx
 
 DESCRIPTION="GNOME webbrowser based on Webkit"
 HOMEPAGE="http://projects.gnome.org/epiphany/"
@@ -16,7 +16,7 @@ IUSE="avahi doc +introspection +nss test"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # XXX: Should we add seed support? Seed seems to be unmaintained now.
-COMMON_DEPEND=">=dev-libs/glib-2.31.2:2
+RDEPEND=">=dev-libs/glib-2.31.2:2
 	>=x11-libs/gtk+-3.3.14:3[introspection?]
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
@@ -31,14 +31,13 @@ COMMON_DEPEND=">=dev-libs/glib-2.31.2:2
 	x11-libs/libSM
 	x11-libs/libX11
 
-	app-misc/ca-certificates
 	x11-themes/gnome-icon-theme
+	x11-themes/gnome-icon-theme-symbolic
 
 	avahi? ( >=net-dns/avahi-0.6.22 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 	nss? ( dev-libs/nss )"
-DEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	app-text/gnome-doc-utils
 	>=dev-util/intltool-0.40
 	dev-util/pkgconfig
@@ -58,3 +57,15 @@ pkg_setup() {
 		$(use_enable nss)
 		$(use_enable test tests)"
 }
+
+src_test() {
+	# Tests require gsettings schemas from >=epiphany-3.3.5 to be installed
+	local v=$(best_version www-client/epiphany)
+	v=${v/www-client\/epiphany-/}
+	if version_is_at_least 3.3.5 "${v}"; then
+		Xemake check
+	else
+		ewarn "Skipping tests. To run tests, >=${PN}-3.3.5 needs to be already"
+		ewarn "installed on the system."
+	fi
+}

diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-9999.ebuild
index 6216de9..1377caf 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.30.2.ebuild,v 1.1 2010/06/13 21:09:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.2.1.ebuild,v 1.1 2011/11/06 04:57:01 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
 
-inherit eutils gnome2
+inherit eutils gnome2 versionator virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -15,15 +15,15 @@ HOMEPAGE="http://projects.gnome.org/epiphany/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="avahi doc +introspection nss test"
+IUSE="avahi doc +introspection +nss test"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 # XXX: Should we add seed support? Seed seems to be unmaintained now.
-COMMON_DEPEND=">=dev-libs/glib-2.31.2:2
+RDEPEND=">=dev-libs/glib-2.31.2:2
 	>=x11-libs/gtk+-3.3.14:3[introspection?]
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
@@ -38,21 +38,19 @@ COMMON_DEPEND=">=dev-libs/glib-2.31.2:2
 	x11-libs/libSM
 	x11-libs/libX11
 
-	app-misc/ca-certificates
 	x11-themes/gnome-icon-theme
+	x11-themes/gnome-icon-theme-symbolic
 
 	avahi? ( >=net-dns/avahi-0.6.22 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 	nss? ( dev-libs/nss )"
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	app-text/gnome-doc-utils
 	>=dev-util/intltool-0.40
 	dev-util/pkgconfig
 	sys-devel/gettext
 	doc? ( >=dev-util/gtk-doc-1 )"
 
-
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
 	G2CONF="${G2CONF}
@@ -66,3 +64,15 @@ pkg_setup() {
 		$(use_enable nss)
 		$(use_enable test tests)"
 }
+
+src_test() {
+	# Tests require gsettings schemas from >=epiphany-3.3.5 to be installed
+	local v=$(best_version www-client/epiphany)
+	v=${v/www-client\/epiphany-/}
+	if version_is_at_least 3.3.5 "${v}"; then
+		Xemake check
+	else
+		ewarn "Skipping tests. To run tests, >=${PN}-3.3.5 needs to be already"
+		ewarn "installed on the system."
+	fi
+}

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Priit Laes]

commit:     3bc26d0eca7cc9b041cb49ea61e1f0b0bf65ebde
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Tue Feb  7 11:00:11 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Tue Feb  7 11:47:57 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3bc26d0e

www-client/epiphany: 3.3.4.1 → 3.3.5

---
 ...iphany-3.3.4.1.ebuild => epiphany-3.3.5.ebuild} |    2 +-
 www-client/epiphany/epiphany-9999.ebuild           |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-client/epiphany/epiphany-3.3.4.1.ebuild b/www-client/epiphany/epiphany-3.3.5.ebuild
similarity index 97%
rename from www-client/epiphany/epiphany-3.3.4.1.ebuild
rename to www-client/epiphany/epiphany-3.3.5.ebuild
index c3613e3..37028b7 100644
--- a/www-client/epiphany/epiphany-3.3.4.1.ebuild
+++ b/www-client/epiphany/epiphany-3.3.5.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # XXX: Should we add seed support? Seed seems to be unmaintained now.
 COMMON_DEPEND=">=dev-libs/glib-2.31.2:2
-	>=x11-libs/gtk+-3.3.8:3[introspection?]
+	>=x11-libs/gtk+-3.3.14:3[introspection?]
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
 	>=app-text/iso-codes-0.35

diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-9999.ebuild
index 1c43e64..6216de9 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-9999.ebuild
@@ -24,7 +24,7 @@ fi
 
 # XXX: Should we add seed support? Seed seems to be unmaintained now.
 COMMON_DEPEND=">=dev-libs/glib-2.31.2:2
-	>=x11-libs/gtk+-3.3.8:3[introspection?]
+	>=x11-libs/gtk+-3.3.14:3[introspection?]
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
 	>=app-text/iso-codes-0.35

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Priit Laes]

commit:     b1a2b8fc5aa8b0b1047b4389bba01adb2399661e
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Wed Jan 18 22:44:28 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Wed Jan 18 22:44:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b1a2b8fc

www-client/epiphany: 3.3.4 -> 3.3.4.1

---
 ...iphany-3.3.4.ebuild => epiphany-3.3.4.1.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/www-client/epiphany/epiphany-3.3.4.ebuild b/www-client/epiphany/epiphany-3.3.4.1.ebuild
similarity index 100%
rename from www-client/epiphany/epiphany-3.3.4.ebuild
rename to www-client/epiphany/epiphany-3.3.4.1.ebuild

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Nirbheek Chauhan]

commit:     c01c095d31830f3b872ab7026396236bfed67e4c
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 18 07:21:16 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Jan 18 09:39:18 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c01c095d

www-client/epiphany: IUSE=+nss since upstream has that

---
 www-client/epiphany/epiphany-3.3.4.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/www-client/epiphany/epiphany-3.3.4.ebuild b/www-client/epiphany/epiphany-3.3.4.ebuild
index 1c5ec4d..c3613e3 100644
--- a/www-client/epiphany/epiphany-3.3.4.ebuild
+++ b/www-client/epiphany/epiphany-3.3.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://projects.gnome.org/epiphany/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="avahi doc +introspection nss test"
+IUSE="avahi doc +introspection +nss test"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # XXX: Should we add seed support? Seed seems to be unmaintained now.

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Gilles Dartiguelongue]

commit:     cf9b805d315f06c322c4166031ddb624e130457b
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 24 21:41:19 2011 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Jul 24 21:41:54 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=cf9b805d

www-client/epiphany: 3.0.3 → 3.0.4

	* Require webkit-gtk-1.4.2 for stability fixes

---
 ...epiphany-3.0.3.ebuild => epiphany-3.0.4.ebuild} |   11 ++++++-----
 www-client/epiphany/epiphany-9999.ebuild           |   11 ++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/www-client/epiphany/epiphany-3.0.3.ebuild b/www-client/epiphany/epiphany-3.0.4.ebuild
similarity index 94%
rename from www-client/epiphany/epiphany-3.0.3.ebuild
rename to www-client/epiphany/epiphany-3.0.4.ebuild
index 86fc9c2..729aa1e 100644
--- a/www-client/epiphany/epiphany-3.0.3.ebuild
+++ b/www-client/epiphany/epiphany-3.0.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.30.2.ebuild,v 1.1 2010/06/13 21:09:33 pacho Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="yes"
 
 inherit eutils gnome2
@@ -30,7 +30,7 @@ RDEPEND=">=dev-libs/glib-2.25.13:2
 	>=x11-libs/startup-notification-0.5
 	>=dev-libs/dbus-glib-0.71
 	>=app-text/iso-codes-0.35
-	>=net-libs/webkit-gtk-1.4:3[introspection?]
+	>=net-libs/webkit-gtk-1.4.2:3[introspection?]
 	>=net-libs/libsoup-gnome-2.33.1:2.4
 	>=gnome-base/gnome-keyring-2.26.0
 	>=gnome-base/gsettings-desktop-schemas-0.0.1
@@ -45,14 +45,15 @@ RDEPEND=">=dev-libs/glib-2.25.13:2
 	avahi? ( >=net-dns/avahi-0.6.22 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 	networkmanager? ( net-misc/networkmanager )
-	nss? ( dev-libs/nss )"
+	nss? ( dev-libs/nss )
+"
 DEPEND="${RDEPEND}
 	app-text/gnome-doc-utils
 	>=dev-util/intltool-0.40
 	dev-util/pkgconfig
 	sys-devel/gettext
-	doc? ( >=dev-util/gtk-doc-1 )"
-
+	doc? ( >=dev-util/gtk-doc-1 )
+"
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"

diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-9999.ebuild
index 720f0fb..729aa1e 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.30.2.ebuild,v 1.1 2010/06/13 21:09:33 pacho Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="yes"
 
 inherit eutils gnome2
@@ -30,7 +30,7 @@ RDEPEND=">=dev-libs/glib-2.25.13:2
 	>=x11-libs/startup-notification-0.5
 	>=dev-libs/dbus-glib-0.71
 	>=app-text/iso-codes-0.35
-	>=net-libs/webkit-gtk-1.3.13:3[introspection?]
+	>=net-libs/webkit-gtk-1.4.2:3[introspection?]
 	>=net-libs/libsoup-gnome-2.33.1:2.4
 	>=gnome-base/gnome-keyring-2.26.0
 	>=gnome-base/gsettings-desktop-schemas-0.0.1
@@ -45,14 +45,15 @@ RDEPEND=">=dev-libs/glib-2.25.13:2
 	avahi? ( >=net-dns/avahi-0.6.22 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 	networkmanager? ( net-misc/networkmanager )
-	nss? ( dev-libs/nss )"
+	nss? ( dev-libs/nss )
+"
 DEPEND="${RDEPEND}
 	app-text/gnome-doc-utils
 	>=dev-util/intltool-0.40
 	dev-util/pkgconfig
 	sys-devel/gettext
-	doc? ( >=dev-util/gtk-doc-1 )"
-
+	doc? ( >=dev-util/gtk-doc-1 )
+"
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Gilles Dartiguelongue]

commit:     6a1331c99230337ea508b2fa6093f730e7db5b40
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 15:52:32 2011 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat May 14 15:52:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6a1331c9

www-client/epiphany: gnome-base/nautilus: 3.0.2 → 3.0.3

---
 ...epiphany-3.0.2.ebuild => epiphany-3.0.3.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/www-client/epiphany/epiphany-3.0.2.ebuild b/www-client/epiphany/epiphany-3.0.3.ebuild
similarity index 100%
rename from www-client/epiphany/epiphany-3.0.2.ebuild
rename to www-client/epiphany/epiphany-3.0.3.ebuild

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Nirbheek Chauhan]

commit:     a291893d67dd313d464255747f813f6b6265992e
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon May  2 12:41:39 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon May  2 12:41:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a291893d

www-client/epiphany: 3.0.1 → 3.0.2

---
 ...epiphany-3.0.1.ebuild => epiphany-3.0.2.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/www-client/epiphany/epiphany-3.0.1.ebuild b/www-client/epiphany/epiphany-3.0.2.ebuild
similarity index 100%
rename from www-client/epiphany/epiphany-3.0.1.ebuild
rename to www-client/epiphany/epiphany-3.0.2.ebuild

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Gilles Dartiguelongue]

commit:     10d5658bc7a8460f83909f4e2d747fc2919eaa81
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 21:43:28 2011 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 22:17:36 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=10d5658b

www-client/epiphany: 3.0.0 → 3.0.1

---
 ...epiphany-3.0.0.ebuild => epiphany-3.0.1.ebuild} |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/www-client/epiphany/epiphany-3.0.0.ebuild b/www-client/epiphany/epiphany-3.0.1.ebuild
similarity index 97%
rename from www-client/epiphany/epiphany-3.0.0.ebuild
rename to www-client/epiphany/epiphany-3.0.1.ebuild
index 720f0fb..86fc9c2 100644
--- a/www-client/epiphany/epiphany-3.0.0.ebuild
+++ b/www-client/epiphany/epiphany-3.0.1.ebuild
@@ -30,7 +30,7 @@ RDEPEND=">=dev-libs/glib-2.25.13:2
 	>=x11-libs/startup-notification-0.5
 	>=dev-libs/dbus-glib-0.71
 	>=app-text/iso-codes-0.35
-	>=net-libs/webkit-gtk-1.3.13:3[introspection?]
+	>=net-libs/webkit-gtk-1.4:3[introspection?]
 	>=net-libs/libsoup-gnome-2.33.1:2.4
 	>=gnome-base/gnome-keyring-2.26.0
 	>=gnome-base/gsettings-desktop-schemas-0.0.1

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Gilles Dartiguelongue]

commit:     a60ee65cc348870e5e685e148531131a62b3f577
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  9 13:56:37 2011 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 18:03:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a60ee65c

www-client/epiphany: QAed

	* Sync with gentoo-x86 changes
	* Use GNOME_DEBUG_CHECK so leave debug handling to eclass
	* Drop now useless src_compile

(Portage version: 2.2.0_alpha29/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key C6085806)

---
 www-client/epiphany/epiphany-3.0.0.ebuild |   17 ++++++-----------
 www-client/epiphany/epiphany-9999.ebuild  |   17 ++++++-----------
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/www-client/epiphany/epiphany-3.0.0.ebuild b/www-client/epiphany/epiphany-3.0.0.ebuild
index 046ed67..720f0fb 100644
--- a/www-client/epiphany/epiphany-3.0.0.ebuild
+++ b/www-client/epiphany/epiphany-3.0.0.ebuild
@@ -3,6 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.30.2.ebuild,v 1.1 2010/06/13 21:09:33 pacho Exp $
 
 EAPI="3"
+GCONF_DEBUG="yes"
 
 inherit eutils gnome2
 if [[ ${PV} = 9999 ]]; then
@@ -22,7 +23,7 @@ else
 fi
 
 # XXX: Should we add seed support? Seed seems to be unmaintained now.
-RDEPEND=">=dev-libs/glib-2.25.3:2
+RDEPEND=">=dev-libs/glib-2.25.13:2
 	>=x11-libs/gtk+-3.0.2:3[introspection?]
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
@@ -38,14 +39,15 @@ RDEPEND=">=dev-libs/glib-2.25.3:2
 	x11-libs/libSM
 	x11-libs/libX11
 
+	app-misc/ca-certificates
+	x11-themes/gnome-icon-theme
+
 	avahi? ( >=net-dns/avahi-0.6.22 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 	networkmanager? ( net-misc/networkmanager )
-	nss? ( dev-libs/nss )
-	x11-themes/gnome-icon-theme"
+	nss? ( dev-libs/nss )"
 DEPEND="${RDEPEND}
 	app-text/gnome-doc-utils
-	gnome-base/gnome-common
 	>=dev-util/intltool-0.40
 	dev-util/pkgconfig
 	sys-devel/gettext
@@ -68,10 +70,3 @@ pkg_setup() {
 		$(use_enable nss)
 		$(use_enable test tests)"
 }
-
-src_compile() {
-	# Fix sandbox error with USE="introspection" and "doc"
-	# https://bugs.webkit.org/show_bug.cgi?id=35471
-	addpredict "$(unset HOME; echo ~)/.local"
-	gnome2_src_compile
-}

diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-9999.ebuild
index 046ed67..720f0fb 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-9999.ebuild
@@ -3,6 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.30.2.ebuild,v 1.1 2010/06/13 21:09:33 pacho Exp $
 
 EAPI="3"
+GCONF_DEBUG="yes"
 
 inherit eutils gnome2
 if [[ ${PV} = 9999 ]]; then
@@ -22,7 +23,7 @@ else
 fi
 
 # XXX: Should we add seed support? Seed seems to be unmaintained now.
-RDEPEND=">=dev-libs/glib-2.25.3:2
+RDEPEND=">=dev-libs/glib-2.25.13:2
 	>=x11-libs/gtk+-3.0.2:3[introspection?]
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
@@ -38,14 +39,15 @@ RDEPEND=">=dev-libs/glib-2.25.3:2
 	x11-libs/libSM
 	x11-libs/libX11
 
+	app-misc/ca-certificates
+	x11-themes/gnome-icon-theme
+
 	avahi? ( >=net-dns/avahi-0.6.22 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 	networkmanager? ( net-misc/networkmanager )
-	nss? ( dev-libs/nss )
-	x11-themes/gnome-icon-theme"
+	nss? ( dev-libs/nss )"
 DEPEND="${RDEPEND}
 	app-text/gnome-doc-utils
-	gnome-base/gnome-common
 	>=dev-util/intltool-0.40
 	dev-util/pkgconfig
 	sys-devel/gettext
@@ -68,10 +70,3 @@ pkg_setup() {
 		$(use_enable nss)
 		$(use_enable test tests)"
 }
-
-src_compile() {
-	# Fix sandbox error with USE="introspection" and "doc"
-	# https://bugs.webkit.org/show_bug.cgi?id=35471
-	addpredict "$(unset HOME; echo ~)/.local"
-	gnome2_src_compile
-}

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Nirbheek Chauhan]

commit:     ad49c9b896591a3b0ba17cea10fa2ff0969210b3
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  4 23:31:01 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Apr  5 00:29:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ad49c9b8

www-client/epiphany: 2.91.92 → 3.0.0

---
 ...iphany-2.91.92.ebuild => epiphany-3.0.0.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/www-client/epiphany/epiphany-2.91.92.ebuild b/www-client/epiphany/epiphany-3.0.0.ebuild
similarity index 100%
rename from www-client/epiphany/epiphany-2.91.92.ebuild
rename to www-client/epiphany/epiphany-3.0.0.ebuild

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Priit Laes]

commit:     3174dbd797a8c94cc45292a136ec2202efaa0af4
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Tue Mar 22 13:34:21 2011 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Tue Mar 22 13:34:21 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3174dbd7

www-client/epiphany: Bump to 2.91.92

---
 ...hany-2.91.91.ebuild => epiphany-2.91.92.ebuild} |   12 ++++++------
 www-client/epiphany/epiphany-9999.ebuild           |   12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/www-client/epiphany/epiphany-2.91.91.ebuild b/www-client/epiphany/epiphany-2.91.92.ebuild
similarity index 88%
rename from www-client/epiphany/epiphany-2.91.91.ebuild
rename to www-client/epiphany/epiphany-2.91.92.ebuild
index 805769f..2df5457 100644
--- a/www-client/epiphany/epiphany-2.91.91.ebuild
+++ b/www-client/epiphany/epiphany-2.91.92.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.30.2.ebuild,v 1.1 2010/06/13 21:09:33 pacho Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit eutils gnome2
 
 DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="http://www.gnome.org/projects/epiphany/"
+HOMEPAGE="http://projects.gnome.org/epiphany/"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -27,7 +27,7 @@ RDEPEND=">=dev-libs/glib-2.25.3:2
 	>=x11-libs/startup-notification-0.5
 	>=dev-libs/dbus-glib-0.71
 	>=app-text/iso-codes-0.35
-	>=net-libs/webkit-gtk-1.3.11:3[introspection?]
+	>=net-libs/webkit-gtk-1.3.13:3[introspection?]
 	>=net-libs/libsoup-gnome-2.33.1:2.4
 	>=gnome-base/gnome-keyring-2.26.0
 	>=gnome-base/gsettings-desktop-schemas-0.0.1
@@ -49,9 +49,9 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	doc? ( >=dev-util/gtk-doc-1 )"
 
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
 
 pkg_setup() {
+	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
 	G2CONF="${G2CONF}
 		--enable-shared
 		--disable-maintainer-mode
@@ -68,8 +68,8 @@ pkg_setup() {
 }
 
 src_compile() {
-	# Fix sandbox error with USE="introspection"
+	# Fix sandbox error with USE="introspection" and "doc"
 	# https://bugs.webkit.org/show_bug.cgi?id=35471
 	addpredict "$(unset HOME; echo ~)/.local"
-	emake || die "Compile failed"
+	gnome2_src_compile
 }

diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-9999.ebuild
index 805769f..2df5457 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-9999.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.30.2.ebuild,v 1.1 2010/06/13 21:09:33 pacho Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit eutils gnome2
 
 DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="http://www.gnome.org/projects/epiphany/"
+HOMEPAGE="http://projects.gnome.org/epiphany/"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -27,7 +27,7 @@ RDEPEND=">=dev-libs/glib-2.25.3:2
 	>=x11-libs/startup-notification-0.5
 	>=dev-libs/dbus-glib-0.71
 	>=app-text/iso-codes-0.35
-	>=net-libs/webkit-gtk-1.3.11:3[introspection?]
+	>=net-libs/webkit-gtk-1.3.13:3[introspection?]
 	>=net-libs/libsoup-gnome-2.33.1:2.4
 	>=gnome-base/gnome-keyring-2.26.0
 	>=gnome-base/gsettings-desktop-schemas-0.0.1
@@ -49,9 +49,9 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	doc? ( >=dev-util/gtk-doc-1 )"
 
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
 
 pkg_setup() {
+	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
 	G2CONF="${G2CONF}
 		--enable-shared
 		--disable-maintainer-mode
@@ -68,8 +68,8 @@ pkg_setup() {
 }
 
 src_compile() {
-	# Fix sandbox error with USE="introspection"
+	# Fix sandbox error with USE="introspection" and "doc"
 	# https://bugs.webkit.org/show_bug.cgi?id=35471
 	addpredict "$(unset HOME; echo ~)/.local"
-	emake || die "Compile failed"
+	gnome2_src_compile
 }

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Nirbheek Chauhan]

commit:     50652dece1aa7daa857bb7a43240047e24055d59
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  8 16:08:23 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Mar  9 11:21:35 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=50652dec

www-client/epiphany: 2.91.90 → 2.91.91

---
 ...hany-2.91.90.ebuild => epiphany-2.91.91.ebuild} |    4 ++--
 www-client/epiphany/epiphany-9999.ebuild           |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/www-client/epiphany/epiphany-2.91.90.ebuild b/www-client/epiphany/epiphany-2.91.91.ebuild
similarity index 96%
rename from www-client/epiphany/epiphany-2.91.90.ebuild
rename to www-client/epiphany/epiphany-2.91.91.ebuild
index 2101146..805769f 100644
--- a/www-client/epiphany/epiphany-2.91.90.ebuild
+++ b/www-client/epiphany/epiphany-2.91.91.ebuild
@@ -21,8 +21,8 @@ fi
 
 # XXX: Should we add seed support? Seed seems to be unmaintained now.
 RDEPEND=">=dev-libs/glib-2.25.3:2
-	>=x11-libs/gtk+-3.0.0:3[introspection?]
-	>=dev-libs/libxml2-2.6.12
+	>=x11-libs/gtk+-3.0.2:3[introspection?]
+	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
 	>=x11-libs/startup-notification-0.5
 	>=dev-libs/dbus-glib-0.71

diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-9999.ebuild
index 2101146..805769f 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-9999.ebuild
@@ -21,8 +21,8 @@ fi
 
 # XXX: Should we add seed support? Seed seems to be unmaintained now.
 RDEPEND=">=dev-libs/glib-2.25.3:2
-	>=x11-libs/gtk+-3.0.0:3[introspection?]
-	>=dev-libs/libxml2-2.6.12
+	>=x11-libs/gtk+-3.0.2:3[introspection?]
+	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
 	>=x11-libs/startup-notification-0.5
 	>=dev-libs/dbus-glib-0.71

[gentoo-commits] proj/gnome:master commit in: www-client/epiphany/

[Nirbheek Chauhan]

commit:     ed845bf185be4bf7c50853acd8e26b72359653cf
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 22 20:52:42 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Feb 22 20:52:42 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ed845bf1

www-client/epiphany: 2.91.6 -> 2.91.90, remove old, update live

---
 www-client/epiphany/epiphany-2.91.5.ebuild         |   75 --------------------
 ...phany-2.91.6.ebuild => epiphany-2.91.90.ebuild} |    6 +-
 www-client/epiphany/epiphany-9999.ebuild           |    6 +-
 3 files changed, 6 insertions(+), 81 deletions(-)

diff --git a/www-client/epiphany/epiphany-2.91.5.ebuild b/www-client/epiphany/epiphany-2.91.5.ebuild
deleted file mode 100644
index 8f829ea..0000000
--- a/www-client/epiphany/epiphany-2.91.5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.30.2.ebuild,v 1.1 2010/06/13 21:09:33 pacho Exp $
-
-EAPI="2"
-
-inherit eutils gnome2
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="http://www.gnome.org/projects/epiphany/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="avahi doc +introspection networkmanager +nss test"
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~sparc ~x86"
-fi
-
-# XXX: Should we add seed support? Seed seems to be unmaintained now.
-RDEPEND=">=dev-libs/glib-2.25.3
-	>=x11-libs/gtk+-2.99.0:3[introspection?]
-	>=dev-libs/libxml2-2.6.12
-	>=dev-libs/libxslt-1.1.7
-	>=x11-libs/startup-notification-0.5
-	>=dev-libs/dbus-glib-0.71
-	>=app-text/iso-codes-0.35
-	>=net-libs/webkit-gtk-1.3.9:3[introspection?]
-	>=net-libs/libsoup-gnome-2.29.91
-	>=gnome-base/gnome-keyring-2.26.0
-	>=gnome-base/gsettings-desktop-schemas-0.0.1
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-
-	avahi? ( >=net-dns/avahi-0.6.22 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	networkmanager? ( net-misc/networkmanager )
-	nss? ( dev-libs/nss )
-	x11-themes/gnome-icon-theme"
-DEPEND="${RDEPEND}
-	app-text/gnome-doc-utils
-	gnome-base/gnome-common
-	>=dev-util/intltool-0.40
-	dev-util/pkgconfig
-	sys-devel/gettext
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--enable-shared
-		--disable-maintainer-mode
-		--disable-schemas-compile
-		--disable-scrollkeeper
-		--disable-static
-		--with-distributor-name=Gentoo
-		--with-ca-file=${ROOT}/etc/ssl/certs/ca-certificates.crt
-		$(use_enable avahi zeroconf)
-		$(use_enable introspection)
-		$(use_enable networkmanager network-manager)
-		$(use_enable nss)
-		$(use_enable test tests)"
-}
-
-src_compile() {
-	# Fix sandbox error with USE="introspection"
-	# https://bugs.webkit.org/show_bug.cgi?id=35471
-	addpredict "$(unset HOME; echo ~)/.local"
-	emake || die "Compile failed"
-}

diff --git a/www-client/epiphany/epiphany-2.91.6.ebuild b/www-client/epiphany/epiphany-2.91.90.ebuild
similarity index 94%
rename from www-client/epiphany/epiphany-2.91.6.ebuild
rename to www-client/epiphany/epiphany-2.91.90.ebuild
index 47e30be..2101146 100644
--- a/www-client/epiphany/epiphany-2.91.6.ebuild
+++ b/www-client/epiphany/epiphany-2.91.90.ebuild
@@ -20,15 +20,15 @@ else
 fi
 
 # XXX: Should we add seed support? Seed seems to be unmaintained now.
-RDEPEND=">=dev-libs/glib-2.25.3
-	>=x11-libs/gtk+-2.99.0:3[introspection?]
+RDEPEND=">=dev-libs/glib-2.25.3:2
+	>=x11-libs/gtk+-3.0.0:3[introspection?]
 	>=dev-libs/libxml2-2.6.12
 	>=dev-libs/libxslt-1.1.7
 	>=x11-libs/startup-notification-0.5
 	>=dev-libs/dbus-glib-0.71
 	>=app-text/iso-codes-0.35
 	>=net-libs/webkit-gtk-1.3.11:3[introspection?]
-	>=net-libs/libsoup-gnome-2.33.1
+	>=net-libs/libsoup-gnome-2.33.1:2.4
 	>=gnome-base/gnome-keyring-2.26.0
 	>=gnome-base/gsettings-desktop-schemas-0.0.1
 

diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-9999.ebuild
index 47e30be..2101146 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-9999.ebuild
@@ -20,15 +20,15 @@ else
 fi
 
 # XXX: Should we add seed support? Seed seems to be unmaintained now.
-RDEPEND=">=dev-libs/glib-2.25.3
-	>=x11-libs/gtk+-2.99.0:3[introspection?]
+RDEPEND=">=dev-libs/glib-2.25.3:2
+	>=x11-libs/gtk+-3.0.0:3[introspection?]
 	>=dev-libs/libxml2-2.6.12
 	>=dev-libs/libxslt-1.1.7
 	>=x11-libs/startup-notification-0.5
 	>=dev-libs/dbus-glib-0.71
 	>=app-text/iso-codes-0.35
 	>=net-libs/webkit-gtk-1.3.11:3[introspection?]
-	>=net-libs/libsoup-gnome-2.33.1
+	>=net-libs/libsoup-gnome-2.33.1:2.4
 	>=gnome-base/gnome-keyring-2.26.0
 	>=gnome-base/gsettings-desktop-schemas-0.0.1