Bump for bug #197701

(Portage version: 2.1.3.16)

7 files changed, 160 insertions, 7 deletions

diff --git a/net-news/liferea/ChangeLog b/net-news/liferea/ChangeLog
index 6a453d0308de..8054b61340bc 100644
--- a/net-news/liferea/ChangeLog
+++ b/net-news/liferea/ChangeLog
@@ -1,6 +1,30 @@
 # ChangeLog for net-news/liferea
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.125 2007/10/17 23:44:14 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.126 2007/11/01 03:07:26 dang Exp $
+
+*liferea-1.2.23-r1 (01 Nov 2007)
+
+  01 Nov 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/liferea-1.2.23-backup-perms.patch, +liferea-1.2.23-r1.ebuild:
+  Bump with patch to fix backup perms; bug #197701
+
+*liferea-1.4.6 (01 Nov 2007)
+
+  01 Nov 2007; Daniel Gryniewicz <dang@gentoo.org> -liferea-1.4.5b.ebuild,
+  +liferea-1.4.6.ebuild:
+  Bump to 1.4.6
+  	* Fixes visible markup in "no title" item titles.
+  	* Fixes unread count in tray icon not updated properly (reported by
+  	  cpapp)
+  	* Fixes segfaults when clicking on empty folder (reported by Luis
+  	  Rodrigo Gallardo Cruz)
+  	* Fixes issue that feedlist.opml backup file has permissions 0644
+  	  instead if 0600.
+  	* Updated Japanese translation (Takeshi AIHANA)
+  	* Fixes segfault on mark-all-read (reported by snmartin)
+  	* Build fix for NetworkManager 0.7.x (Jeremy Katz)
+  	* Fixes looses user-defined feed titles on updates (reported by
+  	* several users)
 
 *liferea-1.4.5b (17 Oct 2007)
 
