gentoo resync : 28.11.2020

4 files changed, 2 insertions, 119 deletions

diff --git a/net-analyzer/echoping/Manifest b/net-analyzer/echoping/Manifest
index b749c125385c..8f604c8644b1 100644
--- a/net-analyzer/echoping/Manifest
+++ b/net-analyzer/echoping/Manifest
@@ -3,7 +3,5 @@ AUX echoping-6.0.2_p434-fno-common.patch 2751 BLAKE2B fe623ef782dbefafc28399af33
 AUX echoping-6.0.2_p434-gnutls_certificate_type_set_priority.patch 595 BLAKE2B 76363f96ff38ad793ef55707b59e102c7fac3c75a4437d51d32245f4e06539004cd7303884edf905c4f32d23c7e138ee9d3997c306f7a14167655c599d5f1709 SHA512 4bec1c8a77f17a163437dca9ce2ef49a355db041b08df7eb087352e03eede069f869e271d9414fc62d88a5e36687787e4719e7405f4b5ba96bbf8534af06ca52
 AUX echoping-6.0.2_p434-gnutls_session.patch 492 BLAKE2B 4a3841f87c70147c120b2fb15227c18d18d2db38ae984306c17c83fcc6405ef98417de7c13e6c2b6c23454a27b7d846f98b327298ddff3c0489c5f53465c9b92 SHA512 99362748feb0ab02172ee4f21c9630c505b899c78483077ef4f056e136854037ea165dd57d2637bed791ff3e8407b08733efab864d68e726b0d31d31a4c17525
 DIST echoping-6.0.2_p434.tar.gz 74568 BLAKE2B 881cc0e3d0be0f704968cbc02e4ac6abe73fe1ccf7019bb33dc522934d2f50f2ba5f70845c81024d3f4101c0acc5837599e05ba7a44f34b1453b470ca30d4b9b SHA512 1b4f5f1ea6ba000c558cab3b8e86758d6c539d8cd237620000d837b468861a177ac733441c885eb8ec1c35b49baa33a82e34e3f8b14b05429a075b72233d5799
-EBUILD echoping-6.0.2_p434-r2.ebuild 1338 BLAKE2B 7bd40239a5dc169ed8ba501b81c6993deaa99284be480e5af35481dacb58558abb3f4a525ef2fd85cdef8ac88a6ecce1259c1a657f74b3c6f2bb1ac4eb36dd4d SHA512 816e419112f7bb521881bda550026868b2496f6828d9c975b848fcc46b51758a65c3dba4b0d5856a3d83e09c0a6529bfb5f158ab7d4310921a1aded9c899b2db
-EBUILD echoping-6.0.2_p434-r3.ebuild 1399 BLAKE2B f9a04a415c4db0ae91a3dece244a7d1809c0184b98e09f44fa61adeb582f15d84ba708dda179b32037b5f940bbf7f7547dcd11d033859f049a6a000886b84db8 SHA512 0b3871be5a68ad2884999437362e1b2d16419a3e08081af9b7e321a85445abf1fa4af7c83ca913c2fc52f648a50ba73dbfbbcf2f10d33bceea218da05f1b1bbc
-EBUILD echoping-6.0.2_p434-r4.ebuild 1458 BLAKE2B f4a9acdba9ae31df1aaa776a0361124fef086369072d0ad30de97f31535e5f688e86592a0d5b2200585979daa47a77fe845d4597f62da2932ce7e75f33a37e37 SHA512 7f358016dd82ebf6897136173a604b371b5dc7093a9a6a60d4ffd9f80029f06a8dec1fcd24b2830e56ce288565cb280bdcadf2a4ae9bd621296fa3570637e7dd
+EBUILD echoping-6.0.2_p434-r4.ebuild 1456 BLAKE2B 9be51cd3fad8b56de5be073624526c0f43d4f7072cae3c5436f5c0fbbc93549ef030a2fd1f05b393388231046dc49fca39f200e0b42fb08a177e366e0956a925 SHA512 35bc3f7a304ed977527bff99b7d3e21451020a1736656ebb7b502c5ce561cbed26832569aed15800278755929f75088ba1baed2262ba3c98a1952fa907a61f63
 MISC metadata.xml 702 BLAKE2B 7a3a21935981a54b2fea15c7e02163bedc02e519a1aeca06bf08e61b237bd152cb999a9b1aae62f98499956bf36e2bbf610cf11b1803a25f9f2957e3cc419020 SHA512 db906d89ac30011c740e44f73fad23a4f9b8d8c318b6a0b9240e17dc31c897850ed2f22890b8516633c6a10f44154b77a4c198e851eb8793a55c36497ebb702f
