aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2013-10-14 00:02:19 +0200
committerGilles Dartiguelongue <eva@gentoo.org>2013-11-15 01:39:12 +0100
commit05fd1ba4e14c65fdd14baf3c11db8548a83b8bbf (patch)
tree6abf76a551abb3dc1d8bc8a67c6385c97923e188 /www-client
parentgnome-extra/gnome-user-share: 3.8.3 → 3.10.0 (diff)
downloadgnome-05fd1ba4e14c65fdd14baf3c11db8548a83b8bbf.tar.gz
gnome-05fd1ba4e14c65fdd14baf3c11db8548a83b8bbf.tar.bz2
gnome-05fd1ba4e14c65fdd14baf3c11db8548a83b8bbf.zip
www-client/epiphany: 3.8.2 → 3.10.0
Diffstat (limited to 'www-client')
-rw-r--r--www-client/epiphany/Manifest12
-rw-r--r--www-client/epiphany/epiphany-3.10.0.ebuild (renamed from www-client/epiphany/epiphany-3.7.91.ebuild)32
-rw-r--r--www-client/epiphany/epiphany-9999.ebuild36
3 files changed, 46 insertions, 34 deletions
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 7a951635..471a7fd4 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1 +1,11 @@
-DIST epiphany-3.7.91.tar.xz 2482380 SHA256 52f09d84c813206d6721681d37a05c50f028e734e8c52b606508669071a32b86 SHA512 1821011184d6a98c1d6f3ef240e5463b10289609b2eca647bfee71a9b43961cba4da70790f3e0d42b5c7d2fb759bbb9c225b582530b29880fae93a3b81fdff30 WHIRLPOOL 0f108f72992c805554335abb61467108c8bdb7b43cc89ef86132d29f5a99594978330bbc56f39f2dc3c7a31ba831efb47a9a7b7f1883247221e27fdfe5e6dfdd
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+DIST epiphany-3.10.0.tar.xz 3085076 SHA256 7bd2c3b21464a83909d75befe2f9501c1ab2f00e2371f26023f79818faec351e SHA512 26a5afca461db4a05824ae44d66032387e1777480a9a78f38b202a3f99396db016e440183f978aa1184d9f6cd4a645793b6d214facf3b5c7cca740bda91a71a7 WHIRLPOOL 073df0f1d2149493a2d16cd8d57608657fffadd73749e6a1ad31ec077f9e6302c3cc09ba8f1c6d441c2125ed2e77389fb38fd6f4425f789ea84e1e9dc28a2435
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.21 (GNU/Linux)
+
+iEYEAREKAAYFAlJbGGwACgkQ1fmVwcYIWAZplQCgvOxSAkMVZndctn53QaKEZQJ/
+0mUAn38nG8pBCwUtO011LK1hzDCbcoDW
+=mqhI
+-----END PGP SIGNATURE-----
diff --git a/www-client/epiphany/epiphany-3.7.91.ebuild b/www-client/epiphany/epiphany-3.10.0.ebuild
index 0d22fc44..74dd4215 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 7e6cdeb7..1c6bd509 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() {