5 files changed, 21 insertions, 58 deletions
diff --git a/dev-util/ply/Manifest b/dev-util/ply/Manifest
index db6ffb998c1f..3ebf13c3a8f7 100644
--- a/dev-util/ply/Manifest
+++ b/dev-util/ply/Manifest
@@ -1 +1,2 @@
+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
diff --git a/dev-util/ply/files/ply-2.1.1-arm-build-fix.patch b/dev-util/ply/files/ply-2.1.1-arm-build-fix.patch
deleted file mode 100644
index 0d12f7724e70..000000000000
--- a/dev-util/ply/files/ply-2.1.1-arm-build-fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 6f870ba1f4054674024cc3d3faf18d8b1e3676f6 Mon Sep 17 00:00:00 2001
-From: Jakov Smolic <jakov.smolic@sartura.hr>
-Date: Fri, 17 Jul 2020 09:10:45 +0200
-Subject: [PATCH] Fix armv7a build crash
-Bug: https://bugs.gentoo.org/732902
-Upstream: https://github.com/iovisor/ply/pull/60
-
-Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr>
----
- src/libply/Makefile.am   | 1 +
- src/libply/arch/armv7a.c | 1 +
- 2 files changed, 2 insertions(+)
- create mode 120000 src/libply/arch/armv7a.c
-
-diff --git a/src/libply/Makefile.am b/src/libply/Makefile.am
-index 3c83bb4..3a7c747 100644
---- a/src/libply/Makefile.am
-+++ b/src/libply/Makefile.am
-@@ -10,6 +10,7 @@ AM_LFLAGS = --header-file=lexer.h
- EXTRA_DIST = grammar.c grammar.h lexer.c lexer.h \
- 	arch/aarch64.c \
- 	arch/arm.c     \
-+	arch/armv7a.c \
- 	arch/powerpc.c \
- 	arch/x86_64.c
- 
-diff --git a/src/libply/arch/armv7a.c b/src/libply/arch/armv7a.c
-new file mode 120000
-index 0000000..980a6a5
---- /dev/null
-+++ b/src/libply/arch/armv7a.c
-@@ -0,0 +1 @@
-+arm.c
-\ No newline at end of file
--- 
-2.26.2
-
diff --git a/dev-util/ply/ply-2.1.1.ebuild b/dev-util/ply/ply-2.1.1-r1.ebuild
index 70868dec44d9..94ed8a669184 100644
--- a/dev-util/ply/ply-2.1.1.ebuild
+++ b/dev-util/ply/ply-2.1.1-r1.ebuild
@@ -7,12 +7,17 @@ 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"
+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 ~x86"
 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
@@ -23,7 +28,7 @@ pkg_pretend() {
 
 src_prepare() {
 	sed -i "/^AC_INIT/c\AC_INIT(${PN}, ${PV}," configure.ac || die
-	eapply "${FILESDIR}/${P}-arm-build-fix.patch"
+	eapply "${DISTDIR}/${P}-arm-build-fix.patch"
 	eapply_user
 	eautoreconf
 }
diff --git a/dev-util/sasm/sasm-2.2-r1.ebuild b/dev-util/sasm/sasm-2.2-r1.ebuild
index 3e6169701e94..47e5827a677f 100644
--- a/dev-util/sasm/sasm-2.2-r1.ebuild
+++ b/dev-util/sasm/sasm-2.2-r1.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit qmake-utils
 
-if [[ ${PV} == 9999 ]]; then
+if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/Dman95/SASM.git"
-	SRC_URI=""
 	inherit git-r3
 else
 	SRC_URI="https://github.com/Dman95/SASM/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/SASM-${PV}"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${P^^}"
 fi
 
 DESCRIPTION="Simple crossplatform IDE for NASM assembly language"
@@ -19,8 +19,6 @@ HOMEPAGE="https://dman95.github.io/SASM/"
 
 LICENSE="GPL-3"
 SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-util/sasm/sasm-3.10.1.ebuild b/dev-util/sasm/sasm-3.10.1.ebuild
index 2bd11f199b6a..a5173a60a311 100644
--- a/dev-util/sasm/sasm-3.10.1.ebuild
+++ b/dev-util/sasm/sasm-3.10.1.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit qmake-utils
 
-if [[ ${PV} == 9999 ]]; then
+if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/Dman95/SASM.git"
-	SRC_URI=""
 	inherit git-r3
 else
 	SRC_URI="https://github.com/Dman95/SASM/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/SASM-${PV}"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${P^^}"
 fi
 
 DESCRIPTION="Simple crossplatform IDE for NASM assembly language"
@@ -19,13 +19,9 @@ HOMEPAGE="https://dman95.github.io/SASM/"
 
 LICENSE="GPL-3"
 SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-PATCHES=(
-	"${FILESDIR}"/${P}-unbundle-qtsingleapplication.patch
-)
+PATCHES=( "${FILESDIR}"/${P}-unbundle-qtsingleapplication.patch )
 
 DEPEND="
 	dev-qt/qtcore:5
@@ -42,13 +38,13 @@ REPEND="${DEPEND}
 QA_PREBUILT="usr/bin/fasm usr/bin/listing"
 
 src_prepare() {
+	default
+
 	# To recompress it with gentoo tools
 	gunzip Linux/share/doc/sasm/changelog.gz || die
 	sed -e 's@changelog.gz@changelog@g' \
 		-e '/docfiles.path/s@doc/sasm@doc/'${PF}'@g' \
 		-i SASM.pro || die
-
-	default
 }
 
 src_configure() {