5 files changed, 40 insertions, 33 deletions
diff --git a/net-news/leafnode/ChangeLog b/net-news/leafnode/ChangeLog
index e8c621df2c9a..1baaefd26919 100644
--- a/net-news/leafnode/ChangeLog
+++ b/net-news/leafnode/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-news/leafnode
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/leafnode/ChangeLog,v 1.30 2004/06/28 22:45:31 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/leafnode/ChangeLog,v 1.31 2004/06/28 22:52:56 swegener Exp $
+
+*leafnode-2.0.0_alpha20040513 (29 Jun 2004)
+
+  29 Jun 2004; Sven Wegener <swegener@gentoo.org>
+  -leafnode-2.0.0_alpha20040206.ebuild, +leafnode-2.0.0_alpha20040513.ebuild:
+  Version bump to 2.0.0_alpha20040513 in the pre-release series and removed the
+  older ebuild as upstream source package has been dropped. Thanks to Daniel
+  Webert <daniel_webert@web.de> in bug #55365. Fixed bug #43094 so that leafnode
+  looks in the right directories for configuration files. Thanks to Rui Malheiro
+  <rmalheiro@6mil.pt> for reporting and providing a patch. Tidied the ebuild a
+  bit. Thanks to tove <bugs@veller.net> in bug #43039 for reporting and
+  providing a solution.
 
 *leafnode-1.10.1 (29 Jun 2004)
 
diff --git a/net-news/leafnode/Manifest b/net-news/leafnode/Manifest
index 5a2b8d354557..9a9063c5b779 100644
--- a/net-news/leafnode/Manifest
+++ b/net-news/leafnode/Manifest
@@ -1,13 +1,13 @@
 MD5 9da72ab9d19b9c3cc28f391671eff3ca leafnode-1.9.49.ebuild 1986
 MD5 ad07bab1d4cc67965c2a7a8f4f9223d6 leafnode-1.9.50.ebuild 1994
-MD5 5fe7815d04d89408eec786d23ecc30c1 leafnode-2.0.0_alpha20040206.ebuild 2454
 MD5 d4764f5c17f5e0b416f7ddf271c77d71 metadata.xml 161
 MD5 79b5d2fdce4d9983f72699141d4b28a3 leafnode-1.10.1.ebuild 1935
-MD5 ea48f8c961c75b752d64d66bb09ac08a ChangeLog 6050
+MD5 815ce631650114d4a9b2c8425a17fd78 leafnode-2.0.0_alpha20040513.ebuild 2051
+MD5 7f5ffb3c82bbf48c90fcab56da7fc3eb ChangeLog 6718
 MD5 55746f46949f232f8cc02f902f807b08 files/digest-leafnode-1.9.49 72
 MD5 b6867235b6efd8bf05a2734ee5432667 files/digest-leafnode-1.9.50 72
-MD5 9b1f84bee84104e123b7aea75bc282ab files/digest-leafnode-2.0.0_alpha20040206 82
 MD5 5909cb0566e88e7694e85246c78fe4ff files/fetchnews.cron 177
 MD5 510836c882c3365d0441ba7d8854ba6b files/leafnode.xinetd 230
 MD5 72cc5e849b413ec0cf288a65980dd3b5 files/texpire.cron 158
 MD5 3821841ecf37466cd3630872cb7f0c7d files/digest-leafnode-1.10.1 72
+MD5 400f282f47bfa31b927f0b1cb06ef29e files/digest-leafnode-2.0.0_alpha20040513 82
diff --git a/net-news/leafnode/files/digest-leafnode-2.0.0_alpha20040206 b/net-news/leafnode/files/digest-leafnode-2.0.0_alpha20040206
deleted file mode 100644
index 1027a7018b31..000000000000
--- a/net-news/leafnode/files/digest-leafnode-2.0.0_alpha20040206
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b46ef6cdc51af3fabd3ca3502e3bf5c8 leafnode-2.0.0.alpha20040206a.tar.bz2 273324
diff --git a/net-news/leafnode/files/digest-leafnode-2.0.0_alpha20040513 b/net-news/leafnode/files/digest-leafnode-2.0.0_alpha20040513
new file mode 100644
index 000000000000..0e9bb8f6f052
--- /dev/null
+++ b/net-news/leafnode/files/digest-leafnode-2.0.0_alpha20040513
@@ -0,0 +1 @@
+MD5 52a1c7b40a796cd388ec6b3304704a42 leafnode-2.0.0.alpha20040513a.tar.bz2 279225
diff --git a/net-news/leafnode/leafnode-2.0.0_alpha20040206.ebuild b/net-news/leafnode/leafnode-2.0.0_alpha20040513.ebuild
index e486459d7703..26e0efa3f50c 100644
--- a/net-news/leafnode/leafnode-2.0.0_alpha20040206.ebuild
+++ b/net-news/leafnode/leafnode-2.0.0_alpha20040513.ebuild
@@ -1,37 +1,31 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/leafnode/leafnode-2.0.0_alpha20040206.ebuild,v 1.3 2004/06/25 00:25:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/leafnode/leafnode-2.0.0_alpha20040513.ebuild,v 1.1 2004/06/28 22:52:56 swegener Exp $
+
+MY_P=${P/_/.}a
 
 DESCRIPTION="A USENET software package designed for small sites"
