version bump. drop old

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

4 files changed, 16 insertions, 41 deletions

diff --git a/sys-cluster/ipvsadm/ChangeLog b/sys-cluster/ipvsadm/ChangeLog
index 241b33d85ab1..2f828de4e978 100644
--- a/sys-cluster/ipvsadm/ChangeLog
+++ b/sys-cluster/ipvsadm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/ipvsadm
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ChangeLog,v 1.45 2010/09/17 09:39:16 robbat2 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ChangeLog,v 1.46 2011/03/07 19:44:12 ultrabug Exp $
+
+*ipvsadm-1.26 (07 Mar 2011)
+
+  07 Mar 2011; Ultrabug <ultrabug@gentoo.org> -ipvsadm-1.25-r1.ebuild,
+  -files/ipvsadm-1.25-netlink-conns.diff, +ipvsadm-1.26.ebuild:
+  version bump. drop old
 
   17 Sep 2010; Robin H. Johnson <robbat2@gentoo.org> ipvsadm-1.21-r1.ebuild,
   ipvsadm-1.24.ebuild:
diff --git a/sys-cluster/ipvsadm/Manifest b/sys-cluster/ipvsadm/Manifest
index e29f27189fe9..864638aeb34e 100644
--- a/sys-cluster/ipvsadm/Manifest
+++ b/sys-cluster/ipvsadm/Manifest
@@ -1,11 +1,10 @@
-AUX ipvsadm-1.25-netlink-conns.diff 1376 RMD160 edea404fc5a00041674e0db5a0cd51a6ef862c51 SHA1 05b654d5ac3aab7a10cf1e356c18cace9e879d3a SHA256 65acd8e4b140c463b3382a4c3bfc47b5753fda5c975365450119f8daa193c70b
 AUX ipvsadm-1.25-r1-build-fixup.diff 2194 RMD160 5962baca01c882cb0b3a5e0a935ca1562806a6c7 SHA1 edcaed6ad01327b17ec94ccb78f256cdd6d1c3a6 SHA256 c68deb98bf859f0c8ae36a06f670ac0be1bc44f67d3fb88fe0e544f3e71432ce
 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.25.tar.gz 62248 RMD160 24f071a0ac431a47c8003d0af294f97f4dfdfbec SHA1 a23aadff85ccb55294ab2f4ca93a1869b8d22e2b SHA256 902c16a6458519fa5dd04457abe0c9edbd2ae4ae0334735634c6617c6eefeb69
+DIST ipvsadm-1.26.tar.gz 41700 RMD160 7be7dcd00bdd640bbe9ab498180bb632d9c0d02d SHA1 fd23f6d81d4ac2a353db1fed694eaa5f2ff3ac6b SHA256 6d6c46fecb1c532a892616b4445c73b71730e8790d5630f60269fd9cbee0eb2d
 EBUILD ipvsadm-1.21-r1.ebuild 1286 RMD160 4d1583434b7967c8555bfceafa9dc3fe9dd9939d SHA1 e38398525c9e9ad3852c1f4c040118eb4a4b223f SHA256 083cb6dacd17178e8ce5fd0973879d6be2996b5d38a2b2edac27181530a50634
 EBUILD ipvsadm-1.24.ebuild 1387 RMD160 3605e04500efea274cf02d86e822aaadd1c42eab SHA1 c7cc57c9f2b7507f1bb82c1249db39bcf2fa0fc1 SHA256 25d1cfbf05424167b157a3074926859682718e7524f607fddc835e497688676b
