From 500496c704524c3253ee6eec82912273a640046b Mon Sep 17 00:00:00 2001 From: Leonardo Valeri Manera Date: Sat, 10 May 2008 17:32:32 +0200 Subject: [PATCH] net-news/liferea: make backends mutually exclusive. --- net-news/liferea/Manifest | 2 +- net-news/liferea/liferea-1.5.2b.ebuild | 28 ++++++++++++++++++++-------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest index ee5ba15..010eac8 100644 --- a/net-news/liferea/Manifest +++ b/net-news/liferea/Manifest @@ -1,2 +1,2 @@ DIST liferea-1.5.2b.tar.gz 1575132 RMD160 81f790e1f956c7dbe169466a949d8764294dd6e4 SHA1 73b4f1740c1823309f6b911e1ba8d786c1c51166 SHA256 6698647a253bb8ae7beaf07f9a473695e36082b0dd652889d29086def3e4be1b -EBUILD liferea-1.5.2b.ebuild 1944 RMD160 b13ffb23bf4fb504f964a17f83a196cc964956c8 SHA1 ee2fd93fd40958f4313892a9a15e50943746ce54 SHA256 43cd392b5080454af0461c0deaa5ae5985987cf95a73e797bd218d12f0b151d1 +EBUILD liferea-1.5.2b.ebuild 2434 RMD160 a4a64e8159e375ea0b26ba4df9265acbe51017bc SHA1 367b63ff8af5d5935539dd3e81e75f8678352f39 SHA256 30e7577d08a2a2295c69a19382db48f8954f413086c79fb0c547ce12101b1e1a diff --git a/net-news/liferea/liferea-1.5.2b.ebuild b/net-news/liferea/liferea-1.5.2b.ebuild index 285a6b1..645b4bc 100644 --- a/net-news/liferea/liferea-1.5.2b.ebuild +++ b/net-news/liferea/liferea-1.5.2b.ebuild @@ -18,8 +18,8 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE="avahi dbus gtkhtml gnutls libnotify lua networkmanager webkit xulrunner" RDEPEND="xulrunner? ( net-libs/xulrunner:1.8 ) - webkit? ( net-libs/webkitgtk ) - !amd64? ( gtkhtml? ( gnome-extra/gtkhtml:2 ) ) + !xulrunner? ( webkit? ( net-libs/webkitgtk ) ) + !amd64? ( !xulrunner? ( !webkit? ( gtkhtml? ( gnome-extra/gtkhtml:2 ) ) ) ) >=x11-libs/gtk+-2.8:2 x11-libs/pango gnome-base/gconf:2 @@ -45,18 +45,30 @@ S="${WORKDIR}"/${PN}-1.5.2 pkg_setup() { # Backends are now mutually exclusive. - # we prefer xulrunner over firefox over seamonkey over gtkhtml - if ! ( use xulrunner || use webkit || use gtkhtml ); then - ewarn "You must choose at least one backend for liferea to work." + # we prefer xulrunner over webkit over gtkhtml + if use xulrunner; then + einfo "Select XULrunner 1.8 backend." + G2CONF="--enable-xulrunner --disable-webkit --disable gtkhtml2" + elif use webkit; then + einfo "Selected webkit backend." + G2CONF="--disable-xulrunner --enable-webkit --disable gtkhtml2" + elif use gtkhtml; then + if ! use amd64; then + einfo "Selected GtkHTML2 backend." + G2CONF="--disable-xulrunner --disable-webkit --enable gtkhtml2" + else + eerror "GtkHTML2 backend is not supported on amd64 anymore." + eerror "Please choose either the xulrunner or the webkit backend." + die "Choose either the xulrunner or the webkit backend" + fi + else + ewarn "You must choose one backend for liferea to work." ewarn "Choices are: xulrunner, webkit, gtkhtml." die "You must enable one of the backends" fi G2CONF="${G2CONF} \ --disable-gecko \ - $(use_enable xulrunner) \ - $(use_enable webkit) \ - $(use_enable gtkhtml gtkhtml2) \ $(use_enable avahi) \ $(use_enable dbus) \ $(use_enable gnutls) \ -- 2.11.4.GIT