x11-plugins/allin1: update EAPI 6 -> 8

Signed-off-by: David Seifert <soap@gentoo.org>

3 files changed, 71 insertions, 33 deletions

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