[gentoo-commits] repo/gentoo:master commit in: x11-misc/gbase/, x11-misc/gbase/files/

[gentoo-commits] repo/gentoo:master commit in: x11-misc/gbase/, x11-misc/gbase/files/

[David Seifert]

commit:     2e8ad73e4d9ce3802709bfff5d7a05bd22d761e2
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  7 22:19:43 2023 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Oct  7 22:19:43 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e8ad73e

x11-misc/gbase: update EAPI 6 -> 8

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

 x11-misc/gbase/files/gbase-0.5-gtk.patch            | 21 +++++++++------------
 .../{gbase-0.5-r1.ebuild => gbase-0.5-r2.ebuild}    | 14 ++++++--------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/x11-misc/gbase/files/gbase-0.5-gtk.patch b/x11-misc/gbase/files/gbase-0.5-gtk.patch
index 4763839624af..55a1dfff9b95 100644
--- a/x11-misc/gbase/files/gbase-0.5-gtk.patch
+++ b/x11-misc/gbase/files/gbase-0.5-gtk.patch
@@ -1,25 +1,22 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -1,15 +1,15 @@
+@@ -1,15 +1,7 @@
 -CC = gcc
 -CCFLAGS = `gtk-config --cflags`
 -LDFLAGS = `gtk-config --libs`
-+CC ?= gcc
-+CFLAGS += `${PKG_CONFIG} --cflags gtk+-2.0`
-+LIBS = `${PKG_CONFIG} --libs gtk+-2.0`
++CPPFLAGS += `${PKG_CONFIG} --cflags gtk+-2.0`
++LDLIBS = `${PKG_CONFIG} --libs gtk+-2.0`
  
- gbase:	gbase.o
+-gbase:	gbase.o
 -	$(CC) gbase.o $(LDFLAGS) -o gbase
-+	$(CC) $(LDFLAGS) gbase.o $(LIBS) -o gbase
++all: gbase
  
  clean:
  	rm -f gbase gbase.o gbase.c~
- 
- # Make object files:
- %.o:
+-
+-# Make object files:
+-%.o:
 -	$(CC) $(CCFLAGS) -c $*.c
-+	$(CC) $(CFLAGS) -c $*.c
- 
+-
 -gbase.o: gbase.c
 \ No newline at end of file
-+gbase.o: gbase.c

diff --git a/x11-misc/gbase/gbase-0.5-r1.ebuild b/x11-misc/gbase/gbase-0.5-r2.ebuild
similarity index 79%
rename from x11-misc/gbase/gbase-0.5-r1.ebuild
rename to x11-misc/gbase/gbase-0.5-r2.ebuild
index e40430eebba8..c24962442fd6 100644
--- a/x11-misc/gbase/gbase-0.5-r1.ebuild
+++ b/x11-misc/gbase/gbase-0.5-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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="http://www.fluxcode.net/files/${P}.tar.gz"
 LICENSE="Artistic"
 SLOT="0"
 KEYWORDS="amd64 x86"
-
 RESTRICT="test" #424671
 
 RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=( "${FILESDIR}"/${P}-gtk.patch )
 
-src_compile() {
+src_configure() {
 	tc-export CC PKG_CONFIG
-	default
 }
 
 src_install() {
-	dobin ${PN}
+	dobin gbase
 	einstalldocs
 }