Cleanup the latest ebuild. Remove weird info. Reword the warning in 2.4 kernel suppor...

Package-Manager: portage-2.2.0_alpha54/cvs/Linux x86_64

diff --git a/sys-cluster/ipvsadm/ChangeLog b/sys-cluster/ipvsadm/ChangeLog
index b6cc8a53f165b947d7b37388f4efe0065e9ea2d9..d6c9d20c0b1f4f3e2d8ba691e55f83fda29bbc2c 100644 (file)
--- 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 <scarabeus@gentoo.org> 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 <armin76@gentoo.org> ipvsadm-1.26-r1.ebuild:
   ia64/s390/sparc stable wrt #370441

diff --git a/sys-cluster/ipvsadm/Manifest b/sys-cluster/ipvsadm/Manifest
index 3f734d4d708052df7f77871a290f1b523ca08b04..8149596ac2522ffa5039f7fa99c08d6f842f629f 100644 (file)
--- a/sys-cluster/ipvsadm/Manifest
+++ b/sys-cluster/ipvsadm/Manifest
@@ -4,17 +4,25 @@ Hash: SHA1
 AUX ipvsadm-1.26-buildsystem.patch 2989 RMD160 669c160e624995c8ac85787ec3b3435422a01b7f SHA1 58f72bcf13ed839e6b748c27a2176ac81ce29026 SHA256 88391e5122dbb7d8c92385647b2e8856bf7ad7231cfb2e73eda4e422addce198
 AUX ipvsadm-init 764 RMD160 447562aeb699ab12d97d088e97678c2ac98d7e5c SHA1 ce953d9013b3a5b0e35cc5901376d9bf54fd51f4 SHA256 296c44030f502882c361ff9ceff14fe1377150e9aae8dc6a9ddaa4bd94275868
 DIST ipvsadm-1.21-11.tar.gz 34030 RMD160 2476f127bfd76313a7e32d0f6d2d4225164ef872 SHA1 368630ac25a772221deb101ee86b87a5341a5bab SHA256 7b85020f84d4648166bce480d747d82ac5c9113f9a222e3de7eb92b7af0598fa
-DIST ipvsadm-1.24.tar.gz 32007 RMD160 6647adb3914e69bd2a6924b5a0f675b670cd57ed SHA1 6bb6ce422745d0fe6409d91df7820fd5e7d2eeeb SHA256 773cbada48061e3afafaeaa2800d5382b8ff638b2c929293c14a793112a0642a
 DIST ipvsadm-1.26.tar.gz 41700 RMD160 7be7dcd00bdd640bbe9ab498180bb632d9c0d02d SHA1 fd23f6d81d4ac2a353db1fed694eaa5f2ff3ac6b SHA256 6d6c46fecb1c532a892616b4445c73b71730e8790d5630f60269fd9cbee0eb2d
