public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:dev commit in: gui-apps/lswt/
@ 2024-03-22 20:22 Ben Buhse
  0 siblings, 0 replies; 6+ messages in thread
From: Ben Buhse @ 2024-03-22 20:22 UTC (permalink / raw
  To: gentoo-commits

commit:     10e371f6962f2e3ac061a56199674d0ee77d4ada
Author:     Ben Buhse <me <AT> benbuhse <DOT> com>
AuthorDate: Fri Mar 22 20:20:43 2024 +0000
Commit:     Ben Buhse <gentoo <AT> benbuhse <DOT> com>
CommitDate: Fri Mar 22 20:21:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=10e371f6

gui-apps/lswt: new package, add 1.0.4

Signed-off-by: Ben Buhse <me <AT> benbuhse.com>

 gui-apps/lswt/Manifest          |  1 +
 gui-apps/lswt/lswt-1.0.4.ebuild | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/gui-apps/lswt/Manifest b/gui-apps/lswt/Manifest
new file mode 100644
index 0000000000..214feff0e2
--- /dev/null
+++ b/gui-apps/lswt/Manifest
@@ -0,0 +1 @@
+DIST lswt-1.0.4.tar.gz 21479 BLAKE2B fc5f2dd3d28bc10bd460ab6557ce2a5be17d88ff58f22414ed836c1f63a1cf7c70d6363b23a794c49631ab465f1e69a6fa539d5ccd397148a6819ce927137c4d SHA512 708500f09cd50acd9df4d6101c599b7a48bda274ddb2f31d138ca77b37b11cf244b2c5b473c2f13274b61458eb820aa506f9b1ad6ce517c8e5c274935e4f3443

diff --git a/gui-apps/lswt/lswt-1.0.4.ebuild b/gui-apps/lswt/lswt-1.0.4.ebuild
new file mode 100644
index 0000000000..5b54e25b05
--- /dev/null
+++ b/gui-apps/lswt/lswt-1.0.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="List Wayland toplevels"
+HOMEPAGE="https://git.sr.ht/~leon_plickat/lswt/"
+SRC_URI="https://git.sr.ht/~leon_plickat/lswt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-libs/wayland"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-libs/wayland-protocols"
+
+src_install() {
+	# Need to install to /usr instead of /usr/local
+	# and the Makefile doens't handle DESTDIR properly
+	emake PREFIX="${D}"/usr install
+}


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

* [gentoo-commits] repo/proj/guru:dev commit in: gui-apps/lswt/
@ 2024-03-23  0:10 Ben Buhse
  0 siblings, 0 replies; 6+ messages in thread
From: Ben Buhse @ 2024-03-23  0:10 UTC (permalink / raw
  To: gentoo-commits

commit:     889fd0b3571bdfa856e42af68cf827e0a8c7e674
Author:     Ben Buhse <me <AT> benbuhse <DOT> com>
AuthorDate: Sat Mar 23 00:09:27 2024 +0000
Commit:     Ben Buhse <gentoo <AT> benbuhse <DOT> com>
CommitDate: Sat Mar 23 00:09:27 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=889fd0b3

gui-apps/lswt: add 9999

Signed-off-by: Ben Buhse <me <AT> benbuhse.com>

 gui-apps/lswt/lswt-1.0.4.ebuild                       | 11 ++++++++---
 gui-apps/lswt/{lswt-1.0.4.ebuild => lswt-9999.ebuild} | 11 ++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/gui-apps/lswt/lswt-1.0.4.ebuild b/gui-apps/lswt/lswt-1.0.4.ebuild
index 5b54e25b05..083438fff0 100644
--- a/gui-apps/lswt/lswt-1.0.4.ebuild
+++ b/gui-apps/lswt/lswt-1.0.4.ebuild
@@ -5,13 +5,18 @@ EAPI=8
 
 DESCRIPTION="List Wayland toplevels"
 HOMEPAGE="https://git.sr.ht/~leon_plickat/lswt/"
-SRC_URI="https://git.sr.ht/~leon_plickat/lswt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-S="${WORKDIR}/${PN}-v${PV}"
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~leon_plickat/lswt"
+else
+	SRC_URI="https://git.sr.ht/~leon_plickat/lswt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-v${PV}"
+	KEYWORDS="~amd64"
+fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
 
 DEPEND="dev-libs/wayland"
 RDEPEND="${DEPEND}"

diff --git a/gui-apps/lswt/lswt-1.0.4.ebuild b/gui-apps/lswt/lswt-9999.ebuild
similarity index 65%
copy from gui-apps/lswt/lswt-1.0.4.ebuild
copy to gui-apps/lswt/lswt-9999.ebuild
index 5b54e25b05..083438fff0 100644
--- a/gui-apps/lswt/lswt-1.0.4.ebuild
+++ b/gui-apps/lswt/lswt-9999.ebuild
@@ -5,13 +5,18 @@ EAPI=8
 
 DESCRIPTION="List Wayland toplevels"
 HOMEPAGE="https://git.sr.ht/~leon_plickat/lswt/"
-SRC_URI="https://git.sr.ht/~leon_plickat/lswt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-S="${WORKDIR}/${PN}-v${PV}"
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~leon_plickat/lswt"
+else
+	SRC_URI="https://git.sr.ht/~leon_plickat/lswt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-v${PV}"
+	KEYWORDS="~amd64"
+fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
 
 DEPEND="dev-libs/wayland"
 RDEPEND="${DEPEND}"


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

* [gentoo-commits] repo/proj/guru:dev commit in: gui-apps/lswt/
@ 2024-05-12 17:00 Lucio Sauer
  0 siblings, 0 replies; 6+ messages in thread
From: Lucio Sauer @ 2024-05-12 17:00 UTC (permalink / raw
  To: gentoo-commits

commit:     ae0304496fafc555cc48cde90979e222d24168e2
Author:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
AuthorDate: Sun May 12 16:47:30 2024 +0000
Commit:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
CommitDate: Sun May 12 17:00:24 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ae030449

gui-apps/lswt: add correct build dependency

Signed-off-by: Lucio Sauer <watermanpaint <AT> posteo.net>

 gui-apps/lswt/lswt-1.0.4.ebuild | 2 +-
 gui-apps/lswt/lswt-9999.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gui-apps/lswt/lswt-1.0.4.ebuild b/gui-apps/lswt/lswt-1.0.4.ebuild
index 083438fff0..310b8cf739 100644
--- a/gui-apps/lswt/lswt-1.0.4.ebuild
+++ b/gui-apps/lswt/lswt-1.0.4.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 
 DEPEND="dev-libs/wayland"
 RDEPEND="${DEPEND}"
-BDEPEND="dev-libs/wayland-protocols"
+BDEPEND="dev-util/wayland-scanner"
 
 src_install() {
 	# Need to install to /usr instead of /usr/local

diff --git a/gui-apps/lswt/lswt-9999.ebuild b/gui-apps/lswt/lswt-9999.ebuild
index 083438fff0..310b8cf739 100644
--- a/gui-apps/lswt/lswt-9999.ebuild
+++ b/gui-apps/lswt/lswt-9999.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 
 DEPEND="dev-libs/wayland"
 RDEPEND="${DEPEND}"
-BDEPEND="dev-libs/wayland-protocols"
+BDEPEND="dev-util/wayland-scanner"
 
 src_install() {
 	# Need to install to /usr instead of /usr/local


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

* [gentoo-commits] repo/proj/guru:dev commit in: gui-apps/lswt/
@ 2024-05-12 17:00 Lucio Sauer
  0 siblings, 0 replies; 6+ messages in thread
From: Lucio Sauer @ 2024-05-12 17:00 UTC (permalink / raw
  To: gentoo-commits

commit:     a36e877ff03e95cbdfee1002330990176b3a22d2
Author:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
AuthorDate: Sun May 12 16:58:55 2024 +0000
Commit:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
CommitDate: Sun May 12 17:00:28 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a36e877f

gui-apps/lswt: fix CFLAGS and support EPREFIX

Bug: https://bugs.gentoo.org/260867
Closes: https://bugs.gentoo.org/927846
Signed-off-by: Lucio Sauer <watermanpaint <AT> posteo.net>

 gui-apps/lswt/{lswt-1.0.4.ebuild => lswt-1.0.4-r1.ebuild} | 10 +++++++---
 gui-apps/lswt/lswt-9999.ebuild                            |  9 ++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/gui-apps/lswt/lswt-1.0.4.ebuild b/gui-apps/lswt/lswt-1.0.4-r1.ebuild
similarity index 80%
rename from gui-apps/lswt/lswt-1.0.4.ebuild
rename to gui-apps/lswt/lswt-1.0.4-r1.ebuild
index e3a5bc0252..d923c8b54a 100644
--- a/gui-apps/lswt/lswt-1.0.4.ebuild
+++ b/gui-apps/lswt/lswt-1.0.4-r1.ebuild
@@ -24,12 +24,16 @@ DEPEND="dev-libs/wayland"
 RDEPEND="${DEPEND}"
 BDEPEND="dev-util/wayland-scanner"
 
+src_prepare() {
+	default
+	sed '/^CFLAGS/{s/=/:=/;s/-Werror//;s/$/ $(CFLAGS)/}' \
+		-i Makefile || die
+}
+
 src_compile() {
 	emake CC="$(tc-getCC)"
 }
 
 src_install() {
-	# Need to install to /usr instead of /usr/local
-	# and the Makefile doens't handle DESTDIR properly
-	emake PREFIX="${D}"/usr install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
 }

diff --git a/gui-apps/lswt/lswt-9999.ebuild b/gui-apps/lswt/lswt-9999.ebuild
index e3a5bc0252..505b6eee62 100644
--- a/gui-apps/lswt/lswt-9999.ebuild
+++ b/gui-apps/lswt/lswt-9999.ebuild
@@ -24,12 +24,15 @@ DEPEND="dev-libs/wayland"
 RDEPEND="${DEPEND}"
 BDEPEND="dev-util/wayland-scanner"
 
+src_prepare() {
+	default
+	sed '/^CFLAGS/s/-Werror//' -i Makefile || die
+}
+
 src_compile() {
 	emake CC="$(tc-getCC)"
 }
 
 src_install() {
-	# Need to install to /usr instead of /usr/local
-	# and the Makefile doens't handle DESTDIR properly
-	emake PREFIX="${D}"/usr install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
 }


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

* [gentoo-commits] repo/proj/guru:dev commit in: gui-apps/lswt/
@ 2024-05-12 17:00 Lucio Sauer
  0 siblings, 0 replies; 6+ messages in thread
From: Lucio Sauer @ 2024-05-12 17:00 UTC (permalink / raw
  To: gentoo-commits

commit:     3bb00484a980fbbe5fb350ed75b6f5faeddb6a1d
Author:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
AuthorDate: Sun May 12 16:51:43 2024 +0000
Commit:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
CommitDate: Sun May 12 17:00:28 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3bb00484

gui-apps/lswt: use CHOST CC

Bug: https://bugs.gentoo.org/243502
Signed-off-by: Lucio Sauer <watermanpaint <AT> posteo.net>

 gui-apps/lswt/lswt-1.0.4.ebuild | 6 ++++++
 gui-apps/lswt/lswt-9999.ebuild  | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/gui-apps/lswt/lswt-1.0.4.ebuild b/gui-apps/lswt/lswt-1.0.4.ebuild
index 310b8cf739..e3a5bc0252 100644
--- a/gui-apps/lswt/lswt-1.0.4.ebuild
+++ b/gui-apps/lswt/lswt-1.0.4.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit toolchain-funcs
+
 DESCRIPTION="List Wayland toplevels"
 HOMEPAGE="https://git.sr.ht/~leon_plickat/lswt/"
 
@@ -22,6 +24,10 @@ DEPEND="dev-libs/wayland"
 RDEPEND="${DEPEND}"
 BDEPEND="dev-util/wayland-scanner"
 
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
 src_install() {
 	# Need to install to /usr instead of /usr/local
 	# and the Makefile doens't handle DESTDIR properly

diff --git a/gui-apps/lswt/lswt-9999.ebuild b/gui-apps/lswt/lswt-9999.ebuild
index 310b8cf739..e3a5bc0252 100644
--- a/gui-apps/lswt/lswt-9999.ebuild
+++ b/gui-apps/lswt/lswt-9999.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit toolchain-funcs
+
 DESCRIPTION="List Wayland toplevels"
 HOMEPAGE="https://git.sr.ht/~leon_plickat/lswt/"
 
@@ -22,6 +24,10 @@ DEPEND="dev-libs/wayland"
 RDEPEND="${DEPEND}"
 BDEPEND="dev-util/wayland-scanner"
 
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
 src_install() {
 	# Need to install to /usr instead of /usr/local
 	# and the Makefile doens't handle DESTDIR properly


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

* [gentoo-commits] repo/proj/guru:dev commit in: gui-apps/lswt/
@ 2024-05-17 18:31 Ben Buhse
  0 siblings, 0 replies; 6+ messages in thread
From: Ben Buhse @ 2024-05-17 18:31 UTC (permalink / raw
  To: gentoo-commits

commit:     6e5626386124754050f0326fbc85e74be243aee1
Author:     Ben Buhse <me <AT> benbuhse <DOT> com>
AuthorDate: Fri May 17 18:29:52 2024 +0000
Commit:     Ben Buhse <gentoo <AT> benbuhse <DOT> com>
CommitDate: Fri May 17 18:29:52 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6e562638

gui-apps/lswt: add 2.0.0

Signed-off-by: Ben Buhse <me <AT> benbuhse.com>

 gui-apps/lswt/Manifest          |  1 +
 gui-apps/lswt/lswt-2.0.0.ebuild | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/gui-apps/lswt/Manifest b/gui-apps/lswt/Manifest
index 214feff0e2..c4511a6cb0 100644
--- a/gui-apps/lswt/Manifest
+++ b/gui-apps/lswt/Manifest
@@ -1 +1,2 @@
 DIST lswt-1.0.4.tar.gz 21479 BLAKE2B fc5f2dd3d28bc10bd460ab6557ce2a5be17d88ff58f22414ed836c1f63a1cf7c70d6363b23a794c49631ab465f1e69a6fa539d5ccd397148a6819ce927137c4d SHA512 708500f09cd50acd9df4d6101c599b7a48bda274ddb2f31d138ca77b37b11cf244b2c5b473c2f13274b61458eb820aa506f9b1ad6ce517c8e5c274935e4f3443
+DIST lswt-2.0.0.tar.gz 27758 BLAKE2B 9f659d3a37c800457727da9df44517ffe0bb4c8d4dab269fdf3752b9da4fd64e37c091e075c7576009a453c261eed7eff6d784d092c2ea32b55302d3d8d08b10 SHA512 147c4a0f7f2410230b9a27adb669ce7004f19701bf50d8e3c540fedb79ad37a282ce7968d2f1abdef6991b297f5d2b6b913ffbf4a4ef3ebc4481ff0cc803a01f

diff --git a/gui-apps/lswt/lswt-2.0.0.ebuild b/gui-apps/lswt/lswt-2.0.0.ebuild
new file mode 100644
index 0000000000..d923c8b54a
--- /dev/null
+++ b/gui-apps/lswt/lswt-2.0.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="List Wayland toplevels"
+HOMEPAGE="https://git.sr.ht/~leon_plickat/lswt/"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~leon_plickat/lswt"
+else
+	SRC_URI="https://git.sr.ht/~leon_plickat/lswt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-v${PV}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+DEPEND="dev-libs/wayland"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-util/wayland-scanner"
+
+src_prepare() {
+	default
+	sed '/^CFLAGS/{s/=/:=/;s/-Werror//;s/$/ $(CFLAGS)/}' \
+		-i Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+}


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

end of thread, other threads:[~2024-05-17 18:32 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-22 20:22 [gentoo-commits] repo/proj/guru:dev commit in: gui-apps/lswt/ Ben Buhse
  -- strict thread matches above, loose matches on Subject: below --
2024-03-23  0:10 Ben Buhse
2024-05-12 17:00 Lucio Sauer
2024-05-12 17:00 Lucio Sauer
2024-05-12 17:00 Lucio Sauer
2024-05-17 18:31 Ben Buhse

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