Remove no longer needed patch for ppc-macos and move -r0 to -r1 to not cause a

downgrade.

(Portage version: 2.1.2_pre2)
 (Unsigned Manifest commit)

4 files changed, 8 insertions, 128 deletions

diff --git a/net-ftp/tnftp/Manifest b/net-ftp/tnftp/Manifest
index 5a28bd049a74..76c9de4e3db8 100644
--- a/net-ftp/tnftp/Manifest
+++ b/net-ftp/tnftp/Manifest
@@ -1,37 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX tnftp-20050625-macos.patch 1534 RMD160 00714e108032b35a03cd76f4ccdc80a846aa4f33 SHA1 b0efbd8278ba002cb6ecb32ae77e23718d50c3c5 SHA256 5629ebaf994787006bc12e38f26928c31346e69308e358819bc7a38ba2d8358e
-MD5 0064b3f4150a285bf297bc4aeb80e47c files/tnftp-20050625-macos.patch 1534
-RMD160 00714e108032b35a03cd76f4ccdc80a846aa4f33 files/tnftp-20050625-macos.patch 1534
-SHA256 5629ebaf994787006bc12e38f26928c31346e69308e358819bc7a38ba2d8358e files/tnftp-20050625-macos.patch 1534
 DIST tnftp-20050625.tar.gz 313915 RMD160 74a310cf0e28cbc183141aff277458e35df1295a SHA256 6194383702bfef8d7731660f9359c5946e2ba8176df9382ae39584942a28d6b3
-EBUILD tnftp-20050625-r1.ebuild 1188 RMD160 f5e86f23b81074aaa08dd167cb7ff9226eb44060 SHA1 68679ca27e9136438d0ece7b2686988f484f6a78 SHA256 069b159ac5df97617084c21897b74819b670add74cd1eaca2f30760dced73478
-MD5 d1d9a92ef6a81afd0d48d629ad1a1d99 tnftp-20050625-r1.ebuild 1188
-RMD160 f5e86f23b81074aaa08dd167cb7ff9226eb44060 tnftp-20050625-r1.ebuild 1188
-SHA256 069b159ac5df97617084c21897b74819b670add74cd1eaca2f30760dced73478 tnftp-20050625-r1.ebuild 1188
-EBUILD tnftp-20050625.ebuild 1006 RMD160 231a6f15fdb99f0fdf6afe303be65ab7f4feb7df SHA1 e8de0e653548b3fed671c6cf55ac2536a0c2e268 SHA256 4825cfe70da9260a0ece08373a8b6518e4436b1327438da1be924675248d1ae2
-MD5 a7c144072028293c4fa3def49efead77 tnftp-20050625.ebuild 1006
-RMD160 231a6f15fdb99f0fdf6afe303be65ab7f4feb7df tnftp-20050625.ebuild 1006
-SHA256 4825cfe70da9260a0ece08373a8b6518e4436b1327438da1be924675248d1ae2 tnftp-20050625.ebuild 1006
-MISC ChangeLog 2674 RMD160 b8b2fb7abe667228193a634b16409947c1ce8cc3 SHA1 3faad1d51790128d15e7bb0f68cf41750c6e9e72 SHA256 402c2ef05a213f0ed14fbc50354b99dc246901f021f69221063f0ab359d606bc
-MD5 fb25e821ac6fae47e3fb755cdb30bd52 ChangeLog 2674
-RMD160 b8b2fb7abe667228193a634b16409947c1ce8cc3 ChangeLog 2674
-SHA256 402c2ef05a213f0ed14fbc50354b99dc246901f021f69221063f0ab359d606bc ChangeLog 2674
+EBUILD tnftp-20050625-r1.ebuild 1030 RMD160 8e400f5852522fc2d8faf49ae7517af10f70b9a2 SHA1 6645b35da442e3d26d9b4930d726ce9f1566ecd6 SHA256 8c023e6cb147fd8293739cc439acf7e4139f2eab7d4cab6769d492884d802e26
+MD5 4afe9b03150588ce49d7936a91a3e27d tnftp-20050625-r1.ebuild 1030
+RMD160 8e400f5852522fc2d8faf49ae7517af10f70b9a2 tnftp-20050625-r1.ebuild 1030
+SHA256 8c023e6cb147fd8293739cc439acf7e4139f2eab7d4cab6769d492884d802e26 tnftp-20050625-r1.ebuild 1030
+MISC ChangeLog 2903 RMD160 0cdf3b9561894c0012e17cc5e8083f1b8c2efabc SHA1 287069f4fa79f8b35afa86c227712d664dbcfc8d SHA256 06b217ce6c5cd3ed58079216ed0fbacf2d36a8d6f80371d701558f1b3fba04e2
+MD5 0b3000d5794945f7529b97727dbaaa4c ChangeLog 2903
+RMD160 0cdf3b9561894c0012e17cc5e8083f1b8c2efabc ChangeLog 2903
+SHA256 06b217ce6c5cd3ed58079216ed0fbacf2d36a8d6f80371d701558f1b3fba04e2 ChangeLog 2903
 MISC metadata.xml 298 RMD160 60625e202ed0ef00f82e7d7e5bf05b4412526f36 SHA1 a51489bc5de3f67a0183720f9425adb2cba0e3ef SHA256 fa6086e7352367eeb9b96d059ab58bca3bd6fde533180cd5551280c808535fc9
 MD5 1f7353efef0082c74884b4a97c1191ba metadata.xml 298
 RMD160 60625e202ed0ef00f82e7d7e5bf05b4412526f36 metadata.xml 298
 SHA256 fa6086e7352367eeb9b96d059ab58bca3bd6fde533180cd5551280c808535fc9 metadata.xml 298
