gentoo auto-resync : 21:08:2022 - 14:41:18

5 files changed, 2 insertions, 147 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index d12d3d138607..e7eee655bc6e 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ploop/Manifest b/sys-cluster/ploop/Manifest
index c6bd8a176953..ef891533e90e 100644
--- a/sys-cluster/ploop/Manifest
+++ b/sys-cluster/ploop/Manifest
@@ -1,8 +1,5 @@
 AUX disable_create_run_dir.patch 560 BLAKE2B 08be833a3afd51560f91337e750027fc13163244e3709399a7824a0afe432c86820cb97b703276e2a64968aeba2c63c44a4944fee080a4e4414928f72bc3da31 SHA512 69f2fe1214bc9fa3cae47bf55af94df83b21c1c19f04a60ddae7d7e261ef59a90ab1ed6dbed63271db2c97ae0b476c3bc69bbde656d85af3ef2c16f4ebb0a7e4
-AUX ploop-1.14-musl.patch 2044 BLAKE2B ab2d9bc2797e2cdb3a167521b4e50e689441e503dd0c2d8f3aaec973e77d40c39f87708162becd189574b2cd7c09c5da2b99f33daf2d8eaa91de5e000deed1a9 SHA512 a564183b937692dc8e1802bc00000f5877c488a0d34da0d6cc835355a1d07a3b8682c5d58a752a398e498bd52f677b59f2265eedbc418c9c9a9b04ee3149dda1
 AUX ploop-1.15-makedev-include.patch 272 BLAKE2B 474c2a5c09b4ed508c57a5401ec1ff01a67ee0a4d5738c884f9b0e92b1cc051f3c0c9735afc85b62788341977b5b5ca695b8021b0333b1a0dec19186bc3dcc35 SHA512 551e9720ffa2cd4ad81a7f99e67d3fea63535669529156695fd49e4fbc77e2cb76cfe06e8147e5bb0752e0efe809b4108194b468a019ab106f1ea7b5aea96adb
-DIST ploop-1.14.1.tar.bz2 123962 BLAKE2B d4f4f102d2ec0714d79901bd3193f85514e232dc18ffcab254becb954cf794f3598fe7b0f65d0bbb85766bff5ded9d816900b40b81cb6046c31d8b6459c67618 SHA512 7a235865f071de6e2762923d6591c8c6ee00d0d05ec80c6a2a1332f5b6881ccf827f7ddc40dfe1d663b8abf492a188a23f7d28a43dd553d6e37c8091cb3bc484
 DIST ploop-1.15.tar.bz2 125618 BLAKE2B ad7d06865606c20bdd9601ce343817a332653f3f7544dd27f08d3fb5ff2ee8112ef1ae0217546c28fde3dba076b0703b5881e8a019eec663964dd39885c5524c SHA512 07a691aeed949971534dcf9bb5138defacf25d7c437336df84a5ec3759cba0c20f6724660b7c8a204b3f455d15a892e20b060b0e0ea27280eeba738c36f280cb