-EBUILD ipvsadm-1.25-r1.ebuild 1559 RMD160 b35488e128a6ad401427a1245829d23f9d93bd99 SHA1 979e735502e48c79379b8c26c913b73f4aff8aba SHA256 569ffeabc43c1fb3f7ef44d44245d891641264399010ff59622b6fd0440e386d
-MISC ChangeLog 5922 RMD160 7ee874319b0184a24f955db7814a0ed440223b6d SHA1 855a17500fe4d8cdf2406cbd717ba2e3007da5eb SHA256 91cf867ba65479c1a2c3b5f5ad7fe9708469821cc09ae8262ba541b450fdab05
+EBUILD ipvsadm-1.26.ebuild 1525 RMD160 7f618323dbb169c427ac019338af7f9ef26a03d9 SHA1 ffd3312a0f07a74e670850b8bf6b68f03ba924e2 SHA256 1d5e25c1ab6347e657feeb040dbf72d84a8bb8ed247b5c311d0589849f34f6da
+MISC ChangeLog 6113 RMD160 4c283b035d5bfeb3ffdbc19ab211a84f7f788ec7 SHA1 53de0e86fb203fd5f4f26a0ce994f36c728d115b SHA256 5c686f90bd064f296b4e04d947d1370b0359c9c34d5748fb3925860a1bf48281
 MISC metadata.xml 265 RMD160 d5a540823bf95c48407b6404d973473db9cab6d9 SHA1 b0e94d9558b9b83e49f5af440d81e26516f0c00c SHA256 e6d5d2ea1a07e2e00194e0a485c66904b09fefb05427e9373d184ab3161fcdda
diff --git a/sys-cluster/ipvsadm/files/ipvsadm-1.25-netlink-conns.diff b/sys-cluster/ipvsadm/files/ipvsadm-1.25-netlink-conns.diff
deleted file mode 100644
index 4a25e6dbdfbb..000000000000
--- a/sys-cluster/ipvsadm/files/ipvsadm-1.25-netlink-conns.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-------------------------------------------------------------------------
-r64 | wensong | 2010-07-22 01:50:58 +0200 (Thu, 22 Jul 2010) | 11 lines
-
-This fixes what appears to be a typo in the netlink client code
-whereby the activeconns is read as activeconns and then
-overwritten by persistentconns. The result is that the active
-connection count reported by ipvsadm -L is wrong if the
-code is compiled to use the netlink interface.
-
-Tested-by: Nigel Kukard <nkukard@lbsd.net>
-Signed-off-by: Simon Horman <horms@verge.net.au>
-Signed-off-by: Wensong Zhang <wensong@linux-vs.org>
-
-
-------------------------------------------------------------------------
-
-Index: ipvsadm/libipvs/libipvs.c
-===================================================================
---- ipvsadm/libipvs/libipvs.c	(revision 63)
-+++ ipvsadm/libipvs/libipvs.c	(revision 64)
-@@ -748,7 +748,7 @@
- 	d->entrytable[i].l_threshold = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_L_THRESH]);
- 	d->entrytable[i].activeconns = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_ACTIVE_CONNS]);
- 	d->entrytable[i].inactconns = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_INACT_CONNS]);
--	d->entrytable[i].activeconns = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_PERSIST_CONNS]);
-+	d->entrytable[i].persistconns = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_PERSIST_CONNS]);
- 	d->entrytable[i].af = d->af;
- 
- 	if (ipvs_parse_stats(&(d->entrytable[i].stats),
diff --git a/sys-cluster/ipvsadm/ipvsadm-1.25-r1.ebuild b/sys-cluster/ipvsadm/ipvsadm-1.26.ebuild
index fc185a91fd6e..4e51dde3fcd9 100644
--- a/sys-cluster/ipvsadm/ipvsadm-1.25-r1.ebuild
+++ b/sys-cluster/ipvsadm/ipvsadm-1.26.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.25-r1.ebuild,v 1.1 2010/09/09 09:40:54 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ipvsadm-1.26.ebuild,v 1.1 2011/03/07 19:44:12 ultrabug Exp $
 
-EAPI=2
+EAPI=3
 inherit linux-info toolchain-funcs eutils
 
 DESCRIPTION="utility to administer the IP virtual server services offered by the Linux kernel"
@@ -11,7 +11,7 @@ SRC_URI="http://www.linuxvirtualserver.org/software/kernel-2.6/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=sys-libs/ncurses-5.2
@@ -26,8 +26,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PF}-build-fixup.diff \
-		"${FILESDIR}"/${P}-netlink-conns.diff
+	epatch "${FILESDIR}"/${PN}-1.25-r1-build-fixup.diff
 }
 
 src_compile() {