Yet another bump, to fix 1.1.7 issues.

Package-Manager: portage-2.0.51.21-r1

5 files changed, 76 insertions, 2 deletions

diff --git a/net-news/blam/ChangeLog b/net-news/blam/ChangeLog
index e20170fc1641..db8da36bb8d7 100644
--- a/net-news/blam/ChangeLog
+++ b/net-news/blam/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-news/blam
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/blam/ChangeLog,v 1.20 2005/05/06 01:20:21 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/blam/ChangeLog,v 1.21 2005/05/07 15:32:16 latexer Exp $
+
+*blam-1.6.1-r2 (07 May 2005)
+
+  07 May 2005; Peter Johanson <latexer@gentoo.org>
+  +files/blam-1.6.1-mono-1.1.7-compat-v2.diff, +blam-1.6.1-r2.ebuild:
+  Yet another bump, to fix 1.1.7 issues.
 
   06 May 2005; Peter Johanson <latexer@gentoo.org> blam-1.6.1-r1.ebuild:
   Meant to be ~x86
diff --git a/net-news/blam/Manifest b/net-news/blam/Manifest
index 27cd6ac03d89..025d15a6d016 100644
--- a/net-news/blam/Manifest
+++ b/net-news/blam/Manifest
@@ -1,10 +1,13 @@
 MD5 4d73cdf2b94eac6ad3868c1d4d7d2a10 blam-1.6.0-r1.ebuild 899
 MD5 086a263aa213f617c1b6ff089c00de03 blam-1.6.1.ebuild 816
-MD5 db64dd359806ccbee582ade146d6d99a ChangeLog 3274
+MD5 4bc0caba6af17aed212e32a5d164ce9f ChangeLog 3467
 MD5 a60fdfbce7c7cfc52187ff86a7f8bbf8 metadata.xml 222
 MD5 6968a0e969f62cad10eede8dcc4f65b3 blam-1.6.1-r1.ebuild 993
+MD5 284df599b60d21f80250bed729912ea7 blam-1.6.1-r2.ebuild 996
 MD5 00f43721ad68695ca3870578cce4a220 files/blam-1.6.0-gecko-fix.diff 614
 MD5 6d0aaf91ad9d6efc35a2f33b25d9a079 files/digest-blam-1.6.0-r1 62
 MD5 687962557e8232ff8b5f5b6f93d2c0f6 files/digest-blam-1.6.1 62
 MD5 4d50c34081dae158dfee08c8f011571a files/blam-1.6.1-mono-1.1.7-compat.diff 609
 MD5 687962557e8232ff8b5f5b6f93d2c0f6 files/digest-blam-1.6.1-r1 62
+MD5 bc93c8091228ce883de5381bcd35c801 files/blam-1.6.1-mono-1.1.7-compat-v2.diff 768
+MD5 687962557e8232ff8b5f5b6f93d2c0f6 files/digest-blam-1.6.1-r2 62
diff --git a/net-news/blam/blam-1.6.1-r2.ebuild b/net-news/blam/blam-1.6.1-r2.ebuild
new file mode 100644
index 000000000000..37ab3330f011
--- /dev/null
+++ b/net-news/blam/blam-1.6.1-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-news/blam/blam-1.6.1-r2.ebuild,v 1.1 2005/05/07 15:32:16 latexer Exp $
+
+inherit mono eutils
+
+DESCRIPTION="A RSS aggregator written in C#"
+HOMEPAGE="http://www.imendio.com/projects/blam/"
+SRC_URI="http://ftp.imendio.com/pub/imendio/${PN}/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+
+IUSE=""
+DEPEND=">=dev-lang/mono-1.0
+		>=dev-dotnet/gtk-sharp-1.0.4-r1
+		=dev-dotnet/gtk-sharp-1.0*
+		=dev-dotnet/gconf-sharp-1.0*
+		=dev-dotnet/glade-sharp-1.0*
+		=dev-dotnet/gecko-sharp-0.6*
+		>=gnome-base/gconf-2.4"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-mono-1.1.7-compat-v2.diff
+
+	libtoolize --force --copy || die
+	aclocal || die
+	autoconf || die
+	automake || die
+}
+
+src_compile() {
+	econf || die
+	emake -j1 || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+}
diff --git a/net-news/blam/files/blam-1.6.1-mono-1.1.7-compat-v2.diff b/net-news/blam/files/blam-1.6.1-mono-1.1.7-compat-v2.diff
new file mode 100644
index 000000000000..e91b041ed103
--- /dev/null
+++ b/net-news/blam/files/blam-1.6.1-mono-1.1.7-compat-v2.diff
@@ -0,0 +1,21 @@
+diff -aur blam-1.6.1-orig/src/FeedUpdater.cs blam-1.6.1/src/FeedUpdater.cs
+--- blam-1.6.1-orig/src/FeedUpdater.cs	2004-10-20 20:21:46.000000000 -0400
++++ blam-1.6.1/src/FeedUpdater.cs	2005-05-07 11:23:01.000000000 -0400
+@@ -22,9 +22,14 @@
+ 		string lastModified;
+ 		string eTag;
+ 
+-		WebRequest req = WebRequest.Create(channel.Url);
+-		req.Headers.Add("If-Modified-Since", channel.LastModified);
+-		req.Headers.Add("If-None-Match", channel.ETag);
++		HttpWebRequest req = (HttpWebRequest) WebRequest.Create(channel.Url);
++		if (channel.LastModified != "") {
++			req.IfModifiedSince = DateTime.Parse(channel.LastModified);
++		}
++
++		if (channel.ETag != "") {
++			req.Headers.Add("If-None-Match", channel.ETag);
++		}
+ 	
+ 		req.Timeout = 20000;
+ 		WebResponse res = null;
diff --git a/net-news/blam/files/digest-blam-1.6.1-r2 b/net-news/blam/files/digest-blam-1.6.1-r2
new file mode 100644
index 000000000000..ee1e0982983e
--- /dev/null
+++ b/net-news/blam/files/digest-blam-1.6.1-r2
@@ -0,0 +1 @@
+MD5 c84ca140aea625da50d9631bd72b7941 blam-1.6.1.tar.gz 547665