From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 25 Aug 2020 10:45:55 +0100
Subject: gentoo resync : 25.08.2020

---
 dev-util/ply/Manifest            |  3 ++-
 dev-util/ply/ply-2.1.1-r1.ebuild | 43 ++++++++++++++++++++++++++++++++++++++++
 dev-util/ply/ply-2.1.1.ebuild    | 37 ----------------------------------
 3 files changed, 45 insertions(+), 38 deletions(-)
 create mode 100644 dev-util/ply/ply-2.1.1-r1.ebuild
 delete mode 100644 dev-util/ply/ply-2.1.1.ebuild

(limited to 'dev-util/ply')

diff --git a/dev-util/ply/Manifest b/dev-util/ply/Manifest
index 771fb859de6d..4378eae3476f 100644
--- a/dev-util/ply/Manifest
+++ b/dev-util/ply/Manifest
@@ -1,3 +1,4 @@
+DIST ply-2.1.1-arm-build-fix.patch 1433 BLAKE2B 305bb06ce1e5516dc3868cd276edc94d89cb7c20866094c6947092048af2c090a29bae52dc82956cbf7f36e42e15d873c553948dade17f4b1f9d490bb8191ed9 SHA512 e7572e5e777e13b483e9123fc5c62d63f3f1a2c753d7dedce8de8d78a4c5baa9c10b45b0e31ba16a92b0e2af11e206662cfe815643f0a8145f8d79e388d536b9
 DIST ply-2.1.1.tar.gz 71578 BLAKE2B b63d0bd355985035b8d1c934c13982e21eeda0d710f40b8131562e9ef6a21a3eaf04960b871f5ab83d718ab1726450996988a2aef1a6fbd2e8f1a3c55db92beb SHA512 fdc66d752989a239e01d2746e6c56610c2c945fbeeff8f2a79be1db487a6cbba365d1bd1b553d25c43a3fdc3634ab96bf4a37ab4f694c6eb6eba82c35b37231e
-EBUILD ply-2.1.1.ebuild 825 BLAKE2B a29c547816c0849664fe79e89e2f54fd53f2c89ec9b40d77fb026885ee45a3533691dcb04bc2691e64aa377451ce6e45691d1d77fb64f232b77ad6ee2414048a SHA512 592546cc3f262ade58314f976d68eb20eeca75634cac9d38a69f2246132c62ae2c912f8e43de89eee0f55b9aa5a9bff73401ab8505612b7074516f647cdd3e0d
+EBUILD ply-2.1.1-r1.ebuild 1110 BLAKE2B 973c3683c6d18eb918889d9e4ad1937d4e5a41994f3e7df0e00cd0c7cb8f6a4ff355ffda4fff22e2e0a3c0f2545beb2d0ebd293d7cfd8b5019ddec46c616a6ab SHA512 71d2e081753355e7eb08786a6d4ca9739d8b63b695dbb78f200c8ff65ae7201d72d84729b609906917f6e1d7746b12bf518ae8179f75becb9c0761be0a5b34db
 MISC metadata.xml 659 BLAKE2B dc960603c0d60aed83463b6e7b284faa759caf821a5087aeb320efe15b8a7af0c74d532b0fbe9ae67fdc6e0b07b9a5a5e9a04bc123fceaff615bb49408126872 SHA512 ee75ce0854893a75ee1bc8a2ff723e93ce4845192b7a16a5c1d217b36231c009fb1d07d05792b4fd8a700081b6f0d1b60786d1184c9b32289dbe8c6d34f9d563
diff --git a/dev-util/ply/ply-2.1.1-r1.ebuild b/dev-util/ply/ply-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..995c760e574e
--- /dev/null
+++ b/dev-util/ply/ply-2.1.1-r1.ebuild
@@ -0,0 +1,43 @@
+# 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
+	https://github.com/iovisor/ply/commit/1bc183af8703023e377f92716ecd3f339ffffd11.patch -> ${P}-arm-build-fix.patch"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~ppc"
+IUSE="static-libs"
+# Bug 733248 file collisions with sys-boot/plymouth:
+# /usr/lib64/libply.la
+# /usr/lib64/libply.so
+RDEPEND="!sys-boot/plymouth"
+
+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 "${DISTDIR}/${P}-arm-build-fix.patch"
+	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
+}
diff --git a/dev-util/ply/ply-2.1.1.ebuild b/dev-util/ply/ply-2.1.1.ebuild
deleted file mode 100644
index 55bfd433e220..000000000000
--- a/dev-util/ply/ply-2.1.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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
-}
-- 
cgit v1.2.3