commit: 5399d78db2f9f64175fe19c4d392a3f3d9cbee94
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 15 11:35:29 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 19 19:48:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5399d78d
dev-util/sasm: EAPI-7 bump
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-util/sasm/sasm-2.2-r1.ebuild | 12 +++++-------
dev-util/sasm/sasm-3.10.1.ebuild | 20 ++++++++------------
2 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/dev-util/sasm/sasm-2.2-r1.ebuild b/dev-util/sasm/sasm-2.2-r1.ebuild
index 7c9c73aab79..6af06e5653b 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="http://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 90ca72d5316..7b82aa3b818 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="http://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 '[email protected]@changelog@g' \
-e '/docfiles.path/s@doc/sasm@doc/'${PF}'@g' \
-i SASM.pro || die
-
- default
}
src_configure() {
