fix iproute dep

4 files changed, 21 insertions, 28 deletions

diff --git a/sys-apps/tcng/tcng-9i.ebuild b/sys-apps/tcng/tcng-9i.ebuild
index 974a06ebb3ae..271d74128be9 100644
--- a/sys-apps/tcng/tcng-9i.ebuild
+++ b/sys-apps/tcng/tcng-9i.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcng/tcng-9i.ebuild,v 1.1 2003/12/17 11:58:17 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcng/tcng-9i.ebuild,v 1.2 2004/04/21 16:28:21 vapier Exp $
 
-DESCRIPTION="tcng - Traffic Control Next Generation"
+DESCRIPTION="Traffic Control Next Generation"
 HOMEPAGE="http://tcng.sourceforge.net/"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
@@ -14,11 +15,11 @@ IUSE="doc tcsim"
 # os-headers as it compiles stuff with them
 # gcc/binutils as it compiles stuff
 DEPEND_COMMON="dev-lang/perl
-				sys-apps/iproute
-				net-dialup/linux-atm
-				virtual/os-headers
-				sys-devel/gcc
-				sys-devel/binutils"
+	sys-apps/iproute2
+	net-dialup/linux-atm
+	virtual/os-headers
+	sys-devel/gcc
+	sys-devel/binutils"
 
 DEPEND="doc? ( virtual/ghostscript app-text/tetex media-gfx/transfig )
 	sys-devel/make
diff --git a/sys-cluster/keepalived/keepalived-1.1.3.ebuild b/sys-cluster/keepalived/keepalived-1.1.3.ebuild
index 6a7d31a78724..cc4546624b10 100644
--- a/sys-cluster/keepalived/keepalived-1.1.3.ebuild
+++ b/sys-cluster/keepalived/keepalived-1.1.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.1.3.ebuild,v 1.3 2004/01/26 06:41:21 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.1.3.ebuild,v 1.4 2004/04/21 16:30:02 vapier Exp $
 
 DESCRIPTION="The main goal of the keepalived project is to add a strong & robust keepalive facility to the Linux Virtual Server project."
 HOMEPAGE="http://keepalived.sourceforge.net"
 LICENSE="GPL-2"
 
 DEPEND="dev-libs/popt
-	sys-apps/iproute"
+	sys-apps/iproute2"
 
 SRC_URI="http://keepalived.sourceforge.net/software/${P}.tar.gz"
 
diff --git a/sys-cluster/keepalived/keepalived-1.1.5.ebuild b/sys-cluster/keepalived/keepalived-1.1.5.ebuild
index 6aafcd375945..9f33ef65ddd6 100644
--- a/sys-cluster/keepalived/keepalived-1.1.5.ebuild
+++ b/sys-cluster/keepalived/keepalived-1.1.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.1.5.ebuild,v 1.1 2004/01/26 06:41:21 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.1.5.ebuild,v 1.2 2004/04/21 16:30:02 vapier Exp $
 
 DESCRIPTION="The main goal of the keepalived project is to add a strong & robust keepalive facility to the Linux Virtual Server project."
 HOMEPAGE="http://keepalived.sourceforge.net"
 LICENSE="GPL-2"
 
 DEPEND="dev-libs/popt
-	sys-apps/iproute"
+	sys-apps/iproute2"
 
 SRC_URI="http://keepalived.sourceforge.net/software/${P}.tar.gz"
 
diff --git a/sys-cluster/keepalived/keepalived-1.1.6.ebuild b/sys-cluster/keepalived/keepalived-1.1.6.ebuild
index 587f24636f1d..6ad2db4eed8a 100644
--- a/sys-cluster/keepalived/keepalived-1.1.6.ebuild
+++ b/sys-cluster/keepalived/keepalived-1.1.6.ebuild
@@ -1,20 +1,18 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.1.6.ebuild,v 1.1 2004/02/23 18:00:05 iggy Exp $
-
-DESCRIPTION="The main goal of the keepalived project is to add a strong & robust keepalive facility to the Linux Virtual Server project."
-HOMEPAGE="http://keepalived.sourceforge.net"
-LICENSE="GPL-2"
-
-DEPEND="dev-libs/popt
-	sys-apps/iproute"
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.1.6.ebuild,v 1.2 2004/04/21 16:30:02 vapier Exp $
 
+DESCRIPTION="add a strong & robust keepalive facility to the Linux Virtual Server project"
+HOMEPAGE="http://keepalived.sourceforge.net/"
 SRC_URI="http://keepalived.sourceforge.net/software/${P}.tar.gz"
 
-IUSE=""
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
-S="${WORKDIR}/${P}"
+IUSE="debug"
+
+DEPEND="dev-libs/popt
+	sys-apps/iproute2"
 
 src_compile() {
 	local myconf
@@ -24,15 +22,11 @@ src_compile() {
 	use debug && myconf="${myconf} --enable-debug"
 #	use profile && myconf="${myconf} --enable-profile"
 
-	cd "${S}"
 	./configure ${myconf} || die "configure failed"
 	emake || die "make failed (myconf=${myconf})"
-
 }
 
 src_install() {
-
-	cd "${S}"
 	einstall || die
 
 	exeinto /etc/init.d
@@ -43,7 +37,6 @@ src_install() {
 }
 
 pkg_postinst() {
-
 	einfo ""
 	einfo "If you want Linux Virtual Server support in keepalived then you must emerge an"
 	einfo "LVS patched kernel, compile with ipvs support either as a module or built into"
@@ -51,5 +44,4 @@ pkg_postinst() {
 	einfo ""
 	einfo "For debug support add USE=\"debug\" to your /etc/make.conf"
 	einfo ""
-
 }