diff --git a/net-news/liferea/files/digest-liferea-1.2.23-r1 b/net-news/liferea/files/digest-liferea-1.2.23-r1
new file mode 100644
index 000000000000..222c507c7e2c
--- /dev/null
+++ b/net-news/liferea/files/digest-liferea-1.2.23-r1
@@ -0,0 +1,3 @@
+MD5 2d910c60f063a7d274d69815ca55d002 liferea-1.2.23.tar.gz 1517098
+RMD160 26a9eee1bd760c1e7f7a3fbdebb98880417b26eb liferea-1.2.23.tar.gz 1517098
+SHA256 136dee87c7156d7fb20233b6ba597e194bcaafbce4f132bd3b002148b2982a67 liferea-1.2.23.tar.gz 1517098
diff --git a/net-news/liferea/files/digest-liferea-1.4.5b b/net-news/liferea/files/digest-liferea-1.4.5b
deleted file mode 100644
index 22d5366347b2..000000000000
--- a/net-news/liferea/files/digest-liferea-1.4.5b
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b5e9f4b6ef74a90a051ba23321d9384b liferea-1.4.5b.tar.gz 1580291
-RMD160 f601c2ae89107bfbc1d91c96b7e340d5cc3b2587 liferea-1.4.5b.tar.gz 1580291
-SHA256 8efcfd3559a2501bcf4625ae6896d56d8aa9326e4f9ba144a333fa06ba43864b liferea-1.4.5b.tar.gz 1580291
diff --git a/net-news/liferea/files/digest-liferea-1.4.6 b/net-news/liferea/files/digest-liferea-1.4.6
new file mode 100644
index 000000000000..a51158015c12
--- /dev/null
+++ b/net-news/liferea/files/digest-liferea-1.4.6
@@ -0,0 +1,3 @@
+MD5 d38257cf130a43041e5f416e12ae94c5 liferea-1.4.6.tar.gz 1580078
+RMD160 058b758c9de024618ef83577e351e314d2b2c9e3 liferea-1.4.6.tar.gz 1580078
+SHA256 c8d164301460923507e80f51a9bc2d77a42f75456da4fe30498caf3423621c7e liferea-1.4.6.tar.gz 1580078
diff --git a/net-news/liferea/files/liferea-1.2.23-backup-perms.patch b/net-news/liferea/files/liferea-1.2.23-backup-perms.patch
new file mode 100644
index 000000000000..c0c2464e822a
--- /dev/null
+++ b/net-news/liferea/files/liferea-1.2.23-backup-perms.patch
@@ -0,0 +1,35 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN liferea-1.2.23.orig/src/common.c liferea-1.2.23/src/common.c
+--- liferea-1.2.23.orig/src/common.c	2007-08-19 13:17:58.000000000 -0400
++++ liferea-1.2.23/src/common.c	2007-10-31 22:42:36.000000000 -0400
+@@ -908,6 +908,9 @@ static void common_init_cache_path(void)
+ 
+ 	g_free(cachePath);
+ 	/* lifereaUserPath reused globally */
++	
++	/* ensure reasonable default umask */
++	umask (077);
+ }
+ 
+ const gchar * common_get_cache_path(void) {
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN liferea-1.2.23.orig/src/export.c liferea-1.2.23/src/export.c
+--- liferea-1.2.23.orig/src/export.c	2007-06-20 18:22:10.000000000 -0400
++++ liferea-1.2.23/src/export.c	2007-10-31 22:43:35.000000000 -0400
+@@ -126,15 +126,15 @@ gboolean export_OPML_feedlist(const gcha
+ 			error = TRUE;
+ 		}
+ 		
+-		if(trusted)
+-			old_umask = umask(077);
++		if(!trusted)
++			old_umask = umask(022);	/* give read permissions for other, per-default we wouldn't give it... */
+ 			
+ 		if(-1 == common_save_xml(doc, backupFilename)) {
+ 			g_warning("Could not export to OPML file!!");
+ 			error = TRUE;
+ 		}
+ 		
+-		if(trusted)
++		if(!trusted)
+ 			umask(old_umask);
+ 			
+ 		xmlFreeDoc(doc);
diff --git a/net-news/liferea/liferea-1.2.23-r1.ebuild b/net-news/liferea/liferea-1.2.23-r1.ebuild
new file mode 100644
index 000000000000..de7a20754174
--- /dev/null
+++ b/net-news/liferea/liferea-1.2.23-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.2.23-r1.ebuild,v 1.1 2007/11/01 03:07:26 dang Exp $
+
+WANT_AUTOMAKE=1.7
+WANT_AUTOCONF=latest
+inherit gnome2 flag-o-matic eutils autotools
+
+DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo/etc feeds"
+HOMEPAGE="http://liferea.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="dbus firefox gtkhtml gnutls libnotify lua networkmanager seamonkey xulrunner"
+
+RDEPEND=">=x11-libs/gtk+-2.8
+	x11-libs/pango
+	>=gnome-base/gconf-2
+	>=dev-libs/libxml2-2.6.27
+	>=dev-libs/libxslt-1.1.19
+	>=dev-libs/glib-2
+	xulrunner? ( net-libs/xulrunner )
+	!xulrunner? ( firefox? ( www-client/mozilla-firefox ) )
+	!xulrunner? ( !firefox? ( seamonkey? ( www-client/seamonkey ) ) )
+	!amd64? ( !xulrunner? ( !firefox? ( !seamonkey? ( =gnome-extra/gtkhtml-2* ) ) ) )
+	!amd64? ( gtkhtml? ( =gnome-extra/gtkhtml-2* ) )
+	dbus? ( >=dev-libs/dbus-glib-0.71 )
+	libnotify? ( >=x11-libs/libnotify-0.3.2 )
+	networkmanager? ( net-misc/networkmanager )
+	lua? ( >=dev-lang/lua-5.1 )
+	gnutls? ( net-libs/gnutls )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.35"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_unpack() {
+	gnome2_src_unpack
+
+	epatch "${FILESDIR}/${PN}-1.1.0-libnotify.patch"
+	epatch "${FILESDIR}/${PN}-1.2.23-backup-perms.patch"
+
+	eautoreconf || die "Autoreconf failed"
+}
+
+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
+	if use xulrunner ; then
+		G2CONF="${G2CONF} --enable-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
+
+	G2CONF="${G2CONF} \
+		$(use_enable dbus) \
+		$(use_enable gnutls) \
+		$(use_enable libnotify) \
+		$(use_enable lua) \
+		$(use_enable networkmanager nm)"
+}
+
+src_install() {
+	gnome2_src_install
+	rm -f "${D}/usr/bin/${PN}"
+	mv "${D}/usr/bin/${PN}-bin" "${D}/usr/bin/${PN}"
+}
diff --git a/net-news/liferea/liferea-1.4.5b.ebuild b/net-news/liferea/liferea-1.4.6.ebuild
index 37204a80489f..d83b16874d19 100644
--- a/net-news/liferea/liferea-1.4.5b.ebuild
+++ b/net-news/liferea/liferea-1.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.4.5b.ebuild,v 1.1 2007/10/17 23:44:14 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.4.6.ebuild,v 1.1 2007/11/01 03:07:26 dang Exp $
 
 WANT_AUTOMAKE=1.7
 WANT_AUTOCONF=latest
@@ -81,6 +81,6 @@ pkg_setup() {
 
 src_install() {
 	gnome2_src_install
-	rm -f ${D}/usr/bin/${PN}
-	mv ${D}/usr/bin/${PN}-bin ${D}/usr/bin/${PN}
+	rm -f "${D}/usr/bin/${PN}"
+	mv "${D}/usr/bin/${PN}-bin" "${D}/usr/bin/${PN}"
 }