gentoo resync : 16.02.1018

3 files changed, 3 insertions, 63 deletions

diff --git a/sys-cluster/ploop/Manifest b/sys-cluster/ploop/Manifest
index 641e1c7905a1..c7abd35da5a4 100644
--- a/sys-cluster/ploop/Manifest
+++ b/sys-cluster/ploop/Manifest
@@ -1,6 +1,4 @@
 AUX disable_create_run_dir.patch 632 BLAKE2B 9b4c817cbf77de4b33063f42d832f729542da24cbd9c8c495f5383562e1228322e3c41321f4c2f09b9745dfc56420c74cc94dc380a7780d01dbd71a1f5a04d99 SHA512 4ef81f24a21f200881f2ff94ba9d39f1b097362eb371623a62dc7d66c7e174e3e7a465be85856c7c5ca8a01d8fe725bd9d713f871af8cec3c25bc94811d7c415
-DIST ploop-1.13.2.tar.bz2 122821 BLAKE2B f71174ae9eba00c00714faa760abb356bf4fa5ede48cdb2366ef685f703f58950d0e49d65634eaca05529289666c548c93e7d526929e3ae51814b0ccc8736cdf SHA512 85a3314dc1114b692cd98290412fd2ea78c516964c712487dd72f8347fd583172d8836f997d63ccade89ee39be031669074d9bc957926b97175e659ec505ddfb
 DIST ploop-1.14.1.tar.bz2 123962 BLAKE2B d4f4f102d2ec0714d79901bd3193f85514e232dc18ffcab254becb954cf794f3598fe7b0f65d0bbb85766bff5ded9d816900b40b81cb6046c31d8b6459c67618 SHA512 7a235865f071de6e2762923d6591c8c6ee00d0d05ec80c6a2a1332f5b6881ccf827f7ddc40dfe1d663b8abf492a188a23f7d28a43dd553d6e37c8091cb3bc484
-EBUILD ploop-1.13.2.ebuild 1358 BLAKE2B 937013bc3128d5c8f8cd9b856645271370659dfcf87c881a3f2966cd284e4fb92d6f6550187ab7a2200a2ce07998de6b5e065f6e4af0579070b11d3c5a98d58f SHA512 230ada0afffd5282bc67139d3fb7a3b22a45a42fe0e361c170765e6c139c437d37e336c2de8f05a7ccc62b23cbec619905b7072490c8eb894e5905b9278ea759
-EBUILD ploop-1.14.1.ebuild 1412 BLAKE2B a6e95a8955c218d42b08b477a347341f1f463059854f0622618e35a31285f8effaae452de425a775a4dfc807a91503d54370483856a7fc7b073d78e96b7ea045 SHA512 4b217a9f2e44331b04bdd2edcc69fe8567dd57de1b8d87d6d8a2094727863c6b0f7d493dbd15b651acec6d4ef53281fed1285b35b2f3d1ef1c952a5712caac29
+EBUILD ploop-1.14.1.ebuild 1407 BLAKE2B dc7a9d264b26cc186b324f8cccf125fac8859a3d6a6e670e0a274278b11e51a5bc917daa641a0edaabaefd999dd73ab5bb35a26c6b85a9ca9c33b46329fcc7b3 SHA512 12f92b7f53d240b3ec801c5260169ba77e851a4d751bbc88a467bd320c5e05dc1560f09f5f605bb69d869caf20625463e07bc62054a1ad13f2a90c81bb87aa54
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-cluster/ploop/ploop-1.13.2.ebuild b/sys-cluster/ploop/ploop-1.13.2.ebuild
deleted file mode 100644
index e0953461d6cf..000000000000
--- a/sys-cluster/ploop/ploop-1.13.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs multilib systemd
-
-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 static-libs"
-
-DEPEND="
-	dev-libs/libxml2
-	virtual/pkgconfig
-	"
-
-RDEPEND="dev-libs/libxml2
-	!<sys-cluster/vzctl-4.8
-	sys-block/parted
-	sys-fs/e2fsprogs
-	sys-process/lsof
-	sys-apps/findutils
-	"
-
-DOCS=( tools/README )
-
-src_prepare() {
-	# 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() {
-	default
-	ldconfig -n "${D}/usr/$(get_libdir)/" || die
-}
diff --git a/sys-cluster/ploop/ploop-1.14.1.ebuild b/sys-cluster/ploop/ploop-1.14.1.ebuild
index e8529be645c8..adb736dd7bd0 100644
--- a/sys-cluster/ploop/ploop-1.14.1.ebuild
+++ b/sys-cluster/ploop/ploop-1.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -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 static-libs"
 
 DEPEND="