gentoo resync : 04.01.2022

3 files changed, 15 insertions, 82 deletions

diff --git a/sys-cluster/ipvsadm/Manifest b/sys-cluster/ipvsadm/Manifest
index 9d2087553abb..fed8317eda78 100644
--- a/sys-cluster/ipvsadm/Manifest
+++ b/sys-cluster/ipvsadm/Manifest
@@ -2,9 +2,7 @@ AUX ipvsadm-1.27-buildsystem.patch 3624 BLAKE2B d7a1f68a505d8c64fdbcdb5589a9b6b1
 AUX ipvsadm-1.27-fix-daemon-state.patch 2001 BLAKE2B efc15ede85aae2c069399c0137c6ec5142bbcc35054b2de32e20cbbdc216e32c3628e4821d1da93f0d14580c67714cbd310147cbca776652301fbc5a275490dc SHA512 4898672423f2b53776bedde1b5d7a7dce27d8d66aeec6b749149209c6acabcfa8cc53b4f3342107f9a783c5a4afe88f4e8b10d25771c49d86b0def8777834c22
 AUX ipvsadm-init 649 BLAKE2B 9414395d1093c1bff940982f90e7416fef6d74e9972b5416d571fe8a41363c03c9a4ff819cd2be578911a7c6c021cc7f52910371030a479a58800b8eb4f3d2ff SHA512 3fb2467fc157599fbf308e27f39f0cb4164e3d36423500d89c7fbedec3ba6f5c7b3cbe52b077811011fc0faef73072a0bf3b204d728841773ef2a520c03130f7
 DIST ipvsadm-1.27.tar.xz 38196 BLAKE2B 1b8a72b11c14a909b8b7459c459195d32bb7944ed4a01d963e2b85e8279c5d7d2fd095d9c23473c64dc15881a2b22b439b39c10b2019b3183f54e22535a258a9 SHA512 cf982b7981674c91d1b7516de7b55cf378b306ce4a53e13976b8eeb8610015c4fa4aa9d251bc4d329db8e05c1862863160af2d3c63b76263f290087cffdf1b80
-DIST ipvsadm-1.28.tar.xz 38600 BLAKE2B 2a892f858324788b425f7c5aa6ce6a1548c6cd166977d1d36a5236061d1a6ce7e31f6bc1e24a7d53a57406e468271ccebc01330de6be9784c1a955b60eb89d16 SHA512 a1e10ce30751d9439f832e221e5c41b338f87dcc94a0b21329d908a9164f8882049af9d9d918b764b36c30e353d5b8db49d7088e60c24e4748713c06cccf7035
 DIST ipvsadm-1.31.tar.xz 42396 BLAKE2B a42ceea834fb16e25ea34417227f6b632fe3b94c8a7ce5d3daff4375884fd47f14999551eab3bf7226d5eb02f25aef4c77a8287592b642946683bc5ddc6783da SHA512 1c7187405771e702eff0009d688fa697375b833a486ff88b41a4a0dcfaa3e9884c7e3bc34375efea5f6a2d025847c9fac9fd6ba694ec3bf2fc9d357eef2cb631
 EBUILD ipvsadm-1.27-r1.ebuild 1752 BLAKE2B 763a282dd008e7609f5f67f9f67085b5f2b21005667f95d4a0476315ddb09bb26b02bae2acdc33ab8eeb17554ee1edea920ea7399d0d5bc681984cd5d5f36113 SHA512 c0f8dedd134dc917ed869264113e6119a30687a4f75449a54ecad3658337584a5bbb8bf973c9b566d7601de1aee438ac957418e67ec72eb0768a9676cd046d9c
-EBUILD ipvsadm-1.28-r1.ebuild 1662 BLAKE2B ed4fc083b785cddae22fdbff7cd272f5bfb5ecd05d2e7260a55abb2e32ca7fcdc2743d0c315dcfa4a06f795e06dc7c42cc24e8a9a15d1e0d3cd3b317a95763a2 SHA512 3e566c48b551b34943d96fe0ad806eea138aaaa051c5060457f10d0d7eb017a1f1cedda5e8367c34c1b150decfd0d45feef3a10664e56bd7b934661bff86867b
-EBUILD ipvsadm-1.31.ebuild 1606 BLAKE2B 2f6dbb1f4ab241e4fdf1fd5f5d917cb397ef820d95acf53b1d32a6307b58affc02b8d4d0c84ab5c0b6b0bc285cd9d27e0105310f17595ddce24514c898e59f29 SHA512 8b6482559bc95fd4cb832e30c9f700d405c370d242483d25ff845f29a9937c415aabfde8bf5ee5efd512260aa09537ee01eeb7a8776b0e2a1e1941d56686060c
+EBUILD ipvsadm-1.31-r1.ebuild 1614 BLAKE2B 1e71d3b01c249565c3087abec65c01fed4f3b918deea8df179c3e13c0120d3361e5ae0b3ea0810b9304afb54b2175a89e0f9b469487156171e960b795f2f4141 SHA512 a3db1640513adc0ee1e0a9f87f642f9733e095a175798c77b220f3f5764a264ea4455648a47f51f3200821e79929a680507418af270b7fac8b4f4a5a02c06576
 MISC metadata.xml 264 BLAKE2B 72a8181e4235f4fb310c8d9db3d21082b028cd147a04382ae60a1db2d622fcf13bc56fd944c85684c233673d8705e85690f8e6fa116f177758a83504cc2beb0a SHA512 b560647d04f40bd98c6d95744f963455d52138ca4eed3209a0c7ff6314ed8e297a4784a2462bb1f7a8a4dc9af2addd13a0be3a6f7e9109dfe00f95b5935c40af
