Marked 0.9.8.1 stable on x86. Removed old ebuild. Some general cleanup.

6 files changed, 35 insertions, 102 deletions

diff --git a/net-news/slrn/ChangeLog b/net-news/slrn/ChangeLog
index 99eaac0331fc..23349c598fba 100644
--- a/net-news/slrn/ChangeLog
+++ b/net-news/slrn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-news/slrn
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/slrn/ChangeLog,v 1.32 2004/11/12 23:42:55 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/slrn/ChangeLog,v 1.33 2004/12/05 02:42:10 swegener Exp $
+
+  05 Dec 2004; Sven Wegener <swegener@gentoo.org> slrn-0.9.8.0-r1.ebuild,
+  -slrn-0.9.8.0-r2.ebuild, slrn-0.9.8.0.ebuild, slrn-0.9.8.1.ebuild:
+  Marked 0.9.8.1 stable on x86. Removed old ebuild. Some general cleanup.
 
   13 Nov 2004; Sven Wegener <swegener@gentoo.org>
   -files/0.9.8.1/slrn-0.9.8.1-lastchar.diff,
diff --git a/net-news/slrn/files/digest-slrn-0.9.8.0-r2 b/net-news/slrn/files/digest-slrn-0.9.8.0-r2
deleted file mode 100644
index 02026be11140..000000000000
--- a/net-news/slrn/files/digest-slrn-0.9.8.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 47e9931771114ba192356a0473e9649e slrn-0.9.8.0.tar.bz2 995881
diff --git a/net-news/slrn/slrn-0.9.8.0-r1.ebuild b/net-news/slrn/slrn-0.9.8.0-r1.ebuild
index f5b94dde2e6b..b881c3d44ade 100644
--- a/net-news/slrn/slrn-0.9.8.0-r1.ebuild
+++ b/net-news/slrn/slrn-0.9.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/slrn/slrn-0.9.8.0-r1.ebuild,v 1.9 2004/08/22 22:06:03 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/slrn/slrn-0.9.8.0-r1.ebuild,v 1.10 2004/12/05 02:42:10 swegener Exp $
 
 inherit eutils
 
@@ -29,7 +29,8 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	for i in ${SLRN_PATCHES} ; do
+	for i in ${SLRN_PATCHES}
+	do
 		epatch ${FILESDIR}/${PV}/${P}-${i}.diff
 	done
 }
@@ -38,9 +39,9 @@ src_compile() {
 	econf \
 		--with-docdir=/usr/share/doc/${PF} \
 		--with-slrnpull \
-		`use_enable nls` \
-		`use_with ssl` \
-		`use_with uudeview` \
+		$(use_enable nls) \
+		$(use_with ssl) \
+		$(use_with uudeview) \
 		|| die "econf failed"
 	emake || die "emake failed"
 }
diff --git a/net-news/slrn/slrn-0.9.8.0-r2.ebuild b/net-news/slrn/slrn-0.9.8.0-r2.ebuild
deleted file mode 100644
index cef20656fd66..000000000000
--- a/net-news/slrn/slrn-0.9.8.0-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/slrn/slrn-0.9.8.0-r2.ebuild,v 1.2 2004/09/08 02:52:03 vapier Exp $
-
-inherit eutils
-
-# Upstream patches from http://slrn.sourceforge.net/patches/
-# ${FILESDIR}/${PV}/${P}-<name>.diff
-SLRN_PATCHES="mime post ranges ranges2"
-
-DESCRIPTION="s-lang Newsreader"
-HOMEPAGE="http://slrn.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~sparc ~ppc ~x86"
-IUSE="ssl nls unicode uudeview"
-
-RDEPEND="virtual/mta
-	>=app-arch/sharutils-4.2.1
-	>=sys-libs/slang-1.4.9-r1
-	ssl? ( >=dev-libs/openssl-0.9.6 )"
-DEPEND="${RDEPEND}
-	uudeview? ( dev-libs/uulib )
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	for i in ${SLRN_PATCHES} ; do
-		epatch ${FILESDIR}/${PV}/${P}-${i}.diff
-	done
-
-	use unicode && epatch ${FILESDIR}/${PV}/${P}-utf8.patch
-}
-
-src_compile() {
-	econf \
-		--with-docdir=/usr/share/doc/${PF} \
-		--with-slrnpull \
-		`use_enable nls` \
-		`use_with ssl` \
-		`use_with uudeview` \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-	make DESTDIR=${D} install || die "make install failed"
-}
diff --git a/net-news/slrn/slrn-0.9.8.0.ebuild b/net-news/slrn/slrn-0.9.8.0.ebuild
index f6e560e6a9f1..83095ed1054f 100644
--- a/net-news/slrn/slrn-0.9.8.0.ebuild
+++ b/net-news/slrn/slrn-0.9.8.0.ebuild
@@ -1,59 +1,39 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/slrn/slrn-0.9.8.0.ebuild,v 1.12 2004/07/08 21:05:52 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/slrn/slrn-0.9.8.0.ebuild,v 1.13 2004/12/05 02:42:10 swegener Exp $
 
 IUSE="ssl nls"
 
 DESCRIPTION="s-lang Newsreader"
 PATCH_URI="http://slrn.sourceforge.net/patches"
