diff options
author | Mike Frysinger <vapier@gentoo.org> | 2008-08-20 06:31:55 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2008-08-20 06:31:55 +0000 |
commit | 81e919441472afb482658a0ad09209565edcb96e (patch) | |
tree | 0f9612bd1aee9cb58ac8453d5398a14dfbc5db06 | |
parent | old (diff) | |
download | gentoo-2-81e919441472afb482658a0ad09209565edcb96e.tar.gz gentoo-2-81e919441472afb482658a0ad09209565edcb96e.tar.bz2 gentoo-2-81e919441472afb482658a0ad09209565edcb96e.zip |
Fix by cyrillic for manpage install #235237.
(Portage version: 2.2_rc8/cvs/Linux 2.6.26.2 x86_64, RepoMan options: --force)
-rw-r--r-- | sys-apps/iproute2/ChangeLog | 8 | ||||
-rw-r--r-- | sys-apps/iproute2/iproute2-2.6.26-r1.ebuild | 96 |
2 files changed, 103 insertions, 1 deletions
diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog index c9c4d0a3eb79..c99c3771615c 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.110 2008/08/17 14:28:32 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.111 2008/08/20 06:31:55 vapier Exp $ + +*iproute2-2.6.26-r1 (20 Aug 2008) + + 20 Aug 2008; Mike Frysinger <vapier@gentoo.org> + +iproute2-2.6.26-r1.ebuild: + Fix by cyrillic for manpage install #235237. *iproute2-2.6.26 (17 Aug 2008) diff --git a/sys-apps/iproute2/iproute2-2.6.26-r1.ebuild b/sys-apps/iproute2/iproute2-2.6.26-r1.ebuild new file mode 100644 index 000000000000..a2bd28983faf --- /dev/null +++ b/sys-apps/iproute2/iproute2-2.6.26-r1.ebuild @@ -0,0 +1,96 @@ +# 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-r1.ebuild,v 1.1 2008/08/20 06:31:55 vapier Exp $ + +inherit eutils toolchain-funcs + +if [[ ${PV} == *.*.*.* ]] ; then + MY_PV=${PV%.*} +else + MY_PV=${PV} +fi +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} + elibc_glibc? ( >=sys-libs/glibc-2.7 ) + >=virtual/os-headers-2.6.25" + +S=${WORKDIR}/${MY_P} + +src_unpack() { + unpack ${A} + 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 + + 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} \ + 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 +} |