summaryrefslogtreecommitdiff
path: root/dev-util/sasm
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-03-09 16:53:27 +0000
committerV3n3RiX <venerix@redcorelinux.org>2018-03-09 16:53:27 +0000
commit80208fb578cf92cc308906660ca6d7860c6b2a1f (patch)
tree6f06818031b553c506fc10dfe9908a835df288aa /dev-util/sasm
parent06a7b5647e11a8ddf69b1c3d3ded6a8ba28b923e (diff)
gentoo resync : 09.03.2018
Diffstat (limited to 'dev-util/sasm')
-rw-r--r--dev-util/sasm/Manifest4
-rw-r--r--dev-util/sasm/sasm-2.2-r1.ebuild (renamed from dev-util/sasm/sasm-2.2.ebuild)19
-rw-r--r--dev-util/sasm/sasm-9999.ebuild22
3 files changed, 32 insertions, 13 deletions
diff --git a/dev-util/sasm/Manifest b/dev-util/sasm/Manifest
index 57f388d08a10..c7f8761c5c31 100644
--- a/dev-util/sasm/Manifest
+++ b/dev-util/sasm/Manifest
@@ -1,4 +1,4 @@
DIST sasm-2.2.tar.gz 9117410 BLAKE2B f85d120469f11fd8cdb7ae9dcdc87464d8bc64db4f99cb2787c4f2adb6294288a7fd1dc071b53badb8153e8c8220a77964b102a234ad9ebc3b6a64d505c828dd SHA512 42d4af775d37d47bcf63fb70b9142e387e33cef5589002ff3e3cee926b5fca7e1508d640d1d5a175d48fc9fd041eb1f03304cad5ddc3c22a09ff29198650b513
-EBUILD sasm-2.2.ebuild 640 BLAKE2B d4a254916286246bcef2146f292db325a290a4cd9e91f67362d6b65d92a502b2d60996d136fbc3c6bdebf4b27d2e3c35a0d689c01c266317d0fb2a061efef36c SHA512 4a7059cdec57cbbd3f010368d1b0752ff2946b0d0a1c8818a6ec909cf9bef832e8426adba3b2938528647d6b9a690fcb3d9076c5132a10c95445a1527d517cbd
-EBUILD sasm-9999.ebuild 640 BLAKE2B d4a254916286246bcef2146f292db325a290a4cd9e91f67362d6b65d92a502b2d60996d136fbc3c6bdebf4b27d2e3c35a0d689c01c266317d0fb2a061efef36c SHA512 4a7059cdec57cbbd3f010368d1b0752ff2946b0d0a1c8818a6ec909cf9bef832e8426adba3b2938528647d6b9a690fcb3d9076c5132a10c95445a1527d517cbd
+EBUILD sasm-2.2-r1.ebuild 749 BLAKE2B 336ff1f57eaf6fa9beef03f49b9b6082d45072e1e89927117e9d464a56edb6717e3cda8e72a02fbe9ebce398952c650ea7adca8afc9cbf29e718e2f3e688fd4c SHA512 7e049807b11fd7acbef12900decc451979818b413718e2935e6c28ec68ac7b0a70bfbe8316c407651bb66f336308157ba75ed77db0313b3ad45dbd81fcc6fddc
+EBUILD sasm-9999.ebuild 770 BLAKE2B c78133844ee317fbc57b7650359d56cf86ca102056b8241ced281450a8d755d9ab72b32aa2edf4901375bc634bac347041ecfa825fddec6e5b280fce4c26f10c SHA512 0dba9e85f0c9a638f82ef99f1a6deb4854c84f40ac2d8845f0d0dc155d22a84363af58a07e1ed4e32b9c797b1c4f4bb8ac0e35c77bbcccfc9c0718d62af59e27
MISC metadata.xml 325 BLAKE2B 7fad0a2d1d4ab4f67758d702f18de025b6bf553e5f99ab43b6657ee9dbfcb858892ae5c4d6e37094b744b85fd70f1dd7f1b1e8e7ff142d86f9bf83190aa045c2 SHA512 8cb446410e74845234244cb121cf966f18ea1ce69796f6dc5c6c1d434952811e61c8b02aaeba24905578f8e8463e29269538b50768b30524af859419769b5a92
diff --git a/dev-util/sasm/sasm-2.2.ebuild b/dev-util/sasm/sasm-2.2-r1.ebuild
index 023b24aab05d..7c9c73aab793 100644
--- a/dev-util/sasm/sasm-2.2.ebuild
+++ b/dev-util/sasm/sasm-2.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-inherit qt4-r2
+inherit qmake-utils
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/Dman95/SASM.git"
@@ -24,10 +24,19 @@ KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="
- dev-qt/qtcore:4
- dev-qt/qtgui:4
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
"
REPEND="${DEPEND}
dev-lang/nasm
sys-devel/gdb
"
+
+src_configure() {
+ eqmake5
+}
+
+src_install() {
+ emake install INSTALL_ROOT="${D}"
+}
diff --git a/dev-util/sasm/sasm-9999.ebuild b/dev-util/sasm/sasm-9999.ebuild
index 023b24aab05d..61a911989dd0 100644
--- a/dev-util/sasm/sasm-9999.ebuild
+++ b/dev-util/sasm/sasm-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-inherit qt4-r2
+inherit qmake-utils
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/Dman95/SASM.git"
@@ -15,7 +15,7 @@ else
fi
DESCRIPTION="Simple crossplatform IDE for NASM assembly language"
-HOMEPAGE="http://dman95.github.io/SASM/"
+HOMEPAGE="https://dman95.github.io/SASM/"
LICENSE="GPL-3"
SLOT="0"
@@ -24,10 +24,20 @@ KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="
- dev-qt/qtcore:4
- dev-qt/qtgui:4
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
"
REPEND="${DEPEND}
dev-lang/nasm
sys-devel/gdb
"
+
+src_configure() {
+ eqmake5
+}
+
+src_install() {
+ emake install INSTALL_ROOT="${D}"
+}