updated copyright, added additional checks on kernel version (1.21 works only on kernel 2.4.x)

4 files changed, 30 insertions, 20 deletions

diff --git a/sys-cluster/ipvsadm/ChangeLog b/sys-cluster/ipvsadm/ChangeLog
index 08ca582d9b37..b2114a9a613a 100644
--- a/sys-cluster/ipvsadm/ChangeLog
+++ b/sys-cluster/ipvsadm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/ipvsadm
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ChangeLog,v 1.14 2004/09/03 15:21:28 dholm Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ChangeLog,v 1.15 2005/01/21 18:14:37 xmerlin Exp $
+
+  21 Jan 2005; Christian Zoffoli <xmerlin@gentoo.org> ipvsadm-1.21-r1.ebuild:
+  updated copyright, added additional checks on kernel version (1.21 works only
+  on kernel 2.4.x)
 
   03 Sep 2004; David Holm <dholm@gentoo.org> ipvsadm-1.21-r1.ebuild:
   Added to ~ppc.
diff --git a/sys-cluster/ipvsadm/Manifest b/sys-cluster/ipvsadm/Manifest
index 7a3965faf784..a4071e5a8fba 100644
--- a/sys-cluster/ipvsadm/Manifest
+++ b/sys-cluster/ipvsadm/Manifest
@@ -1,7 +1,7 @@
+MD5 c06d4ebf96df70cad6ffda10a832940a ipvsadm-1.24.ebuild 1197
 MD5 820df1507d48c92f25a1a35055b73833 ChangeLog 2023
-MD5 cdf42c3f8a364c03cfab9a185d41bf4a ipvsadm-1.21-r1.ebuild 1145
-MD5 89e45c10f03b0f57683ed4c127b9dbbe ipvsadm-1.24.ebuild 1197
 MD5 f8149340999d7088d0b706591237ec73 metadata.xml 332
-MD5 73f42ff7b9dfa10345e0f2f6a3d8b57a files/digest-ipvsadm-1.21-r1 63
+MD5 4560ae9194e864a7286dfd8add202882 ipvsadm-1.21-r1.ebuild 1347
 MD5 1b3d2656b8219fca2114015a5ed932c9 files/digest-ipvsadm-1.24 63
+MD5 73f42ff7b9dfa10345e0f2f6a3d8b57a files/digest-ipvsadm-1.21-r1 63
 MD5 3b3c592fdf57e4760d02989b8ee11562 files/ipvsadm-init 764
diff --git a/sys-cluster/ipvsadm/ipvsadm-1.21-r1.ebuild b/sys-cluster/ipvsadm/ipvsadm-1.21-r1.ebuild
index 4e83b6393493..d58d48089c61 100644
--- a/sys-cluster/ipvsadm/ipvsadm-1.21-r1.ebuild
+++ b/sys-cluster/ipvsadm/ipvsadm-1.21-r1.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ipvsadm-1.21-r1.ebuild,v 1.7 2004/09/03 15:21:28 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ipvsadm-1.21-r1.ebuild,v 1.8 2005/01/21 18:14:37 xmerlin Exp $
 
+inherit check-kernel
 
 DESCRIPTION="ipvsadm is a utility to administer the IP virtual server services offered by the Linux kernel with IP virtual server support."
 HOMEPAGE="http://linuxvirtualserver.org"
 LICENSE="GPL-2"
 DEPEND="virtual/libc
+	virtual/linux-sources
 	>=sys-libs/ncurses-5.2"
 
 SRC_URI="http://www.linuxvirtualserver.org/software/kernel-2.4/${P}.tar.gz"
@@ -15,23 +17,27 @@ SLOT="0"
 KEYWORDS="x86 ~ppc"
 IUSE=""
 
+pkg_setup() {
+	if is_2_5_kernel || is_2_6_kernel
+	then
+		die "${P} does not support 2.5 and 2.6 kernels, please try ${PN}-1.24"
+	fi
+}
+
+
 src_compile() {
-	cd "${S}"
-	make || die
+	check_KV
+	make || die "error compiling source"
 }
 
 src_install() {
 	into /
-	dosbin ipvsadm
-	dosbin ipvsadm-save
-	dosbin ipvsadm-restore
+	dosbin ipvsadm ipvsadm-save ipvsadm-restore || die
 
-	doman ipvsadm.8
-	doman ipvsadm-save.8
-	doman ipvsadm-restore.8
+	doman ipvsadm.8 ipvsadm-save.8 ipvsadm-restore.8
 
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/ipvsadm-init ipvsadm
+	newexe ${FILESDIR}/ipvsadm-init ipvsadm || die
 	keepdir /var/lib/ipvsadm
 
 	diropts -m 755 -o root -g root
@@ -40,10 +46,10 @@ src_install() {
 
 	insopts -m 644 -o root -g root
 	insinto /usr/lib
-	doins libipvs/libipvs.a
+	doins libipvs/libipvs.a || die
 
 	insinto /usr/include/ipvs
-	newins libipvs/libipvs.h ipvs.h
+	newins libipvs/libipvs.h ipvs.h || die
 
 	einfo "You will need a kernel that has ipvs patches to use LVS"
 }
diff --git a/sys-cluster/ipvsadm/ipvsadm-1.24.ebuild b/sys-cluster/ipvsadm/ipvsadm-1.24.ebuild
index 94ec8011fa21..736f1086b5ce 100644
--- a/sys-cluster/ipvsadm/ipvsadm-1.24.ebuild
+++ b/sys-cluster/ipvsadm/ipvsadm-1.24.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ipvsadm-1.24.ebuild,v 1.6 2004/07/15 02:55:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ipvsadm-1.24.ebuild,v 1.7 2005/01/21 18:14:37 xmerlin Exp $
 
 
 DESCRIPTION="ipvsadm is a utility to administer the IP virtual server services offered by the Linux kernel with IP virtual server support."