gentoo resync : 30.05.2020

4 files changed, 52 insertions, 61 deletions

diff --git a/dev-util/ply/Manifest b/dev-util/ply/Manifest
index fe560e41acde..771fb859de6d 100644
--- a/dev-util/ply/Manifest
+++ b/dev-util/ply/Manifest
@@ -1,3 +1,3 @@
-DIST ply-0_pre20160313.tar.gz 38530 BLAKE2B 3c709e98c32cfd5dce389cf8829e135e0ecdc7907c83dcd2eed88c9c4c5f5a81093cc9ca7045b0cdb18566f0a8b49ddb4d3ba7320c7eaf56a350e45345e8d7bf SHA512 2de2ca2751574fe23b48188b0e8d1b4f1afe46003cbdefa69aeadaed0442675dad42b6cbfd161ebfbe006fbb21d447be4fca0ea7350b1409207473511f685d47
-EBUILD ply-0_pre20160313.ebuild 1539 BLAKE2B ea3962c5a222eda81b7da7d97c3e33622c9e871e3d8e9101a65f9120e611c130f8d2af87d4d30b8a1147d9ebd73abe99c716c2c7695b521200a2ce79da0115ae SHA512 76457c4d3d0b7e537fca072b4133cbeec5898a786e09e758bf5ea42c870e039c3386e4a29fe7dd5e357d04ff7d75f0ed7be6d978e3b6fd1801a55bd164d66c1a
-MISC metadata.xml 302 BLAKE2B f400d60a9dad4f8afcbf107bcf139d58435e77b8dfc8b5178f4fa8cce592b62eee40f6ef5bfef0cf1793c9c5293c43df8ce701bb1243d096f1872fc701d82799 SHA512 528855426ce54aa03f915178952e3b82d98dfe1dec45ef7a5a9ddf1069bc279e5bd4c894ab9bb5e328b72a10e05a5f9d5d9b5c60650246343b832bb6381bd24c
+DIST ply-2.1.1.tar.gz 71578 BLAKE2B b63d0bd355985035b8d1c934c13982e21eeda0d710f40b8131562e9ef6a21a3eaf04960b871f5ab83d718ab1726450996988a2aef1a6fbd2e8f1a3c55db92beb SHA512 fdc66d752989a239e01d2746e6c56610c2c945fbeeff8f2a79be1db487a6cbba365d1bd1b553d25c43a3fdc3634ab96bf4a37ab4f694c6eb6eba82c35b37231e
+EBUILD ply-2.1.1.ebuild 825 BLAKE2B a29c547816c0849664fe79e89e2f54fd53f2c89ec9b40d77fb026885ee45a3533691dcb04bc2691e64aa377451ce6e45691d1d77fb64f232b77ad6ee2414048a SHA512 592546cc3f262ade58314f976d68eb20eeca75634cac9d38a69f2246132c62ae2c912f8e43de89eee0f55b9aa5a9bff73401ab8505612b7074516f647cdd3e0d
+MISC metadata.xml 659 BLAKE2B dc960603c0d60aed83463b6e7b284faa759caf821a5087aeb320efe15b8a7af0c74d532b0fbe9ae67fdc6e0b07b9a5a5e9a04bc123fceaff615bb49408126872 SHA512 ee75ce0854893a75ee1bc8a2ff723e93ce4845192b7a16a5c1d217b36231c009fb1d07d05792b4fd8a700081b6f0d1b60786d1184c9b32289dbe8c6d34f9d563
diff --git a/dev-util/ply/metadata.xml b/dev-util/ply/metadata.xml
index 0e1f3d58af2b..28ee2e30136d 100644
--- a/dev-util/ply/metadata.xml
+++ b/dev-util/ply/metadata.xml
@@ -4,6 +4,18 @@
   <maintainer type="person">
     <email>zmedico@gentoo.org</email>
   </maintainer>
+  <maintainer type="person">
+    <email>jakov.smolic@sartura.hr</email>
+    <name>Jakov Smolic</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>luka.perkov@sartura.hr</email>
+    <name>Luka Perkov</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">iovisor/ply</remote-id>
   </upstream>
diff --git a/dev-util/ply/ply-0_pre20160313.ebuild b/dev-util/ply/ply-0_pre20160313.ebuild
deleted file mode 100644
index 46367c55cfcd..000000000000
--- a/dev-util/ply/ply-0_pre20160313.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools linux-info
-
-DESCRIPTION="Dynamic instrumentation of the Linux kernel with BPF and kprobes"
-HOMEPAGE="https://github.com/iovisor/ply"
-EGIT_COMMIT="cfc56c789ad1eff1080ecb0dad18d009b91ae8ea"
-SRC_URI="https://github.com/iovisor/ply/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}-${EGIT_COMMIT}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~BPF_JIT ~HAVE_BPF_JIT ~BPF_EVENTS"
-
-	check_extra_config
-}
-
-src_prepare() {
-	eapply_user
-	eautoreconf
-	default
-}
-
-src_configure() {
-	local econf_args=() kerneldir_orig
-	if [[ -d ${KERNEL_DIR} ]]; then
-		# Using KBUILD_OUTPUT can fail, depending on the source tree
-		# state (it might demand that we make mrproper). Therefore,
-		# create a symlink copy of the source tree so that we are free
-		# to clean things up as needed.
-		kerneldir_orig=${KERNEL_DIR}
-		cp -sR "$(realpath "${kerneldir_orig}")" "${T}/kerneldir" || die
-		export KERNEL_DIR="${T}/kerneldir"
-		pushd "${KERNEL_DIR}" || die
-		# avoid sandbox violation for scripts/kconfig/.conf.cmd
-		find . -name '\.*' -delete
-		cp "${kerneldir_orig}/.config" ./.config || die
-		set_arch_to_kernel
-		make mrproper oldconfig prepare || die
-		popd || die
-		econf_args+=(--with-kerneldir="${KERNEL_DIR}")
-	fi
-	econf "${econf_args[@]}"
-}
-
-src_install() {
-	default
-	rm -f "${ED}/usr/share/doc/${P}/COPYING"
-}
diff --git a/dev-util/ply/ply-2.1.1.ebuild b/dev-util/ply/ply-2.1.1.ebuild
new file mode 100644
index 000000000000..55bfd433e220
--- /dev/null
+++ b/dev-util/ply/ply-2.1.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info
+
+DESCRIPTION="Dynamic instrumentation of the Linux kernel with BPF and kprobes"
+HOMEPAGE="https://github.com/iovisor/ply"
+SRC_URI="https://github.com/iovisor/ply/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="static-libs"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
+		~BPF_JIT ~HAVE_BPF_JIT ~BPF_EVENTS"
+
+	check_extra_config
+}
+
+src_prepare() {
+	sed -i "/^AC_INIT/c\AC_INIT(${PN}, ${PV}," configure.ac || die
+	eapply_user
+	eautoreconf
+}
+
+src_install() {
+	default
+	rm -f "${ED}/usr/share/doc/${P}/COPYING"
+
+	if ! use static-libs; then
+		find "${D}" -type f -name '*.a' -delete || die
+	fi
+}