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
