public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-util/sasm/
@ 2018-03-04 21:18 Andreas Sturmlechner
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2018-03-04 21:18 UTC (permalink / raw
  To: gentoo-commits

commit:     870692e188b7464783f03d4ec147b5f452d0762f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  4 21:17:38 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar  4 21:18:10 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=870692e1

dev-util/sasm: Drop old Qt4-based

Closes: https://bugs.gentoo.org/644384
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-util/sasm/sasm-2.2.ebuild | 33 ---------------------------------
 1 file changed, 33 deletions(-)

diff --git a/dev-util/sasm/sasm-2.2.ebuild b/dev-util/sasm/sasm-2.2.ebuild
deleted file mode 100644
index 023b24aab05..00000000000
--- a/dev-util/sasm/sasm-2.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-r2
-
-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=""
-
-DEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-"
-REPEND="${DEPEND}
-	dev-lang/nasm
-	sys-devel/gdb
-"


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/sasm/
@ 2018-03-04 21:18 Andreas Sturmlechner
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2018-03-04 21:18 UTC (permalink / raw
  To: gentoo-commits

commit:     015cf4a48b24cc23ce0d902931aceb4f77d584af
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  4 21:17:05 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar  4 21:18:10 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=015cf4a4

dev-util/sasm: Switch to Qt5

Bug: https://bugs.gentoo.org/644384
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../sasm/{sasm-9999.ebuild => sasm-2.2-r1.ebuild}  | 19 ++++++++++++++-----
 dev-util/sasm/sasm-9999.ebuild                     | 22 ++++++++++++++++------
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/dev-util/sasm/sasm-9999.ebuild b/dev-util/sasm/sasm-2.2-r1.ebuild
similarity index 72%
copy from dev-util/sasm/sasm-9999.ebuild
copy to dev-util/sasm/sasm-2.2-r1.ebuild
index 023b24aab05..7c9c73aab79 100644
--- a/dev-util/sasm/sasm-9999.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 023b24aab05..61a911989dd 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}"
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/sasm/
@ 2019-08-17  7:58 Maxim Koltsov
  0 siblings, 0 replies; 7+ messages in thread
From: Maxim Koltsov @ 2019-08-17  7:58 UTC (permalink / raw
  To: gentoo-commits

commit:     e55dc63a4c8ff3d8b5da4d2e0695b79ab805706d
Author:     Maxim Koltsov <maksbotan <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 17 07:57:04 2019 +0000
Commit:     Maxim Koltsov <maksbotan <AT> gentoo <DOT> org>
CommitDate: Sat Aug 17 07:57:45 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e55dc63a

dev-util/sasm: remove 9999

Package-Manager: Portage-2.3.71, Repoman-2.3.12
Signed-off-by: Maxim Koltsov <maksbotan <AT> gentoo.org>

 dev-util/sasm/sasm-9999.ebuild | 43 ------------------------------------------
 1 file changed, 43 deletions(-)

diff --git a/dev-util/sasm/sasm-9999.ebuild b/dev-util/sasm/sasm-9999.ebuild
deleted file mode 100644
index 61a911989dd..00000000000
--- 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}"
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/sasm/
@ 2020-07-19 19:48 Andreas Sturmlechner
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2020-07-19 19:48 UTC (permalink / raw
  To: gentoo-commits

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 's@changelog.gz@changelog@g' \
 		-e '/docfiles.path/s@doc/sasm@doc/'${PF}'@g' \
 		-i SASM.pro || die
-
-	default
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/sasm/
@ 2020-07-20 13:01 Joonas Niilola
  0 siblings, 0 replies; 7+ messages in thread
From: Joonas Niilola @ 2020-07-20 13:01 UTC (permalink / raw
  To: gentoo-commits

commit:     6ee8d0891a920415573e8acf1b3de2727b28efbb
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 20 12:50:29 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jul 20 13:01:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ee8d089

dev-util/sasm: fix RDEPEND typo in 3.10.1

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-util/sasm/sasm-3.10.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/sasm/sasm-3.10.1.ebuild b/dev-util/sasm/sasm-3.10.1.ebuild
index 7b82aa3b818..33cb8195c3e 100644
--- a/dev-util/sasm/sasm-3.10.1.ebuild
+++ b/dev-util/sasm/sasm-3.10.1.ebuild
@@ -29,7 +29,7 @@ DEPEND="
 	dev-qt/qtsingleapplication
 	dev-qt/qtwidgets:5
 "
-REPEND="${DEPEND}
+RDEPEND="${DEPEND}
 	dev-lang/nasm
 	sys-devel/gdb
 "


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/sasm/
@ 2020-07-20 13:01 Joonas Niilola
  0 siblings, 0 replies; 7+ messages in thread
From: Joonas Niilola @ 2020-07-20 13:01 UTC (permalink / raw
  To: gentoo-commits

commit:     c62016e7b74663ce0348d0d9f3d0f5ee0db54857
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 20 12:50:09 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jul 20 13:01:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c62016e7

dev-util/sasm: fix RDEPEND typo in 2.2-r1

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-util/sasm/sasm-2.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/sasm/sasm-2.2-r1.ebuild b/dev-util/sasm/sasm-2.2-r1.ebuild
index 6af06e5653b..eb371161fa2 100644
--- a/dev-util/sasm/sasm-2.2-r1.ebuild
+++ b/dev-util/sasm/sasm-2.2-r1.ebuild
@@ -26,7 +26,7 @@ DEPEND="
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 "
-REPEND="${DEPEND}
+RDEPEND="${DEPEND}
 	dev-lang/nasm
 	sys-devel/gdb
 "


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/sasm/
@ 2021-02-07  9:16 Andreas Sturmlechner
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2021-02-07  9:16 UTC (permalink / raw
  To: gentoo-commits

commit:     5c13812c25824bb8c5798c664bed9f1b6a0eb1b0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  6 23:20:01 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb  7 09:15:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c13812c

dev-util/sasm: Drop 2.2-r1

Closes: https://bugs.gentoo.org/732730
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-util/sasm/Manifest           |  1 -
 dev-util/sasm/sasm-2.2-r1.ebuild | 40 ----------------------------------------
 2 files changed, 41 deletions(-)

diff --git a/dev-util/sasm/Manifest b/dev-util/sasm/Manifest
index c40448f3c61..42b7bc9dce9 100644
--- a/dev-util/sasm/Manifest
+++ b/dev-util/sasm/Manifest
@@ -1,2 +1 @@
-DIST sasm-2.2.tar.gz 9117410 BLAKE2B f85d120469f11fd8cdb7ae9dcdc87464d8bc64db4f99cb2787c4f2adb6294288a7fd1dc071b53badb8153e8c8220a77964b102a234ad9ebc3b6a64d505c828dd SHA512 42d4af775d37d47bcf63fb70b9142e387e33cef5589002ff3e3cee926b5fca7e1508d640d1d5a175d48fc9fd041eb1f03304cad5ddc3c22a09ff29198650b513
 DIST sasm-3.10.1.tar.gz 22349749 BLAKE2B e1337d9ab1f62b0ccab31f202f5964ab2b355ab597cf08e65dd69f7a35f72187a36767d1bbbf339e3bf8330dffcd924682e464d0e8cdc13255723b2c5ed75747 SHA512 2a1410c996e3dac1179a2c8a0140b2180ccc9e461e4695a588c6a5db787a13de5ca9124d467561905e1d445d08bd044bd99831203faa6a740614bc6680ae10d1

diff --git a/dev-util/sasm/sasm-2.2-r1.ebuild b/dev-util/sasm/sasm-2.2-r1.ebuild
deleted file mode 100644
index eb371161fa2..00000000000
--- a/dev-util/sasm/sasm-2.2-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/Dman95/SASM.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/Dman95/SASM/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${P^^}"
-fi
-
-DESCRIPTION="Simple crossplatform IDE for NASM assembly language"
-HOMEPAGE="http://dman95.github.io/SASM/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}
-	dev-lang/nasm
-	sys-devel/gdb
-"
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2021-02-07  9:16 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-04 21:18 [gentoo-commits] repo/gentoo:master commit in: dev-util/sasm/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2018-03-04 21:18 Andreas Sturmlechner
2019-08-17  7:58 Maxim Koltsov
2020-07-19 19:48 Andreas Sturmlechner
2020-07-20 13:01 Joonas Niilola
2020-07-20 13:01 Joonas Niilola
2021-02-07  9:16 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox