Enable multilib support, bug #488390. Acked by Chainsaw.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 122 insertions, 10 deletions

diff --git a/sys-apps/tcp-wrappers/ChangeLog b/sys-apps/tcp-wrappers/ChangeLog
index 120d4a73c0a2..fcf6991ef32d 100644
--- a/sys-apps/tcp-wrappers/ChangeLog
+++ b/sys-apps/tcp-wrappers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/tcp-wrappers
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/ChangeLog,v 1.47 2013/05/14 05:46:04 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/ChangeLog,v 1.48 2013/11/25 14:56:23 mgorny Exp $
+
+*tcp-wrappers-7.6.22-r1 (25 Nov 2013)
+
+  25 Nov 2013; Michał Górny <mgorny@gentoo.org> +tcp-wrappers-7.6.22-r1.ebuild:
+  Enable multilib support, bug #488390. Acked by Chainsaw.
 
   14 May 2013; Tim Harder <radhermit@gentoo.org> tcp-wrappers-7.6-r8.ebuild:
   Inherit multilib eclass for get_libdir usage and drop empty DEPEND.
diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest
index 1be768c40760..3aa18f861098 100644
--- a/sys-apps/tcp-wrappers/Manifest
+++ b/sys-apps/tcp-wrappers/Manifest
@@ -8,17 +8,26 @@ DIST tcp-wrappers-7.6-patches-1.0.tar.bz2 16128 SHA256 dcb10f194684b16ae6aa9faf0
 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-r8.ebuild 1991 SHA256 cb8bc7c15c1a4e3891e98ff27e6116d0f8a0bef23740f96602d7e07090175ba8 SHA512 ff4dc2d603fae7ac3123750c1541cd1167975620e4d9ca80c945a5ab110cd6c0db310390d0375a5785b704254103ed4002dec50e21321f3d367c318b614dc5ce WHIRLPOOL e596af98af7c925b9f7f07610780324e861258bea366542c5dea014cf446f38e8e66fe11127507bb2e58f4067dbe9e9e9520139e8d1ed324d04263f6c6d54258
+EBUILD tcp-wrappers-7.6.22-r1.ebuild 2776 SHA256 f02a0a986455d6738deaee662c5e1690a324d9e27cd7a22290e1ecb391433e38 SHA512 09865e9881a4ffb4ef09ac855b31a02610b18558b1f9ed75a2bbfef24eefaf408d0a321c7f2250a16293c7df7f64af8e2c34ec8a9053b2c846107b54621f3b46 WHIRLPOOL d076d917ae067b83469f19702cee695c2ebdcffbd4919263d6ad639b3b053057f88ae7b7ca0498e59639ae00a7732e72a532b0ee4681835621a8696a7d62b43f
 EBUILD tcp-wrappers-7.6.22.ebuild 2503 SHA256 f5debb7a18e4a2894f55b441b3cd7231d4bef05b14ae503928f3a0191146c574 SHA512 9e2a5b9cc1ddc607d085db7745ddcef3cf515e3e85503da85f2ab14c26233769a43acc66fc21fbd94b2c1f263f574694469fdc4de08db79d16e0c65f3b4e5b1a WHIRLPOOL cd77041fae3d8d4257451f61f072ff8c64b340586eab2f1a8f4490676d40ae3c1bc6b68406d4b25fd458f41a966cea49926cf2f964e89a0cdde1c78ca510d68d
