Make liferea only choose a single backend. bug #217003

Package-Manager: portage-2.1.5_rc2

3 files changed, 42 insertions, 25 deletions

diff --git a/net-news/liferea/ChangeLog b/net-news/liferea/ChangeLog
index 59a1d97e1f90..269f9eb831e0 100644
--- a/net-news/liferea/ChangeLog
+++ b/net-news/liferea/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-news/liferea
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.144 2008/04/09 08:29:16 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.145 2008/04/09 13:18:59 dang Exp $
+
+  09 Apr 2008; Daniel Gryniewicz <dang@gentoo.org> liferea-1.4.14.ebuild:
+  Make liferea only choose a single backend. bug #217003
 
   09 Apr 2008; Markus Rothe <corsair@gentoo.org> liferea-1.4.13.ebuild:
   Stable on ppc64; bug #216743
diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest
index 6facdf8f1cca..eedfe13f9e33 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX liferea-1.0.22-add-feed.patch 677 RMD160 a9f4203c943056a9752326379efe35172653319b SHA1 80ccd5923eb797b9252840cb9b29b6243af81e00 SHA256 0455f43ef73065d8d84a624682ea04a8dcb17d8537a0d97eda3756c3f463a9e3
 AUX liferea-1.1.0-libnotify.patch 552 RMD160 0bf67b33913e08ed5528b86813aae30649123304 SHA1 9aa754c47fb483d1c4bcbdbe4bfd12e55cc0bcb2 SHA256 73a54e020b045ee261f9444464a68f4f1aba831182498b8a103886b7c0108bab
 AUX liferea-1.2.23-backup-perms.patch 1211 RMD160 7ad9f9476f6b9bd3b0b47e982386d08ca096ba32 SHA1 16a9ca26887311066020312cdc2a5adb688a7793 SHA256 b409b32fbc3569ed5836e11439727038b5e9f522ced32f895f1401976fd15e06
@@ -8,6 +11,13 @@ DIST liferea-1.4.14.tar.gz 1616844 RMD160 17193c195417de18a995ca547d2ff0fe8d40fd
 EBUILD liferea-1.0.24.ebuild 1786 RMD160 3ba1527cb99de81e4b4d5906eae3679f73b9161f SHA1 8fb92869ebac7982ce3c963a0b9db62540f17649 SHA256 371464df5564a49797fc0221c6ae12766c3177af2c0dfba0ad53049419992fe1
 EBUILD liferea-1.2.23-r1.ebuild 2854 RMD160 caed5b4b30b45087db2c0bcd53e1d9bf49cc10a8 SHA1 35ab5a89d9f47d70af6dc8dae67f4ba79f6360f7 SHA256 f3018c2af0a2fd89b2bd44a2638d37de087fe065903101632a87dcc0e28e1113
 EBUILD liferea-1.4.13.ebuild 2714 RMD160 af5b25509c8b294b014b18e3ddd658ff038b865c SHA1 2f6e0c4231a36689db8ed857ea205aa689b7ad4e SHA256 a3e0700372f86b80ffcba5314c5846429340b58706468b30881abbf2ffe2a064
-EBUILD liferea-1.4.14.ebuild 2714 RMD160 e6ec345743b4c7928285b489489587edc8023b87 SHA1 d67542fbe52e627285121a51ebf157a1290a3280 SHA256 6a626fc7488cc1e11ae887f6f64bad31bc7f71ecedd2186112f27252adf5eb90
-MISC ChangeLog 42436 RMD160 9ac347707c8dd8e8291355f634e15d482c243c60 SHA1 63804f4d1d868e02855491af38881aaf116546ff SHA256 654d1632a426d8101c6c6e83e68831db66473697089b4f626c69652b07d520d4
+EBUILD liferea-1.4.14.ebuild 2841 RMD160 7285064764555101631cd96db073038140018a20 SHA1 83b4cdb930b69a657e6a6f2a93d3804ed4d71327 SHA256 28e5fc12c5702b496dca5071920a713e130f9c64f7845e5644efceee6b501f5c
+MISC ChangeLog 42565 RMD160 6d5247d9a97a5c1caf2b02e74123954f3291868d SHA1 1384d668ec66ddc8ec71ecde5a16853df1dbdd4e SHA256 e3438fcee6ae2f9831a196d61b76e0bdbaad755020eaf0c223a81cecd815604d
 MISC metadata.xml 255 RMD160 562a797d1896f67d305d0ed9a14e92b0b5f9e3d1 SHA1 05283cb82ca2afd01e086dd2de39efb2cdca548d SHA256 f7c60a684ebde7e8464e55aed08cf2ac2f536d175e426997630cb1f2e106f33b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iD8DBQFH/MIVomPajV0RnrERAqz6AJ9grZYv8U1yEyIhsKJ9Esd96CMNzgCfT3Hg
