Someone mucked up the configure line when they were marking this stable (bug #46348), so I am revbumping it.

6 files changed, 20 insertions, 52 deletions

diff --git a/net-ftp/oftpd/ChangeLog b/net-ftp/oftpd/ChangeLog
index cd5a0958f9a2..e75f94f67da3 100644
--- a/net-ftp/oftpd/ChangeLog
+++ b/net-ftp/oftpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-ftp/oftpd
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/ChangeLog,v 1.9 2004/03/27 22:23:40 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/ChangeLog,v 1.10 2004/03/31 19:29:05 eradicator Exp $
+
+*oftpd-0.3.7-r1 (31 Mar 2004)
+
+  31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  oftpd-0.3.6-r7.ebuild, oftpd-0.3.7-r1.ebuild, oftpd-0.3.7.ebuild:
+  Someone mucked up the configure line when they were marking this stable (bug
+  #46348), so I am revbumping it.
 
   27 Mar 2004; Luca Barbato <lu_zero@gentoo.org> oftpd-0.3.7.ebuild:
   Marked ppc for securty issue with the previous version see  #45738
diff --git a/net-ftp/oftpd/Manifest b/net-ftp/oftpd/Manifest
index 34652c723360..da269bea9f1a 100644
--- a/net-ftp/oftpd/Manifest
+++ b/net-ftp/oftpd/Manifest
@@ -1,8 +1,6 @@
-MD5 404a2b81c70ba763cd53c01db33efcca oftpd-0.3.6-r7.ebuild 992
-MD5 2ea2408a695ba3958ccd85b5a61551a0 oftpd-0.3.7.ebuild 846
-MD5 c967d9096564c956d6855fcffd0de51c ChangeLog 1509
+MD5 48eb677d38dc458825403233b77bf45d oftpd-0.3.7-r1.ebuild 875
+MD5 2e6bf03775dfe4905abf0de82838ea8c ChangeLog 1784
 MD5 0f7a846dd3f2197538502db078109b71 metadata.xml 351
+MD5 a8787fb0c452c7d62131d869a7117a73 files/init.d.oftpd 685
 MD5 b0ba4d96ae0eb98abce711409607eda4 files/conf.d.oftpd 469
-MD5 56b946d01010a7a4f6eab6dfb5f1313a files/digest-oftpd-0.3.6-r7 62
-MD5 f79abb144f1b6d1feccb8e71b670e666 files/init.d.oftpd 684
-MD5 14eb385d2dee30be94c941c01703ab40 files/digest-oftpd-0.3.7 62
+MD5 14eb385d2dee30be94c941c01703ab40 files/digest-oftpd-0.3.7-r1 62
diff --git a/net-ftp/oftpd/files/digest-oftpd-0.3.6-r7 b/net-ftp/oftpd/files/digest-oftpd-0.3.6-r7
deleted file mode 100644
index 22821daa64be..000000000000
--- a/net-ftp/oftpd/files/digest-oftpd-0.3.6-r7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 78b4139bb0108297b9814564db986852 oftpd-0.3.6.tar.gz 77201
diff --git a/net-ftp/oftpd/files/digest-oftpd-0.3.7 b/net-ftp/oftpd/files/digest-oftpd-0.3.7-r1
index b99ac815fee3..b99ac815fee3 100644
--- a/net-ftp/oftpd/files/digest-oftpd-0.3.7
+++ b/net-ftp/oftpd/files/digest-oftpd-0.3.7-r1
diff --git a/net-ftp/oftpd/oftpd-0.3.6-r7.ebuild b/net-ftp/oftpd/oftpd-0.3.6-r7.ebuild
deleted file mode 100644
index 3a187880994f..000000000000
--- a/net-ftp/oftpd/oftpd-0.3.6-r7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/oftpd-0.3.6-r7.ebuild,v 1.10 2004/03/26 03:02:50 eradicator Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Secure, small, anonymous only ftpd"
-SRC_URI="http://www.time-travellers.org/oftpd/${P}.tar.gz"
-HOMEPAGE="http://www.time-travellers.org/oftpd"
-
-DEPEND="virtual/glibc"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 sparc ~ppc ppc64"
-
-src_compile() {
-	# local myconf
-	# ipv6 support busted according to lamer
-	# use ipv6 && myconf="${myconf} --enable-ipv6"
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/sbin \
-		--mandir=/usr/share/man \
-		--host=${CHOST} ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS BUGS COPYING INSTALL FAQ NEWS README TODO
-	dodir /home/ftp
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/init.d.oftpd oftpd
-	insinto /etc/conf.d
-	newins ${FILESDIR}/conf.d.oftpd oftpd
-}
diff --git a/net-ftp/oftpd/oftpd-0.3.7.ebuild b/net-ftp/oftpd/oftpd-0.3.7-r1.ebuild
index 9a74cce61f68..f0998ae57c8c 100644
--- a/net-ftp/oftpd/oftpd-0.3.7.ebuild
+++ b/net-ftp/oftpd/oftpd-0.3.7-r1.ebuild
@@ -1,29 +1,29 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/oftpd-0.3.7.ebuild,v 1.6 2004/03/27 22:23:40 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/oftpd-0.3.7-r1.ebuild,v 1.1 2004/03/31 19:29:05 eradicator Exp $
 
 DESCRIPTION="Secure, small, anonymous only ftpd"
-HOMEPAGE="http://www.time-travellers.org/oftpd"
 SRC_URI="http://www.time-travellers.org/oftpd/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 ppc ~ppc64 sparc"
+HOMEPAGE="http://www.time-travellers.org/oftpd"
 
 DEPEND="virtual/glibc"
 
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86 sparc ~ppc ~ppc64"
+
 src_compile() {
 	# local myconf
 	# ipv6 support busted according to lamer
 	# use ipv6 && myconf="${myconf} --enable-ipv6"
-	econf || die
+	econf --bindir=/usr/sbin || die
 	emake || die
 }
 
 src_install() {
 	make DESTDIR=${D} install || die
 	dodoc AUTHORS BUGS FAQ NEWS README TODO
-	dodir /home/ftp
+	keepdir /home/ftp
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/init.d.oftpd oftpd
 	insinto /etc/conf.d