-EBUILD ploop-1.14.1-r1.ebuild 1493 BLAKE2B 9689336ae21fe11ca41c1d43c4399ce2eae4cc1d5f77624ae2e1beacde16fb0b3ef8028fc52a578a5a7a07e38de8b0f43da27b647bd56caef6acc6458b5a3562 SHA512 341058a862c6c4158d1ef744a42bed76d912415c0bfcba2385d0265685539119b3264b18041eedb539aad66efca38bb168530b34a6d964323deb58b2a2b7e65c
-EBUILD ploop-1.15-r1.ebuild 1547 BLAKE2B a275c5318d60acd3e39fcfdba66d9a20b7e29a49f28e19ad9b522b10c678ddeb8fa2d3d2026749851aaa72b6fd48f9138f1f94807081d54ecc0640b0b4e1bd58 SHA512 3b4defa81cf833be8f4318ac9bafbbddc23d633e52efea58ccd06706a8c555a5782dcbd106f7cf54fb49d1c022e067916ee064418af0483ae09b82aaf53baec5
+EBUILD ploop-1.15-r1.ebuild 1546 BLAKE2B 1f4cbc972742c78482738c7149fd8006192f34515517267a317c52dc52258ff8582506922f11ef3996deccff8e1daa5ba168e4c9348d2e9b0fb9153cb91c6a57 SHA512 e8a1344c557ad84fb08ecb55bfd1e41d781b57766f7a9a9603c62a65336415ae3fee31db310aaf36c8b0ca0883e6f0967b5b017dd3a8d1a59b3a9e139369ed5d
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/sys-cluster/ploop/files/ploop-1.14-musl.patch b/sys-cluster/ploop/files/ploop-1.14-musl.patch
deleted file mode 100644
index 693135123c55..000000000000
--- a/sys-cluster/ploop/files/ploop-1.14-musl.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- a/lib/balloon_util.c
-+++ b/lib/balloon_util.c
-@@ -30,6 +30,7 @@
- #include <string.h>
- #include <linux/fs.h>
- #include <linux/fiemap.h>
-+#include <stddef.h>
- 
- #include "ploop.h"
- 
---- a/lib/delta_read.c
-+++ b/lib/delta_read.c
-@@ -24,6 +24,7 @@
- #include <malloc.h>
- #include <string.h>
- #include <sys/stat.h>
-+#include <stddef.h>
- 
- #include "ploop.h"
- 
---- a/lib/delta_sysfs.c
-+++ b/lib/delta_sysfs.c
-@@ -29,6 +29,7 @@
- #include <linux/fs.h>
- #include <sys/ioctl.h>
- #include <sys/utsname.h>
-+#include <sys/sysmacros.h>
- 
- #include "ploop.h"
- 
-@@ -238,7 +239,7 @@ static int get_dev_num(const char *path, dev_t *dev_num)
- 		ploop_err(0, "Unexpected format of %s: %s", path, nbuf);
- 		return -1;
- 	}
--	*dev_num = gnu_dev_makedev(maj, min);
-+	*dev_num = makedev(maj, min);
- 	return 0;
- }
- 
---- a/lib/merge.c
-+++ b/lib/merge.c
-@@ -29,6 +29,7 @@
- #include <linux/types.h>
- #include <string.h>
- #include <assert.h>
-+#include <stddef.h>
- 
- #include "ploop.h"
- 
---- a/lib/ploop.c
-+++ b/lib/ploop.c
-@@ -1087,7 +1087,7 @@ static int get_mount_dir(const char *device, char *out, int size)
- 
- 	if (get_dev_by_name(device, &dev))
- 		return -1;
--	minor = gnu_dev_minor(dev);
-+	minor = minor(dev);
- 
- 	fp = fopen("/proc/self/mountinfo", "r");
- 	if (fp == NULL) {
-@@ -1719,7 +1719,7 @@ static int create_ploop_dev(int minor)
- 	make_sysfs_dev_name(minor, device + 5, sizeof(device) - 5);
- 	/* Create pair /dev/ploopN & /dev/ploopNp1 */
- 	if (access(device, F_OK)) {
--		if (mknod(device, S_IFBLK, gnu_dev_makedev(PLOOP_DEV_MAJOR, minor))) {
-+		if (mknod(device, S_IFBLK, makedev(PLOOP_DEV_MAJOR, minor))) {
- 			ploop_err(errno, "mknod %s", device);
- 			return SYSEXIT_MKNOD;
- 		}
-@@ -1730,7 +1730,7 @@ static int create_ploop_dev(int minor)
- 	}
- 	snprintf(devicep1, sizeof(devicep1), "%sp1", device);
- 	if (access(devicep1, F_OK)) {
--		if (mknod(devicep1, S_IFBLK, gnu_dev_makedev(PLOOP_DEV_MAJOR, minor+1))) {
-+		if (mknod(devicep1, S_IFBLK, makedev(PLOOP_DEV_MAJOR, minor+1))) {
- 			ploop_err(errno, "mknod %s", devicep1);
- 			return SYSEXIT_MKNOD;
- 		}
diff --git a/sys-cluster/ploop/ploop-1.14.1-r1.ebuild b/sys-cluster/ploop/ploop-1.14.1-r1.ebuild
deleted file mode 100644
index 1dfbcff162dc..000000000000
--- a/sys-cluster/ploop/ploop-1.14.1-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit tmpfiles toolchain-funcs
-
-DESCRIPTION="openvz tool and a library to control ploop block devices"
-HOMEPAGE="https://wiki.openvz.org/Download/ploop"
-SRC_URI="https://download.openvz.org/utils/ploop/${PV}/src/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="dev-libs/libxml2"
-RDEPEND="${DEPEND}
-	sys-block/parted
-	sys-fs/e2fsprogs
-	sys-process/lsof
-	sys-apps/findutils"
-
-PATCHES=(
-	"${FILESDIR}"/disable_create_run_dir.patch
-	"${FILESDIR}"/${PN}-1.14-musl.patch
-)
-
-DOCS=( tools/README )
-
-src_prepare() {
-	default
-
-	# Respect CFLAGS and CC, do not add debug by default
-	sed -i \
-		-e 's|CFLAGS =|CFLAGS +=|' \
-		-e '/CFLAGS/s/-g -O0 //' \
-		-e '/CFLAGS/s/-O2//' \
-		-e 's|CC=|CC?=|' \
-		-e 's/-Werror//' \
-		-e '/DEBUG=yes/d' \
-		-e '/LOCKDIR/s/var/run/' \
-		Makefile.inc || die 'sed on Makefile.inc failed'
-	# Avoid striping of binaries
-	sed -e '/INSTALL/{s: -s::}' -i tools/Makefile || die 'sed on tools/Makefile failed'
-
-	# respect AR and RANLIB, bug #452092
-	tc-export AR RANLIB
-	sed -i -e 's/ranlib/$(RANLIB)/' lib/Makefile || die 'sed on lib/Makefile failed'
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" V=1 $(usex debug 'DEBUG' '' '=yes' '')
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR=/usr/$(get_libdir) install
-	rm "${ED}"/usr/$(get_libdir)/*.a || die
-}
-
-pkg_postinst() {
-	tmpfiles_process ploop.conf
-}
diff --git a/sys-cluster/ploop/ploop-1.15-r1.ebuild b/sys-cluster/ploop/ploop-1.15-r1.ebuild
index b097c176c3ac..502d92b28e1d 100644
--- a/sys-cluster/ploop/ploop-1.15-r1.ebuild
+++ b/sys-cluster/ploop/ploop-1.15-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.openvz.org/utils/ploop/${PV}/src/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 BDEPEND="virtual/pkgconfig"