net-misc/uftp: remove old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Azamat H. Hackimov <azamat.hackimov@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14581
Signed-off-by: Joonas Niilola <juippis@gentoo.org>

diff --git a/net-misc/uftp/Manifest b/net-misc/uftp/Manifest
index 64d63ab90afc7af3f3f24b68ba57f41c915d5899..9f1cf5a6aa959be58f8585e1527864d08a21660c 100644 (file)
--- a/net-misc/uftp/Manifest
+++ b/net-misc/uftp/Manifest
@@ -1,5 +1 @@
-DIST uftp-3.7.1.tar 849920 BLAKE2B 32a2ccca01f4b8ee205301a2bb4ac30da4f17bf0d8a24f885ec40a430b2cc478efcd504ba118ef7f55c43ef53a6fb3e6caa2e2cebda93c254ab289a8683488a6 SHA512 93fefe1d4c5310bfa6470a78011e63aea8cc9cf59a73ea24920d3ad8c835476bbc410b3669ee79c847eba7d21d61f600e09529d5e6f2ed24076f663a34d99c15
 DIST uftp-4.10.1.tar.gz 245625 BLAKE2B 23b01758fa5a0387471f8d95b24738d8157801822b8a07a59072eeab81277ceb5283463465ed522af6971d65141712ead3e2206caa286bedece9e0c34a149873 SHA512 9ef4594e0cde2f64970523661fcee07f34600bd4f2ab235c34bde9d20ef1b0312d5e430e1f52ab605c188c42aee4a0384ed02ae9f5e93b3edc062f848a8130bf
-DIST uftp-4.9.4.tar.gz 243819 BLAKE2B b7aa75f8db82480912dd4cf8199dce7e8170db837853f16a2d8e5a4b7cf190416b7a2a23e170a4837f59a7bba030b0434383bceae9b253eb1d2fc13f6fcd26e7 SHA512 f3c799265a55e0cb536f17be3a0ebfad5f81284255083ebe9a12fda4b5ce8407f05a710cb32a41f3dccbc0ac90367c44d4b67058bdbeaa4f2f8efe732463ebf0
-DIST uftp-4.9.5.tar.gz 243999 BLAKE2B 32f6e6fef062e3b0696db775f2e925fdd53f03d8e04181f65140372abc85674b90579ea4b0c48cf21378c97552d06374005e70b6f1e9af7c03b7478d0b86e26c SHA512 3a4809cc61555ee26de6c1e1ac8525c0345a3b9555cf0a2094ff06eb6f409d1b3ca16b94d7b953dba6d1ae1d8c69a646d575a6357cd178c374bef68888744086
-DIST uftp-4.9.8.tar.gz 244855 BLAKE2B bdb5b5caffbfbfaf8d7aa71e675a98240e64b27b6386088c9a096202f32e825a1cd9bed933b5242601c9ff7c5c2afb4c43190b2335a2a73c0dd0b51caf74a1cf SHA512 04875ddc59cdd9cfa88d642aeb9ea4418a99eca12057f54c949ec5aecee85a8a78803ebdeefe11a29a298a151bb5eb19d6c6c5656f26e17639a86308a2946ef5

