gentoo auto-resync : 20:02:2023 - 02:17:29

4 files changed, 53 insertions, 35 deletions

diff --git a/x11-terms/yeahconsole/Manifest b/x11-terms/yeahconsole/Manifest
index 5252f351643c..9ca705a3ffd0 100644
--- a/x11-terms/yeahconsole/Manifest
+++ b/x11-terms/yeahconsole/Manifest
@@ -1,4 +1,5 @@
-AUX yeahconsole-0.3.4-make.patch 769 BLAKE2B 23f6aed2c70340e4d007f5ffc8ff986c3063f51d851fc42f8605fefc9d735bf39eb8ce8d3ad87dd1d5d8fbf30d077f0c944c903790df76f9ad41a50c5931ab6a SHA512 e78ace16e451fabe508ff9e6b691ae215b626a1b16868d44f958801c01278b15921cd8a187d454dd685a75eea8b798cd00e71ae024d83c43918104c43cf1a58f
+AUX yeahconsole-0.3.4-C99-decls.patch 178 BLAKE2B 216a576228dd72d81bbae6f10ea8d5ee41b887af824d99c6636e33d8c9334599539bb45c85b73734f839d2d9a95f5b919ea35c4ab447d7316893ef5d1e502a0c SHA512 4511fe5ea71c758cf756b07b85cb9d0140ca92a2c88e4d66a157e5894ed9e43021d144af58c01ec1d43f4c642d7bc7b054cad1d873dafb30c2ec707d0b846613
+AUX yeahconsole-0.3.4-make.patch 910 BLAKE2B 6d10a4c6a837b1f567c1edc304181036ed9bcc2730a206c38a5f640405b9e4789791fe9917518acdb0229eaac213b1923058ba39e6e0d5950d3c7616154cffa6 SHA512 8f78a0c1be5561256086f3c9451f19f319c002b106bba0dff54aecf4e12ce8795c0dc85db859ecdd5ecfc8c7ea974f3510ad4e869c0da893442ecda750cbf67d
 DIST yeahconsole-0.3.4.tar.gz 12281 BLAKE2B d53ca2a5000a0b166f23195a6d4febcae96a0b91c03ea2d60c9a2a82bfef65222431bcdf717e10e3b83d3ed2387d3ea5ce746b22d3af209fcfb8939935d00996 SHA512 cba74d988b3cb991d95de1796e9e79b881fe011d4fc8d6aa1f863f4c465aadfd31250e57d36ce0118dfc367225c2861cf8e80ac47996c2718d83756a8e638ead
-EBUILD yeahconsole-0.3.4-r1.ebuild 784 BLAKE2B 3f5d5a9fb59e6e7e6c119767f9d1aa0706224f66974a78f5e1c9e9686246dac22e11f57dc74c3b02e224a029fb2c3f3e49909242b5dca07f24b6e084f2832a53 SHA512 9917cde983676601a94d0a1b1695fff77128732c6ee0436089700ab28231997a5776f9aad85a73d9e0d6b4a3f200d8a46e8aebb6b691d0dd20c86bb7547ed705
+EBUILD yeahconsole-0.3.4-r2.ebuild 771 BLAKE2B e373e92ea0584812a6417c37999f16cd39dec2a0b1036e09c9cc04e0a23a452da33b88b24506d59036fd5f03dbbe5c84b929cb83e21edc9087825e55c38c4359 SHA512 60e97747806e5466387bcacf7324ec8b9e0c3f0feeeade19c5010545a419c639e9087c6c44a60bd7241e38824cb199b13a5b189fe5f0b1df66183567ac547066
 MISC metadata.xml 252 BLAKE2B ed5f11ce8c4de4fde4020b83dc772d6b47192ea5617cacf05adf13ab5a29923858b2969ed9dc26e75194cb972d41ffceee40856e6f955f42039693af96ebb2e4 SHA512 7f9b5cf205b6500eb65742c67963c3c6c375fa05c7eb094037fb9950d9d2840930e8b4d3ef76c948ddf7f37005012be51c8217c758a615dd7e128c80b6b1db28
