Bump, remove some older versions, and mark 1.8.0 stable on x86.

(Portage version: 2.0.51.22-r2)

10 files changed, 22 insertions, 88 deletions

diff --git a/net-news/blam/ChangeLog b/net-news/blam/ChangeLog
index 28a1d69ebb4c..18b0ce6af5e1 100644
--- a/net-news/blam/ChangeLog
+++ b/net-news/blam/ChangeLog
@@ -1,6 +1,13 @@
 # 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.26 2005/06/06 08:22:48 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/blam/ChangeLog,v 1.27 2005/11/08 04:36:10 latexer Exp $
+
+*blam-1.8.2 (08 Nov 2005)
+
+  08 Nov 2005; Peter Johanson <latexer@gentoo.org> -blam-1.6.0-r1.ebuild,
+  -blam-1.6.1.ebuild, -blam-1.6.1-r1.ebuild, blam-1.6.1-r2.ebuild,
+  blam-1.8.0.ebuild, +blam-1.8.2.ebuild:
+  Bump, remove some older versions, and mark 1.8.0 stable on x86.
 
   06 Jun 2005; David Holm <dholm@gentoo.org> blam-1.8.0.ebuild:
   Added to ~ppc.
diff --git a/net-news/blam/blam-1.6.1-r1.ebuild b/net-news/blam/blam-1.6.1-r1.ebuild
deleted file mode 100644
index 93d7cb917d25..000000000000
--- a/net-news/blam/blam-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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-r1.ebuild,v 1.2 2005/05/06 01:20:21 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.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/blam-1.6.1-r2.ebuild b/net-news/blam/blam-1.6.1-r2.ebuild
index 37ab3330f011..3f3741d30af4 100644
--- a/net-news/blam/blam-1.6.1-r2.ebuild
+++ b/net-news/blam/blam-1.6.1-r2.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-news/blam/blam-1.6.1-r2.ebuild,v 1.2 2005/11/08 04:36:10 latexer Exp $
 
 inherit mono eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://ftp.imendio.com/pub/imendio/${PN}/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 
 IUSE=""
 DEPEND=">=dev-lang/mono-1.0
diff --git a/net-news/blam/blam-1.6.1.ebuild b/net-news/blam/blam-1.6.1.ebuild
deleted file mode 100644
index 9ac8763deb3b..000000000000
--- a/net-news/blam/blam-1.6.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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.ebuild,v 1.4 2005/04/21 00:37:04 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_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/blam-1.8.0.ebuild b/net-news/blam/blam-1.8.0.ebuild
index fbbdc2e3e2d5..abb7c792ea5c 100644
--- a/net-news/blam/blam-1.8.0.ebuild
+++ b/net-news/blam/blam-1.8.0.ebuild
@@ -1,6 +1,6 @@
 # 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.8.0.ebuild,v 1.6 2005/06/06 08:22:48 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/blam/blam-1.8.0.ebuild,v 1.7 2005/11/08 04:36:10 latexer Exp $
 
 inherit mono eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://ftp.imendio.com/pub/imendio/${PN}/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 IUSE=""
 DEPEND=">=dev-lang/mono-1.1.4
diff --git a/net-news/blam/blam-1.6.0-r1.ebuild b/net-news/blam/blam-1.8.2.ebuild
index e00b6b3a24e0..f86d2d6516db 100644
--- a/net-news/blam/blam-1.6.0-r1.ebuild
+++ b/net-news/blam/blam-1.8.2.ebuild
@@ -1,6 +1,6 @@
 # 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.0-r1.ebuild,v 1.5 2005/04/21 00:37:04 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/blam/blam-1.8.2.ebuild,v 1.1 2005/11/08 04:36:10 latexer Exp $
 
 inherit mono eutils
 
@@ -10,10 +10,10 @@ SRC_URI="http://ftp.imendio.com/pub/imendio/${PN}/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE=""
-DEPEND=">=dev-lang/mono-1.0
+DEPEND=">=dev-lang/mono-1.1.4
 		>=dev-dotnet/gtk-sharp-1.0.4-r1
 		=dev-dotnet/gtk-sharp-1.0*
 		=dev-dotnet/gconf-sharp-1.0*
@@ -23,8 +23,12 @@ DEPEND=">=dev-lang/mono-1.0
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gecko-fix.diff
+	if [ $(get_libdir) != "lib" ] ; then
+		sed -i -e 's:$(prefix)/lib/blam:$(libdir)/blam:' \
+			-e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
+			${S}/lib/Makefile.{in,am} \
+			${S}/libblam/Makefile.{in,am} ${S}/blam.in || die
+	fi
 }
 
 src_compile() {
diff --git a/net-news/blam/files/digest-blam-1.6.0-r1 b/net-news/blam/files/digest-blam-1.6.0-r1
deleted file mode 100644
index bd60dbcf48e1..000000000000
--- a/net-news/blam/files/digest-blam-1.6.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2d806ec6c57330b929dd3bd78e564659 blam-1.6.0.tar.gz 531361
diff --git a/net-news/blam/files/digest-blam-1.6.1 b/net-news/blam/files/digest-blam-1.6.1
deleted file mode 100644
index ee1e0982983e..000000000000
--- a/net-news/blam/files/digest-blam-1.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c84ca140aea625da50d9631bd72b7941 blam-1.6.1.tar.gz 547665
diff --git a/net-news/blam/files/digest-blam-1.6.1-r1 b/net-news/blam/files/digest-blam-1.6.1-r1
deleted file mode 100644
index ee1e0982983e..000000000000
--- a/net-news/blam/files/digest-blam-1.6.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c84ca140aea625da50d9631bd72b7941 blam-1.6.1.tar.gz 547665
diff --git a/net-news/blam/files/digest-blam-1.8.2 b/net-news/blam/files/digest-blam-1.8.2
new file mode 100644
index 000000000000..424cdf949505
--- /dev/null
+++ b/net-news/blam/files/digest-blam-1.8.2
@@ -0,0 +1 @@
+MD5 8cb05faedf60d895d94a5ecf9d10eb8f blam-1.8.2.tar.gz 597408