From a7de76c014c36b8f2942b231317ee6bf443a29f0 Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Sat, 10 Sep 2011 09:02:31 +0000 Subject: Cleanup the latest ebuild. Remove weird info. Reword the warning in 2.4 kernel support. Remove overshadowed version. (Portage version: 2.2.0_alpha54/cvs/Linux x86_64) --- sys-cluster/ipvsadm/ChangeLog | 7 +++- sys-cluster/ipvsadm/ipvsadm-1.21-r1.ebuild | 4 +-- sys-cluster/ipvsadm/ipvsadm-1.24.ebuild | 54 ------------------------------ sys-cluster/ipvsadm/ipvsadm-1.26-r1.ebuild | 18 +++++----- 4 files changed, 16 insertions(+), 67 deletions(-) delete mode 100644 sys-cluster/ipvsadm/ipvsadm-1.24.ebuild (limited to 'sys-cluster') diff --git a/sys-cluster/ipvsadm/ChangeLog b/sys-cluster/ipvsadm/ChangeLog index b6cc8a53f165..d6c9d20c0b1f 100644 --- a/sys-cluster/ipvsadm/ChangeLog +++ b/sys-cluster/ipvsadm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-cluster/ipvsadm # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ChangeLog,v 1.52 2011/06/24 12:01:25 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ChangeLog,v 1.53 2011/09/10 09:02:31 scarabeus Exp $ + + 10 Sep 2011; Tomáš Chvátal ipvsadm-1.21-r1.ebuild, + -ipvsadm-1.24.ebuild, ipvsadm-1.26-r1.ebuild: + Cleanup the latest ebuild. Remove weird info. Reword the warning in 2.4 + kernel support. Remove overshadowed version. 24 Jun 2011; Raúl Porcel ipvsadm-1.26-r1.ebuild: ia64/s390/sparc stable wrt #370441 diff --git a/sys-cluster/ipvsadm/ipvsadm-1.21-r1.ebuild b/sys-cluster/ipvsadm/ipvsadm-1.21-r1.ebuild index f4a80d30b2ff..76877163274c 100644 --- a/sys-cluster/ipvsadm/ipvsadm-1.21-r1.ebuild +++ b/sys-cluster/ipvsadm/ipvsadm-1.21-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.18 2011/06/06 05:00:08 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ipvsadm-1.21-r1.ebuild,v 1.19 2011/09/10 09:02:31 scarabeus Exp $ inherit linux-info @@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}" pkg_setup() { if kernel_is -ge 2 6; then - eerror "${P} does not support 2.6 kernels, please try ${PN}-1.24" + eerror "${P} does not support 2.6 kernels, please try newer versions" die "wrong kernel version" fi } diff --git a/sys-cluster/ipvsadm/ipvsadm-1.24.ebuild b/sys-cluster/ipvsadm/ipvsadm-1.24.ebuild deleted file mode 100644 index 3d71865a25af..000000000000 --- a/sys-cluster/ipvsadm/ipvsadm-1.24.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2010 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.27 2010/09/17 09:39:16 robbat2 Exp $ - -inherit linux-info toolchain-funcs - -DESCRIPTION="utility to administer the IP virtual server services offered by the Linux kernel" -HOMEPAGE="http://linuxvirtualserver.org/" -SRC_URI="http://www.linuxvirtualserver.org/software/kernel-2.5/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ia64 ~ppc64 s390 sparc x86" -IUSE="" - -RDEPEND=">=sys-libs/ncurses-5.2" -DEPEND="${RDEPEND}" - -pkg_setup() { - if kernel_is 2 4; then - eerror "${P} supports only 2.6 kernels, please try ${PN}-1.21 for 2.4 kernels" - die "wrong kernel version" - fi -} - -src_compile() { - emake \ - -j1 \ - INCLUDE="-I${KV_DIR}/include -I.. -I." \ - CFLAGS="${CFLAGS}" \ - CC="$(tc-getCC)" \ - || die "error compiling source" -} - -src_install() { - into / - dosbin ipvsadm ipvsadm-save ipvsadm-restore || die - - doman ipvsadm.8 ipvsadm-save.8 ipvsadm-restore.8 || die - - newinitd "${FILESDIR}"/ipvsadm-init ipvsadm - keepdir /var/lib/ipvsadm - - insinto /usr/lib - doins libipvs/libipvs.a || die - - insinto /usr/include/ipvs - newins libipvs/libipvs.h ipvs.h || die -} - -pkg_postinst() { - einfo "You will need a kernel that has ipvs patches to use LVS." - einfo "This version is specifically for 2.6 kernels." -} diff --git a/sys-cluster/ipvsadm/ipvsadm-1.26-r1.ebuild b/sys-cluster/ipvsadm/ipvsadm-1.26-r1.ebuild index ff1f4699f701..8507ace5fd97 100644 --- a/sys-cluster/ipvsadm/ipvsadm-1.26-r1.ebuild +++ b/sys-cluster/ipvsadm/ipvsadm-1.26-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ipvsadm-1.26-r1.ebuild,v 1.5 2011/06/24 12:01:25 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ipvsadm-1.26-r1.ebuild,v 1.6 2011/09/10 09:02:31 scarabeus Exp $ EAPI=4 @@ -21,9 +21,9 @@ RDEPEND=">=sys-libs/ncurses-5.2 DEPEND="${RDEPEND} dev-util/pkgconfig" -pkg_setup() { +pkg_pretend() { if kernel_is 2 4; then - eerror "${P} supports only 2.6 kernels, please try ${PN}-1.21 for 2.4 kernels" + eerror "${P} supports only 2.6 series and later kernels, please try ${PN}-1.21 for 2.4 kernels" die "wrong kernel version" fi } @@ -39,28 +39,26 @@ src_compile() { CC="$(tc-getCC)" \ HAVE_NL=1 \ STATIC_LIB=${STATIC} \ - POPT_LIB="$(pkg-config --libs popt)" \ - || die + POPT_LIB="$(pkg-config --libs popt)" } src_install() { into / - dosbin ipvsadm ipvsadm-save ipvsadm-restore || die + dosbin ipvsadm ipvsadm-save ipvsadm-restore into /usr - doman ipvsadm.8 ipvsadm-save.8 ipvsadm-restore.8 || die + doman ipvsadm.8 ipvsadm-save.8 ipvsadm-restore.8 newinitd "${FILESDIR}"/ipvsadm-init ipvsadm keepdir /var/lib/ipvsadm use static-libs && dolib.a libipvs/libipvs.a - dolib.so libipvs/libipvs.so || die + dolib.so libipvs/libipvs.so insinto /usr/include/ipvs - newins libipvs/libipvs.h ipvs.h || die + newins libipvs/libipvs.h ipvs.h } pkg_postinst() { einfo "You will need a kernel that has ipvs patches to use LVS." - einfo "This version is specifically for 2.6 kernels." } -- cgit v1.2.3-65-gdbad