-MD5 5960bdcc70b120b6118a807cd349e8f9 files/digest-tnftp-20050625 244
-RMD160 1cd5169c19709efa4e1beae2e5239b4ff6ce5e26 files/digest-tnftp-20050625 244
-SHA256 d5deebc39bded3a39d1df3638b4537bc0b1d7bf74266daecc0861db4df2b6eb2 files/digest-tnftp-20050625 244
 MD5 5960bdcc70b120b6118a807cd349e8f9 files/digest-tnftp-20050625-r1 244
 RMD160 1cd5169c19709efa4e1beae2e5239b4ff6ce5e26 files/digest-tnftp-20050625-r1 244
 SHA256 d5deebc39bded3a39d1df3638b4537bc0b1d7bf74266daecc0861db4df2b6eb2 files/digest-tnftp-20050625-r1 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEcg41AiZjviIA2XgRAsB0AJ9LEwxJaMpJLZKWkZFdufxLCjr8VQCcDlRR
-2xygt0ndO2nXf7IkmQp/QJs=
-=ImH1
------END PGP SIGNATURE-----
diff --git a/net-ftp/tnftp/files/digest-tnftp-20050625 b/net-ftp/tnftp/files/digest-tnftp-20050625
deleted file mode 100644
index f7d03cee6183..000000000000
--- a/net-ftp/tnftp/files/digest-tnftp-20050625
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bab3c6ccc342d3156cdcd92746ab924d tnftp-20050625.tar.gz 313915
-RMD160 74a310cf0e28cbc183141aff277458e35df1295a tnftp-20050625.tar.gz 313915
-SHA256 6194383702bfef8d7731660f9359c5946e2ba8176df9382ae39584942a28d6b3 tnftp-20050625.tar.gz 313915
diff --git a/net-ftp/tnftp/files/tnftp-20050625-macos.patch b/net-ftp/tnftp/files/tnftp-20050625-macos.patch
deleted file mode 100644
index f02432dd8640..000000000000
--- a/net-ftp/tnftp/files/tnftp-20050625-macos.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- tnftp-20050625/configure.in.orig	2005-11-26 20:54:03.000000000 +0100
-+++ tnftp-20050625/configure.in	2005-11-26 20:54:35.000000000 +0100
-@@ -199,7 +199,7 @@
- 
- dnl Always replace glob(3); the vendor's may not be secure.
- dnl
--LIBOBJS="$LIBOBJS glob.o"
-+AC_LIBOBJ([glob])
- 
- if test $ac_cv_func_strptime = yes; then
- 	AC_MSG_TRY_COMPILE([for strptime() declaration],
-@@ -323,7 +323,7 @@
- #include <stringlist.h>
- 	    ], [
- 	int f = sl_add((StringList *)0, "foo")
--	    ], [ : ], [LIBOBJS="$LIBOBJS sl_init.o"])
-+	    ], [ : ], [AC_LIBOBJ([sl_init])])
- fi
- 
- 
-@@ -342,7 +342,7 @@
- 	AC_MSG_RESULT(yes)
- else
- 	if test $ac_cv_func_getaddrinfo = yes; then
--		LIBOBJS="$LIBOBJS getaddrinfo.o"
-+		AC_LIBOBJ([getaddrinfo])
- 		AC_MSG_RESULT([no - using local version])
- 	else
- 		AC_MSG_RESULT([using local version])
-@@ -359,12 +359,22 @@
- fi
- 
- 
--if test -n "$LIBOBJS"; then
--	INCLUDES="$INCLUDES -I\${srcdir}/../libnetbsd"
--	LDFLAGS="$LDFLAGS -L../libnetbsd"
--	LIBS="$LIBS -lnetbsd"
--	LIBNETBSD=libnetbsd.a
--	LIBDEPENDS="$LIBDEPENDS ../libnetbsd/libnetbsd.a"
-+INCLUDES="$INCLUDES -I\${srcdir}/../libnetbsd"
-+LDFLAGS="$LDFLAGS -L../libnetbsd"
-+LIBS="$LIBS -lnetbsd"
-+LIBNETBSD=libnetbsd.a
-+LIBDEPENDS="$LIBDEPENDS ../libnetbsd/libnetbsd.a"
-+
-+AC_MSG_CHECKING([for apple's gcc])
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-+#ifndef __APPLE__
-+make an error
-+#endif]])],
-+	[ac_cv_apple_gcc=yes],
-+	[ac_cv_apple_gcc=no])
-+
-+if test $ac_cv_apple_gcc = yes; then
-+   	LDFLAGS="$LDFLAGS -Xlinker -search_paths_first"
- fi
- 
- dnl Create the Makefiles
diff --git a/net-ftp/tnftp/tnftp-20050625.ebuild b/net-ftp/tnftp/tnftp-20050625.ebuild
deleted file mode 100644
index bf1b1888a7e6..000000000000
--- a/net-ftp/tnftp/tnftp-20050625.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tnftp/tnftp-20050625.ebuild,v 1.5 2006/02/21 21:20:15 exg Exp $
-
-DESCRIPTION="NetBSD FTP client with several advanced features"
-SRC_URI="ftp://ftp.netbsd.org/pub/NetBSD/misc/${PN}/${P}.tar.gz
-	ftp://ftp.netbsd.org/pub/NetBSD/misc/${PN}/old/${P}.tar.gz"
-HOMEPAGE="ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="alpha ~amd64 ppc sparc x86"
-IUSE="ipv6"
-
-DEPEND=">=sys-libs/ncurses-5.1"
-
-src_compile() {
-	econf \
-		--enable-editcomplete \
-		$(use_enable ipv6) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	newbin src/ftp tnftp || die "newbin failed"
-	newman src/ftp.1 tnftp.1 || die "newman failed"
-
-	for x in ftp lukemftp
-	do
-		if [ ! -e "${ROOT}"/usr/bin/${x} ]
-		then
-			dosym tnftp /usr/bin/${x} || die "dosym failed"
-		fi
-	done
-
-	dodoc COPYING ChangeLog README THANKS || die "dodoc failed"
-}