-SRC_URI="mirror://sourceforge/slrn/${P}.tar.bz2"
-#${PATCH_URI}/${P}-mem_leak.diff
-#${PATCH_URI}/${P}-popup_win.diff
-#${PATCH_URI}/${P}-po.diff"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ~ppc sparc alpha ia64"
 
 HOMEPAGE="http://slrn.sourceforge.net/"
-DEPEND="virtual/libc
-		virtual/mta
-		>=app-arch/sharutils-4.2.1
-		>=sys-libs/slang-1.4.4
-		ssl? ( >=dev-libs/openssl-0.9.6 )
-		nls? ( sys-devel/gettext )"
 
 RDEPEND="virtual/libc
-		virtual/mta
-		>=app-arch/sharutils-4.2.1
-		>=sys-libs/slang-1.4.4
-		ssl? ( >=dev-libs/openssl-0.9.6 )
-		nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd ${S}
-	for i in ${P}-{mem_leak,popup_win,po}.diff ; do
-		[ -f ${DISTDIR}/${i} ] &&
-			patch -p1 < ${DISTDIR}/${i}
-	done
-}
+	virtual/mta
+	>=app-arch/sharutils-4.2.1
+	>=sys-libs/slang-1.4.4
+	ssl? ( >=dev-libs/openssl-0.9.6 )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
 
 src_compile() {
-	local myconf
-	use nls && myconf="--enable-nls" \
-		|| myconf="--disable-nls"
-	use ssl && myconf="--with-ssl=/usr" \
-		|| myconf="--without-ssl"
-	./configure --infodir=/usr/share/info \
-		--mandir=/usr/share/man --prefix=/usr \
-		--with-slrnpull --host=${CHOST} $myconf \
-		|| die "./configure failed (myconf=$myconf)"
-	emake || die
+	econf \
+		--with-docdir=/usr/share/doc/${PF} \
+		--with-slrnpull \
+		$(use_enable nls) \
+		$(use_with ssl) \
+		$(use_with uudeview) \
+		|| die "econf failed"
+	emake || die "emake failed"
 }
 
 src_install () {
-
 	make DESTDIR=${D} DOCDIR=/usr/share/doc/${P} install || die
 	find $D/usr/share/doc -type f | xargs gzip
 }
diff --git a/net-news/slrn/slrn-0.9.8.1.ebuild b/net-news/slrn/slrn-0.9.8.1.ebuild
index 5300a6c5e715..9f8aecdab49e 100644
--- a/net-news/slrn/slrn-0.9.8.1.ebuild
+++ b/net-news/slrn/slrn-0.9.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/slrn/slrn-0.9.8.1.ebuild,v 1.3 2004/11/12 23:42:55 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/slrn/slrn-0.9.8.1.ebuild,v 1.4 2004/12/05 02:42:10 swegener Exp $
 
 inherit eutils
 
@@ -10,11 +10,11 @@ SLRN_PATCHES="fetch lastchar2"
 
 DESCRIPTION="s-lang Newsreader"
 HOMEPAGE="http://slrn.sourceforge.net/"
-SRC_URI="mirror://sourceforge/slrn/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~sparc ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~sparc ~ppc x86"
 IUSE="ssl nls unicode uudeview"
 
 RDEPEND="virtual/mta
@@ -29,7 +29,8 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	for i in ${SLRN_PATCHES} ; do
+	for i in ${SLRN_PATCHES}
+	do
 		epatch ${FILESDIR}/${PV}/${P}-${i}.diff
 	done
 
@@ -40,9 +41,9 @@ src_compile() {
 	econf \
 		--with-docdir=/usr/share/doc/${PF} \
 		--with-slrnpull \
-		`use_enable nls` \
-		`use_with ssl` \
-		`use_with uudeview` \
+		$(use_enable nls) \
+		$(use_with ssl) \
+		$(use_with uudeview) \
 		|| die "econf failed"
 	emake || die "emake failed"
 }