rc5 with xulrunner

svn path=/maintainer/; revision=20

6 files changed, 23 insertions, 218 deletions

diff --git a/net-news/liferea/ChangeLog b/net-news/liferea/ChangeLog
index 8d27f36..26e4165 100644
--- a/net-news/liferea/ChangeLog
+++ b/net-news/liferea/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Dec 2006; Daniel Gryniewicz <dang@gentoo.org>
+  liferea-1.2_rc3-r1.ebuild, +liferea-1.2_rc5.ebuild:
+  rc5...
+
   05 Dec 2006; Daniel Gryniewicz <dang@gentoo.org> -liferea-1.1.9-r1.ebuild,
   -liferea-1.2_rc1-r1.ebuild, +liferea-1.2_rc3-r1.ebuild:
   New upstream bump
diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest
index 889884f..972ecb6 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -2,19 +2,15 @@ AUX liferea-1.1.0-libnotify.patch 552 RMD160 0bf67b33913e08ed5528b86813aae306491
 MD5 3a20454520ddb0c23157591a24516972 files/liferea-1.1.0-libnotify.patch 552
 RMD160 0bf67b33913e08ed5528b86813aae30649123304 files/liferea-1.1.0-libnotify.patch 552
 SHA256 73a54e020b045ee261f9444464a68f4f1aba831182498b8a103886b7c0108bab files/liferea-1.1.0-libnotify.patch 552