diff --git a/net-misc/uftp/files/uftp-3.7_makefile.patch b/net-misc/uftp/files/uftp-3.7_makefile.patch
deleted file mode 100644 (file)
index 81afe8b..0000000
--- a/net-misc/uftp/files/uftp-3.7_makefile.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -Nuar uftp-3.7.orig//makefile uftp-3.7/makefile
---- uftp-3.7.orig//makefile    2012-08-10 17:00:22.566403478 +0600
-+++ uftp-3.7/makefile  2012-08-10 17:04:47.523386683 +0600
-@@ -39,25 +39,26 @@
- endif
- 
- # defaults
--CC = gcc
--OPTIONS=-g -Wall $(ENC_OPTS)
-+CC ?= gcc
-+OPTIONS=$(ENC_OPTS)
- LDLIBS=-lc -lm $(CRYPT_LIB)
--CFLAGS=
-+CFLAGS?=
-+LDFLAGS?=
- 
- # FreeBSD
- ifeq ("FreeBSD", "$(UNAME_S)")
--OPTIONS=-g -Wall -DHAS_GETIFADDRS $(ENC_OPTS)
-+OPTIONS=-DHAS_GETIFADDRS $(ENC_OPTS)
- endif
- 
- # OSX, aka Darwin
- ifeq ("Darwin", "$(UNAME_S)")
--OPTIONS=-g -Wall -DHAS_GETIFADDRS $(ENC_OPTS)
-+OPTIONS=-DHAS_GETIFADDRS $(ENC_OPTS)
- endif
- 
- # Sun
- ifeq ("SunOS", "$(UNAME_S)")
--CC = cc
--OPTIONS=-g -DBSD_COMP $(ENC_OPTS)
-+CC ?= cc
-+OPTIONS=-DBSD_COMP $(ENC_OPTS)
- LDLIBS=-lnsl -lsocket -lm $(CRYPT_LIB)
- CFLAGS=`getconf LFS_CFLAGS`
- OPENSSL=/usr/sfw
-@@ -65,9 +66,9 @@
- 
- # Linux
- ifeq ("Linux", "$(UNAME_S)")
--OPTIONS=-g -Wall -DHAS_GETIFADDRS $(ENC_OPTS)
-+OPTIONS=-DHAS_GETIFADDRS $(ENC_OPTS)
- LDLIBS=-lm $(CRYPT_LIB)
--CFLAGS=`getconf LFS_CFLAGS`
-+CFLAGS?=`getconf LFS_CFLAGS`
- endif
- 
- ifdef OPENSSL
-@@ -82,7 +83,7 @@
- testclient_multi.o: testclient_multi.c uftp.h uftp_common.h encryption.h
- 
- testclient_multi: testclient_multi.o encrypt_openssl.o uftp_common.o
--      $(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
-+      $(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
- 
- clean:
-       rm -f testclient_multi uftp uftpd uftpproxyd uftp_keymgt *.o
-@@ -176,16 +177,16 @@
- endif
- 
- uftp: $(UFTP_OBJS)
--      $(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
-+      $(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
- 
- uftpd: $(UFTPD_OBJS)
--      $(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
-+      $(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
- 
- uftpproxyd: $(UFTPPROXYD_OBJS)
--      $(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
-+      $(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
- 
- uftp_keymgt: $(UFTP_KEYMGT_OBJS)
--      $(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
-+      $(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
- 
- %.o: %.c
-       $(CC) $(OPTIONS) $(INCLUDE) $(CFLAGS) -c $<

diff --git a/net-misc/uftp/files/uftp-4.9.4_makefile.patch b/net-misc/uftp/files/uftp-4.10.1_makefile.patch
similarity index 100%
rename from net-misc/uftp/files/uftp-4.9.4_makefile.patch
rename to net-misc/uftp/files/uftp-4.10.1_makefile.patch

diff --git a/net-misc/uftp/uftp-3.7.1.ebuild b/net-misc/uftp/uftp-3.7.1.ebuild
deleted file mode 100644 (file)
index 41aed30..0000000
--- a/net-misc/uftp/uftp-3.7.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Encrypted UDP based FTP with multicast"
-HOMEPAGE="http://www.tcnj.edu/~bush/uftp.html"
-SRC_URI="http://www.tcnj.edu/~bush/downloads/${P}.tar"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+server ssl"
-
-DEPEND="ssl? ( dev-libs/openssl:0= )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-3.7_makefile.patch"
-)
-
-src_compile() {
-       use ssl || local opt="NO_ENCRYPTION=1"
-       emake CC=$(tc-getCC) $opt uftp uftp_keymgt
-       use server && emake CC=$(tc-getCC) $opt uftpd uftpproxyd
-}
-
-src_install() {
-       dobin uftp uftp_keymgt
-       dodoc ReadMe.txt
-       doman uftp.1 uftp_keymgt.1
-
-       if use server ; then
-               dosbin uftpd uftpproxyd
-               newinitd "${FILESDIR}/uftpd.init" uftpd
-               newconfd "${FILESDIR}/uftpd.conf" uftpd
-               newinitd "${FILESDIR}/uftpproxyd.init" uftpproxyd
-               newconfd "${FILESDIR}/uftpproxyd.conf" uftpproxyd
-               doman uftpd.1 uftpproxyd.1
-               insinto /etc/logrotate.d
-               newins "${FILESDIR}/logrotate" uftpd
-       fi
-}

diff --git a/net-misc/uftp/uftp-4.10.1.ebuild b/net-misc/uftp/uftp-4.10.1.ebuild
index db422b2917e4a834539268b6a17a90eb7386bf66..9fb44efca5f8814a627038a6561f50c518332609 100644 (file)
--- a/net-misc/uftp/uftp-4.10.1.ebuild
+++ b/net-misc/uftp/uftp-4.10.1.ebuild
@@ -22,7 +22,7 @@ RDEPEND="${DEPEND}"
 RESTRICT=test
 
 PATCHES=(
-       "${FILESDIR}/${PN}-4.9.4_makefile.patch"
+       "${FILESDIR}/${P}_makefile.patch"
        "${FILESDIR}/${P}_gcc10.patch"
 )
 
@@ -35,7 +35,7 @@ src_compile() {
 src_install() {
        dobin uftp uftp_keymgt
        dodoc {Changes,protocol,ReadMe}.txt
-       doman uftp.1 uftp_keymgt.1
+       doman {uftp,uftp_keymgt}.1
 
        if use server ; then
                dosbin uftpd uftpproxyd
@@ -43,7 +43,7 @@ src_install() {
                newconfd "${FILESDIR}/uftpd.conf" uftpd
                newinitd "${FILESDIR}/uftpproxyd.init" uftpproxyd
                newconfd "${FILESDIR}/uftpproxyd.conf" uftpproxyd
-               doman uftpd.1 uftpproxyd.1
+               doman {uftpd,uftpproxyd}.1
                insinto /etc/logrotate.d
                newins "${FILESDIR}/logrotate" uftpd
        fi

diff --git a/net-misc/uftp/uftp-4.9.4.ebuild b/net-misc/uftp/uftp-4.9.4.ebuild
deleted file mode 100644 (file)
index 74358db..0000000
--- a/net-misc/uftp/uftp-4.9.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Encrypted UDP based FTP with multicast"
-HOMEPAGE="http://uftp-multicast.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}-multicast/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+server ssl"
-
-DEPEND="ssl? ( dev-libs/openssl:0= )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-       "${FILESDIR}/${P}_makefile.patch"
-)
-
-src_compile() {
-       use ssl || local opt="NO_ENCRYPTION=1"
-       emake CC=$(tc-getCC) $opt uftp uftp_keymgt
-       use server && emake CC=$(tc-getCC) $opt uftpd uftpproxyd
-}
-
-src_install() {
-       dobin uftp uftp_keymgt
-       dodoc {Changes,protocol,ReadMe}.txt
-       doman uftp.1 uftp_keymgt.1
-
-       if use server ; then
-               dosbin uftpd uftpproxyd
-               newinitd "${FILESDIR}/uftpd.init" uftpd
-               newconfd "${FILESDIR}/uftpd.conf" uftpd
-               newinitd "${FILESDIR}/uftpproxyd.init" uftpproxyd
-               newconfd "${FILESDIR}/uftpproxyd.conf" uftpproxyd
-               doman uftpd.1 uftpproxyd.1
-               insinto /etc/logrotate.d
-               newins "${FILESDIR}/logrotate" uftpd
-       fi
-}
-
-pkg_postinst() {
-       if use server ; then
-               ewarn "Please note, uftpd 4.x server is not backward compatible with"
-               ewarn "uftp 3.x clients! Please upgrade clients before servers."
-       fi
-}

diff --git a/net-misc/uftp/uftp-4.9.5.ebuild b/net-misc/uftp/uftp-4.9.5.ebuild
deleted file mode 100644 (file)
index a596a83..0000000
--- a/net-misc/uftp/uftp-4.9.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Encrypted UDP based FTP with multicast"
-HOMEPAGE="http://uftp-multicast.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}-multicast/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+server ssl"
-
-# openssl with EC required, see #644674
-DEPEND="ssl? ( dev-libs/openssl:0=[-bindist] )"
-RDEPEND="${DEPEND}"
-
-# Workaround, see #644670
-RESTRICT=test
-
-PATCHES=(
-       "${FILESDIR}/${PN}-4.9.4_makefile.patch"
-)
-
-src_compile() {
-       use ssl || local opt="NO_ENCRYPTION=1"
-       emake CC=$(tc-getCC) $opt uftp uftp_keymgt
-       use server && emake CC=$(tc-getCC) $opt uftpd uftpproxyd
-}
-
-src_install() {
-       dobin uftp uftp_keymgt
-       dodoc {Changes,protocol,ReadMe}.txt
-       doman uftp.1 uftp_keymgt.1
-
-       if use server ; then
-               dosbin uftpd uftpproxyd
-               newinitd "${FILESDIR}/uftpd.init" uftpd
-               newconfd "${FILESDIR}/uftpd.conf" uftpd
-               newinitd "${FILESDIR}/uftpproxyd.init" uftpproxyd
-               newconfd "${FILESDIR}/uftpproxyd.conf" uftpproxyd
-               doman uftpd.1 uftpproxyd.1
-               insinto /etc/logrotate.d
-               newins "${FILESDIR}/logrotate" uftpd
-       fi
-}
-
-pkg_postinst() {
-       if use server ; then
-               ewarn "Please note, uftpd 4.x server is not backward compatible with"
-               ewarn "uftp 3.x clients! Please upgrade clients before servers."
-       fi
-}

diff --git a/net-misc/uftp/uftp-4.9.8.ebuild b/net-misc/uftp/uftp-4.9.8.ebuild
deleted file mode 100644 (file)
index 0894313..0000000
--- a/net-misc/uftp/uftp-4.9.8.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Encrypted UDP based FTP with multicast"
-HOMEPAGE="http://uftp-multicast.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}-multicast/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+server ssl"
-
-# openssl with EC required, see #644674
-DEPEND="ssl? ( dev-libs/openssl:0=[-bindist] )"
-RDEPEND="${DEPEND}"
-
-# Workaround, see #644670
-RESTRICT=test
-
-PATCHES=(
-       "${FILESDIR}/${PN}-4.9.4_makefile.patch"
-)
-
-src_compile() {
-       use ssl || local opt="NO_ENCRYPTION=1"
-       emake CC=$(tc-getCC) $opt uftp uftp_keymgt
-       use server && emake CC=$(tc-getCC) $opt uftpd uftpproxyd
-}
-
-src_install() {
-       dobin uftp uftp_keymgt
-       dodoc {Changes,protocol,ReadMe}.txt
-       doman uftp.1 uftp_keymgt.1
-
-       if use server ; then
-               dosbin uftpd uftpproxyd
-               newinitd "${FILESDIR}/uftpd.init" uftpd
-               newconfd "${FILESDIR}/uftpd.conf" uftpd
-               newinitd "${FILESDIR}/uftpproxyd.init" uftpproxyd
-               newconfd "${FILESDIR}/uftpproxyd.conf" uftpproxyd
-               doman uftpd.1 uftpproxyd.1
-               insinto /etc/logrotate.d
-               newins "${FILESDIR}/logrotate" uftpd
-       fi
-}
-
-pkg_postinst() {
-       if use server ; then
-               ewarn "Please note, uftpd 4.x server is not backward compatible with"
-               ewarn "uftp 3.x clients! Please upgrade clients before servers."
-       fi
-}