Revision bump to include a patch so Liferea can be built against Firefox 1.5.

Package-Manager: portage-2.0.53

5 files changed, 114 insertions, 2 deletions

diff --git a/net-news/liferea/ChangeLog b/net-news/liferea/ChangeLog
index d2d73ede0732..127b7f16fff4 100644
--- a/net-news/liferea/ChangeLog
+++ b/net-news/liferea/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-news/liferea
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.31 2006/01/12 23:25:53 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.32 2006/01/13 23:14:22 citizen428 Exp $
+
+*liferea-1.0-r1 (13 Jan 2006)
+
+  13 Jan 2006; Michael Kohl <citizen428@gentoo.org>
+  +files/liferea-firefox-1.5.patch, +liferea-1.0-r1.ebuild:
+  Revision bump to include a patch so Liferea can be built against Firefox 1.5.
 
   12 Jan 2006; Saleem Abdulrasool <compnerd@gentoo.org>
   liferea-0.9.6.ebuild, liferea-0.9.7a.ebuild, liferea-0.9.7b.ebuild,
diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest
index b324703e2197..b50960d76b2e 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -1,16 +1,29 @@
-MD5 9fc72f14f83245b4edd7dbbfb5977be0 ChangeLog 8580
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ef6f3a499e570b548f7978e51ce74ad7 ChangeLog 8806
 MD5 ca0f3d49b323b6401d4b75e56fb151fe files/digest-liferea-0.9.6 66
 MD5 e79d04e2dcb1066bf83edf55b9b1e9f7 files/digest-liferea-0.9.7a 67
 MD5 4d464b035de4131b12167c6ce4a1dffd files/digest-liferea-0.9.7b 67
 MD5 f309c7f30cee3864c2461a0c5a2b05ef files/digest-liferea-1.0 64
+MD5 f309c7f30cee3864c2461a0c5a2b05ef files/digest-liferea-1.0-r1 64
 MD5 f9efd550765d540bf2d15dd7fafe153f files/digest-liferea-1.0_rc2 68
 MD5 44856fd3e858bd754985da1949624363 files/digest-liferea-1.0_rc3 68
 MD5 4abbef0103bb7d2f4c23803ad92448e3 files/digest-liferea-1.0_rc4 68
+MD5 86662e7c1f5a7d08669b0d6c729de55a files/liferea-firefox-1.5.patch 650
 MD5 848125241aa76ebb1329aac056983151 liferea-0.9.6.ebuild 757
 MD5 78a818f82f583f893b65118fec404ff7 liferea-0.9.7a.ebuild 1647
 MD5 7403b38f1f62d15594acf84a395f7c5f liferea-0.9.7b.ebuild 1646
+MD5 bffcbdddf3249f9fc59d74216e3140b4 liferea-1.0-r1.ebuild 1855
 MD5 391508720123ff6001823e9ff1d05a61 liferea-1.0.ebuild 1643
 MD5 b529e5920b2ec3ddd5cdc901d0d2a425 liferea-1.0_rc2.ebuild 1695
 MD5 208c62688dcb41b305fb84c70218c4d5 liferea-1.0_rc3.ebuild 1695
 MD5 49a7f1ddc264364445ccc7c2544c1be6 liferea-1.0_rc4.ebuild 1695
 MD5 e04d992316575de13c0505290156db3e metadata.xml 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDyDRpZgSmR+etHJoRAiyvAJ9BArmwLorotQKEE/ajF5RURgoO9QCfdZPL
