radhermit    14/04/13 09:34:58

  Modified:             ChangeLog
  Added:                iproute2-3.14.0.ebuild
  Log:
  Version bump, add selinux use flag.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
4AB3E85B4F064CA3)

Revision  Changes    Path
1.231                sys-apps/iproute2/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/iproute2/ChangeLog?rev=1.231&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/iproute2/ChangeLog?rev=1.231&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/iproute2/ChangeLog?r1=1.230&r2=1.231

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -r1.230 -r1.231
--- ChangeLog   18 Jan 2014 11:02:22 -0000      1.230
+++ ChangeLog   13 Apr 2014 09:34:58 -0000      1.231
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/iproute2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.230 
2014/01/18 11:02:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.231 
2014/04/13 09:34:58 radhermit Exp $
+
+*iproute2-3.14.0 (13 Apr 2014)
+
+  13 Apr 2014; Tim Harder <radher...@gentoo.org> +iproute2-3.14.0.ebuild:
+  Version bump, add selinux use flag.
 
   18 Jan 2014; Mike Frysinger <vap...@gentoo.org> iproute2-3.10.0.ebuild,
   iproute2-3.11.0.ebuild, iproute2-3.12.0.ebuild, iproute2-3.8.0.ebuild,



1.1                  sys-apps/iproute2/iproute2-3.14.0.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/iproute2/iproute2-3.14.0.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/iproute2/iproute2-3.14.0.ebuild?rev=1.1&content-type=text/plain

Index: iproute2-3.14.0.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-3.14.0.ebuild,v 
1.1 2014/04/13 09:34:58 radhermit Exp $

EAPI="5"

inherit eutils toolchain-funcs flag-o-matic multilib

if [[ ${PV} == "9999" ]] ; then
        
EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
        inherit git-2
else
        SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86"
fi

DESCRIPTION="kernel routing and traffic control utilities"
HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2";

LICENSE="GPL-2"
SLOT="0"
IUSE="atm berkdb +iptables ipv6 minimal selinux"

RDEPEND="!net-misc/arpd
        iptables? ( >=net-firewall/iptables-1.4.20:= )
        !minimal? ( berkdb? ( sys-libs/db ) )
        atm? ( net-dialup/linux-atm )
        selinux? ( sys-libs/libselinux )"
DEPEND="${RDEPEND}
        app-arch/xz-utils
        iptables? ( virtual/pkgconfig )
        sys-devel/bison
        sys-devel/flex
        >=sys-kernel/linux-headers-2.6.27
        elibc_glibc? ( >=sys-libs/glibc-2.7 )"

src_prepare() {
        epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
        use ipv6 || epatch "${FILESDIR}"/${PN}-3.10.0-no-ipv6.patch #326849

        sed -i \
                -e '/^CC =/d' \
                -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
                -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
                -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
                -e "/^WFLAGS/s:-Werror::" \
                -e "/^DBM_INCLUDE/s:=.*:=${T}:" \
                Makefile || die

        # build against system headers
        rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h 
include/libiptc
        sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die

        # don't build arpd if USE=-berkdb #81660
        use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile

        use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc:' Makefile
}

src_configure() {
        tc-export AR CC PKG_CONFIG

        # This sure is ugly.  Should probably move into toolchain-funcs at some 
point.
        local setns
        pushd "${T}" >/dev/null
        echo 'main(){return setns();};' > test.c
        ${CC} ${CFLAGS} ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
        echo 'main(){};' > test.c
        ${CC} ${CFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i 
'/^LDLIBS/s:-lresolv::' "${S}"/Makefile
        popd >/dev/null

        cat <<-EOF > Config
        TC_CONFIG_ATM := $(usex atm y n)
        TC_CONFIG_XT  := $(usex iptables y n)
        HAVE_SELINUX  := $(usex selinux y n)
        IP_CONFIG_SETNS := ${setns}
        # Use correct iptables dir, #144265 #293709
        IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables 
--variable=xtlibdir)
        EOF
}

src_install() {
        if use minimal ; then
                into /
                dosbin tc/tc
                return 0
        fi

        emake \
                DESTDIR="${D}" \
                LIBDIR="${EPREFIX}"/$(get_libdir) \
                SBINDIR="${EPREFIX}"/sbin \
                CONFDIR="${EPREFIX}"/etc/iproute2 \
                DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
                MANDIR="${EPREFIX}"/usr/share/man \
                ARPDDIR="${EPREFIX}"/var/lib/arpd \
                install

        rm "${ED}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988

        dodir /bin
        mv "${ED}"/{s,}bin/ip || die #330115

        dolib.a lib/libnetlink.a
        insinto /usr/include
        doins include/libnetlink.h
        # This local header pulls in a lot of linux headers it
        # doesn't directly need.  Delete this header that requires
        # linux-headers-3.8 until that goes stable.  #467716
        sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die

        if use berkdb ; then
                dodir /var/lib/arpd
                # bug 47482, arpd doesn't need to be in /sbin
                dodir /usr/bin
                mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
        fi
}




Reply via email to