-SRC_URI="http://www-dt.e-technik.uni-dortmund.de/~ma/leafnode/beta/leafnode-2.0.0.alpha20040206a.tar.bz2"
+SRC_URI="http://www-dt.e-technik.uni-dortmund.de/~ma/leafnode/beta/${MY_P}.tar.bz2"
 HOMEPAGE="http://www-dt.e-technik.uni-dortmund.de/~ma/leafnode/beta/"
-DEPEND=">=dev-libs/libpcre-3.9
-	virtual/inetd"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
 IUSE="ipv6"
-S="${WORKDIR}/leafnode-2.0.0.alpha20040206a"
-
-src_compile() {
-	local myconf
 
-	# ------------------------------------------------------
-	# Enabling IPv6.
-	# ------------------------------------------------------
-	# If this was misdetected, then run either
-	#   env cf_cv_ipv6=no /bin/sh ./configure YOUR_OPTIONS
-	# or
-	#   env cf_cv_ipv6=yes /bin/sh ./configure YOUR_OPTIONS
-	# (of course, you need to replace YOUR_OPTIONS)
-	# ------------------------------------------------------
+DEPEND=">=dev-libs/libpcre-3.9"
+RDEPEND="${DEPEND}
+	virtual/inetd"
 
-	use ipv6 && myconf="--with-ipv6" ||	export cf_cv_ipv6=no
+S="${WORKDIR}/${MY_P}"
 
+src_compile() {
 	econf \
-		--with-runas-user=news --with-spooldir="/var/spool/news" \
-		${myconf} || die "./configure failed"
-
+		--sysconfdir=/etc/leafnode \
+		--with-runas-user=news \
+		--localstatedir=/var \
+		--with-spooldir=/var/spool/news \
+		$(use_with ipv6) \
+		|| die "./configure failed"
 	emake || die "emake failed"
 }
 
@@ -43,7 +37,7 @@ src_install() {
 	rm -rf ${D}/var/spool
 
 	# add .keep file to /var/lock/news to avoid ebuild to ignore the empty dir
-	keepdir /var/lock/news/
+	keepdir /var/lock/news
 	# ... and keep texpire from complaining about missing dir
 	keepdir /etc/leafnode/local.groups
 
@@ -55,17 +49,18 @@ src_install() {
 	exeinto /etc/cron.daily
 	doexe ${FILESDIR}/texpire.cron
 
-	dodoc AUTHORS COPYING* CREDITS ChangeLog DEBUGGING ENVIRONMENT FAQ \
-	INSTALL NEWS TODO README README_FIRST UPDATING
+	dodoc \
+		AUTHORS COPYING* CREDITS ChangeLog DEBUGGING ENVIRONMENT FAQ \
+		INSTALL NEWS TODO README README_FIRST UPDATING
 	dohtml README.html
 }
 
 pkg_postinst() {
-	dodir ${D}/var/spool/news/{leaf.node,failed.postings,interesting.groups,out.going}
-	dodir ${D}/var/spool/news/message.id/{0,1,2,3,4,5,6,7,8,9}{0,1,2,3,4,5,6,7,8,9}{0,1,2,3,4,5,6,7,8,9}
-	chown -R news:news ${D}/var/spool/news
+	dodir ${ROOT}/var/spool/news/{leaf.node,failed.postings,interesting.groups,out.going}
+	dodir ${ROOT}/var/spool/news/message.id/{0,1,2,3,4,5,6,7,8,9}{0,1,2,3,4,5,6,7,8,9}{0,1,2,3,4,5,6,7,8,9}
+	chown -R news:news ${ROOT}/var/spool/news
 
-	zcat ${ROOT}/usr/share/doc/${P}/README_FIRST.gz | while read line ;
+	zcat ${ROOT}/usr/share/doc/${PF}/README_FIRST.gz | while read line ;
 	do
 		einfo $line
 	done