[gentoo-commits] proj/musl:master commit in: sys-apps/tcp-wrappers/, sys-apps/tcp-wrappers/files/

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     c0604443700e1c4eb796176af7dd2f25a46e69cf
Author:     layman <layman <AT> localhost>
AuthorDate: Fri Jun 12 22:16:20 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jun 12 22:19:18 2015 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=c0604443

sys-apps/tcp-wrappers: switch t multilib_is_native_abi.

Package-Manager: portage-2.2.18

 sys-apps/tcp-wrappers/Manifest                     |  5 +-
 .../files/tcp-wrappers-7.6-remove-DECLS.patch      | 19 ------
 sys-apps/tcp-wrappers/tcp-wrappers-7.6-r99.ebuild  | 77 ----------------------
 .../tcp-wrappers/tcp-wrappers-7.6.22-r99.ebuild    |  2 +-
 4 files changed, 2 insertions(+), 101 deletions(-)

diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest
index 83f9c8f..81f8008 100644
--- a/sys-apps/tcp-wrappers/Manifest
+++ b/sys-apps/tcp-wrappers/Manifest
@@ -1,11 +1,8 @@
 AUX hosts.allow.example 585 SHA256 fbcdcedbdc985d8f0cc79e9a8752e69553b48aa38662321046cd4eae9f4d7e3b SHA512 63587dd4552b688dc5ed0adde3932e43e5287129315211498063f09e37c1f8beee0de60d7d4f69df7149bd500546a2fd59a6094d71f9c0be221426eae3cb869b WHIRLPOOL 449f28dad80a13497baa7d5d43cc99b8e7159b8e38dc7659947c9dd76ca2e8d7153de84a3706ec6658d94bb70d5b35554b72e9cf8f35bc8eaf27dacb8229cae9
 AUX tcp-wrappers-7.6-headers.patch 5419 SHA256 86d24cdf5d1c7f88d21b174988234d5024f506982e029e173c06cb5456c46bb0 SHA512 48cd3d8951ef0f0106c51f1a1de6116fe1f68bf49f321b956d4f9dac1b3f1b6c2964163deb3d1bb449a2ac672e471c4b216e0e616de4a2dad0665d767d13f786 WHIRLPOOL 721d65254fd0d39152e0ba1c860fba5bb8c08ab61d1c89a10e1da9ed274b41ba2734253e79e0c680fe72cdf720eba7243c7b7e6f33d383c074f078b2c64d923d
 AUX tcp-wrappers-7.6-redhat-bug11881.patch 956 SHA256 b8b3bbbe223d3496b25070d1fbc62d9a1424709e20d380b55390b13f03b46e03 SHA512 d530f788c3b40f5ec2836ba7c6e73df529869ef465b93fe2b2d8460dfcb5e9031e78c8e6a99c71d6262a05b82f25e694fdd717686198a87dfcb2c9b9d5a52ef4 WHIRLPOOL 05620832e55b9ef396601851d22e6fc1e60adb655340b1c1909c8138454b38338cba3bf9976d8458d157cc2ce8a3f30450efdf82943b885e325965b2d93697b7
-AUX tcp-wrappers-7.6-remove-DECLS.patch 490 SHA256 5155a217b51cede4179c3febb008e6397b05a2900d27be658e4aff5b26e8b6e2 SHA512 67eff00fd55d1f6c9628f629ffd49a49a7f92e2c6eda85e0c00f41077afd8ac33494c2a8ff1d0f402bc29694b4ffb9a056d88410959a0e1ee020c0653e05bc83 WHIRLPOOL aad11b4436134dcd1d7e8671e79083a773aedf1647c7f3173a3526b8934504e8135db9f71b63edd40ebad1a52b125a00023563e4bcc4b610be1c166a5cd255bb
 AUX tcp-wrappers-7.6.22-remove-DECLS.patch 475 SHA256 d7fadcd9d60955e971402033c017ffa5aaee5ae489ff26ff0658e926131bdf66 SHA512 c56562e2209559c6c7aa10e3fd10eff2612efaa0455b4a405497d095b99926e057236f9a60ce4d2646dec0d442b9d1642ad3defc3f099fec49896d6a9b3fc76f WHIRLPOOL c03aca47527a07a3fc7115c3d14747202124aa837b24571eae715c2b6e90bd0ab83ccbe94240c2102d89c806dd00c40e19688fff5d4cbff00b07d73db7336216