-MISC ChangeLog 7092 SHA256 55e947155f9b909a84c25b32d0f6893e988d0c3be390067984354afd7784d331 SHA512 645e79fcec517e68dddc476b8558bda6ac21d0dc55124cf6c15e7165436e41e078d8bbb5ad5c16a5d46f3f53bb300555ea876e58da1345dc00c342fb71975ce6 WHIRLPOOL 0b83e1458133d90a8cdbff6255055baeaeceef71e96c007290aa43be5b182f969499827e4086c368f0e5daa3ac39a96851675b9e9f9cf0a6c2b1bb49df0a8fbd
+MISC ChangeLog 7270 SHA256 ce8a79d84bb34c6fc6c1542754dcb9cb164b0b272fec36b1ac855f4d2515c31b SHA512 5ff2166ef6d788c12107349e662bedac6e6345b7a03f85465da01abbec8ce8daa02d4fe9444c7a7171dc1d1c7acc8e78f8d6573b8a4aaab626d7f9d38d2ffe60 WHIRLPOOL 435d9ff622e0304b431a4f4baf40944e0606b4c45bb3c7d9256f0be6f99d4f057c234ec47671b70a49f73394fff6349f461a7694b572d3e469a887d1008fa022
 MISC metadata.xml 349 SHA256 81a5bdc0c787284f58b68dd7e3db3cfe6652b336d03698826dd86a705626b725 SHA512 b3c8aa5ea459990ef57ffa5b66e230ea6cf7aa8acd3481183f2dbe7394d98add0a2712cd5b74fd494ca0372e79097c3e2d712514a5f20815c7673372351f5755 WHIRLPOOL 2c28eb2f649bb90041c36b7c9b5fe5ec5826382a59a13f64846bd99746172bdea5daa8d3c025d74402ec9d8beb8a675ec536405b2b223aeffd9122d9af8342cd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRkc+dAAoJEEqz6FtPBkyjbZwIAIIqXChqmK9MclzOeFLe8o2j
-qKTAYS6PQ84hgFZCmEOENRWzQNj0VyV/VnUlvxM2E8en0B/hAf/qav6KSWstuqDw
-11wlquSTmH2nF7AX0/fD/WdROtNJj5bDQa0gBqw4eTLHjz4aJIWpPa76GRy9DPIx
-7hotTruE8ZU07chi0/GTNtNtc07oCcWY+IozOT7/CthEzKJ+iMxQhlOzhFdq1Egi
-wKfllm2oTdZ5XG8bZDqIH8MdeGthZKzRrfKpfS1lMJy9MrS3dd2n39Byfk8eSkOY
-Qo0cJZ7YlCReg8prnOKdYikPZNCawop8DH0h4DC0T+JqZ/M+Gn4yWFtNSseXmL0=
-=Taax
+iQJ8BAEBCABmBQJSk2UZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOaKcP/R+suU8J3Gu5iAwyjN8j3Od1
+pX6yIuQRVbnFOuhYjsOUEr7XiaWt7ME6HSv3vRKdD1y3K7hnp45gjS/vxGpV5BOc
+aZYAQdTI3tjF7f5MoMP/zQOB8SA+Z2I3INustZSnYHnBTAbHHJU7UnBInETwTDi5
+XmCl1a84PhgoH+g69bKuju5N+lTEEOTgxPfNoGg84Bb6SnPWc2DZLObet3T8Xm5U
+tOE7vltStZFp8rj0WGXWmBV4b19Xn8MRuUnx3D0F89wdONr6C2tASeCFJcOqacqZ
+J2dYKFZEazdzCeuSnDVTQ09aKPXKxxMieHhG+AvFANawkwrWx4aIIvjJS71983z6
+csekk41clK/3qBa+EwilQUPxIW56ed3t5gPThRpeNCb7vtEFdpjlUbbooJfACHk1
+zjtpy7W1cHm62h0Sezwkh4+00p5+0FLC0cWjBLBQVLTsXtMw9Vx5XK7EURmG2Vj3
+bxfod5MroIO9H9VTLSVTydxQFqeDqypmISFv40KMqAdTatmykLYzoeTOfQlFtok7
+tMtjBKvQ5PW/83z/rxGUfxU/4p8okYp63nog0DpzNSl6HFz4+w0V6mL7LTfEc3iR
+OX7y6xQK93tN5L7FyKn+yOrqHAhAhotUqXcd71xNruuy2x4I8ge3OhYPHtJlLzle
+Y7DAz5jCWdbUzJNmRlno
+=8jnF
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..b04d02ea736d
--- /dev/null
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild
@@ -0,0 +1,98 @@
+# 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.22-r1.ebuild,v 1.1 2013/11/25 14:56:23 mgorny Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs versionator flag-o-matic multilib-minimal
+
+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 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux"
+IUSE="ipv6 netgroups static-libs"
+
+RDEPEND="
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r4
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+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() {
+	emake \
+		REAL_DAEMON_DIR=/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}" \
+		LDFLAGS="${LDFLAGS}" \
+		"$@" || die
+}
+
+multilib_src_configure() {
+	tc-export AR RANLIB
+	append-cppflags -DHAVE_WEAKSYMS -DHAVE_STRERROR -DSYS_ERRLIST_DEFINED
+	use ipv6 && append-cppflags -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len
+	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_build_binaries; 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
+}