--- tcp-wrappers-7.6.22.ebuild 2013-11-25 15:42:27.912363971 +0100 +++ tcp-wrappers-7.6.22-r1.ebuild 2013-11-25 15:43:44.716574666 +0100 @@ -4,7 +4,7 @@ EAPI="4" -inherit eutils toolchain-funcs versionator flag-o-matic +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) @@ -19,6 +19,12 @@ 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() { @@ -26,6 +32,8 @@ src_prepare() { 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() { @@ -48,20 +56,32 @@ temake() { "$@" || die } -src_configure() { - tc-export AR CC RANLIB +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 } -src_compile() { +multilib_src_compile() { temake all } -src_install() { - dosbin tcpd tcpdchk tcpdmatch safe_finger try-from || die +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 @@ -69,14 +89,6 @@ src_install() { insinto /etc newins "${FILESDIR}"/hosts.allow.example hosts.allow - insinto /usr/include - doins tcpd.h - - into /usr - use static-libs && dolib.a libwrap.a - dolib.so shared/libwrap.so* - gen_usr_ldscript -a wrap - dodoc BLURB CHANGES DISCLAIMER README* }