gentoo auto-resync : 21:02:2023 - 02:22:31

4 files changed, 41 insertions, 64 deletions

diff --git a/x11-wm/goomwwm/Manifest b/x11-wm/goomwwm/Manifest
index 880dd9ab9de8..ffc46bd7f14e 100644
--- a/x11-wm/goomwwm/Manifest
+++ b/x11-wm/goomwwm/Manifest
@@ -1,4 +1,4 @@
+AUX goomwwm-1.0.0-makefile.patch 767 BLAKE2B a41842159c2fb2042c61438a2a3e51838145a2873cc19abf95195d0bea9e759d2211aa7210ce74b8409f31a2839b707d92155a1f94826fbd774862398082bac8 SHA512 39fdd1bdf6dbe91662f27450c790643838c4feee81d1021b8c5b7ad77c8f5d024fbafac000b81b8e6788d945ad126d82a1ecf59939695770148adc9d4b1df412
 DIST goomwwm-1.0.0-github.tar.gz 406143 BLAKE2B 0118dfec32a3598b0a23b3421643a211386c1bc302d523a4a63a78e34ba9f0673b0bae18b27b491ab153e3e0fb8031123c56425ac007c20651fb3ec8484ab7a5 SHA512 e37d80c8ea47fe136172c392521ec8d4dab361c3469d3d1626ed7c30385513301983c0ffde39f4c2e6f2dee8709da6a34f14f7bb89776f1ccde5103ab1a26764
-EBUILD goomwwm-1.0.0-r1.ebuild 795 BLAKE2B 09f17ae9824995f845a3537076e11a69f2431c4631ddff5965c2dfd316be2b505d0ff11498b13284dfb481afce61ca2da89e971ea22797c5c79160e03f7c6e64 SHA512 cd5a942d05221ed3bf51c685dd053a7a60ac0e6c727d1a4766d3546a10b67fce3cacec21aba494809c701fce1a1ac49ac2010c5451f46bd3edddb4fc4433f93b
-EBUILD goomwwm-9999.ebuild 754 BLAKE2B a773fbe2e44f62bd889668b0d64411c02c7e6bf3415d4b119f500be99f9f6cab83ab58a8922f6c298c339cecec58bd1ebe49cec5cbb6a8ad1b0b4fa9f73a6f15 SHA512 77c6450c9fbb0874987eb930121dbf1827b1e48e7796fb33d9e14267e2ead0d8bcfd7873f6a606aa021b5e1bd6b11deec1f54dd25e33fc58e6a77844e3ac8a48
+EBUILD goomwwm-1.0.0-r2.ebuild 723 BLAKE2B d6e68f478f359ea35a05640d5f1daff79cc19c54d2c468ac1a926a51bccb5bbdf6f55e92f1708c87db60e2b739865ed288190ccfcfb726a9835bd0d9bdf5cad9 SHA512 1659fc4541f7dcf71e051e848892f15e622ec6e8c6d5e5c7cfff65ad1185a7b64adb430c0e6a035ca6a5a75d6668aca5137b7c20339fec01adb856bafc8c932f
 MISC metadata.xml 252 BLAKE2B c4a2c3f6d0db197a7b49dfc6cfb753158bf4a405c4deb0527672c789a2c97c68f22df69507107830adebb769d52366dbcdc13d6f2cc1199f84c6f563fd9c387e SHA512 627fde87dcdac1bc610d9889b780582d1f94cb08dc45df38b3200536b71a3b913a5b3f232144bd796a598e89c08bb9987aeb0b1ad86f79bceac7d26dd304b392
diff --git a/x11-wm/goomwwm/files/goomwwm-1.0.0-makefile.patch b/x11-wm/goomwwm/files/goomwwm-1.0.0-makefile.patch
new file mode 100644
index 000000000000..b5d7ddb873f5
--- /dev/null
+++ b/x11-wm/goomwwm/files/goomwwm-1.0.0-makefile.patch
@@ -0,0 +1,29 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,11 +1,9 @@
+-CFLAGS?=-Wall -O2
+-LDADD?=$(shell pkg-config --cflags --libs x11 xinerama x11 xft)
++CFLAGS += -Wall
++CPPFLAGS += $(shell $(PKG_CONFIG) --cflags x11 xinerama x11 xft)
++LDLIBS += $(shell $(PKG_CONFIG) --libs x11 xinerama x11 xft)
+ 
+-normal:
+-	$(CC) -o goomwwm goomwwm.c $(CFLAGS) $(LDADD) $(LDFLAGS)
+-
+-debug:
+-	$(CC) -o goomwwm-debug goomwwm.c $(CFLAGS) -g -DDEBUG $(LDADD)
++all: goomwwm
++goomwwm.c: proto
+ 
+ proto:
+ 	cat *.c | egrep '^(void|int|char|unsigned|client|Window|winlist|XWindow)' | sed -r 's/\)/);/' > proto.h
+@@ -13,7 +11,5 @@
+ docs:
+ 	pandoc -s -w man goomwwm.md -o goomwwm.1
+ 
+-all: proto normal debug docs
+-
+ clean:
+-	rm -f goomwwm goomwwm-debug
+\ No newline at end of file
++	rm -f goomwwm goomwwm-debug
diff --git a/x11-wm/goomwwm/goomwwm-1.0.0-r1.ebuild b/x11-wm/goomwwm/goomwwm-1.0.0-r2.ebuild
index f51897cf633f..506169ced6bf 100644
--- a/x11-wm/goomwwm/goomwwm-1.0.0-r1.ebuild
+++ b/x11-wm/goomwwm/goomwwm-1.0.0-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit flag-o-matic toolchain-funcs
 
@@ -17,28 +17,20 @@ IUSE="debug"
 RDEPEND="
 	x11-libs/libXft
 	x11-libs/libX11
-	x11-libs/libXinerama
-"
+	x11-libs/libXinerama"
 DEPEND="
 	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
+	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
 
-src_prepare() {
-	default
-	sed -i -e 's|$(LDADD) $(LDFLAGS)|$(LDFLAGS) $(LDADD)|g' Makefile || die
-}
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
 src_configure() {
-	use debug && append-cflags -DDEBUG
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" proto normal
+	tc-export CC PKG_CONFIG
+	use debug && append-cppflags -DDEBUG
 }
 
 src_install() {
-	dobin ${PN}
-	doman ${PN}.1
+	dobin goomwwm
+	doman goomwwm.1
 }
diff --git a/x11-wm/goomwwm/goomwwm-9999.ebuild b/x11-wm/goomwwm/goomwwm-9999.ebuild
deleted file mode 100644
index 7183c82c7e49..000000000000
--- a/x11-wm/goomwwm/goomwwm-9999.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic git-r3 toolchain-funcs
-
-DESCRIPTION="Get out of my way, Window Manager!"
-HOMEPAGE="https://github.com/seanpringle/goomwwm"
-EGIT_REPO_URI="https://github.com/seanpringle/goomwwm"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug"
-
-RDEPEND="
-	x11-libs/libXft
-	x11-libs/libX11
-	x11-libs/libXinerama
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	default
-	sed -i -e 's|$(LDADD) $(LDFLAGS)|$(LDFLAGS) $(LDADD)|g' Makefile || die
-}
-
-src_configure() {
-	use debug && append-cflags -DDEBUG
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" proto normal
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-}