-EBUILD ipvsadm-1.21-r1.ebuild 1290 RMD160 2f051c11f9409f6c19ebb96dc87a6a1fd305c99b SHA1 574ddca297d01aabc3878e6d748bc1683d1ed6d9 SHA256 729da3f6bba921383782c590fea707713070c3245f3ce0161fdcaab62c2a6b16
-EBUILD ipvsadm-1.24.ebuild 1387 RMD160 3605e04500efea274cf02d86e822aaadd1c42eab SHA1 c7cc57c9f2b7507f1bb82c1249db39bcf2fa0fc1 SHA256 25d1cfbf05424167b157a3074926859682718e7524f607fddc835e497688676b
-EBUILD ipvsadm-1.26-r1.ebuild 1598 RMD160 08f96b21c16e64d59d278d84eed786f2fed8b363 SHA1 c3bd653cede187df9ace954330db85e4bacec93a SHA256 d593e7a62e4abeed52a582ed8a02346218f9962233f5e63d9bf439c3ce467b33
-MISC ChangeLog 7078 RMD160 1cc2904f3f24bd76181b5dd5943eedfb5c407fd2 SHA1 d85836d4c5314515552685ab7d94e00e197cdb03 SHA256 a16fa65c39c797bfa01a1137621f09b990e615cd01a69b16fbc0e3429e3166d8
+EBUILD ipvsadm-1.21-r1.ebuild 1296 RMD160 6ddbc4b56efa78ee974b90cc5dc8add52ea41e51 SHA1 107c72988256a0bac31be8d7ac9e45e1d19190f6 SHA256 c6ebaf3186b461fd6e1a3d4c982d0505d64af7eb533ec03e579fafd55e145865
+EBUILD ipvsadm-1.26-r1.ebuild 1524 RMD160 b9baec08e1b9b2ec3d879233ca031661dbe2f524 SHA1 61262b7fdb1819c5b4d8fe25ea4390f6ba7d5ded SHA256 c6d69a0f0a0ea934ca254b71579f7ba07f7662a6bf2a1dc52ee1240be31a6610
+MISC ChangeLog 7329 RMD160 bcb4d5f448c69d94934e416e60f0c14ee3478b7b SHA1 4c276058693025496ab0a8f42b28625bab76fa41 SHA256 c336e50721178ff6f2efc7e8045d20f0b99d990e429d8d864df3531ea6b5809c
 MISC metadata.xml 265 RMD160 d5a540823bf95c48407b6404d973473db9cab6d9 SHA1 b0e94d9558b9b83e49f5af440d81e26516f0c00c SHA256 e6d5d2ea1a07e2e00194e0a485c66904b09fefb05427e9373d184ab3161fcdda
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4EfRAACgkQuQc30/atMkAqfQCeOTA+32RFcLWYYiHTukqsHUOT
-U3UAoJGEZ8Z1t9RdFL0PfYc4Yg2jjkZs
-=WMQ1
+iQIcBAEBAgAGBQJOaye0AAoJEOSiRoyO7jvoVRYP/i/7Z4tFRkyYpS+WYfF2Lm8T
+Qk9URQQOU7qr2ywWdsbfZ9PUHMQkRI59o6EhA6HLFZRClDkr217YuNAt6s+j3pU2
+LwzcdOOz4+hqfZ/Tfz+o5XS4/YKiQCaZQ/1xSdlQXQBe4YKdXKHP7MTVdn7Tlcqy
+kI6IgRmjiVrz3+PTB63xiTvLjL9ObqWSeOa+7TFiAuspzaiU7IzWQaPi0DmDp9Gc
+vBEPj91DRBxQqaoWskz8uCc26pCwtaDPD8Mjh+XFZAFPfUf3YOpL2Mz3RMaPImN3
+v28Dc/owZhUOltybR1oUKTO2J1CsN+M39+7oV01Po7pLtIOWbiiO+8+NrAiiPoZF
+lnl9ztG8/0+TqVsAGGjamhXgkyu/oqiDZrAwrL/wu9bB6LzXOcwJogGG7laYElYG
+bqDkMnqrphSEafmlu6xlQw10Zw6Ps8pDqwVxGk5+8EyTPpFEbD7LIDLFvAhqcQ1o
+Vzuk0OTpsIrfvskOnHAhU2+2L6plF1RbIAJu3BAOqd04patTxljpzK1XQY8cbdFM
+SnTH0s4w6iJ2f3RepnG8Pzr2fCZSf2tOb0dTRXeMvUix2k71GJo30GyvvkZ41BV7
+/wuEDjnIEKJw7bU2PDyv4WVrshKsQy10NoDOJMCfZR4x38Sj9eoPTJqwVV0pg7Rl
+H46qloT0cRigDhA5yOVk
+=4q54
 -----END PGP SIGNATURE-----

diff --git a/sys-cluster/ipvsadm/ipvsadm-1.21-r1.ebuild b/sys-cluster/ipvsadm/ipvsadm-1.21-r1.ebuild
index f4a80d30b2ff3062616a5b85e139e58823954cd0..76877163274cf10804f4b5b7b54517da07ef4ede 100644 (file)
--- 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 (file)
index 3d71865..0000000
--- 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 ff1f4699f701201ffe0e57e930c6f0af663d858d..8507ace5fd97f0e2f6e77c45a6bdbbc13ae1df62 100644 (file)
--- 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."
 }