gentoo auto-resync : 16:10:2022 - 01:51:50

7 files changed, 64 insertions, 100 deletions

diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index ba8e0f9b8498..0b811d1b82a4 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/galaxis/Manifest b/games-puzzle/galaxis/Manifest
index b50f17c8769b..67bc4bb7f866 100644
--- a/games-puzzle/galaxis/Manifest
+++ b/games-puzzle/galaxis/Manifest
@@ -1,4 +1,4 @@
-AUX galaxis-1.8-gentoo.patch 1412 BLAKE2B be1f33db0ddd13a5db8dc4f7c5e7c7bd7e1311d8d9eba60b60a816bd9c7f79b7b123d8898d6ec74f696234744cea14424ed8158da02bb0810833f8450c249ea0 SHA512 110c500bdd46e7ea5fdd90bf93468e7560f9de7735b2f7b89f74ddd273d5d9afc1983891106103632429b73f3af16c667d7133987218ca7c5a7f5cceb1106301
-DIST galaxis-1.8.tar.gz 8962 BLAKE2B 3380d44ca6b168ddc71edf4e7fb61bc9a22c24cf73e1bbd4b60a87517a769f3b3b2475d64281168fe6ade7b88bbc75b3eec923cf1d26532b097d6820b14f9817 SHA512 9d4c7447827fea333ddec8a289d5d6415777379c7aab53fc2088418051f3a38c8abeceff2e8ba0472f792fac457345f2307b3f51c8366aa0b9affa37c3eee05f
-EBUILD galaxis-1.8-r1.ebuild 687 BLAKE2B dea7025d503c3ca438035d098c027d82b94e50ffcdcf049dc284318adfdf27a47574add1d87c27e95010aad5d84d874b09edfaf718fcc2f4ea1e83b63b4662a0 SHA512 fa12e3a8a2f7f4c1a91875b51c1db52970097e8646fdadfdfcafdbe1d0080276172974c812913f0a6f45fc7f41f206ca06269e94d9a50c1acb3a9d774855443a
-MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
+AUX galaxis-1.10-c2x.patch 318 BLAKE2B 33c6fb9025581b3c6390bb343e85ff734dbfd144cfa06dffd0cc07f44e12dc40e7ab39f23bf75be96990c46f24036e3d220ac6cb884f1cc0d77b9f5f953a6061 SHA512 efba622b0a740991cd3588576d57c905cc89417affc9baf32de0ec7d37c5bf2e114065a3e2c9a8017ce2b2fea87d6a02789d38201cb400c36e8e3b8ebff96444
+DIST galaxis-1.10.tar.gz 11499 BLAKE2B d18dbedbe9533de3238a6f77dc05854454afe05ceb3ad9fdcdba1b80c3a07a904e1c16932e19ca3ef769121704823a28e62c87fa7e79acc1707226db35b1b67e SHA512 cedaac1923674fdae85dd09d6c38c6a15e0c027cf520ea6d92c15f0613adbc3a3b7e1e627d19e6d8b21c93fdb8acab8236893ce179dc4e898ba7da8f256dd341
+EBUILD galaxis-1.10.ebuild 857 BLAKE2B 0aae0a116010274d75ea9b7afa001b1f596e3d5cb1d018f6f1df99f7d8bac99c88d0ade3c73778e88091cfc65572197dfe136bacb46b02a53b34954f2a1f5419 SHA512 e820a830076ce9ac080f406df1d427cbdee404748a45f9715d03b5ca0725f8a9e9f32eef255a20ab092eff0940efc5884080c46ffcaa0c145f0b1cbeb93f81f2
+MISC metadata.xml 330 BLAKE2B ec0d37289ccf55d0a4f3d33464c463286682a80226591f173744ef30baf05305434cec40b63cfee35d3e66cdd244da26678458ad736b703a7416093b6fb40156 SHA512 61da4417f3881c425974f96276d6c41a0ec38bc4abc5e73e703f457e727d66518a20fb63e8ad700682ff57fc420a459a2b1172043a5317c13df274b6c7165053
diff --git a/games-puzzle/galaxis/files/galaxis-1.10-c2x.patch b/games-puzzle/galaxis/files/galaxis-1.10-c2x.patch
new file mode 100644
index 000000000000..bdd7b9cfd95f
--- /dev/null
+++ b/games-puzzle/galaxis/files/galaxis-1.10-c2x.patch
@@ -0,0 +1,15 @@
+Early fixes for upcoming C2x.
+--- a/galaxis.c
++++ b/galaxis.c
+@@ -32,4 +32,2 @@
+ #define rand()		lrand48()
+-extern long lrand48();
+-extern void srand48();
+ #define bzero(s, n)	(void)memset((char *)(s), '\0', n)
+@@ -648,5 +646,3 @@
+ 
+-int main(argc, argv)
+-int argc;
+-char *argv[];
++int main(int argc, char *argv[])
+ {
diff --git a/games-puzzle/galaxis/files/galaxis-1.8-gentoo.patch b/games-puzzle/galaxis/files/galaxis-1.8-gentoo.patch
deleted file mode 100644
index abee05096288..000000000000
--- a/games-puzzle/galaxis/files/galaxis-1.8-gentoo.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -ru galaxis-1.8.orig/Makefile galaxis-1.8/Makefile
---- galaxis-1.8.orig/Makefile	2010-10-19 09:48:58.000000000 -0400
-+++ galaxis-1.8/Makefile	2010-10-20 04:04:49.246650551 -0400
-@@ -3,9 +3,8 @@
- VERS=$(shell sed <galaxis.spec -n -e '/Version: \(.*\)/s//\1/p')
- 
- # Flags for use with the Linux ncurses package (recommended)
--CFLAGS = -g -DNDEBUG  # -I/usr/local/include -L/usr/local/lib
-+CFLAGS += -DNDEBUG  # -I/usr/local/include -L/usr/local/lib
- TERMLIB = -lncurses
--CC = gcc
- 
- # Flags for use with stock curses
- #CFLAGS = -DNDEBUG
-@@ -13,7 +12,7 @@
- #CC = gcc
- 
- galaxis: galaxis.c
--	$(CC) $(CFLAGS) -o galaxis galaxis.c $(TERMLIB)
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o galaxis galaxis.c $(TERMLIB)
- 
- galaxis.6: galaxis.xml
- 	xmlto man galaxis.xml
-diff -ru galaxis-1.8.orig/galaxis.c galaxis-1.8/galaxis.c
---- galaxis-1.8.orig/galaxis.c	2010-10-13 06:13:31.000000000 -0400
-+++ galaxis-1.8/galaxis.c	2010-10-20 04:05:30.036888771 -0400
-@@ -8,6 +8,8 @@
- #define _POSIX_SOURCE
- 
- #include <stdio.h>
-+#include <unistd.h>
-+#include <time.h>
- #include <termios.h>
- #include <curses.h>
- #include <signal.h>
-@@ -176,6 +177,7 @@
-     (void) refresh();
- }
- 
-+#if 0
- static void error(char *s)
- {
-     (void) move(PROMPTLINE + 2, 0);
-@@ -186,6 +188,7 @@
- 	(void) beep();
-     }
- }
-+#endif
- 
- static int rnd(int n)
- {
-@@ -644,7 +647,7 @@
-     }
- }
- 
--main(argc, argv)
-+int main(argc, argv)
- int argc;
- char *argv[];
- {
diff --git a/games-puzzle/galaxis/galaxis-1.10.ebuild b/games-puzzle/galaxis/galaxis-1.10.ebuild
new file mode 100644
index 000000000000..d5baee4147e0
--- /dev/null
+++ b/games-puzzle/galaxis/galaxis-1.10.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop flag-o-matic toolchain-funcs
+
+DESCRIPTION="Curses-based clone of the nifty little Macintosh freeware game Galaxis"
+HOMEPAGE="http://www.catb.org/~esr/galaxis/"
+SRC_URI="http://www.catb.org/~esr/galaxis/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND="sys-libs/ncurses:="
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-c2x.patch
+)
+
+src_compile() {
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags ncurses || die) -DNDEBUG
+	append-libs $($(tc-getPKG_CONFIG) --libs ncurses || die)
+
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" TERMLIB="${LIBS}"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.6
+	einstalldocs
+
+	doicon ${PN}.png
+	domenu ${PN}.desktop
+}
diff --git a/games-puzzle/galaxis/galaxis-1.8-r1.ebuild b/games-puzzle/galaxis/galaxis-1.8-r1.ebuild
deleted file mode 100644
index d646f5a94a2b..000000000000
--- a/games-puzzle/galaxis/galaxis-1.8-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Curses-based clone of the nifty little Macintosh freeware game Galaxis"
-HOMEPAGE="http://www.catb.org/~esr/galaxis/"
-SRC_URI="http://www.catb.org/~esr/galaxis/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=">=sys-libs/ncurses-5.3:0="
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_compile() {
-	local PKGCONFIG="$(tc-getPKG_CONFIG)"
-	emake TERMLIB="$(${PKGCONFIG} --libs ncurses)"
-}
-
-src_install() {
-	dobin galaxis
-	doman galaxis.6
-	einstalldocs
-}
diff --git a/games-puzzle/galaxis/metadata.xml b/games-puzzle/galaxis/metadata.xml
index 1c3ba213c494..1c8dd3a77066 100644
--- a/games-puzzle/galaxis/metadata.xml
+++ b/games-puzzle/galaxis/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">esr/galaxis</remote-id>
+	</upstream>
 </pkgmetadata>