+YdHs+LpEQcZWzCRMMh0pHYE=
+=4E/x
+-----END PGP SIGNATURE-----
diff --git a/net-news/liferea/files/digest-liferea-1.0-r1 b/net-news/liferea/files/digest-liferea-1.0-r1
new file mode 100644
index 000000000000..82b237403ad7
--- /dev/null
+++ b/net-news/liferea/files/digest-liferea-1.0-r1
@@ -0,0 +1 @@
+MD5 ba3a520361e5b02a27f93ee5ecda4448 liferea-1.0.tar.gz 1466393
diff --git a/net-news/liferea/files/liferea-firefox-1.5.patch b/net-news/liferea/files/liferea-firefox-1.5.patch
new file mode 100644
index 000000000000..e9abe11e371b
--- /dev/null
+++ b/net-news/liferea/files/liferea-firefox-1.5.patch
@@ -0,0 +1,22 @@
+--- src/mozilla/mozilla.cpp.orig	2005-09-24 10:10:56.000000000 +0000
++++ src/mozilla/mozilla.cpp	2005-12-03 16:51:25.000000000 +0000
+@@ -33,7 +33,9 @@
+ #include <gtk/gtk.h>
+ #include <gtkmozembed.h>
+ #include <gtkmozembed_internal.h>
++#define MOZILLA_INTERNAL_API
+ #include "nsIDocument.h"
++#undef MOZILLA_INTERNAL_API
+ #include "nsIDocShell.h"
+ #include "nsIDocShellTreeItem.h"
+ #include "nsIDocShellTreeNode.h"
+@@ -47,7 +49,9 @@
+ #include "nsIDOMKeyEvent.h"
+ #include "nsIDOMWindow.h"
+ #include "nsIPrefService.h"
++#define MOZILLA_INTERNAL_API
+ #include "nsIServiceManager.h"
++#undef MOZILLA_INTERNAL_API
+ 
+ extern "C" {
+ #include "../callbacks.h"
diff --git a/net-news/liferea/liferea-1.0-r1.ebuild b/net-news/liferea/liferea-1.0-r1.ebuild
new file mode 100644
index 000000000000..678cc1c0115b
--- /dev/null
+++ b/net-news/liferea/liferea-1.0-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.0-r1.ebuild,v 1.1 2006/01/13 23:14:23 citizen428 Exp $
+
+inherit gnome2 eutils
+
+
+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 ~sparc ~x86"
+IUSE="dbus firefox gtkhtml mozilla"
+
+RDEPEND=">=x11-libs/gtk+-2
+	>=dev-libs/libxml2-2.5.10
+	firefox? ( www-client/mozilla-firefox )
+	!firefox? ( mozilla? ( www-client/mozilla ) )
+	gtkhtml? ( =gnome-extra/gtkhtml-2* )
+	!mozilla? ( !firefox? ( =gnome-extra/gtkhtml-2* ) )
+	>=gnome-base/gconf-2
+	dbus? ( >=sys-apps/dbus-0.30 )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+DOCS="README AUTHORS ChangeLog COPYING"
+USE_DESTDIR="1"
+
+
+src_unpack () {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/liferea-firefox-1.5.patch
+}
+
+pkg_setup() {
+	if ! use gtkhtml && ! use mozilla && ! use firefox ; then
+		ewarn "None of the \"gtkhtml\", \"mozilla\" or \"firefox\" HTML backends"
+		ewarn "was selected by USE flags. Will use \"gtkhtml\"."
+	elif use mozilla && use firefox ; then
+		ewarn "Both \"mozilla\" and \"firefox\" were selected by USE flags."
+		ewarn "Will use \"firefox\"."
+	fi
+}
+
+src_compile() {
+	if ! use mozilla && ! use firefox || use gtkhtml ; then
+		G2CONF="${G2CONF} --enable-gtkhtml2"
+	else
+		G2CONF="${G2CONF} --disable-gtkhtml2"
+	fi
+	if use firefox ; then
+		G2CONF="${G2CONF} --enable-gecko=firefox"
+	elif use mozilla ; then
+		G2CONF="${G2CONF} --enable-gecko=mozilla"
+	else
+		G2CONF="${G2CONF} --disable-gecko"
+	fi
+	G2CONF="${G2CONF} $(use_enable dbus)"
+	gnome2_src_compile
+}
+
+src_install() {
+	gnome2_src_install
+	rm -f ${D}/usr/bin/${PN}
+	mv ${D}/usr/bin/${PN}-bin ${D}/usr/bin/${PN}
+}