From fc637fb28da700da71ec2064d65ca5a7a31b9c6c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 18 Aug 2019 18:16:17 +0100 Subject: gentoo resync : 18.08.2019 --- dev-util/sasm/Manifest | 4 +- .../sasm-3.10.1-unbundle-qtsingleapplication.patch | 19 +++++++ dev-util/sasm/sasm-3.10.1.ebuild | 60 ++++++++++++++++++++++ dev-util/sasm/sasm-9999.ebuild | 43 ---------------- 4 files changed, 82 insertions(+), 44 deletions(-) create mode 100644 dev-util/sasm/files/sasm-3.10.1-unbundle-qtsingleapplication.patch create mode 100644 dev-util/sasm/sasm-3.10.1.ebuild delete mode 100644 dev-util/sasm/sasm-9999.ebuild (limited to 'dev-util/sasm') diff --git a/dev-util/sasm/Manifest b/dev-util/sasm/Manifest index c7f8761c5c31..07f4eff449dc 100644 --- a/dev-util/sasm/Manifest +++ b/dev-util/sasm/Manifest @@ -1,4 +1,6 @@ +AUX sasm-3.10.1-unbundle-qtsingleapplication.patch 441 BLAKE2B 433221ce1d28357dc3897916e11f0e42ae4bb95402c1da6b6abcfcdecf33ddfd1a727b87ab2bf933f96fbeda95137f70e31d02c8e731a7ab3da7a784f148dad3 SHA512 c04977ee0f651c8cd5f56c93c32668aeeeeac5ae3c1bcc909933a660afae149dd797bf23df159f15fe8374001a9dbdf78ca5c5f6b59034922a82e19ad16c037f DIST sasm-2.2.tar.gz 9117410 BLAKE2B f85d120469f11fd8cdb7ae9dcdc87464d8bc64db4f99cb2787c4f2adb6294288a7fd1dc071b53badb8153e8c8220a77964b102a234ad9ebc3b6a64d505c828dd SHA512 42d4af775d37d47bcf63fb70b9142e387e33cef5589002ff3e3cee926b5fca7e1508d640d1d5a175d48fc9fd041eb1f03304cad5ddc3c22a09ff29198650b513 +DIST sasm-3.10.1.tar.gz 22349749 BLAKE2B e1337d9ab1f62b0ccab31f202f5964ab2b355ab597cf08e65dd69f7a35f72187a36767d1bbbf339e3bf8330dffcd924682e464d0e8cdc13255723b2c5ed75747 SHA512 2a1410c996e3dac1179a2c8a0140b2180ccc9e461e4695a588c6a5db787a13de5ca9124d467561905e1d445d08bd044bd99831203faa6a740614bc6680ae10d1 EBUILD sasm-2.2-r1.ebuild 749 BLAKE2B 336ff1f57eaf6fa9beef03f49b9b6082d45072e1e89927117e9d464a56edb6717e3cda8e72a02fbe9ebce398952c650ea7adca8afc9cbf29e718e2f3e688fd4c SHA512 7e049807b11fd7acbef12900decc451979818b413718e2935e6c28ec68ac7b0a70bfbe8316c407651bb66f336308157ba75ed77db0313b3ad45dbd81fcc6fddc -EBUILD sasm-9999.ebuild 770 BLAKE2B c78133844ee317fbc57b7650359d56cf86ca102056b8241ced281450a8d755d9ab72b32aa2edf4901375bc634bac347041ecfa825fddec6e5b280fce4c26f10c SHA512 0dba9e85f0c9a638f82ef99f1a6deb4854c84f40ac2d8845f0d0dc155d22a84363af58a07e1ed4e32b9c797b1c4f4bb8ac0e35c77bbcccfc9c0718d62af59e27 +EBUILD sasm-3.10.1.ebuild 1173 BLAKE2B 78b77ce3d85ab9d4720dbf5c918e46ea1553c3f840e024e9d6cf6cc2ee8a83e305885beed42d00d03b7a577058e316eef0c19d4efd0fec4f5d847aacc7a7b3a4 SHA512 0f6aba843321330417639396ed709155d9e03ca9934b14251967a5c65e54f33db9efca0af1e0a6a1f5835ab740701c15d6b1b041262fd196470f577a96772149 MISC metadata.xml 325 BLAKE2B 7fad0a2d1d4ab4f67758d702f18de025b6bf553e5f99ab43b6657ee9dbfcb858892ae5c4d6e37094b744b85fd70f1dd7f1b1e8e7ff142d86f9bf83190aa045c2 SHA512 8cb446410e74845234244cb121cf966f18ea1ce69796f6dc5c6c1d434952811e61c8b02aaeba24905578f8e8463e29269538b50768b30524af859419769b5a92 diff --git a/dev-util/sasm/files/sasm-3.10.1-unbundle-qtsingleapplication.patch b/dev-util/sasm/files/sasm-3.10.1-unbundle-qtsingleapplication.patch new file mode 100644 index 000000000000..70b7e56682d2 --- /dev/null +++ b/dev-util/sasm/files/sasm-3.10.1-unbundle-qtsingleapplication.patch @@ -0,0 +1,19 @@ +--- a/SASM.pro 2018-10-08 22:09:33.000000000 +0300 ++++ b/SASM.pro 2019-08-17 10:39:31.695020549 +0300 +@@ -18,6 +18,8 @@ + BINDIR = $$PREFIX/bin + DATADIR = $$PREFIX/share + ++CONFIG += qtsingleapplication ++ + bsd { + binfile.files += sasm + binfile.files += BSD/bin/* +@@ -47,7 +49,6 @@ + INSTALLS += shortcutfiles + INSTALLS += docfiles + +-include(singleapplication/qtsingleapplication.pri) + + SOURCES += main.cpp\ + mainwindow.cpp \ diff --git a/dev-util/sasm/sasm-3.10.1.ebuild b/dev-util/sasm/sasm-3.10.1.ebuild new file mode 100644 index 000000000000..90ca72d53168 --- /dev/null +++ b/dev-util/sasm/sasm-3.10.1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit qmake-utils + +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}" +fi + +DESCRIPTION="Simple crossplatform IDE for NASM assembly language" +HOMEPAGE="http://dman95.github.io/SASM/" + +LICENSE="GPL-3" +SLOT="0" +[[ ${PV} == 9999 ]] || \ +KEYWORDS="~amd64 ~x86" +IUSE="" + +PATCHES=( + "${FILESDIR}"/${P}-unbundle-qtsingleapplication.patch +) + +DEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtsingleapplication + dev-qt/qtwidgets:5 +" +REPEND="${DEPEND} + dev-lang/nasm + sys-devel/gdb +" + +# SASM repository contains precompiled binaries ¯\_(ツ)_/¯ +QA_PREBUILT="usr/bin/fasm usr/bin/listing" + +src_prepare() { + # 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() { + eqmake5 +} + +src_install() { + emake install INSTALL_ROOT="${D}" +} diff --git a/dev-util/sasm/sasm-9999.ebuild b/dev-util/sasm/sasm-9999.ebuild deleted file mode 100644 index 61a911989dd0..000000000000 --- a/dev-util/sasm/sasm-9999.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit qmake-utils - -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}" -fi - -DESCRIPTION="Simple crossplatform IDE for NASM assembly language" -HOMEPAGE="https://dman95.github.io/SASM/" - -LICENSE="GPL-3" -SLOT="0" -[[ ${PV} == 9999 ]] || \ -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=" - 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}" -} -- cgit v1.2.3