From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Kd4JE-00024k-UV for garchives@archives.gentoo.org; Tue, 09 Sep 2008 14:35:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 96BCCE03AD; Tue, 9 Sep 2008 14:35:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4E560E03AD for ; Tue, 9 Sep 2008 14:35:12 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 139EF65AD9 for ; Tue, 9 Sep 2008 14:35:11 +0000 (UTC) Received: from cardoe by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1Kd4JB-0001L8-S3 for gentoo-commits@lists.gentoo.org; Tue, 09 Sep 2008 14:35:09 +0000 From: "Doug Goldstein (cardoe)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, cardoe@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/iproute2: ChangeLog iproute2-2.6.26-r2.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog iproute2-2.6.26-r2.ebuild X-VCS-Directories: sys-apps/iproute2 X-VCS-Committer: cardoe X-VCS-Committer-Name: Doug Goldstein Content-Type: text/plain; charset=utf8 Message-Id: Sender: Doug Goldstein Date: Tue, 09 Sep 2008 14:35:09 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 7a8b0b08-1526-4f15-bfd0-40fa212b37fe X-Archives-Hash: 86012c2c66bd7b02afed31c28c337694 cardoe 08/09/09 14:35:09 Modified: ChangeLog Added: iproute2-2.6.26-r2.ebuild Log: multilib and ldflags respecting changes from Olivier Huber bug #236861 (Portage version: 2.2_rc8/cvs/Linux 2.6.25-gentoo-r8 x86_64) Revision Changes Path 1.112 sys-apps/iproute2/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/iproute2/= ChangeLog?rev=3D1.112&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/iproute2/= ChangeLog?rev=3D1.112&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/iproute2/= ChangeLog?r1=3D1.111&r2=3D1.112 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- ChangeLog 20 Aug 2008 06:31:55 -0000 1.111 +++ ChangeLog 9 Sep 2008 14:35:09 -0000 1.112 @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/iproute2 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.111 2= 008/08/20 06:31:55 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.112 2= 008/09/09 14:35:09 cardoe Exp $ + +*iproute2-2.6.26-r2 (09 Sep 2008) + + 09 Sep 2008; Doug Goldstein + +files/iproute2-2.6.26-ldflags.patch, +iproute2-2.6.26-r2.ebuild: + multilib and ldflags respecting changes from Olivier Huber + bug #236861 =20 *iproute2-2.6.26-r1 (20 Aug 2008) =20 1.1 sys-apps/iproute2/iproute2-2.6.26-r2.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/iproute2/= iproute2-2.6.26-r2.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/iproute2/= iproute2-2.6.26-r2.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: iproute2-2.6.26-r2.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.26-r2.e= build,v 1.1 2008/09/09 14:35:09 cardoe Exp $ inherit eutils toolchain-funcs if [[ ${PV} =3D=3D *.*.*.* ]] ; then MY_PV=3D${PV%.*} else MY_PV=3D${PV} fi MY_P=3D"${PN}-${MY_PV}" DESCRIPTION=3D"kernel routing and traffic control utilities" HOMEPAGE=3D"http://linux-net.osdl.org/index.php/Iproute2" SRC_URI=3D"http://developer.osdl.org/dev/iproute2/download/${MY_P}.tar.bz= 2" LICENSE=3D"GPL-2" SLOT=3D"0" KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 = ~sh ~sparc ~x86" IUSE=3D"atm berkdb minimal" RDEPEND=3D"!minimal? ( berkdb? ( sys-libs/db ) ) atm? ( net-dialup/linux-atm )" DEPEND=3D"${RDEPEND} elibc_glibc? ( >=3Dsys-libs/glibc-2.7 ) >=3Dvirtual/os-headers-2.6.25" S=3D${WORKDIR}/${MY_P} src_unpack() { unpack ${A} cd "${S}" sed -i "s:-O2:${CFLAGS} ${CPPFLAGS}:" Makefile || die "sed Makefile fail= ed" # build against system headers rm -r include/linux include/netinet #include/ip{,6}tables{,_common}.h in= clude/libiptc # fix LDFLAGS usage bug #236861 epatch "${FILESDIR}"/${PN}-2.6.26-ldflags.patch local check base=3D${PORTAGE_CONFIGROOT}/etc/portage/patches for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do EPATCH_SOURCE=3D${base}/${CTARGET}/${check} [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=3D${base}/${CHOST}/${check} [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=3D${base}/${check} if [[ -d ${EPATCH_SOURCE} ]] ; then EPATCH_SUFFIX=3D"patch" EPATCH_FORCE=3D"yes" \ EPATCH_MULTI_MSG=3D"Applying user patches from ${EPATCH_SOURCE} ..." \ epatch break fi done # don't build arpd if USE=3D-berkdb #81660 use berkdb || sed -i '/^TARGETS=3D/s: arpd : :' misc/Makefile # Multilib fixes sed -i 's:/usr/local:/usr:' tc/m_ipt.c include/iptables.h sed -i "s:/usr/lib:/usr/$(get_libdir):g" \ netem/Makefile tc/{Makefile,tc.c,q_netem.c,m_ipt.c} include/iptables.h = || die sed -i "s:/lib/tc:$(get_libdir)/tc:g" tc/Makefile || die # Use correct iptables dir, #144265. sed -i "s:/usr/local/lib/iptables:/$(get_libdir)/iptables:g" \ include/iptables.h } src_compile() { echo -n 'TC_CONFIG_ATM:=3D' > Config use atm \ && echo 'y' >> Config \ || echo 'n' >> Config use minimal && sed -i -e '/^SUBDIRS=3D/s:=3D.*:=3Dlib tc:' Makefile emake \ CC=3D"$(tc-getCC)" \ AR=3D"$(tc-getAR)" \ || die "make" } src_install() { if use minimal ; then into / dosbin tc/tc || die "minimal" return 0 fi emake \ DESTDIR=3D"${D}" \ SBINDIR=3D/sbin \ DOCDIR=3D/usr/share/doc/${PF} \ MANDIR=3D/usr/share/man \ install \ || die "make install failed" if use berkdb ; then dodir /var/lib/arpd # bug 47482, arpd doesn't need to be in /sbin dodir /usr/sbin mv "${D}"/sbin/arpd "${D}"/usr/sbin/ fi }