Drop symlinks #330115.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 7 insertions, 114 deletions

diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog
index 87a1e4d67fd4..26cbb9ad0910 100644
--- a/sys-apps/iproute2/ChangeLog
+++ b/sys-apps/iproute2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/iproute2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.157 2010/08/07 17:40:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.158 2010/08/09 17:29:20 vapier Exp $
+
+  09 Aug 2010; Mike Frysinger <vapier@gentoo.org> -iproute2-2.6.35.ebuild,
+  iproute2-2.6.35-r1.ebuild, iproute2-9999.ebuild:
+  Drop symlinks #330115.
 
 *iproute2-2.6.35-r1 (07 Aug 2010)
 
diff --git a/sys-apps/iproute2/iproute2-2.6.35-r1.ebuild b/sys-apps/iproute2/iproute2-2.6.35-r1.ebuild
index 2ed3763e51ca..4953f6db852b 100644
--- a/sys-apps/iproute2/iproute2-2.6.35-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-2.6.35-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.35-r1.ebuild,v 1.1 2010/08/07 17:40:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.35-r1.ebuild,v 1.2 2010/08/09 17:29:20 vapier Exp $
 
 EAPI="2"
 
@@ -90,9 +90,6 @@ src_install() {
 		|| die
 	prepalldocs
 
-	dodir /bin
-	dosym ../sbin/ip /bin/ip || die #330115
-
 	dolib.a lib/libnetlink.a || die
 	insinto /usr/include
 	doins include/libnetlink.h || die
diff --git a/sys-apps/iproute2/iproute2-2.6.35.ebuild b/sys-apps/iproute2/iproute2-2.6.35.ebuild
deleted file mode 100644
index 2930657a3fbb..000000000000
--- a/sys-apps/iproute2/iproute2-2.6.35.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.35.ebuild,v 1.1 2010/08/04 19:23:55 vapier Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-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%.*}-${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://www.linuxfoundation.org/collaborate/workgroups/networking/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.27"
-
-src_prepare() {
-	sed -i \
-		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
-		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
-		Makefile || die
-
-	# build against system headers
-	rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
-
-	epatch "${FILESDIR}"/${PN}-2.6.29.1-hfsc.patch #291907
-
-	epatch_user
-
-	# 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() {
-	echo -n 'TC_CONFIG_ATM:=' > Config
-	use atm \
-		&& echo 'y' >> Config \
-		|| echo 'n' >> Config
-
-	# Use correct iptables dir, #144265 #293709
-	append-cppflags -DIPT_LIB_DIR=\\\"`$(tc-getPKG_CONFIG) xtables --variable=xtlibdir`\\\"
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		|| die
-}
-
-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
-	prepalldocs
-
-	dodir /bin
-	mv "${D}"/{sbin,bin}/ip || die #330115
-
-	dolib.a lib/libnetlink.a || die
-	insinto /usr/include
-	doins include/libnetlink.h || die
-
-	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 cb430b3062c9..541d98993bd6 100644
--- a/sys-apps/iproute2/iproute2-9999.ebuild
+++ b/sys-apps/iproute2/iproute2-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.12 2010/08/07 17:40:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-9999.ebuild,v 1.13 2010/08/09 17:29:20 vapier Exp $
 
 EAPI="2"
 
@@ -90,9 +90,6 @@ src_install() {
 		|| die
 	prepalldocs
 
-	dodir /bin
-	dosym ../sbin/ip /bin/ip || die #330115
-
 	dolib.a lib/libnetlink.a || die
 	insinto /usr/include
 	doins include/libnetlink.h || die