gentoo auto-resync : 13:04:2023 - 17:43:46

4 files changed, 73 insertions, 35 deletions

diff --git a/x11-plugins/allin1/Manifest b/x11-plugins/allin1/Manifest
index ef3edc523086..cdf83359f701 100644
--- a/x11-plugins/allin1/Manifest
+++ b/x11-plugins/allin1/Manifest
@@ -1,4 +1,4 @@
-AUX makefile-r2.patch 587 BLAKE2B 0aab33c0b78c37f097237180663a929fcd1b6cc356afd36dcf07a88573a9214dd588a316ea06f6807536665b6663b0cd2c578873cbf6cdbc4a1f30d3ed844c0a SHA512 13b366ce564ddbf3aac94dae0ac7e4b1f5ea77755ae875bdb70b1ba9706045f6424c5fea3c870f6f9f0da0a986268ebdf81ebf71e9621c9e0256a3ecd738bab2
+AUX allin1-0.5.0-makefile.patch 1624 BLAKE2B d966d5d87f09f6873bece00ab4711506be23dbec57161939076f22065f8456b9759f8b45483474815e7be6db93729972646158c8dac6e6e411e51329855b4181 SHA512 e840a0752ef99b490d36d0a3e6d3c8bcf6ad49a8857a709382c1c90faa78ffee040bc16f13f85df6bee96d1dc3e39473defdddf36651f255ac2c576f5d3fbd7c
 DIST allin1-0.5.0.tar.gz 43905 BLAKE2B e914d174d4b1c15e8df53deb793388d8d5cbe9e1a663663b08aad052654b6b759670310d1276f0705bd8faa459c33144a6656cb64610b9d6814809e65ea34798 SHA512 2728bc86b59850dd3e928ea62f00e32bb06a1ea4b8dc3611b2fdc952de8decef7d9ac3c51ed3676d242b5de670270e19bf5783658c6651ae534154249d99a4e7
-EBUILD allin1-0.5.0-r2.ebuild 764 BLAKE2B 091505c9b4a8ed62086ffd511ec0c4e508741d75e8c082d82c021279ea8b0b2ed7aab5136253328e81bf0ea672bcb11dab43ee9f4d5c0a0ca42dee9ac2444e23 SHA512 2e190ad6ba8943ce8fa467b295086e1a5e7be92c7b4a0d3abefebb390d7b7e392831e1c950f5e15c255b18b39427a16464227770b6e7bd48781ddb1ee94f85fc
+EBUILD allin1-0.5.0-r3.ebuild 722 BLAKE2B b1e467e168f3fc531b6111bd5abcccc50bb8e6d99ea97aade6a2774db697ddbc9ad923e44faf840bb9ac55f2fc488b9a140fe1add9ee7d320a66ad04960c561c SHA512 dc5a7131df87fda035f626b156477e43263a4138cb996360511c3582aeb06fb093232924aa366a7d868c7fa62164f15c60ed6aafa5c68ae660004f3ef78b353d
 MISC metadata.xml 566 BLAKE2B fc386e39f96e66a724f38ac22176b39bf7a655cc210ad4d9228b8c6723906ba0204fab551c59cc84eb0880e8f2f31b6b55f18ac1753f9199fae0cf3edd6ff46a SHA512 ee310bb63bba1069791a7e0779f85d0257abb0c455cb1aeaecf46debe5f8b98ac5fdf8595a091471f89d9141e7d27964890b96ec9589026ec1987392c39cf0f1
diff --git a/x11-plugins/allin1/allin1-0.5.0-r2.ebuild b/x11-plugins/allin1/allin1-0.5.0-r3.ebuild
index 8fbbd58b567a..3d5fb558e2e9 100644
--- a/x11-plugins/allin1/allin1-0.5.0-r2.ebuild
+++ b/x11-plugins/allin1/allin1-0.5.0-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -12,21 +12,19 @@ SRC_URI="mirror://sourceforge/allinone/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
-RDEPEND="x11-libs/libX11
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
+BDEPEND="sys-devel/flex"
 
