Version bump #225455 by teidakankan.

Package-Manager: portage-2.2_pre7-r1/cvs/Linux 2.6.25 AMD Athlon(tm) 64 X2 Dual Core Processor 4200+

3 files changed, 103 insertions, 6 deletions

diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog
index 45859c1bc4ad..9dd4de38433d 100644
--- a/sys-apps/iproute2/ChangeLog
+++ b/sys-apps/iproute2/ChangeLog
@@ -1,6 +1,12 @@
 # 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.104 2008/03/29 17:26:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.105 2008/06/09 00:58:21 vapier Exp $
+
+*iproute2-2.6.25.20080417 (09 Jun 2008)
+
+  09 Jun 2008; Mike Frysinger <vapier@gentoo.org>
+  +iproute2-2.6.25.20080417.ebuild:
+  Version bump #225455 by teidakankan.
 
 *iproute2-2.6.24.20080108 (29 Mar 2008)
 
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 6c406eb4c1aa..0b3a2f0cb697 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -4,15 +4,17 @@ Hash: SHA1
 AUX iproute2-2.6.16.20060323-build.patch 938 RMD160 13cfc8c208cd07b3db06353b42e77583f1b537dc SHA1 4b29a52e5c26648e1255dc3ad5779a0fd23dfd69 SHA256 d322b077a550ce851d0056738285a50290934bfe3d2a9aaaf6ab5036de99ac63
 DIST iproute2-2.6.22-070710.tar.gz 410719 RMD160 b11222506531e446d1c0b2e73440fa1d98031ceb SHA1 0d0b73a36945009fa3597e929bef6e71b91cfbde SHA256 3c6b48af9e655e4f0a34c7718e288960a1dc84a3ac7eb726e855adb45fbd953a
 DIST iproute2-2.6.24-rc7.tar.bz2 343912 RMD160 227d16911749839d37dec53e63042ca846e0128d SHA1 8a0029de759dc81c23637a2b5834191d4ce87b5d SHA256 6991ff2be1826193b6537413939c00026c63b9d326a6a95272a6ab228eb017bf
+DIST iproute2-2.6.25.tar.bz2 359144 RMD160 1f1175f187901de388bf300bd138f76af38599d8 SHA1 c73943aea21c047e3fe2e933b5ece3fcc8a20e10 SHA256 dc0e0f66c0928b5b4d4ae6bc833f3b21d0d4f5dbdaaf0711e42497bf50294512
 EBUILD iproute2-2.6.22.20070710.ebuild 2697 RMD160 9ff9ae78130f6e6f843944f4b83687530d00d260 SHA1 864e1f14cb1d5ea7c6719991a280fcaaeb3c0770 SHA256 74bbb34b55d768fbb6478442f4a3ba20df031e7e97ac45527cadd2df6a3a3223
 EBUILD iproute2-2.6.24.20080108.ebuild 2537 RMD160 b9dc98cac16ec225f18979be40b0e9cefbc4d0a3 SHA1 05115241fe38242ac25d180872a4ade4e140f49c SHA256 7806732fa3a3b29ef8be76ea2abb3159ed820a3281fa9f4c8b836c736df97420
-EBUILD iproute2-9999.ebuild 1885 RMD160 7c3d67ead87e300417f08a1fa46045b185f93e43 SHA1 ee443b7d7afa53b4d88ab07eae5334f356fded49 SHA256 6f9f55c3351e63d323b5c3af1a18555235b8f585e1df96c63b3113a9dda1dc03
-MISC ChangeLog 19271 RMD160 3cfd3d933bbda5ddcd52099e81f9700b67602031 SHA1 4722b4be7c1b3b97432966cea12b601598c41e87 SHA256 8cd68bc446d9bca14cdfcbe605c7c5edc5e8a74b8ce57f1a39163d9c6e57f1ee
+EBUILD iproute2-2.6.25.20080417.ebuild 2468 RMD160 a5148a6e81e965913be5d1d6f7c49245c20707a3 SHA1 2858bfd94d763c1d142991c43fc1ee0d05d49de1 SHA256 8d6eb466c04836d60c1700492864f7b6fe2414e46cb8c0419286c1341410ac7d
+EBUILD iproute2-9999.ebuild 1820 RMD160 09f3b3a9d629ace8d9b8d29ab2598f3473ed5bfe SHA1 f11b23660187018641974f003d5c4e3042a19247 SHA256 d91ef999b59695cef298b4f3c31099ec43d6cfa47b6d35c2fe382580f0b9f084
+MISC ChangeLog 19438 RMD160 da9950da98084e9e634bfe9d88de23c7cd05f567 SHA1 3057250a991608df6511b9d98c1f768888d42bf0 SHA256 0ee00092b7b77dbb0d7c5f837cd4a7be3ed4bac39e4016d7c0555ded209609c4
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH7nyIj9hvisErhMIRAvW4AJ47vgRkfPnV0shdFdFqKD2aIIOwvQCgsxs3
-w9yfkhwasOKxDmN/7O+MGMA=
-=MoKD
+iD8DBQFITIA6j9hvisErhMIRAugBAKCYdJnF2oG06yQLhUqnnKfXjbthvACg7Osu
+i+qV6XT0C3x8T7Y/aR3GmK0=
+=+d8w
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/iproute2/iproute2-2.6.25.20080417.ebuild b/sys-apps/iproute2/iproute2-2.6.25.20080417.ebuild
new file mode 100644
index 000000000000..40768b0cccfc
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-2.6.25.20080417.ebuild
@@ -0,0 +1,89 @@
+# 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.25.20080417.ebuild,v 1.1 2008/06/09 00:58:21 vapier Exp $
+
+inherit eutils toolchain-funcs
+
+MY_PV="${PV%.*}"
+SNAP=${PV##*.}
+SNAP=${SNAP:2}
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="kernel routing and traffic control utilities"
+HOMEPAGE="http://linux-net.osdl.org/index.php/Iproute2"
+SRC_URI="http://developer.osdl.org/dev/iproute2/download/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="atm berkdb minimal"
+
+RDEPEND="!minimal? ( berkdb? ( sys-libs/db ) )
+	atm? ( net-dialup/linux-atm )"
+DEPEND="${RDEPEND}
+	>=virtual/os-headers-2.4.21"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i "s:-O2:${CFLAGS}:" Makefile || die "sed Makefile failed"
+
+	local check base=${PORTAGE_CONFIGROOT}/etc/portage/patches
+	for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
+		EPATCH_SOURCE=${base}/${CTARGET}/${check}
+		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
+		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
+		if [[ -d ${EPATCH_SOURCE} ]] ; then
+			EPATCH_SUFFIX="patch"
+			EPATCH_FORCE="yes" \
+			EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
+			epatch
+			break
+		fi
+	done
+
+	# don't build arpd if USE=-berkdb #81660
+	use berkdb || sed -i '/^TARGETS=/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
+	# 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:=' > Config
+	use atm \
+		&& echo 'y' >> Config \
+		|| echo 'n' >> Config
+
+	use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc:' Makefile
+	emake \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		|| die "make"
+}
+
+src_install() {
+	if use minimal ; then
+		into /
+		dosbin tc/tc || die "minimal"
+		return 0
+	fi
+
+	emake \
+		DESTDIR="${D}" \
+		SBINDIR=/sbin \
+		DOCDIR=/usr/share/doc/${PF} \
+		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
+}