Merge ebuild versions and version bump #255095 by Krzysztof Oledzki.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 x86_64

4 files changed, 178 insertions, 18 deletions

diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog
index ea83d543d8a0..71894f154097 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.114 2008/11/27 20:48:07 vapier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.115 2009/01/17 17:11:14 vapier Exp $
+
+*iproute2-2.6.28 (17 Jan 2009)
+
+  17 Jan 2009; Mike Frysinger <vapier@gentoo.org> +iproute2-2.6.28.ebuild,
+  iproute2-9999.ebuild:
+  Merge ebuild versions and version bump #255095 by Krzysztof Oledzki.
 
   27 Nov 2008; Mike Frysinger <vapier@gentoo.org> iproute2-2.6.26-r2.ebuild:
   Add a blocker on iproute2 #248092 by Diego E. Pettenò.
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index fa94c24eefef..49d51d6ee21c 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -9,18 +9,20 @@ DIST iproute2-2.6.22-070710.tar.gz 410719 RMD160 b11222506531e446d1c0b2e73440fa1
 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
 DIST iproute2-2.6.26.tar.bz2 359574 RMD160 9a6016ceb5d8a87c4e951463faf5d7dcf7731a9a SHA1 95e0f528066eae7304b5d7c610348b522628c92f SHA256 e4468eb1944ef66eb994e9fe3505fe09957b8ab98929287c12c9920caf95137e
+DIST iproute2-2.6.28.tar.bz2 365502 RMD160 8798b9aba50f92882d5aab234801e6ac41305877 SHA1 303601cf70caf61ece62116fe6e3370f423aa134 SHA256 bb54e0abbd4b9b5a928bdfe17039d3e2c42a6d42fd5b82b454b8b72ebba35cb3
 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-2.6.25.20080417.ebuild 2687 RMD160 818a3827b847e7568dd457c566b1dea65731623c SHA1 78027cf1c73f9d665b66d32cbb29b0ad3ab945e1 SHA256 83901533961d70f5a68d72f6260d672daee9689c71ee4f686652c402e452649f
 EBUILD iproute2-2.6.26-r1.ebuild 2682 RMD160 37946a9c850ed14c32aeca1c9d4c927f4aa6d9fd SHA1 6cb5a08ef4581902ec41a3b47f930f09426423fe SHA256 575d6dccc496b502b0b9594ba92ffefabbf782477b739926e8db5fd9640591e9
 EBUILD iproute2-2.6.26-r2.ebuild 2856 RMD160 1ff08f59998a50fde7dc9c4ef1d256b209315f67 SHA1 857c668dd00100981dec88cb18c3cf9f2964618e SHA256 4b0a2e4191cdbf2bc37f29b60615e59b5481a78f2cdaacb653d87747b5b20af1
