gentoo auto-resync : 08:10:2023 - 00:01:40

3 files changed, 17 insertions, 22 deletions

diff --git a/x11-misc/gbase/Manifest b/x11-misc/gbase/Manifest
index a1632b5edeaf..98f40bb437f6 100644
--- a/x11-misc/gbase/Manifest
+++ b/x11-misc/gbase/Manifest
@@ -1,4 +1,4 @@
-AUX gbase-0.5-gtk.patch 506 BLAKE2B 882ca6e7bdecf7003c5d1aea091d569ffe5e1d7bf0e20de8e448baf780dfbcf4fad6fc6dd63e070fabd3acef5a1947ca349a609fb7181f22a415e0aeefe7e2a8 SHA512 b10aa59b6a5b3a58145cae9d7483eb5c3c468c89ba602fe1cc6621250145a6a722ff362bdc552489a9dcf6abd8ec4e773e63422274505cf0112fec6938b0dc56
+AUX gbase-0.5-gtk.patch 422 BLAKE2B dc8c829349c6afd41bb1e5e77292d8807d1713f02716a5b3a014d9ac81a2a1aa424b9cd1ffdcb95141d9593d8b25345136545555138f144bb91ca6946ae60f89 SHA512 ef2aa89a16a9adf3d7660ad06658d1194136211af7e181c41ebcf8ed6c60d9a7b35332ac66a781cacb05a67cab1a4b0d7ccc8a339820c86c213e3d7fd8602c91
 DIST gbase-0.5.tar.gz 6427 BLAKE2B 0bd534b5435b93c986456db9fcace10536ab9742d1ff35fc38fe3834f81e60694006914db96511515febb76a8093774f412a40c32f626a4a86f947c5d792a0c8 SHA512 2c873317f192c0886d131ac32ef38d6371880a50ca5296ee290232dcb1ad985f90dce9678178e23e4be0d4f962f9f1a3ab2ab870810b645186f309be912abb3c
-EBUILD gbase-0.5-r1.ebuild 589 BLAKE2B 87bd3900129f7133640ae34bb6b4bff31a1340dc3b126d662cfd767ab0dc292e85ea28ad6e2c9d983f80294db8a6615aeb515b8209fc3ed625cb2fe9f3500b02 SHA512 1158b782e4f32591d1ff7c0425208146485ff194beb3a333cd87b02c6f00c4fd28f611848d40f5ae041c42bba489d5c6fd283a10111d8f92b8a1a8aa313753dc
+EBUILD gbase-0.5-r2.ebuild 590 BLAKE2B 61f596a37d152b295d3da07afc345a64eb7fabb3e3b42a6cb2fed73e53b9a44a6e552c1efed7264abccca9475032503567bd0aa63a678403f7fa9eda2fc9de8f SHA512 bfa05181fb4e71fe2e3c88b9e756b105eb8249f7d285b8c2340e481d3101a795a8bd49fe2d86fb683c19abab49a7bcab33fdb8136438cd26313c1c950449abfd
 MISC metadata.xml 277 BLAKE2B ebaa8353413cfc5519fce99f8627c71cf765fc6d42b42651e232274de315487c156d45dcb23a401dffb8f112600b0dadd56f93d2283ff86b4293dc5490ad4059 SHA512 c8ef9069153b124118a6be64375c6954ccc6f518a13805e4ff1c33c9cec136170132a580c4a9781930b709c93678c94d6448291625de34d18fea41bfd17f685d
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
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
 }