-DIST tcp-wrappers-7.6-patches-1.0.tar.bz2 16128 SHA256 dcb10f194684b16ae6aa9faf05dd8b063d81a3dde1431b664260dcf385089256 SHA512 b020006ce3f7578c0ab3c7b8cb71a3bb00ab0ae3d595b0612fa6464041e06905fb431acb85a759de90407ef502aa75191abed6225a57586abc7bbd1801cea969 WHIRLPOOL 819afd55ac96abe8e737592ac5663f3d41e96837eafe2511018cf6dda17dd2cb13ed8930ff0bf50a3d63a45fb834897586f78b10f0d8a55d31934fd970147903
 DIST tcp-wrappers_7.6.q-22.debian.tar.gz 41730 SHA256 0ff28337c5effe4f91e7ea43ddd65fc629c06922326f5ef2804f70943be64fb3 SHA512 cee45f265c34ec1c4e9e81d54be636dcd9702964f9cf5bb076f72d6772d2dbc638d2ef366560b51c24a216724807826bb3b7bf9d5d0f5c0923b71de7d0b002a8 WHIRLPOOL 4a22c083d3bfe18af020ea48663ab3eb5a77d613665bbeb935daffcce64641d66f5c32a88ef4e4dbf8b4edfe9d71bfc4e35601451d065c10806ea726430d2aa8
 DIST tcp_wrappers_7.6.tar.gz 99438 SHA256 9543d7adedf78a6de0b221ccbbd1952e08b5138717f4ade814039bb489a4315d SHA512 2d9d003791f8d00912a36ae00579e2b8dd7ad8a7bf8eae259659bcaf5365b150540ff6c93c91765872c76041579b7a02b6e3c64528fb7f8235680399ba1d9dac WHIRLPOOL e04861d03a49dd6d6d5cd9eba86732a40e79deff39d981a5e883bcfae4979c6e1c2a388eabd84691927b159e606a5649073473a717cb62c12cbd8546d75635bf
-EBUILD tcp-wrappers-7.6-r99.ebuild 1975 SHA256 59731a917a5cc260227631d38c537a683c13353287b72340fc6b51c378df71fb SHA512 c2f52de54f6448eb1e7b768c0f537a0e2a46a53f4b8d283cf0dee4b27c17c92bf02ee555e19c25d1c686a7dddbdf5ac6a6caea0c78f4ee1bf99a3ba2e6c973ca WHIRLPOOL 24fa8061dd19cd3ad3eb96f31e1dc4de07b8dc66c1723be8c9c35e00579f3e616a738321db8003c251b386f309b5ced77d9cf8f9e6897dfc7219d897e256b860
-EBUILD tcp-wrappers-7.6.22-r99.ebuild 2711 SHA256 bb6b777d4eafe0fa671708d1dfbda7bbeb5a3aa4eea770e400d2aabbaac4b241 SHA512 76bb3fd216ae20d11c1f8e9191a20ee3eb56ae6c47c50df8d100f68289b8556cc71471c4b1d8009b32f08df3334bef8c19ae639b0b3f5f65e4b3c8575ca3d07d WHIRLPOOL 79844b6565cf3c1a5bf3a871ad48c75e7b1a481c871c543bfbb4ff218b35a3b4199680afb44547da4c76cace1b42ff3d2f8512bde3cacdf74acc6c0cb52879b7
+EBUILD tcp-wrappers-7.6.22-r99.ebuild 2710 SHA256 fa2e755e7219bc2095e9384e5e44abded40b41206867a63d346291fc2bbf44d1 SHA512 6ca803e03ea8e44caaedf31f6068931bc1415ca7978b35cfa0b2c2b5da9993d2bfd78e70acac6518f83c50888c5d63970972da56baae21137cd059c57bf55cc4 WHIRLPOOL 49aedea96f174a5be1a765a901cdcced6f6976acaba3b66f158cc07decf608f9b17523d0c65a2f607694b60cf3e45d7758075dc18690559883b412d6c82cdd25
 MISC metadata.xml 349 SHA256 81a5bdc0c787284f58b68dd7e3db3cfe6652b336d03698826dd86a705626b725 SHA512 b3c8aa5ea459990ef57ffa5b66e230ea6cf7aa8acd3481183f2dbe7394d98add0a2712cd5b74fd494ca0372e79097c3e2d712514a5f20815c7673372351f5755 WHIRLPOOL 2c28eb2f649bb90041c36b7c9b5fe5ec5826382a59a13f64846bd99746172bdea5daa8d3c025d74402ec9d8beb8a675ec536405b2b223aeffd9122d9af8342cd