-EBUILD iproute2-9999.ebuild 1820 RMD160 09f3b3a9d629ace8d9b8d29ab2598f3473ed5bfe SHA1 f11b23660187018641974f003d5c4e3042a19247 SHA256 d91ef999b59695cef298b4f3c31099ec43d6cfa47b6d35c2fe382580f0b9f084
-MISC ChangeLog 21110 RMD160 7f3ae8af11a1719755ffe1cb68287f0fac7eac19 SHA1 c39d8a1582b0167b7fbbedd8a4aa05487ea43bf2 SHA256 9881a22a67ecacb9035c1eba5800257eb9834535824abbbdf8c244e808185270
+EBUILD iproute2-2.6.28.ebuild 3045 RMD160 53daf5888448bad9bf87b91b1928941ac0ef0de6 SHA1 5ff15d9fa0147832dd6af8fc4e519707855d1354 SHA256 87c7d51d0295d4fa9e7dd13305ee3013be65f342dbbbc74aa70003ca2e79043c
+EBUILD iproute2-9999.ebuild 3043 RMD160 dadc3ac95eed39e2a7837746a4aaa098e0f9b0b5 SHA1 14fe922db75eb2a584de93cc31a71bd2f4d1a719 SHA256 5405d8a0e003b2ffaa620619a79e52d7c7ee72c12e18d4109ff093bdc809171e
+MISC ChangeLog 21313 RMD160 dc843cc632a9337e4f5de692c32f740701b40747 SHA1 1755379bd9befdfa0d615ae1e9ff8379a02d8bdd SHA256 cbecc3ab481fe8eab8f8e24da44a1320650d110e031e43b0350c4af4e300e848
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkvB40ACgkQ67wieSYcaxeOvwCdGGcbzMzRN9HMClnYqDSmcEed
-2YUAnRxIVZNwGflXdhG/aEULubkYWM2R
-=D6GQ
+iEYEARECAAYFAklyETgACgkQn/5bYzqsSmF8twCeK3XDlTmDjSdvzlDHAcs1F4tE
+sXIAoIEKNj9AL5ZV+gZn7B+j8opCOP37
+=jomR
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/iproute2/iproute2-2.6.28.ebuild b/sys-apps/iproute2/iproute2-2.6.28.ebuild
new file mode 100644
index 000000000000..763166f38512
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-2.6.28.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.28.ebuild,v 1.1 2009/01/17 17:11:14 vapier Exp $
+
+inherit eutils toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
+	inherit git
+	SRC_URI=""
+	KEYWORDS=""
+else
+	if [[ ${PV} == *.*.*.* ]] ; then
+		MY_PV=${PV%.*}
+	else
+		MY_PV=${PV}
+	fi
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="http://developer.osdl.org/dev/iproute2/download/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
+
+DESCRIPTION="kernel routing and traffic control utilities"
+HOMEPAGE="http://linux-net.osdl.org/index.php/Iproute2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="atm berkdb minimal"
+
+RDEPEND="!net-misc/arpd
+	!minimal? ( berkdb? ( sys-libs/db ) )
+	atm? ( net-dialup/linux-atm )"
+DEPEND="${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.7 )
+	>=virtual/os-headers-2.6.25"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git_src_unpack
+	else
+		unpack ${A}
+	fi
+	cd "${S}"
+	sed -i "s:-O2:${CFLAGS} ${CPPFLAGS}:" Makefile || die "sed Makefile failed"
+
+	# build against system headers
+	rm -r include/linux include/netinet #include/ip{,6}tables{,_common}.h include/libiptc
+
+	epatch "${FILESDIR}"/${PN}-2.6.26-ldflags.patch #236861
+
+	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
+	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:=' > 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} \
+		MANDIR=/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
+}
diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild
index 25611cbb1ef1..c553e208363a 100644
--- a/sys-apps/iproute2/iproute2-9999.ebuild
+++ b/sys-apps/iproute2/iproute2-9999.ebuild
@@ -1,28 +1,67 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-9999.ebuild,v 1.2 2008/06/09 00:57:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-9999.ebuild,v 1.3 2009/01/17 17:11:14 vapier Exp $
 
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
-inherit eutils toolchain-funcs git
+inherit eutils toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
+	inherit git
+	SRC_URI=""
+	KEYWORDS=""
+else
+	if [[ ${PV} == *.*.*.* ]] ; then
+		MY_PV=${PV%.*}
+	else
+		MY_PV=${PV}
+	fi
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="http://developer.osdl.org/dev/iproute2/download/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
 HOMEPAGE="http://linux-net.osdl.org/index.php/Iproute2"
-SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="atm berkdb minimal"
 
-RDEPEND="!minimal? ( berkdb? ( sys-libs/db ) )
+RDEPEND="!net-misc/arpd
+	!minimal? ( berkdb? ( sys-libs/db ) )
 	atm? ( net-dialup/linux-atm )"
 DEPEND="${RDEPEND}
-	>=virtual/os-headers-2.4.21"
+	elibc_glibc? ( >=sys-libs/glibc-2.7 )
+	>=virtual/os-headers-2.6.25"
 
 src_unpack() {
-	git_src_unpack
+	if [[ ${PV} == "9999" ]] ; then
+		git_src_unpack
+	else
+		unpack ${A}
+	fi
 	cd "${S}"
-	sed -i "s:-O2:${CFLAGS}:" Makefile || die "sed Makefile failed"
+	sed -i "s:-O2:${CFLAGS} ${CPPFLAGS}:" Makefile || die "sed Makefile failed"
+
+	# build against system headers
+	rm -r include/linux include/netinet #include/ip{,6}tables{,_common}.h include/libiptc
+
+	epatch "${FILESDIR}"/${PN}-2.6.26-ldflags.patch #236861
+
+	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
@@ -30,7 +69,8 @@ src_unpack() {
 	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:/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
 }
@@ -59,6 +99,7 @@ src_install() {
 		DESTDIR="${D}" \
 		SBINDIR=/sbin \
 		DOCDIR=/usr/share/doc/${PF} \
+		MANDIR=/usr/share/man \
 		install \
 		|| die "make install failed"
 	if use berkdb ; then