gentoo Easter resync : 12.04.2020

3 files changed, 2 insertions, 97 deletions

diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest
index 7f2a9d42e315..4a4283133193 100644
--- a/sys-apps/tcp-wrappers/Manifest
+++ b/sys-apps/tcp-wrappers/Manifest
@@ -2,9 +2,7 @@ AUX hosts.allow.example 585 BLAKE2B 18a7786b0eb9d08b0536de6ef135189aa0527af34a9b
 AUX tcp-wrappers-7.6-headers.patch 5419 BLAKE2B 6d56c77652299c8bc75ea76ff42c5dfa915b94b4466c79a23529e1d815487145dffef73d262a1d79e209caaf627fbf81b4f5402fca45af6f995c129fcb2539e4 SHA512 48cd3d8951ef0f0106c51f1a1de6116fe1f68bf49f321b956d4f9dac1b3f1b6c2964163deb3d1bb449a2ac672e471c4b216e0e616de4a2dad0665d767d13f786
 AUX tcp-wrappers-7.6-redhat-bug11881.patch 956 BLAKE2B ac2e8e4c8778899c6460bf6ae680b189158c9936428644e7b93981403ed017ef26806f3de184f66eace573cf385ae350f3b0fa1b3f250b2a0b4708908289c558 SHA512 d530f788c3b40f5ec2836ba7c6e73df529869ef465b93fe2b2d8460dfcb5e9031e78c8e6a99c71d6262a05b82f25e694fdd717686198a87dfcb2c9b9d5a52ef4
 AUX tcp-wrappers-7.6.28-no-external-malloc.patch 317 BLAKE2B 4436d7bf54e13b038e8139c2dfd0a4a061b6113898560436ae0e5fb6e5a74c3c4c163c27f99e9957ec89665186beed30e7a57810db886b8a86148f6b58f5f594 SHA512 bdefe3dd35e96d1e140d1dc363f1904526aaf0c44952b8ec5e206c8e53693437f07be2ad136a0e22c38e09c1dcd1c73c755165cc68b4588715f6997f9c6affb8
-DIST tcp-wrappers_7.6.q-22.debian.tar.gz 41730 BLAKE2B 2e507269b14e5cf3e1a599b4cdae40c2900b098a1e40fc1b74e6b5565183fc71e25306e8dd0863fb16e6e52a6c471aeccb73c0b7c42d6f3f98aa9f95274583fb SHA512 cee45f265c34ec1c4e9e81d54be636dcd9702964f9cf5bb076f72d6772d2dbc638d2ef366560b51c24a216724807826bb3b7bf9d5d0f5c0923b71de7d0b002a8
 DIST tcp-wrappers_7.6.q-28.debian.tar.xz 36104 BLAKE2B 209fd9730785db8afc8ebec581f7132cfb4352f8807d2cea4715daf5c11aa08a92cf084ab1ff31222f5b265f032286ce2dcf49a238e9dc5616161c400fce4f08 SHA512 2c63201937737c19b4e5ca97dbc0ede9fc2d3b8fc344f8854a7d2afc0109ccb9ee52af94ba8a8498da910336a4f473825daa7a0cca26a0d93e1078e67abe16b0
 DIST tcp_wrappers_7.6.tar.gz 99438 BLAKE2B 961d9858866990f0f5e8c6bb782f5f39a03b267a8957dcd89734aeefcc85ca32554e032c73314e0a88110f3bb8a0dbdd81f093392307623a996b0232773e1e67 SHA512 2d9d003791f8d00912a36ae00579e2b8dd7ad8a7bf8eae259659bcaf5365b150540ff6c93c91765872c76041579b7a02b6e3c64528fb7f8235680399ba1d9dac