diff --git a/sys-cluster/ipvsadm/ipvsadm-1.28-r1.ebuild b/sys-cluster/ipvsadm/ipvsadm-1.28-r1.ebuild
deleted file mode 100644
index 9c28d73e4cb0..000000000000
--- a/sys-cluster/ipvsadm/ipvsadm-1.28-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit epatch linux-info toolchain-funcs
-
-DESCRIPTION="utility to administer the IP virtual server services"
-HOMEPAGE="http://linuxvirtualserver.org/"
-SRC_URI="https://kernel.org/pub/linux/utils/kernel/ipvsadm/ipvsadm-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="static-libs"
-
-RDEPEND=">=sys-libs/ncurses-5.2:*
-	dev-libs/libnl:=
-	>=dev-libs/popt-1.16"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if kernel_is 2 4; then
-		eerror "${P} supports only 2.6 series and later kernels, please try ${PN}-1.21 for 2.4 kernels"
-		die "wrong kernel version"
-	fi
-}
-
-src_prepare() {
-	default
-	epatch "${FILESDIR}"/${PN}-1.27-buildsystem.patch
-	epatch "${FILESDIR}"/${PN}-1.27-fix-daemon-state.patch
-	use static-libs && export STATIC=1
-}
-
-src_compile() {
-	local libnl_include
-	if has_version ">=dev-libs/libnl-3.0"; then
-		libnl_include=$($(tc-getPKG_CONFIG) --cflags libnl-3.0)
-	else
-		libnl_include=""
-	fi
-	emake -e \
-		INCLUDE="-I.. -I. ${libnl_include}" \
-		CC="$(tc-getCC)" \
-		HAVE_NL=1 \
-		STATIC=${STATIC} \
-		POPT_LIB="$($(tc-getPKG_CONFIG) --libs popt)"
-}
-
-src_install() {
-	into /
-	dosbin ipvsadm ipvsadm-save ipvsadm-restore
-
-	into /usr
-	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
-
-	insinto /usr/include/ipvs
-	newins libipvs/libipvs.h ipvs.h
-}
-
-pkg_postinst() {
-	einfo "You will need a kernel that has ipvs patches to use LVS."
-}
diff --git a/sys-cluster/ipvsadm/ipvsadm-1.31.ebuild b/sys-cluster/ipvsadm/ipvsadm-1.31-r1.ebuild
index 67b27b47b59c..22b2dc5d4897 100644
--- a/sys-cluster/ipvsadm/ipvsadm-1.31.ebuild
+++ b/sys-cluster/ipvsadm/ipvsadm-1.31-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit epatch linux-info toolchain-funcs
+inherit linux-info toolchain-funcs
 
 DESCRIPTION="utility to administer the IP virtual server services"
 HOMEPAGE="http://linuxvirtualserver.org/"
@@ -14,11 +14,18 @@ SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="static-libs"
 
-RDEPEND=">=sys-libs/ncurses-5.2:*
+RDEPEND="
+	>=sys-libs/ncurses-5.2:=
 	dev-libs/libnl:=
-	>=dev-libs/popt-1.16"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	>=dev-libs/popt-1.16
+"
+
+BDEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${PN}"-1.27-buildsystem.patch )
 
 pkg_pretend() {
 	if kernel_is 2 4; then
@@ -29,7 +36,6 @@ pkg_pretend() {
 
 src_prepare() {
 	default
-	epatch "${FILESDIR}"/${PN}-1.27-buildsystem.patch
 	use static-libs && export STATIC=1
 }
 
@@ -44,7 +50,7 @@ src_compile() {
 		INCLUDE="-I.. -I. ${libnl_include}" \
 		CC="$(tc-getCC)" \
 		HAVE_NL=1 \
-		STATIC=${STATIC} \
+		STATIC="${STATIC}" \
 		POPT_LIB="$($(tc-getPKG_CONFIG) --libs popt)"
 }