+KcZ0TdfEb9/fRpIoqq05p1Y=
+=Dbsp
+-----END PGP SIGNATURE-----
diff --git a/net-news/liferea/liferea-1.4.14.ebuild b/net-news/liferea/liferea-1.4.14.ebuild
index c8135c8e148d..c48aafcb727f 100644
--- a/net-news/liferea/liferea-1.4.14.ebuild
+++ b/net-news/liferea/liferea-1.4.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.4.14.ebuild,v 1.1 2008/04/07 17:05:53 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.4.14.ebuild,v 1.2 2008/04/09 13:18:59 dang Exp $
 
 WANT_AUTOMAKE=1.7
 WANT_AUTOCONF=latest
@@ -22,8 +22,7 @@ RDEPEND="
 	xulrunner? ( =net-libs/xulrunner-1.8* )
 	!xulrunner? ( firefox? ( =www-client/mozilla-firefox-2* ) )
 	!xulrunner? ( !firefox? ( seamonkey? ( =www-client/seamonkey-1* ) ) )
-	!amd64? ( !xulrunner? ( !firefox? ( !seamonkey? ( gnome-extra/gtkhtml:2 ) ) ) )
-	!amd64? ( gtkhtml? ( gnome-extra/gtkhtml:2 ) )
+	!amd64? ( !xulrunner? ( !firefox? ( !seamonkey? ( gtkhtml? ( gnome-extra/gtkhtml:2 ) ) ) ) )
 	>=x11-libs/gtk+-2.8
 	x11-libs/pango
 	>=gnome-base/gconf-2
@@ -43,32 +42,37 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog NEWS README"
 
 pkg_setup() {
-	# On amd64, gtkhtml isn't supported.  You need one of the gecko use flags
-	if use amd64 && ! use firefox && ! use seamonkey && ! use xulrunner; then
-		elog "gtkhtml is no longer supported on amd64; you will need to select"
-		elog "one of the gecko backends to use liferea"
-		die "You must enable on of the gecko backends on amd64"
-	fi
-
-	# if you don't choose a gecko to use, we will automatically
-	# use gtkhtml2 as the backend except on amd64 (where we failed above)
-	if ! use seamonkey && ! use firefox && ! use xulrunner && ! use amd64 ; then
-		G2CONF="${G2CONF} --enable-gtkhtml2"
-	elif ! use amd64 && use gtkhtml ; then
-		G2CONF="${G2CONF} --enable-gtkhtml2"
-	else
-		G2CONF="${G2CONF} --disable-gtkhtml2"
-	fi
-
-	# we prefer xulrunner over firefox over seamonkey
+	# Backends are now mutually exclusive.
+	# we prefer xulrunner over firefox over seamonkey over gtkhtml
 	if use xulrunner ; then
 		G2CONF="${G2CONF} --enable-xulrunner"
+		G2CONF="${G2CONF} --disable-gecko"
+		G2CONF="${G2CONF} --disable-gtkhtml2"
 	elif use firefox ; then
 		G2CONF="${G2CONF} --enable-gecko=firefox"
+		G2CONF="${G2CONF} --disable-xulrunner"
+		G2CONF="${G2CONF} --disable-gtkhtml2"
 	elif use seamonkey ; then
 		G2CONF="${G2CONF} --enable-gecko=seamonkey"
+		G2CONF="${G2CONF} --disable-xulrunner"
+		G2CONF="${G2CONF} --disable-gtkhtml2"
+	elif use gtkhtml ; then
+		if ! use amd64 ; then
+			G2CONF="${G2CONF} --enable-gtkhtml2"
+			G2CONF="${G2CONF} --disable-gecko"
+			G2CONF="${G2CONF} --disable-xulrunner"
+		else
+			elog ""
+			elog "gtkhtml is no longer supported on amd64; you will need to "
+			elog "select one of the gecko backends to use liferea.  "
+			elog "Preference is: xulrunner, firefox, then seamonkey."
+			die "You must enable on of the gecko backends on amd64"
+		fi
 	else
-		G2CONF="${G2CONF} --disable-gecko"
+		elog ""
+		elog "You must choose one backend for liferea to work.  Preference is:"
+		elog "xulrunner, firefox, seamonkey, then gtkhtml."
+		die "You must enable on of the backends"
 	fi
 
 	G2CONF="${G2CONF} \