-AUX liferea-1.2_rc1-nm.patch 6209 RMD160 e8b2632fef56486e2b4f132b9181641b2a4d510b SHA1 0170305da4e4c67c7214e510da496d44deadff47 SHA256 b0712b4c3ce188c590ef98c4bf61c1a5c457aac821b077b55b72d35b84a354fb
-MD5 c08620c6b085e7956bd4870e073c2ef3 files/liferea-1.2_rc1-nm.patch 6209
-RMD160 e8b2632fef56486e2b4f132b9181641b2a4d510b files/liferea-1.2_rc1-nm.patch 6209
-SHA256 b0712b4c3ce188c590ef98c4bf61c1a5c457aac821b077b55b72d35b84a354fb files/liferea-1.2_rc1-nm.patch 6209
-DIST liferea-1.2-RC3.tar.gz 1282608 RMD160 d0d11aa18384fb1bc0d5cb8a317f1011c39ac92e SHA1 1a264a37a6e8334f8dcd6d6d48a1642fab8587fc SHA256 5e4028a655bb9f5912662e47b69c125646b3222d64125160929856c5d7aab53a
-EBUILD liferea-1.2_rc3-r1.ebuild 2323 RMD160 c2cb63660cfc1e891fe14e075c5dfee731b61ce7 SHA1 5e042aef00bbcbe0e54e979637add7d3ffc751fa SHA256 e4f769b15457e3cae18fbf961f21bc98fde871964cbe7a7cb26d2b14dd7c9a1e
-MD5 16b0e84450974dcd77454f49ca48b072 liferea-1.2_rc3-r1.ebuild 2323
-RMD160 c2cb63660cfc1e891fe14e075c5dfee731b61ce7 liferea-1.2_rc3-r1.ebuild 2323
-SHA256 e4f769b15457e3cae18fbf961f21bc98fde871964cbe7a7cb26d2b14dd7c9a1e liferea-1.2_rc3-r1.ebuild 2323
-MISC ChangeLog 273 RMD160 6eb4c58fd95a7519efaa188bf13abf53f2f2a4dd SHA1 ec898e358db7f62924e735ad7204792b404800ad SHA256 3db7d0218f6c59ce5c80accc219195abe8231c1edf6b63bf269f778ff4dc95e3
-MD5 84370e4a9b6e3205a34db4ce9219d996 ChangeLog 273
-RMD160 6eb4c58fd95a7519efaa188bf13abf53f2f2a4dd ChangeLog 273
-SHA256 3db7d0218f6c59ce5c80accc219195abe8231c1edf6b63bf269f778ff4dc95e3 ChangeLog 273
-MD5 f0f7c5084e443f5b633aae4d26f880b6 files/digest-liferea-1.2_rc3-r1 250
-RMD160 f61b087cd793ab456128c8c941d9f07ff38c4a26 files/digest-liferea-1.2_rc3-r1 250
-SHA256 edef6ff908d45f3a02242df4aff2de0b7904870be4ce08b649ee28027cb91e37 files/digest-liferea-1.2_rc3-r1 250
+DIST liferea-1.2-RC5.tar.gz 1307072 RMD160 bd489325333483567e7c37d8ed05c31ab88c7e10 SHA1 74be6888fa2fb07b9838cfaca777fca6db173df9 SHA256 ff4c633e559065626291a1d16b6e1331f1282a285c75d2a5623c50186001562f
+EBUILD liferea-1.2_rc5.ebuild 2087 RMD160 3c7753847442fca6ae7d5f3027cbd3b413635218 SHA1 e537fcd8a6d6e7361054fb689f3fc3856519a681 SHA256 9a756df178df6102f0279cf1796e30c88006cbcf58d6f34201616e46d43526ad
+MD5 ae2c374c418db8d9f37422544304362a liferea-1.2_rc5.ebuild 2087
+RMD160 3c7753847442fca6ae7d5f3027cbd3b413635218 liferea-1.2_rc5.ebuild 2087
+SHA256 9a756df178df6102f0279cf1796e30c88006cbcf58d6f34201616e46d43526ad liferea-1.2_rc5.ebuild 2087
+MISC ChangeLog 388 RMD160 e60aff96a698a775d017fdab555c15e71111880f SHA1 e54cde8e1ad9544e3338136e3a2bcdc8d914aefc SHA256 403a306e46327f5d63cff7b7ec98e673296dfd7456a429447105cfa30eadfb69
+MD5 34b15a76dd6c54f7f6ac564b9ebe1b0a ChangeLog 388
+RMD160 e60aff96a698a775d017fdab555c15e71111880f ChangeLog 388
+SHA256 403a306e46327f5d63cff7b7ec98e673296dfd7456a429447105cfa30eadfb69 ChangeLog 388
+MD5 943824239a489227948e586d6d3ca29c files/digest-liferea-1.2_rc5 250
+RMD160 6697b054ebe1b163925110adb9689b10f4994b59 files/digest-liferea-1.2_rc5 250
+SHA256 0fb51a0ea40d02ea956d8c02cf3c89b91d5f78e161b977b272db817f9dc5c040 files/digest-liferea-1.2_rc5 250
diff --git a/net-news/liferea/files/digest-liferea-1.2_rc3-r1 b/net-news/liferea/files/digest-liferea-1.2_rc3-r1
deleted file mode 100644
index 7d7630f..0000000
--- a/net-news/liferea/files/digest-liferea-1.2_rc3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 30542c315370db12cc9598d3b809b2d5 liferea-1.2-RC3.tar.gz 1282608
-RMD160 d0d11aa18384fb1bc0d5cb8a317f1011c39ac92e liferea-1.2-RC3.tar.gz 1282608
-SHA256 5e4028a655bb9f5912662e47b69c125646b3222d64125160929856c5d7aab53a liferea-1.2-RC3.tar.gz 1282608
diff --git a/net-news/liferea/files/digest-liferea-1.2_rc5 b/net-news/liferea/files/digest-liferea-1.2_rc5
new file mode 100644
index 0000000..114546b
--- /dev/null
+++ b/net-news/liferea/files/digest-liferea-1.2_rc5
@@ -0,0 +1,3 @@
+MD5 da5f471185743c6ce72695fc0904dc02 liferea-1.2-RC5.tar.gz 1307072
+RMD160 bd489325333483567e7c37d8ed05c31ab88c7e10 liferea-1.2-RC5.tar.gz 1307072
+SHA256 ff4c633e559065626291a1d16b6e1331f1282a285c75d2a5623c50186001562f liferea-1.2-RC5.tar.gz 1307072
diff --git a/net-news/liferea/files/liferea-1.2_rc1-nm.patch b/net-news/liferea/files/liferea-1.2_rc1-nm.patch
deleted file mode 100644
index 35d4614..0000000
--- a/net-news/liferea/files/liferea-1.2_rc1-nm.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -up -ruN liferea-1.2-RC1.orig/configure.ac liferea-1.2-RC1/configure.ac
---- liferea-1.2-RC1.orig/configure.ac	2006-11-04 09:32:53.000000000 -0500
-+++ liferea-1.2-RC1/configure.ac	2006-11-24 13:00:18.000000000 -0500
-@@ -30,6 +30,7 @@ AC_SYS_LARGEFILE
- 
- AC_ARG_ENABLE(sm,        AS_HELP_STRING([--disable-sm],[compile without X session management support]),,enable_sm=yes)
- AC_ARG_ENABLE(dbus,      AS_HELP_STRING([--disable-dbus],[compile without DBUS support]),,enable_dbus=yes)
-+AC_ARG_ENABLE(nm,        AS_HELP_STRING([--disable-nm],[compile without NetworkManager support]),,enable_nm=yes)
- AC_ARG_ENABLE(gtkhtml2,  AS_HELP_STRING([--disable-gtkhtml2],[don't compile the gtkhtml2 backend]),,enable_gtkhtml2=yes)
- AC_ARG_ENABLE(xulrunner, AS_HELP_STRING([--disable-xulrunner],[don't compile the xulrunner backend]),,enable_xulrunner=yes)
- AC_ARG_ENABLE(gecko,     AS_HELP_STRING([--disable-gecko],[don't compile the Gecko backend]),,enable_gecko=yes)
-@@ -342,6 +343,20 @@ AC_SUBST(DBUS_CFLAGS)
- AC_SUBST(DBUS_LIBS)
- dnl AM_CONDITIONAL(WITH_DBUS, test "x$enable_dbus" != "xyes")
- 
-+dnl ****
-+dnl NetworkManager
-+dnl ****
-+if test "x$enable_nm" = "xyes"; then
-+   AC_MSG_NOTICE([checking for NetworkManager])
-+   PKG_CHECK_MODULES([NM], [dbus-glib-1 libnm_glib],enable_nm=yes,enable_nm=no)
-+fi
-+
-+if test "x$enable_nm" = "xyes"; then
-+  AC_DEFINE(USE_NM, 1, [Define if we're using NetworkManager.])
-+fi
-+
-+AC_SUBST(NM_CFLAGS)
-+AC_SUBST(NM_LIBS)
- 
- dnl #
- dnl # Check for GNUTLS if it's specified.
-@@ -470,6 +485,7 @@ echo "Build LUA scripting Plugin ..... :
- echo
- echo "Use X Session Management........ : $enable_sm"
- echo "Use DBUS........................ : $enable_dbus"
-+echo "Use NetworkManager.............. : $enable_nm"
- echo "GNUTLS SSL/HTTPS Support........ : $enable_gnutls"
- echo
- eval eval echo Liferea will be installed in $bindir.
-diff --exclude-from=/home/dang/.diffrc -up -ruN liferea-1.2-RC1.orig/src/main.c liferea-1.2-RC1/src/main.c
---- liferea-1.2-RC1.orig/src/main.c	2006-11-07 18:30:35.000000000 -0500
-+++ liferea-1.2-RC1/src/main.c	2006-11-24 11:57:58.000000000 -0500
-@@ -136,6 +136,9 @@ int main(int argc, char *argv[]) {	
- #ifdef USE_DBUS
- 	dbus_g_thread_init();
- #endif
-+#ifdef USE_NM
-+	update_nm_initialize();
-+#endif
- 	gtk_init(&argc, &argv);
- 	
- 	bacon_connection = bacon_message_connection_new("liferea");
-diff --exclude-from=/home/dang/.diffrc -up -ruN liferea-1.2-RC1.orig/src/Makefile.am liferea-1.2-RC1/src/Makefile.am
---- liferea-1.2-RC1.orig/src/Makefile.am	2006-10-17 13:11:04.000000000 -0400
-+++ liferea-1.2-RC1/src/Makefile.am	2006-11-24 12:35:22.000000000 -0500
-@@ -15,6 +15,7 @@ AM_CPPFLAGS = \
- 	$(PACKAGE_CFLAGS) \
- 	$(X_CFLAGS) \
- 	$(DBUS_CFLAGS) \
-+	$(NM_CFLAGS) \
- 	$(GNUTLS_CFLAGS) 
- 
- bin_PROGRAMS = liferea-bin 
-@@ -39,7 +40,6 @@ liferea_bin_SOURCES = \
- 	itemset.c itemset.h \
- 	itemlist.c itemlist.h \
- 	itemview.c itemview.h \
--	main.c \
- 	metadata.c metadata.h \
- 	newsbin.c newsbin.h \
- 	node.c node.h \
-@@ -49,6 +49,7 @@ liferea_bin_SOURCES = \
- 	social.c social.h \
- 	support.c support.h \
- 	update.c update.h \
-+	main.c \
- 	vfolder.c vfolder.h 
- 
- liferea_bin_LDADD =	net/liblinet.a \
-@@ -57,7 +58,7 @@ liferea_bin_LDADD =	net/liblinet.a \
- 			notification/liblinotification.a \
- 			scripting/libliscript.a \
- 			ui/libliui.a \
--			$(PACKAGE_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS) $(DBUS_LIBS) $(INTLLIBS) $(GNUTLS_LIBS) 
-+			$(PACKAGE_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS) $(DBUS_LIBS) $(NM_LIBS) $(INTLLIBS) $(GNUTLS_LIBS) 
- 
- if PLATFORM_WIN32
- 
-Files liferea-1.2-RC1.orig/src/.Makefile.am.swp and liferea-1.2-RC1/src/.Makefile.am.swp differ
-diff --exclude-from=/home/dang/.diffrc -up -ruN liferea-1.2-RC1.orig/src/update.c liferea-1.2-RC1/src/update.c
---- liferea-1.2-RC1.orig/src/update.c	2006-09-11 18:57:03.000000000 -0400
-+++ liferea-1.2-RC1/src/update.c	2006-11-24 12:46:22.000000000 -0500
-@@ -34,6 +34,10 @@
- #include <sys/wait.h>
- #include <string.h>
- 
-+#ifdef USE_NM
-+#include <NetworkManager/libnm_glib.h>
-+#endif
-+
- #include "common.h"
- #include "conf.h"
- #include "debug.h"
-@@ -60,6 +64,12 @@ static GMutex	*cond_mutex = NULL;
- static GCond	*offline_cond = NULL;
- static gboolean	online = TRUE;
- 
-+#ifdef USE_NM
-+/* State for NM support */
-+static libnm_glib_ctx *nm_ctx = NULL;
-+static guint nm_id = 0;
-+#endif
-+
- /* update state interface */
- 
- updateStatePtr update_state_new(void) {
-@@ -583,3 +593,49 @@ void update_init(void) {
- 			   NULL,
- 			   NULL);
- }
-+
-+#ifdef USE_NM
-+static void update_network_monitor(libnm_glib_ctx *ctx, gpointer user_data)
-+{
-+	libnm_glib_state	state;
-+	gboolean online;
-+
-+	g_return_if_fail(ctx != NULL);
-+
-+	state = libnm_glib_get_network_state(ctx);
-+	online = update_is_online();
-+
-+	if (online && state == LIBNM_NO_NETWORK_CONNECTION) {
-+		 update_set_online(FALSE);
-+	} else if (!online && state == LIBNM_ACTIVE_NETWORK_CONNECTION) {
-+		 update_set_online(TRUE);
-+	}
-+}
-+
-+
-+gboolean update_nm_initialize(void)
-+{
-+	if (!nm_ctx)
-+	{
-+		nm_ctx = libnm_glib_init();
-+		if (!nm_ctx) {
-+				fprintf(stderr, "Could not initialize libnm.\n");
-+				return FALSE;
-+			  }	
-+	}
-+
-+	nm_id = libnm_glib_register_callback(nm_ctx, update_network_monitor, NULL, NULL);
-+	
-+	return TRUE;
-+}
-+
-+void update_nm_cleanup(void)
-+{
-+	if (nm_id != 0 && nm_ctx != NULL) {
-+		libnm_glib_unregister_callback(nm_ctx, nm_id);
-+		libnm_glib_shutdown(nm_ctx);
-+		nm_ctx = NULL;
-+		nm_id = 0;
-+	}
-+}
-+#endif
-diff --exclude-from=/home/dang/.diffrc -up -ruN liferea-1.2-RC1.orig/src/update.h liferea-1.2-RC1/src/update.h
---- liferea-1.2-RC1.orig/src/update.h	2006-09-11 18:12:25.000000000 -0400
-+++ liferea-1.2-RC1/src/update.h	2006-11-24 12:28:40.000000000 -0500
-@@ -245,4 +245,20 @@ void update_cancel_requests(gpointer own
-  */
- gboolean update_request_cancel_retry(struct request *request);
- 
-+#ifdef USE_NM
-+/**
-+ * Initialize NetworkManager support
-+ * Set up NM support, so that offline state can be set based on availability of
-+ * a network
-+ * 
-+ * @return TRUE if successfully initialized NM support
-+ */
-+gboolean update_nm_initialize(void);
-+
-+/**
-+ * Clean up NetworkManager support
-+ */
-+void update_nm_cleanup(void);
-+#endif // USE_NM
-+
- #endif
diff --git a/net-news/liferea/liferea-1.2_rc3-r1.ebuild b/net-news/liferea/liferea-1.2_rc5.ebuild
index dc15220..0d03836 100644
--- a/net-news/liferea/liferea-1.2_rc3-r1.ebuild
+++ b/net-news/liferea/liferea-1.2_rc5.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="dbus firefox gnutls gtkhtml libnotify networkmanager seamonkey xulrunner"
+IUSE="dbus firefox gnutls gtkhtml libnotify networkmanager xulrunner"
 
 RDEPEND=">=x11-libs/gtk+-2.8
 	x11-libs/pango
@@ -22,8 +22,7 @@ RDEPEND=">=x11-libs/gtk+-2.8
 	>=dev-libs/glib-2
 	xulrunner? ( net-libs/xulrunner )
 	!xulrunner? ( firefox? ( www-client/mozilla-firefox ) )
-	!xulrunner? ( !firefox? ( seamonkey? ( www-client/seamonkey ) ) )
-	!xulrunner? ( !firefox? ( !seamonkey? ( =gnome-extra/gtkhtml-2* ) ) )
+	!xulrunner? ( !firefox? ( =gnome-extra/gtkhtml-2* ) )
 	gtkhtml? ( =gnome-extra/gtkhtml-2* )
 	dbus? ( || ( >=dev-libs/dbus-glib-0.71
 		( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.36 ) )
@@ -46,7 +45,6 @@ src_unpack() {
 	cd ${S}
 
 	epatch "${FILESDIR}/${PN}-1.1.0-libnotify.patch"
-	epatch "${FILESDIR}/${P}-nm.patch"
 
 	eautoreconf || die "Autoreconf failed"
 }
@@ -54,19 +52,17 @@ src_unpack() {
 pkg_setup() {
 	# if you don't choose a gecko to use, we will automatically
 	# use gtkhtml2 as the backend.
-	if ! use seamonkey && ! use firefox || use gtkhtml ; then
+	if ! use firefox || use gtkhtml ; then
 		G2CONF="${G2CONF} --enable-gtkhtml2"
 	else
 		G2CONF="${G2CONF} --disable-gtkhtml2"
 	fi
 
-	# we prefer xulrunner over firefox over seamonkey
+	# we prefer xulrunner over firefox
 	if use xulrunner ; then
 		G2CONF="${G2CONF} --enable-gecko=xulrunner"
 	elif use firefox ; then
 		G2CONF="${G2CONF} --enable-gecko=firefox"
-	elif use seamonkey ; then
-		G2CONF="${G2CONF} --enable-gecko=seamonkey"
 	else
 		G2CONF="${G2CONF} --disable-gecko"
 	fi