diff --git a/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6-remove-DECLS.patch b/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6-remove-DECLS.patch
deleted file mode 100644
index 1382c6d..0000000
--- a/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6-remove-DECLS.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur tcp_wrappers_7.6.orig/tcpd.h tcp_wrappers_7.6/tcpd.h
---- tcp_wrappers_7.6.orig/tcpd.h	2013-07-06 02:14:23.070110799 +0000
-+++ tcp_wrappers_7.6/tcpd.h	2013-07-06 02:14:56.184112650 +0000
-@@ -21,8 +21,6 @@
- #include <netinet/in.h>
- #include <stdio.h>
- 
--__BEGIN_DECLS
--
- /* Structure to describe one communications endpoint. */
- 
- #define STRING_LENGTH	128		/* hosts, users, processes */
-@@ -259,6 +257,4 @@
- extern char *my_strtok();
- #endif
- 
--__END_DECLS
--
- #endif /* tcpd.h */

diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r99.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r99.ebuild
deleted file mode 100644
index bca5ab9..0000000
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r99.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild,v 1.26 2013/05/14 05:46:04 radhermit Exp $
-
-inherit eutils toolchain-funcs multilib
-
-MY_P="${P//-/_}"
-PATCH_VER="1.0"
-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://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
-
-LICENSE="tcp_wrappers_license"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="ipv6"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	chmod ug+w Makefile
-
-	EPATCH_SUFFIX="patch"
-	PATCHDIR=${WORKDIR}/${PV}
-	epatch ${PATCHDIR}/${P}-makefile.patch
-	epatch ${PATCHDIR}/generic
-	epatch ${PATCHDIR}/${P}-shared.patch
-	use ipv6 && epatch ${PATCHDIR}/${P}-ipv6-1.14.diff
-
-	epatch "${FILESDIR}"/${P}-remove-DECLS.patch
-}
-
-src_compile() {
-	tc-export AR CC RANLIB
-
-	local myconf="-DHAVE_WEAKSYMS"
-	use ipv6 && myconf="${myconf} -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len"
-
-	emake \
-		REAL_DAEMON_DIR=/usr/sbin \
-		GENTOO_OPT="${myconf}" \
-		MAJOR=0 MINOR=${PV:0:1} REL=${PV:2:3} \
-		config-check || die "emake config-check failed"
-
-	emake \
-		REAL_DAEMON_DIR=/usr/sbin \
-		GENTOO_OPT="${myconf}" \
-		MAJOR=0 MINOR=${PV:0:1} REL=${PV:2:3} \
-		linux || die "emake linux failed"
-}
-
-src_install() {
-	dosbin tcpd tcpdchk tcpdmatch safe_finger try-from || die
-
-	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 /usr/include
-	doins tcpd.h
-
-	into /usr
-	dolib.a libwrap.a
-
-	into /
-	newlib.so libwrap.so libwrap.so.0.${PV}
-	dosym libwrap.so.0.${PV} /$(get_libdir)/libwrap.so.0
-	dosym libwrap.so.0 /$(get_libdir)/libwrap.so
-	# bug #4411
-	gen_usr_ldscript libwrap.so || die "gen_usr_ldscript failed"
-
-	dodoc BLURB CHANGES DISCLAIMER README* "${FILESDIR}"/hosts.allow.example
-}

diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r99.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r99.ebuild
index 39b8e84..7772021 100644
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r99.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r99.ebuild
@@ -76,7 +76,7 @@ multilib_src_install() {
 	insinto /usr/include
 	doins tcpd.h
 
-	if multilib_build_binaries; then
+	if multilib_is_native_abi; then
 		gen_usr_ldscript -a wrap
 		dosbin tcpd tcpdchk tcpdmatch safe_finger try-from
 	fi