-PATCHES=( "${FILESDIR}/makefile-r2.patch" )
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
diff --git a/x11-plugins/allin1/files/allin1-0.5.0-makefile.patch b/x11-plugins/allin1/files/allin1-0.5.0-makefile.patch
new file mode 100644
index 000000000000..244605ac88e1
--- /dev/null
+++ b/x11-plugins/allin1/files/allin1-0.5.0-makefile.patch
@@ -0,0 +1,63 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -9,12 +9,10 @@
+ 
+ # General vars
+ 
+-CC = gcc
+ FLEX = flex
+-LIBFLAGS = -ggdb -Wall -O2 -fPIC
+-CFLAGS = -ggdb -Wall -O2
++LIBFLAGS = -fPIC
+ GENERATED = allin1 confparse.c
+-LIBRARIES = -L/usr/X11R6/lib -lXext -lX11 -lXpm -lm
++LIBRARIES = -lXext -lX11 -lXpm -lm
+ MODULES = allin1.o dockhelper.o memory.o battery.o cpu.o \
+ 	  network.o filesys.o confparse.o seti.o
+ INCLUDES = dockhelper.h memory.h battery.h cpu.h network.h filesys.h seti.h \
+@@ -30,35 +28,35 @@
+ 	$(FLEX) -o$@ -i -s $<
+ 
+ confparse.o: confparse.c confparse.h
+-	$(CC) $(CFLAGS) -c $<
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+ 
+ dockhelper.o: dockhelper.c dockhelper.h
+-	$(CC) $(CFLAGS) -c $<
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+ 
+ cpu.o: cpu.c dockhelper.h cpu.h
+-	$(CC) $(CFLAGS) -c $<
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+ 
+ memory.o: memory.c memory.h dockhelper.h
+-	$(CC) $(CFLAGS) -c $<
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+ 
+ seti.o: seti.c seti.h dockhelper.h
+-	$(CC) $(CFLAGS) -c $<
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+ 
+ battery.o: battery.c battery.h batt.xpm dockhelper.h
+-	$(CC) $(CFLAGS) -c $<
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+ 
+ network.o: network.c network.h net.xpm dockhelper.h
+-	$(CC) $(CFLAGS) -c $<
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+ 
+ filesys.o: filesys.c filesys.h dockhelper.h
+-	$(CC) $(CFLAGS) -c $<
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+ 
+ allin1.o: allin1.c $(INCLUDES)
+-	$(CC) $(CFLAGS) -c $<
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+ 
+ 
+ allin1: $(MODULES)
+-	$(CC) $(CFLAGS) -o $@ $(MODULES) -DDEBUG $(LIBRARIES)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(MODULES) -DDEBUG $(LIBRARIES)
+ 
+ 
+ install: allin1
diff --git a/x11-plugins/allin1/files/makefile-r2.patch b/x11-plugins/allin1/files/makefile-r2.patch
deleted file mode 100644
index 9d0b2ab028fa..000000000000
--- a/x11-plugins/allin1/files/makefile-r2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/src/Makefile.old	2012-10-24 13:12:48.128285694 +0200
-+++ b/src/Makefile	2012-10-24 13:19:56.135247071 +0200
-@@ -11,8 +11,9 @@
- 
- CC = gcc
- FLEX = flex
--LIBFLAGS = -ggdb -Wall -O2 -fPIC
--CFLAGS = -ggdb -Wall -O2
-+LIBFLAGS = -fPIC
-+CFLAGS =
-+LDFLAGS =
- GENERATED = allin1 confparse.c
- LIBRARIES = -L/usr/X11R6/lib -lXext -lX11 -lXpm -lm
- MODULES = allin1.o dockhelper.o memory.o battery.o cpu.o \
-@@ -58,7 +59,7 @@
- 
- 
- allin1: $(MODULES)
--	$(CC) $(CFLAGS) -o $@ $(MODULES) -DDEBUG $(LIBRARIES)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(MODULES) -DDEBUG $(LIBRARIES)
- 
- 
- install: allin1