diff --git a/net-analyzer/echoping/echoping-6.0.2_p434-r2.ebuild b/net-analyzer/echoping/echoping-6.0.2_p434-r2.ebuild
deleted file mode 100644
index 3ef54165ba6e..000000000000
--- a/net-analyzer/echoping/echoping-6.0.2_p434-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils ltprune
-
-DESCRIPTION="Small program to test performances of remote servers"
-HOMEPAGE="http://echoping.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="gnutls http icp idn priority smtp ssl tos postgres ldap"
-RESTRICT="test"
-
-RDEPEND="idn? ( net-dns/libidn )
-	postgres? ( dev-db/postgresql:* )
-	ldap? ( net-nds/openldap )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3:= )
-		!gnutls? ( >=dev-libs/openssl-0.9.7d:= )
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2"
-
-REQUIRED_USE="gnutls? ( ssl )"
-
-DOCS=( README AUTHORS ChangeLog DETAILS NEWS TODO )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-6.0.2_p434-fix_implicit_declarations.patch
-	epatch "${FILESDIR}"/${PN}-6.0.2_p434-gnutls_certificate_type_set_priority.patch
-	epatch "${FILESDIR}"/${PN}-6.0.2_p434-gnutls_session.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable http)  \
-		$(use_enable icp) \
-		$(use_enable priority) \
-		$(use_enable smtp) \
-		$(use_enable tos) \
-		$(use_with idn libidn) \
-		$(usex gnutls $(use_with gnutls) $(use_with ssl)) \
-		--config-cache \
-		--disable-static \
-		--disable-ttcp
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/net-analyzer/echoping/echoping-6.0.2_p434-r3.ebuild b/net-analyzer/echoping/echoping-6.0.2_p434-r3.ebuild
deleted file mode 100644
index ea9b234861eb..000000000000
--- a/net-analyzer/echoping/echoping-6.0.2_p434-r3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils ltprune
-
-DESCRIPTION="Small program to test performances of remote servers"
-HOMEPAGE="http://echoping.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="libressl gnutls http icp idn priority smtp ssl tos postgres ldap"
-RESTRICT="test"
-
-RDEPEND="idn? ( net-dns/libidn )
-	postgres? ( dev-db/postgresql:* )
-	ldap? ( net-nds/openldap )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3:= )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2"
-
-REQUIRED_USE="gnutls? ( ssl )"
-
-DOCS=( README AUTHORS ChangeLog DETAILS NEWS TODO )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-6.0.2_p434-fix_implicit_declarations.patch
-	epatch "${FILESDIR}"/${PN}-6.0.2_p434-gnutls_certificate_type_set_priority.patch
-	epatch "${FILESDIR}"/${PN}-6.0.2_p434-gnutls_session.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable http)  \
-		$(use_enable icp) \
-		$(use_enable priority) \
-		$(use_enable smtp) \
-		$(use_enable tos) \
-		$(use_with idn libidn) \
-		$(usex gnutls $(use_with gnutls) $(use_with ssl)) \
-		--config-cache \
-		--disable-static \
-		--disable-ttcp
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild b/net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild
index 17e0727353a8..3557e9a751a7 100644
--- a/net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild
+++ b/net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa x86"
 IUSE="libressl gnutls http icp idn priority smtp ssl tos postgres ldap"
 RESTRICT="test"