diff --git a/x11-terms/yeahconsole/files/yeahconsole-0.3.4-C99-decls.patch b/x11-terms/yeahconsole/files/yeahconsole-0.3.4-C99-decls.patch
new file mode 100644
index 000000000000..a6e5fb5f64c3
--- /dev/null
+++ b/x11-terms/yeahconsole/files/yeahconsole-0.3.4-C99-decls.patch
@@ -0,0 +1,11 @@
+--- a/yeahconsole.c
++++ b/yeahconsole.c
+@@ -340,7 +340,7 @@
+     XMapWindow(dpy, win);
+ }
+ 
+-void init_xterm(move)
++void init_xterm(int move)
+ {
+     XEvent ev;
+     long dummy;
diff --git a/x11-terms/yeahconsole/files/yeahconsole-0.3.4-make.patch b/x11-terms/yeahconsole/files/yeahconsole-0.3.4-make.patch
index 0075c433292b..1d1a403e6b12 100644
--- a/x11-terms/yeahconsole/files/yeahconsole-0.3.4-make.patch
+++ b/x11-terms/yeahconsole/files/yeahconsole-0.3.4-make.patch
@@ -1,30 +1,41 @@
---- a/Makefile	2006-01-14 16:54:05.000000000 +0100
-+++ b/Makefile	2009-02-26 16:18:25.000000000 +0100
-@@ -1,6 +1,4 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,30 +1,21 @@
  TARGET = yeahconsole
 -CC = gcc
 -#CC = cc
  INSTALL = install
  
- PREFIX = /usr/local
-@@ -8,17 +6,16 @@
- LIBS = -lX11 
- INCLUDES = -I/usr/X11R6/include 
- LIB_DIRS = -L/usr/X11R6/lib
--FLAGS = -Os -Wall
-+FLAGS = -Wall $(CFLAGS)
- 
- OBJECTS := yeahconsole.o
- SOURCES := yeahconsole.c
+-PREFIX = /usr/local
++PREFIX = $(EPREFIX)/usr
  
- $(TARGET): $(OBJECTS) 
+-LIBS = -lX11 
+-INCLUDES = -I/usr/X11R6/include 
+-LIB_DIRS = -L/usr/X11R6/lib
+-FLAGS = -Os -Wall
+-
+-OBJECTS := yeahconsole.o
+-SOURCES := yeahconsole.c
+-
+-$(TARGET): $(OBJECTS) 
 -	$(CC) $(DEFINES) $(INCLUDES) $(LIB_DIRS) $(LIBS) -o $@ $<
 -	strip $@
-+	$(CC) $(FLAGS) $(LDFLAGS) $(DEFINES) $(INCLUDES) $(LIB_DIRS) -o $@ $< $(LIBS)
++PKG_CONFIG ?= pkg-config
++CFLAGS += -Wall
++CPPFLAGS += $(shell $(PKG_CONFIG) --cflags x11)
++LDLIBS += $(shell $(PKG_CONFIG) --libs x11)
  
- $(OBJECTS): $(SOURCES) 
+-$(OBJECTS): $(SOURCES) 
 -	$(CC) $(FLAGS)  $(DEFINES) $(INCLUDES) $(LIB_DIRS) -c -o $@ $<
-+	$(CC) $(FLAGS) $(DEFINES) $(INCLUDES) $(LIB_DIRS) -c -o $@ $<
++all: $(TARGET)
  
  clean:
  	rm -rf $(TARGET) $(OBJECTS)
+ 
+ install: $(TARGET) $(MAN)
+-	$(INSTALL) -o root -g root -m 0755 $(TARGET) $(PREFIX)/bin
++	$(INSTALL) -d $(DESTDIR)$(PREFIX)/bin
++	$(INSTALL) -o root -g root -m 0755 $(TARGET) $(DESTDIR)$(PREFIX)/bin
+ 	
+ 
+ uninstall:
diff --git a/x11-terms/yeahconsole/yeahconsole-0.3.4-r1.ebuild b/x11-terms/yeahconsole/yeahconsole-0.3.4-r2.ebuild
index c8e1f6f147a0..abf927e9c380 100644
--- a/x11-terms/yeahconsole/yeahconsole-0.3.4-r1.ebuild
+++ b/x11-terms/yeahconsole/yeahconsole-0.3.4-r2.ebuild
@@ -1,7 +1,8 @@
-# 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 toolchain-funcs
 
 DESCRIPTION="yeahconsole turns an xterm or rxvt-unicode into a game-like console"
@@ -11,26 +12,20 @@ SRC_URI="http://phrat.de/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ~riscv x86"
-RDEPEND="
-	x11-libs/libX11
-"
+
+RDEPEND="x11-libs/libX11"
 DEPEND="
 	${RDEPEND}
-	x11-base/xorg-proto
-"
+	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
+
 PATCHES=(
 	"${FILESDIR}"/${P}-make.patch
+	"${FILESDIR}"/${P}-C99-decls.patch
 )
 
-src_compile() {
-	tc-export CC
-	emake
-}
-
-src_install() {
-	dodir /usr/bin
-	emake PREFIX="${D}"/usr install
-	dodoc README
+src_configure() {
+	tc-export CC PKG_CONFIG
 }
 
 pkg_postinst() {