diff options
author | Gilles Dartiguelongue <eva@gentoo.org> | 2013-10-14 00:02:19 +0200 |
---|---|---|
committer | Gilles Dartiguelongue <eva@gentoo.org> | 2013-12-02 00:04:15 +0100 |
commit | 02e27f600fcf704844b8321141b2adca8357a312 (patch) | |
tree | 8f6c6f511784ec218e7a17b77a0b2c67d44ce822 | |
parent | dev-util/glade: 3.14.2 → 3.16.0 (diff) | |
download | gnome-02e27f600fcf704844b8321141b2adca8357a312.tar.gz gnome-02e27f600fcf704844b8321141b2adca8357a312.tar.bz2 gnome-02e27f600fcf704844b8321141b2adca8357a312.zip |
www-client/epiphany: 3.8.2 → 3.10.2
-rw-r--r-- | www-client/epiphany/Manifest | 12 | ||||
-rw-r--r-- | www-client/epiphany/epiphany-3.10.2.ebuild (renamed from www-client/epiphany/epiphany-3.7.91.ebuild) | 36 | ||||
-rw-r--r-- | www-client/epiphany/epiphany-9999.ebuild | 38 | ||||
-rw-r--r-- | www-client/epiphany/metadata.xml | 1 |
4 files changed, 51 insertions, 36 deletions
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest index 7a951635..6b078da4 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.2.tar.xz 3087916 SHA256 7788221f775605ab29b26b92f4907ca9d5e8cf7999d103697a5979228d5fdd47 SHA512 f49ffa4ea453f002e228a1932be1885bc426fb4e5fc96a61cdb7f44057ce3ae4f74527e713ffb670e39b618d41d8164fe7b2bb0f223da1de3b0e16539dd4f042 WHIRLPOOL 115f3dd0d9aaa9e14b2c5f4f12602859d3d02e21d10aac0b202270416ccf4496327aa9c8edea94ab137973e364dec18ba345745089ddb248582fd32b143969b5 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.21 (GNU/Linux) + +iEYEAREKAAYFAlKbv0oACgkQ1fmVwcYIWAb9aACg4nbEq5b6HxU6znmz6p8eioh3 +Wf4AnRPwESj0N5Jo5PnUlZLbsx8Ohpyu +=jLrR +-----END PGP SIGNATURE----- diff --git a/www-client/epiphany/epiphany-3.7.91.ebuild b/www-client/epiphany/epiphany-3.10.2.ebuild index 0d22fc44..45176417 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 7e6cdeb7..1d952869 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 9421843c..3833156a 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> |