-EBUILD tcp-wrappers-7.6.22-r1.ebuild 2482 BLAKE2B c872dce38e5ae757ae66223deea3ff54a7d5fcf798f036544b958136ec86b65af6a38de0b4f9e3493d1779077c7695608e391d7baaed1cafb5d1b03aff89e235 SHA512 e53367eebaedf81e99d6f2996d14e1de980c4848a64e7dc43e5e90085ac0e74e77be2c4713959a99804a85c698cebead65ae7ebffbc6f463eccd4435db6fad47
-EBUILD tcp-wrappers-7.6.28.ebuild 2425 BLAKE2B 4702a06c1818dfccc29c42907e8903d2137c1389cfeff9cc39c22c61519462e7ca80b86551fd1d6e6a5ea2be82ab4640fb623f90f446a798a638d1ccf81a3a50 SHA512 5ecdb9a4d4ae9ff911abbe9798d9a7bbca55289401d1ce19f02101f50e26febcfcb9c7da6064411310715c972a42b68276c40fcb8b9cf388b4d23f8eaa0a6d00
+EBUILD tcp-wrappers-7.6.28.ebuild 2421 BLAKE2B 85ebf9f0e8b3ef9a31631a2add177081e35cdbbccf56134e45b1947c1703db51aad96032a76700eb6310d72697491567570ecd858eb9dd6ccbb229b7f139d0df SHA512 3f8f400f4fb9ab91d9bfecf26c5e1bcedca5fc681c0f76b09f66f2d7f10ec1708dcbc7571e244ada5420a831d7ee35b793a154068ad439c2f39ab1bd39838256
 MISC metadata.xml 440 BLAKE2B 701c101283758170adf92309f323c549f8cdac83c8885cff01e0a9841474e88b00cd8ce7d3e5c0d19209cc2acd8c113d23129c54a116433cf495126960758bea SHA512 3075ada2500265fa53064720159a33779d79c46e4244a5cc6624d0c2de81dcacf62f89232162182bf29477c36025f4b3f4618d9ae3f592ebd714a658425428a5
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild
deleted file mode 100644
index a251fc64ee0d..000000000000
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils toolchain-funcs versionator flag-o-matic multilib-minimal usr-ldscript
-
-MY_PV=$(get_version_component_range 1-2)
-DEB_PV=$(get_version_component_range 3)
-MY_P="${PN//-/_}_${MY_PV}"
-DESCRIPTION="TCP Wrappers"
-HOMEPAGE="ftp://ftp.porcupine.org/pub/security/index.html"
-SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz
-	mirror://debian/pool/main/t/${PN}/${PN}_${MY_PV}.q-${DEB_PV}.debian.tar.gz"
-
-LICENSE="tcp_wrappers_license"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="ipv6 netgroups static-libs"
-
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	EPATCH_OPTS="-p1" \
-	epatch $(sed -e 's:^:../debian/patches/:' ../debian/patches/series)
-	epatch "${FILESDIR}"/${PN}-7.6-headers.patch
-	epatch "${FILESDIR}"/${PN}-7.6-redhat-bug11881.patch
-
-	multilib_copy_sources
-}
-
-temake() {
-	local mycppflags="-DHAVE_WEAKSYMS -DHAVE_STRERROR -DSYS_ERRLIST_DEFINED"
-	use ipv6 && mycppflags+=" -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len"
-	emake \
-		REAL_DAEMON_DIR="${EPREFIX}"/usr/sbin \
-		TLI= VSYSLOG= PARANOID= BUGS= \
-		AUTH="-DALWAYS_RFC931" \
-		AUX_OBJ="weak_symbols.o" \
-		DOT="-DAPPEND_DOT" \
-		HOSTNAME="-DALWAYS_HOSTNAME" \
-		NETGROUP=$(usex netgroups -DNETGROUPS "") \
-		STYLE="-DPROCESS_OPTIONS" \
-		LIBS=$(usex netgroups -lnsl "") \
-		LIB=$(usex static-libs libwrap.a "") \
-		AR="$(tc-getAR)" ARFLAGS=rc \
-		CC="$(tc-getCC)" \
-		RANLIB="$(tc-getRANLIB)" \
-		COPTS="${CFLAGS} ${CPPFLAGS} ${mycppflags}" \
-		LDFLAGS="${LDFLAGS}" \
-		"$@"
-}
-
-multilib_src_configure() {
-	tc-export AR RANLIB
-	temake config-check
-}
-
-multilib_src_compile() {
-	temake all
-}
-
-multilib_src_install() {
-	into /usr
-	use static-libs && dolib.a libwrap.a
-	dolib.so shared/libwrap.so*
-
-	insinto /usr/include
-	doins tcpd.h
-
-	if multilib_is_native_abi; then
-		gen_usr_ldscript -a wrap
-		dosbin tcpd tcpdchk tcpdmatch safe_finger try-from
-	fi
-}
-
-multilib_src_install_all() {
-	doman *.[358]
-	dosym hosts_access.5 /usr/share/man/man5/hosts.allow.5
-	dosym hosts_access.5 /usr/share/man/man5/hosts.deny.5
-
-	insinto /etc
-	newins "${FILESDIR}"/hosts.allow.example hosts.allow
-
-	dodoc BLURB CHANGES DISCLAIMER README*
-}
-
-pkg_preinst() {
-	# don't clobber people with our default example config
-	[[ -e ${EROOT}/etc/hosts.allow ]] && cp -pP "${EROOT}"/etc/hosts.allow "${ED}"/etc/hosts.allow
-}
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild
index e37ddc9c2952..c6a037553529 100644
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://ftp.porcupine.org/pub/security/${MY_P}.tar.gz
 
 LICENSE="tcp_wrappers_license"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="ipv6 netgroups static-libs"
 
 RDEPEND=""