diff options
Diffstat (limited to 'games-arcade')
490 files changed, 7407 insertions, 6042 deletions
diff --git a/games-arcade/abe/Manifest b/games-arcade/abe/Manifest index 0c3cc51f301a..98c62e38d0f4 100644 --- a/games-arcade/abe/Manifest +++ b/games-arcade/abe/Manifest @@ -1 +1,2 @@ DIST abe-1.1.tar.gz 3321075 BLAKE2B 2ab51bd9103e8954bbc27eceb81b4bb845ec84ee249f21aaefdc59df87689f865d3b62a8c2db9584b8361303028174b1a96b60e0caf88ee857f8ad0d3cd3d920 SHA512 6106fce9c72554596ac3f94551326381e98c0d40f7a5aa8ae7aeadaa234c113733e8df717bd1b18d2ba835f689982e859607c9d88ab2d59790ec00833a4e48c7 +DIST abe.png 3303 BLAKE2B a99f8a1c31b9f8704b201ca9edd7ab67b685bde4bd43f675e62f1ba3a5554a63dba009634cdc63a2855a51f82de8ea2818bfe5f390b2f9e176d55cd4476547b6 SHA512 421d87248d91bb315d9d02955271cad096c842857819fc7a91ad77571047770eb9487722cb1b2e43d602ad61e3c7eca4fd834e955724905b8b870a5dd66d2e2b diff --git a/games-arcade/abe/abe-1.1-r1.ebuild b/games-arcade/abe/abe-1.1-r1.ebuild deleted file mode 100644 index 9e2dbd751738..000000000000 --- a/games-arcade/abe/abe-1.1-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit desktop toolchain-funcs - -DESCRIPTION="A scrolling, platform-jumping, key-collecting, ancient pyramid exploring game" -HOMEPAGE="http://abe.sourceforge.net/" -SRC_URI="mirror://sourceforge/abe/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="media-libs/libsdl[sound,video] - x11-libs/libXi - media-libs/sdl-mixer[vorbis]" -RDEPEND=${DEPEND} - -src_unpack() { - unpack ${A} - cd "${S}" - unpack ./images/images.tar -} - -PATCHES=( - # From Fedora: - # Enable changing the video settings. Sent upstream 2 Apr 2006: - # https://sourceforge.net/p/abe/bugs/1/ - "${FILESDIR}"/${P}-settings.patch - - # Fix a double free() bug. Sent upstream 15 Mar 2011: - # https://sourceforge.net/p/abe/patches/1/ - "${FILESDIR}"/${P}-doublefree.patch - - # Fix an incorrect printf format specifier. Sent upstream 15 Mar 2011: - # https://sourceforge.net/p/abe/patches/2/ - "${FILESDIR}"/${P}-format.patch - - # Fix build failure with -Werror=format-security - "${FILESDIR}"/${P}-format-security.patch -) - -src_prepare() { - default - sed -i \ - -e "/^TR_CFLAGS/d" \ - -e "/^TR_CXXFLAGS/d" \ - configure || die -} - -src_configure() { - econf --with-data-dir=/usr/share/${PN} -} - -src_install() { - dobin src/abe - insinto /usr/share/${PN} - doins -r images sounds maps - newicon tom1.bmp abe.bmp - make_desktop_entry abe "Abe's Amazing Adventure" /usr/share/pixmaps/abe.bmp - einstalldocs -} diff --git a/games-arcade/abe/abe-1.1-r2.ebuild b/games-arcade/abe/abe-1.1-r2.ebuild new file mode 100644 index 000000000000..a833efa73b21 --- /dev/null +++ b/games-arcade/abe/abe-1.1-r2.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools desktop toolchain-funcs + +DESCRIPTION="Scrolling, platform-jumping, key-collecting, ancient pyramid exploring game" +HOMEPAGE=" + https://abe.sourceforge.net/ + https://github.com/OSSGames/GAME-SDL-ADVENTURE-Abe-s_Amazing_Adventure +" +SRC_URI=" + mirror://sourceforge/abe/${P}.tar.gz + https://dev.gentoo.org/~ionen/distfiles/${PN}.png" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + media-libs/libsdl[sound,video] + media-libs/sdl-mixer[vorbis] +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-settings.patch + "${FILESDIR}"/${P}-doublefree.patch + "${FILESDIR}"/${P}-format.patch + "${FILESDIR}"/${P}-format-security.patch + "${FILESDIR}"/${P}-no-x-check.patch +) + +src_prepare() { + default + + sed -i '/^TR_CFLAGS/d;/^TR_CXXFLAGS/d' configure.in || die + + # original configure contains problematic detections with modern compilers + # see #883287, #898794 + eautoreconf +} + +src_configure() { + tc-export CC CXX + + econf --with-data-dir="${EPREFIX}"/usr/share/${PN} +} + +src_install() { + dobin src/${PN} + + insinto /usr/share/${PN} + doins -r images maps sounds + + einstalldocs + + doicon "${DISTDIR}"/${PN}.png + make_desktop_entry ${PN} "Abe's Amazing Adventure" +} diff --git a/games-arcade/abe/files/abe-1.1-doublefree.patch b/games-arcade/abe/files/abe-1.1-doublefree.patch index ce7389d97100..82d49031844c 100644 --- a/games-arcade/abe/files/abe-1.1-doublefree.patch +++ b/games-arcade/abe/files/abe-1.1-doublefree.patch @@ -1,5 +1,7 @@ ---- a/src/Main.c.orig 2005-03-05 09:20:04.000000000 -0700 -+++ b/src/Main.c 2011-03-14 10:08:31.846413904 -0600 +Fix a double free() bug. Sent upstream 15 Mar 2011: +https://sourceforge.net/p/abe/patches/1/ +--- a/src/Main.c ++++ b/src/Main.c @@ -35,8 +35,6 @@ for(i = 0; modes[i]; ++i) printf("\t%d x %d\n", modes[i]->w, modes[i]->h); diff --git a/games-arcade/abe/files/abe-1.1-format-security.patch b/games-arcade/abe/files/abe-1.1-format-security.patch index ad88b4b60486..9f98b080f53d 100644 --- a/games-arcade/abe/files/abe-1.1-format-security.patch +++ b/games-arcade/abe/files/abe-1.1-format-security.patch @@ -1,5 +1,6 @@ ---- ./src/Game.c.orig 2005-03-05 09:20:04.000000000 -0700 -+++ ./src/Game.c 2013-11-20 12:30:00.000000000 -0700 +Fix build failure with -Werror=format-security +--- ./src/Game.c ++++ ./src/Game.c @@ -6,21 +6,14 @@ Game game; // path_sprintf should not be used by other .c files, as it does not fit for them. diff --git a/games-arcade/abe/files/abe-1.1-format.patch b/games-arcade/abe/files/abe-1.1-format.patch index 529534745712..eed86f83483d 100644 --- a/games-arcade/abe/files/abe-1.1-format.patch +++ b/games-arcade/abe/files/abe-1.1-format.patch @@ -1,5 +1,7 @@ ---- a/src/MapIO.c.orig 2005-03-05 09:20:04.000000000 -0700 -+++ b/src/MapIO.c 2011-03-14 10:15:33.166949366 -0600 +Fix an incorrect printf format specifier. Sent upstream 15 Mar 2011: +https://sourceforge.net/p/abe/patches/2/ +--- a/src/MapIO.c ++++ b/src/MapIO.c @@ -93,7 +93,7 @@ // compression step 1: read compressed data from disk // FIXME: what would be nicer is to only allocate as much mem as used on disk. diff --git a/games-arcade/abe/files/abe-1.1-no-x-check.patch b/games-arcade/abe/files/abe-1.1-no-x-check.patch new file mode 100644 index 000000000000..a02eaa4b898c --- /dev/null +++ b/games-arcade/abe/files/abe-1.1-no-x-check.patch @@ -0,0 +1,29 @@ +Remove check for X. + +The game uses only SDL library. There is no need to check for X. + +diff --git a/configure.in b/configure.in +index 2270cb4..f0a93c6 100644 +--- a/configure.in ++++ b/configure.in +@@ -98,17 +98,6 @@ if test "x$is_win32" = "xyes" ; then + TR_LIBS="$TR_LIBS -luser32 -lgdi32" + fi + +-dnl -------------------------------------------------------------------------- +-dnl Check for X +-dnl Note that we only need libs (so that glut links properly on all systems). +-dnl -------------------------------------------------------------------------- +-if test "x$is_win32" = "xno" ; then +- AC_PATH_XTRA +- if test "x$no_x" = "x" ; then +- TR_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXi -lXext -lXmu -lXt $X_EXTRA_LIBS $TR_LIBS" +- fi +-fi +- + dnl -------------------------------------------------------------------------- + dnl Check for some common libraries + dnl -------------------------------------------------------------------------- +-- +2.41.0 + diff --git a/games-arcade/abe/files/abe-1.1-settings.patch b/games-arcade/abe/files/abe-1.1-settings.patch index ea5809f7386a..c0471a03388a 100644 --- a/games-arcade/abe/files/abe-1.1-settings.patch +++ b/games-arcade/abe/files/abe-1.1-settings.patch @@ -1,6 +1,8 @@ -diff -Naur --exclude '*.swp' abe-1.1/src/Menu.c abe-1.1.new/src/Menu.c ---- abe-1.1/src/Menu.c 2005-03-05 08:20:04.000000000 -0800 -+++ abe-1.1.new/src/Menu.c 2006-04-02 15:04:37.000000000 -0700 +From Fedora: +Enable changing the video settings.Sent upstream 2 Apr 2006: +https://sourceforge.net/p/abe/bugs/1/ +--- a/src/Menu.c ++++ b/src/Menu.c @@ -116,7 +116,7 @@ if(n == SOUND_ENABLED || n == MUSIC_ENABLED) return sound_loaded; diff --git a/games-arcade/abe/metadata.xml b/games-arcade/abe/metadata.xml index e9edf695246f..850b37f9125e 100644 --- a/games-arcade/abe/metadata.xml +++ b/games-arcade/abe/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> <upstream> + <remote-id type="github">OSSGames/GAME-SDL-ADVENTURE-Abe-s_Amazing_Adventure</remote-id> <remote-id type="sourceforge">abe</remote-id> </upstream> </pkgmetadata> diff --git a/games-arcade/afternoonstalker/Manifest b/games-arcade/afternoonstalker/Manifest index 275ab4cd7d35..ddb94dca66bd 100644 --- a/games-arcade/afternoonstalker/Manifest +++ b/games-arcade/afternoonstalker/Manifest @@ -1 +1 @@ -DIST afternoonstalker-1.1.5.tar.gz 202663 BLAKE2B 1572e5fa2b7ac0c9e24897cd8e31333c1a1819fc36576a3410cbb2ab6676ee505182dc71dd97e65ccaaff8218c470065bdc942a380aafb506f4c0032d4325df4 SHA512 ff08cc72385deddfaffabf98c3cc67f72f8c6db77de1feb4e19d2d3dcf6ca1018a71d6e052d2e2373dc758e119a4c068a3f4195cb6fbf1b01900bdedf193a7e0 +DIST afternoonstalker-1.1.6.tar.gz 186724 BLAKE2B 2915e1ff11f0cdf392a94d515541c25082afbe62547c90a49cdc39ab01bc234ac8098394905a0d1ce3d3a550b5c5096fd64f76db2d8d62b510822a0a59ae8cf6 SHA512 4d823abc5f939bc6322729548abb0adc43b56b5d5e035578f15084f4e8f6ce80bd7b7dc3ffbe71530975b7c02962ea93405e2ad13de8a50303ccfdde543cd6c7 diff --git a/games-arcade/afternoonstalker/afternoonstalker-1.1.5-r1.ebuild b/games-arcade/afternoonstalker/afternoonstalker-1.1.5-r1.ebuild deleted file mode 100644 index acc061abc505..000000000000 --- a/games-arcade/afternoonstalker/afternoonstalker-1.1.5-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools - -DESCRIPTION="Clone of the 1981 Night Stalker video game by Mattel Electronics" -HOMEPAGE="https://perso.b2b2c.ca/~sarrazip/dev/afternoonstalker.html" -SRC_URI="https://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-games/flatzebra-0.1.6" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -src_prepare() { - default - sed -i \ - -e "/^pkgsounddir/ s:sounds.*:\$(PACKAGE)/sounds:" \ - -e "/^desktopentrydir/ s:=.*:=/usr/share/applications:" \ - -e "/^pixmapdir/ s:=.*:=/usr/share/pixmaps:" \ - src/Makefile.am || die - eautoreconf -} - -src_install() { - emake -C src DESTDIR="${D}" install - doman doc/${PN}.6 - einstalldocs -} diff --git a/games-arcade/afternoonstalker/afternoonstalker-1.1.6.ebuild b/games-arcade/afternoonstalker/afternoonstalker-1.1.6.ebuild new file mode 100644 index 000000000000..8968417bb1e6 --- /dev/null +++ b/games-arcade/afternoonstalker/afternoonstalker-1.1.6.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="Clone of the 1981 Night Stalker video game by Mattel Electronics" +HOMEPAGE="http://perso.b2b2c.ca/~sarrazip/dev/afternoonstalker.html" +SRC_URI="http://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=">=dev-games/flatzebra-0.1.6" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/${PN}-1.1.6-autotools.patch ) + +src_prepare() { + default + eautoreconf +} diff --git a/games-arcade/afternoonstalker/files/afternoonstalker-1.1.6-autotools.patch b/games-arcade/afternoonstalker/files/afternoonstalker-1.1.6-autotools.patch new file mode 100644 index 000000000000..a7c5bc9fe590 --- /dev/null +++ b/games-arcade/afternoonstalker/files/afternoonstalker-1.1.6-autotools.patch @@ -0,0 +1,41 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,17 +2,16 @@ + + SUBDIRS = src + +-man_MANS = doc/$(PACKAGE).6 ++man_MANS = doc/afternoonstalker.6 + +-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION) + doc_DATA = \ + AUTHORS \ +- COPYING \ + NEWS \ + README \ + THANKS + + EXTRA_DIST = \ ++ COPYING \ + bootstrap \ + autogen.sh \ + $(PACKAGE).spec \ +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -114,13 +114,13 @@ + images/digit8.xpm \ + images/digit9.xpm + +-desktopentrydir = $(datadir)/applications ++desktopentrydir = $(datarootdir)/applications + desktopentry_DATA = $(PACKAGE).desktop + +-pixmapdir = $(datadir)/pixmaps ++pixmapdir = $(datarootdir)/pixmaps + pixmap_DATA = images/$(PACKAGE).png + +-pkgsounddir = $(datadir)/sounds/$(PACKAGE) ++pkgsounddir = $(pkgdatadir)/sounds + pkgsound_DATA = \ + sounds/gun-pickup.wav \ + sounds/bat-killed.wav \ diff --git a/games-arcade/afternoonstalker/metadata.xml b/games-arcade/afternoonstalker/metadata.xml index 418dc79f8c64..1c3ba213c494 100644 --- a/games-arcade/afternoonstalker/metadata.xml +++ b/games-arcade/afternoonstalker/metadata.xml @@ -1,12 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> -<longdescription lang="en"> -Afternoon Stalker, a clone of the 1981 Night Stalker video game by Mattel -Electronics. -</longdescription> </pkgmetadata> diff --git a/games-arcade/alienwave/alienwave-0.4.0-r1.ebuild b/games-arcade/alienwave/alienwave-0.4.0-r2.ebuild index ae1536797605..55f4f0182698 100644 --- a/games-arcade/alienwave/alienwave-0.4.0-r1.ebuild +++ b/games-arcade/alienwave/alienwave-0.4.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,8 +14,8 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND="sys-libs/ncurses:0" -RDEPEND=${DEPEND} +DEPEND="sys-libs/ncurses:0=" +RDEPEND="${DEPEND}" BDEPEND="virtual/pkgconfig" S="${WORKDIR}/${PN}" diff --git a/games-arcade/alienwave/metadata.xml b/games-arcade/alienwave/metadata.xml index 26079e608bed..7c730d47817a 100644 --- a/games-arcade/alienwave/metadata.xml +++ b/games-arcade/alienwave/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/amphetamine/Manifest b/games-arcade/amphetamine/Manifest index a4a47b6f7268..d1332c2d993f 100644 --- a/games-arcade/amphetamine/Manifest +++ b/games-arcade/amphetamine/Manifest @@ -1,2 +1,3 @@ DIST amphetamine-0.8.10.tar.bz2 72324 BLAKE2B 39d8f56066e7fbad853198be28375dfe7ee766d7c493a6faf0e2fa321ee2d2d757f5f294418208ac97a440d58bae03d40de2615e421bb8e9fad7a8ba5220d354 SHA512 eb3106df6070e207ffb3293ac4701bba8222603c0e399667505bad29b6f6433dc9ec008499b5180f713a724d3b686fead15536a20927195bc57780be16a860ef -DIST amphetamine-data-0.8.6.tar.bz2 928775 BLAKE2B 078de623c719ebaedae3137fe3876ecd7ba02ad7ec44a64b7775fd173a42b399d137a3862d3fe426780a234638b0876a1f0fc5a06d6ab8f4b3c4ca66df367a49 SHA512 0feb86f420b4816064594756bb30bb6e02ae5062f03ef175b3262a8f30043340933f6f1b1894e2b2cfad70befc76d3ed1e0d2777c2dc2f7461459e8a93efeaf1 +DIST amphetamine-data_0.8.7.orig.tar.gz 955993 BLAKE2B ad14f36ac1d41b9c4ce7dccb9676a562b07400e2d3bf4303e6fbc18fa385453891da35bdcbbf73331989a65379a68329752b0d550951430c2777a3174db8df8f SHA512 623f5c4d02157f55188f4f7f0ea743b613ac846f56fa80c7b875488384341cb6737beecd2ea2322219ff2ff306e1588350e80bf3bcbd0891a3ce0fd514f142e7 +DIST amphetamine.png 95279 BLAKE2B 6403bb35883ce62f672ee3a3859eb580784c8fd5b068a116c6e3606be27893288205011cba5e9b83f2989d7471a65c13789e44acf5905fdf23402bf065f92c31 SHA512 c7698973e0d656187bebb070a1a76669d71d0025b5dc1e53adf221d934db5aac926897b52db257435168d74b622ed83d6fa6938984ec06682fbd9bd08f64521c diff --git a/games-arcade/amphetamine/amphetamine-0.8.10-r1.ebuild b/games-arcade/amphetamine/amphetamine-0.8.10-r2.ebuild index 608047e72a0a..ac1c0dde9fb1 100644 --- a/games-arcade/amphetamine/amphetamine-0.8.10-r1.ebuild +++ b/games-arcade/amphetamine/amphetamine-0.8.10-r2.ebuild @@ -1,14 +1,15 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit desktop DESCRIPTION="A cool Jump'n Run game offering some unique visual effects" HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" SRC_URI=" mirror://gentoo/${P}.tar.bz2 - mirror://gentoo/${PN}-data-0.8.6.tar.bz2 + mirror://debian/pool/main/a/amphetamine-data/amphetamine-data_0.8.7.orig.tar.gz + https://dev.gentoo.org/~pacho/${PN}/${PN}.png " LICENSE="GPL-2" @@ -21,6 +22,7 @@ RDEPEND=" x11-libs/libXpm " DEPEND="${RDEPEND}" +BDEPEND="" PATCHES=( "${FILESDIR}"/${P}-build.patch @@ -31,6 +33,11 @@ PATCHES=( "${FILESDIR}"/${P}-bugs.patch "${FILESDIR}"/${P}-missing-headers.patch "${FILESDIR}"/${P}-newline.patch + "${FILESDIR}"/${P}-format-string.patch + + # From OpenBSD: + "${FILESDIR}"/${P}-SDL-conversions.patch + "${FILESDIR}"/${P}-clang.patch ) src_prepare() { @@ -46,7 +53,7 @@ src_install() { newbin amph ${PN} insinto /usr/share/${PN} doins -r ../amph/* - newicon amph.xpm ${PN}.xpm + doicon "${DISTDIR}/${PN}.png" make_desktop_entry ${PN} Amphetamine ${PN} einstalldocs } diff --git a/games-arcade/amphetamine/files/amphetamine-0.8.10-SDL-conversions.patch b/games-arcade/amphetamine/files/amphetamine-0.8.10-SDL-conversions.patch new file mode 100644 index 000000000000..7182eb7acfd0 --- /dev/null +++ b/games-arcade/amphetamine/files/amphetamine-0.8.10-SDL-conversions.patch @@ -0,0 +1,22 @@ +--- a/src/SndSys.cpp.orig Sun Mar 24 00:49:09 2002 ++++ b/src/SndSys.cpp Sat Jan 24 04:52:38 2009 +@@ -16,7 +16,7 @@ void Mix_Audio(void *udata, Uint8 *stream, int len) + + int InitializeSoundSystem() + { +- SDL_AudioSpec wanted, obtained; ++ SDL_AudioSpec wanted; + + /* Set the audio format */ + // Not all sounds are of the same sampling rate which is why +@@ -28,8 +28,8 @@ int InitializeSoundSystem() + wanted.callback = Mix_Audio; + wanted.userdata = NULL; + +- /* Open the audio device, forcing the desired format */ +- if ( SDL_OpenAudio(&wanted, &obtained) < 0 ) { ++ /* Open the audio device, allowing SDL to apply conversions */ ++ if ( SDL_OpenAudio(&wanted, NULL) < 0 ) { + fprintf(stderr, "InitSoundSystem: Couldn't open audio: %s\n", SDL_GetError()); + fprintf(stderr, "Sound was disabled. \n"); + return(-1); diff --git a/games-arcade/amphetamine/files/amphetamine-0.8.10-clang.patch b/games-arcade/amphetamine/files/amphetamine-0.8.10-clang.patch new file mode 100644 index 000000000000..d3fcbfdcabff --- /dev/null +++ b/games-arcade/amphetamine/files/amphetamine-0.8.10-clang.patch @@ -0,0 +1,18 @@ +Index: src/Element.cpp +--- a/src/Element.cpp.orig ++++ b/src/Element.cpp +@@ -279,7 +279,13 @@ CBackgroundElement::CBackgroundElement(short initx, sh + + void CBackgroundElement::OnAllocate() + { +- short params[5] = {-1, xs, ys, xe - xs, ye - ys}; ++ short params[5] = { ++ -1, ++ static_cast<short>(xs), ++ static_cast<short>(ys), ++ static_cast<short>(xe - xs), ++ static_cast<short>(ye - ys) ++ }; + unsigned char *tmpBmp; + + tmpBmp = gShapeManager->GetBackground(params[1], params[2]); diff --git a/games-arcade/amphetamine/files/amphetamine-0.8.10-format-string.patch b/games-arcade/amphetamine/files/amphetamine-0.8.10-format-string.patch new file mode 100644 index 000000000000..50e235a66a85 --- /dev/null +++ b/games-arcade/amphetamine/files/amphetamine-0.8.10-format-string.patch @@ -0,0 +1,11 @@ +description: fix a format string issue +--- a/src/AmpHead.hpp ++++ b/src/AmpHead.hpp +@@ -183,6 +183,6 @@ typedef struct { + #define SWAP(a, b, _t) (a) = (_t)((long)a ^ (long)(b)); (b) = (_t)((long)(a) ^ (long)(b)); (a) = (_t)((long)(a) ^ (long)(b)); + #define NZ(a, b) ((a) == 0 ? (b) : (a)) + +-#define MSG(message) if (logFile) fprintf(logFile, message); fflush(logFile) ++#define MSG(message) if (logFile) fprintf(logFile, "%s", message); fflush(logFile) + + #endif diff --git a/games-arcade/amphetamine/metadata.xml b/games-arcade/amphetamine/metadata.xml index 204e28ed3b7a..1c3ba213c494 100644 --- a/games-arcade/amphetamine/metadata.xml +++ b/games-arcade/amphetamine/metadata.xml @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> -<longdescription lang="en"> -Amphetamine is a cool Jump'n Run game offering some unique visual effects. -</longdescription> </pkgmetadata> diff --git a/games-arcade/aop/aop-0.6-r1.ebuild b/games-arcade/aop/aop-0.6-r2.ebuild index c5edb52f234a..2f52e08067cd 100644 --- a/games-arcade/aop/aop-0.6-r1.ebuild +++ b/games-arcade/aop/aop-0.6-r2.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="Ambassador of Pain is a curses based game with only 64 lines of code" HOMEPAGE="http://raffi.at/view/code/aop" @@ -10,23 +12,30 @@ SRC_URI="http://www.raffi.at/code/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc64 ~x86" -IUSE="" RDEPEND="sys-libs/ncurses:0" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-as-needed.patch +) src_prepare() { default + + tc-export CC PKG_CONFIG + sed -i \ - -e "s#/usr/local/share#${GAMES_DATADIR}#" \ + -e "s#/usr/local/share#/usr/share/${PN}#" \ aop.c || die - eapply "${FILESDIR}"/${P}-as-needed.patch } src_install() { dobin aop - insinto "/usr/shate/${PN}" + + insinto /usr/share/${PN} doins aop-level-*.txt + einstalldocs } diff --git a/games-arcade/aop/files/aop-0.6-as-needed.patch b/games-arcade/aop/files/aop-0.6-as-needed.patch index f172919553b4..85934f30b062 100644 --- a/games-arcade/aop/files/aop-0.6-as-needed.patch +++ b/games-arcade/aop/files/aop-0.6-as-needed.patch @@ -1,9 +1,9 @@ ---- a/Makefile.old 2009-01-30 17:00:58.000000000 +0100 -+++ b/Makefile 2009-01-30 17:01:15.000000000 +0100 +--- a/Makefile ++++ b/Makefile @@ -1,5 +1,5 @@ -LDFLAGS = -lncurses -+LDLIBS := $(shell pkg-config ncurses --libs) ++LDLIBS := $(shell ${PKG_CONFIG} ncurses --libs) aop: aop.c diff --git a/games-arcade/aop/metadata.xml b/games-arcade/aop/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/aop/metadata.xml +++ b/games-arcade/aop/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/apricots/Manifest b/games-arcade/apricots/Manifest index aca5a7158470..777ad348f175 100644 --- a/games-arcade/apricots/Manifest +++ b/games-arcade/apricots/Manifest @@ -1 +1,2 @@ -DIST apricots-0.2.6.tar.gz 768568 BLAKE2B 82fa6d4be5f1a9ed86e968a4645822cbf558ea37df956d54d0f07e3260ca2e7ff561ae6ea357dabb2c35b7bfd4ff0d806dda5cf51cbb3a956ebdba52f6ef526a SHA512 cf8a988d316382469e4b13a86315c760b702b3d490398cf2fe96f119ba743c1ff707c09228dbbf4eb601189fece708913a621b04c44e9d93162639ccbd502cf5 +DIST apricots-0.2.7.tar.gz 388024 BLAKE2B 5d16cb2637580ae728aa4f1b3911801effa6c79faabf7f3a1c026de8d91aaa582c8063ae33152c44fc9878ae0f7126fdb6ab0363b562e90c7359bcfe6ac78391 SHA512 7f97759402703962f660cdf609f50bb9a4465cc727d3fd17751eb5863b0b9131d9014eab50632c1638130f7e4223c89c45c12cecbc9fe2639943def2ce80ae25 +DIST apricots.png 1965 BLAKE2B 164e06ec9856273077636b347cac555cc49f5f38faffeea6f43b9032edee9dfebedce24470f70b185707ee2e467d861164a9c90c370ada5ff89d5c4854b99e7c SHA512 5d637707d7cfa775e5f3d3416a51abbbb39369cf0bfd9be871295ca3079530c25b893076c2cb6a6621586d67860920e079cb4f491d2c67ff13ce80e56a2cf4e5 diff --git a/games-arcade/apricots/apricots-0.2.6-r2.ebuild b/games-arcade/apricots/apricots-0.2.6-r2.ebuild deleted file mode 100644 index 32117603fb82..000000000000 --- a/games-arcade/apricots/apricots-0.2.6-r2.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools desktop - -DESCRIPTION="Fly a plane around bomb/shoot the enemy. Port of Planegame from Amiga" -HOMEPAGE="http://www.fishies.org.uk/apricots.html" -SRC_URI="http://www.fishies.org.uk/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="media-libs/libsdl[sound,video] - media-libs/openal - media-libs/freealut" -RDEPEND="${DEPEND}" - -src_prepare() { - default - - eapply "${FILESDIR}"/${P}-freealut.patch \ - "${FILESDIR}"/${P}-ldflags.patch - - cp admin/acinclude.m4.in acinclude.m4 - - sed -i \ - -e 's:-DAP_PATH=\\\\\\"$prefix.*":-DAP_PATH=\\\\\\"/usr/share/${PN}/\\\\\\"":' \ - -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \ - configure.in || die - sed -i \ - -e "s:filename(AP_PATH):filename(\"/etc/${PN}/\"):" \ - ${PN}/init.cpp || die - sed -i \ - -e "s:apricots.cfg:/etc/${PN}/apricots.cfg:" \ - README apricots.html || die - sed -i \ - -e 's/-Wmissing-prototypes//' \ - acinclude.m4 || die - - mv configure.in configure.ac || die - eautoreconf -} - -src_compile() { - emake LIBTOOL="/usr/bin/libtool" -} - -src_install() { - HTML_DOCS="apricots.html" - einstalldocs - - cd ${PN} - dobin apricots - insinto /usr/share/${PN} - doins *.wav *.psf *.shapes - insinto /etc/${PN} - doins apricots.cfg - - make_desktop_entry ${PN} Apricots -} diff --git a/games-arcade/apricots/apricots-0.2.7.ebuild b/games-arcade/apricots/apricots-0.2.7.ebuild new file mode 100644 index 000000000000..b7c7ed818813 --- /dev/null +++ b/games-arcade/apricots/apricots-0.2.7.ebuild @@ -0,0 +1,40 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop + +DESCRIPTION="Fly a plane around and bomb/shoot the enemy (port of Planegame from Amiga)" +HOMEPAGE="https://github.com/moggers87/apricots" +SRC_URI=" + https://github.com/moggers87/apricots/releases/download/v${PV}/${P}.tar.gz + https://dev.gentoo.org/~ionen/distfiles/${PN}.png" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RESTRICT="test" # this is only static analysis / linter tests + +RDEPEND=" + media-libs/freealut + media-libs/libsdl2[sound,video] + media-libs/openal" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-sign-undef.patch +) + +src_install() { + emake DESTDIR="${D}" datadir="${ED}/usr/share" install + einstalldocs + + insinto /etc + doins ${PN}/${PN}.cfg + rm "${ED}"/usr/share/${PN}/apricots.cfg + + doicon "${DISTDIR}"/${PN}.png + make_desktop_entry ${PN} ${PN^} +} diff --git a/games-arcade/apricots/files/apricots-0.2.6-freealut.patch b/games-arcade/apricots/files/apricots-0.2.6-freealut.patch deleted file mode 100644 index d2e1b27f6f34..000000000000 --- a/games-arcade/apricots/files/apricots-0.2.6-freealut.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- a/apricots/apricots.cpp -+++ b/apricots/apricots.cpp -@@ -16,6 +16,7 @@ - int main(int, char**){
- #endif
-
-+atexit(SDL_Quit);
- // Initialize data
- gamedata g;
- init_data(g);
- ---- a/apricots/sampleio.cpp -+++ b/apricots/sampleio.cpp -@@ -74,12 +74,9 @@ - alListenerfv(AL_ORIENTATION, front );
-
- // Load in samples
-- ALvoid* data = malloc(5 * (512 * 3) * 1024);
- alGenBuffers(numsamples, samples);
-
- for (int i = 0; i < numsamples; i++){
-- ALsizei freq;
-- ALboolean fileok;
- // Evil OpenAL portability fix done here
- #ifdef _WIN32
- ALenum format;
-@@ -87,15 +84,12 @@ - alutLoadWAVFile(filenames[i],&format,&data,&filelen,&freq,&trash);
- fileok = (alGetError() == AL_NO_ERROR);
- #else
-- ALsizei format;
-- ALsizei trash;
-- fileok = alutLoadWAV(filenames[i],&data,&format,&filelen,&trash,&freq);
-+ samples[i] = alutCreateBufferFromFile(filenames[i]);
- #endif
-- if (!fileok){
-+ if (samples[i] == AL_NONE){
- cerr << "sampleio: could not open " << filenames[i] << endl;
- exit(1);
- }
-- alBufferData(samples[i], format, data, filelen, freq);
- }
-
- // Generate Sources
-@@ -107,7 +101,6 @@ - alSourcefv(sources[j], AL_ORIENTATION, back );
- }
-
-- free(data);
-
- }
-
- ---- a/configure.in -+++ b/configure.in -@@ -100,7 +100,8 @@ - - dnl Check for OpenAL - AC_CHECK_HEADER(AL/al.h,[CXXFLAGS="$CXXFLAGS -DAP_AUDIO_OPENAL"]) --AC_CHECK_LIB( openal, alutInit) -+AC_CHECK_LIB( openal, alGetError) -+AC_CHECK_LIB( alut, alutInit) - - KDE_CHECK_EXTRA_LIBS - all_libraries="$all_libraries $USER_LDFLAGS" diff --git a/games-arcade/apricots/files/apricots-0.2.6-ldflags.patch b/games-arcade/apricots/files/apricots-0.2.6-ldflags.patch deleted file mode 100644 index 8a7b4a9f9a8c..000000000000 --- a/games-arcade/apricots/files/apricots-0.2.6-ldflags.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/apricots/Makefile.am.old 2010-10-11 15:58:18.000000000 +0200 -+++ b/apricots/Makefile.am 2010-10-11 15:59:21.000000000 +0200 -@@ -4,7 +4,8 @@ - ## INCLUDES were found outside kdevelop specific part - - apricots_SOURCES = SDLfont.cpp shape.cpp setup.cpp sampleio.cpp init.cpp game.cpp finish.cpp fall.cpp drawall.cpp drak.cpp collide.cpp apricots.cpp all.cpp ai.cpp --apricots_LDADD = -+apricots_LDADD = $(all_libraries) -+ - - SUBDIRS = docs - -@@ -68,7 +69,3 @@ - ####### kdevelop will overwrite this part!!! (end)############ - # set the include path found by configure - INCLUDES= $(all_includes) -- --# the library search path. --apricots_LDFLAGS = $(all_libraries) -- diff --git a/games-arcade/apricots/files/apricots-0.2.7-sign-undef.patch b/games-arcade/apricots/files/apricots-0.2.7-sign-undef.patch new file mode 100644 index 000000000000..c1904ea9f8be --- /dev/null +++ b/games-arcade/apricots/files/apricots-0.2.7-sign-undef.patch @@ -0,0 +1,10 @@ +Undefined reference to sign() when using -O1 or above. +--- a/apricots/all.cpp ++++ b/apricots/all.cpp +@@ -19,5 +19,5 @@ + // Sign function + +-inline int sign(int n) { return (0 < n) - (n < 0); } ++int sign(int n) { return (0 < n) - (n < 0); } + + // Error message for switch statements that shouldn't ever get to default diff --git a/games-arcade/apricots/metadata.xml b/games-arcade/apricots/metadata.xml index 78274e0fa550..c470ad8c5978 100644 --- a/games-arcade/apricots/metadata.xml +++ b/games-arcade/apricots/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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="github">moggers87/apricots</remote-id> + </upstream> </pkgmetadata> diff --git a/games-arcade/aquaria/aquaria-1.1.3-r1.ebuild b/games-arcade/aquaria/aquaria-1.1.3-r3.ebuild index ff45a40ffdba..c052fc1b10ad 100644 --- a/games-arcade/aquaria/aquaria-1.1.3-r1.ebuild +++ b/games-arcade/aquaria/aquaria-1.1.3-r3.ebuild @@ -1,27 +1,26 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit unpacker eutils games +EAPI=7 + +inherit desktop unpacker wrapper DESCRIPTION="A 2D scroller set in a massive ocean world" HOMEPAGE="http://www.bit-blot.com/aquaria/" SRC_URI="aquaria-lnx-humble-bundle.mojo.run" +S="${WORKDIR}"/data LICENSE="all-rights-reserved" SLOT="0" KEYWORDS="-* ~amd64 ~x86" -IUSE="" RESTRICT="strip fetch bindist" -DEPEND="app-arch/unzip" RDEPEND=" >=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)]" +BDEPEND="app-arch/unzip" -S=${WORKDIR}/data - -dir=${GAMES_PREFIX_OPT}/${PN} +dir=/opt/${PN} QA_PREBUILT="${dir#/}/aquaria" pkg_nofetch() { @@ -36,19 +35,18 @@ src_unpack() { } src_install() { - insinto "${dir}" - exeinto "${dir}" - + insinto ${dir} doins -r *.xml */ - doexe "${PN}" - doicon "${PN}.png" + + exeinto ${dir} + doexe ${PN} + + doicon ${PN}.png dodoc README-linux.txt mv "${ED}/${dir}"/docs "${ED}/usr/share/doc/${PF}/html" || die - dosym /usr/share/doc/${PF}/html "${dir}"/docs + dosym ../../../usr/share/doc/${PF}/html ${dir}/docs - games_make_wrapper "${PN}" "./${PN}" "${dir}" + make_wrapper "${PN}" "./${PN}" "${dir}" make_desktop_entry "${PN}" "Aquaria" - - prepgamesdirs } diff --git a/games-arcade/aquaria/metadata.xml b/games-arcade/aquaria/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/aquaria/metadata.xml +++ b/games-arcade/aquaria/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/ascii-invaders/Manifest b/games-arcade/ascii-invaders/Manifest index 49d3540909e9..0201bfd84c84 100644 --- a/games-arcade/ascii-invaders/Manifest +++ b/games-arcade/ascii-invaders/Manifest @@ -1 +1 @@ -DIST invaders0.1b.tgz 14597 BLAKE2B ecccca6636c4d8dffbc57b8cec82471efc2fd1a256648b9ac46fd256ef99d884205f1c86ff2bf0aedb7bb5996a59a7af3f301339944c6a4753355a8a4db23190 SHA512 3ac9dee0c532384e2849fdc8910bce885e3fdef362b629e8637df1cc0d82eba52c02a836a4925d811b339e9232f20caa7c761dbc1feeddc74e9b6f09e97046b8 +DIST ascii-invaders-1.0.1.tar.gz 37578 BLAKE2B 181509c07b1d9ae54f9147f7425c3d62a57f9bff9561fca6af3f3cc15b7fc96f62c809576bdbbe0ba6a2801947941e259e788f99980174848efedbc71c8a969c SHA512 326708ffc2c277e04575920c58f6a267e0bf46f8d2a3dbca9b5c317fb01006d4f673ab35f92f292549cc52dbee4400a84c85478eb81b9bd7703689a705547bc7 diff --git a/games-arcade/ascii-invaders/ascii-invaders-0.1b-r1.ebuild b/games-arcade/ascii-invaders/ascii-invaders-0.1b-r1.ebuild deleted file mode 100644 index 9437783b42ad..000000000000 --- a/games-arcade/ascii-invaders/ascii-invaders-0.1b-r1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Space invaders clone, using ncurses library" -HOMEPAGE="https://packages.gentoo.org/package/games-arcade/ascii-invaders" -SRC_URI="mirror://gentoo/invaders${PV}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~mips ~ppc64 ~x86 ~ppc-macos" -IUSE="" - -RDEPEND="sys-libs/ncurses:0" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/invaders" - -src_prepare() { - default - rm -f Makefile -} - -src_compile() { - emake LDLIBS="$(pkg-config ncurses --libs)" invaders -} - -src_install() { - newbin invaders ${PN} - einstalldocs -} diff --git a/games-arcade/ascii-invaders/ascii-invaders-1.0.1.ebuild b/games-arcade/ascii-invaders/ascii-invaders-1.0.1.ebuild new file mode 100644 index 000000000000..c0476227fa84 --- /dev/null +++ b/games-arcade/ascii-invaders/ascii-invaders-1.0.1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Space invaders clone, using ncurses library" +HOMEPAGE="https://github.com/macdice/ascii-invaders" +SRC_URI="https://github.com/macdice/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~mips ~ppc64 ~x86 ~ppc-macos" + +RDEPEND="sys-libs/ncurses:=" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_compile() { + tc-export CC + append-cppflags $($(tc-getPKG_CONFIG) --cflags ncurses || die) + emake -f /dev/null LDLIBS="$($(tc-getPKG_CONFIG) ncurses --libs || die)" invaders +} + +src_install() { + newbin invaders ${PN} + einstalldocs +} diff --git a/games-arcade/ascii-invaders/metadata.xml b/games-arcade/ascii-invaders/metadata.xml index 13dd7d1a5ea3..607eb492104a 100644 --- a/games-arcade/ascii-invaders/metadata.xml +++ b/games-arcade/ascii-invaders/metadata.xml @@ -1,13 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> -<longdescription> -Ascii-Invaders is a clone of Space Invaders for text-terminals using the -curses library. It compiles and runs on MacOS X, GNU/Linux and probably -any other system with a curses implementation. -</longdescription> + <maintainer type="project"> + <email>games@gentoo.org</email> + <name>Gentoo Games Project</name> + </maintainer> + <upstream> + <remote-id type="github">macdice/ascii-invaders</remote-id> + </upstream> </pkgmetadata> diff --git a/games-arcade/asteroid/asteroid-1.2.1.ebuild b/games-arcade/asteroid/asteroid-1.2.1.ebuild index 0272ee41549e..0f9fb6cd0973 100644 --- a/games-arcade/asteroid/asteroid-1.2.1.ebuild +++ b/games-arcade/asteroid/asteroid-1.2.1.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit cmake-utils +EAPI=7 -DESCRIPTION="A modern version of the arcade classic that uses OpenGL" +inherit cmake + +DESCRIPTION="Modern version of the arcade classic that uses OpenGL" HOMEPAGE="https://chazomaticus.github.io/asteroid/" SRC_URI="https://github.com/chazomaticus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" @@ -14,13 +15,20 @@ KEYWORDS="~amd64 ~x86" IUSE="" RDEPEND=" - virtual/opengl media-libs/freeglut - virtual/glu media-libs/libsdl media-libs/sdl-mixer + virtual/glu + virtual/opengl x11-libs/gtk+:2 " DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/${P}-libm.patch ) + +src_configure() { + local mycmakeargs=( + -DOpenGL_GL_PREFERENCE=GLVND + ) + cmake_src_configure +} diff --git a/games-arcade/asteroid/metadata.xml b/games-arcade/asteroid/metadata.xml index d86be3eb5292..05a5f140849e 100644 --- a/games-arcade/asteroid/metadata.xml +++ b/games-arcade/asteroid/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/balloonchase/Manifest b/games-arcade/balloonchase/Manifest index 9e11cb51d3df..86eaba1aa8fc 100644 --- a/games-arcade/balloonchase/Manifest +++ b/games-arcade/balloonchase/Manifest @@ -1 +1,2 @@ DIST balloonchase-0.9.6.tar.bz2 523085 BLAKE2B 50e453327d51da3fe40f52850cb2fbb7a10e897f59bac5d6f4a676d3211d3dcdae00359304ad119252ebf98e9f46482ad801078762f16ddc609bc94b68c3fc18 SHA512 ab5617713c96187564926fd5ecbdbf5186f78c23cfb43b26b28b9d18e71330efd77700cf7cd02e04be7fd8e33f2d30bf59f64954135ac82802d1d839dc2e7767 +DIST balloonchase.png 1744 BLAKE2B d78e636c0cb2ef521967035ce96fbee0e7b2659cb5127ba32cd3437394a709941fd915dfc0f376d47c2ad5ca81f6392f5942c2737cb2524ec3a041dc5b8c6c26 SHA512 bfd32d65b5cb290df90881cb7a953f1cac38f4e91151c672e4320b9b41f7bff46ef97d6c123aa7267b241710dccf4ade409ff129c945af1ee06d33fdf490f169 diff --git a/games-arcade/balloonchase/balloonchase-0.9.6-r1.ebuild b/games-arcade/balloonchase/balloonchase-0.9.6-r1.ebuild deleted file mode 100644 index 36976cc63a40..000000000000 --- a/games-arcade/balloonchase/balloonchase-0.9.6-r1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit desktop toolchain-funcs - -DESCRIPTION="Fly a hot air balloon and try to blow the other player out of the screen" -HOMEPAGE="http://makegho.mbnet.fi/c/bchase/" -SRC_URI="http://makegho.mbnet.fi/c/bchase/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="media-libs/libsdl[video]" -RDEPEND="${DEPEND}" - -src_prepare() { - default - eapply "${FILESDIR}"/${PV}-gentoo.patch - sed -i "s:g++:$(tc-getCXX):" Makefile || die - sed -i \ - -e "s:GENTOODIR:/usr/share/${PN}:" src/main.c || die -} - -src_install() { - dobin ${PN} - insinto /usr/share/${PN} - doins -r images - newicon images/kp2b.bmp ${PN}.bmp - make_desktop_entry ${PN} "Balloon Chase" /usr/share/pixmaps/${PN}.bmp - einstalldocs -} diff --git a/games-arcade/balloonchase/balloonchase-0.9.6-r2.ebuild b/games-arcade/balloonchase/balloonchase-0.9.6-r2.ebuild new file mode 100644 index 000000000000..aa65b89196ec --- /dev/null +++ b/games-arcade/balloonchase/balloonchase-0.9.6-r2.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop toolchain-funcs + +DESCRIPTION="Fly a hot air balloon and try to blow the other player out of the screen" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI=" + mirror://gentoo/${P}.tar.bz2 + https://dev.gentoo.org/~ionen/distfiles/${PN}.png" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="media-libs/libsdl[video]" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch +) + +src_prepare() { + default + + sed -i "s|GENTOODIR|${EPREFIX}/usr/share/${PN}|" src/main.c || die + + tc-export CXX PKG_CONFIG +} + +src_install() { + dobin ${PN} + + insinto /usr/share/${PN} + doins -r images + + doicon "${DISTDIR}"/${PN}.png + make_desktop_entry ${PN} "Balloon Chase" + + einstalldocs +} diff --git a/games-arcade/balloonchase/files/0.9.6-gentoo.patch b/games-arcade/balloonchase/files/balloonchase-0.9.6-gentoo.patch index ff232693422b..c847f0677660 100644 --- a/games-arcade/balloonchase/files/0.9.6-gentoo.patch +++ b/games-arcade/balloonchase/files/balloonchase-0.9.6-gentoo.patch @@ -1,26 +1,18 @@ --- a/Makefile +++ b/Makefile -@@ -1,4 +1,3 @@ +@@ -1,2 +1 @@ -LDFLAGS= -lSDL -lpthread -s CFLAGS= -Wall # -DDEBUG - PKG_BCDIR=balloonchase-`cat src/ver` - PKG_BCVER=`cat src/ver` -@@ -9,8 +8,8 @@ - clean: - rm balloonchase src/*.o +@@ -11,4 +10,4 @@ main: src/main.c - g++ -c -o src/main.o `sdl-config --cflags` src/main.c - g++ -o balloonchase src/main.o `sdl-config --libs` -+ g++ $(CXXFLAGS) -c -o src/main.o `sdl-config --cflags` src/main.c -+ g++ $(LDFLAGS) -o balloonchase src/main.o `sdl-config --libs` ++ $(CXX) $(CXXFLAGS) -c -o src/main.o `$(PKG_CONFIG) --cflags sdl` src/main.c ++ $(CXX) $(LDFLAGS) -o balloonchase src/main.o `$(PKG_CONFIG) --libs sdl` pkg: - @echo $(PKG_BCVERSION) >VERSION - rm balloonchase src/*.o --- a/src/main.c +++ b/src/main.c -@@ -333,47 +333,47 @@ - - int InitImages() +@@ -335,35 +335,35 @@ { - back = SDL_LoadBMP("images/back.bmp"); + back = SDL_LoadBMP("GENTOODIR/images/back.bmp"); @@ -71,8 +63,7 @@ - font2 = SDL_LoadBMP("images/font.bmp"); + font2 = SDL_LoadBMP("GENTOODIR/images/font.bmp"); font = SDL_CreateRGBSurface(SDL_SWSURFACE, 1288, 100, 32, 0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF); - SDL_SetColorKey(font, SDL_SRCCOLORKEY, SDL_MapRGB(font->format, 0x00, 0x00, 0x00)); - DrawIMG (font, font2, 0, 0); +@@ -372,6 +372,6 @@ - blobtrox = SDL_LoadBMP("images/blobtrox.bmp"); + blobtrox = SDL_LoadBMP("GENTOODIR/images/blobtrox.bmp"); @@ -81,27 +72,17 @@ - balloonchase = SDL_LoadBMP("images/balloonchase.bmp"); + balloonchase = SDL_LoadBMP("GENTOODIR/images/balloonchase.bmp"); - TMP = SDL_CreateRGBSurface(SDL_SWSURFACE, 259, 200, 32, 0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF); - blursurface = SDL_CreateRGBSurface(SDL_SWSURFACE, 640, 480, 32, 0x00000000, 0x00000000, 0x00000000, 0x00000000); -@@ -578,7 +578,7 @@ - - void createdat(int winsneed, int option_wave_effect) +@@ -580,3 +580,3 @@ { - FILE *OPTFILE=fopen ("balloonchase.dat", "w+"); + FILE *OPTFILE=fopen (".balloonchaserc", "w+"); char datmsg[60]; - sprintf (datmsg, "Balloon Chase settings file -- Do not edit manually!"); - char tmp2; -@@ -588,52 +588,32 @@ - } - fputc (winsneed, OPTFILE); +@@ -590,3 +590,3 @@ fputc (option_wave_effect+2, OPTFILE); - fprintf (stderr, "Saved configuration to balloonchase.dat\n"); + fprintf (stderr, "Saved configuration to .balloonchaserc\n"); fclose (OPTFILE); - } - - void checkfiles() +@@ -596,42 +596,22 @@ { - char found=0; - #ifdef WIN32 @@ -161,23 +142,13 @@ + createdat(2, 1); + } } - - Uint32 rgb(Uint8 r, Uint8 g, Uint8 b) -@@ -1257,7 +1237,7 @@ - SDL_WM_SetCaption ("Balloon Chase", 0); - checkfiles(); +@@ -1259,3 +1239,3 @@ - FILE *OPTFILE=fopen ("balloonchase.dat", "r"); + FILE *OPTFILE=fopen (".balloonchaserc", "r"); char datmsg[60]; - char varmistus[60]; - -@@ -1275,7 +1255,7 @@ - { - winsneeded=fgetc(OPTFILE); +@@ -1277,3 +1257,3 @@ option_wave_effect=fgetc(OPTFILE)-2; - fprintf (stderr, "Successfully loaded balloonchase.dat\n"); + fprintf (stderr, "Successfully loaded .balloonchaserc\n"); } - else - { diff --git a/games-arcade/balloonchase/metadata.xml b/games-arcade/balloonchase/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/balloonchase/metadata.xml +++ b/games-arcade/balloonchase/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/barbarian-bin/barbarian-bin-1.01-r1.ebuild b/games-arcade/barbarian-bin/barbarian-bin-1.01-r1.ebuild deleted file mode 100644 index 555f99dd3acb..000000000000 --- a/games-arcade/barbarian-bin/barbarian-bin-1.01-r1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils games - -MY_PN=${PN/-bin/} -DESCRIPTION="Save Princess Mariana through one-on-one battles with demonic barbarians" -HOMEPAGE="http://www.tdbsoft.com/" -SRC_URI="http://www.pcpages.com/tomberrr/downloads/${MY_PN}${PV/./}_linux.zip" - -LICENSE="CC-BY-NC-ND-2.0" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -RESTRICT="strip" -IUSE="" - -DEPEND="app-arch/unzip" -RDEPEND="sys-libs/libstdc++-v3:5 - amd64? ( sys-libs/libstdc++-v3:5[multilib] ) - >=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)]" - -game_dest="${GAMES_PREFIX_OPT}/${MY_PN}" -QA_PREBUILT="${game_dest:1}/Barbarian" - -S=${WORKDIR} - -src_install() { - dodir "${game_dest}" - cp -r gfx sounds "${D}${game_dest}/" || die - - exeinto "${game_dest}" - doexe Barbarian - - dohtml Barbarian.html - - games_make_wrapper barbarian ./Barbarian "${game_dest}" - - # High-score file - dodir "${GAMES_STATEDIR}" - touch "${D}${GAMES_STATEDIR}/heroes.hoh" - fperms 660 "${GAMES_STATEDIR}/heroes.hoh" - dosym "${GAMES_STATEDIR}/heroes.hoh" "${game_dest}/heroes.hoh" - newicon gfx/sprites/player_attack_2_1.bmp barbarian.bmp - make_desktop_entry barbarian "Barbarian" /usr/share/pixmaps/barbarian.bmp - prepgamesdirs -} diff --git a/games-arcade/barbarian-bin/barbarian-bin-1.01-r3.ebuild b/games-arcade/barbarian-bin/barbarian-bin-1.01-r3.ebuild new file mode 100644 index 000000000000..8d2c53e6ff46 --- /dev/null +++ b/games-arcade/barbarian-bin/barbarian-bin-1.01-r3.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop wrapper + +MY_PN=${PN/-bin/} +DESCRIPTION="Save Princess Mariana through one-on-one battles with demonic barbarians" +HOMEPAGE="http://www.tdbsoft.com/" +SRC_URI="http://www.pcpages.com/tomberrr/downloads/${MY_PN}${PV/./}_linux.zip" +S="${WORKDIR}" + +LICENSE="CC-BY-NC-ND-2.0" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +RESTRICT="strip" + +RDEPEND=" + acct-group/gamestat + >=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)] + sys-libs/glibc + sys-libs/libstdc++-v3:5 + amd64? ( sys-libs/libstdc++-v3:5[multilib] ) +" +BDEPEND="app-arch/unzip" + +game_dest="/opt/${MY_PN}" +QA_PREBUILT="${game_dest#/}/Barbarian" + +src_install() { + dodir ${game_dest} + cp -r gfx sounds "${ED}"/${game_dest}/ || die + + exeinto ${game_dest} + doexe Barbarian + + docinto html + dodoc Barbarian.html + + make_wrapper barbarian ./Barbarian "${game_dest}" + + # High-score file + dodir /var/games/${PN} + touch "${ED}"/var/games/${PN}/heroes.hoh || die + dosym ../../var/games/${PN}/heroes.hoh /opt/${MY_PN}/heroes.hoh + + fperms 660 /var/games/${PN}/heroes.hoh + fowners -R root:gamestat /var/games/${PN} /opt/${MY_PN}/Barbarian + fperms g+s /opt/${MY_PN}/Barbarian + + newicon gfx/sprites/player_attack_2_1.bmp barbarian.bmp + make_desktop_entry barbarian "Barbarian" /usr/share/pixmaps/barbarian.bmp +} diff --git a/games-arcade/barbarian-bin/metadata.xml b/games-arcade/barbarian-bin/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/barbarian-bin/metadata.xml +++ b/games-arcade/barbarian-bin/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/batrachians/Manifest b/games-arcade/batrachians/Manifest index 6ae336d142f2..dada55c3e402 100644 --- a/games-arcade/batrachians/Manifest +++ b/games-arcade/batrachians/Manifest @@ -1 +1 @@ -DIST batrachians-0.1.6.tar.gz 198088 BLAKE2B 446e2fd77068dc8c58e801fca6544ea825529240a79e1b14fac6962d26d78f6f4e977f6965751ba5d09ea790679dfa820e5cdb1ed667bd0af46f8c89180a38bf SHA512 d3022712627061f9828e1f3baa7207053884f1f4c0348768d4ac073673ff1bcf14c95cedf01031b8bd36a6b684bf239af0f381df41aa18d49218320a8bea3b68 +DIST batrachians-0.1.7.tar.gz 206981 BLAKE2B 871fb7e22fb17fdfb0fd32d14a36cf63043e46de5bdabc83594d3d3eb43f616ec703d220ad9cf56e505c31025e76582e52b3a816d932f9fca22a6f070ed3198e SHA512 01c49cf02e3894d43948ba2656713fdd1662f3441c1dfe41b2fc3dc27fc5c4c95ac377a946d647c1c59e201a63d0659bc6fc2bd50132eb2f2b393ed64167e781 diff --git a/games-arcade/batrachians/batrachians-0.1.6-r1.ebuild b/games-arcade/batrachians/batrachians-0.1.6-r1.ebuild deleted file mode 100644 index c3da891efd81..000000000000 --- a/games-arcade/batrachians/batrachians-0.1.6-r1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_EAUTORECONF="yes" - -inherit autotools gnome2 - -DESCRIPTION="A fly-eating frog video game" -HOMEPAGE="https://perso.b2b2c.ca/~sarrazip/dev/batrachians.html" -SRC_URI="https://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-games/flatzebra-0.1.5" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) - -src_install() { - emake -C src DESTDIR="${D}" install - doman doc/${PN}.6 - einstalldocs -} diff --git a/games-arcade/batrachians/batrachians-0.1.7.ebuild b/games-arcade/batrachians/batrachians-0.1.7.ebuild new file mode 100644 index 000000000000..059c43550bc8 --- /dev/null +++ b/games-arcade/batrachians/batrachians-0.1.7.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools xdg + +DESCRIPTION="A fly-eating frog video game" +HOMEPAGE="http://perso.b2b2c.ca/~sarrazip/dev/batrachians.html" +SRC_URI="http://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + >=dev-games/flatzebra-0.1.5 + media-libs/libsdl + media-libs/sdl-image + media-libs/sdl-mixer" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/${PN}-0.1.7-autotools.patch ) + +src_prepare() { + default + eautoreconf +} diff --git a/games-arcade/batrachians/files/batrachians-0.1.6-makefile.patch b/games-arcade/batrachians/files/batrachians-0.1.6-makefile.patch deleted file mode 100644 index f01fdfb0da8d..000000000000 --- a/games-arcade/batrachians/files/batrachians-0.1.6-makefile.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -ru batrachians-0.1.6.orig/src/Makefile.am batrachians-0.1.6/src/Makefile.am ---- batrachians-0.1.6.orig/src/Makefile.am 2011-04-18 21:25:53.000000000 -0400 -+++ batrachians-0.1.6/src/Makefile.am 2014-10-27 23:19:58.292260669 -0400 -@@ -20,7 +20,7 @@ - -DPACKAGE_FULL_NAME_EN=\"$(PACKAGE_FULL_NAME_EN)\" \ - -DPKGSOUNDDIR=\"$(pkgsounddir)\" - --pkgsounddir = $(datadir)/sounds/$(PACKAGE) -+pkgsounddir = $(datadir)/$(PACKAGE)/sounds - pkgsound_DATA = \ - sounds/game-starts.wav \ - sounds/game-ends.wav \ -@@ -29,18 +29,18 @@ - sounds/frog-jumps.wav \ - sounds/tongue-out.wav - --desktopentrydir = $(datadir)/applications -+desktopentrydir =/usr/share/applications - desktopentry_DATA = $(PACKAGE).desktop - --pixmapdir = $(datadir)/pixmaps -+pixmapdir =/usr/share/icons/hicolor/48x48/apps/ - pixmap_DATA = images/$(PACKAGE).png - - - check: all - if HAVE_GETOPT_LONG - test "`./$(PACKAGE) --version`" = "$(PACKAGE) $(VERSION)" -- ./$(PACKAGE) --version >& /dev/null -- ./$(PACKAGE) --help >& /dev/null -+ ./$(PACKAGE) --version > /dev/null 2>&1 -+ ./$(PACKAGE) --help > /dev/null 2>&1 - endif - - diff --git a/games-arcade/batrachians/files/batrachians-0.1.7-autotools.patch b/games-arcade/batrachians/files/batrachians-0.1.7-autotools.patch new file mode 100644 index 000000000000..bc05a7f267c2 --- /dev/null +++ b/games-arcade/batrachians/files/batrachians-0.1.7-autotools.patch @@ -0,0 +1,50 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,21 +2,20 @@ + + SUBDIRS = src + +-man_MANS = doc/$(PACKAGE).6 ++man_MANS = doc/batrachians.6 + + RPMBUILD = rpmbuild + rpm: dist + $(RPMBUILD) -ta $(distdir).tar.gz + +-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION) + doc_DATA = \ + AUTHORS \ +- COPYING \ + NEWS \ + README \ + THANKS + + EXTRA_DIST = \ ++ COPYING \ + bootstrap \ + autogen.sh \ + $(PACKAGE).spec \ +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -20,7 +20,7 @@ + -DPACKAGE_FULL_NAME_EN=\"$(PACKAGE_FULL_NAME_EN)\" \ + -DPKGSOUNDDIR=\"$(pkgsounddir)\" + +-pkgsounddir = $(datadir)/sounds/$(PACKAGE) ++pkgsounddir = $(pkgdatadir)/sounds + pkgsound_DATA = \ + sounds/game-starts.wav \ + sounds/game-ends.wav \ +@@ -29,10 +29,10 @@ + sounds/frog-jumps.wav \ + sounds/tongue-out.wav + +-desktopentrydir = $(datadir)/applications ++desktopentrydir = $(datarootdir)/applications + desktopentry_DATA = $(PACKAGE).desktop + +-pixmapdir = $(datadir)/pixmaps ++pixmapdir = $(datarootdir)/pixmaps + pixmap_DATA = images/$(PACKAGE).png + + diff --git a/games-arcade/batrachians/metadata.xml b/games-arcade/batrachians/metadata.xml index 418dc79f8c64..1c3ba213c494 100644 --- a/games-arcade/batrachians/metadata.xml +++ b/games-arcade/batrachians/metadata.xml @@ -1,12 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> -<longdescription lang="en"> -Afternoon Stalker, a clone of the 1981 Night Stalker video game by Mattel -Electronics. -</longdescription> </pkgmetadata> diff --git a/games-arcade/berusky/berusky-1.7.1-r1.ebuild b/games-arcade/berusky/berusky-1.7.1-r2.ebuild index 57077ecfc396..f50ada36626b 100644 --- a/games-arcade/berusky/berusky-1.7.1-r1.ebuild +++ b/games-arcade/berusky/berusky-1.7.1-r2.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit desktop gnome2 +EAPI=7 + +inherit desktop flag-o-matic gnome2 DATAFILE="${PN}-data-1.7" DESCRIPTION="Free logic game based on an ancient puzzle named Sokoban" @@ -14,20 +15,45 @@ SRC_URI="https://www.anakreon.cz/download/${P}.tar.gz LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RDEPEND=" media-libs/libsdl[X,video] media-libs/sdl-image[png] x11-libs/gtk+:2 " -DEPEND="${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-1.7.1-r2-gentoo.patch + "${FILESDIR}"/${PN}-1.7.1-missing-includes.patch +) + +src_prepare() { + mv ../${DATAFILE}/{berusky.ini,GameData,Graphics,Levels} . || die + + default +} + +src_configure() { + # https://bugs.gentoo.org/787287 + # clashes with C++17's "std::byte" type + append-cxxflags -std=c++14 + + default +} src_install() { gnome2_src_install - rm -rf "${ED}"/usr/doc + + rm -rf "${ED}"/usr/doc || die + + insinto /usr/share/${PN} + doins -r GameData Graphics Levels + + insinto /var/lib/${PN} + doins berusky.ini + doicon -s 32 "${DISTDIR}"/${PN}.png make_desktop_entry ${PN} } diff --git a/games-arcade/berusky/files/berusky-1.7.1-missing-includes.patch b/games-arcade/berusky/files/berusky-1.7.1-missing-includes.patch new file mode 100644 index 000000000000..a44d142b7307 --- /dev/null +++ b/games-arcade/berusky/files/berusky-1.7.1-missing-includes.patch @@ -0,0 +1,22 @@ +https://bugs.gentoo.org/890361 +--- a/src/level_game.cpp ++++ b/src/level_game.cpp +@@ -27,6 +27,8 @@ + + #include "portability.h" + ++#include <cassert> ++#include <cstddef> + #ifdef LINUX + #include <endian.h> + #endif // LINUX +--- a/src/level_game.h ++++ b/src/level_game.h +@@ -28,6 +28,7 @@ + #ifndef __LEVEL_GAME_H__ + #define __LEVEL_GAME_H__ + ++#include <cassert> + #include <time.h> + #include "stack.h" + diff --git a/games-arcade/berusky/files/berusky-1.7.1-r2-gentoo.patch b/games-arcade/berusky/files/berusky-1.7.1-r2-gentoo.patch new file mode 100644 index 000000000000..6fd1381ad2ac --- /dev/null +++ b/games-arcade/berusky/files/berusky-1.7.1-r2-gentoo.patch @@ -0,0 +1,47 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -5,8 +5,7 @@ + + SUBDIRS = po src data + +-beruskydocdir = ${prefix}/doc/berusky +-beruskydoc_DATA = \ ++EXTRA_DIST = \ + README\ + COPYING\ + AUTHORS\ +@@ -15,10 +14,6 @@ + NEWS\ + TODO + +-EXTRA_DIST = $(beruskydoc_DATA) +- +- +- + # Copy all the spec files. Of cource, only one is actually used. + dist-hook: + for specfile in *.spec; do \ +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -3,10 +3,3 @@ + ## Created by Anjuta - will be overwritten + ## If you don't want it to overwrite it, + ## Please disable it in the Anjuta project configuration +- +-berusky_datadir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/@PACKAGE@ +- +-berusky_data_DATA = \ +- berusky.ini +- +-EXTRA_DIST = $(berusky_data_DATA) +--- a/src/defines.h ++++ b/src/defines.h +@@ -446,7 +446,7 @@ + #define INI_USER_DIRECTORY "~/.berusky" + #define INI_USER_LEVELS "~/.berusky/User" + #define INI_USER_PROFILES "~/.berusky/Profiles" +-#define INI_FILE_GLOBAL "/var/games/berusky/"INI_FILE_NAME ++#define INI_FILE_GLOBAL "/var/lib/berusky/"INI_FILE_NAME + #define INI_FILE_USER "~/.berusky/"INI_FILE_NAME + #define INI_FILE_LOCAL "./"INI_FILE_NAME + #elif WINDOWS diff --git a/games-arcade/berusky/metadata.xml b/games-arcade/berusky/metadata.xml index d0959ece3c93..2f4ce531a045 100644 --- a/games-arcade/berusky/metadata.xml +++ b/games-arcade/berusky/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/betna/betna-0.9.7.ebuild b/games-arcade/betna/betna-0.9.7-r1.ebuild index 57c0d775c4da..0aaf65902004 100644 --- a/games-arcade/betna/betna-0.9.7.ebuild +++ b/games-arcade/betna/betna-0.9.7-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=7 + +inherit desktop toolchain-funcs DESCRIPTION="Defend your volcano from the attacking ants by firing rocks/bullets at them" HOMEPAGE="http://koti.mbnet.fi/makegho/c/betna/" @@ -11,15 +12,16 @@ SRC_URI="http://koti.mbnet.fi/makegho/c/betna/${P}.tgz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" DEPEND="media-libs/libsdl[video]" RDEPEND="${DEPEND}" src_prepare() { + default + sed -i \ -e '/blobprintf.*char msg/s/char msg/const char msg/' \ - -e "s:images/:${GAMES_DATADIR}/${PN}/:" \ + -e "s:images/:/var/lib/${PN}/:" \ src/main.cpp || die sed -i \ @@ -30,17 +32,23 @@ src_prepare() { Makefile || die } +src_configure() { + tc-export CXX +} + src_compile() { emake clean emake } src_install() { - dogamesbin betna - insinto "${GAMES_DATADIR}"/${PN} + dobin betna + dodoc README Q\&A + + insinto /var/lib/${PN} doins images/* + newicon images/target.bmp ${PN}.bmp + make_desktop_entry ${PN} Betna /usr/share/pixmaps/${PN}.bmp - dodoc README Q\&A - prepgamesdirs } diff --git a/games-arcade/betna/metadata.xml b/games-arcade/betna/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/betna/metadata.xml +++ b/games-arcade/betna/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/blobby/blobby-1.0.ebuild b/games-arcade/blobby/blobby-1.0-r1.ebuild index 413ea74b1024..0044ddcffb2d 100644 --- a/games-arcade/blobby/blobby-1.0.ebuild +++ b/games-arcade/blobby/blobby-1.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils desktop +inherit cmake desktop DESCRIPTION="Beach ball game with blobs of goo" HOMEPAGE="https://sourceforge.net/projects/blobby/" @@ -16,11 +16,14 @@ IUSE="" RDEPEND=" >=dev-games/physfs-2[zip] - media-libs/libsdl[sound,joystick,opengl,video,X] - virtual/opengl" + media-libs/libsdl2[sound,joystick,opengl,video] + virtual/opengl +" DEPEND="${RDEPEND} - app-arch/zip dev-libs/boost +" +BDEPEND=" + app-arch/zip virtual/pkgconfig " @@ -31,7 +34,7 @@ PATCHES=( ) src_install() { - cmake-utils_src_install + cmake_src_install newicon data/Icon.bmp ${PN}.bmp make_desktop_entry ${PN} "Blobby Volley" /usr/share/pixmaps/${PN}.bmp diff --git a/games-arcade/blobby/metadata.xml b/games-arcade/blobby/metadata.xml index 503a13f4e202..fb1a171ee542 100644 --- a/games-arcade/blobby/metadata.xml +++ b/games-arcade/blobby/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/blobwars/blobwars-2.00-r1.ebuild b/games-arcade/blobwars/blobwars-2.00-r1.ebuild index 1d51f12f8b9d..25f0c476fd88 100644 --- a/games-arcade/blobwars/blobwars-2.00-r1.ebuild +++ b/games-arcade/blobwars/blobwars-2.00-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit gnome2-utils xdg +EAPI=8 +inherit xdg DESCRIPTION="Platform game about a blob and his quest to rescue MIAs from an alien invader" HOMEPAGE="https://sourceforge.net/projects/blobwars/ https://www.parallelrealities.co.uk/games/metalBlobSolid/ https://github.com/perpendicular-dimensions/blobwars" @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/blobwars/${P}.tar.gz" LICENSE="BSD CC-BY-SA-3.0 CC-BY-3.0 GPL-2 LGPL-2.1 fairuse public-domain" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="" RDEPEND=" @@ -22,9 +22,8 @@ RDEPEND=" sys-libs/zlib virtual/libintl " -DEPEND="${RDEPEND} - sys-devel/gettext -" +DEPEND="${RDEPEND}" +BDEPEND="sys-devel/gettext" src_prepare() { default diff --git a/games-arcade/blobwars/blobwars-2.00.ebuild b/games-arcade/blobwars/blobwars-2.00.ebuild deleted file mode 100644 index 45d85b3dd782..000000000000 --- a/games-arcade/blobwars/blobwars-2.00.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit gnome2-utils xdg - -DESCRIPTION="Platform game about a blob and his quest to rescue MIAs from an alien invader" -HOMEPAGE="https://sourceforge.net/projects/blobwars/ https://www.parallelrealities.co.uk/games/metalBlobSolid/ https://github.com/perpendicular-dimensions/blobwars" -SRC_URI="mirror://sourceforge/blobwars/${P}.tar.gz" - -LICENSE="BSD CC-BY-SA-3.0 CC-BY-3.0 GPL-2 LGPL-2.1 fairuse public-domain" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="" - -RDEPEND=" - media-libs/libsdl2 - media-libs/sdl2-mixer - media-libs/sdl2-ttf - media-libs/sdl2-image - media-libs/sdl2-net - sys-libs/zlib - virtual/libintl -" -DEPEND="${RDEPEND} - sys-devel/gettext -" - -src_prepare() { - default - sed -i -e "/-Werror/d" Makefile || die -} - -src_compile() { - emake \ - RELEASE="1" \ - USEPAK="1" -} - -src_install() { - emake \ - BINDIR="/usr/bin/" \ - USEPAK="1" \ - DESTDIR="${D}" \ - DOCDIR="/usr/share/doc/${PF}/html/" \ - install - - mv -vf \ - "${D}"/usr/share/doc/${PF}/html/{changes,hacking,porting,readme} \ - "${D}"/usr/share/doc/${PF}/ -} diff --git a/games-arcade/blobwars/metadata.xml b/games-arcade/blobwars/metadata.xml index 6f1c50934c2f..56ab8b6c4acb 100644 --- a/games-arcade/blobwars/metadata.xml +++ b/games-arcade/blobwars/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>pacho@gentoo.org</email> @@ -7,5 +7,6 @@ </maintainer> <upstream> <remote-id type="sourceforge">blobwars</remote-id> + <remote-id type="github">perpendicular-dimensions/blobwars</remote-id> </upstream> </pkgmetadata> diff --git a/games-arcade/blockrage/blockrage-0.2.3-r1.ebuild b/games-arcade/blockrage/blockrage-0.2.3-r1.ebuild new file mode 100644 index 000000000000..c6d07681ac87 --- /dev/null +++ b/games-arcade/blockrage/blockrage-0.2.3-r1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="Falling-blocks arcade game with a 2-player hotseat mode" +HOMEPAGE="https://blockrage.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="media-libs/libsdl[video]" +RDEPEND="${DEPEND}" + +DOCS=( ChangeLog KNOWN_BUGS README TODO ) + +PATCHES=( + # Removing error due to wrong detection of cross-compile mode + "${FILESDIR}"/${P}-config.patch + "${FILESDIR}"/${P}-statx.patch +) + +src_configure() { + tc-export CC + default +} diff --git a/games-arcade/blockrage/blockrage-0.2.3.ebuild b/games-arcade/blockrage/blockrage-0.2.3.ebuild deleted file mode 100644 index 62aa1d3692a6..000000000000 --- a/games-arcade/blockrage/blockrage-0.2.3.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils games - -DESCRIPTION="Falling-blocks arcade game with a 2-player hotseat mode" -HOMEPAGE="http://blockrage.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="media-libs/libsdl[video]" -RDEPEND=${DEPEND} - -# Removing error due to wrong detection of cross-compile mode -DOCS=( ChangeLog KNOWN_BUGS README TODO ) - -src_prepare() { - epatch "${FILESDIR}/${P}"-config.patch -} - -src_install() { - default - prepgamesdirs -} diff --git a/games-arcade/blockrage/files/blockrage-0.2.3-config.patch b/games-arcade/blockrage/files/blockrage-0.2.3-config.patch index dc1875fc28e8..f1b3e5bde119 100644 --- a/games-arcade/blockrage/files/blockrage-0.2.3-config.patch +++ b/games-arcade/blockrage/files/blockrage-0.2.3-config.patch @@ -1,5 +1,5 @@ ---- configure -+++ configure +--- a/configure ++++ b/configure @@ -40,7 +40,7 @@ SOUND_OPT= @@ -17,8 +17,8 @@ fi;; --bindir=*) bindir="$cfg_optarg";; ---- src/Makefile.in -+++ src/Makefile.in +--- a/src/Makefile.in ++++ b/src/Makefile.in @@ -1,7 +1,7 @@ OBJS = main.o gfxout.o gfxlib.o menus.o keyboard.o bg.o sound.o global.o timer.o diff --git a/games-arcade/blockrage/files/blockrage-0.2.3-statx.patch b/games-arcade/blockrage/files/blockrage-0.2.3-statx.patch new file mode 100644 index 000000000000..95459e0984e6 --- /dev/null +++ b/games-arcade/blockrage/files/blockrage-0.2.3-statx.patch @@ -0,0 +1,92 @@ +Thanks-to: samuel.bauer +https://bugs.gentoo.org/669598 +--- a/src/main.c ++++ b/src/main.c +@@ -102,7 +102,7 @@ + + int immedstart; + int quit; +-static int statx[6],staty[6]; ++static int stat_x[6],stat_y[6]; + int diffx,diffy; /* coordinates of the difficulty level display box */ + int ts_x0,ts_x1; /* x-coordinates of the top-ten names(ts_x0) & scores(ts_x1) */ + int no_of_sets; +@@ -191,14 +191,14 @@ + + static void game_drawscore(player_t *p, int bgvcpy) { + if(bgvcpy) { +- v_drawscrarea(bmp_game[players-1].data,statx[1],staty[1], ++ v_drawscrarea(bmp_game[players-1].data,stat_x[1],stat_y[1], + strpixlen("0000000",FONT_HIGHLIGHTED),font[FONT_HIGHLIGHTED].ch); + } + t_align=T_LEFT; +- v_printf(statx[1],staty[1],FONT_HIGHLIGHTED,"%07d",p->score); ++ v_printf(stat_x[1],stat_y[1],FONT_HIGHLIGHTED,"%07d",p->score); + + if(bgvcpy) { +- virt_cpyarea(statx[1],staty[1], ++ virt_cpyarea(stat_x[1],stat_y[1], + strpixlen("00000000",FONT_HIGHLIGHTED),font[FONT_HIGHLIGHTED].ch); + } + } +@@ -206,28 +206,28 @@ + static void game_drawlevelnum(int bgvcpy) { + + if(bgvcpy) { +- v_drawscrarea(bmp_game[players-1].data,statx[3],staty[3], ++ v_drawscrarea(bmp_game[players-1].data,stat_x[3],stat_y[3], + strpixlen("00",FONT_HIGHLIGHTED),font[FONT_HIGHLIGHTED].ch); + } + t_align=T_LEFT; +- v_printf(statx[3],staty[3],FONT_HIGHLIGHTED,"%02d",level); ++ v_printf(stat_x[3],stat_y[3],FONT_HIGHLIGHTED,"%02d",level); + + if(bgvcpy) { +- virt_cpyarea(statx[3],staty[3], ++ virt_cpyarea(stat_x[3],stat_y[3], + strpixlen("00",FONT_HIGHLIGHTED),font[FONT_HIGHLIGHTED].ch); + } + } + + static void game_drawblocksleft(int bgvcpy) { + if(bgvcpy) { +- v_drawscrarea(bmp_game[players-1].data,statx[5],staty[5], ++ v_drawscrarea(bmp_game[players-1].data,stat_x[5],stat_y[5], + strpixlen("00",FONT_HIGHLIGHTED),font[FONT_HIGHLIGHTED].ch); + } + t_align=T_LEFT; +- v_printf(statx[5],staty[5],FONT_HIGHLIGHTED,"%02d",blocksleft); ++ v_printf(stat_x[5],stat_y[5],FONT_HIGHLIGHTED,"%02d",blocksleft); + + if(bgvcpy) { +- virt_cpyarea(statx[5],staty[5], ++ virt_cpyarea(stat_x[5],stat_y[5], + strpixlen("00",FONT_HIGHLIGHTED),font[FONT_HIGHLIGHTED].ch); + } + } +@@ -371,9 +371,9 @@ + void game_statistics_draw(void) { + if(players==1) { + t_align=T_LEFT; +- v_print(statx[0],staty[0],FONT_NORMAL,"Score:"); +- v_print(statx[2],staty[2],FONT_NORMAL,"Level:"); +- v_print(statx[4],staty[4],FONT_NORMAL,"Blocks:"); ++ v_print(stat_x[0],stat_y[0],FONT_NORMAL,"Score:"); ++ v_print(stat_x[2],stat_y[2],FONT_NORMAL,"Level:"); ++ v_print(stat_x[4],stat_y[4],FONT_NORMAL,"Blocks:"); + game_drawlevelnum(0); + game_drawblocksleft(0); + game_drawscore(&(player[0]),0); +@@ -1530,9 +1530,9 @@ + fscanf(f,"%d %d %d %d %d %d",&nx_x0[0],&nx_y0[0], + &nx_x0[1],&nx_y0[1],&nx_x0[2],&nx_y0[2]); + +- fscanf(f,"%d %d %d %d",&statx[0],&staty[0],&statx[1],&staty[1]); +- fscanf(f,"%d %d %d %d",&statx[2],&staty[2],&statx[3],&staty[3]); +- fscanf(f,"%d %d %d %d",&statx[4],&staty[4],&statx[5],&staty[5]); ++ fscanf(f,"%d %d %d %d",&stat_x[0],&stat_y[0],&stat_x[1],&stat_y[1]); ++ fscanf(f,"%d %d %d %d",&stat_x[2],&stat_y[2],&stat_x[3],&stat_y[3]); ++ fscanf(f,"%d %d %d %d",&stat_x[4],&stat_y[4],&stat_x[5],&stat_y[5]); + + fscanf(f,"%d %d",&diffx,&diffy); + fscanf(f,"%d %d",&ts_x0,&ts_x1); diff --git a/games-arcade/blockrage/metadata.xml b/games-arcade/blockrage/metadata.xml index 13e8bd0d6026..693ef4c34d53 100644 --- a/games-arcade/blockrage/metadata.xml +++ b/games-arcade/blockrage/metadata.xml @@ -1,13 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> - <longdescription lang="en"> -An arcade game with addictive gameplay and a 2-player hotseat mode. -</longdescription> <upstream> <remote-id type="sourceforge">blockrage</remote-id> </upstream> diff --git a/games-arcade/bomns/bomns-0.99.2.ebuild b/games-arcade/bomns/bomns-0.99.2-r1.ebuild index 37632fd1375c..130963ce7b0c 100644 --- a/games-arcade/bomns/bomns-0.99.2.ebuild +++ b/games-arcade/bomns/bomns-0.99.2-r1.ebuild @@ -1,48 +1,55 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools flag-o-matic games +EAPI=7 -DESCRIPTION="A fast-paced multiplayer deathmatch arcade game" -HOMEPAGE="http://greenridge.sourceforge.net" +inherit autotools flag-o-matic + +DESCRIPTION="Fast-paced multiplayer deathmatch arcade game" +HOMEPAGE="https://github.com/keithfancher/Bomns-for-Linux" SRC_URI="mirror://sourceforge/greenridge/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="gtk editor" -DEPEND="media-libs/libsdl[video] +DEPEND=" + media-libs/libsdl[video] media-libs/sdl-mixer - gtk? ( x11-libs/gtk+:2 )" -RDEPEND=${DEPEND} + gtk? ( x11-libs/gtk+:2 ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-fpe.patch +) src_prepare() { + default + sed -i \ -e "/appicondir/s:\$(prefix):/usr:" \ -e "/desktopdir/s:\$(prefix):/usr:" \ $(find icons -name Makefile.am) \ Makefile.am || die + sed -i \ - -e "s:\$*[({]prefix[})]/share:${GAMES_DATADIR}:" \ + -e "s:\$*[({]prefix[})]/share:/var/lib/:" \ configure.in \ graphics/Makefile.am \ levels/Makefile.am \ sounds/Makefile.am || die - epatch "${FILESDIR}"/${P}-fpe.patch + + mv configure.{in,ac} || die + eautoreconf } src_configure() { filter-flags -fforce-addr - egamesconf \ + econf \ --disable-launcher1 \ $(use_enable gtk launcher2) \ $(use_enable editor) } - -src_install() { - default - prepgamesdirs -} diff --git a/games-arcade/bomns/files/bomns-0.99.2-fpe.patch b/games-arcade/bomns/files/bomns-0.99.2-fpe.patch index 3a9e39c241af..273212a4f6e1 100644 --- a/games-arcade/bomns/files/bomns-0.99.2-fpe.patch +++ b/games-arcade/bomns/files/bomns-0.99.2-fpe.patch @@ -1,5 +1,5 @@ ---- src/bomns.cpp.old 2015-01-03 18:44:59.947689613 +0100 -+++ src/bomns.cpp 2015-01-03 18:47:29.854777276 +0100 +--- a/src/bomns.cpp ++++ b/src/bomns.cpp @@ -432,7 +432,10 @@ if(g_bShowFps) { diff --git a/games-arcade/bomns/metadata.xml b/games-arcade/bomns/metadata.xml index bbfb3927e5f4..2c5a99662f2e 100644 --- a/games-arcade/bomns/metadata.xml +++ b/games-arcade/bomns/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> @@ -10,5 +10,6 @@ </use> <upstream> <remote-id type="sourceforge">greenridge</remote-id> + <remote-id type="github">keithfancher/Bomns-for-Linux</remote-id> </upstream> </pkgmetadata> diff --git a/games-arcade/briquolo/briquolo-0.5.7.ebuild b/games-arcade/briquolo/briquolo-0.5.7.ebuild index 07776ecc7735..fff6d3ea6456 100644 --- a/games-arcade/briquolo/briquolo-0.5.7.ebuild +++ b/games-arcade/briquolo/briquolo-0.5.7.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=7 + +inherit autotools desktop DESCRIPTION="Breakout with 3D representation based on OpenGL" HOMEPAGE="http://briquolo.free.fr/en/index.html" @@ -13,39 +14,50 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="nls" -RDEPEND="virtual/opengl +RDEPEND=" + virtual/opengl virtual/glu media-libs/libsdl[joystick,sound,video] media-libs/sdl-mixer media-libs/sdl-ttf media-libs/libpng:0 - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" + nls? ( virtual/libintl ) +" +DEPEND="${RDEPEND}" +BDEPEND="nls? ( sys-devel/gettext )" + +PATCHES=( + "${FILESDIR}"/${P}-gcc43.patch + "${FILESDIR}"/${P}-libpng14.patch + "${FILESDIR}"/${P}-respect-AR.patch + "${FILESDIR}"/${P}-gcc11-fix-const.patch + "${FILESDIR}"/${P}-clang-widening.patch +) src_prepare() { - epatch "${FILESDIR}"/${P}-gcc43.patch \ - "${FILESDIR}"/${P}-libpng14.patch - # no thanks we'll take care of it. + default + + # No thanks, we'll take care of it. sed -i \ -e '/^SUBDIRS/s/desktop//' \ - Makefile.in || die + Makefile.{in,am} || die sed -i \ - -e "/CXXFLAGS/s:-O3:${CXXFLAGS}:" \ + -e "/CXXFLAGS/s|-O3|${CXXFLAGS}|" \ -e 's:=.*share/locale:=/usr/share/locale:' \ - configure || die + configure{,.ac} || die sed -i \ -e 's:$(datadir)/locale:/usr/share/locale:' \ po/Makefile.in.in || die + + eautoreconf } src_configure() { - egamesconf $(use_enable nls) + econf $(use_enable nls) } src_install() { default doicon desktop/briquolo.svg make_desktop_entry briquolo Briquolo - prepgamesdirs } diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch b/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch new file mode 100644 index 000000000000..5afaaefd5848 --- /dev/null +++ b/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch @@ -0,0 +1,31 @@ +https://bugs.gentoo.org/739094 +https://svnweb.freebsd.org/ports/head/games/briquolo/files/patch-src-MOGL-MOGL_PoliceTTF.h?revision=460698&view=co + +Fix types passed to SDL_Rect structure (SDL 1.2) + +--- a/src/MOGL/MOGL_PoliceTTF.h ++++ b/src/MOGL/MOGL_PoliceTTF.h +@@ -42,10 +42,10 @@ + { + GLuint TextureName; + Uint16 carac; +- unsigned int x1; +- unsigned int y1; +- unsigned int x2; +- unsigned int y2; ++ Sint16 x1; ++ Sint16 y1; ++ int x2; ++ int y2; + }; + + struct MOGL_Struct_TextureCarac +@@ -141,7 +141,7 @@ + MOGL_Struct_Carac * _Caracteres; + MOGL_Struct_Carac * (_Correspondance[256-32]); + +- unsigned int _LastTextureX, _LastTextureY; ++ Sint16 _LastTextureX, _LastTextureY; + unsigned int maxHeightCarac; + MOGL_Map_Carac _MapCarac; + MOGL_Vector_TextureName _VectorTextureName; diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch b/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch new file mode 100644 index 000000000000..d5d68819675a --- /dev/null +++ b/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/790746 +--- a/src/MOGL/MOGL_Fenetre.h ++++ b/src/MOGL/MOGL_Fenetre.h +@@ -52,7 +52,7 @@ class MOGL_Fenetre + private: + struct CompareResolution + { +- bool operator() (const MOGL_Resolution & x, const MOGL_Resolution & y) ++ bool operator() (const MOGL_Resolution & x, const MOGL_Resolution & y) const + { + return x.w < y.w; + } diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-gcc43.patch b/games-arcade/briquolo/files/briquolo-0.5.7-gcc43.patch index 13e932a1c69e..ba2690792dd5 100644 --- a/games-arcade/briquolo/files/briquolo-0.5.7-gcc43.patch +++ b/games-arcade/briquolo/files/briquolo-0.5.7-gcc43.patch @@ -1,6 +1,5 @@ -diff -ru src.orig/Constante.cpp src/Constante.cpp ---- src.orig/Constante.cpp 2008-03-22 05:40:33.000000000 -0400 -+++ src/Constante.cpp 2008-06-11 23:16:46.000000000 -0400 +--- a/src/Constante.cpp ++++ b/src/Constante.cpp @@ -27,6 +27,7 @@ #define DATADIR_BRIQUOLO "./" #define PACKAGE "briquolo" @@ -9,9 +8,8 @@ diff -ru src.orig/Constante.cpp src/Constante.cpp #ifdef WIN32 #define WIN32_LEAN_AND_MEAN -diff -ru src.orig/MOGL/MOGL_EnsembleObjet.cpp src/MOGL/MOGL_EnsembleObjet.cpp ---- src.orig/MOGL/MOGL_EnsembleObjet.cpp 2008-03-24 09:12:36.000000000 -0400 -+++ src/MOGL/MOGL_EnsembleObjet.cpp 2008-06-11 23:17:11.000000000 -0400 +--- a/src/MOGL/MOGL_EnsembleObjet.cpp ++++ b/src/MOGL/MOGL_EnsembleObjet.cpp @@ -24,7 +24,8 @@ #include "MOGL_Armature.h" #include "MOGL_Peau.h" @@ -22,9 +20,8 @@ diff -ru src.orig/MOGL/MOGL_EnsembleObjet.cpp src/MOGL/MOGL_EnsembleObjet.cpp //#include <mmsystem.h> -diff -ru src.orig/MOGL/MOGL_GestionnaireObjet.cpp src/MOGL/MOGL_GestionnaireObjet.cpp ---- src.orig/MOGL/MOGL_GestionnaireObjet.cpp 2008-03-24 08:56:13.000000000 -0400 -+++ src/MOGL/MOGL_GestionnaireObjet.cpp 2008-06-11 23:18:45.000000000 -0400 +--- a/src/MOGL/MOGL_GestionnaireObjet.cpp ++++ b/src/MOGL/MOGL_GestionnaireObjet.cpp @@ -21,6 +21,7 @@ *****************************************************************************/ #include "../I18n.h" @@ -33,9 +30,8 @@ diff -ru src.orig/MOGL/MOGL_GestionnaireObjet.cpp src/MOGL/MOGL_GestionnaireObje bool MOGL_GestionnaireObjet::ChargerObjetASCTriangle(const char * p_NomFichier, const MOGL_GestionnaireTexture & p_GM, MOGL_Objet & p_Objet) -diff -ru src.orig/MOGL/MOGL_GestionnaireObjet.h src/MOGL/MOGL_GestionnaireObjet.h ---- src.orig/MOGL/MOGL_GestionnaireObjet.h 2006-03-07 15:31:24.000000000 -0500 -+++ src/MOGL/MOGL_GestionnaireObjet.h 2008-06-11 23:20:07.000000000 -0400 +--- a/src/MOGL/MOGL_GestionnaireObjet.h ++++ b/src/MOGL/MOGL_GestionnaireObjet.h @@ -24,7 +24,8 @@ #include <vector> @@ -46,9 +42,8 @@ diff -ru src.orig/MOGL/MOGL_GestionnaireObjet.h src/MOGL/MOGL_GestionnaireObjet. #include "MOGL_Triangle.h" #include "MOGL_Objet.h" -diff -ru src.orig/MOGL/MOGL_Image.h src/MOGL/MOGL_Image.h ---- src.orig/MOGL/MOGL_Image.h 2006-03-07 15:53:11.000000000 -0500 -+++ src/MOGL/MOGL_Image.h 2008-06-11 23:20:51.000000000 -0400 +--- a/src/MOGL/MOGL_Image.h ++++ b/src/MOGL/MOGL_Image.h @@ -24,6 +24,7 @@ #include "MOGL_Structure.h" @@ -57,9 +52,8 @@ diff -ru src.orig/MOGL/MOGL_Image.h src/MOGL/MOGL_Image.h using namespace std; -diff -ru src.orig/MOGL/MOGL_Objet.cpp src/MOGL/MOGL_Objet.cpp ---- src.orig/MOGL/MOGL_Objet.cpp 2006-03-07 15:31:24.000000000 -0500 -+++ src/MOGL/MOGL_Objet.cpp 2008-06-11 23:21:05.000000000 -0400 +--- a/src/MOGL/MOGL_Objet.cpp ++++ b/src/MOGL/MOGL_Objet.cpp @@ -20,6 +20,7 @@ * *****************************************************************************/ @@ -68,9 +62,8 @@ diff -ru src.orig/MOGL/MOGL_Objet.cpp src/MOGL/MOGL_Objet.cpp //MOGL_Objet::MOGL_Objet(): MOGL_ObjetAbstrait(), MOGL_ElementArbre() MOGL_Objet::MOGL_Objet(): MOGL_Noeud(), _ModifieTriangle(true), _ModifieStrip(true), -diff -ru src.orig/MOGL/MOGL_Peau.cpp src/MOGL/MOGL_Peau.cpp ---- src.orig/MOGL/MOGL_Peau.cpp 2006-03-07 15:31:24.000000000 -0500 -+++ src/MOGL/MOGL_Peau.cpp 2008-06-11 23:21:17.000000000 -0400 +--- a/src/MOGL/MOGL_Peau.cpp ++++ b/src/MOGL/MOGL_Peau.cpp @@ -20,6 +20,7 @@ * *****************************************************************************/ diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-libpng14.patch b/games-arcade/briquolo/files/briquolo-0.5.7-libpng14.patch index d325bac02578..201922e24e61 100644 --- a/games-arcade/briquolo/files/briquolo-0.5.7-libpng14.patch +++ b/games-arcade/briquolo/files/briquolo-0.5.7-libpng14.patch @@ -1,7 +1,7 @@ http://bugs.gentoo.org/show_bug.cgi?id=308667 ---- src/MOGL/MOGL_Image.cpp -+++ src/MOGL/MOGL_Image.cpp +--- a/src/MOGL/MOGL_Image.cpp ++++ b/src/MOGL/MOGL_Image.cpp @@ -183,7 +183,7 @@ bool MOGL_Image::ChargerPNG(const char * info_ptr = png_create_info_struct(png_ptr); if (info_ptr == NULL) diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-respect-AR.patch b/games-arcade/briquolo/files/briquolo-0.5.7-respect-AR.patch new file mode 100644 index 000000000000..2cccf8341e9a --- /dev/null +++ b/games-arcade/briquolo/files/briquolo-0.5.7-respect-AR.patch @@ -0,0 +1,10 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -16,6 +16,7 @@ AM_INIT_AUTOMAKE(dist-bzip2) + # Checks for programs. + AC_PROG_CXX + AC_PROG_CC ++AM_PROG_AR + AC_PROG_INSTALL + AC_PROG_RANLIB + AC_PROG_YACC diff --git a/games-arcade/briquolo/metadata.xml b/games-arcade/briquolo/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/briquolo/metadata.xml +++ b/games-arcade/briquolo/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/bumprace/bumprace-1.5.3.ebuild b/games-arcade/bumprace/bumprace-1.5.3-r1.ebuild index cd28a4e023c1..e283536bccab 100644 --- a/games-arcade/bumprace/bumprace-1.5.3.ebuild +++ b/games-arcade/bumprace/bumprace-1.5.3-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=7 + +inherit desktop DESCRIPTION="simple arcade racing game" HOMEPAGE="http://www.linux-games.com/bumprace/" @@ -11,17 +12,17 @@ SRC_URI="http://user.cs.tu-berlin.de/~karlb/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -DEPEND="media-libs/libsdl[sound,video] +DEPEND=" + media-libs/libsdl[sound,video] + media-libs/sdl-image[gif,jpeg,png] media-libs/sdl-mixer[mod] virtual/jpeg:0 sys-libs/zlib - media-libs/sdl-image[gif,jpeg,png]" -RDEPEND=${DEPEND} +" +RDEPEND="${DEPEND}" src_install() { default make_desktop_entry bumprace BumpRace - prepgamesdirs } diff --git a/games-arcade/bumprace/metadata.xml b/games-arcade/bumprace/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/bumprace/metadata.xml +++ b/games-arcade/bumprace/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/burgerspace/Manifest b/games-arcade/burgerspace/Manifest index d6a4983327db..05af86cb66e6 100644 --- a/games-arcade/burgerspace/Manifest +++ b/games-arcade/burgerspace/Manifest @@ -1 +1 @@ -DIST burgerspace-1.9.2.tar.gz 505314 BLAKE2B 8a6de753e41de791fdc3a2ceb106f193da3de6c04c80c19b9f84cb03f569982ae8f3fe2e5541c1c389e16085d51867733d4911f04266497420eafd170d085095 SHA512 b2af53d6fcf1d52164870147aa8a5b08941ecb62f3d9bbce5c2872885923057481c21bc34f1e19b8aeb8a76acadd9a11c11fa7b6304438610e8a23e043b7deee +DIST burgerspace-1.9.3.tar.gz 517492 BLAKE2B 6d3cf554580a1a370720f349ae71edab7228c18426d4ae39a8f5bb9177071204715e527beea52aa6b11b9112db5a168951d92b0de60189cfdb1882c85c79d1f2 SHA512 59629ca497a0a379858ba69bb444182f935b58be6554109fb9b309713bd6bde0d771e63858802f9153a4e46bbfe63b5edf58f857bb94ca337dbba89ff3c610cb diff --git a/games-arcade/burgerspace/burgerspace-1.9.2.ebuild b/games-arcade/burgerspace/burgerspace-1.9.2.ebuild deleted file mode 100644 index 2dea3767701f..000000000000 --- a/games-arcade/burgerspace/burgerspace-1.9.2.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools games - -DESCRIPTION="Clone of the 1982 BurgerTime video game by Data East" -HOMEPAGE="https://perso.b2b2c.ca/~sarrazip/dev/burgerspace.html" -SRC_URI="https://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="network" -RESTRICT="test" # doesn't really test anything - -RDEPEND=">=dev-games/flatzebra-0.1.6" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - sed -i \ - -e "/^pkgsounddir/ s:sounds.*:\$(PACKAGE)/sounds:" \ - -e "/^desktopentrydir/ s:=.*:=/usr/share/applications:" \ - -e "/^pixmapdir/ s:=.*:=/usr/share/pixmaps:" \ - src/Makefile.am \ - || die - sed -i \ - -e "/Categories/s:Application;::" \ - -e "/Icon/s:\..*::" \ - -e "/Terminal/s:0:false:" \ - src/burgerspace.desktop.in \ - || die - eautoreconf -} - -src_configure() { - egamesconf \ - $(use_with network) -} - -src_install() { - emake -C src DESTDIR="${D}" install - doman doc/${PN}.6 - dodoc AUTHORS NEWS README THANKS - prepgamesdirs -} diff --git a/games-arcade/burgerspace/burgerspace-1.9.3-r1.ebuild b/games-arcade/burgerspace/burgerspace-1.9.3-r1.ebuild new file mode 100644 index 000000000000..20885e388a68 --- /dev/null +++ b/games-arcade/burgerspace/burgerspace-1.9.3-r1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools xdg + +DESCRIPTION="Clone of the 1982 BurgerTime video game by Data East" +HOMEPAGE="http://perso.b2b2c.ca/~sarrazip/dev/burgerspace.html" +SRC_URI="http://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="network" +RESTRICT="test" # doesn't really test anything + +RDEPEND=">=dev-games/flatzebra-0.1.7 + media-libs/libsdl[joystick] + media-libs/sdl-image + media-libs/sdl-mixer" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/${PN}-1.9.3-autotools.patch ) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf $(use_with network) +} diff --git a/games-arcade/burgerspace/files/burgerspace-1.9.3-autotools.patch b/games-arcade/burgerspace/files/burgerspace-1.9.3-autotools.patch new file mode 100644 index 000000000000..cd7db7a1d73a --- /dev/null +++ b/games-arcade/burgerspace/files/burgerspace-1.9.3-autotools.patch @@ -0,0 +1,62 @@ +* Install "doc/burgerspace-server.6" only when installing the server +* Use "$datarootdir" for FDO specified paths + This is recommended by Debian, as $datadir could be specified to lie + on a different file system, whereas icons/desktop/pixmaps are specified + by freedesktop.org and are based on $datarootdir + -> https://blogs.gnome.org/hughsie/2014/06/16/datarootdir-v-s-datadir/ +* Do not install LICENSE + The fact that the source is licensed under the GPL doesn't require installing + the COPYING file along. +* Nested sound files in "$pkgdatadir", i.e., $(datadir)/$(PACKAGE) + +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,12 +2,13 @@ + + SUBDIRS = src + +-man_MANS = doc/burgerspace.6 doc/burgerspace-server.6 ++man_MANS = doc/burgerspace.6 ++if BUILD_NETWORK ++man_MANS += doc/burgerspace-server.6 ++endif + +-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION) + doc_DATA = \ + AUTHORS \ +- COPYING \ + NEWS \ + README \ + THANKS +@@ -17,6 +18,7 @@ + $(RPMBUILD) -ta $(distdir).tar.gz + + EXTRA_DIST = \ ++ COPYING \ + bootstrap \ + autogen.sh \ + $(PACKAGE).spec \ +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -74,10 +74,10 @@ + PKGSOUNDDIR=$(srcdir)/sounds ./$(PACKAGE) + + +-desktopentrydir = $(datadir)/applications ++desktopentrydir = $(datarootdir)/applications + desktopentry_DATA = $(PACKAGE).desktop + +-pixmapdir = $(datadir)/pixmaps ++pixmapdir = $(datarootdir)/pixmaps + pixmap_DATA = images/$(PACKAGE).png + + +@@ -193,7 +193,7 @@ + images/digit8.xpm \ + images/digit9.xpm + +-pkgsounddir = $(datadir)/sounds/$(PACKAGE) ++pkgsounddir = $(pkgdatadir)/sounds + pkgsound_DATA = \ + sounds/ingredient-bounces.wav \ + sounds/ingredient-in-plate.wav \ diff --git a/games-arcade/burgerspace/metadata.xml b/games-arcade/burgerspace/metadata.xml index 0f35d2dd16cf..b80ce794cf01 100644 --- a/games-arcade/burgerspace/metadata.xml +++ b/games-arcade/burgerspace/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/cavezofphear/cavezofphear-0.5.1-r1.ebuild b/games-arcade/cavezofphear/cavezofphear-0.5.1-r1.ebuild new file mode 100644 index 000000000000..d9356a2052b6 --- /dev/null +++ b/games-arcade/cavezofphear/cavezofphear-0.5.1-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="A boulder dash / digger-like game for console using ncurses" +HOMEPAGE="http://www.x86.no/cavezofphear/" +SRC_URI="mirror://gentoo/phear-${PV}.tar.bz2" +S="${WORKDIR}"/${P/cavezof/} + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + +RDEPEND=">=sys-libs/ncurses-5:0=" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-no-common.patch +) + +src_prepare() { + default + + sed -i \ + -e "s:get_data_dir(.):\"/usr/share/${PN}/\":" \ + src/{chk.c,main.c,gplot.c} \ + || die +} + +src_configure() { + tc-export CC PKG_CONFIG +} + +src_install() { + dobin src/phear + insinto /usr/share/${PN} + doins -r data/* + dodoc ChangeLog README* TODO +} diff --git a/games-arcade/cavezofphear/cavezofphear-0.5.1.ebuild b/games-arcade/cavezofphear/cavezofphear-0.5.1.ebuild deleted file mode 100644 index 459bd6d3f2ae..000000000000 --- a/games-arcade/cavezofphear/cavezofphear-0.5.1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils games - -DESCRIPTION="A boulder dash / digger-like game for console using ncurses" -HOMEPAGE="http://www.x86.no/cavezofphear/" -SRC_URI="mirror://gentoo/phear-${PV}.tar.bz2" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" -IUSE="" - -RDEPEND=">=sys-libs/ncurses-5:0" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S=${WORKDIR}/${P/cavezof/} - -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch - sed -i \ - -e "s:get_data_dir(.):\"${GAMES_DATADIR}/${PN}/\":" \ - src/{chk.c,main.c,gplot.c} \ - || die -} - -src_install() { - dogamesbin src/phear - insinto "${GAMES_DATADIR}"/${PN} - doins -r data/* - dodoc ChangeLog README* TODO - prepgamesdirs -} diff --git a/games-arcade/cavezofphear/files/cavezofphear-0.5.1-gentoo.patch b/games-arcade/cavezofphear/files/cavezofphear-0.5.1-gentoo.patch index fbf79af44519..e3cb92c17a01 100644 --- a/games-arcade/cavezofphear/files/cavezofphear-0.5.1-gentoo.patch +++ b/games-arcade/cavezofphear/files/cavezofphear-0.5.1-gentoo.patch @@ -1,6 +1,5 @@ -diff -ru phear-0.5.1.orig/Makefile phear-0.5.1/Makefile ---- phear-0.5.1.orig/Makefile 2007-02-27 06:21:55.000000000 -0500 -+++ phear-0.5.1/Makefile 2013-01-18 02:09:56.403224104 -0500 +--- a/Makefile ++++ b/Makefile @@ -2,7 +2,7 @@ DESTDIR_DATA = /usr/local/share @@ -10,9 +9,8 @@ diff -ru phear-0.5.1.orig/Makefile phear-0.5.1/Makefile clean: rm -f phear editor install: -diff -ru phear-0.5.1.orig/src/Makefile phear-0.5.1/src/Makefile ---- phear-0.5.1.orig/src/Makefile 2011-12-12 07:26:03.000000000 -0500 -+++ phear-0.5.1/src/Makefile 2013-01-18 02:10:48.218423433 -0500 +--- a/src/Makefile ++++ b/src/Makefile @@ -2,10 +2,8 @@ DESTDIR = .. @@ -21,7 +19,7 @@ diff -ru phear-0.5.1.orig/src/Makefile phear-0.5.1/src/Makefile INSTALL = install -CFLAGS ?= -s -Wall -O2 -LDFLAGS += -lncurses -+LDLIBS = `pkg-config ncurses --libs` ++LDLIBS = `${PKG_CONFIG} ncurses --libs` all: phear install clean diff --git a/games-arcade/cavezofphear/files/cavezofphear-0.5.1-no-common.patch b/games-arcade/cavezofphear/files/cavezofphear-0.5.1-no-common.patch new file mode 100644 index 000000000000..4cc9bb5be02c --- /dev/null +++ b/games-arcade/cavezofphear/files/cavezofphear-0.5.1-no-common.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/706880 +--- a/src/editor.c ++++ b/src/editor.c +@@ -24,7 +24,7 @@ + #include "common.h" + #include "proto.h" + +-char map[MAP_YSIZE][MAP_XSIZE]; ++extern char map[MAP_YSIZE][MAP_XSIZE]; + int lock; + int last_obj; + +--- a/src/frame.c ++++ b/src/frame.c +@@ -26,7 +26,7 @@ void bail(char *message); + void sigint_handler(); + void sigwinch_handler(); + +-int need_refresh; ++extern int need_refresh; + + void curses_start(void) + { diff --git a/games-arcade/cavezofphear/metadata.xml b/games-arcade/cavezofphear/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/cavezofphear/metadata.xml +++ b/games-arcade/cavezofphear/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/cdogs-sdl/Manifest b/games-arcade/cdogs-sdl/Manifest index 42dd2833ce2a..bbaf745f3bdd 100644 --- a/games-arcade/cdogs-sdl/Manifest +++ b/games-arcade/cdogs-sdl/Manifest @@ -1,2 +1,2 @@ -DIST cdogs-data-2007-07-06.tar.bz2 218810 BLAKE2B fb788ed11ef220b4f244a74be838536281a87a5c8055cb9674b4269f0a63cb07120b31af113fab63f820c1b293c97b310e91d3638bc41d5d3ef4a12472481aaa SHA512 9e645d64bcc0b99df9fb113f7103590eb8045ca9439700279c8ea55a6277d10fc38aff38bb1137887bc5697c505fe18e15d6c62eaf2790c065b1261fa7418a84 -DIST cdogs-sdl-0.4.tar.bz2 164804 BLAKE2B 91498d981b2318d4f1d68112fe8d574b447290f9cad7b232a56cd6d516ca2fd3983b01789c87914f81eaa6d1c593dac95fe88ec1cd2823e6769d9f5980c6c2d5 SHA512 69fbac533207e38c85cf0f71db47df50405a5ff220a6662f7e186d1f54c4181ee56e1ff8049a427acec7fcf0529b8df66db36a693978bb0aa04eb0594a8b5adc +DIST cdogs-sdl-2.0.0.tar.gz 35833483 BLAKE2B 3e5a57a6571ad3c28a28c6a29f34cf0b5db09aadc666c4258f33efe78b2b7c5a9b69a311a8cab79c994f88d865f2b9961dff515ebe4e45afb9ae20200b5b9733 SHA512 1e68bf0eed882836849c41d3c6a38275d8d3c551b0776b8658996d18d65a6401f810d265e9a5a666ab3b8694fe341b2783f72dee681c242f54373a584b4e2a3c +DIST cdogs-sdl-2.1.0.tar.gz 35945061 BLAKE2B 03dc9554fd982ecc322a01224846fde05a116cdea8ed8415ba703d2711957ec5314301c7a92117d231d338cabe4c21e14297c2cff1205f6cf1abac1ff7606c4a SHA512 92b82a94cd73c7e33e141878db6ee71ca1e164a41c79e0c575aa02f4121506496e2e8e6bbef1eb239c7b145b90c0a49c3f31f4cc6d8817f75e91f5554b6d6d05 diff --git a/games-arcade/cdogs-sdl/cdogs-sdl-0.4-r1.ebuild b/games-arcade/cdogs-sdl/cdogs-sdl-0.4-r1.ebuild deleted file mode 100644 index 04c64376691c..000000000000 --- a/games-arcade/cdogs-sdl/cdogs-sdl-0.4-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils flag-o-matic games - -CDOGS_DATA="cdogs-data-2007-07-06" -DESCRIPTION="A port of the old DOS arcade game C-Dogs" -HOMEPAGE="http://lumaki.com/code/cdogs" -SRC_URI="http://icculus.org/cdogs-sdl/files/src/${P}.tar.bz2 - http://icculus.org/cdogs-sdl/files/data/${CDOGS_DATA}.tar.bz2" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="media-libs/libsdl[video] - media-libs/sdl-mixer" -RDEPEND=${DEPEND} - -S=${WORKDIR}/${P}/src - -src_unpack() { - unpack ${A} - mv ${CDOGS_DATA} ${P}/data || die -} - -src_prepare() { - sed -i \ - -e "/^CF_OPT/d" \ - -e "/^CC/d" \ - Makefile || die - sed -i -e "/\bopen(/s/)/, 0666)/" files.c || die - epatch "${FILESDIR}"/${P}-64bit.patch - append-cflags -std=gnu89 # build with gcc5 (bug #571112) -} - -src_compile() { - emake I_AM_CONFIGURED=yes \ - SYSTEM="\"linux\"" \ - STRIP=true \ - DATADIR="${GAMES_DATADIR}/${PN}" \ - cdogs -} - -src_install() { - dogamesbin cdogs - insinto "${GAMES_DATADIR}/${PN}" - doins -r ../data/* - newicon ../data/cdogs_icon.png ${PN}.png - dodoc ../doc/{README,AUTHORS,ChangeLog,README_DATA,TODO,original_readme.txt} - make_desktop_entry "cdogs -fullscreen" C-Dogs - prepgamesdirs -} diff --git a/games-arcade/cdogs-sdl/cdogs-sdl-2.0.0.ebuild b/games-arcade/cdogs-sdl/cdogs-sdl-2.0.0.ebuild new file mode 100644 index 000000000000..45e3f8fbcc15 --- /dev/null +++ b/games-arcade/cdogs-sdl/cdogs-sdl-2.0.0.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic xdg + +DESCRIPTION="Classic overhead run-and-gun game" +HOMEPAGE="https://cxong.github.io/cdogs-sdl/" +SRC_URI=" + https://github.com/cxong/cdogs-sdl/archive/refs/tags/${PV}.tar.gz + -> ${P}.tar.gz +" + +LICENSE=" + GPL-2+ + BSD-2 CC-BY-3.0 CC-BY-4.0 CC-BY-SA-3.0 CC0-1.0 WTFPL-2 XMAME public-domain +" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + media-libs/libsdl2[haptic,opengl] + media-libs/sdl2-image[png] + media-libs/sdl2-mixer[mp3,vorbis,wav] + net-libs/enet:1.3= +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.1.1-cmake.patch +) + +src_configure() { + filter-lto #858527 + + local mycmakeargs=( + -DCDOGS_DATA_DIR="${EPREFIX}"/usr/share/${PN}/ # trailing / is needed + -DBUILD_EDITOR=OFF + -DUSE_SHARED_ENET=ON + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + dodoc doc/{AUTHORS,original_readme.txt} + + # CREDITS is used at runtime, rest is licenses or duplicates + find "${ED}"/usr/share/${PN}/doc -type f ! -name CREDITS -delete || die +} diff --git a/games-arcade/cdogs-sdl/cdogs-sdl-2.1.0.ebuild b/games-arcade/cdogs-sdl/cdogs-sdl-2.1.0.ebuild new file mode 100644 index 000000000000..45e3f8fbcc15 --- /dev/null +++ b/games-arcade/cdogs-sdl/cdogs-sdl-2.1.0.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic xdg + +DESCRIPTION="Classic overhead run-and-gun game" +HOMEPAGE="https://cxong.github.io/cdogs-sdl/" +SRC_URI=" + https://github.com/cxong/cdogs-sdl/archive/refs/tags/${PV}.tar.gz + -> ${P}.tar.gz +" + +LICENSE=" + GPL-2+ + BSD-2 CC-BY-3.0 CC-BY-4.0 CC-BY-SA-3.0 CC0-1.0 WTFPL-2 XMAME public-domain +" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + media-libs/libsdl2[haptic,opengl] + media-libs/sdl2-image[png] + media-libs/sdl2-mixer[mp3,vorbis,wav] + net-libs/enet:1.3= +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.1.1-cmake.patch +) + +src_configure() { + filter-lto #858527 + + local mycmakeargs=( + -DCDOGS_DATA_DIR="${EPREFIX}"/usr/share/${PN}/ # trailing / is needed + -DBUILD_EDITOR=OFF + -DUSE_SHARED_ENET=ON + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + dodoc doc/{AUTHORS,original_readme.txt} + + # CREDITS is used at runtime, rest is licenses or duplicates + find "${ED}"/usr/share/${PN}/doc -type f ! -name CREDITS -delete || die +} diff --git a/games-arcade/cdogs-sdl/files/cdogs-sdl-0.4-64bit.patch b/games-arcade/cdogs-sdl/files/cdogs-sdl-0.4-64bit.patch deleted file mode 100644 index bcab13c0ebfd..000000000000 --- a/games-arcade/cdogs-sdl/files/cdogs-sdl-0.4-64bit.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- src/grafx.c -+++ src/grafx.c -@@ -216,12 +216,6 @@ - SDL_VideoQuit(); - } - --typedef struct _Pic { -- short int w; -- short int h; -- char *data; --} Pic; -- - int ReadPics(const char *filename, void **pics, int maxPics, - color * palette) - { -@@ -241,12 +235,12 @@ - fread(&size, sizeof(size), 1, f); - swap16(&size); - if (size) { -- Pic *p = sys_mem_alloc(size); -+ unsigned char *p = sys_mem_alloc(size); - -- f_read16(f, &p->w, 2); -- f_read16(f, &p->h, 2); -+ f_read16(f, &p[0], 2); // w -+ f_read16(f, &p[2], 2); // h - -- f_read(f, &p->data, size - 4); -+ f_read(f, &p[4], size - 4); // data - - pics[i] = p; - -@@ -278,11 +272,11 @@ - fread(&size, sizeof(size), 1, f); - swap16(&size); - if (size) { -- Pic *p = sys_mem_alloc(size); -+ unsigned char *p = sys_mem_alloc(size); - -- f_read16(f, &p->w, 2); -- f_read16(f, &p->h, 2); -- f_read(f, &p->data, size - 4); -+ f_read16(f, &p[0], 2); // w -+ f_read16(f, &p[2], 2); // h -+ f_read(f, &p[4], size - 4); // data - - pics[i] = p; - diff --git a/games-arcade/cdogs-sdl/files/cdogs-sdl-1.1.1-cmake.patch b/games-arcade/cdogs-sdl/files/cdogs-sdl-1.1.1-cmake.patch new file mode 100644 index 000000000000..92ce17bcbc39 --- /dev/null +++ b/games-arcade/cdogs-sdl/files/cdogs-sdl-1.1.1-cmake.patch @@ -0,0 +1,14 @@ +Remove -Werror and install data to CDOGS_DATA_DIR rather +than directly under CMAKE_INSTALL_PREFIX. +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -128,3 +128,3 @@ + if(NOT BEOS AND NOT HAIKU) +- add_definitions(-Winline -Werror) ++ add_definitions(-Winline) + set(EXTRA_LIBRARIES "m") +@@ -195,3 +195,3 @@ + set(LIB_EXTENSION ".so") +- set(DATA_INSTALL_DIR ".") ++ set(DATA_INSTALL_DIR ${CDOGS_DATA_DIR}) + endif() diff --git a/games-arcade/cdogs-sdl/metadata.xml b/games-arcade/cdogs-sdl/metadata.xml index 8332a46990b6..7a09ee92f034 100644 --- a/games-arcade/cdogs-sdl/metadata.xml +++ b/games-arcade/cdogs-sdl/metadata.xml @@ -1,14 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> <longdescription lang="en"> -C-Dogs is an arcade shoot-em-up which lets players work alone and -cooperatively during missions or fight against each other in the "dogfight" -deathmatch mode. The DOS version of C-Dogs came with severla built in missions -and dogfight maps. This version does too. +C-Dogs SDL is a classic overhead run-and-gun game, supporting up to 4 players in +co-op and deathmatch modes. Customize your player, choose from many weapons, and +blast, slide and slash your way through over 100 user-created campaigns. Have +fun! </longdescription> +<upstream> + <bugs-to>https://github.com/cxong/cdogs-sdl/issues</bugs-to> + <doc lang="en">https://cxong.github.io/cdogs-sdl/</doc> + <remote-id type="github">cxong/cdogs-sdl</remote-id> +</upstream> </pkgmetadata> diff --git a/games-arcade/ceferino/ceferino-0.97.8-r2.ebuild b/games-arcade/ceferino/ceferino-0.97.8-r2.ebuild deleted file mode 100644 index feb2563f0e38..000000000000 --- a/games-arcade/ceferino/ceferino-0.97.8-r2.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools desktop - -DESCRIPTION="Super-Pang clone (destroy bouncing balloons with your grapnel)" -HOMEPAGE="http://www.losersjuegos.com.ar/juegos/ceferino" -SRC_URI="mirror://debian/pool/main/c/ceferino/${PN}_${PV}+svn37.orig.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="nls" - -RDEPEND=" - >=media-libs/libsdl-1.2[video] - >=media-libs/sdl-image-1.2 - >=media-libs/sdl-mixer-1.2 - nls? ( virtual/libintl ) -" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext ) -" - -S="${WORKDIR}/${P}+svn37" - -src_prepare() { - default - eapply "${FILESDIR}"/${P}-latin1.patch - sed -i \ - -e '/^INCLUDES/s:\$(datadir)/locale:/usr/share/locale:' \ - src/Makefile.am || die - eautoreconf -} - -src_configure() { - econf $(use_enable nls) -} - -src_install() { - default - newicon data/ima/icono.png ${PN}.png - make_desktop_entry ceferino "Don Ceferino Haza単a" -} - -pkg_postinst() { - if ! has_version "media-libs/sdl-mixer[mod]" ; then - ewarn - ewarn "To hear music, you will have to rebuild media-libs/sdl-mixer" - ewarn "with the \"mod\" USE flag turned on." - ewarn - fi -} diff --git a/games-arcade/ceferino/ceferino-0.97.8-r3.ebuild b/games-arcade/ceferino/ceferino-0.97.8-r3.ebuild new file mode 100644 index 000000000000..e9f380a370e9 --- /dev/null +++ b/games-arcade/ceferino/ceferino-0.97.8-r3.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools desktop + +DESCRIPTION="Super-Pang clone (destroy bouncing balloons with your grapnel)" +HOMEPAGE="http://www.losersjuegos.com.ar/juegos/ceferino" +SRC_URI="mirror://debian/pool/main/c/ceferino/${PN}_${PV}+svn37.orig.tar.gz" +S="${WORKDIR}/${P}+svn37" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="nls" + +RDEPEND=" + media-libs/libsdl[sound,video] + media-libs/sdl-image[jpeg,png] + media-libs/sdl-mixer[mod] + nls? ( virtual/libintl )" +DEPEND="${RDEPEND}" +BDEPEND="nls? ( sys-devel/gettext )" + +PATCHES=( + "${FILESDIR}"/${P}-fix-audio.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf $(use_enable nls) +} + +src_install() { + default + newicon data/ima/icono.png ${PN}.png + make_desktop_entry ${PN} "Don Ceferino Haza単a" +} diff --git a/games-arcade/ceferino/files/ceferino-0.97.8-fix-audio.patch b/games-arcade/ceferino/files/ceferino-0.97.8-fix-audio.patch new file mode 100644 index 000000000000..6ac1de0d07f8 --- /dev/null +++ b/games-arcade/ceferino/files/ceferino-0.97.8-fix-audio.patch @@ -0,0 +1,11 @@ +12 .wav files for an array with 11 elements invokes undefined behavior. + +--- a/src/audio.h ++++ b/src/audio.h +@@ -50,5 +50,5 @@ + int canal_musica; + +- Mix_Chunk *sonidos[11]; ++ Mix_Chunk *sonidos[12]; + Mix_Music *musicas[2]; + diff --git a/games-arcade/ceferino/metadata.xml b/games-arcade/ceferino/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/ceferino/metadata.xml +++ b/games-arcade/ceferino/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/circuslinux/circuslinux-1.0.3-r1.ebuild b/games-arcade/circuslinux/circuslinux-1.0.3-r1.ebuild deleted file mode 100644 index 1001c7c8aeba..000000000000 --- a/games-arcade/circuslinux/circuslinux-1.0.3-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit desktop - -DESCRIPTION="clone of the Atari 2600 game \"Circus Atari\"" -SRC_URI="ftp://ftp.sonic.net/pub/users/nbs/unix/x/circus-linux/${P}.tar.gz" -HOMEPAGE="http://www.newbreedsoftware.com/circus-linux/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~x86" -IUSE="" - -DEPEND="media-libs/libsdl - media-libs/sdl-image[png] - media-libs/sdl-mixer[mod]" -RDEPEND="${DEPEND}" - -src_prepare() { - default - sed -i \ - -e "/^install-data-am/d" \ - Makefile.in \ - || die - sed -i \ - -e 's/\$(pkgdatadir)/$(DESTDIR)&/' \ - data/Makefile.in \ - || die -} - -src_install() { - default - newicon data/images/${PN}-icon.xpm ${PN}.xpm - make_desktop_entry ${PN} "Circus Linux!" -} diff --git a/games-arcade/circuslinux/circuslinux-1.0.3-r2.ebuild b/games-arcade/circuslinux/circuslinux-1.0.3-r2.ebuild new file mode 100644 index 000000000000..1d19f856630d --- /dev/null +++ b/games-arcade/circuslinux/circuslinux-1.0.3-r2.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop toolchain-funcs + +DESCRIPTION="Clone of the Atari 2600 game \"Circus Atari\"" +SRC_URI="ftp://ftp.tuxpaint.org/unix/x/circus-linux/src/${P}.tar.gz" +HOMEPAGE="http://www.newbreedsoftware.com/circus-linux/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + media-libs/libsdl[joystick,sound,video] + media-libs/sdl-image[png] + media-libs/sdl-mixer[mod]" +RDEPEND="${DEPEND}" + +src_prepare() { + default + tc-export CC + sed -i 's/-O2//' Makefile.in || die + sed -i 's/$(pkgdatadir)/$(DESTDIR)&/' data/Makefile.in || die +} + +src_configure() { + tc-export CC + econf --enable-joystick +} + +src_install() { + emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}" install + + newicon data/images/${PN}-icon.xpm ${PN}.xpm + make_desktop_entry ${PN} "Circus Linux!" +} diff --git a/games-arcade/circuslinux/metadata.xml b/games-arcade/circuslinux/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/circuslinux/metadata.xml +++ b/games-arcade/circuslinux/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/cob/Manifest b/games-arcade/cob/Manifest index 3f73042b7290..5c3011b55732 100644 --- a/games-arcade/cob/Manifest +++ b/games-arcade/cob/Manifest @@ -1 +1,2 @@ DIST cob-0.9.tar.gz 712618 BLAKE2B f73bec711f4e2c7907cf987fdd12207556752e05f5cf98f9818ef470c2bc2fa95f03c8c4a2f6c114b87d5c00cf3b17da3a1d127869b7ee548d5bd0d05d4c4114 SHA512 1a329bb06a25137c1dc9d65cff949ed1b0ca7445ecf897375be71581c35f0bc563008fc7607d650a660a405f2282b0329148487bd29b6a053478b61d932bdf4d +DIST cob.png 755 BLAKE2B d560e5b72275c174d4285f54e900f8fb82e54fd358df7aa07c37e9e75974fc776293faa9cb9c26c4aacbe28961462432b3d97193365533851b7c5179e291a6c2 SHA512 201e8c4d534532d22417e6a96832061e0286ade7e2fc768b9391114e86565cb38365674dbee19f13029e43b55dba7332ccd9536ff26629e3f7382090b8224882 diff --git a/games-arcade/cob/cob-0.9-r1.ebuild b/games-arcade/cob/cob-0.9-r1.ebuild deleted file mode 100644 index 8851838f489d..000000000000 --- a/games-arcade/cob/cob-0.9-r1.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit desktop - -DESCRIPTION="Cruising on Broadway: a painting-type game" -HOMEPAGE="http://www.autismuk.freeserve.co.uk/" -SRC_URI="http://www.autismuk.freeserve.co.uk/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~x86" -IUSE="" - -DEPEND="media-libs/libsdl[joystick,sound,video]" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-gcc43.patch - "${FILESDIR}"/${P}-gcc44.patch -) - -src_install() { - default - make_desktop_entry ${PN} "Cruising on Broadway" -} diff --git a/games-arcade/cob/cob-0.9-r2.ebuild b/games-arcade/cob/cob-0.9-r2.ebuild new file mode 100644 index 000000000000..5311fc6a8ea7 --- /dev/null +++ b/games-arcade/cob/cob-0.9-r2.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop + +DESCRIPTION="Cruising on Broadway: a painting-type game" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI=" + mirror://gentoo/${P}.tar.gz + https://dev.gentoo.org/~ionen/distfiles/${PN}.png" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="media-libs/libsdl[joystick,sound,video]" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-gcc43.patch + "${FILESDIR}"/${P}-gcc44.patch +) + +src_install() { + default + + doicon "${DISTDIR}"/${PN}.png + make_desktop_entry ${PN} "Cruising on Broadway" +} diff --git a/games-arcade/cob/metadata.xml b/games-arcade/cob/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/cob/metadata.xml +++ b/games-arcade/cob/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/commandergenius/commandergenius-2.4.0.ebuild b/games-arcade/commandergenius/commandergenius-2.4.0-r1.ebuild index 9baded9ec4a0..82eb3b850b7e 100644 --- a/games-arcade/commandergenius/commandergenius-2.4.0.ebuild +++ b/games-arcade/commandergenius/commandergenius-2.4.0-r1.ebuild @@ -1,17 +1,18 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7,8} ) +# note: version >=2.5.0 switches from python to lua +PYTHON_COMPAT=( python3_{9..11} ) +inherit cmake flag-o-matic python-single-r1 xdg -inherit desktop python-single-r1 xdg cmake +MY_P="Commander-Genius-v${PV}" -MY_PN="Commander-Genius" -MY_P="${MY_PN}-v${PV}" DESCRIPTION="Open Source Commander Keen clone (needs original game files)" -HOMEPAGE="http://clonekeenplus.sourceforge.net" -SRC_URI="https://gitlab.com/Dringgstein/${MY_PN}/-/archive/v${PV}/${MY_P}.tar.bz2" +HOMEPAGE="https://clonekeenplus.sourceforge.io/" +SRC_URI="https://gitlab.com/Dringgstein/Commander-Genius/-/archive/v${PV}/${MY_P}.tar.bz2" +S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" SLOT="0" @@ -28,50 +29,49 @@ RDEPEND=" sys-libs/zlib[minizip] downloader? ( net-misc/curl ) opengl? ( virtual/opengl ) - python? ( ${PYTHON_DEPS} ) -" - + python? ( ${PYTHON_DEPS} )" DEPEND=" ${RDEPEND} - dev-libs/boost -" - -BDEPEND="virtual/pkgconfig" + dev-libs/boost" +BDEPEND="python? ( ${PYTHON_DEPS} )" PATCHES=( "${FILESDIR}"/${PN}-2.3.1-build.patch "${FILESDIR}"/${PN}-2.3.1-paths.patch + "${FILESDIR}"/${P}-gcc13.patch ) -S="${WORKDIR}/${MY_P}" - -SHAREDIR="/usr/share" -GAMESDIR="${SHAREDIR}/${PN}/games" -DOCS=() +pkg_setup() { + use python && python-single-r1_pkg_setup +} src_configure() { + filter-lto #858530 + local mycmakeargs=( - -DAPPDIR="${EPREFIX}/usr/bin" - -DGAMES_SHAREDIR="${EPREFIX}${SHAREDIR}" - -DDOCDIR="${EPREFIX}/usr/share/doc/${PF}" + -DAPPDIR="${EPREFIX}"/usr/bin + -DDOCDIR="${EPREFIX}"/usr/share/doc/${PF} + -DGAMES_SHAREDIR="${EPREFIX}"/usr/share -DDOWNLOADER=$(usex downloader) -DUSE_OPENGL=$(usex opengl) -DUSE_PYTHON3=$(usex python) - -DUSE_SDL2=ON - -DUSE_SDL_TTF=ON # Crashes when disabled. + -DUSE_SDL2=yes + -DUSE_SDL_TTF=yes # crashes when disabled + $(usev python -DPython3_EXECUTABLE="${PYTHON}") ) cmake_src_configure } src_install() { + local DOCS=() # skip .in template file, can drop this on bump cmake_src_install - # The normal executable name is weird. + # default executable name is weird dosym CGeniusExe /usr/bin/${PN} - # Game data can be manually installed here. - keepdir "${GAMESDIR}" + # game data can be manually installed here + keepdir /usr/share/${PN}/games } pkg_postinst() { diff --git a/games-arcade/commandergenius/files/commandergenius-2.4.0-gcc13.patch b/games-arcade/commandergenius/files/commandergenius-2.4.0-gcc13.patch new file mode 100644 index 000000000000..866905c251b8 --- /dev/null +++ b/games-arcade/commandergenius/files/commandergenius-2.4.0-gcc13.patch @@ -0,0 +1,23 @@ +https://gitlab.com/Dringgstein/Commander-Genius/-/commit/f9fb2808acfca598fe6e6963c84fe9afe5bcd89e + +From f9fb2808acfca598fe6e6963c84fe9afe5bcd89e Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt <jengelh@inai.de> +Date: Tue, 28 Mar 2023 10:56:06 +0200 +Subject: [PATCH] build: resolve compile error with gcc-13 + +GsKit/base/utils/Unicode.h:16:9: error: 'uint32_t' does not name a type +GsKit/base/utils/Unicode.h:17:27: error: 'UnicodeChar' was not declared in this scope +GsKit/base/utils/Unicode.h:17:38: error: template argument 1 is invalid +... +--- a/GsKit/base/utils/Unicode.h ++++ b/GsKit/base/utils/Unicode.h +@@ -11,6 +11,7 @@ + #ifndef __UNICODE_H__ + #define __UNICODE_H__ + ++#include <cstdint> + #include <string> + + typedef uint32_t UnicodeChar; +-- +GitLab diff --git a/games-arcade/commandergenius/metadata.xml b/games-arcade/commandergenius/metadata.xml index 8de6e6384295..7a6ace45e180 100644 --- a/games-arcade/commandergenius/metadata.xml +++ b/games-arcade/commandergenius/metadata.xml @@ -1,5 +1,5 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?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> diff --git a/games-arcade/conveysdl/Manifest b/games-arcade/conveysdl/Manifest index f32988e47ccf..055890135264 100644 --- a/games-arcade/conveysdl/Manifest +++ b/games-arcade/conveysdl/Manifest @@ -1 +1,2 @@ DIST conveysdl.1.3.tar 429568 BLAKE2B 950952ad311bb51855bbd1cf3bf25b750d067db1cef8333f44ac3a96f30033f700efb9771d3050be6a3acc63c79b49fa8d64a1a11a088a777a13f21fb82a4c81 SHA512 fe6f91cdd63ae1019cb99613618e44ceeddb4080ad5e50bd8ce0abf27e057617d3658a29b2faf668cbc3b0887f1a4a05cadadb060f69d850c3d85c9e7190dd8a +DIST conveysdl.png 328 BLAKE2B a62da06757da9e103e7156a5fbda7b9a7e0381aa6d203fe4ed7e46568073eef6287a955303a227975f9e073dbab3bad990a8033200da204059887bb8078203c8 SHA512 dcf99bc5112189a5d33a183a8a6ecad3b70456a75112a3caece1d87f967fcb14279f6a2f9a47dc67967806c09b5725cb2f239c29be9370336c0f76bed4db1867 diff --git a/games-arcade/conveysdl/conveysdl-1.3-r1.ebuild b/games-arcade/conveysdl/conveysdl-1.3-r1.ebuild deleted file mode 100644 index 889cc7840cce..000000000000 --- a/games-arcade/conveysdl/conveysdl-1.3-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit desktop toolchain-funcs - -DESCRIPTION="Guide the blob along the conveyer belt collecting the red blobs" -HOMEPAGE="http://www.cloudsprinter.com/software/conveysdl/" -SRC_URI="http://www.cloudsprinter.com/software/conveysdl/${P/-/.}.tar" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="media-libs/libsdl[sound,video] - media-libs/sdl-mixer" -RDEPEND=${DEPEND} - -S="${WORKDIR}" - -src_prepare() { - default - - # Incomplete readme - sed -i \ - -e 's:I k:use -nosound to disable sound\n\nI k:' \ - readme || die - - sed -i \ - -e 's:SDL_Mi:SDL_mi:' \ - main.c || die - - eapply \ - "${FILESDIR}"/${P}-arrays.patch \ - "${FILESDIR}"/${P}-speed.patch -} - -src_compile() { - emake main \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS} $(sdl-config --cflags) \ - -DDATA_PREFIX=\\\"/usr/share/${PN}/\\\" \ - -DENABLE_SOUND" \ - LDLIBS="-lSDL_mixer $(sdl-config --libs)" -} - -src_install() { - newbin main ${PN} - insinto /usr/share/${PN} - doins -r gfx sounds levels - newicon gfx/jblob.bmp ${PN}.bmp - make_desktop_entry ${PN} Convey /usr/share/pixmaps/${PN}.bmp - einstalldocs -} diff --git a/games-arcade/conveysdl/conveysdl-1.3-r2.ebuild b/games-arcade/conveysdl/conveysdl-1.3-r2.ebuild new file mode 100644 index 000000000000..54d79cf9b620 --- /dev/null +++ b/games-arcade/conveysdl/conveysdl-1.3-r2.ebuild @@ -0,0 +1,53 @@ +# 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="Guide the blob along the conveyer belt collecting the red blobs" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI=" + mirror://gentoo/${P/-/.}.tar + https://dev.gentoo.org/~ionen/distfiles/${PN}.png" +S="${WORKDIR}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + media-libs/libsdl[sound,video] + media-libs/sdl-mixer" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-arrays.patch + "${FILESDIR}"/${P}-audio.patch + "${FILESDIR}"/${P}-speed.patch + "${FILESDIR}"/${P}-clang16.patch +) + +src_compile() { + tc-export CC + + append-cppflags $($(tc-getPKG_CONFIG) --cflags sdl SDL_mixer || die) \ + -DDATA_PREFIX="'\"${EPREFIX}/usr/share/${PN}/\"'" \ + -DENABLE_SOUND + append-libs $($(tc-getPKG_CONFIG) --libs sdl SDL_mixer || die) + + emake main LDLIBS="${LIBS}" +} + +src_install() { + newbin main ${PN} + + insinto /usr/share/${PN} + doins -r gfx levels sounds + + doicon "${DISTDIR}"/${PN}.png + make_desktop_entry ${PN} Convey + + dodoc readme +} diff --git a/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch b/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch index a6286d96f145..b733159425e6 100644 --- a/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch +++ b/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch @@ -1,29 +1,18 @@ ---- a/main.c.org 2010-07-28 13:16:20.552161148 +0300 -+++ b/main.c 2010-07-29 20:43:14.714543259 +0300 -@@ -22,7 +22,7 @@ - - SDL_Surface *bletters; +https://bugs.gentoo.org/330161 +--- a/main.c ++++ b/main.c +@@ -24,3 +24,3 @@ SDL_Surface *letters[100]; -SDL_Surface *tiles[9]; +SDL_Surface *tiles[10]; SDL_Surface *btiles; - SDL_Surface *blob; - SDL_Surface *jblob; -@@ -51,7 +51,7 @@ - FILE *file_ptr; - +@@ -53,3 +53,3 @@ -int bpointx,bpointy,pointx,pointy,jug,death,goose,jump,jumpf,blibs,spr[1000][8],leveldone,level,lives,totallevels,blobx[7],bloby[7],blobp[7],score,bak,bok,buk,bik,start,blibo,blibs,die,jumpoo=12,speed=4,arse,highscore; +int bpointx,bpointy,pointx,pointy,jug,death,goose,jump,jumpf,blibs,spr[1000][8],leveldone,level,lives,totallevels,blobx[8],bloby[8],blobp[8],score,bak,bok,buk,bik,start,blibo,blibs,die,jumpoo=12,speed=4,arse,highscore; /* Keys */ - int quit = 0; - int spacebar = 0; -@@ -452,7 +452,7 @@ - static void info(void) - { +@@ -454,3 +454,3 @@ int monkey=70,munk; - char scoremonkey[10]; + char scoremonkey[16]; if (lives>1) { - for (munk=1 ; munk<lives ; munk++ ) - { diff --git a/games-arcade/conveysdl/files/conveysdl-1.3-audio.patch b/games-arcade/conveysdl/files/conveysdl-1.3-audio.patch new file mode 100644 index 000000000000..9f76cb2dc0a9 --- /dev/null +++ b/games-arcade/conveysdl/files/conveysdl-1.3-audio.patch @@ -0,0 +1,15 @@ +Fix header and add lacking instructions to readme. +--- a/main.c ++++ b/main.c +@@ -8,3 +8,3 @@ + #ifdef ENABLE_SOUND +-#include <SDL_Mixer.h> ++#include <SDL_mixer.h> + static int soundv = 2; +--- a/readme ++++ b/readme +@@ -6,2 +6,4 @@ + ++use -nosound to disable sound ++ + I knocked this game up over a couple of days, and can't be diff --git a/games-arcade/conveysdl/files/conveysdl-1.3-clang16.patch b/games-arcade/conveysdl/files/conveysdl-1.3-clang16.patch new file mode 100644 index 000000000000..ca050433c474 --- /dev/null +++ b/games-arcade/conveysdl/files/conveysdl-1.3-clang16.patch @@ -0,0 +1,8 @@ +https://bugs.gentoo.org/871048 +--- a/main.c ++++ b/main.c +@@ -70,3 +70,3 @@ + +-int playsound(soundnum) ++int playsound(int soundnum) + { diff --git a/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch b/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch index 6d6d13eb11be..06d518597d94 100644 --- a/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch +++ b/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch @@ -1,31 +1,20 @@ ---- a/main.c 2010-07-30 10:41:21.392783010 +0300 -+++ b/main.c 2010-07-30 10:44:35.791690958 +0300 -@@ -52,6 +52,7 @@ - - +https://bugs.gentoo.org/330161 +--- a/main.c ++++ b/main.c +@@ -54,2 +54,3 @@ int bpointx,bpointy,pointx,pointy,jug,death,goose,jump,jumpf,blibs,spr[1000][8],leveldone,level,lives,totallevels,blobx[8],bloby[8],blobp[8],score,bak,bok,buk,bik,start,blibo,blibs,die,jumpoo=12,speed=4,arse,highscore; +int realspeed; /* Keys */ - int quit = 0; - int spacebar = 0; -@@ -140,6 +141,7 @@ - char path[256],jib[50]; - int lvspx,lvspy; +@@ -142,2 +143,3 @@ bpointx=200;bpointy=400;pointx=200;pointy=400;jug=1;death=0;jump=0;jumpf=0;jug=0;blibs=0;blibo=0;die=0;speed=4; + realspeed=speed; strcpy(path, DATA_PREFIX); - sprintf(jib,"levels/level%d",level); - strcat(path, jib); -@@ -212,15 +214,16 @@ - if (jumpf==jumpoo) { jump=0; } - if (jumpf==jumpoo*2) { jumpf=0; } +@@ -214,3 +216,3 @@ } - score+=speed; + score+=realspeed; /*crap*/ - } - - static void plotfloor(void) +@@ -220,5 +222,6 @@ { + if (bpointy==400) realspeed=speed; int nob,nx,nobx=48,ek,ej,el; @@ -34,23 +23,13 @@ + bpointx-=realspeed*2; + bpointy+=realspeed; pointx=bpointx; - pointy=bpointy; - imageplot(bb, blobx[6], bloby[6] ); -@@ -542,7 +545,7 @@ - } - while ( jump_down==0 ); +@@ -544,3 +547,3 @@ leveldone=3; - speed=4; + speed=4; realspeed=speed; blankscreen(); - } - -@@ -563,7 +566,7 @@ - if (quit>0) break; - } +@@ -565,3 +568,3 @@ while ( jump_down==0 ); - speed=4; + speed=4; realspeed=speed; lives+=1; - level+=1; - getlevel(); diff --git a/games-arcade/conveysdl/metadata.xml b/games-arcade/conveysdl/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/conveysdl/metadata.xml +++ b/games-arcade/conveysdl/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/cosmosmash/Manifest b/games-arcade/cosmosmash/Manifest index e5f1ca58169d..1ebc55d1d255 100644 --- a/games-arcade/cosmosmash/Manifest +++ b/games-arcade/cosmosmash/Manifest @@ -1 +1 @@ -DIST cosmosmash-1.4.7.tar.gz 906213 BLAKE2B 58117881e8f705d85c40cf5d0c56a734b80ebf7a84909c98a085aa5d880247c72af8a84d54fe11a4f02c8af226005c561802d93e7a747ff4a836feefde1cafde SHA512 1eaf8b05550c6f96e6392f6ba4565700cd4a9cac66dd57d634569caf9b4dfaf4917b3b9973153d4e6e0ddcd65c68d5242faae7c4f516c07c2e07d1b2f3b838b9 +DIST cosmosmash-1.4.8.tar.gz 921859 BLAKE2B 601ccf0eaf429bee240a6a07534afc44cb5bac390bedfc2548668048b8a5d93229e36de1c0e73856e3588d35cf7cfc6dbb00ac428fcc42612676281dcfaf0896 SHA512 4b78cac18035ef4bdbdebd2a206ceb3c80646fa030f568e171208af7510a6b1da9ef3fd817f3ebae83fbb42b1ce2900e8f1ff33ec23a8fe735022409ab1120af diff --git a/games-arcade/cosmosmash/cosmosmash-1.4.7-r1.ebuild b/games-arcade/cosmosmash/cosmosmash-1.4.8-r1.ebuild index 82f3d9518a71..3c08d0bb90da 100644 --- a/games-arcade/cosmosmash/cosmosmash-1.4.7-r1.ebuild +++ b/games-arcade/cosmosmash/cosmosmash-1.4.8-r1.ebuild @@ -1,37 +1,42 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + inherit autotools DESCRIPTION="A space rock shooting video game" HOMEPAGE="https://perso.b2b2c.ca/~sarrazip/dev/cosmosmash.html" -SRC_URI="https://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz" +SRC_URI="http://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RESTRICT="test" # uses the sound card which portage user might not be available. -RDEPEND=">=dev-games/flatzebra-0.1.6" -DEPEND="${RDEPEND} - virtual/pkgconfig -" +RDEPEND=">=dev-games/flatzebra-0.1.7 + media-libs/libsdl[joystick] + media-libs/sdl-image + media-libs/sdl-mixer" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" src_prepare() { default + sed -i \ -e "/^pkgsounddir/ s:sounds.*:\$(PACKAGE)/sounds:" \ -e "/^desktopentrydir/ s:=.*:=/usr/share/applications:" \ -e "/^pixmapdir/ s:=.*:=/usr/share/pixmaps:" \ src/Makefile.am \ || die + eautoreconf } src_install() { emake -C src DESTDIR="${D}" install + einstalldocs doman doc/${PN}.6 } diff --git a/games-arcade/cosmosmash/metadata.xml b/games-arcade/cosmosmash/metadata.xml index 418dc79f8c64..1c3ba213c494 100644 --- a/games-arcade/cosmosmash/metadata.xml +++ b/games-arcade/cosmosmash/metadata.xml @@ -1,12 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> -<longdescription lang="en"> -Afternoon Stalker, a clone of the 1981 Night Stalker video game by Mattel -Electronics. -</longdescription> </pkgmetadata> diff --git a/games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild b/games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild index eded2a71ead8..8d7f8c43bd2e 100644 --- a/games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild +++ b/games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit desktop +EAPI=7 +inherit autotools desktop DESCRIPTION="Addictive OpenGL-based block game" HOMEPAGE="http://www.nongnu.org/crack-attack/" @@ -15,28 +15,42 @@ IUSE="gtk sdl" RDEPEND=" media-libs/freeglut - sdl? ( media-libs/libsdl - media-libs/sdl-mixer ) + sdl? ( + media-libs/libsdl + media-libs/sdl-mixer + ) gtk? ( >=x11-libs/gtk+-2.6:2 ) " -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/${P}-glut.patch + "${FILESDIR}"/${P}-gcc43.patch + "${FILESDIR}"/${P}-avoid_bashisms.patch +) + src_prepare() { default - eapply \ - "${FILESDIR}"/${P}-glut.patch \ - "${FILESDIR}"/${P}-gcc43.patch + + # SDL macro not bundled + # bug #779745 + cp "${FILESDIR}/sdl.m4" . || die + AT_M4DIR="." eautoreconf + sed -i 's/-lXmu//' src/gtk-gui/Makefile.in src/Makefile.in || die touch -r . * */* } src_configure() { - econf \ - --disable-binreloc \ - $(use_enable sdl sound) \ + local myeconfargs=( + --disable-binreloc + $(use_enable sdl sound) $(use_enable gtk) + ) + econf "${myeconfargs[@]}" } src_install() { diff --git a/games-arcade/crack-attack/files/crack-attack-1.1.14-avoid_bashisms.patch b/games-arcade/crack-attack/files/crack-attack-1.1.14-avoid_bashisms.patch new file mode 100644 index 000000000000..8f405710dae4 --- /dev/null +++ b/games-arcade/crack-attack/files/crack-attack-1.1.14-avoid_bashisms.patch @@ -0,0 +1,15 @@ +--- crack-attack-1.1.14/configure.ac ++++ crack-attack-1.1.14/configure.ac +@@ -75,10 +75,10 @@ + ],[found_sound=no] + ) + +- if test "$enable_sound" == "yes" -a "$found_sound" == "no"; then ++ if test "$enable_sound" = "yes" -a "$found_sound" = "no"; then + AC_MSG_ERROR(libSDL and SDL_mixer are required for sound) + fi +- if test "$found_sound" == "yes"; then ++ if test "$found_sound" = "yes"; then + AUDIO_CFLAGS="$SDL_CFLAGS" + AUDIO_LIBS="$SDL_LIBS -lSDL_mixer" + AC_DEFINE(AUDIO_ENABLED, 1, [Has audio support]) diff --git a/games-arcade/crack-attack/files/sdl.m4 b/games-arcade/crack-attack/files/sdl.m4 new file mode 100644 index 000000000000..30e1f2144ee4 --- /dev/null +++ b/games-arcade/crack-attack/files/sdl.m4 @@ -0,0 +1,180 @@ +# Configure paths for SDL +# Sam Lantinga 9/21/99 +# stolen from Manish Singh +# stolen back from Frank Belew +# stolen from Manish Singh +# Shamelessly stolen from Owen Taylor + +# serial 2 + +dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS +dnl +AC_DEFUN([AM_PATH_SDL], +[dnl +dnl Get the cflags and libraries from the sdl-config script +dnl +AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], + sdl_prefix="$withval", sdl_prefix="") +AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)], + sdl_exec_prefix="$withval", sdl_exec_prefix="") +AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program], + , enable_sdltest=yes) + + min_sdl_version=ifelse([$1], ,1.2.0,$1) + + if test "x$sdl_prefix$sdl_exec_prefix" = x ; then + PKG_CHECK_MODULES([SDL], [sdl >= $min_sdl_version], + [sdl_pc=yes], + [sdl_pc=no]) + else + sdl_pc=no + if test x$sdl_exec_prefix != x ; then + sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix" + if test x${SDL_CONFIG+set} != xset ; then + SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config + fi + fi + if test x$sdl_prefix != x ; then + sdl_config_args="$sdl_config_args --prefix=$sdl_prefix" + if test x${SDL_CONFIG+set} != xset ; then + SDL_CONFIG=$sdl_prefix/bin/sdl-config + fi + fi + fi + + if test "x$sdl_pc" = xyes ; then + no_sdl="" + SDL_CONFIG="pkg-config sdl" + else + as_save_PATH="$PATH" + if test "x$prefix" != xNONE && test "$cross_compiling" != yes; then + PATH="$prefix/bin:$prefix/usr/bin:$PATH" + fi + AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH]) + PATH="$as_save_PATH" + AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) + no_sdl="" + + if test "$SDL_CONFIG" = "no" ; then + no_sdl=yes + else + SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags` + SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs` + + sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_sdltest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_CXXFLAGS="$CXXFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $SDL_CFLAGS" + CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" + LIBS="$LIBS $SDL_LIBS" +dnl +dnl Now check if the installed SDL is sufficiently new. (Also sanity +dnl checks the results of sdl-config to some extent +dnl + rm -f conf.sdltest + AC_RUN_IFELSE([AC_LANG_SOURCE([[ +#include <stdio.h> +#include <stdlib.h> +#include "SDL.h" + +int main (int argc, char *argv[]) +{ + int major, minor, micro; + FILE *fp = fopen("conf.sdltest", "w"); + + if (fp) fclose(fp); + + if (sscanf("$min_sdl_version", "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_sdl_version"); + exit(1); + } + + if (($sdl_major_version > major) || + (($sdl_major_version == major) && ($sdl_minor_version > minor)) || + (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version); + printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro); + printf("*** best to upgrade to the required version.\n"); + printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n"); + printf("*** to point to the correct copy of sdl-config, and remove the file\n"); + printf("*** config.cache before re-running configure\n"); + return 1; + } +} + +]])], [], [no_sdl=yes], [echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + CXXFLAGS="$ac_save_CXXFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_sdl" = x ; then + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + fi + fi + if test "x$no_sdl" = x ; then + ifelse([$2], , :, [$2]) + else + if test "$SDL_CONFIG" = "no" ; then + echo "*** The sdl-config script installed by SDL could not be found" + echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the SDL_CONFIG environment variable to the" + echo "*** full path to sdl-config." + else + if test -f conf.sdltest ; then + : + else + echo "*** Could not run SDL test program, checking why..." + CFLAGS="$CFLAGS $SDL_CFLAGS" + CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" + LIBS="$LIBS $SDL_LIBS" + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ +#include <stdio.h> +#include "SDL.h" + +int main(int argc, char *argv[]) +{ return 0; } +#undef main +#define main K_and_R_C_main +]], [[ return 0; ]])], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding SDL or finding the wrong" + echo "*** version of SDL. If it is not finding SDL, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means SDL was incorrectly installed" + echo "*** or that you have moved SDL since it was installed. In the latter case, you" + echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ]) + CFLAGS="$ac_save_CFLAGS" + CXXFLAGS="$ac_save_CXXFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + SDL_CFLAGS="" + SDL_LIBS="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(SDL_CFLAGS) + AC_SUBST(SDL_LIBS) + rm -f conf.sdltest +]) diff --git a/games-arcade/crack-attack/metadata.xml b/games-arcade/crack-attack/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/crack-attack/metadata.xml +++ b/games-arcade/crack-attack/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/criticalmass/criticalmass-1.0.2-r1.ebuild b/games-arcade/criticalmass/criticalmass-1.0.2-r1.ebuild deleted file mode 100644 index 5191beb0107f..000000000000 --- a/games-arcade/criticalmass/criticalmass-1.0.2-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools desktop flag-o-matic - -DESCRIPTION="SDL/OpenGL space shoot'em up game" -HOMEPAGE="http://criticalmass.sourceforge.net/" -SRC_URI="mirror://sourceforge/criticalmass/CriticalMass-${PV}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - media-libs/sdl-mixer - media-libs/sdl-image[png] - media-libs/libpng:0= - virtual/opengl - net-misc/curl -" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/CriticalMass-${PV}" - -src_prepare() { - default - - eapply "${FILESDIR}"/${P}-gcc43.patch \ - "${FILESDIR}"/${P}-system_curl.patch \ - "${FILESDIR}"/${P}-libpng14.patch \ - "${FILESDIR}"/${P}-cflags.patch \ - "${FILESDIR}"/${P}-libpng15.patch - - rm -rf curl - - mv configure.in configure.ac || die - eautoreconf -} - -src_configure() { - append-cxxflags -std=gnu++98 # Bug 612758 - default -} - -src_install() { - HTML_DOCS="Readme.html" - default - rm -f "${ED}/usr/bin/Packer" - newicon critter.png ${PN}.png - make_desktop_entry critter "Critical Mass" -} - -pkg_postinst() { - if ! has_version "media-libs/sdl-mixer[mod]" ; then - ewarn - ewarn "To hear music, you will have to rebuild media-libs/sdl-mixer" - ewarn "with the \"mod\" USE flag turned on." - ewarn - fi -} diff --git a/games-arcade/criticalmass/criticalmass-1.0.2-r2.ebuild b/games-arcade/criticalmass/criticalmass-1.0.2-r2.ebuild new file mode 100644 index 000000000000..cfa57d8d73d4 --- /dev/null +++ b/games-arcade/criticalmass/criticalmass-1.0.2-r2.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools desktop flag-o-matic + +MY_P="CriticalMass-${PV}" + +DESCRIPTION="SDL/OpenGL space shoot'em up game" +HOMEPAGE="https://criticalmass.sourceforge.net/" +SRC_URI="mirror://sourceforge/criticalmass/${MY_P}.tar.bz2" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2+ ZLIB" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + media-libs/libglvnd[X] + media-libs/libpng:= + media-libs/libsdl[opengl,sound,video] + media-libs/sdl-image[png] + media-libs/sdl-mixer[mod] + net-misc/curl + sys-libs/zlib:=" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-gcc43.patch + "${FILESDIR}"/${P}-system-curl.patch + "${FILESDIR}"/${P}-libpng.patch + "${FILESDIR}"/${P}-flags.patch +) + +src_prepare() { + default + + rm -r curl || die + eautoreconf + + append-cxxflags -std=gnu++98 #612758 +} + +src_install() { + local HTML_DOCS="Readme.html" + default + + rm "${ED}"/usr/bin/Packer || die #247449 + + newicon critter.png ${PN}.png + make_desktop_entry critter "Critical Mass" +} diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch deleted file mode 100644 index 0d9063c37538..000000000000 --- a/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/configure.in.orig 2011-07-20 11:23:19.849122541 -0400 -+++ b/configure.in 2011-07-20 11:24:28.169713094 -0400 -@@ -35,9 +35,6 @@ - AM_CONDITIONAL(APPLE,test "x$TARGET" = xAPPLE) - AM_CONDITIONAL(WIN32,test "x$TARGET" = xWIN32) - --CFLAGS="" --CXXFLAGS="" -- - if test "x$GCC" = xyes; then - CFLAGS="$CFLAGS -W -Wall" - CXXFLAGS="$CXXFLAGS -W -Wall -fno-exceptions" -@@ -51,14 +48,6 @@ - CXXFLAGS="$CXXFLAGS -g" - fi - --AC_ARG_ENABLE(optimize, --[ --enable-optimize=level Enable optimization [default=2]], -- enable_optmize=$enableval, enable_optimize=2) --if test "x$enable_optimize" != "xno" ; then -- CFLAGS="$CFLAGS -O$enable_optimize" -- CXXFLAGS="$CXXFLAGS -O$enable_optimize" --fi -- - AC_ARG_ENABLE(dyngl, - [ --enable-dyngl Load GL library dynamically [default=off]], - enable_dyngl=$enableval, enable_dyngl=off) diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-flags.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-flags.patch new file mode 100644 index 000000000000..5677211c78a2 --- /dev/null +++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-flags.patch @@ -0,0 +1,24 @@ +https://bugs.gentoo.org/375739 +--- a/configure.in ++++ b/configure.in +@@ -24,2 +24,3 @@ + AC_PROG_RANLIB ++AM_PROG_AR + +@@ -37,5 +38,2 @@ + +-CFLAGS="" +-CXXFLAGS="" +- + if test "x$GCC" = xyes; then +@@ -52,10 +50,2 @@ + fi +- +-AC_ARG_ENABLE(optimize, +-[ --enable-optimize=level Enable optimization [default=2]], +- enable_optmize=$enableval, enable_optimize=2) +-if test "x$enable_optimize" != "xno" ; then +- CFLAGS="$CFLAGS -O$enable_optimize" +- CXXFLAGS="$CXXFLAGS -O$enable_optimize" +-fi + diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-gcc43.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-gcc43.patch index e57c11f5af28..82207f52aec0 100644 --- a/games-arcade/criticalmass/files/criticalmass-1.0.2-gcc43.patch +++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-gcc43.patch @@ -1,101 +1,46 @@ ---- CriticalMass-1.0.0.orig/tinyxml/tinyxml.cpp 2003-03-03 03:34:58.000000000 +0100 -+++ CriticalMass-1.0.0/tinyxml/tinyxml.cpp 2008-04-18 19:40:35.000000000 +0200 -@@ -21,10 +21,12 @@ - distribution.
- */
-
- #include "tinyxml.h"
+https://bugs.gentoo.org/218299 +--- a/tinyxml/tinyxml.cpp ++++ b/tinyxml/tinyxml.cpp +@@ -25,2 +25,4 @@ +#include <cstring> + - TiXmlNode::TiXmlNode( NodeType _type )
- {
- parent = 0;
- type = _type;
---- CriticalMass-1.0.0.orig/tinyxml/tinyxml.h 2003-03-03 03:34:58.000000000 +0100 -+++ CriticalMass-1.0.0/tinyxml/tinyxml.h 2008-04-18 19:40:35.000000000 +0200 -@@ -28,10 +28,11 @@ - #ifdef _MSC_VER
- #pragma warning( disable : 4530 )
- #pragma warning( disable : 4786 )
- #endif
+--- a/tinyxml/tinyxml.h ++++ b/tinyxml/tinyxml.h +@@ -32,2 +32,3 @@ +#include <cstdlib> #include <string>
- #include <stdio.h>
- #include <assert.h>
-
- class TiXmlDocument;
---- CriticalMass-1.0.0.orig/tinyxml/tinyxmlparser.cpp 2003-03-03 03:34:58.000000000 +0100 -+++ CriticalMass-1.0.0/tinyxml/tinyxmlparser.cpp 2008-04-18 19:40:35.000000000 +0200 -@@ -23,10 +23,12 @@ -
-
- #include "tinyxml.h"
- #include <ctype.h>
+--- a/tinyxml/tinyxmlparser.cpp ++++ b/tinyxml/tinyxmlparser.cpp +@@ -27,2 +27,4 @@ +#include <cstring> + const char* TiXmlBase::SkipWhiteSpace( const char* p )
- {
- while ( p && *p &&
- ( isspace( *p ) || *p == '\n' || *p == '\r' ) )
- p++;
---- CriticalMass-1.0.0.orig/utils/ResourceManager.cpp 2005-01-02 03:59:29.000000000 +0100 -+++ CriticalMass-1.0.0/utils/ResourceManager.cpp 2008-04-18 19:40:35.000000000 +0200 -@@ -20,10 +20,12 @@ - #include <ResourceManager.hpp> - #include <FindHash.hpp> - #include <Endian.hpp> - #include <WalkDirectory.hpp> +--- a/utils/ResourceManager.cpp ++++ b/utils/ResourceManager.cpp +@@ -24,2 +24,4 @@ +#include <cstring> + #ifdef WIN32 - const char PATH_SEPERATOR = '\\'; - #else - const char PATH_SEPERATOR = '/'; - #endif ---- CriticalMass-1.0.0.orig/utils/Value.hpp 2004-12-18 03:41:24.000000000 +0100 -+++ CriticalMass-1.0.0/utils/Value.hpp 2008-04-18 19:40:35.000000000 +0200 -@@ -13,10 +13,11 @@ - // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details - // - #ifndef _Value_hpp_ - #define _Value_hpp_ +--- a/utils/Value.hpp ++++ b/utils/Value.hpp +@@ -17,2 +17,3 @@ +#include <cstdlib> #include <stdio.h> - #include <string> - - #include <Trace.hpp> - ---- CriticalMass-1.0.0.orig/utils/zStreamBufferImplZLib.cpp 2005-07-31 22:06:14.000000000 +0200 -+++ CriticalMass-1.0.0/utils/zStreamBufferImplZLib.cpp 2008-04-18 19:40:35.000000000 +0200 -@@ -10,10 +10,11 @@ - // - // This program is distributed in the hope that it will be useful, but WITHOUT - // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details +--- a/utils/zStream.cpp ++++ b/utils/zStream.cpp +@@ -14,2 +14,3 @@ // +#include <cstdlib> #include <Trace.hpp> - #include <zStreamBufferImplZLib.hpp> - - bool ziStreamBufferImplZLib::init( void) - { ---- CriticalMass-1.0.0.orig/utils/zStream.cpp 2005-07-31 22:06:14.000000000 +0200 -+++ CriticalMass-1.0.0/utils/zStream.cpp 2008-04-18 19:40:35.000000000 +0200 -@@ -10,10 +10,11 @@ - // - // This program is distributed in the hope that it will be useful, but WITHOUT - // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details +--- a/utils/zStreamBufferImplZLib.cpp ++++ b/utils/zStreamBufferImplZLib.cpp +@@ -14,2 +14,3 @@ // +#include <cstdlib> #include <Trace.hpp> - #include <Endian.hpp> - #include <zStream.hpp> - #include <zStreamBufferImplLZMA.hpp> - #include <zStreamBufferImplZLib.hpp> diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng.patch new file mode 100644 index 000000000000..c2ea21bb2d63 --- /dev/null +++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng.patch @@ -0,0 +1,28 @@ +https://bugs.gentoo.org/206258 +https://bugs.gentoo.org/383207 +--- a/configure.in ++++ b/configure.in +@@ -101,3 +101,3 @@ + CXXFLAGS="$CXXFLAGS -I/usr/X11R6/include" +- AC_CHECK_LIB(png12, main,, AC_MSG_ERROR(libpng is needed)) ++ AC_CHECK_LIB(png, main,, AC_MSG_ERROR(libpng is needed)) + AC_CHECK_LIB(z, main,, AC_MSG_ERROR(libz is needed)) +--- a/game/main.cpp ++++ b/game/main.cpp +@@ -30,2 +30,4 @@ + ++#include <zlib.h> ++ + void migrateConfig( void) +--- a/utilssdl/PNG.cpp ++++ b/utilssdl/PNG.cpp +@@ -47,3 +47,3 @@ + +- check = fwrite( data, 1, length, (FILE *)(png->io_ptr)); ++ check = fwrite( data, 1, length, (FILE *)(png_get_io_ptr(png))); + if( check != length) +@@ -74,3 +74,3 @@ + +- if( setjmp(_png->jmpbuf)) ++ if( setjmp(png_jmpbuf(_png))) + { diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch deleted file mode 100644 index f8a0eec2ad57..000000000000 --- a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -99,7 +99,7 @@ if test "x$TARGET" = xWIN32; then - else - LIBS="-L/usr/local/lib -L/usr/X11R6/lib $LIBS" - CXXFLAGS="$CXXFLAGS -I/usr/X11R6/include" -- AC_CHECK_LIB(png12, main,, AC_MSG_ERROR(libpng is needed)) -+ AC_CHECK_LIB(png, main,, AC_MSG_ERROR(libpng is needed)) - AC_CHECK_LIB(z, main,, AC_MSG_ERROR(libz is needed)) - if test "x$TARGET" = xUNIX; then - if test "x$enable_dyngl" = xoff; then diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch deleted file mode 100644 index dbdfc9f32275..000000000000 --- a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/game/main.cpp -+++ b/game/main.cpp -@@ -28,6 +28,8 @@ - #include <sys/stat.h> - #include <sys/types.h> - -+#include <zlib.h> -+ - void migrateConfig( void) - { - //if onlineCheck is not set, default it to true ---- a/utilssdl/PNG.cpp -+++ b/utilssdl/PNG.cpp -@@ -45,7 +45,7 @@ - { - png_size_t check; - -- check = fwrite( data, 1, length, (FILE *)(png->io_ptr)); -+ check = fwrite( data, 1, length, (FILE *)(png_get_io_ptr(png))); - if( check != length) - { - png_error( png, "Write Error"); -@@ -72,7 +72,7 @@ - return false; - } - -- if( setjmp(_png->jmpbuf)) -+ if( setjmp(png_jmpbuf(_png))) - { - fclose( fp); - png_destroy_write_struct(&_png, (png_infopp)NULL); diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-system-curl.patch index 1ab1a2d5ce52..084efbc05cf2 100644 --- a/games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch +++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-system-curl.patch @@ -1,33 +1,21 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -6,3 +6,3 @@ + ## Any directories that you want built and installed should go here. +-SUBDIRS = curl tinyxml utils utilssdl utilsgl tools data game ++SUBDIRS = tinyxml utils utilssdl utilsgl tools data game + --- a/configure.in +++ b/configure.in -@@ -115,8 +115,6 @@ fi - AC_CHECK_LIB(m, sin,, - AC_MSG_ERROR(libm is needed)) +@@ -121,4 +121,2 @@ -AC_CONFIG_SUBDIRS(curl) - AC_OUTPUT(Makefile utils/Makefile utilssdl/Makefile utilsgl/Makefile game/Makefile tools/Makefile data/Makefile data/music/Makefile tinyxml/Makefile) - - echo "Configuration: --- a/game/Makefile.am +++ b/game/Makefile.am -@@ -41,7 +41,7 @@ critter_SOURCES = \ - main.cpp - +@@ -43,3 +43,3 @@ LDADD = \ - ../curl/lib/libcurl.a \ + -lcurl \ ../utils/libutils.a \ - ../utilssdl/libutilssdl.a \ - ../utilsgl/libutilsgl.a \ ---- a/Makefile.am -+++ b/Makefile.am -@@ -4,7 +4,7 @@ - AUTOMAKE_OPTIONS = 1.4 - - ## Any directories that you want built and installed should go here. --SUBDIRS = curl tinyxml utils utilssdl utilsgl tools data game -+SUBDIRS = tinyxml utils utilssdl utilsgl tools data game - - ## Any directories you want a part of the distribution should be listed - ## here, as well as have a Makefile generated at the end of configure.in diff --git a/games-arcade/criticalmass/metadata.xml b/games-arcade/criticalmass/metadata.xml index 26c1c9ca5f2d..1ef550c76aa8 100644 --- a/games-arcade/criticalmass/metadata.xml +++ b/games-arcade/criticalmass/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/defendguin/Manifest b/games-arcade/defendguin/Manifest index 1c3ec4e32a71..410c7a2bc99c 100644 --- a/games-arcade/defendguin/Manifest +++ b/games-arcade/defendguin/Manifest @@ -1 +1,2 @@ DIST defendguin-0.0.12.tar.gz 2235694 BLAKE2B 4e694edb5a8e51948e343da8ba4555062505c1c7f2563e291cc4f421624b791630dec7b0c7ce08df0ca0db40070418cd67f750fbe525ef1b1d1577951a5224bd SHA512 3a62c7ac62b016eeb6fc63655e8a8c1ac6c5c7cae7eee03c4ab0b9951ba605c7634336d94adb538e94ccbf1d9f927ac530f58da87413a4b1555b2684681e4167 +DIST defendguin.png 4444 BLAKE2B 54790605accf524c8fff3b465ace1d09f2a320a66dd4dcf7a216eb74489a02ff029c95aaec32ad31ca4491809ccc8bdf5eecab44c7a6ce7060db96bd01d2c8de SHA512 3adc8db2ea8c3f726b03fdfafba3e79121edb8b3ca70a4006c288ccbebb5d35c104f0095d3812a7c094dc23760bd846902133d5252ae7e186ddf1a114bfb37e7 diff --git a/games-arcade/defendguin/defendguin-0.0.12-r1.ebuild b/games-arcade/defendguin/defendguin-0.0.12-r1.ebuild deleted file mode 100644 index 574938e18d7b..000000000000 --- a/games-arcade/defendguin/defendguin-0.0.12-r1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit desktop - -DESCRIPTION="A clone of the arcade game Defender, but with a Linux theme" -HOMEPAGE="http://www.newbreedsoftware.com/defendguin/" -SRC_URI="ftp://ftp.tuxpaint.org/unix/x/${PN}/src/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="media-libs/sdl-mixer[mod] - media-libs/libsdl[video]" -RDEPEND="${DEPEND}" - -src_prepare() { - default - sed -i \ - -e "s:\$(DATA_PREFIX):/usr/share/${PN}/:" \ - -e '/^CFLAGS=.*-O2/d' \ - -e '/^CFLAGS=/s:=:+= $(LDFLAGS) :' \ - Makefile \ - || die - rm -f data/images/*.sh -} - -src_install() { - dobin ${PN} - insinto /usr/share/${PN} - doins -r ./data/* - - newicon data/images/ufo/ufo0.bmp ${PN}.bmp - make_desktop_entry ${PN} Defendguin /usr/share/pixmaps/${PN}.bmp - - doman src/${PN}.6 - dodoc docs/{AUTHORS,CHANGES,README,TODO}.txt -} diff --git a/games-arcade/defendguin/defendguin-0.0.12-r2.ebuild b/games-arcade/defendguin/defendguin-0.0.12-r2.ebuild new file mode 100644 index 000000000000..31b4eb2280dc --- /dev/null +++ b/games-arcade/defendguin/defendguin-0.0.12-r2.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop toolchain-funcs + +DESCRIPTION="Clone of the arcade game Defender, but with a Linux theme" +HOMEPAGE="http://www.newbreedsoftware.com/defendguin/" +SRC_URI=" + ftp://ftp.tuxpaint.org/unix/x/defendguin/src/${P}.tar.gz + https://dev.gentoo.org/~ionen/distfiles/${PN}.png" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + media-libs/libsdl[joystick,sound,video] + media-libs/sdl-mixer[mod]" +RDEPEND="${DEPEND}" + +src_prepare() { + default + tc-export CC + sed -e "s|\$(DATA_PREFIX)|${EPREFIX}/usr/share/${PN}/|" \ + -e '/^CFLAGS=.*-O2/d' \ + -e '/^CFLAGS=/s|=|+= $(CPPFLAGS) $(LDFLAGS) |' \ + -i Makefile || die + rm data/images/l2r.sh || die +} + +src_install() { + dobin ${PN} + + insinto /usr/share/${PN} + doins -r data/. + + doicon "${DISTDIR}"/${PN}.png + make_desktop_entry ${PN} ${PN^} + + doman src/${PN}.6 + dodoc docs/{AUTHORS,CHANGES,README,TODO}.txt +} diff --git a/games-arcade/defendguin/metadata.xml b/games-arcade/defendguin/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/defendguin/metadata.xml +++ b/games-arcade/defendguin/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/diameter/Manifest b/games-arcade/diameter/Manifest deleted file mode 100644 index dca6d5a32390..000000000000 --- a/games-arcade/diameter/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST diameter-0.4.0.3.tar.bz2 4729201 BLAKE2B e96989e0213bbea1c0e7c8d5bea155c2a561741c367220f5d0fb7a4630c076932a4393ad577573195e96945fc812e9a1fb6026089d601d96a22be5004c77877e SHA512 74491d49b233f16b44e4ea7c477fe5c6d71bc88c34b815f7992ea881558e2b4de98b10c5041cff6d0a6098dc4f440291825fb1746ff0282e3f538fac4ee4975d diff --git a/games-arcade/diameter/diameter-0.4.0.3-r2.ebuild b/games-arcade/diameter/diameter-0.4.0.3-r2.ebuild deleted file mode 100644 index a7f2160770db..000000000000 --- a/games-arcade/diameter/diameter-0.4.0.3-r2.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit autotools eutils python-single-r1 - -DESCRIPTION="Arcade game with elements of economy and adventure" -HOMEPAGE="https://sourceforge.net/projects/gamediameter/" -SRC_URI="mirror://sourceforge/gamediameter/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - >=dev-games/guichan-0.8[opengl,sdl] - media-libs/libpng:0= - media-libs/libsdl[video] - media-libs/sdl-image[gif,jpeg,png] - media-libs/sdl-mixer[mod] - virtual/opengl - virtual/glu - ${PYTHON_DEPS}" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S=${WORKDIR}/gamediameter - -src_prepare() { - default - - sed -i \ - -e "s:gamediameter:diameter:" \ - configure.in || die - mv configure.in configure.ac || die - sed -i \ - -e '/for i in .*\/lib/s:".*:/usr/lib/ ; do:' \ - -e "/AC_SUBST.*LDFLAGS/s/\".*\"/\$PYTHON_LIBS/" \ - acinclude.m4 || die - # bug #336812 - sed -i \ - -e '/gui nebular3.gif/s/gui//' \ - data/texture/Makefile.am || die - eautoreconf - - # needed, otherwise -lpython2.7 will not be found - python_export PYTHON PYTHON_LIBS -} - -src_install() { - default - - newicon data/texture/gui/eng/main/logo.png ${PN}.png - make_desktop_entry ${PN} ${PN^} -} diff --git a/games-arcade/diameter/metadata.xml b/games-arcade/diameter/metadata.xml deleted file mode 100644 index ec2759fffab8..000000000000 --- a/games-arcade/diameter/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>games@gentoo.org</email> - <name>Gentoo Games Project</name> - </maintainer> - <longdescription lang="en"> -"Diameter" - is an arcade-style game with elements of economy and adventure. -Project's main objective is to make a distinctive game with a storm gameplay and -simultaneously alluring with its world. Plus, the main mood will be funny, but -thus be serious. -</longdescription> - <upstream> - <remote-id type="sourceforge">gamediameter</remote-id> - </upstream> -</pkgmetadata> diff --git a/games-arcade/digger/Manifest b/games-arcade/digger/Manifest index 291e615e7047..04734b322fba 100644 --- a/games-arcade/digger/Manifest +++ b/games-arcade/digger/Manifest @@ -1 +1,2 @@ DIST digger-20140423.tar.gz 117375 BLAKE2B 39ec5a17c2a12c1d23ed8dbcecfcd1f8309d5309540cd6d50d92aeee056e60f31156016f7cbcdf35092690c0e4df9312feee0a686c8fb1afb6068181630aca59 SHA512 9277c6dc4d7f74aeede379b42aeeef881d8fd927ef0e6f6c0e1a5f76be257244c4353758557209647812b942d215dd992939b190ef11f854b41ee2ceaab7eece +DIST digger.png 1593 BLAKE2B 64595baa9bc41756cdfaf7bd9a4421e42b0bf82f8114d28227e887e822dcf19e2e6dd40344cdb83875dbcbc6200007ffdd2e0d16bfed8e92ef1b14bdf131fbf7 SHA512 3b191bdb8d823b777bc77495cf8566aa911d46ec45dd1c46f3a0dc100f25ee01b3e145a1512d0122b496ed5eabbdf3a4b3b609a3b2867de49aae22c644a9f510 diff --git a/games-arcade/digger/digger-20140423-r1.ebuild b/games-arcade/digger/digger-20140423-r1.ebuild deleted file mode 100644 index 0fd2a02a51dd..000000000000 --- a/games-arcade/digger/digger-20140423-r1.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit desktop - -DESCRIPTION="Digger Remastered" -HOMEPAGE="http://www.digger.org/" -SRC_URI="mirror://gentoo/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" - -DEPEND="media-libs/libsdl[X,video] - x11-libs/libX11" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${PN}-${PN}" - -PATCHES=( "${FILESDIR}"/${P}-ldflags.patch ) - -src_install() { - dobin digger - dodoc digger.txt - make_desktop_entry digger Digger -} diff --git a/games-arcade/digger/digger-20140423-r2.ebuild b/games-arcade/digger/digger-20140423-r2.ebuild new file mode 100644 index 000000000000..9ca1e912de95 --- /dev/null +++ b/games-arcade/digger/digger-20140423-r2.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake desktop + +DESCRIPTION="Digger Remastered" +HOMEPAGE="https://www.digger.org/" +SRC_URI=" + mirror://gentoo/${P}.tar.gz + https://dev.gentoo.org/~ionen/distfiles/${PN}.png" +S="${WORKDIR}/${PN}-${PN}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + +RDEPEND=" + media-libs/libsdl[X,sound,video] + sys-libs/zlib:= + x11-libs/libX11" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto" + +src_install() { + dobin "${BUILD_DIR}"/${PN} + dodoc ${PN}.txt + + doicon "${DISTDIR}"/${PN}.png + make_desktop_entry ${PN} ${PN^} +} diff --git a/games-arcade/digger/files/digger-20140423-ldflags.patch b/games-arcade/digger/files/digger-20140423-ldflags.patch deleted file mode 100644 index fd1e9953b634..000000000000 --- a/games-arcade/digger/files/digger-20140423-ldflags.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ru digger-digger.orig/Makefile digger-digger/Makefile ---- digger-digger.orig/Makefile 2013-10-11 04:56:41.000000000 -0400 -+++ digger-digger/Makefile 2014-04-24 13:11:58.749211920 -0400 -@@ -26,7 +26,7 @@ - ifeq ($(ARCH),"LINUX") - OBJS += fbsd_sup.o # strup() - RCFLAGS += -DLINUX $(shell sdl-config --cflags) --LIBS += $(shell sdl-config --libs) -lz -+LIBS += $(shell sdl-config --libs) -lX11 -lz - ESUFFIX = - endif - -@@ -40,7 +40,7 @@ - all: digger$(ESUFFIX) - - digger$(ESUFFIX): $(OBJS) -- $(CC) -o digger$(ESUFFIX) $(OBJS) $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o digger$(ESUFFIX) $(OBJS) $(LIBS) - - $(OBJS): %.o: %.c - $(CC) -c $(RCFLAGS) $(CFLAGS) $< -o $@ diff --git a/games-arcade/digger/metadata.xml b/games-arcade/digger/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/digger/metadata.xml +++ b/games-arcade/digger/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/dynamitejack/dynamitejack-1.0.23-r1.ebuild b/games-arcade/dynamitejack/dynamitejack-1.0.23-r3.ebuild index 9929eac3aad0..02710d88444f 100644 --- a/games-arcade/dynamitejack/dynamitejack-1.0.23-r1.ebuild +++ b/games-arcade/dynamitejack/dynamitejack-1.0.23-r3.ebuild @@ -1,22 +1,24 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # TODO: icon -EAPI=5 -inherit eutils games +EAPI=8 + +inherit desktop wrapper DESCRIPTION="A stealth game with bombs in glorious 2D" -HOMEPAGE="http://www.galcon.com/dynamitejack/" +HOMEPAGE="https://www.galcon.com/dynamitejack/" SRC_URI="${P}.tgz" +S="${WORKDIR}"/${PN} LICENSE="all-rights-reserved" SLOT="0" KEYWORDS="-* ~amd64 ~x86" -IUSE="" + RESTRICT="bindist fetch splitdebug" -MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN} +MYGAMEDIR=/opt/${PN} QA_PREBUILT="${MYGAMEDIR#/}/bin/*" # linked to pulseaudio @@ -25,10 +27,10 @@ RDEPEND=" >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] >=media-libs/flac-1.2.1-r5[abi_x86_32(-)] >=media-libs/libogg-1.3.0[abi_x86_32(-)] + >=media-libs/libpulse-2.1-r1[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[X,sound,joystick,opengl,video,abi_x86_32(-)] >=media-libs/libsndfile-1.0.25[abi_x86_32(-)] >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)] - >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)] >=virtual/glu-9.0-r1[abi_x86_32(-)] >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] @@ -40,8 +42,6 @@ RDEPEND=" >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXtst-1.2.1-r1[abi_x86_32(-)]" -S=${WORKDIR}/${PN} - pkg_nofetch() { einfo "Please buy & download ${SRC_URI} from:" einfo " ${HOMEPAGE}" @@ -49,6 +49,8 @@ pkg_nofetch() { } src_prepare() { + default + rm run_me || die mv LINUX.txt "${T}"/ || die } @@ -59,9 +61,8 @@ src_install() { insinto "${MYGAMEDIR}" doins -r * - games_make_wrapper ${PN} "./main" "${MYGAMEDIR}/bin" + make_wrapper ${PN} "./main" "${MYGAMEDIR}/bin" make_desktop_entry ${PN} fperms +x "${MYGAMEDIR}"/bin/main - prepgamesdirs } diff --git a/games-arcade/dynamitejack/metadata.xml b/games-arcade/dynamitejack/metadata.xml index 26079e608bed..7c730d47817a 100644 --- a/games-arcade/dynamitejack/metadata.xml +++ b/games-arcade/dynamitejack/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild b/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild deleted file mode 100644 index 56747f703846..000000000000 --- a/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils games - -MY_PN=${PN/emilia-/} -MY_P=${MY_PN}-${PV} -DESCRIPTION="SDL OpenGL pinball game" -HOMEPAGE="http://pinball.sourceforge.net/" -SRC_URI="mirror://sourceforge/pinball/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="virtual/opengl - x11-libs/libSM - media-libs/libsdl[joystick,opengl,video,X] - media-libs/sdl-image[png] - media-libs/sdl-mixer[vorbis] - dev-libs/libltdl:0" -DEPEND="${RDEPEND} - x11-libs/libXt" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - sed -i -e '/dnl/d' {src,test}/Makefile.am || die #334899 - epatch "${FILESDIR}"/${P}-glibc210.patch \ - "${FILESDIR}"/${P}-libtool.patch \ - "${FILESDIR}"/${P}-gcc46.patch \ - "${FILESDIR}"/${P}-parallel.patch - rm -rf libltdl - eautoreconf -} - -src_configure() { - egamesconf --with-x -} - -src_compile() { - emake CXXFLAGS="${CXXFLAGS}" -} - -src_install() { - default - dosym "${GAMES_BINDIR}"/pinball "${GAMES_BINDIR}"/emilia-pinball - mv "${D}/${GAMES_PREFIX}/include" "${D}/usr/" || die - dodir /usr/bin - mv "${D}/${GAMES_BINDIR}/pinball-config" "${D}/usr/bin/" || die - sed -i \ - -e 's:-I${prefix}/include/pinball:-I/usr/include/pinball:' \ - "${D}"/usr/bin/pinball-config || die - newicon data/pinball.xpm ${PN}.xpm - make_desktop_entry emilia-pinball "Emilia pinball" - prepgamesdirs -} diff --git a/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r3.ebuild b/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r3.ebuild new file mode 100644 index 000000000000..a1749ce9f6b5 --- /dev/null +++ b/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r3.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools desktop + +MY_PN=${PN/emilia-/} +MY_P=${MY_PN}-${PV} +DESCRIPTION="SDL OpenGL pinball game" +HOMEPAGE="https://pinball.sourceforge.net/" +SRC_URI="mirror://sourceforge/pinball/${MY_P}.tar.gz" +S="${WORKDIR}"/${MY_P} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" + +RDEPEND=" + dev-libs/libltdl:0 + media-libs/libsdl[joystick,opengl,video,X] + media-libs/sdl-image[png] + media-libs/sdl-mixer[vorbis] + x11-libs/libICE + x11-libs/libSM + virtual/opengl + virtual/glu +" +DEPEND=" + ${DEPEND} + x11-libs/libXt +" + +RDEPEND+=" acct-group/gamestat" + +PATCHES=( + "${FILESDIR}"/${P}-glibc210.patch + "${FILESDIR}"/${P}-libtool.patch + "${FILESDIR}"/${P}-gcc46.patch + "${FILESDIR}"/${P}-parallel.patch +) + +src_prepare() { + # bug #334899 + sed -i -e '/dnl/d' {src,test}/Makefile.am || die + + default + + rm -rf libltdl || die + eautoreconf +} + +src_configure() { + econf --with-x +} + +src_compile() { + emake CXXFLAGS="${CXXFLAGS}" +} + +src_install() { + default + + dosym pinball /usr/bin/emilia-pinball + + sed -i \ + -e 's:-I${prefix}/include/pinball:-I/usr/include/pinball:' \ + "${ED}"/usr/bin/pinball-config || die + + newicon data/pinball.xpm ${PN}.xpm + make_desktop_entry emilia-pinball "Emilia pinball" + + fperms -R 660 /var/games/pinball + fowners -R root:gamestat /usr/bin/pinball /var/games/pinball + fperms g+s /usr/bin/pinball +} diff --git a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-gcc46.patch b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-gcc46.patch index d78779197fce..aef1d672df62 100644 --- a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-gcc46.patch +++ b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-gcc46.patch @@ -1,5 +1,5 @@ ---- base/SignalSender.cpp.old 2011-04-26 09:39:24.303339444 +0200 -+++ base/SignalSender.cpp 2011-04-26 09:39:51.261063162 +0200 +--- a/base/SignalSender.cpp ++++ b/base/SignalSender.cpp @@ -11,6 +11,7 @@ #include "SignalSender.h" #include "Group.h" @@ -8,8 +8,8 @@ SignalSender * SignalSender::p_SignalSender = NULL; ---- base/Behavior.cpp.old 2011-04-26 09:36:27.129006665 +0200 -+++ base/Behavior.cpp 2011-04-26 09:36:48.855396752 +0200 +--- a/base/Behavior.cpp ++++ b/base/Behavior.cpp @@ -9,6 +9,7 @@ #include "Private.h" #include "Behavior.h" @@ -18,8 +18,8 @@ Behavior::Behavior() { //EM_COUT("Behavior::Behavior", 1); ---- base/BehaviorVisitor.cpp.old 2011-04-26 09:37:39.759653248 +0200 -+++ base/BehaviorVisitor.cpp 2011-04-26 09:37:54.481594952 +0200 +--- a/base/BehaviorVisitor.cpp ++++ b/base/BehaviorVisitor.cpp @@ -9,6 +9,7 @@ #include "BehaviorVisitor.h" #include "Behavior.h" diff --git a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-glibc210.patch b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-glibc210.patch index 800dbeae21a7..12f33cd21c85 100644 --- a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-glibc210.patch +++ b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-glibc210.patch @@ -1,5 +1,5 @@ ---- base/Config.cpp -+++ base/Config.cpp +--- a/base/Config.cpp ++++ b/base/Config.cpp @@ -423,8 +423,8 @@ m_sDataDir = string(EM_DATADIR) + "/"; m_sExeDir = "./"; diff --git a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-libtool.patch b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-libtool.patch index 437e4eb684a4..a9bc00051bab 100644 --- a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-libtool.patch +++ b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-libtool.patch @@ -1,6 +1,5 @@ -diff -ur pinball-0.3.1.orig/configure.ac pinball-0.3.1/configure.ac ---- pinball-0.3.1.orig/configure.ac 2003-11-21 09:40:18.000000000 +0200 -+++ pinball-0.3.1/configure.ac 2010-03-05 20:41:24.000000000 +0200 +--- a/configure.ac ++++ b/configure.ac @@ -14,18 +14,13 @@ CFLAGS="-g -W -Wall -O2" CXXFLAGS="-g -W -Wall -O2" @@ -22,9 +21,8 @@ diff -ur pinball-0.3.1.orig/configure.ac pinball-0.3.1/configure.ac dnl ******************************************* dnl PATHS AND DIRS **************************** -diff -ur pinball-0.3.1.orig/Makefile.am pinball-0.3.1/Makefile.am ---- pinball-0.3.1.orig/Makefile.am 2003-12-10 12:15:35.000000000 +0200 -+++ pinball-0.3.1/Makefile.am 2010-03-05 20:36:48.000000000 +0200 +--- a/Makefile.am ++++ b/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = gnu @@ -33,9 +31,8 @@ diff -ur pinball-0.3.1.orig/Makefile.am pinball-0.3.1/Makefile.am EXTRA_DIST = bootstrap pinball.spec clean pinball.desktop -diff -ur pinball-0.3.1.orig/src/Makefile.am pinball-0.3.1/src/Makefile.am ---- pinball-0.3.1.orig/src/Makefile.am 2003-11-20 18:46:17.000000000 +0200 -+++ pinball-0.3.1/src/Makefile.am 2010-03-05 20:37:08.000000000 +0200 +--- a/src/Makefile.am ++++ b/src/Makefile.am @@ -7,9 +7,9 @@ pinlib_LIBRARIES = libemilia_pin.a @@ -48,9 +45,8 @@ diff -ur pinball-0.3.1.orig/src/Makefile.am pinball-0.3.1/src/Makefile.am pinball_LDFLAGS = -export-dynamic pinball_SOURCES = Pinball.cpp -diff -ur pinball-0.3.1.orig/test/Makefile.am pinball-0.3.1/test/Makefile.am ---- pinball-0.3.1.orig/test/Makefile.am 2003-11-20 18:46:17.000000000 +0200 -+++ pinball-0.3.1/test/Makefile.am 2010-03-05 20:36:38.000000000 +0200 +--- a/test/Makefile.am ++++ b/test/Makefile.am @@ -6,8 +6,8 @@ noinst_PROGRAMS = scale simple light texture load explode collision signal billboard font thread menu joy sound trans math misc varray unittest dnl noinst_PROGRAMS = unittest diff --git a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-parallel.patch b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-parallel.patch index 3dfef56090c9..f5857c2b2910 100644 --- a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-parallel.patch +++ b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-parallel.patch @@ -1,5 +1,5 @@ ---- src/Makefile.am.old 2011-04-26 10:46:05.102070461 +0200 -+++ src/Makefile.am 2011-04-26 10:46:16.872813136 +0200 +--- a/src/Makefile.am ++++ b/src/Makefile.am @@ -9,7 +9,7 @@ INCLUDES = -I../base -I../addon diff --git a/games-arcade/emilia-pinball/metadata.xml b/games-arcade/emilia-pinball/metadata.xml index 551a8380f3c8..198d4f91e80f 100644 --- a/games-arcade/emilia-pinball/metadata.xml +++ b/games-arcade/emilia-pinball/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/epiar/Manifest b/games-arcade/epiar/Manifest index baa5cbae42a2..269567abfb55 100644 --- a/games-arcade/epiar/Manifest +++ b/games-arcade/epiar/Manifest @@ -1 +1 @@ -DIST epiar-0.5.0-src.zip 8809392 BLAKE2B c29c541f5841da91d13f7ccddfa2d2175265a434ae03e2ed87a64cd5c177d7139ff2cf44ec679ec023fe783427868f0f234c6f5f49d0d52ab08be852d424ba59 SHA512 22d8655aefd3aa071de064aeeed40d8780fb32ee702e657c8b8a723c381b6825ae9b5820cf5b29991e14bc264c443d0b24f88656b4997a6270383aa080c15f3e +DIST epiar-0.5.1.tar.gz 35576547 BLAKE2B 6648eeccbe86e6935f53d83e5a58aa5839dbec2f5a8c408fd4d8a95e303daa8877c001f5dd4e37a2b72b3c24df646236c850c57c1a1d000fca63177cf075c729 SHA512 ce09aaafc455f3f9721d46a1703bf110ae00041234627b2b5fb4a9489f38672d0d0600b01a65d210728a50b596a51aacddc525d50d1138a6959db421b9384c40 diff --git a/games-arcade/epiar/epiar-0.5-r1.ebuild b/games-arcade/epiar/epiar-0.5-r1.ebuild deleted file mode 100644 index 203d8500f903..000000000000 --- a/games-arcade/epiar/epiar-0.5-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit flag-o-matic eutils games - -DESCRIPTION="A space adventure/combat game" -HOMEPAGE="https://sourceforge.net/projects/epiar/" -SRC_URI="mirror://sourceforge/epiar/${P}.0-src.zip" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -RDEPEND="media-libs/libsdl[video] - media-libs/sdl-image[png]" -DEPEND="${RDEPEND} - x11-libs/libX11 - virtual/opengl - app-arch/unzip" - -S=${WORKDIR} - -src_prepare() { - sed -i \ - -e "/^CFLAGS/s:-pg -g:${CFLAGS} ${LDFLAGS}:" \ - Makefile.linux || die - epatch \ - "${FILESDIR}"/${P}-paths.patch \ - "${FILESDIR}"/${P}-gcc41.patch \ - "${FILESDIR}"/${P}-Makefile.linux.patch \ - "${FILESDIR}"/${P}-underlink.patch - sed -i \ - -e "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}/:" \ - src/main.c || die -} - -src_compile() { - emake -f Makefile.linux -} - -src_install() { - dogamesbin epiar - insinto "${GAMES_DATADIR}"/${PN} - doins -r missions *.eaf - keepdir "${GAMES_DATADIR}"/${PN}/plugins - dodoc AUTHORS ChangeLog README - prepgamesdirs -} diff --git a/games-arcade/epiar/epiar-0.5.1-r1.ebuild b/games-arcade/epiar/epiar-0.5.1-r1.ebuild new file mode 100644 index 000000000000..fd05c36a1d34 --- /dev/null +++ b/games-arcade/epiar/epiar-0.5.1-r1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-1 ) +LUA_REQ_USE="deprecated" +inherit autotools flag-o-matic lua-single + +DESCRIPTION="Space adventure/combat game" +HOMEPAGE="https://epiar.net/" +SRC_URI="https://github.com/cthielen/Epiar/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND=" + ${LUA_DEPS} + dev-games/physfs + dev-libs/libxml2 + media-libs/ftgl + media-libs/libsdl[opengl,sound,video] + media-libs/sdl-image[png] + media-libs/sdl-mixer[vorbis] + virtual/opengl" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-0.5.1-unbundle-lua5.1.patch + "${FILESDIR}"/${PN}-0.5.1-fix-bashisms.patch +) + +src_prepare() { + default + + # Remove bundled Lua 5.1 + rm -r source/lua || die + + eautoreconf +} + +src_configure() { + # -DLUA_COMPAT_OPENLIB=1 is required to enable the + # deprecated (in 5.1) luaL_openlib API (#872803) + append-cppflags -DLUA_COMPAT_OPENLIB=1 + + default +} + +src_install() { + default + + # Game fails to start without this otherwise missing font. + insinto /usr/share/epiar/resources/Fonts + doins resources/Fonts/FreeSansBold.ttf +} diff --git a/games-arcade/epiar/files/epiar-0.5-Makefile.linux.patch b/games-arcade/epiar/files/epiar-0.5-Makefile.linux.patch deleted file mode 100644 index 3086bd13ef9a..000000000000 --- a/games-arcade/epiar/files/epiar-0.5-Makefile.linux.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- Makefile.linux.old 2007-04-05 16:42:30 +0000 -+++ Makefile.linux 2007-04-05 16:42:47 +0000 -@@ -24,7 +24,7 @@ - @echo Building Epiar 0.5.0 ... - @$(CC) $(CFLAGS) -I/usr/X11R6/lib/ $(OBJS) -o epiar $(LIBS) - @echo Building plugins ... -- @make -f Makefile.linux plugin -+ @$(MAKE) -f Makefile.linux plugin - @echo Epiar 0.5.0 build complete. - @echo - @echo Type './epiar' to play. -@@ -33,7 +33,7 @@ - @echo Building Epiar 0.5.0 and linking statically ... - @$(CC) $(CFLAGS) -L/usr/X11R6/lib -L/opt/gnome-2.1/lib $(OBJS) -o epiar $(STATIC_LIBS) - @echo Building plugins ... -- @make plugin -+ @$(MAKE) plugin - @echo Epiar 0.5.0 build complete. - @echo - @echo Type './epiar' to play. diff --git a/games-arcade/epiar/files/epiar-0.5-gcc41.patch b/games-arcade/epiar/files/epiar-0.5-gcc41.patch deleted file mode 100644 index 65f08b2691d1..000000000000 --- a/games-arcade/epiar/files/epiar-0.5-gcc41.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/game/game.h.old 2006-04-23 22:13:36.000000000 +0200 -+++ src/game/game.h 2006-04-23 22:13:50.000000000 +0200 -@@ -2,7 +2,6 @@ - #include "includes.h"
-
- extern Uint32 average_loop_time;
--extern Uint32 game_start_time;
- extern Uint32 total_play_time, total_frames_drawn;
- extern float average_session_fps, current_fps;
-
diff --git a/games-arcade/epiar/files/epiar-0.5-paths.patch b/games-arcade/epiar/files/epiar-0.5-paths.patch deleted file mode 100644 index 41266c7272b1..000000000000 --- a/games-arcade/epiar/files/epiar-0.5-paths.patch +++ /dev/null @@ -1,86 +0,0 @@ ---- src/input/input.c -+++ src/input/input.c -@@ -240,7 +240,10 @@ - *
- ******************************************************************************/
- int load_input_cfg(void) {
-- FILE *fp = fopen("./.epiar-input.ecf", "rb");
-+ char filename[PATH_MAX]; -+ FILE *fp; -+ snprintf(filename, sizeof(filename), "%s/.epiar-input.ecf", getenv("HOME")); -+ fp = fopen(filename, "rb");
-
- /* make sure all keys are enabled */
- unlock_keys();
-@@ -282,7 +285,7 @@ - } else {
- float file_version = 0.0f;
- /* read the file into the struct */
-- fp = fopen("./.epiar-input.ecf", "rb");
-+ fp = fopen(filename, "rb");
-
- if (fp == NULL) {
- fprintf(stdout, "Could not open \"./.epiar-input.ecf\" for reading, assuming default bindings.\n");
-@@ -472,10 +475,12 @@ - }
-
- void save_keybindings(void) {
-+ char filename[PATH_MAX]; - float file_version = 0.2f;
- FILE *fp;
-
-- fp = fopen("./.epiar-input.ecf", "wb");
-+ snprintf(filename, sizeof(filename), "%s/.epiar-input.ecf", getenv("HOME")); -+ fp = fopen(filename, "wb");
- if (fp == NULL) {
- fprintf(stdout, "Could not create '~/.epiar-input.ecf' to save keybindings\n");
- return;
---- src/main.c -+++ src/main.c -@@ -16,7 +16,7 @@ - unsigned char view_mode = 0;
- int ship_to_follow = 0;
- int desired_bpp = 16;
--char *game_path;
-+const char * const game_path = "GENTOO_DATADIR";
- unsigned char use_ogl = 0;
- unsigned char skip_intro = 0;
- FILE *epiar_eaf = NULL, *main_eaf = NULL;
-@@ -78,8 +78,6 @@ -
- parse_commandline(argc, argv);
-
-- get_absolute_path(argv[0]);
--
- init(desired_bpp);
-
- menu();
---- src/main.h -+++ src/main.h -@@ -1,2 +1,2 @@ - extern char epiar_version[6];
--extern char *game_path;
-+extern const char * const game_path;
---- src/system/init.c -+++ src/system/init.c -@@ -89,9 +89,6 @@ - main_eaf = NULL;
- }
-
-- assert(game_path != NULL);
-- free(game_path);
-- game_path = NULL;
-
- if (average_loop_time == 0) average_loop_time = 18; /* in case they quit on menu */
- #ifndef NDEBUG
---- src/system/path.c -+++ src/system/path.c -@@ -45,7 +45,7 @@ - }
- #endif
-
--#ifdef LINUX
-+#if 0
- char *strip_path_of_binary(char *argv) {
- int len = 0, i, blen = 0;
- char *stripped = NULL;
diff --git a/games-arcade/epiar/files/epiar-0.5-underlink.patch b/games-arcade/epiar/files/epiar-0.5-underlink.patch deleted file mode 100644 index 13146cb68b27..000000000000 --- a/games-arcade/epiar/files/epiar-0.5-underlink.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.linux.old 2011-06-22 15:15:50.000000000 +0200 -+++ Makefile.linux 2011-06-22 15:17:01.000000000 +0200 -@@ -1,6 +1,6 @@ - CFLAGS=-W -Wall `sdl-config --cflags` -Isrc/ -DLINUX -DDEVEL -export-dynamic -I/usr/include/SDL -I/usr/local/include/SDL -DBLIT_METHOD_2 -DNAUDIO -O2 -march=pentium4 -pipe -mfpmath=sse -ggdb -Wl,-O1 -Wl,--as-needed - --LIBS=-lm `sdl-config --libs` -lSDL_image -+LIBS=-lm `sdl-config --libs` -lSDL_image -ldl - STATIC_LIBS=-lm /usr/local/lib/libSDL.a /usr/local/lib/libSDL_image.a /usr/local/lib/libSDL_ttf.a /usr/local/lib/libopenal.a /usr/local/lib/libvorbisfile.a /usr/local/lib/libvorbis.a /usr/local/lib/libogg.a /usr/lib/libpng.a /usr/lib/libz.a -lpthread -ldl -lfreetype /usr/lib/libjpeg.a -lX11 -lXext -lesd - - OBJS=main.o init.o video.o backbuffer.o debug.o audio.o linux_video.o \ diff --git a/games-arcade/epiar/files/epiar-0.5.1-fix-bashisms.patch b/games-arcade/epiar/files/epiar-0.5.1-fix-bashisms.patch new file mode 100644 index 000000000000..cc064799366a --- /dev/null +++ b/games-arcade/epiar/files/epiar-0.5.1-fix-bashisms.patch @@ -0,0 +1,41 @@ +From 99b92a9d29f61beae05227c4f10ed54c41c02b11 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Wed, 7 Apr 2021 00:29:01 +0000 +Subject: [PATCH 2/2] Fix bashisms + +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b5a70d5..4d3d598 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -22,13 +22,13 @@ AC_PROG_RANLIB + AC_LANG(C++) + + dnl Check for a C++ compiler +-if test "$ac_cv_prog_cxx_g" == no ++if test "$ac_cv_prog_cxx_g" = no + then + AC_MSG_ERROR([Cannot find a working C++ compiler]) + fi + + dnl Set PKG_CONFIG if necessary +-if test "$PKG_CONFIG" == "" ++if test "$PKG_CONFIG" = "" + then + PKG_CONFIG=`which pkg-config` + fi +@@ -71,7 +71,7 @@ AC_CHECK_LIB(physfs, PHYSFS_init, have_physfs_lib=yes) + if test x$have_physfs_hdr = xyes -a x$have_physfs_lib = xyes; then + enable_physfs="yes" + else +-dnl if test "$ac_cv_prog_cxx_g" == no ++dnl if test "$ac_cv_prog_cxx_g" = no + dnl then + AC_MSG_ERROR([Could not find PhysicsFS]) + dnl fi +-- +2.31.1 + diff --git a/games-arcade/epiar/files/epiar-0.5.1-unbundle-lua5.1.patch b/games-arcade/epiar/files/epiar-0.5.1-unbundle-lua5.1.patch new file mode 100644 index 000000000000..e80615e549b6 --- /dev/null +++ b/games-arcade/epiar/files/epiar-0.5.1-unbundle-lua5.1.patch @@ -0,0 +1,49 @@ +From 0ed05474a5ea50cc972fae620fd1580ed0026fca Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Wed, 7 Apr 2021 00:28:07 +0000 +Subject: [PATCH 1/2] Unbundle Lua 5.1 and dynamically link with system copy + +Signed-off-by: Sam James <sam@gentoo.org> +--- + Makefile.am | 6 ++---- + configure.ac | 3 +++ + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 334b80e..b24ad29 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,4 @@ +-AM_CXXFLAGS = -I$(top_srcdir)/source/ -I$(top_srcdir)/source/lua/src ++AM_CXXFLAGS = -I$(top_srcdir)/source/ $(LUA_CFLAGS) + + bin_PROGRAMS = epiar + +@@ -74,9 +74,7 @@ epiar_SOURCES = source/main.cpp \ + source/Utilities/trig.cpp \ + source/Utilities/xml.cpp + +-epiar_LDADD = source/lua/src/liblua.a +- +-SUBDIRS=source/lua ++epiar_LDADD = $(LUA_LIBS) + + include resources/Animations/Makefile.am + include resources/audio/Makefile.am +diff --git a/configure.ac b/configure.ac +index 17202ae..b5a70d5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -99,6 +99,9 @@ case "$target" in *-apple-darwin*) + LIBS="$LIBS `xml2-config --libs`" + esac + ++dnl Check for Lua 5.1 ++PKG_CHECK_MODULES([LUA], [lua5.1], [], [AC_MSG_ERROR([Could not find needed Lua 5.1])]) ++ + dnl Check for SDL + SDL_VERSION=1.2.10 + +-- +2.31.1 + diff --git a/games-arcade/epiar/metadata.xml b/games-arcade/epiar/metadata.xml index 9a42744eb0df..761011159868 100644 --- a/games-arcade/epiar/metadata.xml +++ b/games-arcade/epiar/metadata.xml @@ -1,21 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> <longdescription> -Epiar is a space adventure/combat game written in C with SDL -(Simple DirectMedia Layer). It is absolutely free (released -under the General Public License v2). -In Epiar, you begin as a shuttle pilot in a galaxy generally -ruled by anarchy, with few stable governments and numerous -rebel factions. You start your adventure off doing whatever -you want, but generally trying to save up money for a new -starship, and your adventure takes off from there ... -</longdescription> + Epiar is a space adventure/combat game written in C with SDL + (Simple DirectMedia Layer). It is absolutely free (released + under the General Public License v2). + In Epiar, you begin as a shuttle pilot in a galaxy generally + ruled by anarchy, with few stable governments and numerous + rebel factions. You start your adventure off doing whatever + you want, but generally trying to save up money for a new + starship, and your adventure takes off from there ... + </longdescription> <upstream> + <remote-id type="github">cthielen/Epiar</remote-id> <remote-id type="sourceforge">epiar</remote-id> </upstream> </pkgmetadata> diff --git a/games-arcade/excido/Manifest b/games-arcade/excido/Manifest index 3efaf1e39af7..069f6225c4f4 100644 --- a/games-arcade/excido/Manifest +++ b/games-arcade/excido/Manifest @@ -1 +1,2 @@ DIST excido-0.1.5c-src.tar.bz2 2981629 BLAKE2B 504c21861a4d966400a94ef6733794f72edbf950a84dcd935213244252b771e168f0bb5e21780c90d2cd1a1799cac821a502dbb558ffe6204d4b552e5af465d4 SHA512 9e1b98ed31eac735087f451c466d0e0d1b885ad5336f7994abf8f844b1c27cc24e90048306ffd62864fa5ab2bada6744b4b54991c6eb9b22624af20c645e02d7 +DIST excido.png 965 BLAKE2B 2f2cb7091d0256c158c801b668e252a555b2c8976fc7af0c73f71457771e33f5e5f46109081431dc8e10a6f7748075ca60e0fe8f3fbf81bc5bb1a6079748ef27 SHA512 8248e652bd148c13e4b896eabd9360281c0c296ecfd28cf5d25593505bba94c1cac5a5dc9e89925dbd851670d917fa8949370cc797bb2eed7fb7c0fc72d14f3c diff --git a/games-arcade/excido/excido-0.1.5c-r3.ebuild b/games-arcade/excido/excido-0.1.5c-r3.ebuild deleted file mode 100644 index cea4558b0b61..000000000000 --- a/games-arcade/excido/excido-0.1.5c-r3.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit desktop - -DESCRIPTION="A fast paced action game" -HOMEPAGE="http://icculus.org/excido/" -SRC_URI="http://icculus.org/excido/${P}-src.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="dev-games/physfs - media-libs/libsdl[opengl] - media-libs/sdl-mixer - media-libs/sdl-ttf - media-libs/sdl-image[png] - media-libs/openal - media-libs/freealut" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-freealut.patch - "${FILESDIR}"/${P}-build.patch -) - -src_compile() { - emake DATADIR=/usr/share/${PN}/ -} - -src_install() { - dobin ${PN} - insinto /usr/share/${PN} - doins data/* - dodoc BUGS CHANGELOG HACKING README TODO \ - keyguide.txt data/CREDITS data/*.txt -} diff --git a/games-arcade/excido/excido-0.1.5c-r4.ebuild b/games-arcade/excido/excido-0.1.5c-r4.ebuild new file mode 100644 index 000000000000..dc58b8086e42 --- /dev/null +++ b/games-arcade/excido/excido-0.1.5c-r4.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop toolchain-funcs + +DESCRIPTION="Fast paced action game" +HOMEPAGE="https://icculus.org/excido/" +SRC_URI=" + https://icculus.org/excido/${P}-src.tar.bz2 + https://dev.gentoo.org/~ionen/distfiles/${PN}.png" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + dev-games/physfs + media-libs/freealut + media-libs/libsdl[opengl] + media-libs/openal + media-libs/sdl-image[png] + media-libs/sdl-mixer + media-libs/sdl-ttf" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-freealut.patch + "${FILESDIR}"/${P}-build.patch +) + +src_compile() { + tc-export CXX + + emake DATADIR=/usr/share/${PN}/ +} + +src_install() { + dobin ${PN} + + insinto /usr/share/${PN} + doins -r data/. + + dodoc BUGS CHANGELOG HACKING README TODO \ + data/{CREDITS,readme-jf-nebula_sky.txt} keyguide.txt + + doicon "${DISTDIR}"/${PN}.png + make_desktop_entry ${PN} Excido +} diff --git a/games-arcade/excido/metadata.xml b/games-arcade/excido/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/excido/metadata.xml +++ b/games-arcade/excido/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/fishsupper/files/fishsupper-0.1.6-int16.patch b/games-arcade/fishsupper/files/fishsupper-0.1.6-int16.patch new file mode 100644 index 000000000000..3e4f6edbf631 --- /dev/null +++ b/games-arcade/fishsupper/files/fishsupper-0.1.6-int16.patch @@ -0,0 +1,14 @@ +Fix build with clang +https://bugs.gentoo.org/739090 + +--- a/src/SFont_gl.cpp ++++ b/src/SFont_gl.cpp +@@ -223,7 +223,7 @@ void Mafferyew::SFont_gl::create_font_char(SDL_Surface* image, + 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000); + #endif + +- SDL_Rect src_rect = { begin_x, 1, font_char_w, font_height }; ++ SDL_Rect src_rect = { (Sint16)begin_x, 1, (Uint16)font_char_w, (Uint16)font_height }; + SDL_BlitSurface(image, &src_rect, converted, 0); + + GLuint texture; diff --git a/games-arcade/fishsupper/fishsupper-0.1.6-r1.ebuild b/games-arcade/fishsupper/fishsupper-0.1.6-r3.ebuild index e73b4a0b1d7d..09a8ec5b5f2a 100644 --- a/games-arcade/fishsupper/fishsupper-0.1.6-r1.ebuild +++ b/games-arcade/fishsupper/fishsupper-0.1.6-r3.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit autotools desktop DESCRIPTION="A simple arcade/puzzle game, loosely based on the retro classic Frogger" @@ -11,10 +12,9 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="CC-BY-SA-2.5 GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RDEPEND=" - media-libs/libsdl[sound,video,opengl,X] + media-libs/libsdl[joystick,sound,video,opengl,X] media-libs/sdl-image[png] media-libs/sdl-mixer[wav] virtual/opengl @@ -23,16 +23,21 @@ DEPEND="${RDEPEND} dev-libs/boost " +PATCHES=( + "${FILESDIR}"/${P}-ovflfix.patch + "${FILESDIR}"/${P}-asneeded.patch + "${FILESDIR}"/${P}-gcc6.patch + "${FILESDIR}"/${P}-int16.patch +) + src_prepare() { default - eapply "${FILESDIR}"/${P}-ovflfix.patch \ - "${FILESDIR}"/${P}-asneeded.patch \ - "${FILESDIR}"/${P}-gcc6.patch eautoreconf } src_install() { default + newicon data/images/fs_sprite_042.png ${PN}.png make_desktop_entry ${PN} "Fish Supper" } diff --git a/games-arcade/fishsupper/metadata.xml b/games-arcade/fishsupper/metadata.xml index 06f43265c42e..ff7a71c8e984 100644 --- a/games-arcade/fishsupper/metadata.xml +++ b/games-arcade/fishsupper/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/frozen-bubble/frozen-bubble-2.2.1_beta1-r1.ebuild b/games-arcade/frozen-bubble/frozen-bubble-2.2.1_beta1-r2.ebuild index 9315ab5159ba..3a75e5deb783 100644 --- a/games-arcade/frozen-bubble/frozen-bubble-2.2.1_beta1-r1.ebuild +++ b/games-arcade/frozen-bubble/frozen-bubble-2.2.1_beta1-r2.ebuild @@ -1,22 +1,23 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -MY_P="${P/_/-}" +EAPI=8 + +inherit desktop perl-module toolchain-funcs xdg -inherit desktop gnome2-utils perl-module toolchain-funcs +MY_P="${P/_/-}" DESCRIPTION="A Puzzle Bubble clone written in perl (now with network support)" HOMEPAGE="http://www.frozen-bubble.org/" SRC_URI="http://www.frozen-bubble.org/data/${MY_P}.tar.bz2" +S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RDEPEND=" - >=dev-lang/perl-5.12 + dev-lang/perl dev-libs/glib:2 >=dev-perl/Alien-SDL-1.413 dev-perl/Compress-Bzip2 @@ -31,30 +32,26 @@ RDEPEND=" media-libs/sdl-ttf virtual/libiconv virtual/perl-Getopt-Long - virtual/perl-IO -" -DEPEND="${RDEPEND} - virtual/pkgconfig + virtual/perl-IO" +DEPEND="${RDEPEND}" +BDEPEND=" dev-perl/Locale-Maketext-Lexicon + dev-perl/Module-Build virtual/perl-ExtUtils-CBuilder virtual/perl-ExtUtils-ParseXS - dev-perl/Module-Build -" + virtual/pkgconfig" -S="${WORKDIR}/${MY_P}" - -src_prepare() { - perl-module_src_prepare - eapply "${FILESDIR}"/${P}-Werror.patch - eapply "${FILESDIR}"/${P}-fix-buffer-size.patch -} +PATCHES=( + "${FILESDIR}"/${P}-Werror.patch + "${FILESDIR}"/${P}-fix-buffer-size.patch +) src_configure() { - LD=$(tc-getCC) perl-module_src_configure + LD="$(tc-getCC)" perl-module_src_configure } src_compile() { - LD=$(tc-getCC) perl-module_src_compile + LD="$(tc-getCC)" perl-module_src_compile } src_install() { @@ -64,20 +61,8 @@ src_install() { local res for res in 16 32 48 64; do - newicon -s ${res} share/icons/frozen-bubble-icon-${res}x${res}.png ${PN}.png + newicon -s ${res} share/icons/frozen-bubble-icon-${res}x${res}.png ${PN}.png done make_desktop_entry ${PN} Frozen-Bubble } - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-arcade/frozen-bubble/metadata.xml b/games-arcade/frozen-bubble/metadata.xml index 7f5d7f12567e..c9db732cba74 100644 --- a/games-arcade/frozen-bubble/metadata.xml +++ b/games-arcade/frozen-bubble/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/funnyboat/files/funnyboat-1.5_p11-windowed.patch b/games-arcade/funnyboat/files/funnyboat-1.5_p11-windowed.patch new file mode 100644 index 000000000000..a736a43e9fb9 --- /dev/null +++ b/games-arcade/funnyboat/files/funnyboat-1.5_p11-windowed.patch @@ -0,0 +1,10 @@ +Fullscreen can misdisplay depending on available modes and, while there +is a command line option to enable it (-f), there is none to disable. + +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=432693 +--- a/locals.py ++++ b/locals.py +@@ -18,2 +18,2 @@ + name = "Funny Boater" +- fullscreen = True ++ fullscreen = False diff --git a/games-arcade/funnyboat/funnyboat-1.5_p11-r1.ebuild b/games-arcade/funnyboat/funnyboat-1.5_p11-r3.ebuild index ca795f62ebaa..057cd72f6914 100644 --- a/games-arcade/funnyboat/funnyboat-1.5_p11-r1.ebuild +++ b/games-arcade/funnyboat/funnyboat-1.5_p11-r3.ebuild @@ -1,48 +1,51 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +EAPI=8 -inherit desktop eutils gnome2-utils python-single-r1 xdg +PYTHON_COMPAT=( python3_{9..11} ) +inherit desktop python-single-r1 wrapper -DESCRIPTION="A side scrolling shooter game starring a steamboat on the sea" -HOMEPAGE="http://funnyboat.sourceforge.net/" +DESCRIPTION="Side scrolling shooter game starring a steamboat on the sea" +HOMEPAGE="https://funnyboat.sourceforge.net/" SRC_URI=" mirror://sourceforge/${PN}/${P/_p*}-src.zip - mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz -" + mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz" +S="${WORKDIR}/${PN}" -LICENSE="GPL-2 MIT" +LICENSE="BitstreamVera GPL-2 MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep ' - >=dev-python/pygame-1.6.2[${PYTHON_MULTI_USEDEP}] - ') -" -DEPEND="${DEPEND}" -BDEPEND="app-arch/unzip" +RDEPEND=" + ${PYTHON_DEPS} + $(python_gen_cond_dep 'dev-python/pygame[${PYTHON_USEDEP}]') + media-libs/sdl2-image[png] + media-libs/sdl2-mixer[vorbis]" +BDEPEND=" + ${PYTHON_DEPS} + app-arch/unzip" -S="${WORKDIR}/${PN}" +PATCHES=( + "${WORKDIR}"/debian/patches + "${FILESDIR}"/${P}-windowed.patch +) src_prepare() { # Drop Debian specific patch rm "${WORKDIR}"/debian/patches/use_debian_vera_ttf.patch || die - eapply -p1 "${WORKDIR}"/debian/patches/*.patch - xdg_src_prepare + default } src_install() { insinto /usr/share/${PN} doins -r data *.py + python_optimize "${ED}"/usr/share/${PN} - dodoc *.txt + einstalldocs make_wrapper ${PN} "${EPYTHON} main.py" /usr/share/${PN} diff --git a/games-arcade/funnyboat/metadata.xml b/games-arcade/funnyboat/metadata.xml index 5d2ebb097195..013c1b840585 100644 --- a/games-arcade/funnyboat/metadata.xml +++ b/games-arcade/funnyboat/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/gav/gav-0.9.0-r1.ebuild b/games-arcade/gav/gav-0.9.0-r1.ebuild index 06d00b3ebba1..2328bd561997 100644 --- a/games-arcade/gav/gav-0.9.0-r1.ebuild +++ b/games-arcade/gav/gav-0.9.0-r1.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit desktop toolchain-funcs +inherit toolchain-funcs DESCRIPTION="GPL Arcade Volleyball" -HOMEPAGE="http://gav.sourceforge.net/" +HOMEPAGE="https://gav.sourceforge.net/" # the themes are behind a lame php-counter script. SRC_URI=" mirror://sourceforge/gav/${P}.tar.gz @@ -18,7 +18,7 @@ SRC_URI=" mirror://gentoo/yisus.tgz mirror://gentoo/yisus2.tgz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" @@ -44,12 +44,19 @@ src_prepare() { # Now, move the additional themes in the proper directory mv ../{fabeach,florindo,inverted,naive,unnamed,yisus,yisus2} themes || die - # no reason to have executable bit set on themes + # No reason to have executable bit set on themes find themes -type f -exec chmod a-x '{}' \; || die + + # Respect LD, bug #779976 + sed -i -e 's/LD = ld/LD ?= ld/' CommonHeader || die + sed -i -e 's/$(LD)/& $(LDFLAGS)/' */Makefile || die } src_configure() { tc-export CXX + + # Nobody _really_ sets LD. Tell the compiler what to do instead. + export LD="${CXX}" } src_compile() { diff --git a/games-arcade/gav/metadata.xml b/games-arcade/gav/metadata.xml index 474d81b5edf8..4662664a83d2 100644 --- a/games-arcade/gav/metadata.xml +++ b/games-arcade/gav/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/gish-demo/gish-demo-1.6-r1.ebuild b/games-arcade/gish-demo/gish-demo-1.6-r1.ebuild index 1116e16d52ec..3d80f29f2e3a 100644 --- a/games-arcade/gish-demo/gish-demo-1.6-r1.ebuild +++ b/games-arcade/gish-demo/gish-demo-1.6-r1.ebuild @@ -1,37 +1,35 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils +EAPI=7 + +inherit wrapper DESCRIPTION="Play as an amorphous ball of tar that rolls and squishes around" HOMEPAGE="http://www.chroniclogic.com/gish.htm" SRC_URI="http://www.chroniclogic.com/demos/gishdemo.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/gishdemo LICENSE="all-rights-reserved" SLOT="0" KEYWORDS="-* ~amd64 ~x86" -IUSE="" RESTRICT="mirror bindist strip" -QA_PREBUILT="${GAMES_PREFIX_OPT:1}/${PN}/gish" +QA_PREBUILT="opt/${PN}/gish" RDEPEND=" + >=media-libs/openal-1.6.372 media-libs/libsdl media-libs/libvorbis virtual/opengl x11-libs/libX11 - >=media-libs/openal-1.6.372 " -DEPEND="" - -S="${WORKDIR}/gishdemo" src_install() { local dir=/opt/${PN} local gishbin=gishdemo use amd64 && gishbin=gishdemo_64 - insinto "${dir}" + insinto ${dir} doins -r * fperms +x "${dir}"/${gishbin} make_wrapper gish ./${gishbin} "${dir}" diff --git a/games-arcade/gish-demo/metadata.xml b/games-arcade/gish-demo/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/gish-demo/metadata.xml +++ b/games-arcade/gish-demo/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/gnake/gnake-0.94b-r1.ebuild b/games-arcade/gnake/gnake-0.94b-r1.ebuild deleted file mode 100644 index cb17bb2e53d9..000000000000 --- a/games-arcade/gnake/gnake-0.94b-r1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="An ncurses-based Nibbles clone" -HOMEPAGE="http://lightless.org/gnake" -SRC_URI="mirror://gentoo/Gnake.${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="sys-libs/ncurses:0" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -S="${WORKDIR}/${PN}" - -src_compile() { - emake LDLIBS="$(pkg-config ncurses --libs)" gnake -} - -src_install() { - dobin gnake - einstalldocs -} diff --git a/games-arcade/gnake/gnake-0.94b-r3.ebuild b/games-arcade/gnake/gnake-0.94b-r3.ebuild new file mode 100644 index 000000000000..64288e3d1c89 --- /dev/null +++ b/games-arcade/gnake/gnake-0.94b-r3.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="ncurses-based Nibbles clone" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI="mirror://gentoo/${PN^}.${PV}.tar.gz" +S="${WORKDIR}/${PN}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" + +RDEPEND="sys-libs/ncurses:=" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_compile() { + tc-export CC + + append-cppflags $($(tc-getPKG_CONFIG) --cflags ncurses || die) + append-libs $($(tc-getPKG_CONFIG) --libs ncurses || die) + + emake LDLIBS="${LIBS}" gnake +} + +src_install() { + dobin gnake + einstalldocs +} diff --git a/games-arcade/gnake/metadata.xml b/games-arcade/gnake/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/gnake/metadata.xml +++ b/games-arcade/gnake/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/gnome-nibbles/Manifest b/games-arcade/gnome-nibbles/Manifest index 409b876ca448..ba8d3f524772 100644 --- a/games-arcade/gnome-nibbles/Manifest +++ b/games-arcade/gnome-nibbles/Manifest @@ -1 +1,2 @@ -DIST gnome-nibbles-3.36.0.tar.xz 317624 BLAKE2B 6b9a582964ba03520e83900bdf00043133edac3ec3fd63a183687875026f70349efa737fd0f6e27fa2feeaf577f1e2957bd02a24213c2ddd573f6fae7c695922 SHA512 f7753589e2bab5d87528cf5dd4365fdc0920555d480cac225f99a9bb5b6c5670779d43602ce8f715c6a185a304c606a1121fb139eb493df69d17a40dffa8d4a4 +DIST gnome-nibbles-4.0.2.tar.xz 418992 BLAKE2B d94e0c11c683765ff50ec4c72669b6ccdac405a107d1f68675b95ae386ff3ae825e0783ce45f26e974675a243d98a00bb1be224ae29e5f25e3735cf1bbf25990 SHA512 a0f82e4860cc05f9b2fdd2037a59088ef1747e17f660778ba68d6eed328b962e27606dfe2e7a9b0a8f46c68bb5f6ff26f7048fae24ab17fe8d63685656e85025 +DIST gnome-nibbles-4.0.4.tar.xz 419784 BLAKE2B 5ddecac8818fe512d84a4d007aa91b2bb747686f3d8471ed4f57b02584755ab0b87f4b479ab445e1197187a7d9a429e6489dd57a9434f7a1a7b7b3d02bee34ba SHA512 751dc492d5facd769e81478e93c55afe7c9a8e64a31e224568d67188cdd07fe568709ee211fe18452e10aa7224d5104284c53b95b52f8721a8e0ec28fe7823cc diff --git a/games-arcade/gnome-nibbles/files/3.36.0-drop-unnecessary-files.patch b/games-arcade/gnome-nibbles/files/3.36.0-drop-unnecessary-files.patch deleted file mode 100644 index 63ae21026066..000000000000 --- a/games-arcade/gnome-nibbles/files/3.36.0-drop-unnecessary-files.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 2ca8c1e70635eba7f667e5d97b6d85bda2374b9e Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <leio@gentoo.org> -Date: Sun, 29 Mar 2020 19:13:14 +0300 -Subject: [PATCH] meson: Don't install data files consumed as gresources - -Fixes #36 ---- - data/meson.build | 10 ---------- - 1 file changed, 10 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index 08fa461..0492411 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -32,16 +32,6 @@ install_data([ - 'teleport.ogg' - ], install_dir: sounddir) - --# UI files --install_data([ -- 'nibbles.ui', -- 'nibbles.css', -- 'scoreboard.ui', -- 'player-score-box.ui', -- 'controls-grid.ui', -- 'preferences-dialog.ui' --], install_dir: pkgdatadir) -- - # Icons - foreach size: [ '16x16', '22x22', '24x24', '32x32', '48x48' ] - install_data(join_paths('icons', 'hicolor', size, 'org.gnome.Nibbles.png'), --- -2.20.1 - diff --git a/games-arcade/gnome-nibbles/gnome-nibbles-3.36.0.ebuild b/games-arcade/gnome-nibbles/gnome-nibbles-4.0.2.ebuild index d35b63cbd280..fed88c796bfc 100644 --- a/games-arcade/gnome-nibbles/gnome-nibbles-3.36.0.ebuild +++ b/games-arcade/gnome-nibbles/gnome-nibbles-4.0.2.ebuild @@ -1,26 +1,24 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit gnome.org gnome2-utils meson vala xdg -DESCRIPTION="Nibbles clone for Gnome" -HOMEPAGE="https://wiki.gnome.org/Apps/Nibbles" +DESCRIPTION="Nibbles clone for GNOME" +HOMEPAGE="https://wiki.gnome.org/Apps/Nibbles https://gitlab.gnome.org/GNOME/gnome-nibbles" LICENSE="GPL-3+ CC-BY-SA-3.0" SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="" +KEYWORDS="amd64 arm64 ~loong ~riscv x86" RDEPEND=" - >=dev-libs/glib-2.40.0:2 - >=media-libs/clutter-1.22.0:1.0 - >=media-libs/clutter-gtk-1.4.0:1.0 + >=dev-libs/glib-2.78.0:2 dev-libs/libgee:0.8= >=media-libs/gsound-1.0.2 - >=x11-libs/gtk+-3.18.0:3 - dev-libs/libgnome-games-support:1= + >=gui-libs/gtk-4.6:4 + x11-libs/pango + >=dev-libs/libgnome-games-support-2.0.0:2= " DEPEND="${RDEPEND}" BDEPEND=" @@ -31,13 +29,10 @@ BDEPEND=" media-libs/gsound[vala] " -PATCHES=( - "${FILESDIR}"/${PV}-drop-unnecessary-files.patch # https://gitlab.gnome.org/GNOME/gnome-nibbles/merge_requests/11 -) - src_prepare() { - xdg_src_prepare - vala_src_prepare + default + vala_setup + xdg_environment_reset } pkg_postinst() { diff --git a/games-arcade/gnome-nibbles/gnome-nibbles-4.0.4.ebuild b/games-arcade/gnome-nibbles/gnome-nibbles-4.0.4.ebuild new file mode 100644 index 000000000000..fa838bb0042b --- /dev/null +++ b/games-arcade/gnome-nibbles/gnome-nibbles-4.0.4.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org gnome2-utils meson vala xdg + +DESCRIPTION="Nibbles clone for GNOME" +HOMEPAGE="https://wiki.gnome.org/Apps/Nibbles https://gitlab.gnome.org/GNOME/gnome-nibbles" + +LICENSE="GPL-3+ CC-BY-SA-3.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" + +RDEPEND=" + >=dev-libs/glib-2.78.0:2 + dev-libs/libgee:0.8= + >=media-libs/gsound-1.0.2 + >=gui-libs/gtk-4.6:4 + x11-libs/pango + >=dev-libs/libgnome-games-support-2.0.0:2= +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/itstool + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + $(vala_depend) + media-libs/gsound[vala] +" + +src_prepare() { + default + vala_setup + xdg_environment_reset +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/games-arcade/gnome-nibbles/metadata.xml b/games-arcade/gnome-nibbles/metadata.xml index 39980802b1da..e0c135044413 100644 --- a/games-arcade/gnome-nibbles/metadata.xml +++ b/games-arcade/gnome-nibbles/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <upstream> + <remote-id type="gnome-gitlab">GNOME/gnome-nibbles</remote-id> + </upstream> </pkgmetadata> diff --git a/games-arcade/gnome-robots/Manifest b/games-arcade/gnome-robots/Manifest index d81173335a77..2848c9722ae6 100644 --- a/games-arcade/gnome-robots/Manifest +++ b/games-arcade/gnome-robots/Manifest @@ -1 +1 @@ -DIST gnome-robots-3.36.0.tar.xz 425616 BLAKE2B 1d5a3a0a087ace46af17fd97d7c284ba722d9bec22b9694ebd16b3d18fe1d87e656c6dcfc7b4687c60ea5015577c8319d967b8ad705d3d4d5e398df35c392068 SHA512 8e5eb03f74c1092c26148d0818c9e8118144dbb70c6cb25db449316ede05ff892a9ad06df2e8dc9942fe8c4f5ae638a1c8a8cda381f78f6f01a80c19010df35a +DIST gnome-robots-40.0.tar.xz 420024 BLAKE2B 2cac9377914a4cc12bdfe23bf73fd1c63e80aee7c70d3817ebeac2cb044c6a1a4f00a6fd40f903bea5560ef598ad74d372dda91a61e486eb17b0bd85bc6c53ca SHA512 bff0caf40976b420f564abbfaa96ae1627da89cfa19a7ff3c14c313f7bbdd1d0452452d49ca7b150493915ae7eebdd022aada673405e0794e4c3abd8f5c39b4f diff --git a/games-arcade/gnome-robots/gnome-robots-3.36.0.ebuild b/games-arcade/gnome-robots/gnome-robots-40.0.ebuild index f1d17dca8f3d..23600912aee4 100644 --- a/games-arcade/gnome-robots/gnome-robots-3.36.0.ebuild +++ b/games-arcade/gnome-robots/gnome-robots-40.0.ebuild @@ -1,32 +1,40 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit gnome.org gnome2-utils meson xdg +inherit gnome.org gnome2-utils meson vala xdg DESCRIPTION="Avoid the robots and make them crash into each other" -HOMEPAGE="https://wiki.gnome.org/Apps/Robots" +HOMEPAGE="https://wiki.gnome.org/Apps/Robots https://gitlab.gnome.org/GNOME/gnome-robots" LICENSE="GPL-3+ CC-BY-SA-3.0" SLOT="0" -KEYWORDS="amd64 ~arm64 x86" +KEYWORDS="amd64 arm64 ~loong ~riscv x86" IUSE="" RDEPEND=" + >=dev-libs/libgee-0.8:= >=dev-libs/glib-2.32:2 - dev-libs/libgnome-games-support:1= + >=dev-libs/libgnome-games-support-1.7.1:1= >=media-libs/gsound-1.0.2 - >=x11-libs/gtk+-3.15:3 + >=x11-libs/gtk+-3.24:3 >=gnome-base/librsvg-2.36.2:2 " DEPEND="${RDEPEND}" BDEPEND=" + $(vala_depend) + gnome-base/librsvg:2[vala] dev-libs/appstream-glib dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig " +src_prepare() { + vala_src_prepare + xdg_src_prepare +} + pkg_postinst() { xdg_pkg_postinst gnome2_schemas_update diff --git a/games-arcade/gnome-robots/metadata.xml b/games-arcade/gnome-robots/metadata.xml index 39980802b1da..8fd18a68db63 100644 --- a/games-arcade/gnome-robots/metadata.xml +++ b/games-arcade/gnome-robots/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <upstream> + <remote-id type="gnome-gitlab">GNOME/gnome-robots</remote-id> + </upstream> </pkgmetadata> diff --git a/games-arcade/gnujump/files/gnujump-1.0.8-musl.patch b/games-arcade/gnujump/files/gnujump-1.0.8-musl.patch new file mode 100644 index 000000000000..83bb4214e722 --- /dev/null +++ b/games-arcade/gnujump/files/gnujump-1.0.8-musl.patch @@ -0,0 +1,10 @@ +locale.h is always needed, include here rather than rely on +conditional macros which lead to failure with musl + +https://bugs.gentoo.org/831726 +--- a/src/gnujump.h ++++ b/src/gnujump.h +@@ -38,2 +38,3 @@ + #include <time.h> ++#include <locale.h> + diff --git a/games-arcade/gnujump/gnujump-1.0.8-r1.ebuild b/games-arcade/gnujump/gnujump-1.0.8-r1.ebuild deleted file mode 100644 index 271171a2cf0a..000000000000 --- a/games-arcade/gnujump/gnujump-1.0.8-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit desktop flag-o-matic - -DESCRIPTION="Xjump clone with added features" -HOMEPAGE="http://gnujump.es.gnu.org" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="media-libs/libsdl[sound,video] - media-libs/sdl-image[png] - media-libs/sdl-mixer[vorbis] - virtual/opengl - x11-libs/libX11 -" -RDEPEND="${DEPEND}" - -src_prepare() { - default - append-libs -lm -} - -src_install() { - default - einstalldocs - - newicon skins/xjump/hero1.0.png ${PN}.png - make_desktop_entry ${PN} "GNUjump" -} diff --git a/games-arcade/gnujump/gnujump-1.0.8-r2.ebuild b/games-arcade/gnujump/gnujump-1.0.8-r2.ebuild new file mode 100644 index 000000000000..d587ae52f45f --- /dev/null +++ b/games-arcade/gnujump/gnujump-1.0.8-r2.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools desktop flag-o-matic + +DESCRIPTION="Xjump clone with added features" +HOMEPAGE="https://jump.gnu.sinusoid.es/" +SRC_URI="mirror://gnu/gnujump/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + media-libs/libglvnd[X] + media-libs/libsdl[opengl,sound,video] + media-libs/sdl-image[png] + media-libs/sdl-mixer[vorbis] + virtual/glu + virtual/libintl" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-build/autoconf-archive + sys-devel/gettext + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-musl.patch +) + +src_prepare() { + default + + # change ac_unique_file given eautoreconf will move configure.in + sed -i 's/(configure.in)//' configure.in || die + + # regenerate due to missing macros, ensure have autoconf-archive for GLU + # and remove acinclude.m4 which does unnecessary checks (bug #818814) + rm acinclude.m4 || die + eautoreconf + + append-libs -lm #496924 +} + +src_install() { + default + + newicon skins/xjump/hero1.0.png ${PN}.png + make_desktop_entry ${PN} "GNUjump" +} diff --git a/games-arcade/gnujump/metadata.xml b/games-arcade/gnujump/metadata.xml index 78274e0fa550..0f5219c82e8e 100644 --- a/games-arcade/gnujump/metadata.xml +++ b/games-arcade/gnujump/metadata.xml @@ -1,8 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> + <bugs-to>https://savannah.gnu.org/bugs/?group=gnujump</bugs-to> + <remote-id type="github">arximboldi/gnujump</remote-id> + </upstream> </pkgmetadata> diff --git a/games-arcade/grande-KXL/Manifest b/games-arcade/grande-KXL/Manifest index 53ba90c3d5d6..70685eda9566 100644 --- a/games-arcade/grande-KXL/Manifest +++ b/games-arcade/grande-KXL/Manifest @@ -1 +1,2 @@ DIST grande-KXL-0.6.tar.gz 240869 BLAKE2B a9109dd37d72ffcfd02b9f160acd89c17d5ae13d53948ecc79718f420cb3826491a6f6b024ca65a12ada76b24110f01a52f502db2de8a736f628eda5c0054a4d SHA512 17916e54b2b2bad25d789bc3d4f182f3f104fd4e5cf7b745bb9613f76ec04a2a3d2740ca89b507ecdb653f1d42b793115e76b5b34d53b96fec3d55574632b980 +DIST grande-KXL.png 5949 BLAKE2B 4461b7f90c2abd332708c81829a5b03436163d7652f60c424c2468d08987338febf147457a16794123a7a6d5e64fea06a40071fb3e62fd5ea7bea6dadfb3dd2c SHA512 4fe68a2fa0cb3e57a590cd818953e82b3456d7e160f12d4a87d2160acf6f6b37d39da2ee1df96f14396c5a86765ab6c66e05c62a8fd246a1ce01fbec962be67d diff --git a/games-arcade/grande-KXL/files/grande-KXL-0.6-clang16.patch b/games-arcade/grande-KXL/files/grande-KXL-0.6-clang16.patch new file mode 100644 index 000000000000..7bc4a9c380fe --- /dev/null +++ b/games-arcade/grande-KXL/files/grande-KXL-0.6-clang16.patch @@ -0,0 +1,27 @@ +https://bugs.gentoo.org/874990 +--- a/src/enemy.c ++++ b/src/enemy.c +@@ -984,3 +984,3 @@ + { +- static fr[8] = {0, 0, 1, 1 ,2, 2, 1, 1}; ++ static Uint8 fr[8] = {0, 0, 1, 1 ,2, 2, 1, 1}; + +--- a/src/grande.h ++++ b/src/grande.h +@@ -13,2 +13,3 @@ + #include <sys/types.h> ++#include <time.h> + #include <unistd.h> +--- a/src/my.c ++++ b/src/my.c +@@ -527,3 +527,3 @@ + { +- static fr[8] = {0, 1, 0, 1, 2, 1, 2, 3}; ++ static Uint8 fr[8] = {0, 1, 0, 1, 2, 1, 2, 3}; + +--- a/src/ranking.h ++++ b/src/ranking.h +@@ -10,2 +10,3 @@ + void RankingScore(void); ++void ScoreRanking(void); + void ReadScore(void); diff --git a/games-arcade/grande-KXL/files/grande-KXL-0.6-configure.in.patch b/games-arcade/grande-KXL/files/grande-KXL-0.6-configure.in.patch deleted file mode 100644 index 19fec93f61a5..000000000000 --- a/games-arcade/grande-KXL/files/grande-KXL-0.6-configure.in.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -17,12 +17,8 @@ - AC_CHECK_HEADERS(unistd.h) - - dnl installation & score path --if test "x${prefix}" = "xNONE"; then -- inst_path="${ac_default_prefix}/games/grande" --else -- inst_path="${prefix}/games/grande" --fi --score_path="/var/games" -+inst_path="${datadir}/grande" -+score_path="${localstatedir}" - - dnl check if installation was disabled - AC_ARG_ENABLE( install, diff --git a/games-arcade/grande-KXL/files/grande-KXL-0.6-paths.patch b/games-arcade/grande-KXL/files/grande-KXL-0.6-paths.patch new file mode 100644 index 000000000000..8aef0e382421 --- /dev/null +++ b/games-arcade/grande-KXL/files/grande-KXL-0.6-paths.patch @@ -0,0 +1,9 @@ +--- a/configure.in ++++ b/configure.in +@@ -21,5 +21,5 @@ + inst_path="${ac_default_prefix}/games/grande" + else +- inst_path="${prefix}/games/grande" ++ inst_path="${datadir}/grande" + fi + score_path="/var/games" diff --git a/games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild b/games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild deleted file mode 100644 index 899a615e6527..000000000000 --- a/games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools desktop - -DESCRIPTION="ZANAC type game" -HOMEPAGE="http://triring.net/ps2linux/games/kxl/kxlgames.html" -SRC_URI="mirror://gentoo/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="dev-games/KXL" -RDEPEND="${DEPEND} - media-fonts/font-adobe-100dpi" - -PATCHES=( - "${FILESDIR}"/${P}-configure.in.patch - "${FILESDIR}"/${P}-cflags.patch -) - -src_prepare() { - default - - mv configure.{in,ac} || die - rm aclocal.m4 || die - eautoreconf -} - -src_install() { - dodir /var/lib - default - - newicon src/bmp/boss1.bmp ${PN}.bmp - make_desktop_entry grande Grande /usr/share/pixmaps/${PN}.bmp -} diff --git a/games-arcade/grande-KXL/grande-KXL-0.6-r3.ebuild b/games-arcade/grande-KXL/grande-KXL-0.6-r3.ebuild new file mode 100644 index 000000000000..13d41d77c5c5 --- /dev/null +++ b/games-arcade/grande-KXL/grande-KXL-0.6-r3.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools desktop + +DESCRIPTION="ZANAC type game" +HOMEPAGE="http://triring.net/ps2linux/games/kxl/kxlgames.html" +SRC_URI=" + mirror://gentoo/${P}.tar.gz + https://dev.gentoo.org/~ionen/distfiles/${PN}.png" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + acct-group/gamestat + dev-games/KXL" +RDEPEND="${DEPEND} + media-fonts/font-adobe-100dpi + media-fonts/font-bitstream-100dpi" + +PATCHES=( + "${FILESDIR}"/${P}-cflags.patch + "${FILESDIR}"/${P}-paths.patch + "${FILESDIR}"/${P}-clang16.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + econf --with-highscore-path="${EPREFIX}/var/games" +} + +src_install() { + dodir /var/games + default + + fowners :gamestat /var/games/grande.scores /usr/bin/grande + fperms g+s /usr/bin/grande + fperms 660 /var/games/grande.scores + + doicon "${DISTDIR}"/${PN}.png + make_desktop_entry grande Grande +} diff --git a/games-arcade/grande-KXL/metadata.xml b/games-arcade/grande-KXL/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/grande-KXL/metadata.xml +++ b/games-arcade/grande-KXL/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/gunocide2ex/files/gunocide2ex-1.0-build.patch b/games-arcade/gunocide2ex/files/gunocide2ex-1.0-build.patch index 9abce6c01a2b..a0ba41f50480 100644 --- a/games-arcade/gunocide2ex/files/gunocide2ex-1.0-build.patch +++ b/games-arcade/gunocide2ex/files/gunocide2ex-1.0-build.patch @@ -1,6 +1,5 @@ -diff -ur work.orig/src/cEffects.cpp work/src/cEffects.cpp ---- work.orig/src/cEffects.cpp 2002-01-12 16:19:00.000000000 -0500 -+++ work/src/cEffects.cpp 2009-06-10 18:14:27.000000000 -0400 +--- a/src/cEffects.cpp ++++ b/src/cEffects.cpp @@ -180,7 +180,6 @@ {
if(!i->update())
@@ -18,9 +17,8 @@ diff -ur work.orig/src/cEffects.cpp work/src/cEffects.cpp }
}
-diff -ur work.orig/src/cFont.cpp work/src/cFont.cpp ---- work.orig/src/cFont.cpp 2002-01-02 07:57:46.000000000 -0500 -+++ work/src/cFont.cpp 2009-06-10 18:19:15.000000000 -0400 +--- a/src/cFont.cpp ++++ b/src/cFont.cpp @@ -62,7 +62,7 @@ }
@@ -30,9 +28,8 @@ diff -ur work.orig/src/cFont.cpp work/src/cFont.cpp {
font = TTF_OpenFont(path,size);
if(font==NULL)
-diff -ur work.orig/src/cFont.h work/src/cFont.h ---- work.orig/src/cFont.h 2002-01-02 07:57:46.000000000 -0500 -+++ work/src/cFont.h 2009-06-10 18:19:27.000000000 -0400 +--- a/src/cFont.h ++++ b/src/cFont.h @@ -34,7 +34,7 @@ static void delInstance(); static bool initttf(); @@ -42,9 +39,8 @@ diff -ur work.orig/src/cFont.h work/src/cFont.h void setcolor(int r,int g,int b); void setshader(int r,int g,int b); void print(SDL_Surface *screen,int posx,int posy,const char *fmt, ...); -diff -ur work.orig/src/cParticleSys.cpp work/src/cParticleSys.cpp ---- work.orig/src/cParticleSys.cpp 2002-01-02 07:57:46.000000000 -0500 -+++ work/src/cParticleSys.cpp 2009-06-10 18:14:27.000000000 -0400 +--- a/src/cParticleSys.cpp ++++ b/src/cParticleSys.cpp @@ -81,9 +81,6 @@ if(time-p->getstarttime()>p->getlifetime()) { @@ -55,9 +51,8 @@ diff -ur work.orig/src/cParticleSys.cpp work/src/cParticleSys.cpp } } -diff -ur work.orig/src/cSound.cpp work/src/cSound.cpp ---- work.orig/src/cSound.cpp 2002-01-12 16:27:34.000000000 -0500 -+++ work/src/cSound.cpp 2009-06-10 18:17:44.000000000 -0400 +--- a/src/cSound.cpp ++++ b/src/cSound.cpp @@ -92,7 +92,7 @@ }
@@ -67,9 +62,8 @@ diff -ur work.orig/src/cSound.cpp work/src/cSound.cpp {
if(!sound_on)
return true;
-diff -ur work.orig/src/cSound.h work/src/cSound.h ---- work.orig/src/cSound.h 2002-01-08 12:30:57.000000000 -0500 -+++ work/src/cSound.h 2009-06-10 18:17:50.000000000 -0400 +--- a/src/cSound.h ++++ b/src/cSound.h @@ -35,7 +35,7 @@ bool init(); @@ -79,9 +73,8 @@ diff -ur work.orig/src/cSound.h work/src/cSound.h void stopogg(); bool loadwav(int index,char *path); void playwav(int index); -diff -ur work.orig/src/cSprite.cpp work/src/cSprite.cpp ---- work.orig/src/cSprite.cpp 2002-01-02 07:57:46.000000000 -0500 -+++ work/src/cSprite.cpp 2009-06-10 18:18:34.000000000 -0400 +--- a/src/cSprite.cpp ++++ b/src/cSprite.cpp @@ -29,7 +29,7 @@ ///ldt ein BMP in das image-Surface @@ -98,9 +91,8 @@ diff -ur work.orig/src/cSprite.cpp work/src/cSprite.cpp -} \ No newline at end of file +} -diff -ur work.orig/src/cSprite.h work/src/cSprite.h ---- work.orig/src/cSprite.h 2002-01-02 07:57:46.000000000 -0500 -+++ work/src/cSprite.h 2009-06-10 18:18:44.000000000 -0400 +--- a/src/cSprite.h ++++ b/src/cSprite.h @@ -26,7 +26,7 @@ cSprite(); ~cSprite(); @@ -110,9 +102,8 @@ diff -ur work.orig/src/cSprite.h work/src/cSprite.h void render(SDL_Surface *screen,int x,int y); void setColorKey(int r,int g,int b); -diff -ur work.orig/src/cSpriteAnim.cpp work/src/cSpriteAnim.cpp ---- work.orig/src/cSpriteAnim.cpp 2002-01-02 07:57:46.000000000 -0500 -+++ work/src/cSpriteAnim.cpp 2009-06-10 18:20:09.000000000 -0400 +--- a/src/cSpriteAnim.cpp ++++ b/src/cSpriteAnim.cpp @@ -145,7 +145,7 @@ }
@@ -129,9 +120,8 @@ diff -ur work.orig/src/cSpriteAnim.cpp work/src/cSpriteAnim.cpp -} \ No newline at end of file +}
-diff -ur work.orig/src/cSpriteAnim.h work/src/cSpriteAnim.h ---- work.orig/src/cSpriteAnim.h 2002-01-02 07:57:46.000000000 -0500 -+++ work/src/cSpriteAnim.h 2009-06-10 18:20:16.000000000 -0400 +--- a/src/cSpriteAnim.h ++++ b/src/cSpriteAnim.h @@ -53,7 +53,7 @@ cSpriteAnim(); ~cSpriteAnim(); @@ -141,9 +131,8 @@ diff -ur work.orig/src/cSpriteAnim.h work/src/cSpriteAnim.h void setColorKey(int r,int g,int b); void render(SDL_Surface *screen,cAnim *anim,int x,int y); int getMaxNum(); -diff -ur work.orig/src/cUtil.cpp work/src/cUtil.cpp ---- work.orig/src/cUtil.cpp 2002-01-02 07:57:46.000000000 -0500 -+++ work/src/cUtil.cpp 2009-06-10 18:16:29.000000000 -0400 +--- a/src/cUtil.cpp ++++ b/src/cUtil.cpp @@ -85,7 +85,7 @@ }
@@ -153,9 +142,8 @@ diff -ur work.orig/src/cUtil.cpp work/src/cUtil.cpp {
FILE *file;
char buffer[512];
-diff -ur work.orig/src/cUtil.h work/src/cUtil.h ---- work.orig/src/cUtil.h 2002-01-02 07:57:46.000000000 -0500 -+++ work/src/cUtil.h 2009-06-10 18:16:39.000000000 -0400 +--- a/src/cUtil.h ++++ b/src/cUtil.h @@ -31,7 +31,7 @@ void updatetime();
@@ -165,9 +153,8 @@ diff -ur work.orig/src/cUtil.h work/src/cUtil.h void drawpixel(SDL_Surface *screen, int x, int y,Uint8 R, Uint8 G,Uint8 B);
bool collision(SDL_Rect objekt1,SDL_Rect objekt2);
-diff -ur work.orig/src/mmgr.cpp work/src/mmgr.cpp ---- work.orig/src/mmgr.cpp 2002-01-02 07:57:46.000000000 -0500 -+++ work/src/mmgr.cpp 2009-06-10 18:14:23.000000000 -0400 +--- a/src/mmgr.cpp ++++ b/src/mmgr.cpp @@ -59,6 +59,7 @@ #include <time.h>
#include <stdarg.h>
diff --git a/games-arcade/gunocide2ex/files/gunocide2ex-1.0-glibc2.10.patch b/games-arcade/gunocide2ex/files/gunocide2ex-1.0-glibc2.10.patch index 6b659c76a82d..2bfdd80f0f84 100644 --- a/games-arcade/gunocide2ex/files/gunocide2ex-1.0-glibc2.10.patch +++ b/games-arcade/gunocide2ex/files/gunocide2ex-1.0-glibc2.10.patch @@ -1,5 +1,5 @@ ---- src/mmgr.cpp -+++ src/mmgr.cpp +--- a/src/mmgr.cpp ++++ b/src/mmgr.cpp @@ -228,9 +228,9 @@ static const char *sourceFileStripper(const char *sourceFile)
diff --git a/games-arcade/gunocide2ex/gunocide2ex-1.0-r3.ebuild b/games-arcade/gunocide2ex/gunocide2ex-1.0-r3.ebuild new file mode 100644 index 000000000000..966755f7ba53 --- /dev/null +++ b/games-arcade/gunocide2ex/gunocide2ex-1.0-r3.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop edos2unix toolchain-funcs unpacker + +DESCRIPTION="Fast-paced 2D shoot'em'up" +HOMEPAGE="https://sourceforge.net/projects/g2ex/" +SRC_URI="mirror://sourceforge/g2ex/g2ex-setup.run" +S="${WORKDIR}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86" + +DEPEND=" + media-libs/libsdl[video] + media-libs/sdl-ttf + media-libs/sdl-mixer[vorbis] +" +RDEPEND=" + ${DEPEND} + acct-group/gamestat +" + +PATCHES=( + "${FILESDIR}"/${P}-build.patch + "${FILESDIR}"/${P}-glibc2.10.patch +) + +src_unpack() { + unpack_makeself + mkdir binary || die +} + +src_prepare() { + default + + edos2unix config.cfg + + sed -i \ + -e "s:/usr/local/games/gunocide2ex/config\.cfg:/etc/${PN}.cfg:" \ + -e "s:/usr/local/games/gunocide2ex/hscore\.dat:/var/games/gunocide2ex/${PN}-hscore.dat:" \ + -e "s:memleaks.log:/dev/null:" \ + src/*.{h,cpp} || die + + sed -i \ + -e "s:/usr/local/games:/usr/share:" \ + src/*.{h,cpp} $(find gfx -name '*.txt') || die +} + +src_compile() { + cd src || die + + tc-export CXX + + emake \ + CXXFLAGS="${CXXFLAGS} $(sdl-config --cflags)" \ + $(echo *.cpp | sed 's/\.cpp/.o/g') + + $(tc-getCXX) ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} -o ${PN} *.o -lpthread -lSDL -lSDL_ttf -lSDL_mixer || die +} + +src_install() { + dobin src/${PN} + dosym ${PN} /usr/bin/g2ex + + insinto /usr/share/${PN} + doins -r gfx sfx lvl credits arial.ttf + + insinto /etc + newins config.cfg ${PN}.cfg + + insinto /var/games/${PN} + newins hscore.dat ${PN}-hscore.dat + + fperms 660 /var/games/${PN}/${PN}-hscore.dat + fowners -R root:gamestat /var/games/${PN} /usr/bin/g2ex + fperms g+s /usr/bin/g2ex + + dodoc history doc/MANUAL_DE + docinto html + dodoc doc/manual_de.html + + newicon g2icon.xpm ${PN}.xpm + make_desktop_entry ${PN} "Gunocide II EX" +} diff --git a/games-arcade/gunocide2ex/gunocide2ex-1.0.ebuild b/games-arcade/gunocide2ex/gunocide2ex-1.0.ebuild deleted file mode 100644 index c713085ac353..000000000000 --- a/games-arcade/gunocide2ex/gunocide2ex-1.0.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils unpacker toolchain-funcs games - -DESCRIPTION="fast-paced 2D shoot'em'up" -HOMEPAGE="http://g2ex.sourceforge.net/" -SRC_URI="mirror://sourceforge/g2ex/g2ex-setup.run" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -DEPEND="media-libs/libsdl[video] - media-libs/sdl-ttf - media-libs/sdl-mixer[vorbis]" -RDEPEND=${DEPEND} - -S=${WORKDIR} - -src_unpack() { - unpack_makeself - mkdir binary || die -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-build.patch \ - "${FILESDIR}"/${P}-glibc2.10.patch - edos2unix config.cfg - sed -i \ - -e "s:/usr/local/games/gunocide2ex/config\.cfg:${GAMES_SYSCONFDIR}/${PN}.cfg:" \ - -e "s:/usr/local/games/gunocide2ex/hscore\.dat:${GAMES_STATEDIR}/${PN}-hscore.dat:" \ - -e "s:memleaks.log:/dev/null:" \ - src/*.{h,cpp} || die - sed -i \ - -e "s:/usr/local/games:${GAMES_DATADIR}:" \ - src/*.{h,cpp} $(find gfx -name '*.txt') || die -} - -src_compile() { - cd src - emake CXXFLAGS="$CXXFLAGS $(sdl-config --cflags)" $(echo *.cpp | sed 's/\.cpp/.o/g') - $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} -o ${PN} *.o -lpthread -lSDL -lSDL_ttf -lSDL_mixer || die -} - -src_install() { - dogamesbin src/${PN} - dosym ${PN} "${GAMES_BINDIR}/g2ex" - insinto "${GAMES_DATADIR}/${PN}" - doins -r gfx sfx lvl credits arial.ttf - insinto "${GAMES_SYSCONFDIR}" - newins config.cfg ${PN}.cfg - insinto "${GAMES_STATEDIR}" - newins hscore.dat ${PN}-hscore.dat - dodoc history doc/MANUAL_DE - dohtml doc/manual_de.html - newicon g2icon.xpm ${PN}.xpm - make_desktop_entry ${PN} "Gunocide II EX" - prepgamesdirs -} diff --git a/games-arcade/gunocide2ex/metadata.xml b/games-arcade/gunocide2ex/metadata.xml index 3ae017fcc5cc..531ebcaa0ed4 100644 --- a/games-arcade/gunocide2ex/metadata.xml +++ b/games-arcade/gunocide2ex/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/holotz-castle/files/holotz-castle-1.3.14-gcc-11.patch b/games-arcade/holotz-castle/files/holotz-castle-1.3.14-gcc-11.patch new file mode 100644 index 000000000000..311c352731d8 --- /dev/null +++ b/games-arcade/holotz-castle/files/holotz-castle-1.3.14-gcc-11.patch @@ -0,0 +1,30 @@ +https://bugs.gentoo.org/739092 +--- a/JLib/JLib/Util/JTextFile.cpp ++++ b/JLib/JLib/Util/JTextFile.cpp +@@ -145,7 +145,7 @@ bool JTextFile::FindNext(const s8 *str, bool jump) + + tmp = strstr(ptr, str); + +- if (tmp > 0) ++ if (tmp) + ptr = tmp; + else + { +@@ -153,7 +153,7 @@ bool JTextFile::FindNext(const s8 *str, bool jump) + { + tmp = strstr(buff, str); + +- if (tmp > 0) ++ if (tmp) + ptr = tmp; + else + return false; +@@ -233,7 +233,7 @@ bool JTextFile::ReadQuotedWord(s8 *str) + ++ptr; + end = ptr; + +- if (0 >= (end = strstr(ptr, "\""))) ++ if ((end = strstr(ptr, "\"")) == NULL) + { + // No hay comillas de cierre + ptr = org; diff --git a/games-arcade/holotz-castle/holotz-castle-1.3.14-r1.ebuild b/games-arcade/holotz-castle/holotz-castle-1.3.14-r1.ebuild index 16ed5d364bad..1ff2a004605f 100644 --- a/games-arcade/holotz-castle/holotz-castle-1.3.14-r1.ebuild +++ b/games-arcade/holotz-castle/holotz-castle-1.3.14-r1.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit desktop toolchain-funcs DESCRIPTION="2D platform game" -HOMEPAGE="http://www.mainreactor.net/holotzcastle/en/index_en.html" -SRC_URI="http://www.mainreactor.net/holotzcastle/download/${P}-src.tar.gz" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${P}-src.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -17,7 +17,7 @@ RDEPEND=" virtual/opengl virtual/glu media-libs/sdl-mixer - media-libs/libsdl + media-libs/libsdl[joystick] media-libs/sdl-ttf media-libs/sdl-image " @@ -29,10 +29,11 @@ PATCHES=( "${FILESDIR}"/${P}-build.patch "${FILESDIR}"/${P}-gcc44.patch "${FILESDIR}"/${P}-underlink.patch + "${FILESDIR}"/${P}-gcc-11.patch ) src_compile() { - tc-export AR + tc-export AR CXX emake -C JLib emake -C src HC_BASE=/usr/share/${PN}/ } diff --git a/games-arcade/holotz-castle/metadata.xml b/games-arcade/holotz-castle/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/holotz-castle/metadata.xml +++ b/games-arcade/holotz-castle/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/insaneodyssey/metadata.xml b/games-arcade/insaneodyssey/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/insaneodyssey/metadata.xml +++ b/games-arcade/insaneodyssey/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/jardinains/files/strings-pt.patch b/games-arcade/jardinains/files/strings-pt.patch index 246017a3f5bc..f4dfe3f5d46e 100644 --- a/games-arcade/jardinains/files/strings-pt.patch +++ b/games-arcade/jardinains/files/strings-pt.patch @@ -1,5 +1,5 @@ ---- data/strings.xml 2006-11-11 23:45:28.000000000 +0000 -+++ data/strings.xml 2007-02-02 14:14:14.000000000 +0000 +--- a/data/strings.xml ++++ b/data/strings.xml @@ -35,5 +35,5 @@ <es>Espaol</es>
<it>Italiano</it>
diff --git a/games-arcade/jardinains/jardinains-2.0-r1.ebuild b/games-arcade/jardinains/jardinains-2.0-r4.ebuild index e98d0da5f03b..d7a4082c3986 100644 --- a/games-arcade/jardinains/jardinains-2.0-r1.ebuild +++ b/games-arcade/jardinains/jardinains-2.0-r4.ebuild @@ -1,30 +1,38 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=7 + +inherit desktop wrapper DESCRIPTION="Arkanoid with Gnomes" -HOMEPAGE="http://www.jardinains2.com" +HOMEPAGE="https://jardinains2.com" SRC_URI="mirror://gentoo/JN2_1_FREE_LIN.tar.gz" LICENSE="jardinains" SLOT="0" KEYWORDS="-* ~amd64 ~x86" -IUSE="" + RESTRICT="strip" -QA_EXECSTACK="${GAMES_PREFIX_OPT:1}/jardinains/jardinains" -DEPEND="" -RDEPEND="sys-libs/libstdc++-v3:5 - amd64? ( sys-libs/libstdc++-v3:5[multilib] ) +RDEPEND=" + acct-group/gamestat + sys-libs/glibc + sys-libs/libstdc++-v3:5 >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=virtual/glu-9.0-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] - >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]" + >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] + amd64? ( sys-libs/libstdc++-v3:5[multilib] ) +" + +dir=/opt/${PN} +QA_PREBUILT="${dir#/}/${PN}" +QA_EXECSTACK="${dir#/}${PN}/jardinains" -dir=${GAMES_PREFIX_OPT}/${PN} -QA_PREBUILT="${dir:1}/${PN}" +PATCHES=( + "${FILESDIR}"/strings-pt.patch +) src_unpack() { unpack JN2_1_FREE_LIN.tar.gz @@ -33,30 +41,33 @@ src_unpack() { } src_prepare() { + default + # clean Mac fork files (bug #295782) - find . -type f -name "._*" -exec rm -f '{}' + - epatch "${FILESDIR}"/strings-pt.patch + find . -type f -name "._*" -exec rm -f '{}' + || die } src_install() { - exeinto "${dir}" + exeinto ${dir} doexe jardinains - insinto "${dir}" - doins -r LICENSE.txt data help - games_make_wrapper jardinains ./jardinains "${dir}" "${dir}" + insinto ${dir} + doins -r LICENSE.txt data help + make_wrapper jardinains ./jardinains "${dir}" "${dir}" make_desktop_entry jardinains "Jardinains 2" - touch "${D}${dir}/data/prefs.xml" - prepgamesdirs - chmod g+rw "${D}${dir}/data/prefs.xml" - chmod -R g+rw "${D}${dir}/data/players" + touch "${ED}"/${dir}/data/prefs.xml || die + + chmod g+rw "${ED}"/${dir}/data/prefs.xml || die + chmod -R g+rw "${ED}"/${dir}/data/players || die + + fperms -R 660 /opt/${PN}/data + fowners -R root:gamestat /opt/${PN}/data /opt/${PN}/jardinains + fperms g+s /opt/${PN}/${PN} } pkg_postinst() { - games_pkg_postinst elog "Due to the way this software is designed all user preferences for" elog "graphics, audio and other in game data are shared among all users" - elog "of the computer. For that reason some files in the installation" - elog "folder are writable by any user in the games group." + elog "of the computer." } diff --git a/games-arcade/jardinains/metadata.xml b/games-arcade/jardinains/metadata.xml index 523866a841c9..03fc3d8c82d7 100644 --- a/games-arcade/jardinains/metadata.xml +++ b/games-arcade/jardinains/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/jazz2-data/metadata.xml b/games-arcade/jazz2-data/metadata.xml index 9ac6d5d0b96a..aa4c2459df1a 100644 --- a/games-arcade/jazz2-data/metadata.xml +++ b/games-arcade/jazz2-data/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> @@ -11,6 +11,5 @@ <use> <flag name="cc">Install The Christmas Chronicles additional data</flag> <flag name="demo">Use the free demo data instead of the full retail game data</flag> - <flag name="gles2-only">Use GLES 2.0 or later instead of full OpenGL 2.1</flag> </use> </pkgmetadata> diff --git a/games-arcade/jazz2/Manifest b/games-arcade/jazz2/Manifest index fc828b0d97a2..412f67c80f37 100644 --- a/games-arcade/jazz2/Manifest +++ b/games-arcade/jazz2/Manifest @@ -1 +1 @@ -DIST jazz2-0.6.4.tar.gz 11028330 BLAKE2B f0f6ca00af950d494baf71a38fcb0e5e14f144bb862475b62a028ce88ebf94905afc6a08da01a40fc68a11292d50c63f638b11973b3eb32811fe42f27dfd1012 SHA512 33216722aa9ce31ca2af4bd1657c8053414678f9d050ed56a802e281b4743860aae40dfdb1ae4047fbdbe5ae7f3ef0b90170184aabfa8279d9f886f7c9bfd24e +DIST jazz2-0.6.7.tar.gz 11031735 BLAKE2B 014ff24c6f5a834a727aaed3760a1e228d9f7d9653dd293e98030c9105cbf15a3b420c2d515605e36187cc833ae892ed30589f1bf821c0b674b883cea216f3f5 SHA512 7172a3ccb367122d1c9bfbd36b76cc3d365024affba9aea5cfa595fd11a9b4dc980e57c1cfdb0d32bc28bb7ecb5f6f5225909697c4c93c43117596f44d80ff8f diff --git a/games-arcade/jazz2/jazz2-0.6.4.ebuild b/games-arcade/jazz2/jazz2-0.6.7.ebuild index 3cb6f0f24315..3bf8b603eeeb 100644 --- a/games-arcade/jazz2/jazz2-0.6.4.ebuild +++ b/games-arcade/jazz2/jazz2-0.6.7.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit desktop dotnet eutils +inherit desktop dotnet wrapper DESCRIPTION="Open source reimplementation of Jazz Jackrabbit 2" HOMEPAGE="http://deat.tk/jazz2/" diff --git a/games-arcade/jazz2/metadata.xml b/games-arcade/jazz2/metadata.xml index 3a5cc6dbaf84..dff951fa6b7f 100644 --- a/games-arcade/jazz2/metadata.xml +++ b/games-arcade/jazz2/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> @@ -9,7 +9,6 @@ <remote-id type="github">deathkiller/jazz2</remote-id> </upstream> <use> - <flag name="gles2-only">Use GLES 2.0 or later instead of full OpenGL 2.1</flag> <flag name="server">Build the multiplayer game server</flag> </use> </pkgmetadata> diff --git a/games-arcade/jumpnbump/Manifest b/games-arcade/jumpnbump/Manifest index 25c7511151cc..15d7dc64525a 100644 --- a/games-arcade/jumpnbump/Manifest +++ b/games-arcade/jumpnbump/Manifest @@ -1,2 +1 @@ -DIST jumpnbump-1.50-autotool.patch.bz2 94692 BLAKE2B 40fa60260426cc1461e3e31d220a8f7261c7ad9e079fb17011fff72dc7ad2d52f66fb040263502d6082f3609bda0c783dd5c8b6a1d226d4fa22a1f77e6bfe5c4 SHA512 3749f3bda969d9ab2225019d8a6333d23402c8e284c3278aad23f76d5436326fed1efcae28a8922f814e0cf8417ea20fc51abb34f70bd6d37afca803475214fa -DIST jumpnbump-1.50.tar.gz 397208 BLAKE2B f62a30723d8a08976ba06b1941d62544a764b4d5cbce6b076d0f096af099d9db35a451c413f3c490e2aff0388c92456e46a70cdc6a9404449a19dc4a77be0db3 SHA512 a343e514efa42aacd2c0fd113269ebf27418ea851dad21cecfa16a765639cc6a5de43fbdb9ad2f0282740f369b7e457a236fc3e918b486af10222c733f5c8fb0 +DIST jumpnbump-1.61_p20210421.tar.bz2 377140 BLAKE2B c2f0b250f980de4789def1040b40b1d3e70ca3bbd84b6789ef88c99ad291147571551e375ff28c1cb8ac5057c3299582f9185bb897d66a36eeba5e179f27214b SHA512 82fda51762f06837a8530571439bdfdd8de6c74f38a53e9538aa28b4d9f3bd014f0ff7f550cc458cffeb38fadc2773b9b99ee7f9797ec84b546620bf93cfa9da diff --git a/games-arcade/jumpnbump/files/jumpnbump-1.61-ranlib.patch b/games-arcade/jumpnbump/files/jumpnbump-1.61-ranlib.patch new file mode 100644 index 000000000000..10d6d48b6deb --- /dev/null +++ b/games-arcade/jumpnbump/files/jumpnbump-1.61-ranlib.patch @@ -0,0 +1,7 @@ +--- a/sdl/Makefile ++++ b/sdl/Makefile +@@ -10,3 +10,3 @@ + $(AR) cru $(TARGET) $(OBJS) +- ranlib $(TARGET) ++ $(RANLIB) $(TARGET) + diff --git a/games-arcade/jumpnbump/jumpnbump-1.50-r2.ebuild b/games-arcade/jumpnbump/jumpnbump-1.50-r2.ebuild deleted file mode 100644 index 476381cf4757..000000000000 --- a/games-arcade/jumpnbump/jumpnbump-1.50-r2.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools desktop - -DESCRIPTION="A funny multiplayer game about cute little fluffy bunnies" -HOMEPAGE="http://www.jumpbump.mine.nu/" -SRC_URI=" - http://www.jumpbump.mine.nu/port/${P}.tar.gz - mirror://gentoo/${P}-autotool.patch.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="X fbcon kde svga tk +music" - -DEPEND=" - media-libs/sdl-mixer - media-libs/libsdl[sound,joystick,video] - media-libs/sdl-net - X? ( x11-libs/libXext ) - kde? ( kde-apps/kdialog ) - music? ( media-libs/sdl-mixer[mod] ) -" -RDEPEND="${DEPEND} - tk? ( - dev-lang/tcl:0= - dev-lang/tk:0= - ) -" - -src_prepare() { - default - eapply ../${P}-autotool.patch - rm -f configure - eautoreconf - sed -i \ - -e "/PREFIX/ s:PREFIX.*:\"/usr/share/${PN}/jumpbump.dat\":" \ - globals.h \ - || die "sed failed" -} - -src_install() { - default - # clean up a bit. It leaves a dep on Xdialog but ignore that. - use fbcon || rm -f "${D}${GAMES_BINDIR}/jumpnbump.fbcon" - use kde || rm -f "${D}${GAMES_BINDIR}/jumpnbump-kdialog" - use svga || rm -f "${D}${GAMES_BINDIR}/jumpnbump.svgalib" - use tk || rm -f "${D}${GAMES_BINDIR}/jnbmenu.tcl" - newicon sdl/jumpnbump64.xpm ${PN}.xpm - make_desktop_entry ${PN} "Jump n Bump" -} diff --git a/games-arcade/jumpnbump/jumpnbump-1.61_p20210421.ebuild b/games-arcade/jumpnbump/jumpnbump-1.61_p20210421.ebuild new file mode 100644 index 000000000000..a48697492c6e --- /dev/null +++ b/games-arcade/jumpnbump/jumpnbump-1.61_p20210421.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +inherit desktop python-single-r1 toolchain-funcs + +MY_COMMIT="73c5fe86fd831dec45a22077e8d63dd2b6a6349e" + +DESCRIPTION="Funny multiplayer game about cute little fluffy bunnies" +HOMEPAGE="https://libregames.gitlab.io/jumpnbump" +SRC_URI="https://gitlab.com/LibreGames/jumpnbump/-/archive/${MY_COMMIT}/${P}.tar.bz2" +S="${WORKDIR}/${PN}-${MY_COMMIT}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gui" +REQUIRED_USE="gui? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND=" + app-arch/bzip2:= + media-libs/libsdl2[joystick,sound,video] + media-libs/sdl2-mixer[mod] + media-libs/sdl2-net + sys-libs/zlib:=" +RDEPEND=" + ${DEPEND} + gui? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/pygobject[${PYTHON_USEDEP}] + ') + x11-libs/gdk-pixbuf:2[introspection] + x11-libs/gtk+:3[introspection] + )" +BDEPEND="gui? ( ${PYTHON_DEPS} )" + +PATCHES=( + "${FILESDIR}"/${PN}-1.61-ranlib.patch +) + +pkg_setup() { + use gui && python-single-r1_pkg_setup +} + +src_compile() { + tc-export AR CC RANLIB + + emake PREFIX="${EPREFIX}"/usr + + if use gui; then + emake PREFIX="${EPREFIX}"/usr jnbmenu + python_fix_shebang menu/jumpnbump_menu.py + fi +} + +src_install() { + emake PREFIX="${ED}"/usr install + + use gui && emake -C menu PREFIX="${ED}"/usr install + + doicon dist/${PN}.png + rm "${ED}"/usr/share/icons/${PN}.png || die + + einstalldocs +} diff --git a/games-arcade/jumpnbump/metadata.xml b/games-arcade/jumpnbump/metadata.xml index 1329ada5712f..1d0c993d37f9 100644 --- a/games-arcade/jumpnbump/metadata.xml +++ b/games-arcade/jumpnbump/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> -<use> - <flag name="music">Enable playing of background music</flag> -</use> + <maintainer type="project"> + <email>games@gentoo.org</email> + <name>Gentoo Games Project</name> + </maintainer> + <upstream> + <remote-id type="gitlab">LibreGames/jumpnbump</remote-id> + </upstream> </pkgmetadata> diff --git a/games-arcade/jvgs/files/jvgs-0.5-unbundle-tinyxml.patch b/games-arcade/jvgs/files/jvgs-0.5-unbundle-tinyxml.patch new file mode 100644 index 000000000000..fd9c0d8702a9 --- /dev/null +++ b/games-arcade/jvgs/files/jvgs-0.5-unbundle-tinyxml.patch @@ -0,0 +1,333 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 87b28ab..2ec725c 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1,10 +1,14 @@ + SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTIXML_USE_STL" ) + ++find_package(PkgConfig REQUIRED) ++pkg_check_modules(TinyXml REQUIRED tinyxml) ++ + INCLUDE_DIRECTORIES( + ${SDL_INCLUDE_DIR} + ${LUA_INCLUDE_DIR} + ${FREETYPE_INCLUDE_DIRS} + ${SDLMIXER_INCLUDE_DIR} ++ ${TINYXML_INCLUDE_DIRS} + ${ZLIB_INCLUDE_DIRS} + ) + +@@ -12,7 +16,6 @@ ADD_SUBDIRECTORY( input ) + ADD_SUBDIRECTORY( core ) + ADD_SUBDIRECTORY( game ) + ADD_SUBDIRECTORY( math ) +-ADD_SUBDIRECTORY( tinyxml ) + ADD_SUBDIRECTORY( video ) + ADD_SUBDIRECTORY( audio ) + ADD_SUBDIRECTORY( sketch ) +@@ -25,5 +28,5 @@ ADD_EXECUTABLE( + ) + + TARGET_LINK_LIBRARIES( +- jvgs bind input ++ jvgs bind input ${TINYXML_LIBRARIES} + ) +diff --git a/src/core/PropertyMap.cpp b/src/core/PropertyMap.cpp +index 190b317..3f7dd1a 100644 +--- a/src/core/PropertyMap.cpp ++++ b/src/core/PropertyMap.cpp +@@ -1,7 +1,7 @@ + #include "PropertyMap.h" + #include "LogManager.h" + +-#include "../tinyxml/tinyxml.h" ++#include "tinyxml.h" + using namespace std; + + namespace jvgs +diff --git a/src/core/XMLLoadable.cpp b/src/core/XMLLoadable.cpp +index f5cbc46..b819184 100644 +--- a/src/core/XMLLoadable.cpp ++++ b/src/core/XMLLoadable.cpp +@@ -1,7 +1,7 @@ + #include "XMLLoadable.h" + #include "LogManager.h" + +-#include "../tinyxml/tinyxml.h" ++#include "tinyxml.h" + + using namespace std; + +diff --git a/src/game/AbstractCamera.cpp b/src/game/AbstractCamera.cpp +index b349418..725a2e2 100644 +--- a/src/game/AbstractCamera.cpp ++++ b/src/game/AbstractCamera.cpp +@@ -5,7 +5,7 @@ using namespace jvgs::video; + + using namespace jvgs::math; + +-#include "../tinyxml/tinyxml.h" ++#include "tinyxml.h" + + namespace jvgs + { +diff --git a/src/game/Animation.cpp b/src/game/Animation.cpp +index ac563a6..6aa3b10 100644 +--- a/src/game/Animation.cpp ++++ b/src/game/Animation.cpp +@@ -7,7 +7,7 @@ using namespace jvgs::sketch; + #include "../core/LogManager.h" + using namespace jvgs::core; + +-#include "../tinyxml/tinyxml.h" ++#include "tinyxml.h" + + using namespace std; + +diff --git a/src/game/BullController.cpp b/src/game/BullController.cpp +index 78f81af..56930b4 100644 +--- a/src/game/BullController.cpp ++++ b/src/game/BullController.cpp +@@ -8,7 +8,7 @@ using namespace jvgs::core; + #include "../math/Vector2D.h" + using namespace jvgs::math; + +-#include "../tinyxml/tinyxml.h" ++#include "tinyxml.h" + + using namespace std; + +diff --git a/src/game/CollisionResponsePositioner.cpp b/src/game/CollisionResponsePositioner.cpp +index 8065efe..657c1c6 100644 +--- a/src/game/CollisionResponsePositioner.cpp ++++ b/src/game/CollisionResponsePositioner.cpp +@@ -15,7 +15,7 @@ using namespace jvgs::sketch; + #include "../math/QuadTree.h" + using namespace jvgs::math; + +-#include "../tinyxml/tinyxml.h" ++#include "tinyxml.h" + + #include <iostream> + using namespace std; +diff --git a/src/game/DefaultInputController.cpp b/src/game/DefaultInputController.cpp +index a05aec9..c6da502 100644 +--- a/src/game/DefaultInputController.cpp ++++ b/src/game/DefaultInputController.cpp +@@ -7,7 +7,7 @@ + #include "../input/InputManager.h" + using namespace jvgs::input; + +-#include "../tinyxml/tinyxml.h" ++#include "tinyxml.h" + + using namespace jvgs::math; + +diff --git a/src/game/Entity.cpp b/src/game/Entity.cpp +index 914297f..f353541 100644 +--- a/src/game/Entity.cpp ++++ b/src/game/Entity.cpp +@@ -27,7 +27,7 @@ using namespace jvgs::video; + #include "../bind/ScriptManager.h" + using namespace jvgs::bind; + +-#include "../tinyxml/tinyxml.h" ++#include "tinyxml.h" + + using namespace std; + using namespace jvgs::math; +diff --git a/src/game/FlyStraightController.cpp b/src/game/FlyStraightController.cpp +index 1217b62..62f8c1a 100644 +--- a/src/game/FlyStraightController.cpp ++++ b/src/game/FlyStraightController.cpp +@@ -5,7 +5,7 @@ + #include "../math/Vector2D.h" + using namespace jvgs::math; + +-#include "../tinyxml/tinyxml.h" ++#include "tinyxml.h" + + namespace jvgs + { +diff --git a/src/game/FollowCamera.cpp b/src/game/FollowCamera.cpp +index 4a1006b..4b1fe2c 100644 +--- a/src/game/FollowCamera.cpp ++++ b/src/game/FollowCamera.cpp +@@ -12,7 +12,7 @@ using namespace jvgs::video; + + using namespace jvgs::math; + +-#include "../tinyxml/tinyxml.h" ++#include "tinyxml.h" + + namespace jvgs + { +diff --git a/src/game/InputController.cpp b/src/game/InputController.cpp +index 0d76dd7..1e07609 100644 +--- a/src/game/InputController.cpp ++++ b/src/game/InputController.cpp +@@ -5,7 +5,7 @@ + #include "../input/InputManager.h" + using namespace jvgs::input; + +-#include "../tinyxml/tinyxml.h" ++#include "tinyxml.h" + + using namespace jvgs::math; + +diff --git a/src/game/Level.cpp b/src/game/Level.cpp +index a02e818..bf0c485 100644 +--- a/src/game/Level.cpp ++++ b/src/game/Level.cpp +@@ -14,7 +14,7 @@ using namespace jvgs::video; + #include "../audio/AudioManager.h" + using namespace jvgs::audio; + +-#include "../tinyxml/tinyxml.h" ++#include "tinyxml.h" + + using namespace jvgs::sketch; + using namespace jvgs::math; +diff --git a/src/game/PatrollingController.cpp b/src/game/PatrollingController.cpp +index 74e5171..7d56754 100644 +--- a/src/game/PatrollingController.cpp ++++ b/src/game/PatrollingController.cpp +@@ -5,7 +5,7 @@ + #include "../math/MathManager.h" + using namespace jvgs::math; + +-#include "../tinyxml/tinyxml.h" ++#include "tinyxml.h" + + namespace jvgs + { +diff --git a/src/game/Positioner.cpp b/src/game/Positioner.cpp +index 6297c09..5fb2f37 100644 +--- a/src/game/Positioner.cpp ++++ b/src/game/Positioner.cpp +@@ -1,7 +1,7 @@ + #include "Positioner.h" + #include "Entity.h" + +-#include "../tinyxml/tinyxml.h" ++#include "tinyxml.h" + + using namespace jvgs::math; + +diff --git a/src/game/SillyController.cpp b/src/game/SillyController.cpp +index 25070e5..4954091 100644 +--- a/src/game/SillyController.cpp ++++ b/src/game/SillyController.cpp +@@ -1,7 +1,7 @@ + #include "SillyController.h" + #include "Entity.h" + +-#include "../tinyxml/tinyxml.h" ++#include "tinyxml.h" + + using namespace jvgs::math; + +diff --git a/src/game/SimpleBirdController.cpp b/src/game/SimpleBirdController.cpp +index 54b95bc..82f371f 100644 +--- a/src/game/SimpleBirdController.cpp ++++ b/src/game/SimpleBirdController.cpp +@@ -1,7 +1,7 @@ + #include "SimpleBirdController.h" + #include "Entity.h" + +-#include "../tinyxml/tinyxml.h" ++#include "tinyxml.h" + + using namespace std; + using namespace jvgs::math; +diff --git a/src/game/SimpleCamera.cpp b/src/game/SimpleCamera.cpp +index 00deb92..e640481 100644 +--- a/src/game/SimpleCamera.cpp ++++ b/src/game/SimpleCamera.cpp +@@ -2,7 +2,7 @@ + + using namespace jvgs::math; + +-#include "../tinyxml/tinyxml.h" ++#include "tinyxml.h" + + namespace jvgs + { +diff --git a/src/game/Sprite.cpp b/src/game/Sprite.cpp +index 19caa35..ee314df 100644 +--- a/src/game/Sprite.cpp ++++ b/src/game/Sprite.cpp +@@ -1,7 +1,7 @@ + #include "Sprite.h" + #include "Animation.h" + +-#include "../tinyxml/tinyxml.h" ++#include "tinyxml.h" + + using namespace std; + +diff --git a/src/math/Vector2D.cpp b/src/math/Vector2D.cpp +index ba8a05e..61673b3 100644 +--- a/src/math/Vector2D.cpp ++++ b/src/math/Vector2D.cpp +@@ -2,7 +2,7 @@ + #include <cmath> + #include "MathManager.h" + +-#include "../tinyxml/tinyxml.h" ++#include "tinyxml.h" + + namespace jvgs + { +diff --git a/src/sketch/GroupParser.cpp b/src/sketch/GroupParser.cpp +index 0924f95..58d5584 100644 +--- a/src/sketch/GroupParser.cpp ++++ b/src/sketch/GroupParser.cpp +@@ -3,7 +3,7 @@ + #include "Group.h" + #include "SketchElement.h" + +-#include "../tinyxml/tinyxml.h" ++#include "tinyxml.h" + + #include "../core/LogManager.h" + using namespace jvgs::core; +diff --git a/src/sketch/Parser.cpp b/src/sketch/Parser.cpp +index 2b55c16..390f9ae 100644 +--- a/src/sketch/Parser.cpp ++++ b/src/sketch/Parser.cpp +@@ -13,7 +13,7 @@ using namespace jvgs::core; + #include "../math/Vector2D.h" + using namespace jvgs::math; + +-#include "../tinyxml/tinyxml.h" ++#include "tinyxml.h" + + namespace jvgs + { +diff --git a/src/sketch/PathParser.cpp b/src/sketch/PathParser.cpp +index 1eb2027..eb63cf2 100644 +--- a/src/sketch/PathParser.cpp ++++ b/src/sketch/PathParser.cpp +@@ -3,7 +3,7 @@ + #include "Path.h" + #include "PathDataParser.h" + +-#include "../tinyxml/tinyxml.h" ++#include "tinyxml.h" + + #include "../core/LogManager.h" + using namespace jvgs::core; +diff --git a/src/sketch/SketchElementParser.cpp b/src/sketch/SketchElementParser.cpp +index b7c4968..fc40dfb 100644 +--- a/src/sketch/SketchElementParser.cpp ++++ b/src/sketch/SketchElementParser.cpp +@@ -3,7 +3,7 @@ + #include "SketchElement.h" + #include "Parser.h" + +-#include "../tinyxml/tinyxml.h" ++#include "tinyxml.h" + + #include "../core/LogManager.h" + using namespace jvgs::core; diff --git a/games-arcade/jvgs/jvgs-0.5-r1.ebuild b/games-arcade/jvgs/jvgs-0.5-r1.ebuild deleted file mode 100644 index 45d527c885be..000000000000 --- a/games-arcade/jvgs/jvgs-0.5-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils desktop - -DESCRIPTION="An open-source platform game with a sketched and minimalistic look" -HOMEPAGE="http://jvgs.sourceforge.net/" -SRC_URI="mirror://sourceforge/jvgs/${P}-src.tar.gz" - -LICENSE="WTFPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - dev-lang/lua:0 - media-libs/libsdl[video] - media-libs/sdl-mixer[vorbis] - media-libs/freetype:2 - sys-libs/zlib:= - virtual/opengl" -DEPEND="${RDEPEND} - dev-lang/swig" - -S=${WORKDIR}/${P}-src -PATCHES=( "${FILESDIR}"/${PN}-0.5-fix-build-system.patch ) - -src_install() { - dobin src/${PN} - - insinto /usr/share/${PN} - doins -r main.lua resources - - newicon resources/drawing.svg ${PN}.svg - make_desktop_entry ${PN} ${PN} - - einstalldocs -} diff --git a/games-arcade/jvgs/jvgs-0.5-r100.ebuild b/games-arcade/jvgs/jvgs-0.5-r100.ebuild new file mode 100644 index 000000000000..b08606046c19 --- /dev/null +++ b/games-arcade/jvgs/jvgs-0.5-r100.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-1 ) + +inherit cmake desktop lua-single + +DESCRIPTION="Open-source platform game with a sketched and minimalistic look" +HOMEPAGE="https://jvgs.sourceforge.net/" +SRC_URI="mirror://sourceforge/jvgs/${P}-src.tar.gz" +S="${WORKDIR}/${P}-src" + +LICENSE="WTFPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND="${LUA_DEPS} + dev-libs/tinyxml[stl] + media-libs/libsdl[video] + media-libs/sdl-mixer[vorbis] + media-libs/freetype:2 + sys-libs/zlib:= + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext + virtual/opengl + virtual/glu +" +DEPEND="${RDEPEND}" +BDEPEND="dev-lang/swig" + +PATCHES=( + "${FILESDIR}"/${PN}-0.5-fix-build-system.patch + "${FILESDIR}"/${PN}-0.5-unbundle-tinyxml.patch +) + +src_prepare() { + sed -i "s:main.lua:/usr/share/${PN}/&:" src/main.cpp || die + + # Make sure we don't use bundled copy + rm -r src/tinyxml/ || die + + cmake_src_prepare +} + +src_install() { + dobin "${BUILD_DIR}"/src/${PN} + + insinto /usr/share/${PN} + doins -r main.lua resources + + newicon resources/drawing.svg ${PN}.svg + make_desktop_entry ${PN} ${PN} + + einstalldocs +} diff --git a/games-arcade/jvgs/metadata.xml b/games-arcade/jvgs/metadata.xml index 88e6fd346456..ac032ed19754 100644 --- a/games-arcade/jvgs/metadata.xml +++ b/games-arcade/jvgs/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/kajaani-kombat/files/kajaani-kombat-0.7-gcc11.patch b/games-arcade/kajaani-kombat/files/kajaani-kombat-0.7-gcc11.patch new file mode 100644 index 000000000000..9a3968fcf83f --- /dev/null +++ b/games-arcade/kajaani-kombat/files/kajaani-kombat-0.7-gcc11.patch @@ -0,0 +1,31 @@ +These SDL_* return NULL on error, and gcc11/clang won't allow this. +https://bugs.gentoo.org/739086 +--- a/client_net.cpp ++++ b/client_net.cpp +@@ -33,3 +33,3 @@ + cond = SDL_CreateCond(); +- if (cond <0) ++ if (!cond) + { +@@ -39,3 +39,3 @@ + mutex = SDL_CreateMutex(); +- if (mutex < 0) ++ if (!mutex) + { +@@ -47,3 +47,3 @@ + trans_th = SDL_CreateThread (&client_tcpnet::transf_func, (void *) this); +- if (trans_th < 0) ++ if (!trans_th) + { +@@ -53,3 +53,3 @@ + input_th = SDL_CreateThread (&client_tcpnet::input_func, (void *) this); +- if (input_th < 0) ++ if (!input_th) + { +--- a/game_server.cpp ++++ b/game_server.cpp +@@ -66,3 +66,3 @@ + con_th = SDL_CreateThread (&game_server::connection_accepter, (void *) this); +- if (con_th < 0) ++ if (!con_th) + { diff --git a/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild b/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild deleted file mode 100644 index 2aeaac0b1392..000000000000 --- a/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit desktop - -DESCRIPTION="A rampart-like game set in space" -HOMEPAGE="http://kombat.kajaani.net/" -SRC_URI="http://kombat.kajaani.net/dl/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="media-libs/libsdl[sound,video] - media-libs/sdl-net - media-libs/sdl-image[png] - media-libs/sdl-ttf - media-libs/sdl-mixer[vorbis] - sys-libs/ncurses:0 - sys-libs/readline:0 -" -RDEPEND="${DEPEND}" - -src_prepare() { - default - eapply "${FILESDIR}/${PV}-makefile.patch" \ - "${FILESDIR}"/${P}-ldflags.patch - sed -i \ - -e "s:GENTOODIR:/usr/share/${PN}/:" \ - Makefile || die - sed -i \ - -e 's/IMG_Load/img_load/' \ - gui_screens.cpp || die -} - -src_install() { - dobin kajaani-kombat - insinto "/usr/share/${PN}" - doins *.{png,ttf,ogg} - einstalldocs - doman kajaani-kombat.6 -} diff --git a/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r2.ebuild b/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r2.ebuild new file mode 100644 index 000000000000..72fc100bce3c --- /dev/null +++ b/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r2.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop flag-o-matic toolchain-funcs + +DESCRIPTION="Rampart-like game set in space" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI="mirror://gentoo/${P}.tar.gz" + +LICENSE="BitstreamVera GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + media-libs/libsdl[sound,video] + media-libs/sdl-image[png] + media-libs/sdl-mixer[vorbis] + media-libs/sdl-net + media-libs/sdl-ttf + sys-libs/ncurses:= + sys-libs/readline:=" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PV}-makefile.patch + "${FILESDIR}"/${P}-ldflags.patch + "${FILESDIR}"/${P}-gcc11.patch +) + +src_prepare() { + default + + sed -i "s|GENTOODIR|${EPREFIX}/usr/share/${PN}/|" Makefile || die + + tc-export CXX + append-cxxflags -std=c++14 #790743 +} + +src_install() { + dobin ${PN} + doman ${PN}.6 + + insinto /usr/share/${PN} + doins *.{ogg,png,ttf} + + einstalldocs + + newicon 1face.png ${PN}.png + make_desktop_entry ${PN} "Kajaani Kombat" +} diff --git a/games-arcade/kajaani-kombat/metadata.xml b/games-arcade/kajaani-kombat/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/kajaani-kombat/metadata.xml +++ b/games-arcade/kajaani-kombat/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-clang.patch b/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-clang.patch new file mode 100644 index 000000000000..7732b6e147d4 --- /dev/null +++ b/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-clang.patch @@ -0,0 +1,22 @@ +--- a/filemap.cpp ++++ b/filemap.cpp +@@ -851,7 +851,7 @@ + while(k) + { + if(strcmp(k->key, key) == 0 || all) +- fprintf(f, "%s"FM_DEREF_TOKEN" --> \"%s\"\n", k->key, k->path); ++ fprintf(f, "%s" FM_DEREF_TOKEN " --> \"%s\"\n", k->key, k->path); + k = k->next; + } + } +--- a/prefs.cpp ++++ b/prefs.cpp +@@ -30,7 +30,7 @@ + void prefs_t::init() + { + comment("--------------------------------------------"); +- comment(" Kobo Deluxe "VERSION" Configuration File"); ++ comment(" Kobo Deluxe " VERSION " Configuration File"); + comment("--------------------------------------------"); + comment(" Switches - [no]<switch>"); + comment(" Values - <key> [<value>|\"<string>\"]"); diff --git a/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-midi-crash-fix.patch b/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-midi-crash-fix.patch new file mode 100644 index 000000000000..0b0fd10d9b08 --- /dev/null +++ b/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-midi-crash-fix.patch @@ -0,0 +1,13 @@ +diff -up KoboDeluxe-0.5.1/sound/a_midicon.c~ KoboDeluxe-0.5.1/sound/a_midicon.c +--- KoboDeluxe-0.5.1/sound/a_midicon.c~ 2015-06-03 20:31:31.000000000 +0200 ++++ KoboDeluxe-0.5.1/sound/a_midicon.c 2015-06-03 20:47:40.836311461 +0200 +@@ -120,7 +120,8 @@ static inline void __press(unsigned ch, + { + m[ch].next[key] = -1; + m[ch].prev[key] = m[ch].last; +- m[ch].next[m[ch].last] = (char)key; ++ if (m[ch].last != -1) ++ m[ch].next[m[ch].last] = (char)key; + m[ch].last = (char)key; + } + diff --git a/games-arcade/kobodeluxe/kobodeluxe-0.5.1-r1.ebuild b/games-arcade/kobodeluxe/kobodeluxe-0.5.1-r4.ebuild index ed655d6c5b87..b010d805782e 100644 --- a/games-arcade/kobodeluxe/kobodeluxe-0.5.1-r1.ebuild +++ b/games-arcade/kobodeluxe/kobodeluxe-0.5.1-r4.ebuild @@ -1,43 +1,50 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit desktop +EAPI=8 +inherit desktop xdg MY_P="KoboDeluxe-${PV/_/}" DESCRIPTION="An SDL port of xkobo, a addictive space shoot-em-up" HOMEPAGE="http://www.olofson.net/kobodl/" SRC_URI="http://www.olofson.net/kobodl/download/${MY_P}.tar.bz2" +S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~ppc64 ~x86" IUSE="opengl" -DEPEND="media-libs/libsdl +DEPEND="media-libs/libsdl[joystick] media-libs/sdl-image[png] opengl? ( virtual/opengl ) " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + acct-group/gamestat +" -S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}"/${P}-glibc29.patch + "${FILESDIR}"/${P}-glibc2.10.patch + "${FILESDIR}"/${P}-clang.patch + "${FILESDIR}"/${P}-midi-crash-fix.patch +) src_unpack() { unpack ${A} - cd "${S}" + cd "${S}" || die unpack ./icons.tar.gz } src_prepare() { default - eapply \ - "${FILESDIR}"/${P}-glibc29.patch \ - "${FILESDIR}"/${P}-glibc2.10.patch + # Fix paths sed -i \ -e 's:\$(datadir)/kobo-deluxe:$(datadir)/kobodeluxe:' \ - -e 's:\$(sharedstatedir)/kobo-deluxe/scores:$(localstatedir)/kobodeluxe:' \ + -e "s:\$(sharedstatedir)/kobo-deluxe/scores:${EPREFIX}/var/games/kobodeluxe:" \ configure || die "sed configure failed" + sed -i \ -e 's:kobo-deluxe:kobodeluxe:' \ data/gfx/Makefile.in \ @@ -50,7 +57,14 @@ src_configure() { src_install() { default - newicon icons/KDE/icons/32x32/kobodl.png ${PN}.png - make_desktop_entry kobodl "Kobo Deluxe" - keepdir /var/lib/${PN} + + for size in 16 22 32 48 64 128; do + newicon -s "${size}" icons/KDE/icons/${size}x${size}/kobodl.png KoboDeluxe.png + done + make_desktop_entry kobodl "Kobo Deluxe" KoboDeluxe + + keepdir /var/games/kobodeluxe + fowners -R :gamestat /var/games/kobodeluxe/ /usr/bin/kobodl + fperms g+s /usr/bin/kobodl + fperms -R g+w /var/games/kobodeluxe } diff --git a/games-arcade/kobodeluxe/metadata.xml b/games-arcade/kobodeluxe/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/kobodeluxe/metadata.xml +++ b/games-arcade/kobodeluxe/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/komi/Manifest b/games-arcade/komi/Manifest index d70fce631e1f..61052014abc0 100644 --- a/games-arcade/komi/Manifest +++ b/games-arcade/komi/Manifest @@ -1 +1,2 @@ DIST komi-1.04.tar.gz 954526 BLAKE2B b7be781da0143f4cd563e885ff7688c2f50b5c1be6fbd8d383aeda06873b25a2081ae58b750a00a70d140757a57ec49652ff5e8c4ebf6ba0f306539707c06c31 SHA512 60babb3642bea7598089b342ba582b2f63f6aa051352ad9b2fa5bad0222a32306775a207712d2e7a9242be5e3ff5b4734f5b62708e451e7230499c6812d4c8a3 +DIST komi.png 352 BLAKE2B 676acccaf198680b62143c436b21aae418ffeacefbcdf32b03b6a78d69e529a499dd4c7a4e2cdf7bdf996d330b683d09cd7b485b7a76dc6805e7798c13acf2e2 SHA512 ba899f07a56e38ccd7fe35b2060f651ab8a5a7edb099ec0bcc69bb70c43b94d459910fc4fb5fe931617cd8d17aa945e2847325ce5aba0b2550713a35216cf88f diff --git a/games-arcade/komi/files/1.04-DESTDIR.patch b/games-arcade/komi/files/1.04-DESTDIR.patch deleted file mode 100644 index 4060d51f3a7d..000000000000 --- a/games-arcade/komi/files/1.04-DESTDIR.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/Makefile.orig 2004-12-11 01:36:11.000000000 -0800 -+++ b/Makefile 2004-12-11 01:36:14.000000000 -0800 -@@ -13,9 +13,7 @@ - MIXER=-lSDL_mixer - SDL_LIB=$(shell sdl-config --static-libs) $(MIXER) - --CFLAGS=-Wall -pedantic -std=c99 -O2 \ -- $(shell sdl-config --cflags) \ -- -DDATAPATH=\"$(DATAPATH)\" -+CFLAGS= $(ECFLAGS) $(shell sdl-config --cflags) -DDATAPATH=\"$(DATAPATH)\" - - all: komi - -@@ -24,15 +22,13 @@ - -rm *.o - - install: -- install -d $(DATAPATH) -- cp -R komidata/* $(DATAPATH) -- chmod -R 644 $(DATAPATH) -- chmod 755 $(DATAPATH) -- install -d $(BINPATH) -- cp komi $(BINPATH) -- chmod 755 $(BINPATH)komi -- install -d $(MANPATH) -- cp komi.6 $(MANPATH)komi.6 -+ install -d $(DESTDIR)$(DATAPATH) -+ cp -R komidata/* $(DESTDIR)$(DATAPATH) -+ chmod -R 644 $(DESTDIR)$(DATAPATH) -+ chmod 755 $(DESTDIR)$(DATAPATH) -+ install -d $(DESTDIR)$(BINPATH) -+ cp komi $(DESTDIR)$(BINPATH) -+ chmod 755 $(DESTDIR)$(BINPATH)/komi - - komi: komi.o - $(CC) $(CFLAGS) komi.o -o komi $(SDL_LIB) diff --git a/games-arcade/komi/files/komi-1.04-install.patch b/games-arcade/komi/files/komi-1.04-install.patch deleted file mode 100644 index 30395eaff72b..000000000000 --- a/games-arcade/komi/files/komi-1.04-install.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.old 2015-01-05 11:35:24.794160467 +0100 -+++ b/Makefile 2015-01-05 11:36:23.181058180 +0100 -@@ -24,8 +24,6 @@ - install: - install -d $(DESTDIR)$(DATAPATH) - cp -R komidata/* $(DESTDIR)$(DATAPATH) -- chmod -R 644 $(DESTDIR)$(DATAPATH) -- chmod 755 $(DESTDIR)$(DATAPATH) - install -d $(DESTDIR)$(BINPATH) - cp komi $(DESTDIR)$(BINPATH) - chmod 755 $(DESTDIR)$(BINPATH)/komi diff --git a/games-arcade/komi/komi-1.04-r1.ebuild b/games-arcade/komi/komi-1.04-r1.ebuild deleted file mode 100644 index 5e0804c4843e..000000000000 --- a/games-arcade/komi/komi-1.04-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit desktop - -DESCRIPTION="Komi the Space Frog - simple SDL game of collection" -HOMEPAGE="http://komi.sourceforge.net" -SRC_URI="mirror://sourceforge/komi/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="media-libs/libsdl[video] - media-libs/sdl-mixer -" -RDEPEND="${DEPEND}" - -src_prepare() { - default - eapply "${FILESDIR}"/${PV}-DESTDIR.patch \ - "${FILESDIR}"/${P}-install.patch - sed -i \ - -e "/^BINPATH/s:=.*:=/usr/bin/:" \ - -e "/^DATAPATH/s:=.*:=/usr/share/${PN}/:" \ - -e '/^SDL_LIB/s:$: $(LDFLAGS):' \ - -e '/^SDL_LIB/s:--static-:--:' \ - Makefile \ - || die "sed failed" -} - -src_compile() { - emake ECFLAGS="${CFLAGS}" -} - -src_install() { - default - newicon komidata/sprites_komi.bmp ${PN}.bmp - make_desktop_entry komi Komi /usr/share/pixmaps/${PN}.bmp - doman komi.6 -} diff --git a/games-arcade/komi/komi-1.04-r2.ebuild b/games-arcade/komi/komi-1.04-r2.ebuild new file mode 100644 index 000000000000..cfc820dc8a65 --- /dev/null +++ b/games-arcade/komi/komi-1.04-r2.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop flag-o-matic toolchain-funcs + +DESCRIPTION="Komi the Space Frog - a simple SDL game" +HOMEPAGE="https://komi.sourceforge.net/" +SRC_URI=" + mirror://sourceforge/komi/${P}.tar.gz + https://dev.gentoo.org/~ionen/distfiles/${PN}.png" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + media-libs/libsdl[sound,video] + media-libs/sdl-mixer" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_compile() { + tc-export CC + + append-cppflags $($(tc-getPKG_CONFIG) --cflags sdl SDL_mixer || die) \ + -DDATAPATH="'\"${EPREFIX}/usr/share/${PN}/\"'" + append-libs $($(tc-getPKG_CONFIG) --libs sdl SDL_mixer || die) + + # simpler to use implicit rules than fix the Makefile + emake -f /dev/null LDLIBS="${LIBS}" ${PN} +} + +src_install() { + dobin ${PN} + + insinto /usr/share/${PN} + doins -r komidata/. + + doman ${PN}.6 + dodoc CHANGELOG.txt README.txt + + doicon "${DISTDIR}"/${PN}.png + make_desktop_entry ${PN} ${PN^} +} diff --git a/games-arcade/komi/metadata.xml b/games-arcade/komi/metadata.xml index f1df7f6e2a86..fa16e75d6f06 100644 --- a/games-arcade/komi/metadata.xml +++ b/games-arcade/komi/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/late/Manifest b/games-arcade/late/Manifest index 35ecf444686e..ef23ab3133e7 100644 --- a/games-arcade/late/Manifest +++ b/games-arcade/late/Manifest @@ -1 +1,2 @@ DIST late-0.1.0.tar.bz2 1560232 BLAKE2B c8d80639fba66d605ea37dbd3ad1fb790b50854f7b2223b4bba0c4f6b94fed2471a725e3e9be66a74526ef4666464377e773b93b0de5dba0b3bcf6fd5ad33fac SHA512 6b3f4d27a723ae450bd8dda375c8663c1a3f457ffbe0a91f5eb96efdd797c2370ec68894df7a4d31e7124b28f3b41b3b952805901427c6ea3502b0d4d13cd72e +DIST late.png 6564 BLAKE2B 9170d82259c632f44ba6149333e33c61fc8d39cf2b5002d3142b685e3ae6bd642dbc137cd5955cd807a412eb1270446a7b3d1b8cc0b92ceb0fd0d53516a0846d SHA512 2038e18857266dcb1aea3ab9c5c2a09b6d3d43c9e97bb4e141d1d7f650b20d743262e29aafe7fc04ecb6583ea209513f49cb3787ed15c7eb96fbbda86f9ee185 diff --git a/games-arcade/late/files/late-0.1.0-gcc43.patch b/games-arcade/late/files/late-0.1.0-gcc43.patch index 8cfead22a27d..a769f61465ab 100644 --- a/games-arcade/late/files/late-0.1.0-gcc43.patch +++ b/games-arcade/late/files/late-0.1.0-gcc43.patch @@ -1,11 +1,7 @@ --- a/src/init.cpp +++ b/src/init.cpp -@@ -26,6 +26,8 @@ - #include "scorescreen.h" - #include <fstream> +@@ -28,2 +28,4 @@ #include <iostream> +#include <cstdlib> +#include <cstring> using namespace std; - - diff --git a/games-arcade/late/files/late-0.1.0-gcc46.patch b/games-arcade/late/files/late-0.1.0-gcc46.patch index 95d18ba7ed11..a40d93914f8f 100644 --- a/games-arcade/late/files/late-0.1.0-gcc46.patch +++ b/games-arcade/late/files/late-0.1.0-gcc46.patch @@ -1,11 +1,7 @@ -diff -ru late-0.1.0.orig/src/ball.h late-0.1.0/src/ball.h ---- late-0.1.0.orig/src/ball.h 2003-08-07 18:26:13.000000000 -0400 -+++ late-0.1.0/src/ball.h 2011-04-07 21:32:14.189799689 -0400 -@@ -25,6 +25,7 @@ - class ball; - +https://bugs.gentoo.org/362367 +--- a/src/ball.h ++++ b/src/ball.h +@@ -27,2 +27,3 @@ #include "square.h" +#include <cstddef> - class ball_base - { diff --git a/games-arcade/late/late-0.1.0-r1.ebuild b/games-arcade/late/late-0.1.0-r1.ebuild deleted file mode 100644 index de1a4c7a13c5..000000000000 --- a/games-arcade/late/late-0.1.0-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit desktop - -DESCRIPTION="A game, similar to Barrack by Ambrosia Software" -HOMEPAGE="http://late.sourceforge.net/" -SRC_URI="mirror://sourceforge/late/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="media-libs/libsdl[video] - media-libs/sdl-image[jpeg]" -RDEPEND="${DEPEND}" - -src_prepare() { - default - eapply \ - "${FILESDIR}"/${P}-gcc43.patch \ - "${FILESDIR}"/${P}-gcc46.patch - sed -i \ - -e "/chown/d" \ - Makefile.in \ - || die "sed failed" -} - -src_install() { - default - newicon graphics/latebg2.jpg ${PN}.jpg - make_desktop_entry late Late /usr/share/pixmaps/${PN}.jpg -} diff --git a/games-arcade/late/late-0.1.0-r2.ebuild b/games-arcade/late/late-0.1.0-r2.ebuild new file mode 100644 index 000000000000..ded5e24cd41f --- /dev/null +++ b/games-arcade/late/late-0.1.0-r2.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop + +DESCRIPTION="Game similar to Barrack by Ambrosia Software" +HOMEPAGE="https://late.sourceforge.net/" +SRC_URI=" + mirror://sourceforge/late/${P}.tar.bz2 + https://dev.gentoo.org/~ionen/distfiles/${PN}.png" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + acct-group/gamestat + media-libs/libsdl[sound,video] + media-libs/sdl-image[jpeg]" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-gcc43.patch + "${FILESDIR}"/${P}-gcc46.patch +) + +src_prepare() { + default + + # handle score file and permissions ourselves + sed -i '/score/d;/chgrp/d' Makefile.in || die + + # want /var/games rather than /var/lib/lib/games + sed -i "s|LOCALSTATEDIR\"/lib|\"${EPREFIX}/var|" src/arch.cpp || die +} + +src_install() { + default + + dodir /var/games + :> "${ED}"/var/games/${PN}.scores || die + + fowners :gamestat /usr/bin/${PN} /var/games/${PN}.scores + fperms g+s /usr/bin/${PN} + fperms 660 /var/games/${PN}.scores + + doicon "${DISTDIR}"/${PN}.png + make_desktop_entry ${PN} ${PN^} +} diff --git a/games-arcade/late/metadata.xml b/games-arcade/late/metadata.xml index 9bdb3fcf19ef..45da2e467b6e 100644 --- a/games-arcade/late/metadata.xml +++ b/games-arcade/late/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/lbreakout/Manifest b/games-arcade/lbreakout/Manifest index 74aaeb4169e6..7cf5ad731533 100644 --- a/games-arcade/lbreakout/Manifest +++ b/games-arcade/lbreakout/Manifest @@ -1 +1,2 @@ DIST lbreakout-010315.tar.gz 655418 BLAKE2B f8d893c16de045f172e2ece3158420a880fff4775e81f714d390cc92cfbc6296cc968442388097d6be7fd23e19be614d872fe4b9e730284dcb7044d06bf9d72f SHA512 92421ceb4e643df2123d084b0d2c5edfd311e39dd8da85c01da5cfd872f787a6969e514efab2c5f110979434e773fce211e755e4c45438c4469ab9095cb595b7 +DIST lbreakout.png 8673 BLAKE2B ce4f7e35617729063ad80507f8d85127195d217e82dcadbdb409dcb1710fd297f19619e038881ed769778265caef19db39879a45cb28ddc7c1242744b2858c2e SHA512 47eb104ebb9bb103a370986af7a4663f0b9b24afc013c4f78eb7f023a64d51c7dc353e2f2a2729bdeb80ca5894bf1acf2fb5f4257cd67a93f9088c692bdcaf72 diff --git a/games-arcade/lbreakout/lbreakout-010315-r1.ebuild b/games-arcade/lbreakout/lbreakout-010315-r1.ebuild index 4a465d929cfc..c9c02681cb30 100644 --- a/games-arcade/lbreakout/lbreakout-010315-r1.ebuild +++ b/games-arcade/lbreakout/lbreakout-010315-r1.ebuild @@ -1,30 +1,47 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + +inherit desktop toolchain-funcs DESCRIPTION="Breakout clone written with the SDL library" -HOMEPAGE="http://lgames.sourceforge.net/LBreakout/" -SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz" +HOMEPAGE="https://lgames.sourceforge.io/LBreakout/" +SRC_URI=" + mirror://sourceforge/lgames/${P}.tar.gz + https://dev.gentoo.org/~ionen/distfiles/${PN}.png" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -DEPEND=">=media-libs/libsdl-1.1.5" -RDEPEND="${DEPEND}" +RDEPEND=" + acct-group/gamestat + media-libs/libsdl[sound,video]" +DEPEND="${RDEPEND}" + +HTML_DOCS=( lbreakout/manual/. ) src_prepare() { default - sed -i \ - -e '/^sdir=/s:$datadir/games:$datadir:' \ - -e '/^hdir=/s:/var/lib/games:$localstatedir:' \ - configure \ - || die "sed failed" + + # remove /games from datadir, and use /var/games for highscore file + sed -e '/^sdir=/s|/games.*||;' \ + -e "/^hdir=/s|=.*|=${EPREFIX}/var/games|" \ + -i configure || die + + tc-export CC CXX } src_install() { - HTML_DOCS="lbreakout/manual/*" + dodir /var/games #655000 + default + + fowners :gamestat /usr/bin/${PN} /var/games/${PN}.hscr + fperms g+s /usr/bin/${PN} + fperms 660 /var/games/${PN}.hscr + + doicon "${DISTDIR}"/${PN}.png + make_desktop_entry ${PN} LBreakout } diff --git a/games-arcade/lbreakout/metadata.xml b/games-arcade/lbreakout/metadata.xml index 2cbba7c09d17..c2edfd91b2cc 100644 --- a/games-arcade/lbreakout/metadata.xml +++ b/games-arcade/lbreakout/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/lbreakout2/lbreakout2-2.6.5-r1.ebuild b/games-arcade/lbreakout2/lbreakout2-2.6.5-r2.ebuild index 129ed748d93f..6b28f14aa363 100644 --- a/games-arcade/lbreakout2/lbreakout2-2.6.5-r1.ebuild +++ b/games-arcade/lbreakout2/lbreakout2-2.6.5-r2.ebuild @@ -1,94 +1,95 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools desktop flag-o-matic gnome2-utils +inherit autotools desktop -levels_V=20141220 -themes_V=20141220 +LB_LEVELS_V="20141220" +LB_THEMES_V="20141220" DESCRIPTION="Breakout clone written with the SDL library" -HOMEPAGE="http://lgames.sourceforge.net/LBreakout2/" -SRC_URI=" mirror://sourceforge/lgames/${P}.tar.gz - mirror://sourceforge/lgames/add-ons/lbreakout2/${PN}-levelsets-${levels_V}.tar.gz - themes? ( mirror://sourceforge/lgames/add-ons/lbreakout2/${PN}-themes-${levels_V}.tar.gz )" +HOMEPAGE="https://lgames.sourceforge.io/LBreakout2/" +SRC_URI=" + mirror://sourceforge/lgames/${P}.tar.gz + mirror://sourceforge/lgames/add-ons/lbreakout2/${PN}-levelsets-${LB_LEVELS_V}.tar.gz + themes? ( mirror://sourceforge/lgames/add-ons/lbreakout2/${PN}-themes-${LB_LEVELS_V}.tar.gz )" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="nls themes" RDEPEND=" - media-libs/libpng:0= - sys-libs/zlib - media-libs/libsdl[sound,joystick,video] - media-libs/sdl-net + acct-group/gamestat + media-libs/libpng:= + media-libs/libsdl[joystick,sound,video] media-libs/sdl-mixer + media-libs/sdl-net nls? ( virtual/libintl )" -DEPEND="${RDEPEND}" -BDEPEND="nls? ( sys-devel/gettext )" +DEPEND=" + ${RDEPEND} + sys-libs/zlib" +BDEPEND=" + nls? ( sys-devel/gettext ) + themes? ( app-arch/unzip )" -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch +) src_unpack() { unpack ${P}.tar.gz cd "${S}/client/levels" || die - unpack ${PN}-levelsets-${levels_V}.tar.gz + unpack ${PN}-levelsets-${LB_LEVELS_V}.tar.gz if use themes; then mkdir "${WORKDIR}"/themes || die cd "${WORKDIR}"/themes || die - unpack ${PN}-themes-${themes_V}.tar.gz + unpack ${PN}-themes-${LB_THEMES_V}.tar.gz # Delete a few duplicate themes (already shipped with lbreakout2 # tarball). Some of them have different case than built-in themes, so it # is harder to just compare if the filename is the same. - rm -f absoluteB.zip oz.zip moiree.zip || die + rm absoluteB.zip oz.zip moiree.zip || die local f for f in *.zip; do - unzip -q "${f}" || die - rm -f "${f}" || die + unpack ./${f} + rm ${f} || die done fi } src_prepare() { default + mv configure.{in,ac} || die eautoreconf } src_configure() { - filter-flags -O? - econf \ - --enable-sdl-net \ - --with-docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ + local econfargs=( $(use_enable nls) + --enable-sdl-net + --localstatedir="${EPREFIX}"/var/games + --with-docdir="${EPREFIX}"/usr/share/doc/${PF}/html + ) + econf "${econfargs[@]}" } src_install() { default + fowners :gamestat /usr/bin/${PN} /var/games/${PN}.hscr + fperms g+s /usr/bin/${PN} + fperms 660 /var/games/${PN}.hscr + if use themes; then insinto /usr/share/lbreakout2/gfx doins -r "${WORKDIR}"/themes/. fi newicon client/gfx/win_icon.png ${PN}.png - newicon -s 32 client/gfx/win_icon.png ${PN}.png - make_desktop_entry lbreakout2 LBreakout2 -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update + make_desktop_entry ${PN} LBreakout2 } diff --git a/games-arcade/lbreakout2/metadata.xml b/games-arcade/lbreakout2/metadata.xml index 4e3b6dfb6f34..ecffed01742f 100644 --- a/games-arcade/lbreakout2/metadata.xml +++ b/games-arcade/lbreakout2/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/metadata.xml b/games-arcade/metadata.xml index 992ba13fea49..f3c287ba8e23 100644 --- a/games-arcade/metadata.xml +++ b/games-arcade/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <catmetadata> <longdescription lang="en"> The games-arcade category contains arcade games. @@ -32,4 +32,3 @@ 舒亠亞仂亳 games-arcade 仂亟亠亢亳 亳亞-舒从舒亟. </longdescription> </catmetadata> - diff --git a/games-arcade/methane/Manifest b/games-arcade/methane/Manifest index e42c2a803ff2..c00621fb635f 100644 --- a/games-arcade/methane/Manifest +++ b/games-arcade/methane/Manifest @@ -1 +1,2 @@ -DIST methane-1.5.1.tgz 1057881 BLAKE2B c783d8153e96cbf0f8f3593cd5ddccd0a9ec8222f61667d411cd3be7159ecf5a3364ad0212b77590b256fc33094e7ea73b83bdcb048aaea6d506e3e146b1412a SHA512 3506f288179a127f8508bd9d4225618d8dcd93794c559822ed2836bb46a318ce3c199f951f564064091b1125375118f2d64c50a27059dcd0e49c8379fa8c3155 +DIST methane-2.0.1.tar.gz 1058487 BLAKE2B 2fc450c03dbbd57439b22e8e6ac8eebd2db18f97a3338180decdc0a437207b581a00e664e6353595c9eb50c16f7d9fead96bddf6ca50b67326ecea6dd4bb935a SHA512 96b005eb5964185adea89aa43afda375c474db8088a132b2d46a843a1eca6ba91f83bf41277a3f3cfa24c4f9b9dae7098527414284fd0521e92a34c225e06bd9 +DIST methane.png 4034 BLAKE2B b10ebd8ca4bf2f6330aa89e3adb77a14bb183bf3d0dd40e305c87d58e0a6a4249662cdee8a457fc3df93a9c0b0daecf0dd8cb307c33a6b5f6e48543062b1b18f SHA512 a56e453c9971b8819904f19af4ed3e417ef0538f87bfa121918c8fa4f93c14ba922b7d29584f0c69497a7b56585a92a7df902997cf18f6f2672c31c960ea7772 diff --git a/games-arcade/methane/files/methane-1.5.1-fullscreen.patch b/games-arcade/methane/files/methane-1.5.1-fullscreen.patch deleted file mode 100644 index 8a12a6bc4891..000000000000 --- a/games-arcade/methane/files/methane-1.5.1-fullscreen.patch +++ /dev/null @@ -1,96 +0,0 @@ ---- methane-1.5.1/sources/methane.cpp 2011-12-11 13:52:54.904083515 +0100 -+++ methane-1.5.1.new/sources/methane.cpp 2011-12-11 13:51:27.174080706 +0100 -@@ -37,6 +37,7 @@ - - RenderTarget GLOBAL_RenderTarget = opengl2; - bool GLOBAL_SoundEnable = true; -+bool GLOBAL_FullScreenEnable = true; - - //------------------------------------------------------------------------------ - // Keyboard stuff -@@ -60,6 +61,20 @@ - - int main(const std::vector<CL_String> &args) - { -+ unsigned int i; -+ -+ for (i = 1; i < args.size(); i++) -+ { -+ if (args[i].compare("-w") == 0) -+ GLOBAL_FullScreenEnable = false; -+ else -+ fprintf(stderr, -+ "Unknown commandline parameter: '%s', ignoring\n\n" -+ "Valid parameters:\n" -+ "'-w': start in windowed mode\n", -+ args[i].c_str()); -+ } -+ - try - { - CL_SetupGL target_opengl2; -@@ -105,8 +120,15 @@ - CL_DisplayWindowDescription desc; - desc.set_title("Super Methane Brothers"); - desc.set_size(CL_Size(SCR_WIDTH*2,SCR_HEIGHT*2), true); -- desc.set_allow_resize(true); -+ if (GLOBAL_FullScreenEnable) -+ { -+ desc.set_fullscreen(true); -+ } -+ else -+ desc.set_allow_resize(true); - CL_DisplayWindow window(desc); -+ if (GLOBAL_FullScreenEnable) -+ window.hide_cursor(); - - CMethDoc Game(window); - -@@ -131,8 +154,6 @@ - int last_time = CL_System::get_time(); - - int quit_flag = 0; -- int disable_scale_flag = 0; -- int full_screen_flag = 0; - int on_options_screen = 1; - int option_page = 0; - int game_speed = 60; -@@ -281,7 +302,8 @@ - - bool get_options() - { -- CL_DisplayWindow window("Methane Options", 640, 480); -+ CL_DisplayWindow window("Methane Options", 640, 480, -+ GLOBAL_FullScreenEnable); - - // Connect the Window close event - CL_Slot slot_quit = window.sig_window_close().connect(this, &SuperMethaneBrothers::on_window_close); -@@ -320,6 +342,12 @@ - GLOBAL_RenderTarget = swrender; - } - -+ if ( (LastKey == 'f') || (LastKey == 'F') ) -+ { -+ LastKey = 0; -+ GLOBAL_FullScreenEnable = !GLOBAL_FullScreenEnable; -+ } -+ - gc.clear(CL_Colorf(0.0f,0.0f,0.2f)); - - int ypos = 40; -@@ -360,6 +388,15 @@ - { - options_font.draw_text(gc, 10, ypos, "Audio - Disabled. Press 'A' to toggle"); - } -+ ypos += 50; -+ if (GLOBAL_FullScreenEnable) -+ { -+ options_font.draw_text(gc, 10, ypos, "Full screen - Enabled. Press 'F' to modify"); -+ } -+ else -+ { -+ options_font.draw_text(gc, 10, ypos, "Full screen - Disabled. Press 'F' to modify"); -+ } - - ypos += 100; - options_font.draw_text(gc, 10, ypos, "Press the spacebar to start"); diff --git a/games-arcade/methane/files/methane-1.5.1-gcc5.patch b/games-arcade/methane/files/methane-1.5.1-gcc5.patch deleted file mode 100644 index 51a69041429b..000000000000 --- a/games-arcade/methane/files/methane-1.5.1-gcc5.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up methane-1.5.1/sources/misc.cpp~ methane-1.5.1/sources/misc.cpp ---- methane-1.5.1/sources/misc.cpp~ 2009-04-28 16:42:43.000000000 +0200 -+++ methane-1.5.1/sources/misc.cpp 2015-06-19 13:40:13.695215411 +0200 -@@ -40,15 +40,15 @@ static PARTYOFFS party_08 = {SPR_ENDSPR_ - static PARTYOFFS party_09 = {SPR_ENDSPR_1+0x09,0x0048,0x0002}; - static PARTYOFFS party_0a = {SPR_ENDSPR_1+0x0a,0x0058,0x0002}; - static PARTYOFFS party_0b = {SPR_ENDSPR_1+0x0b,0x0000,0x0000}; --static PARTYOFFS party_0c = {SPR_ENDSPR_1+0x0c,0x0020,0xFFFFFFD0}; -+static PARTYOFFS party_0c = {SPR_ENDSPR_1+0x0c,0x0020,(int)0xFFFFFFD0}; - static PARTYOFFS party_0d = {SPR_ENDSPR_1+0x0d,0x0040,0x0000}; - static PARTYOFFS party_0e = {SPR_ENDSPR_1+0x0e,0x0000,0x0000}; --static PARTYOFFS party_0f = {SPR_ENDSPR_1+0x0f,0x005E,0xFFFFFFF2}; --static PARTYOFFS party_10 = {SPR_ENDSPR_1+0x10,0x007E,0xFFFFFFFA}; --static PARTYOFFS party_11 = {SPR_ENDSPR_1+0x11,0x008E,0xFFFFFFF9}; -+static PARTYOFFS party_0f = {SPR_ENDSPR_1+0x0f,0x005E,(int)0xFFFFFFF2}; -+static PARTYOFFS party_10 = {SPR_ENDSPR_1+0x10,0x007E,(int)0xFFFFFFFA}; -+static PARTYOFFS party_11 = {SPR_ENDSPR_1+0x11,0x008E,(int)0xFFFFFFF9}; - static PARTYOFFS party_12 = {SPR_ENDSPR_1+0x12,0x0092,0x000B}; --static PARTYOFFS party_13 = {SPR_ENDSPR_1+0x13,0x00B2,0xFFFFFFFB}; --static PARTYOFFS party_14 = {SPR_ENDSPR_1+0x14,0x00C2,0xFFFFFFFA}; -+static PARTYOFFS party_13 = {SPR_ENDSPR_1+0x13,0x00B2,(int)0xFFFFFFFB}; -+static PARTYOFFS party_14 = {SPR_ENDSPR_1+0x14,0x00C2,(int)0xFFFFFFFA}; - static PARTYOFFS party_15 = {SPR_ENDSPR_1+0x15,0x0000,0x0000}; - static PARTYOFFS party_16 = {SPR_ENDSPR_1+0x16,0x0020,0x0008}; - static PARTYOFFS party_17 = {SPR_ENDSPR_1+0x17,0x0020,0x0000}; -@@ -57,7 +57,7 @@ static PARTYOFFS party_19 = {SPR_ENDSPR_ - static PARTYOFFS party_1a = {SPR_ENDSPR_1+0x1a,0x0020,0x0000}; - static PARTYOFFS party_1b = {SPR_ENDSPR_1+0x1b,0x0000,0x0010}; - static PARTYOFFS party_1c = {SPR_ENDSPR_1+0x1c,0x0010,0x0}; --static PARTYOFFS party_1d = {SPR_ENDSPR_1+0x1d,0x0030,0xFFFFFFF0}; -+static PARTYOFFS party_1d = {SPR_ENDSPR_1+0x1d,0x0030,(int)0xFFFFFFF0}; - - static PARTYOFFS *party_group1[] = { - &party_00,&party_01,&party_02,&party_00,&party_03,&party_04,0}; diff --git a/games-arcade/methane/files/methane-1.5.1-gentoo.patch b/games-arcade/methane/files/methane-1.5.1-gentoo.patch deleted file mode 100644 index 6d72a2ca7ed5..000000000000 --- a/games-arcade/methane/files/methane-1.5.1-gentoo.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- a/Makefile.old 2012-11-26 18:58:48.201837870 +0100 -+++ b/Makefile 2012-11-27 12:30:16.038998128 +0100 -@@ -1,5 +1,5 @@ --METHANE_FLAGS = -DENABLE_SOUND `pkg-config --cflags clanCore-2.2 clanDisplay-2.2 clanApp-2.2 clanGL-2.2 clanGL1-2.2 clanSWRender-2.2 clanSound-2.2 clanMikMod-2.2` --METHANE_LIBS = `pkg-config --libs clanCore-2.2 clanDisplay-2.2 clanApp-2.2 clanGL-2.2 clanGL1-2.2 clanSWRender-2.2 clanSound-2.2 clanMikMod-2.2` -+METHANE_FLAGS = -DENABLE_SOUND `pkg-config --cflags clanCore-2.3 clanDisplay-2.3 clanApp-2.3 clanGL-2.3 clanGL1-2.3 clanSWRender-2.3 clanSound-2.3 clanMikMod-2.3` -+METHANE_LIBS = `pkg-config --libs clanCore-2.3 clanDisplay-2.3 clanApp-2.3 clanGL-2.3 clanGL1-2.3 clanSWRender-2.3 clanSound-2.3 clanMikMod-2.3` - - OBJF = build/game.o build/baddie.o build/methane.o build/target.o build/maps.o build/gfxoff.o build/mapdata.o build/objlist.o build/doc.o build/bitdraw.o build/global.o build/suck.o build/power.o build/goodie.o build/bititem.o build/player.o build/weapon.o build/bitgroup.o build/boss.o build/sound.o build/gasobj.o build/misc.o - -@@ -10,7 +10,7 @@ - @echo "=================================" - - methane: ${OBJF} -- g++ ${CXXFLAGS} ${OBJF} -o methane ${METHANE_LIBS} -+ $(CXX) ${LDFLAGS} ${CXXFLAGS} ${OBJF} -o methane ${METHANE_LIBS} - - clean: - @rm -Rf build -@@ -23,6 +23,6 @@ - build/%.o : sources/%.cpp - @echo " Compiling $<..." - @if [ ! -d build ]; then mkdir build; fi -- gcc ${CXXFLAGS} ${METHANE_FLAGS} -c $< -o $@ -+ $(CXX) ${CXXFLAGS} ${METHANE_FLAGS} -c $< -o $@ - - ---- a/sources/methane.cpp.old 2012-11-27 13:49:22.993003266 +0100 -+++ b/sources/methane.cpp 2012-11-27 17:37:23.051913777 +0100 -@@ -80,15 +80,15 @@ - return 0; - } - -- CL_AutoPtr<CL_SetupSound> setup_sound; -- CL_AutoPtr<CL_SoundOutput> sound_output; -- CL_AutoPtr<CL_SetupMikMod> setup_mikmod; -+ CL_UniquePtr<CL_SetupSound> setup_sound; -+ CL_UniquePtr<CL_SoundOutput> sound_output; -+ CL_UniquePtr<CL_SetupMikMod> setup_mikmod; - - if (GLOBAL_SoundEnable) - { -- setup_sound = new CL_SetupSound; -- sound_output = new CL_SoundOutput(44100); -- setup_mikmod = new CL_SetupMikMod; -+ setup_sound = cl_move(CL_UniquePtr<CL_SetupSound>(new CL_SetupSound)); -+ sound_output = cl_move(CL_UniquePtr<CL_SoundOutput>(new CL_SoundOutput(44100))); -+ setup_mikmod = cl_move(CL_UniquePtr<CL_SetupMikMod>(new CL_SetupMikMod)); - } - - // Set the video mode ---- a/sources/target.cpp.old 2012-11-28 21:34:32.666878913 +0100 -+++ b/sources/target.cpp 2012-11-28 21:35:16.371247221 +0100 -@@ -132,7 +132,7 @@ - CL_GraphicContext gc = m_pWindow->get_gc(); - - // Find the resources directory: -- CL_String resource_dir = CL_Directory::get_resourcedata("methane"); -+ CL_String resource_dir = "@GENTOO_DATADIR@/methane/"; - CL_String dataname("page_01.png"); - CL_String filename = resource_dir + dataname; - if (!CL_FileHelp::file_exists(filename)) diff --git a/games-arcade/methane/files/methane-2.0.1-makefile.patch b/games-arcade/methane/files/methane-2.0.1-makefile.patch new file mode 100644 index 000000000000..0cf205041ed7 --- /dev/null +++ b/games-arcade/methane/files/methane-2.0.1-makefile.patch @@ -0,0 +1,41 @@ +From 7fa0b482546993d5279911a43ad6cb75c96ec1f0 Mon Sep 17 00:00:00 2001 +From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com> +Date: Wed, 14 Dec 2022 00:28:51 +0300 +Subject: [PATCH] Use portable variables in Makefile + +--- + Makefile | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index 35c3eb1..f827efc 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,5 +1,6 @@ +-METHANE_FLAGS = `pkg-config --cflags clanCore-4.1 clanDisplay-4.1 clanApp-4.1 clanGL-4.1 clanSound-4.1 libmikmod` -Isources +-METHANE_LIBS = `pkg-config --libs clanCore-4.1 clanDisplay-4.1 clanApp-4.1 clanGL-4.1 clanSound-4.1 libmikmod` ++PKG_CONFIG ?= pkg-config ++METHANE_FLAGS := $(shell ${PKG_CONFIG} --cflags clanCore-4.1 clanDisplay-4.1 clanApp-4.1 clanGL-4.1 clanSound-4.1 libmikmod) -Isources ++METHANE_LIBS := $(shell ${PKG_CONFIG} --libs clanCore-4.1 clanDisplay-4.1 clanApp-4.1 clanGL-4.1 clanSound-4.1 libmikmod) + + OBJF = sources/precomp.o \ + sources/player.o \ +@@ -37,7 +38,7 @@ message: + @echo "=================================" + + methane: ${OBJF} +- g++ ${CXXFLAGS} ${OBJF} -o methane ${METHANE_LIBS} ++ $(CXX) ${CXXFLAGS} ${LDFLAGS} ${OBJF} -o methane ${METHANE_LIBS} + + clean: + @rm -f sources/*.o +@@ -49,5 +50,5 @@ distclean: clean + # The main source code + %.o:%.cpp + @echo " Compiling $<..." +- gcc ${CXXFLAGS} ${METHANE_FLAGS} -c $< -o $@ ++ $(CXX) ${CXXFLAGS} ${METHANE_FLAGS} -c $< -o $@ + +-- +2.37.4 + diff --git a/games-arcade/methane/metadata.xml b/games-arcade/methane/metadata.xml index 4df86fb4c243..b826a80f7a10 100644 --- a/games-arcade/methane/metadata.xml +++ b/games-arcade/methane/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> <upstream> + <remote-id type="github">rombust/Methane</remote-id> <remote-id type="sourceforge">methane</remote-id> </upstream> </pkgmetadata> diff --git a/games-arcade/methane/methane-1.5.1-r1.ebuild b/games-arcade/methane/methane-1.5.1-r1.ebuild deleted file mode 100644 index d26feb258d71..000000000000 --- a/games-arcade/methane/methane-1.5.1-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit desktop - -DESCRIPTION="Port from an old amiga game" -HOMEPAGE="http://methane.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-games/clanlib:2.3[opengl,mikmod]" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -src_prepare() { - default - - eapply "${FILESDIR}"/${P}-gentoo.patch - - # From Fedora - eapply "${FILESDIR}"/${P}-gcc5.patch - eapply "${FILESDIR}"/${P}-fullscreen.patch - - sed -i \ - -e "s:@GENTOO_DATADIR@:/usr/share:" \ - sources/target.cpp || die - - # fix weird parallel make issue wrt #450422 - mkdir build || die -} - -src_install() { - dobin methane - insinto /usr/share/${PN} - doins resources/* - newicon docs/puff.gif ${PN}.gif - make_desktop_entry ${PN} "Super Methane Brothers" /usr/share/pixmaps/${PN}.gif - HTML_DOCS="docs/*" dodoc authors.txt history.txt readme.txt -} diff --git a/games-arcade/methane/methane-2.0.1.ebuild b/games-arcade/methane/methane-2.0.1.ebuild new file mode 100644 index 000000000000..33e4e2941888 --- /dev/null +++ b/games-arcade/methane/methane-2.0.1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop toolchain-funcs + +DESCRIPTION="Port from an old Amiga game" +HOMEPAGE="https://methane.sourceforge.net/" +SRC_URI="https://github.com/rombust/Methane/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://src.fedoraproject.org/rpms/methane/raw/f37/f/methane.png +" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +S="${WORKDIR}/Methane-${PV}" + +RDEPEND=" + dev-games/clanlib:4.1[opengl,sound] + media-libs/libmikmod +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${P}-makefile.patch" +) + +src_prepare() { + default + + tc-export PKG_CONFIG +} + +src_install() { + dobin methane + + insinto /usr/share/${PN} + doins resources/* + + doicon "${DISTDIR}/${PN}.png" + make_desktop_entry ${PN} "Super Methane Brothers" + HTML_DOCS="docs/*" dodoc authors.txt history.txt readme.txt +} diff --git a/games-arcade/missile/files/missile-1.0.1-ldflags.patch b/games-arcade/missile/files/missile-1.0.1-ldflags.patch deleted file mode 100644 index 744b8192c5b9..000000000000 --- a/games-arcade/missile/files/missile-1.0.1-ldflags.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/Makefile.old 2010-09-22 09:11:48.000000000 +0200 -+++ b/Makefile 2010-09-22 09:13:08.000000000 +0200 -@@ -125,10 +125,10 @@ - fi - - $(PROGRAM): $(OBJECTS) -- $(CC) -o $(PROGRAM) $(OBJECTS) $(CFLAGS) $(LIBS) -+ $(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(CFLAGS) $(LIBS) - - static : $(OBJECTS) -- $(CC) -o $(PROGRAM) $(OBJECTS) $(CFLAGS) $(STATIC_LIBS) -+ $(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(CFLAGS) $(STATIC_LIBS) - - - %.o : %.c %.h diff --git a/games-arcade/missile/metadata.xml b/games-arcade/missile/metadata.xml index d0eaca34447e..8dc6fcc8d984 100644 --- a/games-arcade/missile/metadata.xml +++ b/games-arcade/missile/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/missile/missile-1.0.1-r1.ebuild b/games-arcade/missile/missile-1.0.1-r1.ebuild deleted file mode 100644 index 2e9d9e9874db..000000000000 --- a/games-arcade/missile/missile-1.0.1-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit desktop gnome2-utils - -DESCRIPTION="The game Missile Command for Linux" -HOMEPAGE="http://missile.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~x86" -IUSE="" - -DEPEND="media-libs/libsdl[sound,video] - media-libs/sdl-image[png] - media-libs/sdl-mixer -" -RDEPEND="${DEPEND}" - -src_prepare() { - default - eapply "${FILESDIR}"/${P}-ldflags.patch - sed -i \ - -e '/^CC/d' \ - -e "s:\$(game_prefix)/\$(game_data):/usr/share/${PN}:" \ - -e "s/-O2/${CFLAGS}/" \ - -e 's/-lSDL_image $(SND_LIBS)/-lSDL_image -lm $(SND_LIBS)/g' \ - Makefile || die -} - -src_install() { - dobin ${PN} - insinto /usr/share/${PN} - doins -r data/* - newicon -s 48 icons/${PN}_icon_black.png ${PN}.png - make_desktop_entry ${PN} "Missile Command" - einstalldocs -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-arcade/missile/missile-1.0.1-r2.ebuild b/games-arcade/missile/missile-1.0.1-r2.ebuild new file mode 100644 index 000000000000..b11365feac5e --- /dev/null +++ b/games-arcade/missile/missile-1.0.1-r2.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop flag-o-matic toolchain-funcs + +DESCRIPTION="Port of the Atari Missile Command game for Linux" +HOMEPAGE="https://missile.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+sound" + +RDEPEND=" + media-libs/libsdl[sound?,video] + media-libs/sdl-image[png] + sound? ( media-libs/sdl-mixer )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_compile() { + tc-export CC + + local cppargs=( + -DDATA="'\"${EPREFIX}/usr/share/${PN}\"'" + -DVERSION=\\\"${PV}\\\" + $(usev sound -DUSE_SOUND) + $($(tc-getPKG_CONFIG) --cflags sdl SDL_image $(usev sound SDL_mixer)) + ) + append-cppflags "${cppargs[@]}" + + LDLIBS="$($(tc-getPKG_CONFIG) --libs sdl SDL_image $(usev sound SDL_mixer)) -lm" \ + emake -f /dev/null ${PN} +} + +src_install() { + dobin ${PN} + + insinto /usr/share/${PN} + doins -r data/{graphics,missile_icon.png,sound} + + einstalldocs + + newicon icons/${PN}_icon_red.png ${PN}.png + make_desktop_entry ${PN} "Missile Command" +} diff --git a/games-arcade/moleinvasion/files/moleinvasion-0.4-fno-common.patch b/games-arcade/moleinvasion/files/moleinvasion-0.4-fno-common.patch new file mode 100644 index 000000000000..3d1833148792 --- /dev/null +++ b/games-arcade/moleinvasion/files/moleinvasion-0.4-fno-common.patch @@ -0,0 +1,11 @@ +--- a/worldmap.h ++++ b/worldmap.h +@@ -24,7 +24,7 @@ + void draw_level_name(int current_level,myList * all_level_desc); + + /* on stocke ici toutes les datas evoluant relatives au monde en cours */ +-#ifdef MAIN_WORLDMAP ++#ifndef MAIN_WORLDMAP + #define EXTERN_WLD extern + #else + #define EXTERN_WLD diff --git a/games-arcade/moleinvasion/files/moleinvasion-0.4-underlink.patch b/games-arcade/moleinvasion/files/moleinvasion-0.4-underlink.patch index 7ee61f91e378..9d5d651a809b 100644 --- a/games-arcade/moleinvasion/files/moleinvasion-0.4-underlink.patch +++ b/games-arcade/moleinvasion/files/moleinvasion-0.4-underlink.patch @@ -1,5 +1,5 @@ ---- a/Makefile.old 2011-06-14 22:12:00.920386798 +0200 -+++ b/Makefile 2011-06-14 22:12:22.118716548 +0200 +--- a/Makefile ++++ b/Makefile @@ -11,7 +11,7 @@ EDTOB = editor EDWOB = editworld diff --git a/games-arcade/moleinvasion/metadata.xml b/games-arcade/moleinvasion/metadata.xml index 82c310972ccf..f66b7b1cc3e3 100644 --- a/games-arcade/moleinvasion/metadata.xml +++ b/games-arcade/moleinvasion/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/moleinvasion/moleinvasion-0.4-r2.ebuild b/games-arcade/moleinvasion/moleinvasion-0.4-r3.ebuild index 885dd1d1524f..3bd4d5e35124 100644 --- a/games-arcade/moleinvasion/moleinvasion-0.4-r2.ebuild +++ b/games-arcade/moleinvasion/moleinvasion-0.4-r3.ebuild @@ -1,12 +1,14 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit desktop +EAPI=7 + +inherit desktop toolchain-funcs DESCRIPTION="Mole infested 2D platform game" HOMEPAGE="http://moleinvasion.tuxfamily.org/" -SRC_URI="ftp://download.tuxfamily.org/minvasion/packages/MoleInvasion-${PV}.tar.bz2 +SRC_URI=" + ftp://download.tuxfamily.org/minvasion/packages/MoleInvasion-${PV}.tar.bz2 music? ( mirror://gentoo/${PN}-music-20090731.tar.gz )" LICENSE="GPL-2" @@ -14,19 +16,23 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="music" -DEPEND="media-libs/libsdl[opengl,video] - virtual/opengl +DEPEND=" + media-libs/libsdl[joystick,opengl,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf -" + virtual/opengl" RDEPEND="${DEPEND}" S="${WORKDIR}/${P}/src" src_prepare() { default - use music && mv -f "${WORKDIR}"/music ../ + + if use music; then + mv -f "${WORKDIR}"/music ../ || die + fi + sed -i \ -e '/^CFLAGS/s:= -g:+=:' \ -e '/^LDFLAGS/d' \ @@ -34,13 +40,20 @@ src_prepare() { -e "/^FINALDATADIR/s:/usr.*:/usr/share/${PN}:" \ Makefile || die "sed failed" - eapply "${FILESDIR}"/${P}-opengl.patch \ - "${FILESDIR}"/${P}-underlink.patch + eapply \ + "${FILESDIR}"/${P}-opengl.patch \ + "${FILESDIR}"/${P}-underlink.patch \ + "${FILESDIR}"/${P}-fno-common.patch +} + +src_configure() { + tc-export CC } src_install() { emake DESTDIR="${D}" install install-data - newicon ../gfx/icon.xpm ${PN}.xpm - make_desktop_entry ${PN} "Mole Invasion" doman ../debian/*.6 + + newicon ../gfx/icon.xpm moleinvasion.xpm + make_desktop_entry moleinvasion "Mole Invasion" } diff --git a/games-arcade/mrrescue/metadata.xml b/games-arcade/mrrescue/metadata.xml index 8b23901e939a..dda8e7ff7103 100644 --- a/games-arcade/mrrescue/metadata.xml +++ b/games-arcade/mrrescue/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/mrrescue/mrrescue-1.02b-r1.ebuild b/games-arcade/mrrescue/mrrescue-1.02b-r1.ebuild deleted file mode 100644 index 88feab502d79..000000000000 --- a/games-arcade/mrrescue/mrrescue-1.02b-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit desktop eutils gnome2-utils - -DESCRIPTION="Arcade 2d action game based around evacuating civilians from burning buildings" -HOMEPAGE="https://tangramgames.dk/games/mrrescue/" -SRC_URI="https://github.com/SimonLarsen/mrrescue/releases/download/v${PV}/${P}-love.zip - https://dev.gentoo.org/~hasufell/distfiles/${PN}.png" - -LICENSE="CC-BY-SA-3.0 MIT ZLIB" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="games-engines/love:0" -DEPEND="app-arch/unzip" - -S="${WORKDIR}/${P}-love" - -src_install() { - local dir=/usr/share/love/${PN} - - exeinto "${dir}" - doexe ${PN}.love - - einstalldocs - - doicon -s 64 "${DISTDIR}"/${PN}.png - make_wrapper ${PN} "love ${PN}.love" "${dir}" - make_desktop_entry ${PN} -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-arcade/mrrescue/mrrescue-1.02b-r2.ebuild b/games-arcade/mrrescue/mrrescue-1.02b-r2.ebuild index b770ad759c89..a34d56ef3213 100644 --- a/games-arcade/mrrescue/mrrescue-1.02b-r2.ebuild +++ b/games-arcade/mrrescue/mrrescue-1.02b-r2.ebuild @@ -1,25 +1,23 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit desktop eutils gnome2-utils +inherit desktop wrapper xdg DESCRIPTION="Arcade 2d action game based around evacuating civilians from burning buildings" HOMEPAGE="https://tangramgames.dk/games/mrrescue/" SRC_URI="https://github.com/SimonLarsen/mrrescue/releases/download/v${PV}/${P}-love.zip - https://dev.gentoo.org/~hasufell/distfiles/${PN}.png" + mirror://gentoo/${PN}.png" +S="${WORKDIR}/${P}-love" LICENSE="CC-BY-SA-3.0 MIT ZLIB" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" LVSLOT="0.8" RDEPEND="games-engines/love:${LVSLOT}" -DEPEND="app-arch/unzip" - -S="${WORKDIR}/${P}-love" +BDEPEND="app-arch/unzip" src_install() { local dir=/usr/share/love/${PN} @@ -33,15 +31,3 @@ src_install() { make_wrapper ${PN} "love-${LVSLOT} ${PN}.love" "${dir}" make_desktop_entry ${PN} } - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-arcade/netris/files/netris-0.52-clang16.patch b/games-arcade/netris/files/netris-0.52-clang16.patch new file mode 100644 index 000000000000..7d13d02975bf --- /dev/null +++ b/games-arcade/netris/files/netris-0.52-clang16.patch @@ -0,0 +1,31 @@ +https://bugs.gentoo.org/874021 +--- a/Configure ++++ b/Configure +@@ -78,3 +78,3 @@ + echo "Checking for libraries" +-echo 'main(){}' > test.c ++echo 'int main(void){return 0;}' > test.c + LFLAGS="" +@@ -96,4 +96,5 @@ + cat << END > test.c +-void handler(void) {} +-main() { on_exit(handler, (void *)0); } ++#include <stdlib.h> ++void handler(int a, void *b) {} ++int main(void) { on_exit(handler, (void *)0); return 0; } + END +@@ -108,3 +109,3 @@ + #include <signal.h> +-main() { sigset_t set; sigprocmask(SIG_BLOCK, &set, &set); } ++int main(void) { sigset_t set; sigprocmask(SIG_BLOCK, &set, &set); return 0; } + END +@@ -119,3 +120,3 @@ + #include <getopt.h> +-main(){} ++int main(void){return 0;} + END +@@ -131,3 +132,3 @@ + #include <memory.h> +-main(){} ++int main(void){return 0;} + END diff --git a/games-arcade/netris/metadata.xml b/games-arcade/netris/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/netris/metadata.xml +++ b/games-arcade/netris/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/netris/netris-0.52-r3.ebuild b/games-arcade/netris/netris-0.52-r4.ebuild index 54f80a22be4d..81086d655920 100644 --- a/games-arcade/netris/netris-0.52-r3.ebuild +++ b/games-arcade/netris/netris-0.52-r4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit toolchain-funcs +inherit flag-o-matic toolchain-funcs DEB_VER="10" DESCRIPTION="Classic networked version of T*tris" @@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.netris.org/pub/netris/${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~mips ~x86" +KEYWORDS="~amd64 ~arm64 ~mips ~x86" IUSE="" DEPEND="sys-libs/ncurses:0=" @@ -26,6 +26,7 @@ src_prepare() { eapply "${S}"/../debian/patches/[01]* eapply "${FILESDIR}"/${P}-tinfo.patch + eapply "${FILESDIR}"/${P}-clang16.patch # bug #185332 sed -i \ @@ -53,6 +54,9 @@ src_prepare() { } src_configure() { + append-cppflags -D_DEFAULT_SOURCE #874021, for on_exit() + append-cflags ${CPPFLAGS} + bash ./Configure -O || die } diff --git a/games-arcade/nibbles/metadata.xml b/games-arcade/nibbles/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/nibbles/metadata.xml +++ b/games-arcade/nibbles/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/nibbles/nibbles-0.0.4-r1.ebuild b/games-arcade/nibbles/nibbles-0.0.4-r1.ebuild index f0e888118245..83e5c2b92f3e 100644 --- a/games-arcade/nibbles/nibbles-0.0.4-r1.ebuild +++ b/games-arcade/nibbles/nibbles-0.0.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="http://www.earth.li/projectpurple/files/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-linux ~ppc-macos" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~x86-linux ~ppc-macos" IUSE="" DEPEND="sys-libs/ncurses:0=" diff --git a/games-arcade/ninvaders/metadata.xml b/games-arcade/ninvaders/metadata.xml index c7b7a31b3dbc..25baac61088e 100644 --- a/games-arcade/ninvaders/metadata.xml +++ b/games-arcade/ninvaders/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/ninvaders/ninvaders-0.1.2.ebuild b/games-arcade/ninvaders/ninvaders-0.1.2.ebuild index 276a49eae610..97794b66c61a 100644 --- a/games-arcade/ninvaders/ninvaders-0.1.2.ebuild +++ b/games-arcade/ninvaders/ninvaders-0.1.2.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit cmake -DESCRIPTION="a Space Invaders clone based on ncurses for ASCII output" +DESCRIPTION="Space Invaders clone based on ncurses for ASCII output" HOMEPAGE="https://github.com/sf-refugees/ninvaders - http://ninvaders.sourceforge.net/" + https://ninvaders.sourceforge.net/" SRC_URI="https://github.com/sf-refugees/ninvaders/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" diff --git a/games-arcade/njam/metadata.xml b/games-arcade/njam/metadata.xml index c64fdbbaa6d3..e4671b1865a3 100644 --- a/games-arcade/njam/metadata.xml +++ b/games-arcade/njam/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/notpacman/metadata.xml b/games-arcade/notpacman/metadata.xml index 64f4a5d2c1c1..2cfd89a1fc44 100644 --- a/games-arcade/notpacman/metadata.xml +++ b/games-arcade/notpacman/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/notpacman/notpacman-1.0.4-r1.ebuild b/games-arcade/notpacman/notpacman-1.0.4-r1.ebuild index 26472c8d2172..de7d45a2d9cd 100644 --- a/games-arcade/notpacman/notpacman-1.0.4-r1.ebuild +++ b/games-arcade/notpacman/notpacman-1.0.4-r1.ebuild @@ -1,14 +1,15 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit desktop eutils gnome2-utils +inherit desktop wrapper xdg -DESCRIPTION="A mashup of \"Not\" and \"Pacman\"" +DESCRIPTION="Mashup of \"Not\" and \"Pacman\"" HOMEPAGE="https://stabyourself.net/notpacman/" SRC_URI="https://stabyourself.net/dl.php?file=notpacman-1004/notpacman-linux.zip -> ${P}.zip https://dev.gentoo.org/~chewi/distfiles/${PN}.png" +S="${WORKDIR}" LICENSE="WTFPL-2" SLOT="0" @@ -16,11 +17,8 @@ KEYWORDS="~amd64 ~x86" LVSLOT="0.7" RDEPEND=">=games-engines/love-0.7.2:${LVSLOT} - media-libs/devil[png] -" -DEPEND="app-arch/unzip" - -S="${WORKDIR}" + media-libs/devil[png]" +BDEPEND="app-arch/unzip" src_install() { local dir=/usr/share/love/${PN} @@ -34,15 +32,3 @@ src_install() { make_wrapper ${PN} "love-${LVSLOT} ${PN}.love" "${dir}" make_desktop_entry ${PN} } - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-arcade/nottetris2/metadata.xml b/games-arcade/nottetris2/metadata.xml index be520c29e0f5..a15eeb00627c 100644 --- a/games-arcade/nottetris2/metadata.xml +++ b/games-arcade/nottetris2/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/nottetris2/nottetris2-1-r1.ebuild b/games-arcade/nottetris2/nottetris2-1-r1.ebuild index 730417cb8a3b..329cea1efb91 100644 --- a/games-arcade/nottetris2/nottetris2-1-r1.ebuild +++ b/games-arcade/nottetris2/nottetris2-1-r1.ebuild @@ -1,30 +1,30 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit desktop eutils +inherit desktop wrapper DESCRIPTION="The spiritual successor of the classic Tetris mixed with physics" HOMEPAGE="https://stabyourself.net/nottetris2/" SRC_URI="https://stabyourself.net/dl.php?file=nottetris2/nottetris2-linux.zip -> ${P}.zip" +S="${WORKDIR}" LICENSE="CC-BY-NC-SA-3.0" SLOT="0" KEYWORDS="~amd64 ~x86" LVSLOT="0.7" -RDEPEND=">=games-engines/love-0.7.2:${LVSLOT} +RDEPEND=" + >=games-engines/love-0.7.2:${LVSLOT} media-libs/devil[png] " -DEPEND="app-arch/unzip" - -S="${WORKDIR}" +BDEPEND="app-arch/unzip" src_install() { local dir=/usr/share/love/${PN} - exeinto "${dir}" + exeinto ${dir} newexe "Not Tetris 2.love" ${PN}.love newdoc "Not Readme.txt" README diff --git a/games-arcade/open-supaplex/Manifest b/games-arcade/open-supaplex/Manifest new file mode 100644 index 000000000000..88b365965284 --- /dev/null +++ b/games-arcade/open-supaplex/Manifest @@ -0,0 +1 @@ +DIST open-supaplex-7.1.2.tar.gz 50157943 BLAKE2B 74811edf2dbf65b21fc502703ecadaa293ac5219e0c17b6876a6c6d81c46456d3d06717b56124ce5a675dbfa2c228235479ab8e5baf33fc3618576936dc9b62c SHA512 960c916d9af142511c755babeed24e4cde71bf9b61a5d77b988c45dc9fb9065ca6c65f07b72a2c413a1a7a5158da597f72e9d4d907de9585c4a6cc410e6134f6 diff --git a/games-arcade/open-supaplex/files/open-supaplex.svg b/games-arcade/open-supaplex/files/open-supaplex.svg new file mode 100644 index 000000000000..7b91141b63fb --- /dev/null +++ b/games-arcade/open-supaplex/files/open-supaplex.svg @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="128" height="128" version="1.0" viewBox="0 0 1280 1280" xmlns="http://www.w3.org/2000/svg"> +<g transform="translate(-640,-110)"> +<g> +<path d="m1040 1350v-40h-160v-80h-80v-80h-80v-80h-80v-640h80v-80h80v-80h80v-80h80v-80h640v80h160v80h80v160h80v640h-80v80h-80v80h-80v80h-160v80h-480z"/> +</g> +<g fill="#303030"> +<path d="m1040 1350v-40h-160v-80h-80v-80h-80v-80h-80v-640h80v-80h80v-80h80v-80h80v-80h640v80h160v80h80v160h80v640h-80v80h-80v80h-80v80h-160v80h-480zm0-800v-40h-80v80h80zm640 0v-40h-80v80h80z"/> +</g> +<g fill="#b00000"> +<path d="m1040 1350v-40h-160v-80h-80v-80h-80v-80h-80v-640h80v-80h80v-80h80v-80h80v-80h640v80h160v80h80v160h80v640h-80v80h-80v80h-80v80h-160v80h-480zm480-320v-40h-400v80h400zm-480-80v-40h-80v80h80zm640 0v-40h-80v80h80zm-800-160v-40h-80v80h80zm960 0v-40h-80v80h80zm-800-240v-40h-80v80h80zm640 0v-40h-80v80h80z"/> +</g> +<g fill="#e01010"> +<path d="m1040 1190v-40h-160v-80h-80v-80h-80v-160h-80v-320h80v-160h80v-80h80v-80h160v-80h480v80h160v80h80v80h80v160h80v400h-80v80h-80v80h-80v80h-160v80h-480zm480-80v-40h80v-80h160v-80h80v-160h-80v80h-80v80h-160v80h-400v-80h-160v-80h-80v-80h-80v160h80v80h160v80h80v80h400zm-480-560v-40h-80v80h80zm640 0v-40h-80v80h80z"/> +</g> +<g fill="#767676"> +<path d="m880 550v-40h80v-80h80v80h-80v80h-80z"/> +<path d="m1680 550v-40h-80v-80h80v80h80v80h-80z"/> +</g> +<g fill="#f09040"> +<path d="m720 390v-40h80v-80h80v-80h80v80h-80v80h-80v80h-80z"/> +<path d="m1680 310v-40h-160v-80h160v80h80v80h-80z"/> +</g> +<g fill="#f0f0f0"> +<path d="m960 470v-40h80v80h-80z"/> +<path d="m1600 470v-40h80v80h-80z"/> +</g> +</g> +</svg> diff --git a/games-arcade/open-supaplex/metadata.xml b/games-arcade/open-supaplex/metadata.xml new file mode 100644 index 000000000000..c0497eea28b7 --- /dev/null +++ b/games-arcade/open-supaplex/metadata.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>alexey+gentoo@asokolov.org</email> + <name>Alexey Sokolov</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <maintainer type="project"> + <email>games@gentoo.org</email> + <name>Gentoo Games Project</name> + </maintainer> + <upstream> + <remote-id type="github">sergiou87/open-supaplex</remote-id> + </upstream> +</pkgmetadata> diff --git a/games-arcade/open-supaplex/open-supaplex-7.1.2-r1.ebuild b/games-arcade/open-supaplex/open-supaplex-7.1.2-r1.ebuild new file mode 100644 index 000000000000..0235c790c240 --- /dev/null +++ b/games-arcade/open-supaplex/open-supaplex-7.1.2-r1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop flag-o-matic toolchain-funcs + +DESCRIPTION="OSS reimplementation of Supaplex in C and SDL" +HOMEPAGE="https://github.com/sergiou87/open-supaplex" +SRC_URI="https://github.com/sergiou87/open-supaplex/archive/v${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + media-libs/libsdl2[joystick,sound,video] + media-libs/sdl2-mixer[vorbis] +" +DEPEND="${RDEPEND}" +BDEPEND=" + test? ( dev-lang/ruby ) +" + +src_prepare() { + default + rm -r resources/audio-{l,m}q || die +} + +src_compile() { + append-cflags -DFILE_FHS_XDG_DIRS -DFILE_DATA_PATH="${EPREFIX}/usr/share/OpenSupaplex" + emake -C linux CC="$(tc-getCC)" +} + +src_test() { + emake -C tests CC="$(tc-getCC)" + # Avoid installing savegames, configs, etc, if any were written during the test + cp -R resources "${T}/test" || die + cd tests || die + # gems are not used by the test, but by default ruby fails to start if + # dev-ruby/rubygems is not installed. dev-lang/ruby depends on that package + # via PDEPEND which is why it's not available if ruby was pulled as a + # dependency to open-supaplex on clean machine. + # https://bugs.gentoo.org/739126 + OPENSUPAPLEX_PATH="${T}/test" ruby --disable=gems ./run-tests.rb ./opensupaplex || die +} + +src_install() { + dobin linux/opensupaplex + insinto /usr/share/OpenSupaplex + doins -r resources/* + doicon "${FILESDIR}/open-supaplex.svg" + make_desktop_entry opensupaplex OpenSupaplex open-supaplex +} diff --git a/games-arcade/openbubbles/metadata.xml b/games-arcade/openbubbles/metadata.xml index e6ae0aed3cb8..c784e12f82f5 100644 --- a/games-arcade/openbubbles/metadata.xml +++ b/games-arcade/openbubbles/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/openbubbles/openbubbles-1.2-r1.ebuild b/games-arcade/openbubbles/openbubbles-1.2-r1.ebuild index 050bff57fca9..621fcba7e7ab 100644 --- a/games-arcade/openbubbles/openbubbles-1.2-r1.ebuild +++ b/games-arcade/openbubbles/openbubbles-1.2-r1.ebuild @@ -1,17 +1,17 @@ -# 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 desktop -DESCRIPTION="A clone of Evan Bailey's game Bubbles" +DESCRIPTION="Clone of Evan Bailey's game Bubbles" HOMEPAGE="https://web.archive.org/web/20101126190910/http://www.freewebs.com/lasindi/openbubbles/" SRC_URI="https://web.archive.org/web/20101126190910/http://www.freewebs.com/lasindi/openbubbles/${P}.tar.bz2" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~hppa ~x86" -IUSE="" DEPEND="media-libs/libsdl[sound,video] media-libs/sdl-image[png] diff --git a/games-arcade/openmortal/files/openmortal-0.7-freetype.patch b/games-arcade/openmortal/files/openmortal-0.7-freetype.patch index 3a342c88979d..2c545edc1d13 100644 --- a/games-arcade/openmortal/files/openmortal-0.7-freetype.patch +++ b/games-arcade/openmortal/files/openmortal-0.7-freetype.patch @@ -1,5 +1,5 @@ ---- openmortal-0.7/src/sge_tt_text.cpp.old -+++ openmortal-0.7/src/sge_tt_text.cpp +--- a/src/sge_tt_text.cpp ++++ b/src/sge_tt_text.cpp @@ -37,9 +37,9 @@ #ifndef _SGE_NOTTF diff --git a/games-arcade/openmortal/files/openmortal-0.7-freetype_pkgconfig.patch b/games-arcade/openmortal/files/openmortal-0.7-freetype_pkgconfig.patch index fe683899f2e9..cde67a66e107 100644 --- a/games-arcade/openmortal/files/openmortal-0.7-freetype_pkgconfig.patch +++ b/games-arcade/openmortal/files/openmortal-0.7-freetype_pkgconfig.patch @@ -1,5 +1,5 @@ ---- openmortal-0.7/configure.in -+++ openmortal-0.7/configure.in +--- a/configure.in ++++ b/configure.in @@ -25,6 +25,7 @@ AC_C_CONST AC_PROG_CXX diff --git a/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch b/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch index 2620c153e837..888a06868d01 100644 --- a/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch +++ b/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch @@ -1,4 +1,4 @@ ---- a/src/OnlineChat.cpp.old +--- a/src/OnlineChat.cpp +++ b/src/OnlineChat.cpp @@ -56,7 +56,7 @@ class CChallengeMenu: public Menu diff --git a/games-arcade/openmortal/metadata.xml b/games-arcade/openmortal/metadata.xml index 1e665c7eee56..c87dac1d31f2 100644 --- a/games-arcade/openmortal/metadata.xml +++ b/games-arcade/openmortal/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/openmortal/openmortal-0.7-r2.ebuild b/games-arcade/openmortal/openmortal-0.7-r4.ebuild index 0153c5d051ac..3e5b21cd748d 100644 --- a/games-arcade/openmortal/openmortal-0.7-r2.ebuild +++ b/games-arcade/openmortal/openmortal-0.7-r4.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + inherit autotools desktop -DESCRIPTION="A spoof of the famous Mortal Kombat game" -HOMEPAGE="http://openmortal.sourceforge.net/" +DESCRIPTION="Spoof of the famous Mortal Kombat game" +HOMEPAGE="https://openmortal.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -RDEPEND="media-libs/libsdl[video] +RDEPEND="media-libs/libsdl[joystick,video] media-libs/sdl-image media-libs/sdl-mixer media-libs/sdl-ttf @@ -21,21 +21,25 @@ RDEPEND="media-libs/libsdl[video] >=media-libs/freetype-2.4.0:2 dev-lang/perl " -DEPEND="${DEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${P}"-gcc41.patch + "${FILESDIR}/${P}"-freetype.patch + "${FILESDIR}/${P}"-freetype_pkgconfig.patch +) src_prepare() { default - eapply \ - "${FILESDIR}/${P}"-gcc41.patch \ - "${FILESDIR}/${P}"-freetype.patch \ - "${FILESDIR}/${P}"-freetype_pkgconfig.patch + mv configure.{in,ac} || die eautoreconf } src_install() { default + newicon data/gfx/icon.png ${PN}.png make_desktop_entry ${PN} OpenMortal } diff --git a/games-arcade/opensonic/Manifest b/games-arcade/opensonic/Manifest index 53807ee7a677..223b8148355e 100644 --- a/games-arcade/opensonic/Manifest +++ b/games-arcade/opensonic/Manifest @@ -1 +1,2 @@ +DIST loggcompat-4.4.2.tar.gz 3105 BLAKE2B 846430f7a7252ee4de168274b21c9ffd18e9ba40733aaa45def8a8a4a7a938d00ab61267712008bc599ce91d5a283ab586a4dae77c3cd33af10e2dc641b8be12 SHA512 4d704f999fc3ae3caa094a8a32d5285549c40485c7af9015dc67f832255f2d3963ae1d0db9194b101d66a168b85609ec4926b8ebb39fb7ce7986f7df40f293af DIST opensnc-src-0.1.4.tar.gz 10525059 BLAKE2B d5cb825512dfeb614d146e6e7ec45cc3eb56dae0f2cf6c2582e022a1e8ac54e6c87f7bee8795b0e520fa6c24433cb7a748889892cd288f122d7b885e6e91c790 SHA512 239c7b4c7f9663e4d46c54d8bdaefed8d12274b71feaf9c637feb04f3567465f265c50bf3419f4c881ae3fa48a62ab339fe8a0b005c2b080b53d54ebf1e2f29d diff --git a/games-arcade/opensonic/files/opensonic-0.1.4-allegro-4.4.2-loggcompat.patch b/games-arcade/opensonic/files/opensonic-0.1.4-allegro-4.4.2-loggcompat.patch new file mode 100644 index 000000000000..1289e846fe2b --- /dev/null +++ b/games-arcade/opensonic/files/opensonic-0.1.4-allegro-4.4.2-loggcompat.patch @@ -0,0 +1,46 @@ +Source: FreeBSD + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -82,12 +82,6 @@ IF(NOT LJPGALLEG) + MESSAGE(FATAL_ERROR "Fatal error: libjpgalleg not found! ${RTFM}") + ENDIF(NOT LJPGALLEG) + +-# LOGG: liblogg, libogg, libvorbis, libvorbisfile +-FIND_LIBRARY(LLOGG NAMES logg PATH "${CMAKE_LIBRARY_PATH}") +-IF(NOT LLOGG) +- MESSAGE(FATAL_ERROR "Fatal error: liblogg not found! ${RTFM}") +-ENDIF(NOT LLOGG) +- + FIND_LIBRARY(LOGG NAMES ogg PATH "${CMAKE_LIBRARY_PATH}") + IF(NOT LOGG) + MESSAGE(FATAL_ERROR "Fatal error: libogg not found! ${RTFM}") +@@ -150,6 +144,7 @@ SET( + src/core/util.c + src/core/v2d.c + src/core/video.c ++ loggcompat-4.4.2/logg-4.4.2.c + + src/scenes/util/editorgrp.c + src/scenes/util/grouptree.c +@@ -250,7 +245,8 @@ IF(UNIX) + IF(UNIX) + SET(GAME_SRCS ${GAME_SRCS} src/misc/iconlin.c) + ADD_EXECUTABLE(${GAME_UNIXNAME} ${GAME_SRCS}) +- TARGET_LINK_LIBRARIES(${GAME_UNIXNAME} m logg vorbisfile vorbis ogg jpgalleg z png loadpng ${ALLEGRO_UNIX_LIBS}) ++ INCLUDE_DIRECTORIES(loggcompat-4.4.2) ++ TARGET_LINK_LIBRARIES(${GAME_UNIXNAME} m vorbisfile vorbis ogg jpgalleg z png loadpng ${ALLEGRO_UNIX_LIBS}) + SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES COMPILE_FLAGS "-Wall") + ENDIF(UNIX) + +--- a/src/core/audio.c ++++ b/src/core/audio.c +@@ -18,7 +18,7 @@ + */ + + #include <allegro.h> +-#include <logg.h> ++#include <logg-4.4.2.h> + #include <stdlib.h> + #include "audio.h" + #include "osspec.h" diff --git a/games-arcade/opensonic/files/opensonic-0.1.4-clang16.patch b/games-arcade/opensonic/files/opensonic-0.1.4-clang16.patch new file mode 100644 index 000000000000..f375d757eb4f --- /dev/null +++ b/games-arcade/opensonic/files/opensonic-0.1.4-clang16.patch @@ -0,0 +1,26 @@ +--- a/src/core/audio.c ++++ b/src/core/audio.c +@@ -385,3 +385,3 @@ + */ +-void audio_init(int nomusic) ++void audio_init() + { +--- a/src/entities/object_decorators/dialog_box.c ++++ b/src/entities/object_decorators/dialog_box.c +@@ -39,3 +39,3 @@ + +-static objectmachine_t* make_decorator(objectmachine_t *decorated_machine, const char *title, const char *message, void (*strategy)()); ++static objectmachine_t* make_decorator(objectmachine_t *decorated_machine, const char *title, const char *message, void (*strategy)(objectdecorator_dialogbox_t*)); + +@@ -60,3 +60,3 @@ + /* private methods */ +-objectmachine_t* make_decorator(objectmachine_t *decorated_machine, const char *title, const char *message, void (*strategy)()) ++objectmachine_t* make_decorator(objectmachine_t *decorated_machine, const char *title, const char *message, void (*strategy)(objectdecorator_dialogbox_t*)) + { +--- a/src/scenes/level.c ++++ b/src/scenes/level.c +@@ -214,3 +214,3 @@ + static void update_dlgbox(); /* dialog boxes */ +-static void render_dlgbox(); /* dialog boxes */ ++static void render_dlgbox(v2d_t camera_position); /* dialog boxes */ + diff --git a/games-arcade/opensonic/files/opensonic-0.1.4-r1-cmake.patch b/games-arcade/opensonic/files/opensonic-0.1.4-cmake.patch index 53d76faafae2..53d76faafae2 100644 --- a/games-arcade/opensonic/files/opensonic-0.1.4-r1-cmake.patch +++ b/games-arcade/opensonic/files/opensonic-0.1.4-cmake.patch diff --git a/games-arcade/opensonic/metadata.xml b/games-arcade/opensonic/metadata.xml index f62cdf642eee..f3240aa4c725 100644 --- a/games-arcade/opensonic/metadata.xml +++ b/games-arcade/opensonic/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/opensonic/opensonic-0.1.4-r2.ebuild b/games-arcade/opensonic/opensonic-0.1.4-r2.ebuild deleted file mode 100644 index 3e0e1b0c35a2..000000000000 --- a/games-arcade/opensonic/opensonic-0.1.4-r2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -MY_PN=opensnc -MY_P=${MY_PN}-src-${PV} - -DESCRIPTION="A free open-source game based on the Sonic the Hedgehog universe" -HOMEPAGE="http://opensnc.sourceforge.net/" -SRC_URI="https://sourceforge.net/projects/opensnc/files/Open%20Sonic/${PV}/opensnc-src-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -RESTRICT="mirror" # unsure about legality of graphics - -DEPEND=" - media-libs/allegro:0=[X,jpeg,png,vorbis] - media-libs/libogg:= - media-libs/libpng:0= - media-libs/libvorbis:= - sys-libs/zlib:= - virtual/jpeg:0" -RDEPEND=${DEPEND} - -S=${WORKDIR}/${MY_P} -PATCHES=( "${FILESDIR}"/${PN}-0.1.4-r1-cmake.patch ) - -src_configure() { - local mycmakeargs=( - -DGAME_INSTALL_DIR="${EPREFIX}"/usr/share/${PN} - -DGAME_FINAL_DIR="${EPREFIX}"/usr/bin - -DGAME_LIBDIR="${EPREFIX}"/usr/$(get_libdir)/${PN} - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - local f - while IFS="" read -d $'\0' -r f; do - dosym ../../share/${PN}/${f##*/} \ - /usr/$(get_libdir)/${PN}/${f##*/} - done < <(find "${ED%/}"/usr/share/${PN}/ -mindepth 1 -maxdepth 1 -type d -print0) -} diff --git a/games-arcade/opensonic/opensonic-0.1.4-r4.ebuild b/games-arcade/opensonic/opensonic-0.1.4-r4.ebuild new file mode 100644 index 000000000000..ec4956a3e930 --- /dev/null +++ b/games-arcade/opensonic/opensonic-0.1.4-r4.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Free open-source game based on the Sonic the Hedgehog universe" +HOMEPAGE="https://opensnc.sourceforge.net/" +SRC_URI=" + mirror://sourceforge/project/opensnc/Open%20Sonic/${PV}/opensnc-src-${PV}.tar.gz + mirror+https://dev.gentoo.org/~ionen/distfiles/loggcompat-4.4.2.tar.gz" +S="${WORKDIR}/opensnc-src-${PV}" + +LICENSE="GPL-2+ MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +RESTRICT="mirror" # unsure about legality of graphics + +RDEPEND=" + media-libs/allegro:0[X,jpeg,png,vorbis] + media-libs/libvorbis" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-cmake.patch + "${FILESDIR}"/${P}-allegro-4.4.2-loggcompat.patch # bug 711542 + "${FILESDIR}"/${P}-clang16.patch +) + +src_prepare() { + mv "${WORKDIR}"/loggcompat-4.4.2 . || die + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DGAME_FINAL_DIR="${EPREFIX}"/usr/bin + -DGAME_HTMLDIR="${EPREFIX}"/usr/share/doc/${PF}/html + -DGAME_INSTALL_DIR="${EPREFIX}"/usr/share/${PN} + -DGAME_LIBDIR="${EPREFIX}"/usr/$(get_libdir)/${PN} + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + local d + for d in "${ED}"/usr/share/${PN}/*; do + dosym -r /usr/{share,$(get_libdir)}/${PN}/${d##*/} + done +} diff --git a/games-arcade/opentyrian/files/2.1.20130907-datapath.diff b/games-arcade/opentyrian/files/2.1.20130907-datapath.diff deleted file mode 100644 index 5b0143ed9a50..000000000000 --- a/games-arcade/opentyrian/files/2.1.20130907-datapath.diff +++ /dev/null @@ -1,26 +0,0 @@ -diff -uNr opentyrian-2.1.20130907.ORIG/Makefile opentyrian-2.1.20130907/Makefile ---- opentyrian-2.1.20130907.ORIG/Makefile 2013-12-08 17:40:23.470846371 +0000 -+++ opentyrian-2.1.20130907/Makefile 2013-12-08 17:40:49.355847165 +0000 -@@ -49,6 +49,10 @@ - ALL_LDFLAGS += $(LDFLAGS) - LDLIBS += $(EXTRA_LDLIBS) $(SDL_LDLIBS) - -+ifneq ($(DATA_PATH), ) -+ CFLAGS += -DDATA_PATH=\"$(DATA_PATH)\" -+endif -+ - # RULES #################################################### - - .PHONY : all release clean -diff -uNr opentyrian-2.1.20130907.ORIG/src/file.c opentyrian-2.1.20130907/src/file.c ---- opentyrian-2.1.20130907.ORIG/src/file.c 2013-12-08 17:40:23.468846371 +0000 -+++ opentyrian-2.1.20130907/src/file.c 2013-12-08 17:40:49.355847165 +0000 -@@ -34,7 +34,7 @@ - #ifdef TARGET_MACOSX - tyrian_game_folder(), - #endif -- "/usr/share/opentyrian/data" -+ DATA_PATH - }; - - static const char *dir = NULL; diff --git a/games-arcade/opentyrian/files/2.1.20130907-cflag-idiocy.diff b/games-arcade/opentyrian/files/opentyrian-2.1.20130907-cflags.patch index 39ccf1c79f66..3654e22ef45e 100644 --- a/games-arcade/opentyrian/files/2.1.20130907-cflag-idiocy.diff +++ b/games-arcade/opentyrian/files/opentyrian-2.1.20130907-cflags.patch @@ -1,6 +1,5 @@ -diff -uNr opentyrian-2.1.20130907.ORIG/Makefile opentyrian-2.1.20130907/Makefile ---- opentyrian-2.1.20130907.ORIG/Makefile 2013-12-08 17:38:06.982842189 +0000 -+++ opentyrian-2.1.20130907/Makefile 2013-12-08 17:38:26.843842798 +0000 +--- a/Makefile ++++ b/Makefile @@ -21,11 +21,6 @@ # FLAGS #################################################### diff --git a/games-arcade/opentyrian/files/opentyrian-2.1.20130907-datapath.patch b/games-arcade/opentyrian/files/opentyrian-2.1.20130907-datapath.patch new file mode 100644 index 000000000000..8ebf427d0797 --- /dev/null +++ b/games-arcade/opentyrian/files/opentyrian-2.1.20130907-datapath.patch @@ -0,0 +1,24 @@ +--- a/Makefile ++++ b/Makefile +@@ -49,6 +49,10 @@ + ALL_LDFLAGS += $(LDFLAGS) + LDLIBS += $(EXTRA_LDLIBS) $(SDL_LDLIBS) + ++ifneq ($(DATA_PATH), ) ++ CFLAGS += -DDATA_PATH=\"$(DATA_PATH)\" ++endif ++ + # RULES #################################################### + + .PHONY : all release clean +--- a/src/file.c ++++ b/src/file.c +@@ -34,7 +34,7 @@ + #ifdef TARGET_MACOSX + tyrian_game_folder(), + #endif +- "/usr/share/opentyrian/data" ++ DATA_PATH + }; + + static const char *dir = NULL; diff --git a/games-arcade/opentyrian/files/opentyrian-2.1.20130907-gcc10.patch b/games-arcade/opentyrian/files/opentyrian-2.1.20130907-gcc10.patch new file mode 100644 index 000000000000..6f0bfcf64cf3 --- /dev/null +++ b/games-arcade/opentyrian/files/opentyrian-2.1.20130907-gcc10.patch @@ -0,0 +1,353 @@ +From 962ee8fc46ca51691bde1c8c1022dacbe8a037ed Mon Sep 17 00:00:00 2001 +From: Carl Reinke <carlreinke@users.noreply.github.com> +Date: Sun, 14 Jun 2020 14:11:00 -0600 +Subject: [PATCH] Move definitions that don't need to be exposed from opl.h to + opl.c + +--- a/src/opl.c ++++ b/src/opl.c +@@ -23,12 +23,161 @@ + * Copyright (C) 1998-2001 Ken Silverman + * Ken Silverman's official web site: "http://www.advsys.net/ken" + */ +- ++#include "opl.h" + + #include <math.h> ++#include <stdbool.h> + #include <stdlib.h> // rand() + #include <string.h> // memset() +-#include "opl.h" ++ ++#define fltype double ++ ++ /* ++ define attribution that inlines/forces inlining of a function (optional) ++ */ ++#define OPL_INLINE inline ++ ++ ++#undef NUM_CHANNELS ++#if defined(OPLTYPE_IS_OPL3) ++#define NUM_CHANNELS 18 ++#else ++#define NUM_CHANNELS 9 ++#endif ++ ++#define MAXOPERATORS (NUM_CHANNELS*2) ++ ++ ++#define FL05 ((fltype)0.5) ++#define FL2 ((fltype)2.0) ++#define PI ((fltype)3.1415926535897932384626433832795) ++ ++ ++#define FIXEDPT 0x10000 // fixed-point calculations using 16+16 ++#define FIXEDPT_LFO 0x1000000 // fixed-point calculations using 8+24 ++ ++#define WAVEPREC 1024 // waveform precision (10 bits) ++ ++#define INTFREQU ((fltype)(14318180.0 / 288.0)) // clocking of the chip ++ ++ ++#define OF_TYPE_ATT 0 ++#define OF_TYPE_DEC 1 ++#define OF_TYPE_REL 2 ++#define OF_TYPE_SUS 3 ++#define OF_TYPE_SUS_NOKEEP 4 ++#define OF_TYPE_OFF 5 ++ ++#define ARC_CONTROL 0x00 ++#define ARC_TVS_KSR_MUL 0x20 ++#define ARC_KSL_OUTLEV 0x40 ++#define ARC_ATTR_DECR 0x60 ++#define ARC_SUSL_RELR 0x80 ++#define ARC_FREQ_NUM 0xa0 ++#define ARC_KON_BNUM 0xb0 ++#define ARC_PERC_MODE 0xbd ++#define ARC_FEEDBACK 0xc0 ++#define ARC_WAVE_SEL 0xe0 ++ ++#define ARC_SECONDSET 0x100 // second operator set for OPL3 ++ ++ ++#define OP_ACT_OFF 0x00 ++#define OP_ACT_NORMAL 0x01 // regular channel activated (bitmasked) ++#define OP_ACT_PERC 0x02 // percussion channel activated (bitmasked) ++ ++#define BLOCKBUF_SIZE 512 ++ ++ ++ // vibrato constants ++#define VIBTAB_SIZE 8 ++#define VIBFAC 70/50000 // no braces, integer mul/div ++ ++ // tremolo constants and table ++#define TREMTAB_SIZE 53 ++#define TREM_FREQ ((fltype)(3.7)) // tremolo at 3.7hz ++ ++ ++ /* operator struct definition ++ For OPL2 all 9 channels consist of two operators each, carrier and modulator. ++ Channel x has operators x as modulator and operators (9+x) as carrier. ++ For OPL3 all 18 channels consist either of two operators (2op mode) or four ++ operators (4op mode) which is determined through register4 of the second ++ adlib register set. ++ Only the channels 0,1,2 (first set) and 9,10,11 (second set) can act as ++ 4op channels. The two additional operators for a channel y come from the ++ 2op channel y+3 so the operatorss y, (9+y), y+3, (9+y)+3 make up a 4op ++ channel. ++ */ ++typedef struct operator_struct { ++ Bit32s cval, lastcval; // current output/last output (used for feedback) ++ Bit32u tcount, wfpos, tinc; // time (position in waveform) and time increment ++ fltype amp, step_amp; // and amplification (envelope) ++ fltype vol; // volume ++ fltype sustain_level; // sustain level ++ Bit32s mfbi; // feedback amount ++ fltype a0, a1, a2, a3; // attack rate function coefficients ++ fltype decaymul, releasemul; // decay/release rate functions ++ Bit32u op_state; // current state of operator (attack/decay/sustain/release/off) ++ Bit32u toff; ++ Bit32s freq_high; // highest three bits of the frequency, used for vibrato calculations ++ Bit16s* cur_wform; // start of selected waveform ++ Bit32u cur_wmask; // mask for selected waveform ++ Bit32u act_state; // activity state (regular, percussion) ++ bool sus_keep; // keep sustain level when decay finished ++ bool vibrato,tremolo; // vibrato/tremolo enable bits ++ ++ // variables used to provide non-continuous envelopes ++ Bit32u generator_pos; // for non-standard sample rates we need to determine how many samples have passed ++ Bits cur_env_step; // current (standardized) sample position ++ Bits env_step_a,env_step_d,env_step_r; // number of std samples of one step (for attack/decay/release mode) ++ Bit8u step_skip_pos_a; // position of 8-cyclic step skipping (always 2^x to check against mask) ++ Bits env_step_skip_a; // bitmask that determines if a step is skipped (respective bit is zero then) ++ ++#if defined(OPLTYPE_IS_OPL3) ++ bool is_4op,is_4op_attached; // base of a 4op channel/part of a 4op channel ++ Bit32s left_pan,right_pan; // opl3 stereo panning amount ++#endif ++} op_type; ++ ++// per-chip variables ++static op_type op[MAXOPERATORS]; ++ ++static Bits int_samplerate; ++ ++static Bit8u status; ++static Bit32u opl_index; ++#if defined(OPLTYPE_IS_OPL3) ++static Bit8u adlibreg[512]; // adlib register set (including second set) ++static Bit8u wave_sel[44]; // waveform selection ++#else ++static Bit8u adlibreg[256]; // adlib register set ++static Bit8u wave_sel[22]; // waveform selection ++#endif ++ ++ ++ // vibrato/tremolo increment/counter ++static Bit32u vibtab_pos; ++static Bit32u vibtab_add; ++static Bit32u tremtab_pos; ++static Bit32u tremtab_add; ++ ++ ++// enable an operator ++void enable_operator(Bitu regbase, op_type* op_pt, Bit32u act_type); ++ ++// functions to change parameters of an operator ++void change_frequency(Bitu chanbase, Bitu regbase, op_type* op_pt); ++ ++void change_attackrate(Bitu regbase, op_type* op_pt); ++void change_decayrate(Bitu regbase, op_type* op_pt); ++void change_releaserate(Bitu regbase, op_type* op_pt); ++void change_sustainlevel(Bitu regbase, op_type* op_pt); ++void change_waveform(Bitu regbase, op_type* op_pt); ++void change_keepsustain(Bitu regbase, op_type* op_pt); ++void change_vibrato(Bitu regbase, op_type* op_pt); ++void change_feedback(Bitu chanbase, op_type* op_pt); ++ + + static Bit32u generator_add; // should be a chip parameter + +--- a/src/opl.h ++++ b/src/opl.h +@@ -25,11 +25,8 @@ + * Ken Silverman's official web site: "http://www.advsys.net/ken" + */ + +- +-#define fltype double +- +-#include <stdbool.h> + #include <stdint.h> ++ + typedef uintptr_t Bitu; + typedef intptr_t Bits; + typedef uint32_t Bit32u; +@@ -39,154 +36,6 @@ typedef int16_t Bit16s; + typedef uint8_t Bit8u; + typedef int8_t Bit8s; + +- +-/* +- define attribution that inlines/forces inlining of a function (optional) +-*/ +-#define OPL_INLINE inline +- +- +-#undef NUM_CHANNELS +-#if defined(OPLTYPE_IS_OPL3) +-#define NUM_CHANNELS 18 +-#else +-#define NUM_CHANNELS 9 +-#endif +- +-#define MAXOPERATORS (NUM_CHANNELS*2) +- +- +-#define FL05 ((fltype)0.5) +-#define FL2 ((fltype)2.0) +-#define PI ((fltype)3.1415926535897932384626433832795) +- +- +-#define FIXEDPT 0x10000 // fixed-point calculations using 16+16 +-#define FIXEDPT_LFO 0x1000000 // fixed-point calculations using 8+24 +- +-#define WAVEPREC 1024 // waveform precision (10 bits) +- +-#define INTFREQU ((fltype)(14318180.0 / 288.0)) // clocking of the chip +- +- +-#define OF_TYPE_ATT 0 +-#define OF_TYPE_DEC 1 +-#define OF_TYPE_REL 2 +-#define OF_TYPE_SUS 3 +-#define OF_TYPE_SUS_NOKEEP 4 +-#define OF_TYPE_OFF 5 +- +-#define ARC_CONTROL 0x00 +-#define ARC_TVS_KSR_MUL 0x20 +-#define ARC_KSL_OUTLEV 0x40 +-#define ARC_ATTR_DECR 0x60 +-#define ARC_SUSL_RELR 0x80 +-#define ARC_FREQ_NUM 0xa0 +-#define ARC_KON_BNUM 0xb0 +-#define ARC_PERC_MODE 0xbd +-#define ARC_FEEDBACK 0xc0 +-#define ARC_WAVE_SEL 0xe0 +- +-#define ARC_SECONDSET 0x100 // second operator set for OPL3 +- +- +-#define OP_ACT_OFF 0x00 +-#define OP_ACT_NORMAL 0x01 // regular channel activated (bitmasked) +-#define OP_ACT_PERC 0x02 // percussion channel activated (bitmasked) +- +-#define BLOCKBUF_SIZE 512 +- +- +-// vibrato constants +-#define VIBTAB_SIZE 8 +-#define VIBFAC 70/50000 // no braces, integer mul/div +- +-// tremolo constants and table +-#define TREMTAB_SIZE 53 +-#define TREM_FREQ ((fltype)(3.7)) // tremolo at 3.7hz +- +- +-/* operator struct definition +- For OPL2 all 9 channels consist of two operators each, carrier and modulator. +- Channel x has operators x as modulator and operators (9+x) as carrier. +- For OPL3 all 18 channels consist either of two operators (2op mode) or four +- operators (4op mode) which is determined through register4 of the second +- adlib register set. +- Only the channels 0,1,2 (first set) and 9,10,11 (second set) can act as +- 4op channels. The two additional operators for a channel y come from the +- 2op channel y+3 so the operatorss y, (9+y), y+3, (9+y)+3 make up a 4op +- channel. +-*/ +-typedef struct operator_struct { +- Bit32s cval, lastcval; // current output/last output (used for feedback) +- Bit32u tcount, wfpos, tinc; // time (position in waveform) and time increment +- fltype amp, step_amp; // and amplification (envelope) +- fltype vol; // volume +- fltype sustain_level; // sustain level +- Bit32s mfbi; // feedback amount +- fltype a0, a1, a2, a3; // attack rate function coefficients +- fltype decaymul, releasemul; // decay/release rate functions +- Bit32u op_state; // current state of operator (attack/decay/sustain/release/off) +- Bit32u toff; +- Bit32s freq_high; // highest three bits of the frequency, used for vibrato calculations +- Bit16s* cur_wform; // start of selected waveform +- Bit32u cur_wmask; // mask for selected waveform +- Bit32u act_state; // activity state (regular, percussion) +- bool sus_keep; // keep sustain level when decay finished +- bool vibrato,tremolo; // vibrato/tremolo enable bits +- +- // variables used to provide non-continuous envelopes +- Bit32u generator_pos; // for non-standard sample rates we need to determine how many samples have passed +- Bits cur_env_step; // current (standardized) sample position +- Bits env_step_a,env_step_d,env_step_r; // number of std samples of one step (for attack/decay/release mode) +- Bit8u step_skip_pos_a; // position of 8-cyclic step skipping (always 2^x to check against mask) +- Bits env_step_skip_a; // bitmask that determines if a step is skipped (respective bit is zero then) +- +-#if defined(OPLTYPE_IS_OPL3) +- bool is_4op,is_4op_attached; // base of a 4op channel/part of a 4op channel +- Bit32s left_pan,right_pan; // opl3 stereo panning amount +-#endif +-} op_type; +- +-// per-chip variables +-Bitu chip_num; +-op_type op[MAXOPERATORS]; +- +-Bits int_samplerate; +- +-Bit8u status; +-Bit32u opl_index; +-#if defined(OPLTYPE_IS_OPL3) +-Bit8u adlibreg[512]; // adlib register set (including second set) +-Bit8u wave_sel[44]; // waveform selection +-#else +-Bit8u adlibreg[256]; // adlib register set +-Bit8u wave_sel[22]; // waveform selection +-#endif +- +- +-// vibrato/tremolo increment/counter +-Bit32u vibtab_pos; +-Bit32u vibtab_add; +-Bit32u tremtab_pos; +-Bit32u tremtab_add; +- +- +-// enable an operator +-void enable_operator(Bitu regbase, op_type* op_pt, Bit32u act_type); +- +-// functions to change parameters of an operator +-void change_frequency(Bitu chanbase, Bitu regbase, op_type* op_pt); +- +-void change_attackrate(Bitu regbase, op_type* op_pt); +-void change_decayrate(Bitu regbase, op_type* op_pt); +-void change_releaserate(Bitu regbase, op_type* op_pt); +-void change_sustainlevel(Bitu regbase, op_type* op_pt); +-void change_waveform(Bitu regbase, op_type* op_pt); +-void change_keepsustain(Bitu regbase, op_type* op_pt); +-void change_vibrato(Bitu regbase, op_type* op_pt); +-void change_feedback(Bitu chanbase, op_type* op_pt); +- + // general functions + void adlib_init(Bit32u samplerate); + void adlib_write(Bitu idx, Bit8u val); +@@ -195,8 +44,8 @@ void adlib_getsample(Bit16s* sndptr, Bits numsamples); + Bitu adlib_reg_read(Bitu port); + void adlib_write_index(Bitu port, Bit8u val); + +-#endif /* OPL_H */ +- + #define opl_init() adlib_init(OUTPUT_QUALITY * 11025) + #define opl_write(reg, val) adlib_write(reg, val) + #define opl_update(buf, num) adlib_getsample(buf, num) ++ ++#endif /* OPL_H */ diff --git a/games-arcade/opentyrian/metadata.xml b/games-arcade/opentyrian/metadata.xml index 161bc1494dc2..8b8ac653c809 100644 --- a/games-arcade/opentyrian/metadata.xml +++ b/games-arcade/opentyrian/metadata.xml @@ -1,15 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>chainsaw@gentoo.org</email> - <name>Tony Vroon</name> - </maintainer> <maintainer type="project"> <email>games@gentoo.org</email> <name>Gentoo Games Project</name> </maintainer> <upstream> - <remote-id type="bitbucket">opentyrian/opentyrian</remote-id> + <remote-id type="github">opentyrian/opentyrian</remote-id> </upstream> </pkgmetadata> diff --git a/games-arcade/opentyrian/opentyrian-2.1.20130907-r1.ebuild b/games-arcade/opentyrian/opentyrian-2.1.20130907-r1.ebuild deleted file mode 100644 index d6898a9647ff..000000000000 --- a/games-arcade/opentyrian/opentyrian-2.1.20130907-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit desktop gnome2-utils - -DESCRIPTION="Open-source port of the DOS game Tyrian, vertical scrolling shooter" -HOMEPAGE="https://bitbucket.org/opentyrian/opentyrian/wiki/Home" -SRC_URI="http://darklomax.org/tyrian/tyrian21.zip - http://www.camanis.net/${PN}/releases/${P}-src.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="media-libs/libsdl - media-libs/sdl-net" - -# Yes, mercurial is needed to set the build version stamp. -DEPEND="${RDEPEND} - app-arch/unzip - dev-vcs/mercurial" - -PATCHES=( - "${FILESDIR}/${PV}-datapath.diff" - "${FILESDIR}/${PV}-cflag-idiocy.diff" -) - -src_compile() { - emake DATA_PATH="/usr/share/${PN}" -} - -src_install() { - dobin opentyrian - dosym ../../usr/bin/opentyrian /usr/bin/tyrian - dodoc CREDITS NEWS README - domenu linux/opentyrian.desktop || die "Failed to install desktop file" - for i in linux/icons/*.png ; do - local size=`echo ${i} | sed -e 's:.*-\([0-9]\+\).png:\1:'` - insinto /usr/share/icons/hicolor/${size}x${size}/apps - newins ${i} opentyrian.png - done - insinto "/usr/share/${PN}" - cd "${WORKDIR}/tyrian21" - rm *.exe dpmi16bi.ovl loudness.awe || die "Failed to remove win32 binaries" - doins * -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-arcade/opentyrian/opentyrian-2.1.20130907-r3.ebuild b/games-arcade/opentyrian/opentyrian-2.1.20130907-r3.ebuild new file mode 100644 index 000000000000..1161edc3135f --- /dev/null +++ b/games-arcade/opentyrian/opentyrian-2.1.20130907-r3.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop toolchain-funcs xdg-utils + +DESCRIPTION="Open-source port of the DOS game Tyrian, vertical scrolling shooter" +HOMEPAGE="https://github.com/opentyrian/opentyrian" +SRC_URI="http://darklomax.org/tyrian/tyrian21.zip + http://www.camanis.net/${PN}/releases/${P}-src.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="media-libs/libsdl[joystick,video] + media-libs/sdl-net" +RDEPEND="${DEPEND}" +BDEPEND="app-arch/unzip" + +PATCHES=( + "${FILESDIR}/${P}-datapath.patch" + "${FILESDIR}/${P}-cflags.patch" + "${FILESDIR}/${P}-gcc10.patch" +) + +src_prepare() { + default + + rm "${WORKDIR}"/tyrian21/{*.exe,dpmi16bi.ovl,loudness.awe} || die "Failed to remove win32 binaries" +} + +src_compile() { + emake \ + CC="$(tc-getCC)" \ + DATA_PATH="${EPREFIX}/usr/share/${PN}" +} + +src_install() { + dobin opentyrian + dosym opentyrian /usr/bin/tyrian + dodoc CREDITS NEWS README + domenu linux/opentyrian.desktop + + local size + for i in linux/icons/*.png ; do + size=${i%.png} + size=${size##*-} + newicon -s "${size}" "${i}" opentyrian.png + done + + insinto /usr/share/"${PN}" + doins "${WORKDIR}"/tyrian21/* +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/games-arcade/orthorobot/metadata.xml b/games-arcade/orthorobot/metadata.xml index 5b159fbcadd1..115e9d64a669 100644 --- a/games-arcade/orthorobot/metadata.xml +++ b/games-arcade/orthorobot/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>pinkbyte@gentoo.org</email> - <name>Sergey Popov</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/games-arcade/orthorobot/orthorobot-0-r1.ebuild b/games-arcade/orthorobot/orthorobot-0-r1.ebuild index 7d3771a8a4cf..387a153a6b68 100644 --- a/games-arcade/orthorobot/orthorobot-0-r1.ebuild +++ b/games-arcade/orthorobot/orthorobot-0-r1.ebuild @@ -1,39 +1,43 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils +EAPI=7 + +inherit desktop wrapper DESCRIPTION="Perspective based puzzle game, where you flatten the view to move across gaps" HOMEPAGE="https://stabyourself.net/orthorobot/" SRC_URI="https://stabyourself.net/dl.php?file=${PN}/${PN}-source.zip -> ${P}.zip" +S="${WORKDIR}" LICENSE="CC-BY-NC-ND-3.0" SLOT="0" KEYWORDS="~amd64 ~x86" RDEPEND=">=games-engines/love-0.8.0:0" -DEPEND="app-arch/unzip" - -S="${WORKDIR}" +BDEPEND="app-arch/unzip" src_unpack() { default - #it is only one .love file (but with crappy name), so we can use asterisk - mv *.love "${P}.zip" || die 'mv failed' + + # It is only one .love file (but with crappy name), so we can use asterisk + mv *.love "${P}.zip" || die "mv failed" unpack "./${P}.zip" - rm "${P}.zip" || die 'rm failed' + + rm "${P}.zip" || die "rm failed" } src_prepare() { default - # fix error on quit - sed -i -e 's/love.event.push("q")/love.event.push(fadegoal)/' menu.lua || die 'sed failed' + + # Fix error on quit + sed -i -e 's/love.event.push("q")/love.event.push(fadegoal)/' menu.lua || die "sed failed" } src_install() { - local dir="/usr/share/love/${PN}" - insinto "${dir}" + local dir=/usr/share/love/${PN} + insinto ${dir} + doins -r . make_wrapper "${PN}" "love ${dir}" make_desktop_entry "${PN}" diff --git a/games-arcade/orthorobot/orthorobot-0-r2.ebuild b/games-arcade/orthorobot/orthorobot-0-r2.ebuild index 305cf7ee67ed..1da2dac05619 100644 --- a/games-arcade/orthorobot/orthorobot-0-r2.ebuild +++ b/games-arcade/orthorobot/orthorobot-0-r2.ebuild @@ -1,12 +1,14 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils +EAPI=7 + +inherit desktop wrapper DESCRIPTION="Perspective based puzzle game, where you flatten the view to move across gaps" HOMEPAGE="https://stabyourself.net/orthorobot/" SRC_URI="https://stabyourself.net/dl.php?file=${PN}/${PN}-source.zip -> ${P}.zip" +S="${WORKDIR}" LICENSE="CC-BY-NC-ND-3.0" SLOT="0" @@ -14,28 +16,30 @@ KEYWORDS="~amd64 ~x86" LVSLOT="0.8" RDEPEND="games-engines/love:${LVSLOT}" -DEPEND="app-arch/unzip" - -S="${WORKDIR}" +BDEPEND="app-arch/unzip" src_unpack() { default - #it is only one .love file (but with crappy name), so we can use asterisk - mv *.love "${P}.zip" || die 'mv failed' + + # It is only one .love file (but with crappy name), so we can use asterisk + mv *.love "${P}.zip" || die "mv failed" unpack "./${P}.zip" - rm "${P}.zip" || die 'rm failed' + + rm "${P}.zip" || die "rm failed" } src_prepare() { default - # fix error on quit - sed -i -e 's/love.event.push("q")/love.event.push(fadegoal)/' menu.lua || die 'sed failed' + # Fix error on quit + sed -i -e 's/love.event.push("q")/love.event.push(fadegoal)/' menu.lua || die "sed failed" } src_install() { - local dir="/usr/share/love/${PN}" - insinto "${dir}" + local dir=/usr/share/love/${PN} + + insinto ${dir} doins -r . + make_wrapper "${PN}" "love-${LVSLOT} ${dir}" make_desktop_entry "${PN}" } diff --git a/games-arcade/oshu/Manifest b/games-arcade/oshu/Manifest index ebf8762f324e..9a46a682450e 100644 --- a/games-arcade/oshu/Manifest +++ b/games-arcade/oshu/Manifest @@ -1,2 +1,2 @@ -DIST oshu-2.0.1.tar.gz 144900 BLAKE2B 47f1d0a11255459ae357142499aeffcf07fbcad961cb34ba98e9efa7cb4229cf8d61ec836a4c899f2ea0883f1252395bc0c6ff34c5d670d67091cf6483d135ff SHA512 65768b3d8e7733464f05a19bbee594c0be728267bbd0667bc0f34e0d01a39e52d4ecce89a9223f7c454d73b21bc735401e9d83eea8b0a2eaf1c7825a3bd6b1cf +DIST oshu-2.0.2.tar.gz 146109 BLAKE2B 98dd49f972f1f1f820f654a2d358ceffdd2c54cd2daa0594914e6a1e29f1d1e757fe46d021afc75a33f4ef94bbb370213f20229843c173d7c55d876fe3db7e12 SHA512 e881e9429cebaf74337e55e7fa5445d992627d7616088f15abfafa2c125e1ff057a5b0f39ee4a1d1728c310728a8590e65286b9a0f81dca1f8963b2943fba596 DIST oshu-skin-v1.tar.gz 2224947 BLAKE2B 0b463133dd7ab54421551627d12932f5257848b1130d57af8c2ff6b6836a49c9322b8f2f7e95de540909390d0139e547650a6bb321614cf92fac464b09075674 SHA512 d562294ac5e122a9d9971e3ab92f6168d848177cc5e22a94bbc450fde2b3b14007796a24d33722da9b6675467b109ce128ba94dca5dcc7c61c91c1e373032618 diff --git a/games-arcade/oshu/files/oshu-2.0.2-ffmpeg4-compat.patch b/games-arcade/oshu/files/oshu-2.0.2-ffmpeg4-compat.patch new file mode 100644 index 000000000000..c16e61ce1288 --- /dev/null +++ b/games-arcade/oshu/files/oshu-2.0.2-ffmpeg4-compat.patch @@ -0,0 +1,16 @@ +diff --git a/./lib/audio/stream.cc.old b/./lib/audio/stream.cc +index 808851f..09eb4fb 100644 +--- a/./lib/audio/stream.cc.old ++++ b/./lib/audio/stream.cc +@@ -193,7 +193,11 @@ static int open_demuxer(const char *url, oshu::stream *stream) + stream->demuxer, + AVMEDIA_TYPE_AUDIO, + -1, -1, ++#if LIBAVCODEC_VERSION_MAJOR < 59 ++ &stream->codec, ++#else + (const AVCodec**)&stream->codec, ++#endif + 0 + ); + if (rc < 0 || stream->codec == NULL) { diff --git a/games-arcade/oshu/metadata.xml b/games-arcade/oshu/metadata.xml index 3e59d136eb7a..53e3da6f88a6 100644 --- a/games-arcade/oshu/metadata.xml +++ b/games-arcade/oshu/metadata.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> +<maintainer type="person" proxied="yes"> <email>contact@hacktivis.me</email> </maintainer> -<maintainer type="project"> +<maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/games-arcade/oshu/oshu-2.0.1.ebuild b/games-arcade/oshu/oshu-2.0.2.ebuild index f394d8081789..c1d02ab63c76 100644 --- a/games-arcade/oshu/oshu-2.0.1.ebuild +++ b/games-arcade/oshu/oshu-2.0.2.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake xdg DESCRIPTION="Lightweight osu! port" HOMEPAGE="https://github.com/fmang/oshu" -if [[ $PV = *9999 ]]; then +if [[ ${PV} = *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/fmang/oshu.git" SRC_URI="osu-skin? ( https://www.mg0.fr/oshu/skins/osu-v1.tar.gz -> ${PN}-skin-v1.tar.gz )" @@ -32,6 +32,16 @@ RDEPEND=" DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}/oshu-2.0.2-ffmpeg4-compat.patch" ) + +src_unpack() { + default + + if [[ ${PV} = *9999 ]]; then + git-r3_src_unpack + fi +} + src_prepare() { if use osu-skin; then eapply "${FILESDIR}/oshu-2.0.0-use_unpacked_osu-skin.patch" @@ -43,8 +53,8 @@ src_prepare() { src_configure() { local mycmakeargs=( - '-DOSHU_DEFAULT_SKIN='$(usex osu-skin 'osu' 'minimal') - '-DOSHU_SKINS=minimal'$(usex osu-skin ';osu' '') + -DOSHU_DEFAULT_SKIN=$(usex osu-skin osu minimal) + -DOSHU_SKINS=minimal$(usev osu-skin ';osu') ) cmake_src_configure diff --git a/games-arcade/oshu/oshu-9999.ebuild b/games-arcade/oshu/oshu-9999.ebuild index f394d8081789..cf543ede25bd 100644 --- a/games-arcade/oshu/oshu-9999.ebuild +++ b/games-arcade/oshu/oshu-9999.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake xdg DESCRIPTION="Lightweight osu! port" HOMEPAGE="https://github.com/fmang/oshu" -if [[ $PV = *9999 ]]; then +if [[ ${PV} = *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/fmang/oshu.git" SRC_URI="osu-skin? ( https://www.mg0.fr/oshu/skins/osu-v1.tar.gz -> ${PN}-skin-v1.tar.gz )" @@ -27,11 +27,19 @@ RDEPEND=" media-libs/sdl2-image x11-libs/cairo x11-libs/pango - media-video/ffmpeg:= + >media-video/ffmpeg-5:= " DEPEND="${RDEPEND}" +src_unpack() { + default + + if [[ ${PV} = *9999 ]]; then + git-r3_src_unpack + fi +} + src_prepare() { if use osu-skin; then eapply "${FILESDIR}/oshu-2.0.0-use_unpacked_osu-skin.patch" @@ -43,8 +51,8 @@ src_prepare() { src_configure() { local mycmakeargs=( - '-DOSHU_DEFAULT_SKIN='$(usex osu-skin 'osu' 'minimal') - '-DOSHU_SKINS=minimal'$(usex osu-skin ';osu' '') + -DOSHU_DEFAULT_SKIN=$(usex osu-skin osu minimal) + -DOSHU_SKINS=minimal$(usev osu-skin ';osu') ) cmake_src_configure diff --git a/games-arcade/pachi/files/1.0-autotools.patch b/games-arcade/pachi/files/1.0-autotools.patch index 0d0185f142f3..79e79d3a89ec 100644 --- a/games-arcade/pachi/files/1.0-autotools.patch +++ b/games-arcade/pachi/files/1.0-autotools.patch @@ -1,5 +1,5 @@ ---- configure.in -+++ configure.in +--- a/configure.in ++++ b/configure.in @@ -1,5 +1,7 @@ # Process this file with autoconf to produce a configure script. +AC_PREREQ([2.54]) @@ -17,8 +17,8 @@ fi eval DATAPATH=`eval echo "$DATADIR"` ---- data/Makefile.am -+++ data/Makefile.am +--- a/data/Makefile.am ++++ b/data/Makefile.am @@ -10,13 +10,13 @@ objects_v2.dat \ rooms_v2.dat @@ -39,8 +39,8 @@ + for file in $(score_DATA_); do \ + $(INSTALL) -g $(group) -m $(perms) $$file $(DESTDIR)$(scoredir); \ + done ---- Makefile.am -+++ Makefile.am +--- a/Makefile.am ++++ b/Makefile.am @@ -1 +1 @@ -SUBDIRS = src Tgfx data fonts music sounds docs +SUBDIRS = src Tgfx data fonts music sounds diff --git a/games-arcade/pachi/metadata.xml b/games-arcade/pachi/metadata.xml index 542b2bdb6342..d1acf648364c 100644 --- a/games-arcade/pachi/metadata.xml +++ b/games-arcade/pachi/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/pachi/pachi-1.0-r2.ebuild b/games-arcade/pachi/pachi-1.0-r2.ebuild new file mode 100644 index 000000000000..60879e0a8494 --- /dev/null +++ b/games-arcade/pachi/pachi-1.0-r2.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools desktop + +DESCRIPTION="Platform game inspired by games like Manic Miner and Jet Set Willy" +HOMEPAGE="https://dragontech.sourceforge.net/index.php?main=pachi&lang=en" +# Upstream doesn't version their releases. +# (should be downloaded and re-compressed with tar -jcvf) +#SRC_URI="mirror://sourceforge/dragontech/pachi_source.tgz" +SRC_URI="mirror://gentoo/${P}.tar.bz2" +S="${WORKDIR}"/Pachi + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + media-libs/libsdl[joystick,sound,video] + media-libs/sdl-mixer[mod] +" +RDEPEND=" + ${DEPEND} + acct-group/gamestat +" + +PATCHES=( + "${FILESDIR}"/${PV}-autotools.patch +) + +src_prepare() { + default + + rm -f missing || die + mv configure.in configure.ac || die + eautoreconf +} + +src_install() { + default + + newicon Tgfx/icon.bmp ${PN}.bmp + make_desktop_entry ${PN} Pachi /usr/share/pixmaps/${PN}.bmp + + fowners root:gamestat /var/lib/${PN}/data/scores.dat /usr/bin/${PN} + fperms 660 /var/lib/${PN}/data/scores.dat + fperms g+s /usr/bin/${PN} +} diff --git a/games-arcade/pachi/pachi-1.0.ebuild b/games-arcade/pachi/pachi-1.0.ebuild deleted file mode 100644 index f1cc4a2b7bbf..000000000000 --- a/games-arcade/pachi/pachi-1.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils games - -DESCRIPTION="platform game inspired by games like Manic Miner and Jet Set Willy" -HOMEPAGE="http://dragontech.sourceforge.net/index.php?main=pachi&lang=en" -# Upstream doesn't version their releases. -# (should be downloaded and re-compressed with tar -jcvf) -#SRC_URI="mirror://sourceforge/dragontech/pachi_source.tgz" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="media-libs/libsdl[joystick,sound,video] - media-libs/sdl-mixer[mod]" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/Pachi - -src_prepare() { - epatch "${FILESDIR}"/${PV}-autotools.patch - rm -f missing - mv configure.in configure.ac || die - eautoreconf -} - -src_install() { - default - newicon Tgfx/icon.bmp ${PN}.bmp - make_desktop_entry ${PN} Pachi /usr/share/pixmaps/${PN}.bmp - prepgamesdirs -} diff --git a/games-arcade/pacmanarena/files/pacmanarena-0.15-fnocommon.patch b/games-arcade/pacmanarena/files/pacmanarena-0.15-fnocommon.patch new file mode 100644 index 000000000000..103976f4c48e --- /dev/null +++ b/games-arcade/pacmanarena/files/pacmanarena-0.15-fnocommon.patch @@ -0,0 +1,15 @@ +Fix build. https://bugs.gentoo.org/708066#c8 + +diff --git a/include/input.h b/include/input.h +index 08a4aee..491c01d 100644 +--- a/include/input.h ++++ b/include/input.h +@@ -22,8 +22,6 @@ + #ifndef _INPUT_H + #define _INPUT_H + +-char *keyboard_map; +- + void input_reset(void); + void input_update(void); + int input_kstate(int ksym); diff --git a/games-arcade/pacmanarena/metadata.xml b/games-arcade/pacmanarena/metadata.xml index 45f414393de5..f57ce9afd431 100644 --- a/games-arcade/pacmanarena/metadata.xml +++ b/games-arcade/pacmanarena/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/pacmanarena/pacmanarena-0.15-r1.ebuild b/games-arcade/pacmanarena/pacmanarena-0.15-r2.ebuild index e803d7748359..bf60fa2fc4dc 100644 --- a/games-arcade/pacmanarena/pacmanarena-0.15-r1.ebuild +++ b/games-arcade/pacmanarena/pacmanarena-0.15-r2.ebuild @@ -1,32 +1,36 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + inherit autotools desktop DESCRIPTION="3D Pacman clone with a few surprises. Rockets, bombs and explosions abound" -HOMEPAGE="http://pacmanarena.sourceforge.net/" +HOMEPAGE="https://pacmanarena.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/pacman-arena-${PV}.tar.bz2 mirror://sourceforge/${PN}/pacman-data-0.0.zip" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~x86" -IUSE="" +KEYWORDS="~amd64 ~x86" RDEPEND=" - virtual/opengl - virtual/glu media-libs/libsdl[sound] media-libs/sdl-mixer[vorbis] media-libs/sdl-net + virtual/glu + virtual/opengl " -DEPEND="${RDEPEND} - app-arch/unzip -" +DEPEND="${RDEPEND}" +BDEPEND="app-arch/unzip" S="${WORKDIR}/pacman" +PATCHES=( + "${FILESDIR}"/${P}-underlink.patch + "${FILESDIR}"/${P}-fnocommon.patch +) + src_unpack() { unpack pacman-arena-${PV}.tar.bz2 cd "${S}" @@ -41,8 +45,7 @@ src_prepare() { Makefile.in || die sed -i \ -e '/CFLAGS/s:-g::' \ - configure || die - eapply "${FILESDIR}"/${P}-underlink.patch + configure.ac || die eautoreconf } diff --git a/games-arcade/penguin-command/metadata.xml b/games-arcade/penguin-command/metadata.xml index 5b50d1792bff..d0c6552d67c2 100644 --- a/games-arcade/penguin-command/metadata.xml +++ b/games-arcade/penguin-command/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/penguin-command/penguin-command-1.6.11-r1.ebuild b/games-arcade/penguin-command/penguin-command-1.6.11-r1.ebuild index c442fae3b31e..f76c7bbdbc48 100644 --- a/games-arcade/penguin-command/penguin-command-1.6.11-r1.ebuild +++ b/games-arcade/penguin-command/penguin-command-1.6.11-r1.ebuild @@ -1,17 +1,17 @@ -# 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 desktop -DESCRIPTION="A clone of the classic Missile Command game" -HOMEPAGE="http://www.linux-games.com/penguin-command/" +DESCRIPTION="Clone of the classic Missile Command game" +HOMEPAGE="https://www.linux-games.com/penguin-command/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" DEPEND="media-libs/libsdl[sound,joystick,video] media-libs/sdl-mixer[mod] diff --git a/games-arcade/pengupop/files/pengupop-2.2.5-underlink.patch b/games-arcade/pengupop/files/pengupop-2.2.5-underlink.patch deleted file mode 100644 index fbbb704a6a30..000000000000 --- a/games-arcade/pengupop/files/pengupop-2.2.5-underlink.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/Makefile.am.old 2011-06-14 21:44:40.242317771 +0200 -+++ b/Makefile.am 2011-06-14 21:44:49.216882568 +0200 -@@ -17,7 +17,7 @@ - nodist_pengupop_SOURCES = images.h - - if LINUX --pengupop_LDADD = -lSDL -lz -+pengupop_LDADD = -lSDL -lz -lm - - endif - if WIN32 -@@ -25,7 +25,7 @@ - endif - if DARWIN - pengupop_LDFLAGS = -framework Carbon -framework CoreServices -framework AudioUnit -framework QuickTime -framework Cocoa -framework IOKit -framework OpenGL -framework SDL SDLMain.m --pengupop_LDADD = -lz -lstdc++ -+pengupop_LDADD = -lz -lstdc++ -lm - - all-local: Pengupop.dmg - diff --git a/games-arcade/pengupop/metadata.xml b/games-arcade/pengupop/metadata.xml index cd8cab841358..7c730d47817a 100644 --- a/games-arcade/pengupop/metadata.xml +++ b/games-arcade/pengupop/metadata.xml @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> - <upstream> - <remote-id type="freshmeat">pengupop</remote-id> - </upstream> </pkgmetadata> diff --git a/games-arcade/pengupop/pengupop-2.2.5-r1.ebuild b/games-arcade/pengupop/pengupop-2.2.5-r1.ebuild index 6938c534c5c9..c10d3f82d4a8 100644 --- a/games-arcade/pengupop/pengupop-2.2.5-r1.ebuild +++ b/games-arcade/pengupop/pengupop-2.2.5-r1.ebuild @@ -1,55 +1,30 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit autotools desktop gnome2-utils +EAPI=8 -DESCRIPTION="Networked multiplayer-only Puzzle Bubble clone" +inherit desktop + +DESCRIPTION="Networked Puzzle Bubble clone" HOMEPAGE="http://freshmeat.net/projects/pengupop" SRC_URI="mirror://gentoo/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="media-libs/libsdl[sound,video] - sys-libs/zlib" -RDEPEND="${DEPEND}" - -src_prepare() { - default - - eapply "${FILESDIR}"/${P}-underlink.patch - - sed -i \ - -e '/Icon/s/\.png//' \ - -e '/^Encoding/d' \ - -e '/Categories/s/Application;//' \ - pengupop.desktop || die - sed -i \ - -e 's/-g -Wall -O2/-Wall/' \ - Makefile.am || die +RDEPEND=" + media-libs/libsdl[sound,video] + sys-libs/zlib:=" +DEPEND="${RDEPEND}" - mv configure.in configure.ac || die - eautoreconf +src_compile() { + emake LIBS=-lm #497196 } src_install() { default - domenu pengupop.desktop - doicon -s 48 pengupop.png -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} -pkg_postrm() { - gnome2_icon_cache_update + doicon pengupop.png + make_desktop_entry ${PN} Pengupop } diff --git a/games-arcade/performous/Manifest b/games-arcade/performous/Manifest index 2fef1e5036b7..63c87da2cfed 100644 --- a/games-arcade/performous/Manifest +++ b/games-arcade/performous/Manifest @@ -1,4 +1,5 @@ -DIST performous-1.1.tar.gz 3965473 BLAKE2B 021660aa785d0535396a75e8c4cc5cc368ba5745b67fae527e7901ef6601d95887206aae7f74b52bf6b3da3e827bfbd3094e8a393917b9936af266b54766b0b2 SHA512 6659aa03960e68d7af65b072e179e42b122d2a39d25229c6daf765146379a115a52e51c1dc2bc69081ea17fe7a22f1d7007b7cf9e09bc32d134c3ad8e3444dd1 +DIST performous-1.2.0.tar.gz 7240476 BLAKE2B c5c27fc02fe0a17261ad6549492ccc88c7ad213df08f6ec68d86bad9116a2f83eae8ab4b85fc19f63d260b28864fad84c19d55befa81dde7aabedb1c50fef89f SHA512 a8fbbe3768f46915eacb65adcc1592295e4c6a84775ca55def01ebcff2218b1860daee0d4d5fcccc407d8df71da1ac25da667b47dd4a17239041a3d5fbfa1c56 +DIST performous-ced-9ca1351fe0b1e85992a407b0fc54a63e9b3adc6e.tar.gz 221300 BLAKE2B 1aa7027c8543725c812e6a066a2a707fa19a79ae2f36c49bc8eaf0d3d6549ae11b365a76b47c1fc851a3c0d1bbafc3ff739fa32c1599a1f1853033de78b27d0c SHA512 6721ae5936a58b8298d175f3875675bfb8249208642eaf2766dc6a62c7db96454d4f95d8c39de0ca862aa3edc741de535af69242f0d2d0b8f7527408ab673089 DIST ultrastar-songs-jc-1.zip 242698201 BLAKE2B 39c37160c1ce305252c7b94910aae4ed930d6762716b985f35d64b502bcb8c0310ff830384a652bb1b8a72dea5dd08eebbfd89ae047861bd88e2fc983a863d84 SHA512 2f1b8416990c39617269cd6bb7271abdd4ebae65a9bac3dbb3f37cca26876bb7c79460a37597943a10a2d8bfcb5d2d9e2bf24084fe517a418e69f5c6111f6aea DIST ultrastar-songs-libre-3.zip 5289866 BLAKE2B 2c3fc640ad808b12987e9b50510df644ab8dd1ae41a4b9e5056950c7aa1823678a4b568a60a260b93a4bdf06f199fac1b99bd22e4e39301bf34f337c08d68b69 SHA512 820e3637a7b778c92ed1a8b925802134fa2146879b3e03e88cd412de5414635c90fe256dfaf984cfa3e8b07b7da8531dc3061b7c4e1bb4422127b469b2345e66 DIST ultrastar-songs-restricted-3.zip 10242651 BLAKE2B de923f72bdd3081f2870457fd734ae2f8c11a84a74344af165aa5c6cf7b812c98fd53b3ab18ac9ac51f488fbf3fe274289205724c9f8547a31245536bea3c6b1 SHA512 70b987fec3705d6610625c1f30a7ff683a51bb6b7ee3174609c80dc31c1bccdb23dcb2c6ae8154e1b1d9ef115b914e27e73925878a3c5460b997fdde813456b8 diff --git a/games-arcade/performous/files/performous-1.1-boost-1.70.patch b/games-arcade/performous/files/performous-1.1-boost-1.70.patch deleted file mode 100644 index d868e1279659..000000000000 --- a/games-arcade/performous/files/performous-1.1-boost-1.70.patch +++ /dev/null @@ -1,52 +0,0 @@ -https://bugs.gentoo.org/671594 - ---- a/game/audio.cc -+++ b/game/audio.cc -@@ -77,7 +77,7 @@ - static ptime getTime() { return microsec_clock::universal_time(); } - // Conversion helpers - static double getSeconds(time_duration t) { return 1e-6 * t.total_microseconds(); } -- static time_duration getDuration(double seconds) { return microseconds(1e6 * seconds); } -+ static time_duration getDuration(double seconds) { return microseconds(static_cast<long long>(1e6 * seconds)); } - - mutable boost::mutex m_mutex; - ptime m_baseTime; ///< A reference time (corresponds to m_basePos) -@@ -149,7 +149,7 @@ - int64_t m_pos; ///< Current sample position - bool m_preview; - AudioClock m_clock; -- time_duration durationOf(int64_t samples) const { return microseconds(1e6 * samples / srate / 2.0); } -+ time_duration durationOf(int64_t samples) const { return microseconds(static_cast<long long>(1e6 * samples / srate / 2.0)); } - public: - bool suppressCenterChannel; - double fadeLevel; ---- a/game/backgrounds.hh -+++ b/game/backgrounds.hh -@@ -7,6 +7,7 @@ - #include <boost/scoped_ptr.hpp> - #include <boost/thread/mutex.hpp> - #include <boost/thread/thread.hpp> -+#include <boost/noncopyable.hpp> - #include <vector> - - /// songs class for songs screen ---- a/game/songs.hh -+++ b/game/songs.hh -@@ -6,6 +6,7 @@ - #include <boost/scoped_ptr.hpp> - #include <boost/thread/mutex.hpp> - #include <boost/thread/thread.hpp> -+#include <boost/noncopyable.hpp> - #include <set> - #include <sstream> - #include <vector> ---- a/game/svg.cc -+++ b/game/svg.cc -@@ -4,6 +4,7 @@ - #include "configuration.hh" - #include "../common/image.hh" - -+#include <boost/smart_ptr/shared_ptr.hpp> - #include <librsvg/rsvg.h> - #include <iostream> - diff --git a/games-arcade/performous/files/performous-1.1-gentoo.patch b/games-arcade/performous/files/performous-1.1-gentoo.patch deleted file mode 100644 index a73663a88c41..000000000000 --- a/games-arcade/performous/files/performous-1.1-gentoo.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru performous-1.0.orig/game/CMakeLists.txt performous-1.0/game/CMakeLists.txt ---- performous-1.0.orig/game/CMakeLists.txt 2014-10-28 19:11:45.000000000 -0400 -+++ performous-1.0/game/CMakeLists.txt 2015-03-31 03:01:30.806061643 -0400 -@@ -141,7 +141,7 @@ - set(BIN_INSTALL .) # Straight to Program Files/Performous with no bin subfolder. - set(SUBSYSTEM_WIN32 WIN32) - else() -- set(BIN_INSTALL bin) -+ set(BIN_INSTALL @GENTOO_BINDIR@) - endif() - - # Build main executable diff --git a/games-arcade/performous/files/performous-1.1-jpeg-9c.patch b/games-arcade/performous/files/performous-1.1-jpeg-9c.patch deleted file mode 100644 index d878cec07f51..000000000000 --- a/games-arcade/performous/files/performous-1.1-jpeg-9c.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/common/image.cc -+++ b/common/image.cc -@@ -180,7 +180,7 @@ - } - jpeg_create_decompress(&cinfo); - jpeg_mem_src(&cinfo, data.data(), data.size()); -- if (jpeg_read_header(&cinfo, true) != JPEG_HEADER_OK) throw std::runtime_error("Cannot read header of " + filename.string()); -+ if (jpeg_read_header(&cinfo, TRUE) != JPEG_HEADER_OK) throw std::runtime_error("Cannot read header of " + filename.string()); - jpeg_start_decompress(&cinfo); - bitmap.resize(cinfo.output_width, cinfo.output_height); - unsigned stride = (bitmap.width * 3 + 3) & ~3; // Number of bytes per row (word-aligned) diff --git a/games-arcade/performous/files/performous-1.1-linguas.patch b/games-arcade/performous/files/performous-1.1-linguas.patch deleted file mode 100644 index f8f1349ea3b9..000000000000 --- a/games-arcade/performous/files/performous-1.1-linguas.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -ru performous-1.0.orig/lang/CMakeLists.txt performous-1.0/lang/CMakeLists.txt ---- performous-1.0.orig/lang/CMakeLists.txt 2014-10-28 19:11:45.000000000 -0400 -+++ performous-1.0/lang/CMakeLists.txt 2015-02-22 04:25:40.502252942 -0500 -@@ -9,5 +9,13 @@ - file(MAKE_DIRECTORY "${mobuild}") - add_custom_command(OUTPUT "${mofile}" COMMAND "${Msgfmt_BIN}" -v "${pofile}" -o "${mofile}" MAIN_DEPENDENCY "${pofile}" COMMENT "Building ${language} locale" VERBATIM) - add_custom_target("locale_${language}" ALL DEPENDS "${mofile}") # Make sure the mofiles are always built -- install(FILES "${mofile}" DESTINATION "${LOCALE_DIR}/${language}/LC_MESSAGES") - endforeach(language) -+foreach(language $ENV{LINGUAS}) -+ set(pofile ${CMAKE_CURRENT_SOURCE_DIR}/${language}.po) -+ if (EXISTS ${pofile}) -+ set(mofile ${CMAKE_CURRENT_BINARY_DIR}/${language}.mo) -+ install(FILES ${mofile} DESTINATION -+{LOCALE_DIR}/${language}/LC_MESSAGES RENAME ${CMAKE_PROJECT_NAME}.mo) -+ endif() -+endforeach(language) -+ diff --git a/games-arcade/performous/files/performous-1.1-nomancompress.patch b/games-arcade/performous/files/performous-1.1-nomancompress.patch deleted file mode 100644 index fd21f9b70343..000000000000 --- a/games-arcade/performous/files/performous-1.1-nomancompress.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- a/docs/man/CMakeLists.txt 2018-10-14 19:57:14.924572577 +0200 -+++ b/docs/man/CMakeLists.txt 2018-10-14 20:11:13.250717230 +0200 -@@ -1,14 +1,12 @@ - find_program(HELP2MAN help2man DOC "Location of the help2man program") --find_program(GZIP gzip DOC "Location of the gzip program") - mark_as_advanced(HELP2MAN) --mark_as_advanced(GZIP) --if(HELP2MAN AND GZIP) -- set(MANFILE ${CMAKE_CURRENT_BINARY_DIR}/performous.6.gz) -+if(HELP2MAN) -+ set(MANFILE ${CMAKE_CURRENT_BINARY_DIR}/performous.6) - set(H2MFILE ${CMAKE_CURRENT_SOURCE_DIR}/performous.h2m) - set(PERFORMOUS_EXEC ${CMAKE_BINARY_DIR}/performous) - add_custom_command( - OUTPUT ${MANFILE} -- COMMAND ${HELP2MAN} ${PERFORMOUS_EXEC} -s 6 -i ${H2MFILE} -N | ${GZIP} > ${MANFILE} -+ COMMAND ${HELP2MAN} ${PERFORMOUS_EXEC} -s 6 -i ${H2MFILE} -N > ${MANFILE} - MAIN_DEPENDENCY ${H2MFILE} - DEPENDS ${PERFORMOUS_EXEC} - COMMENT "Building Performous man page" -@@ -17,13 +15,13 @@ - add_custom_target(manpage ALL DEPENDS ${MANFILE}) - iF (APPLE) - install(FILES ${MANFILE} DESTINATION Resources/man/man6) -- else(APPLE) -+ else() - install(FILES ${MANFILE} DESTINATION share/man/man6) - endif() --else(HELP2MAN AND GZIP) -- message("WARNING: One of the following is missing: help2man, gzip; performous man page will not be generated") --endif(HELP2MAN AND GZIP) --if(ENABLE_TOOLS AND GZIP) -+else() -+ message("WARNING: help2man is missing; performous man page will not be generated") -+endif() -+if(ENABLE_TOOLS) - set(TOOLS - "ss_pak_extract" "ss_extract" "ss_cover_conv" - "ss_adpcm_decode" "ss_ipu_conv" "ss_chc_decode" -@@ -31,15 +29,7 @@ - set(MAN_SECTION "1") - foreach(TOOL ${TOOLS}) - set(TOOL_MANFILE ${CMAKE_CURRENT_SOURCE_DIR}/${TOOL}.${MAN_SECTION}) -- set(TOOL_MANFILE_GZ ${CMAKE_CURRENT_BINARY_DIR}/${TOOL}.${MAN_SECTION}.gz) -- add_custom_command( -- OUTPUT ${TOOL_MANFILE_GZ} -- COMMAND ${GZIP} -c ${TOOL_MANFILE} > ${TOOL_MANFILE_GZ} -- MAIN_DEPENDENCY ${TOOL_MANFILE} -- COMMENT "Building ${TOOL} man page" -- VERBATIM -- ) -- add_custom_target(${TOOL}.${MAN_SECTION} ALL DEPENDS ${TOOL_MANFILE_GZ}) -- install(FILES ${TOOL_MANFILE_GZ} DESTINATION share/man/man${MAN_SECTION}) -- endforeach(TOOL) --endif(ENABLE_TOOLS AND GZIP) -+ add_custom_target(${TOOL}.${MAN_SECTION} ALL DEPENDS ${TOOL_MANFILE}) -+ install(FILES ${TOOL_MANFILE} DESTINATION share/man/man${MAN_SECTION}) -+ endforeach() -+endif() diff --git a/games-arcade/performous/files/performous-1.2.0-ffmpeg5.patch b/games-arcade/performous/files/performous-1.2.0-ffmpeg5.patch new file mode 100644 index 000000000000..63f573d53ffe --- /dev/null +++ b/games-arcade/performous/files/performous-1.2.0-ffmpeg5.patch @@ -0,0 +1,25 @@ +https://bugs.gentoo.org/834371 +https://github.com/performous/performous/commit/c3c0d2b7172 +From: S辿bastien Gonzalve <sebastien.gonzalve@aliceadsl.fr> +Date: Tue, 3 May 2022 20:26:25 +0200 +Subject: [PATCH] Fix ffmpeg compilation on FC36 + +The new version stats: + +2021-04-27 - 46dac8cf3d - lavf 59.0.100 - avformat.h + av_find_best_stream now uses a const AVCodec ** parameter + for the returned decoder. + +So performous needs a patch to add const when needed. +--- a/game/ffmpeg.cc ++++ b/game/ffmpeg.cc +@@ -251,6 +251,9 @@ FFmpeg::FFmpeg(fs::path const& _filename, int mediaType) : m_filename(_filename) + if (err < 0) throw Error(*this, err); + m_formatContext->flags |= AVFMT_FLAG_GENPTS; + // Find a track and open the codec ++#if (LIBAVFORMAT_VERSION_INT) >= (AV_VERSION_INT(59, 0, 100)) ++ const ++#endif + AVCodec* codec = nullptr; + m_streamId = av_find_best_stream(m_formatContext.get(), static_cast<AVMediaType>(mediaType), -1, -1, &codec, 0); + if (m_streamId < 0) throw Error(*this, m_streamId); diff --git a/games-arcade/performous/metadata.xml b/games-arcade/performous/metadata.xml index 2ee1cd7690b5..b6be9a656e3d 100644 --- a/games-arcade/performous/metadata.xml +++ b/games-arcade/performous/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> @@ -11,7 +11,6 @@ <use> <flag name="midi">Enable MIDI I/O support</flag> <flag name="songs">Install a few demo songs</flag> - <flag name="tools">Enable building of song extraction utilities for SingStar and Guitar Hero</flag> <flag name="webcam">Enable Webcam support</flag> </use> <upstream> diff --git a/games-arcade/performous/performous-1.1-r2.ebuild b/games-arcade/performous/performous-1.1-r2.ebuild deleted file mode 100644 index 5e1eeb5741dd..000000000000 --- a/games-arcade/performous/performous-1.1-r2.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -CMAKE_REMOVE_MODULES="yes" -CMAKE_REMOVE_MODULES_LIST="FindALSA FindBoost FindFreetype FindGettext FindJpeg FindPng FindTiff FindZ" -inherit cmake-utils desktop gnome2-utils - -MY_PN="Performous" -MY_P="${MY_PN}-${PV}" -SONGS_PN="ultrastar-songs" - -DESCRIPTION="SingStar GPL clone" -HOMEPAGE="https://performous.org/" -SRC_URI="https://github.com/performous/performous/archive/${PV}.tar.gz -> ${P}.tar.gz - songs? ( - mirror://sourceforge/performous/${SONGS_PN}-restricted-3.zip - mirror://sourceforge/performous/${SONGS_PN}-jc-1.zip - mirror://sourceforge/performous/${SONGS_PN}-libre-3.zip - mirror://sourceforge/performous/${SONGS_PN}-shearer-1.zip - ) -" - -LICENSE="GPL-2 songs? ( CC-BY-NC-SA-2.5 CC-BY-NC-ND-2.5 ) -" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="midi songs tools webcam" - -RDEPEND=" - dev-cpp/glibmm:2 - dev-cpp/libxmlpp:2.6 - dev-libs/boost[threads(+)] - dev-libs/glib:2 - dev-libs/libxml2:2 - gnome-base/librsvg:2 - media-gfx/imagemagick:0= - media-libs/libepoxy - media-libs/libpng:0= - media-libs/libsdl2[joystick,video] - media-libs/portaudio - sys-libs/zlib - media-video/ffmpeg - virtual/glu - virtual/jpeg:0 - virtual/libintl - virtual/opengl - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/pango - midi? ( media-libs/portmidi ) - webcam? ( media-libs/opencv ) -" -DEPEND="${RDEPEND} - sys-apps/help2man - sys-devel/gettext - songs? ( app-arch/unzip ) -" - -DOCS=( docs/{Authors,instruments}.txt ) - -PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch - "${FILESDIR}"/${P}-linguas.patch - "${FILESDIR}"/${P}-nomancompress.patch - "${FILESDIR}"/${P}-jpeg-9c.patch - "${FILESDIR}"/${P}-boost-1.70.patch -) - -src_prepare() { - cmake-utils_src_prepare - - sed -i \ - -e "s:@GENTOO_BINDIR@:/usr/bin:" \ - -e '/ Z /s/ Z/ ZLIB/g' \ - -e 's/Z_FOUND/ZLIB_FOUND/g' \ - -e 's/Z_LIBRARIES/ZLIB_LIBRARIES/g' \ - -e 's/Jpeg/JPEG/' \ - -e 's/Png/PNG/' \ - {game,tools}/CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DENABLE_TOOLS=$(usex tools) - -DENABLE_WEBCAM=$(usex webcam) - -DENABLE_MIDI=$(usex midi) - -DCMAKE_VERBOSE_MAKEFILE=TRUE - -DSHARE_INSTALL="/usr/share/${PN}" - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - if use songs ; then - insinto "/usr/share/${PN}" - doins -r "${WORKDIR}/songs" - fi - - newicon -s scalable data/themes/default/icon.svg ${PN}.svg -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-arcade/performous/performous-1.2.0.ebuild b/games-arcade/performous/performous-1.2.0.ebuild new file mode 100644 index 000000000000..67c54ea34069 --- /dev/null +++ b/games-arcade/performous/performous-1.2.0.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +# CED is only used in 1.2.0 and can be dropped on bump, no LICENSE +# changes needed given Apache-2.0 is also used by installed fonts +HASH_CED=9ca1351fe0b1e85992a407b0fc54a63e9b3adc6e + +DESCRIPTION="SingStar GPL clone" +HOMEPAGE="https://performous.org/" +SRC_URI=" + https://github.com/performous/performous/archive/refs/tags/${PV}.tar.gz + -> ${P}.tar.gz + https://github.com/performous/compact_enc_det/archive/${HASH_CED}.tar.gz + -> ${PN}-ced-${HASH_CED}.tar.gz + songs? ( + mirror://sourceforge/performous/ultrastar-songs-jc-1.zip + mirror://sourceforge/performous/ultrastar-songs-libre-3.zip + mirror://sourceforge/performous/ultrastar-songs-restricted-3.zip + mirror://sourceforge/performous/ultrastar-songs-shearer-1.zip + )" + +LICENSE=" + GPL-2 + Apache-2.0 OFL-1.1 + songs? ( CC-BY-NC-SA-2.5 CC-BY-NC-ND-2.5 )" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="midi songs webcam" + +RDEPEND=" + dev-cpp/libxmlpp:5.0 + dev-libs/boost:=[nls] + dev-libs/glib:2 + dev-libs/icu:= + gnome-base/librsvg:2 + media-libs/aubio:=[fftw] + media-libs/fontconfig:1.0 + media-libs/glm + media-libs/libepoxy + media-libs/libjpeg-turbo:= + media-libs/libpng:= + media-libs/libsdl2[joystick,opengl,video] + media-libs/portaudio + media-video/ffmpeg:= + virtual/libintl + x11-libs/cairo + x11-libs/pango + midi? ( media-libs/portmidi ) + webcam? ( media-libs/opencv:= )" +DEPEND="${RDEPEND}" +BDEPEND=" + sys-apps/help2man + sys-devel/gettext + songs? ( app-arch/unzip )" + +PATCHES=( + "${FILESDIR}"/${P}-ffmpeg5.patch +) + +src_prepare() { + cmake_src_prepare + + if [[ -v LINGUAS ]]; then + local po + for po in lang/*.po; do + : "${po#*/}" + has "${_%.*}" ${LINGUAS} || rm "${po}" || die + done + fi + + # glibmm is only needed if libxmlpp:2.6, but :5.0 is used if available + sed -i '/Glibmm/d' cmake/Modules/FindLibXML++.cmake || die +} + +src_configure() { + local mycmakeargs=( + -DENABLE_MIDI=$(usex midi) + -DENABLE_WEBCAM=$(usex webcam) + -DFETCHCONTENT_SOURCE_DIR_CED-SOURCES="${WORKDIR}"/compact_enc_det-${HASH_CED} + -DSHARE_INSTALL="${EPREFIX}"/usr/share/${PN} + + # webserver needs unpackaged cpprestsdk which is not recommended for + # use by its upstream (dead), may consider adding only if requested + -DENABLE_WEBSERVER=no + ) + + cmake_src_configure +} + +src_install() { + local DOCS=( README.md docs/{Authors,instruments}.txt ) + cmake_src_install + + insinto /usr/share/${PN} + use songs && doins -r "${WORKDIR}"/songs + + gzip -d "${ED}"/usr/share/man/man6/${PN}.6.gz || die +} diff --git a/games-arcade/primateplunge/files/primateplunge-1.1-fno-common.patch b/games-arcade/primateplunge/files/primateplunge-1.1-fno-common.patch new file mode 100644 index 000000000000..7905b0372e72 --- /dev/null +++ b/games-arcade/primateplunge/files/primateplunge-1.1-fno-common.patch @@ -0,0 +1,11 @@ +--- a/src/game.h ++++ b/src/game.h +@@ -125,7 +125,7 @@ + + + /* Glabals in main.c */ +-SDL_Surface *mainScreen; ++extern SDL_Surface *mainScreen; + + /* Globals in game.c */ + extern world* currentWorld; diff --git a/games-arcade/primateplunge/metadata.xml b/games-arcade/primateplunge/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/primateplunge/metadata.xml +++ b/games-arcade/primateplunge/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/primateplunge/primateplunge-1.1-r2.ebuild b/games-arcade/primateplunge/primateplunge-1.1-r2.ebuild index 4023588bfee4..b14ba0d459b0 100644 --- a/games-arcade/primateplunge/primateplunge-1.1-r2.ebuild +++ b/games-arcade/primateplunge/primateplunge-1.1-r2.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + inherit autotools desktop DESCRIPTION="Help poor Monkey navigate his way down through treacherous areas" @@ -11,22 +12,27 @@ SRC_URI="https://www.aelius.com/${PN}/${P}.tar.gz" LICENSE="Primate-Plunge" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RESTRICT="mirror bindist" #465850 -DEPEND="media-libs/libsdl[sound,video] +DEPEND=" + media-libs/libsdl[sound,video] media-libs/sdl-mixer" RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}"/${P}-AC_SUBST.patch + "${FILESDIR}"/${P}-fno-common.patch +) + src_prepare() { default - eapply "${FILESDIR}"/${P}-AC_SUBST.patch eautoreconf } src_install() { default dodoc TIPS - newicon graphics/idle.bmp ${PN}.bmp - make_desktop_entry ${PN} "Primate Plunge" /usr/share/pixmaps/${PN}.bmp + + newicon graphics/idle.bmp primateplunge.bmp + make_desktop_entry primateplunge "Primate Plunge" /usr/share/pixmaps/primateplunge.bmp } diff --git a/games-arcade/retrobattle/metadata.xml b/games-arcade/retrobattle/metadata.xml index 26079e608bed..7c730d47817a 100644 --- a/games-arcade/retrobattle/metadata.xml +++ b/games-arcade/retrobattle/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/retrobattle/retrobattle-1.0.0-r1.ebuild b/games-arcade/retrobattle/retrobattle-1.0.0-r1.ebuild index e283c6299a0f..7bbb9fa2dc2b 100644 --- a/games-arcade/retrobattle/retrobattle-1.0.0-r1.ebuild +++ b/games-arcade/retrobattle/retrobattle-1.0.0-r1.ebuild @@ -1,29 +1,32 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit desktop eutils +inherit desktop wrapper MY_P="${PN}-src-${PV}" DESCRIPTION="A NES-like platform arcade game" HOMEPAGE="http://remar.se/andreas/retrobattle/" SRC_URI="http://remar.se/andreas/retrobattle/files/${MY_P}.tar.bz2" +S="${WORKDIR}/${MY_P}/src" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" + # test is incomplete RESTRICT="test" -DEPEND="media-libs/libsdl[X,sound,video] - media-libs/sdl-mixer[wav]" +DEPEND=" + media-libs/libsdl[X,sound,video] + media-libs/sdl-mixer[wav] +" RDEPEND="${DEPEND}" -S="${WORKDIR}/${MY_P}/src" - -PATCHES=( "${FILESDIR}"/${P}-{build,sound,gcc6}.patch ) +PATCHES=( + "${FILESDIR}"/${P}-{build,sound,gcc6}.patch +) src_install() { insinto /usr/share/${PN} diff --git a/games-arcade/ri-li/files/ri-li-2.0.1-gcc11.patch b/games-arcade/ri-li/files/ri-li-2.0.1-gcc11.patch new file mode 100644 index 000000000000..e465978789e1 --- /dev/null +++ b/games-arcade/ri-li/files/ri-li-2.0.1-gcc11.patch @@ -0,0 +1,47 @@ +https://bugs.gentoo.org/811501 +https://sourceforge.net/p/ri-li/bugs/2/ + +From 317a80608a061a0acdf196a6c148bfe63b1eaad5 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyich@gmail.com> +Date: Thu, 21 Apr 2022 07:52:46 +0100 +Subject: [PATCH] Fix build on gcc-11 + +Without the change build fails on ordered comparison on pointers: + +tableau.cc:90:9: error: ordered comparison of pointer with integer zero ('unsigned char*' and 'int') + 90 | if(Buf<=0) return false; + | ~~~^~~ +--- a/src/sprite.cc ++++ b/src/sprite.cc +@@ -351,7 +351,7 @@ bool Sprite::Load(unsigned char *Buf,long &P) + // Fabrique la surface + Image[i]=SDL_CreateRGBSurface((Dim[i].bpp-3)*SDL_SRCALPHA,Dim[i].L,Dim[i].H,Dim[i].bpp*8, + 0xff,0xff00,0xff0000,0xff000000*(Dim[i].bpp-3)); +- if(Image[i]<=NULL) { ++ if(Image[i]==NULL) { + std::cerr <<"Impossible de crer une Surface SDL!"<<std::endl; + return false; + } +@@ -485,7 +485,7 @@ bool Sprite::Nouveau(int Lx,int Ly) + // Fabrique la surface + Image[0]=SDL_CreateRGBSurface((Dim[0].bpp-3)*SDL_SRCALPHA,Dim[0].L,Dim[0].H,Dim[0].bpp*8, + 0xff,0xff00,0xff0000,0xff000000*(Dim[0].bpp-3)); +- if(Image[0]<=NULL) { ++ if(Image[0]==NULL) { + std::cerr <<"Impossible de crer une Surface SDL!"<<std::endl; + return false; + } +--- a/src/tableau.cc ++++ b/src/tableau.cc +@@ -87,7 +87,7 @@ bool Tableau::Save(void) + + // Alloue la mmoire + Buf=new unsigned char [sizeof(s_Tableau)*N+sizeof(int)+1]; +- if(Buf<=0) return false; ++ if(Buf==NULL) return false; + + // Charge les tableaux + Buf[0]=N/256; +-- +2.35.1 + diff --git a/games-arcade/ri-li/metadata.xml b/games-arcade/ri-li/metadata.xml index 4e3107e82d1b..aa76f93cb015 100644 --- a/games-arcade/ri-li/metadata.xml +++ b/games-arcade/ri-li/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/ri-li/ri-li-2.0.1-r1.ebuild b/games-arcade/ri-li/ri-li-2.0.1-r2.ebuild index 9fc7f0cd4a6a..10ddfd65cb9a 100644 --- a/games-arcade/ri-li/ri-li-2.0.1-r1.ebuild +++ b/games-arcade/ri-li/ri-li-2.0.1-r2.ebuild @@ -1,35 +1,43 @@ -# 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 autotools desktop DESCRIPTION="Drive a toy wood engine and collect all the coaches" -HOMEPAGE="http://ri-li.sourceforge.net/" +HOMEPAGE="https://ri-li.sourceforge.net/" SRC_URI="mirror://sourceforge/ri-li/Ri-li-${PV}.tar.bz2" +S="${WORKDIR}/Ri-li-${PV}" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -DEPEND="media-libs/libsdl[sound,video] - media-libs/sdl-mixer[mod]" +DEPEND=" + media-libs/libsdl[sound,video] + media-libs/sdl-mixer[mod] +" RDEPEND="${DEPEND}" -S="${WORKDIR}/Ri-li-${PV}" +PATCHES=( + "${FILESDIR}"/${PN}-2.0.1-gcc43.patch + "${FILESDIR}"/${PN}-2.0.1-gcc11.patch +) src_prepare() { default - eapply "${FILESDIR}"/${P}-gcc43.patch - mv configure.{in,ac} - rm aclocal.m4 + + mv configure.{in,ac} || die + rm aclocal.m4 || die eautoreconf } src_install() { default - rm -f "${ED}/usr/share/Ri-li/"*ebuild + + rm -f "${ED}/usr/share/Ri-li/"*ebuild || die + newicon data/Ri-li-icon-48x48.png ${PN}.png make_desktop_entry Ri_li Ri-li } diff --git a/games-arcade/rockdodger/Manifest b/games-arcade/rockdodger/Manifest index 24cdb923e2c6..6cdc22adfe81 100644 --- a/games-arcade/rockdodger/Manifest +++ b/games-arcade/rockdodger/Manifest @@ -1 +1 @@ -DIST rockdodger-0.6.0a.tar.gz 410223 BLAKE2B 5ccda4400468d6a7209adfdad3045773bf31581e34dfb77bff7d314ca9d9fa18e6c5a24996259782c002cf8ea611f92388c9ca46be4e0c7492a526421e8e8163 SHA512 d517cc844df21e8772b13d0226841a64bede0cc2f5461fb83d313f49cd99192dcf6af4597e3d1f3e1c60f578437e355ce665e0288415da803a503fb12d8462eb +DIST rockdodger-1.1.4.tar.gz 1026184 BLAKE2B 08885155508adb878908d3cf9201c98cffded37dea051cb9a668ddb63891a19369648964f3f19d94b72a08626d3d1dea73686b190898d8b59c3b91805e08677c SHA512 542a8b5b1a9dc7fc8e61d3183c14c3f45952614f2e00f71383dfd42ddcf275cbc14520797d4555f2f19f354a4f1819d8527a587598c9dbc06a75b21643a8b019 diff --git a/games-arcade/rockdodger/files/0.6.0a-sec.patch b/games-arcade/rockdodger/files/0.6.0a-sec.patch deleted file mode 100644 index e870cf2d2974..000000000000 --- a/games-arcade/rockdodger/files/0.6.0a-sec.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- main.c.old 2002-11-17 23:56:12.000000000 +0100 -+++ main.c 2004-10-29 22:32:00.000000000 +0200 -@@ -459,7 +459,7 @@ FILE *hs_fopen(char *mode) {/*{{{*/ - else { - char s[1024]; - umask(0177); -- sprintf(s,"%s/.rockdodger_high",getenv("HOME")); -+ snprintf(s,1024,"%s/.rockdodger_high",getenv("HOME")); - if (f=fopen(s,mode)) { - umask(mask); - return f; -@@ -478,7 +478,7 @@ void read_high_score_table() {/*{{{*/ - for (i=0; i<8; i++) { - char s[1024]; - int highscore; -- if (fscanf (f, "%d %[^\n]", &highscore, s)!=2) -+ if (fscanf (f, "%d %1023[^\n]", &highscore, s)!=2) - break; - if (high[i].allocated) - free(high[i].name); diff --git a/games-arcade/rockdodger/files/rockdodger-0.6.0a-gcc41.patch b/games-arcade/rockdodger/files/rockdodger-0.6.0a-gcc41.patch deleted file mode 100644 index 59e01bba17c3..000000000000 --- a/games-arcade/rockdodger/files/rockdodger-0.6.0a-gcc41.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- main.c.old 2006-04-24 16:16:13.000000000 +0200 -+++ main.c 2006-04-24 16:16:21.000000000 +0200 -@@ -206,7 +206,6 @@ - struct bangdots bdot[MAX_BANG_DOTS], *bdotptr=bdot; - struct spacedot sdot[MAX_SPACE_DOTS]; - --struct greeble greeb[MAX_GREEBLES]; - struct greeble { - int active; - float x,y; // When landed, these represent an offset from the host rock -@@ -214,6 +213,7 @@ - int landed; - int boredom; // Goes up while landed - }; -+struct greeble greeb[MAX_GREEBLES]; - // }}} - - void init_greeblies() { diff --git a/games-arcade/rockdodger/files/rockdodger-0.6.0a-underlink.patch b/games-arcade/rockdodger/files/rockdodger-0.6.0a-underlink.patch deleted file mode 100644 index 87cd8453476c..000000000000 --- a/games-arcade/rockdodger/files/rockdodger-0.6.0a-underlink.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.old 2011-06-20 21:25:56.788323912 +0200 -+++ Makefile 2011-06-20 21:26:11.970287694 +0200 -@@ -27,7 +27,7 @@ - #SOUNDLIBRARIES= - SOUNDLIBRARIES=-lSDL_mixer - --LIBRARIES=`sdl-config --libs` -lSDL_image $(SOUNDLIBRARIES) -+LIBRARIES=`sdl-config --libs` -lSDL_image $(SOUNDLIBRARIES) -lm - - all: $(EXENAME) - diff --git a/games-arcade/rockdodger/metadata.xml b/games-arcade/rockdodger/metadata.xml index 2bf107eefc84..1748f81ebd9f 100644 --- a/games-arcade/rockdodger/metadata.xml +++ b/games-arcade/rockdodger/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/rockdodger/rockdodger-0.6.0a-r1.ebuild b/games-arcade/rockdodger/rockdodger-0.6.0a-r1.ebuild deleted file mode 100644 index 5e0cd21a6857..000000000000 --- a/games-arcade/rockdodger/rockdodger-0.6.0a-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils games - -DESCRIPTION="Dodge the rocks for as long as possible until you die" -HOMEPAGE="http://spacerocks.sourceforge.net/" -SRC_URI="mirror://sourceforge/spacerocks/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="media-libs/libsdl[sound,video] - media-libs/sdl-image[png] - media-libs/sdl-mixer" -RDEPEND="${DEPEND}" - -src_prepare() { - # Modify highscores & data directory and add our CFLAGS to the Makefile - sed -i \ - -e "s:\./data:${GAMES_DATADIR}/${PN}:" \ - -e "s:/usr/share/rockdodger/\.highscore:${GAMES_STATEDIR}/rockdodger.scores:" \ - -e 's:umask(0111):umask(0117):' main.c \ - || die " sed main.c failed" - sed -i \ - -e "s:-g:${CFLAGS}:" \ - -e 's:cc:$(CC):' \ - -e '/-o/s:\$+:$(LDFLAGS) $+:' \ - Makefile \ - || die "sed Makefile failed" - - # The 512 chunksize makes the music skip - sed -i \ - -e "s:512:1024:" sound.c \ - || die "sed sound.c failed" - epatch \ - "${FILESDIR}"/${PV}-sec.patch \ - "${FILESDIR}"/${P}-gcc41.patch \ - "${FILESDIR}"/${P}-underlink.patch -} - -src_install() { - dogamesbin ${PN} - insinto "${GAMES_DATADIR}"/${PN} - doins data/* - - newicon spacerocks.xpm ${PN}.xpm - make_desktop_entry ${PN} "Rock Dodger" ${PN} - - dodir "${GAMES_STATEDIR}" - touch "${D}/${GAMES_STATEDIR}"/${PN}.scores - fperms 660 "${GAMES_STATEDIR}"/${PN}.scores - prepgamesdirs -} diff --git a/games-arcade/rockdodger/rockdodger-1.1.4.ebuild b/games-arcade/rockdodger/rockdodger-1.1.4.ebuild new file mode 100644 index 000000000000..b752d56a2e11 --- /dev/null +++ b/games-arcade/rockdodger/rockdodger-1.1.4.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop toolchain-funcs + +DESCRIPTION="Dodge the rocks for as long as possible until you die" +HOMEPAGE="https://bitbucket.org/rpkrawczyk/rockdodger" +SRC_URI="https://bitbucket.org/rpkrawczyk/rockdodger/downloads/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + acct-group/gamestat + media-libs/libsdl[joystick,sound,video] + media-libs/sdl-image[png] + media-libs/sdl-mixer[mod,wav]" +DEPEND="${RDEPEND}" + +src_compile() { + tc-export CC + + local emakeargs=( + prefix="${EPREFIX}"/usr + gamesdir="${EPREFIX}"/var/games/${PN} + MOREOPTS="${CFLAGS} ${CPPFLAGS}" + ) + emake "${emakeargs[@]}" +} + +src_install() { + dobin ${PN} + doman ${PN}.6 + + insinto /usr/share/${PN} + doins -r data/. + + newicon ${PN}.icon.64x64.xpm ${PN}.xpm + domenu ${PN}.desktop + + dodir /var/games/${PN} + touch "${ED}"/var/games/${PN}/${PN}.scores || die + + fowners -R :gamestat /{usr/bin,var/games}/${PN} + fperms 660 /var/games/${PN}/${PN}.scores + fperms g+s /usr/bin/${PN} +} diff --git a/games-arcade/rocksndiamonds/Manifest b/games-arcade/rocksndiamonds/Manifest index 986c5800f4ca..cb49f75aedd0 100644 --- a/games-arcade/rocksndiamonds/Manifest +++ b/games-arcade/rocksndiamonds/Manifest @@ -1,18 +1,26 @@ +DIST Andreas_Buschbeck-1.0.0.zip 18331338 BLAKE2B b6520ab10ce62d4bec804a2a7e1c4908a683f9f3833e5b1d4c64d376eb4225abc38c44a519bed8cbbd3fc928bfdddda17f292b0011805e45a30b84101dad9d1d SHA512 1b47914561aea5b07035cc70f8b1b6d35f0c829d89327713ad644d82225e778a7ffd27f9d421c40dd303f85c9fc0774244dd97d405f5db866ba3d1f8027151e4 DIST BD2K3-1.0.0.zip 4715324 BLAKE2B 72e25038c41a7a1c29a896459db97954d18731d6980f5096c28ebddb09c0b6d7bdb68a8c56f17d26c71085e4ae883d2ceaad8e95b5525cbf532d18f32ecdd638 SHA512 80f172584d2077a3ade0749790802ef9cecde75283d6b889e7d2fedf9b55fd1fd7f1f1fd5596b17d5b2a542172699a929ea626086e77d28fde11487440c43622 DIST Boulder_Dash_Dream-1.0.0.zip 10923437 BLAKE2B 976156c763281b993550a08361c5b6279a471e24568205c0369cc3f57d99e97db84d914a560c909b30fe92b8c8c10931cf6a8a8de4da181edac410a770d922b7 SHA512 f2765f52653b4f9d6c4a6548076281f6749d08c2dfd220345bdc0058b94d51c49ef81acdc87ff71bc1b3f337f3cc6a1d08b9e5a02d6aaeaeac5d894f97ba3d8e DIST Contributions-1.2.0.zip 9499312 BLAKE2B a90a84d230ab1032819bc3821871eb027ed83a8e289b01692f80185c42d50429ca8c6928b72b1ae5ea102ba2a0d25cd25391dc53b0cdb37ef4504233292dc2da SHA512 463e629bd4f592e24a82d20f1f249cea9e266a7c370bb5b079add8daa125d1af69a69746b696dd92f89b90e50972c6b2ba007aab87beed4cd980c0c7bdb81920 -DIST Emerald_Mine_Club-2.1.1.7z 20992125 BLAKE2B deb8e60058ead5e6b8df2c58f5c88da5fc9c1282a7f4a4c85c8e35f3f5c25fefe552d6440401093403cf2b0967c7a39cd1ec9c5926fa780aa6b224ed6bfe7804 SHA512 b45ca6c9163c28b0d000d783cd8a66fccd23a8c4ad2c7200366c6900fc31284d50a55171a12272d8bf117f135fb68810ac3f28e8708b9e47a98dbf0f53dd3d21 +DIST Emerald_Mine_Club-3.1.3.7z 45669526 BLAKE2B 8cc44ba75c67bf2b53b042b07b9cf160f42155559137a873676fff773757760c0d5084b6646e2a1127bd4454beb16e4d5a8ec263c7db36cb782cf0655bba3e8d SHA512 bb4eb28515d01b9bc8fd3a542a017091e7e27ab5a043c3fad128f8ea4deb0ec14edbc026cccc28a6c6d998a882e5bcfef9a7dcb59d478459f49b654f7ea6b9be DIST RS_MIX_01-needs_rnd_jue.zip 288339 BLAKE2B 08d08e934af95543d2027805d91f5c8b2806c2da74a8cdfed61afe26be5696a832cbac7e7aae30a314a2414b7d5a82b53b8556f7098c6570a54a26d751785347 SHA512 546fc50d089493a41f01895f16a7e96e664a472d61b1f92ebc391006c10142b493a55854d892019b0ff19fe318b4b67f78c137d7e1466c5fa4d49fbb521d7a48 +DIST RS_MIX_01-standalone.zip 17982550 BLAKE2B 829055ec48c5de31b8bb0edc3eb5dc8f60001e1cbfa7cd85706e635b2389fd800d22fbe657ceac64c0e3cc7725dbfef23d518d53df1cc35bf8a2aa25ece7cac6 SHA512 1ea070017f80c47c9eff29b644e30b0ae4d5eb78e11dfef10fd183aad7b8af981af74728883f9d223d63b24361a7c5449a68558d142a0f391d102f14f22ceaa5 DIST Snake_Bite-1.0.0.zip 6506066 BLAKE2B 852f7815939100f78d6a7ce27df565277f6467cc63c069f77d4e067f0144df092c3b6e73a64d0a9743033d90b20d390761046b253c188fd65873f7b28bf8b451 SHA512 82131cb68c9654cb49ddbb46b0c15f13ce98af4f3b2a46e1cc4f2980eea45a707297c74787f365996321f39a9f7656a9492c3d437e3da0d71a295447c868960e DIST Sokoban-1.0.0.zip 295339 BLAKE2B e263e311e58dcc21d11dd10b0fa7af0f871405d932c2e1ea6d580ec58098c6a498202b516cbd3d2f1dd795521b419de61c8c9a195f4b2ea781a35ac645cd9c59 SHA512 b63be5b00c4c0b153bb6fc45fde556c26cd49fa672b279cce2f61b572d9c056d5e10a565530bdf539024d75ffdd38efe68310e98b8f810d9c5dfc17b24ec376b DIST Supaplex-2.0.0.zip 13023727 BLAKE2B 0ea4077d66af893e5f42d8857138e4c926c02d6f75642b5a316c4e606d4c3dfb0655c71530a4becfcc6c536727b908122d413fe37cd8f3b094b629f27f31a3d9 SHA512 75641f603499bce062b74657ac1718b7009eed1159504088807ed77600f07b76775d986859e03e2e1bc0693c58850ed94711e1def74eb73a8c92fcc517de5886 DIST Zelda-1.0.0.zip 2175860 BLAKE2B 8c44e67a0e04a992675c1f14acd07c2537873adc1f38f495dd6b12f45eb67962164664a24128ba3abfd602f59eedf9407be8a45800a5aa2e5086473a9b1b403d SHA512 930235aa784cb8304af811144c1c33cd92f5cfda1e744ea04836e9d817223c09dfcd7be6d4d66a050bd50474f7c3e5547f69c166124df288e596f486eeeb426e DIST ZeldaII-1.0.0.zip 11542241 BLAKE2B abe6a8407148478e3ea8a4a9561ffef2a7e193419b65877aeb5844700d6a15d83387140195567029f356a4ead331eff6c6575d074fa522b099f6810519111287 SHA512 9e7fb213251e790b2415745c5a4de671902439abff0d90b8cbb9cfaf90b01b7bb124f8c95360516f93100ccec66d2cddbcefb7a05dfb395b74854568c74c186e +DIST es_b_v1-2.zip 302152 BLAKE2B 2da45a024f8d71d2ce1cad07ecdf7f066c48f6aeec0d79cd49270ae7e48d26e087829972335b77ec5b4b7315c7f30ccf54efd9f42ad44a4e3e9cb55d73d7b2e4 SHA512 93736f0c2187a4a0c619889ee081e4c3ba066a08d1dd765d393a3866161bb987137c46faff2d629880540f5ec9e148453db61c8cf160b25556e95af2bb7cec81 +DIST ese_v1-1.zip 318685 BLAKE2B abf479f873112ef7f76087155e168e0100923545f40ea7912653eec55f07b38b5d6a18de57d1ecd720bc40d0438051a7f1b0eb2533bf8fa81d8cec402867941b SHA512 fe3b5f537f76d37be95ace2ee158b2f917165099cb1d6805bb05e19fa9f0c8eae68e5c41b5db81298629593814692693e7d2bc2a87415980f28cc3065409e943 DIST rnd-contrib-1.0.0.tar.gz 3389242 BLAKE2B bcdc926a7164788c8c640bf1aced57fbe9d71d99332751d2c4e30460427cb09a30ee3e45f2e6b6a1d83cce9bdf4c92ab187a2385a57bdc2a893735bd19c64b9b SHA512 8bd82f9c34e6e2d2b7ea22fc5899e72a64587469bfb1336d0d33e6ee2bcd04b3b6adca958861b0e29e18e8dac74651c642126511cacb247072e367783a5c6a08 DIST rnd_jue-v8.tar.bz2 17244645 BLAKE2B 92d0cf646296b065c9ebe54d8d5ecb831eeb49748e47b6d2f019c2fd359d1e6ef5d3cd0472f1247e5c41b6b5aa7154b9e3baae000defc83b24470163a9dfc416 SHA512 cbff4cd16c812d77fe8446da4016d8f75dfa8675298a745062ff53a7783a39a59cffd886fedf1097023e72e111f10ddd56f280a109058a1a8ee069d664d2c59c DIST rockslevels-dx-1.0.tar.gz 211151 BLAKE2B 637a600f9197925d82e7ef344c90f04e8508c6b114fd07ad00977d91a856ff85dc29207e5f22c659382ee0759f8607e9dc8ad0c0de3826d57b74d494320b57ad SHA512 2e1bc4484a76bf638e8ce285972b20b6377e0483abb2475e2343d48de1f84ee102f430049d685b89bc1087e0f20b9b6e29370f8e6cae66b480d3650be9991f44 DIST rockslevels-emc-1.0.tar.gz 3824268 BLAKE2B 0feadd5d9c6225c8574576281d07e14ff98fc9a33c67d3fa5083219ce39daaa1902a5ed652b5379fa4e58ee2428a8a452d66520571206143fd0fcd54f71b977a SHA512 9abad888fa00bc305444367c5ab8ffdad95eaca22613573e44d5ecd93b1a9a1cbc931497c064002d90fd3174c4661d0b009ede7746b2fe8da0a00072303a1301 DIST rockslevels-sp-1.0.tar.gz 373564 BLAKE2B 3f724ea55bbdaae80a35d6a9f5d8751a9228862fbe1ba45419343b1968510e10d3c82cc01844e35bc35561e65df3bc7e5ec2a0b807e1f56359dc7dccc16e3cb0 SHA512 2d44e9238a72846b9d4fbab90288aa3b23af4957ffe0d42d95c523fd22f3587572864b3fc0b277894d2f3f56d6eff52ea009e5b2d59aebc34163a1067662d729 -DIST rocksndiamonds-4.1.0.0.tar.gz 3850621 BLAKE2B 9c85aced223b855eec0300634d2fb30513d8b2d1856d8e134594f7de1669cf64f487a87335e28f7b8abb0c13492573ac5bd3261cfc5274287e75d0ace258ab93 SHA512 4949c2e9a601c8e005b006b13b82e36f7f001321051d392bc34aa4c234c6cddfa9fae16e58d83070072cac1429e13f1fb96d2c4b2ecd35a309065ca3c1c869c2 -DIST rocksndiamonds-4.1.4.1.tar.gz 3982860 BLAKE2B c19baf38f77c9b9eaaf7c57e9b43d4862a0ff677d99753d6520b9e4746f6340d7f3a2cf8d3e6b692230bf49289cc2aef29d7a846d2d1e0ad162e55f6433634a2 SHA512 eb66dd0fcc162c522384b1c2fb7b380a6a460a4078dd0ffb5f16a63c3faa4a502d9a9a6e3505becd8ab4c188c0eb5edd32db45412c881ab90d6a9d05e5ed6d4b +DIST rocksndiamonds-4.3.5.4-linux.tar.gz 4641623 BLAKE2B 9e0d89bb44e9cfe8fd41ae805faad04a55d250a0345117e579e7787eb2871edb499570894eb2adb9775b894150a479b4f7b8bdc6aad811ba72dfee25df7b3a13 SHA512 5cb41910fbed60b961547d80663ddf4206860776de4e9a2c757de608cb4bc38565fca12f98ec4cfa5f9abab5f83aaab9d2190898ce0bd280f575c3bdd86aa03b +DIST rocksndiamonds-4.3.6.0-linux.tar.gz 4655278 BLAKE2B 29f6976119f2af3f3807f783d199e5ef3a34d1799718d66ff166420838c9352a559ec156d767e2731ca3c6b387f4254f6640938a1ba560444e79186a4878adf0 SHA512 db74d74b89b9ab307d2979eb11e8192a74bd3ef4edb0987c59ce839410a01322a0c0384c009603a370443ce6ce96e3d5e0a82b14002bad62a4a965bd40aefeac +DIST rocksndiamonds-distributable-music.tar.bz2 4957282 BLAKE2B e00ccc1a06977289ffe79c010512b4a9a5c79d5a0fdff750e17f888f09395dd8a20ce06c5f1f7cc034d22e9651bad54beff1fa4e3dac854e77bbc57353d98bdd SHA512 dd220e4506492e66742796d0c359bce24691f5ebfba092aa2c2b52c5582ae9d5a38aa558872c738eeb7619b8ca853d3affa6b0e4af0fda5621bf7e07441ff252 DIST rocksndiamonds.png 2021 BLAKE2B 795be09e6d60aaa66dd457f6ce7dcb0069a82e395cb54578b83ad49ba70b669aa5bd52a4da34979d1e0ba95413a499c13355ce6816c4e364d9d88d1988c88060 SHA512 026abfef17bfc8621d036b83a8a4a878b1d68615e69975ea37589e8d29d864dc42dbabc5a381e579c66be1053175df02209f2c1c1feff3bd9e29db3e09c40346 +DIST wf_v1-3.zip 35570 BLAKE2B eded867101b316406cdf378ce8bf36d1dbd28d38ebc9f904df85753955ec2d8f5a87a528975c58ee81b60362bcc37efa766ad87ccf1a1e8a5b062c59c6cc69a2 SHA512 b1b3b2efe20e7d74a072a6289d1af5c22fccf1b9359700269a381d38bdf2458d7d365df7db616a93512428a05f58cf872ea70fcf87080df327e0c4fc231f0470 +DIST wg_v1-0.zip 821765 BLAKE2B 5bc69179e0429992a916e2287eb57bfa947e4bb08bc6e3d801f940bc73dc8fc8af93aa82a9b8a9f8535d0d22043f50414f09b9643ea9cfa081a92943b1c73273 SHA512 7e7605d258deccbe938fedc4651bdcc4b9a01478de66f793053bb4191429cf733ad317a315965597817dbaa03d5cb538a9ab36bee53cf6a2fd3457aeb06dac88 +DIST ww_v1-0.zip 199805 BLAKE2B 167a36cc33f157e11850a786f511fb5eb9043eb732c514c00e13a71bdce3f63a2406aec88ca25e1510b3d7aeea0434101c878fcdbc2806f89b45c75417a931f3 SHA512 5689663e7d0da797a8a4904d69a3d37cfb09826acf55cf93b41beabf2638b13c6c666f4f40c011018cd84b6c14681061d5efcae3cc09ac86054ec23e0253f6d5 diff --git a/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-YN.patch b/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-YN.patch deleted file mode 100644 index 70c95bd076dc..000000000000 --- a/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-YN.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up rocksndiamonds-4.0.0.1/src/tools.c.yesno rocksndiamonds-4.0.0.1/src/tools.c ---- rocksndiamonds-4.0.0.1/src/tools.c.yesno 2017-01-12 07:47:09.921343574 -0500 -+++ rocksndiamonds-4.0.0.1/src/tools.c 2017-01-12 07:51:45.059649653 -0500 -@@ -3901,6 +3901,18 @@ static int RequestHandleEvents(unsigned - result = 0; - break; - -+ case KSYM_y: -+ case KSYM_Y: -+ if (req_state & REQ_ASK) -+ result = TRUE; -+ break; -+ -+ case KSYM_n: -+ case KSYM_N: -+ if (req_state & REQ_ASK) -+ result = FALSE; -+ break; -+ - default: - HandleKeysDebug(key); - break; diff --git a/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.4.1-gcc10.patch b/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.4.1-gcc10.patch deleted file mode 100644 index 08edb4236e37..000000000000 --- a/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.4.1-gcc10.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up rocksndiamonds-4.1.4.1/src/main.c.gcc10 rocksndiamonds-4.1.4.1/src/main.c ---- rocksndiamonds-4.1.4.1/src/main.c.gcc10 2019-05-20 15:24:46.000000000 -0400 -+++ rocksndiamonds-4.1.4.1/src/main.c 2020-01-31 05:56:37.154931291 -0500 -@@ -67,7 +67,7 @@ short ExplodeDelay[MAX_LEV_FIELDX][MAX - int RunnerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; - int PlayerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; - --int GfxFrame[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; -+// int GfxFrame[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; - int GfxRandom[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; - int GfxElement[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; - int GfxAction[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; -@@ -132,7 +132,7 @@ struct LevelInfo level, level_template; - struct PlayerInfo stored_player[MAX_PLAYERS], *local_player = NULL; - struct HiScore highscore[MAX_SCORE_ENTRIES]; - struct TapeInfo tape; --struct SetupInfo setup; -+// struct SetupInfo setup; - struct GameInfo game; - struct GlobalInfo global; - struct BorderInfo border; diff --git a/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-music-info-url.patch b/games-arcade/rocksndiamonds/files/rocksndiamonds-4.3.2.0-music-info-url.patch index f913be382e94..6dc46277a1b2 100644 --- a/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-music-info-url.patch +++ b/games-arcade/rocksndiamonds/files/rocksndiamonds-4.3.2.0-music-info-url.patch @@ -1,7 +1,7 @@ -diff -up rocksndiamonds-4.1.0.0/src/files.c.url rocksndiamonds-4.1.0.0/src/files.c ---- rocksndiamonds-4.1.0.0/src/files.c.url 2018-04-10 15:44:08.000000000 -0400 -+++ rocksndiamonds-4.1.0.0/src/files.c 2018-04-17 16:30:19.726734512 -0400 -@@ -10127,11 +10127,13 @@ static struct MusicFileInfo *get_music_f +diff -up rocksndiamonds-4.3.2.0/src/files.c.url rocksndiamonds-4.3.2.0/src/files.c +--- rocksndiamonds-4.3.2.0/src/files.c.url 2022-04-16 19:22:44.000000000 -0400 ++++ rocksndiamonds-4.3.2.0/src/files.c 2022-04-26 10:32:33.995238563 -0400 +@@ -12674,11 +12674,13 @@ static struct MusicFileInfo *get_music_f { "artist_header", &tmp_music_file_info.artist_header }, { "album_header", &tmp_music_file_info.album_header }, { "year_header", &tmp_music_file_info.year_header }, @@ -15,7 +15,7 @@ diff -up rocksndiamonds-4.1.0.0/src/files.c.url rocksndiamonds-4.1.0.0/src/files { NULL, NULL }, }; -@@ -10247,11 +10249,13 @@ void LoadMusicInfo() +@@ -12794,11 +12796,13 @@ void LoadMusicInfo(void) checked_free(music_file_info->artist_header); checked_free(music_file_info->album_header); checked_free(music_file_info->year_header); @@ -29,10 +29,10 @@ diff -up rocksndiamonds-4.1.0.0/src/files.c.url rocksndiamonds-4.1.0.0/src/files free(music_file_info); -diff -up rocksndiamonds-4.1.0.0/src/main.h.url rocksndiamonds-4.1.0.0/src/main.h ---- rocksndiamonds-4.1.0.0/src/main.h.url 2018-04-10 15:44:08.000000000 -0400 -+++ rocksndiamonds-4.1.0.0/src/main.h 2018-04-17 16:30:19.727734490 -0400 -@@ -3463,11 +3463,13 @@ struct MusicFileInfo +diff -up rocksndiamonds-4.3.2.0/src/main.h.url rocksndiamonds-4.3.2.0/src/main.h +--- rocksndiamonds-4.3.2.0/src/main.h.url 2022-04-16 19:22:44.000000000 -0400 ++++ rocksndiamonds-4.3.2.0/src/main.h 2022-04-26 10:32:33.995238563 -0400 +@@ -3710,11 +3710,13 @@ struct MusicFileInfo char *artist_header; char *album_header; char *year_header; @@ -46,10 +46,10 @@ diff -up rocksndiamonds-4.1.0.0/src/main.h.url rocksndiamonds-4.1.0.0/src/main.h int music; -diff -up rocksndiamonds-4.1.0.0/src/screens.c.url rocksndiamonds-4.1.0.0/src/screens.c ---- rocksndiamonds-4.1.0.0/src/screens.c.url 2018-04-17 16:30:19.728734467 -0400 -+++ rocksndiamonds-4.1.0.0/src/screens.c 2018-04-17 16:34:00.653803869 -0400 -@@ -3060,6 +3060,19 @@ void HandleInfoScreen_Music(int button) +diff -up rocksndiamonds-4.3.2.0/src/screens.c.url rocksndiamonds-4.3.2.0/src/screens.c +--- rocksndiamonds-4.3.2.0/src/screens.c.url 2022-04-26 10:32:33.996238568 -0400 ++++ rocksndiamonds-4.3.2.0/src/screens.c 2022-04-26 10:34:29.617828672 -0400 +@@ -3392,6 +3392,19 @@ void HandleInfoScreen_Music(int dx, int ystart += ystep_head; } @@ -66,6 +66,6 @@ diff -up rocksndiamonds-4.1.0.0/src/screens.c.url rocksndiamonds-4.1.0.0/src/scr + ystart += ystep_head; + } + - DrawTextSCentered(ybottom, FONT_TEXT_4, - "Press any key or button for next page"); + DrawTextSCentered(ybottom, font_foot, TEXT_NEXT_PAGE); + if (button != MB_MENU_INITIALIZE) diff --git a/games-arcade/rocksndiamonds/metadata.xml b/games-arcade/rocksndiamonds/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/rocksndiamonds/metadata.xml +++ b/games-arcade/rocksndiamonds/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/rocksndiamonds/rocksndiamonds-4.1.0.0.ebuild b/games-arcade/rocksndiamonds/rocksndiamonds-4.1.0.0.ebuild deleted file mode 100644 index 1771c1ba6f18..000000000000 --- a/games-arcade/rocksndiamonds/rocksndiamonds-4.1.0.0.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit desktop flag-o-matic - -DESCRIPTION="A Boulderdash clone" -HOMEPAGE="https://www.artsoft.org/rocksndiamonds/" -SRC_URI="https://www.artsoft.org/RELEASES/unix/rocksndiamonds/${P}.tar.gz - https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Contributions-1.2.0.zip - https://www.artsoft.org/RELEASES/rocksndiamonds/levels/BD2K3-1.0.0.zip - https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Boulder_Dash_Dream-1.0.0.zip - https://www.artsoft.org/RELEASES/rocksndiamonds/levels/rnd-contrib-1.0.0.tar.gz - https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Snake_Bite-1.0.0.zip - https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Sokoban-1.0.0.zip - https://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-emc-1.0.tar.gz - https://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-sp-1.0.tar.gz - https://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-dx-1.0.tar.gz - mirror://gentoo/rnd_jue-v8.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - media-libs/libsdl2[joystick,video] - media-libs/sdl2-mixer[mod,mp3,timidity] - media-libs/sdl2-net - media-libs/sdl2-image[gif] - media-libs/smpeg -" -DEPEND="${RDEPEND} - app-arch/unzip -" - -PATCHES=( - # From Fedora: - "${FILESDIR}"/${PN}-4.1.0.0-YN.patch - "${FILESDIR}"/${PN}-4.1.0.0-music-info-url.patch - "${FILESDIR}"/${PN}-4.1.0.0-CVE-2011-4606.patch -) - -src_unpack() { - unpack ${P}.tar.gz - cd "${S}" - unpack \ - rockslevels-emc-1.0.tar.gz \ - rockslevels-sp-1.0.tar.gz \ - rockslevels-dx-1.0.tar.gz - cd levels - unpack \ - rnd_jue-v8.tar.bz2 \ - BD2K3-1.0.0.zip \ - rnd-contrib-1.0.0.tar.gz \ - Snake_Bite-1.0.0.zip \ - Contributions-1.2.0.zip \ - Boulder_Dash_Dream-1.0.0.zip \ - Sokoban-1.0.0.zip -} - -src_prepare() { - default - sed -i \ - -e 's:\$(MAKE_CMD):$(MAKE) -C $(SRC_DIR):' \ - -e '/^MAKE/d' \ - -e '/^CC/d' \ - Makefile || die - - sed -i \ - -e '/^LDFLAGS/s/=/+=/' \ - src/Makefile || die -} - -src_compile() { - replace-cpu-flags k6 k6-1 k6-2 i586 - - local makeopts="RO_GAME_DIR=/usr/share/${PN} RW_GAME_DIR=/usr/share/${PN}" - emake -j1 clean - emake ${makeopts} OPTIONS="${CFLAGS}" sdl2 -} - -src_install() { - dobin rocksndiamonds - insinto "/usr/share/${PN}" - doins -r docs graphics levels music sounds - - einstalldocs - newicon graphics/gfx_classic/RocksIcon32x32.png ${PN}.png - make_desktop_entry rocksndiamonds "Rocks 'N' Diamonds" /usr/share/pixmaps/${PN}.png -} diff --git a/games-arcade/rocksndiamonds/rocksndiamonds-4.1.4.1.ebuild b/games-arcade/rocksndiamonds/rocksndiamonds-4.3.5.4.ebuild index 37f602b5fc75..b5c59ce9daab 100644 --- a/games-arcade/rocksndiamonds/rocksndiamonds-4.1.4.1.ebuild +++ b/games-arcade/rocksndiamonds/rocksndiamonds-4.3.5.4.ebuild @@ -1,28 +1,37 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit desktop flag-o-matic +EAPI=8 +inherit desktop flag-o-matic unpacker DESCRIPTION="A Boulderdash clone" HOMEPAGE="https://www.artsoft.org/rocksndiamonds/" -SRC_URI="https://www.artsoft.org/RELEASES/unix/rocksndiamonds/${P}.tar.gz +# rocksndiamonds-distributable-music.tar.bz2 from Fedora +SRC_URI="https://www.artsoft.org/RELEASES/unix/rocksndiamonds/${P}-linux.tar.gz + https://dev.gentoo.org/~pacho/${PN}/rocksndiamonds-distributable-music.tar.bz2 https://upload.wikimedia.org/wikipedia/commons/e/e2/Rocks%27n%27Diamonds.png -> ${PN}.png - https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Contributions-1.2.0.zip + https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Andreas_Buschbeck-1.0.0.zip https://www.artsoft.org/RELEASES/rocksndiamonds/levels/BD2K3-1.0.0.zip https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Boulder_Dash_Dream-1.0.0.zip - https://www.artsoft.org/RELEASES/rocksndiamonds/levels/rnd-contrib-1.0.0.tar.gz + https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Contributions-1.2.0.zip + https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Emerald_Mine_Club-3.1.3.7z + https://www.artsoft.org/RELEASES/rocksndiamonds/levels/RS_MIX_01-needs_rnd_jue.zip + https://www.artsoft.org/RELEASES/rocksndiamonds/levels/RS_MIX_01-standalone.zip https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Snake_Bite-1.0.0.zip https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Sokoban-1.0.0.zip + https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Supaplex-2.0.0.zip + https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Zelda-1.0.0.zip + https://www.artsoft.org/RELEASES/rocksndiamonds/levels/ZeldaII-1.0.0.zip + https://www.artsoft.org/RELEASES/rocksndiamonds/levels/rnd-contrib-1.0.0.tar.gz + https://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-dx-1.0.tar.gz https://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-emc-1.0.tar.gz https://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-sp-1.0.tar.gz - https://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-dx-1.0.tar.gz mirror://gentoo/rnd_jue-v8.tar.bz2 - https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Zelda-1.0.0.zip - https://www.artsoft.org/RELEASES/rocksndiamonds/levels/ZeldaII-1.0.0.zip - https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Emerald_Mine_Club-2.1.1.7z - https://www.artsoft.org/RELEASES/rocksndiamonds/levels/RS_MIX_01-needs_rnd_jue.zip - https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Supaplex-2.0.0.zip + https://www.artsoft.org/rocksndiamonds/levels/jamiecullen/zips/wg_v1-0.zip + https://www.artsoft.org/rocksndiamonds/levels/jamiecullen/zips/wf_v1-3.zip + https://www.artsoft.org/rocksndiamonds/levels/jamiecullen/zips/ese_v1-1.zip + https://www.artsoft.org/rocksndiamonds/levels/jamiecullen/zips/es_b_v1-2.zip + https://www.artsoft.org/rocksndiamonds/levels/jamiecullen/zips/ww_v1-0.zip " LICENSE="GPL-2" SLOT="0" @@ -30,34 +39,32 @@ KEYWORDS="~amd64 ~x86" IUSE="" RDEPEND=" + media-libs/libmodplug media-libs/libsdl2[joystick,video] media-libs/sdl2-mixer[mod,mp3,timidity] media-libs/sdl2-net media-libs/sdl2-image[gif] media-libs/smpeg " -DEPEND="${RDEPEND} - app-arch/p7zip - app-arch/unzip -" +DEPEND="${RDEPEND}" +BDEPEND="$(unpacker_src_uri_depends)" PATCHES=( # From Fedora: - "${FILESDIR}"/${PN}-4.1.0.0-YN.patch - "${FILESDIR}"/${PN}-4.1.0.0-music-info-url.patch + "${FILESDIR}"/${PN}-4.3.2.0-music-info-url.patch "${FILESDIR}"/${PN}-4.1.0.0-CVE-2011-4606.patch - "${FILESDIR}"/${PN}-4.1.4.1-gcc10.patch ) src_unpack() { - unpack ${P}.tar.gz + unpack ${P}-linux.tar.gz cd "${S}" unpack \ rockslevels-emc-1.0.tar.gz \ rockslevels-sp-1.0.tar.gz \ rockslevels-dx-1.0.tar.gz cd levels - unpack \ + unpacker \ + Andreas_Buschbeck-1.0.0.zip \ rnd_jue-v8.tar.bz2 \ BD2K3-1.0.0.zip \ rnd-contrib-1.0.0.tar.gz \ @@ -67,9 +74,15 @@ src_unpack() { Sokoban-1.0.0.zip \ Zelda-1.0.0.zip \ ZeldaII-1.0.0.zip \ - Emerald_Mine_Club-2.1.1.7z \ + Emerald_Mine_Club-3.1.3.7z \ RS_MIX_01-needs_rnd_jue.zip \ - Supaplex-2.0.0.zip + RS_MIX_01-standalone.zip \ + Supaplex-2.0.0.zip \ + wg_v1-0.zip \ + wf_v1-3.zip \ + ese_v1-1.zip \ + es_b_v1-2.zip \ + ww_v1-0.zip } src_prepare() { @@ -88,9 +101,9 @@ src_prepare() { src_compile() { replace-cpu-flags k6 k6-1 k6-2 i586 - local makeopts="RO_GAME_DIR=/usr/share/${PN} RW_GAME_DIR=/usr/share/${PN}" + local makeopts="BASE_PATH=/usr/share/${PN} RO_GAME_DIR=/usr/share/${PN} RW_GAME_DIR=/usr/share/${PN} EXTRA_CFLAGS=-DUSE_USERDATADIR_FOR_COMMONDATA" emake -j1 clean - emake ${makeopts} OPTIONS="${CFLAGS}" sdl2 + emake ${makeopts} OPTIONS="${CFLAGS}" } src_install() { @@ -100,5 +113,5 @@ src_install() { einstalldocs doicon "${DISTDIR}/${PN}.png" - make_desktop_entry rocksndiamonds "Rocks 'N' Diamonds" /usr/share/pixmaps/${PN}.png + make_desktop_entry ${PN} "Rocks 'N' Diamonds" ${PN} } diff --git a/games-arcade/rocksndiamonds/rocksndiamonds-4.3.6.0.ebuild b/games-arcade/rocksndiamonds/rocksndiamonds-4.3.6.0.ebuild new file mode 100644 index 000000000000..b5c59ce9daab --- /dev/null +++ b/games-arcade/rocksndiamonds/rocksndiamonds-4.3.6.0.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit desktop flag-o-matic unpacker + +DESCRIPTION="A Boulderdash clone" +HOMEPAGE="https://www.artsoft.org/rocksndiamonds/" +# rocksndiamonds-distributable-music.tar.bz2 from Fedora +SRC_URI="https://www.artsoft.org/RELEASES/unix/rocksndiamonds/${P}-linux.tar.gz + https://dev.gentoo.org/~pacho/${PN}/rocksndiamonds-distributable-music.tar.bz2 + https://upload.wikimedia.org/wikipedia/commons/e/e2/Rocks%27n%27Diamonds.png -> ${PN}.png + https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Andreas_Buschbeck-1.0.0.zip + https://www.artsoft.org/RELEASES/rocksndiamonds/levels/BD2K3-1.0.0.zip + https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Boulder_Dash_Dream-1.0.0.zip + https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Contributions-1.2.0.zip + https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Emerald_Mine_Club-3.1.3.7z + https://www.artsoft.org/RELEASES/rocksndiamonds/levels/RS_MIX_01-needs_rnd_jue.zip + https://www.artsoft.org/RELEASES/rocksndiamonds/levels/RS_MIX_01-standalone.zip + https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Snake_Bite-1.0.0.zip + https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Sokoban-1.0.0.zip + https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Supaplex-2.0.0.zip + https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Zelda-1.0.0.zip + https://www.artsoft.org/RELEASES/rocksndiamonds/levels/ZeldaII-1.0.0.zip + https://www.artsoft.org/RELEASES/rocksndiamonds/levels/rnd-contrib-1.0.0.tar.gz + https://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-dx-1.0.tar.gz + https://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-emc-1.0.tar.gz + https://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-sp-1.0.tar.gz + mirror://gentoo/rnd_jue-v8.tar.bz2 + https://www.artsoft.org/rocksndiamonds/levels/jamiecullen/zips/wg_v1-0.zip + https://www.artsoft.org/rocksndiamonds/levels/jamiecullen/zips/wf_v1-3.zip + https://www.artsoft.org/rocksndiamonds/levels/jamiecullen/zips/ese_v1-1.zip + https://www.artsoft.org/rocksndiamonds/levels/jamiecullen/zips/es_b_v1-2.zip + https://www.artsoft.org/rocksndiamonds/levels/jamiecullen/zips/ww_v1-0.zip +" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + media-libs/libmodplug + media-libs/libsdl2[joystick,video] + media-libs/sdl2-mixer[mod,mp3,timidity] + media-libs/sdl2-net + media-libs/sdl2-image[gif] + media-libs/smpeg +" +DEPEND="${RDEPEND}" +BDEPEND="$(unpacker_src_uri_depends)" + +PATCHES=( + # From Fedora: + "${FILESDIR}"/${PN}-4.3.2.0-music-info-url.patch + "${FILESDIR}"/${PN}-4.1.0.0-CVE-2011-4606.patch +) + +src_unpack() { + unpack ${P}-linux.tar.gz + cd "${S}" + unpack \ + rockslevels-emc-1.0.tar.gz \ + rockslevels-sp-1.0.tar.gz \ + rockslevels-dx-1.0.tar.gz + cd levels + unpacker \ + Andreas_Buschbeck-1.0.0.zip \ + rnd_jue-v8.tar.bz2 \ + BD2K3-1.0.0.zip \ + rnd-contrib-1.0.0.tar.gz \ + Snake_Bite-1.0.0.zip \ + Contributions-1.2.0.zip \ + Boulder_Dash_Dream-1.0.0.zip \ + Sokoban-1.0.0.zip \ + Zelda-1.0.0.zip \ + ZeldaII-1.0.0.zip \ + Emerald_Mine_Club-3.1.3.7z \ + RS_MIX_01-needs_rnd_jue.zip \ + RS_MIX_01-standalone.zip \ + Supaplex-2.0.0.zip \ + wg_v1-0.zip \ + wf_v1-3.zip \ + ese_v1-1.zip \ + es_b_v1-2.zip \ + ww_v1-0.zip +} + +src_prepare() { + default + sed -i \ + -e 's:\$(MAKE_CMD):$(MAKE) -C $(SRC_DIR):' \ + -e '/^MAKE/d' \ + -e '/^CC/d' \ + Makefile || die + + sed -i \ + -e '/^LDFLAGS/s/=/+=/' \ + src/Makefile || die +} + +src_compile() { + replace-cpu-flags k6 k6-1 k6-2 i586 + + local makeopts="BASE_PATH=/usr/share/${PN} RO_GAME_DIR=/usr/share/${PN} RW_GAME_DIR=/usr/share/${PN} EXTRA_CFLAGS=-DUSE_USERDATADIR_FOR_COMMONDATA" + emake -j1 clean + emake ${makeopts} OPTIONS="${CFLAGS}" +} + +src_install() { + dobin rocksndiamonds + insinto "/usr/share/${PN}" + doins -r docs graphics levels music sounds + + einstalldocs + doicon "${DISTDIR}/${PN}.png" + make_desktop_entry ${PN} "Rocks 'N' Diamonds" ${PN} +} diff --git a/games-arcade/sable/metadata.xml b/games-arcade/sable/metadata.xml index 2c66a7711fa8..ada2e2b00c72 100644 --- a/games-arcade/sable/metadata.xml +++ b/games-arcade/sable/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/sable/sable-1.0-r1.ebuild b/games-arcade/sable/sable-1.0-r1.ebuild index 9ff9a086c60e..a99ef373fa01 100644 --- a/games-arcade/sable/sable-1.0-r1.ebuild +++ b/games-arcade/sable/sable-1.0-r1.ebuild @@ -1,18 +1,19 @@ -# 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 desktop DESCRIPTION="A frantic 3D space shooter" -HOMEPAGE="http://jeuxlibres.net/showgame/sable.html" +HOMEPAGE="https://jeuxlibres.net/showgame/sable.html" SRC_URI="mirror://gentoo/${P}-src.tgz mirror://gentoo/${PN}.png" +S="${WORKDIR}/${PN}" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" DEPEND="virtual/opengl media-libs/libsdl[joystick,opengl,sound,video] @@ -20,8 +21,6 @@ DEPEND="virtual/opengl media-libs/sdl-mixer" RDEPEND="${DEPEND}" -S="${WORKDIR}/${PN}" - PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) src_compile() { diff --git a/games-arcade/savagewheels/metadata.xml b/games-arcade/savagewheels/metadata.xml index 00392a14830e..6cffb58dceda 100644 --- a/games-arcade/savagewheels/metadata.xml +++ b/games-arcade/savagewheels/metadata.xml @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> - <use> - <flag name="fmod">Enable the fmod music and sound effects library</flag> - </use> <upstream> - <remote-id type="github">petarov/savagewheels</remote-id> + <remote-id type="github">kenamick/savagewheels</remote-id> </upstream> </pkgmetadata> diff --git a/games-arcade/savagewheels/savagewheels-1.6.1-r1.ebuild b/games-arcade/savagewheels/savagewheels-1.6.1-r1.ebuild deleted file mode 100644 index 7d06e4db88b4..000000000000 --- a/games-arcade/savagewheels/savagewheels-1.6.1-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="2D car crashing game similar to the old classic Destruction Derby." -HOMEPAGE="https://github.com/petarov/savagewheels" - -GAMEDATA="${PN}-gamedata-1.4.0" - -SRC_URI=" - https://github.com/petarov/savagewheels/archive/${PV}.tar.gz -> ${P}.tar.gz - https://github.com/petarov/savagewheels/releases/download/v1.4/${PN}-gamedata.tar.gz -> ${GAMEDATA}.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -IUSE="fmod sound" - -RDEPEND=" - media-libs/libsdl - sound? ( - !fmod? ( media-libs/sdl-mixer[mod,modplug] ) - fmod? ( >=media-libs/fmod-4.38.00 ) - )" - -DEPEND="${RDEPEND}" - -REQUIRED_USE="fmod? ( sound )" - -src_unpack() { - unpack ${P}.tar.gz - - cp "${FILESDIR}/${PN}.in" "${S}" || die - mkdir "${WORKDIR}/${GAMEDATA}" || - die "Failed to make directory: ${WORKDIR}/${GAMEDATA}" - cd "${WORKDIR}/${GAMEDATA}" || - die "Unable to change into directory: ${WORKDIR}/${GAMEDATA}" - unpack "${GAMEDATA}.tar.gz" -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_DATADIR=share/${PN} - -DCMAKE_INSTALL_LIBEXECDIR=libexec/${PN} - $(usex sound $(usex fmod '-DSOUND=FMOD -DFMOD_PATH=/opt/fmodex/api' '-DSOUND=YES') '-DSOUND=NO') - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - insinto /usr/share/${PN} - doins -r "${WORKDIR}/${GAMEDATA}/." -} diff --git a/games-arcade/savagewheels/savagewheels-1.6.1-r2.ebuild b/games-arcade/savagewheels/savagewheels-1.6.1-r2.ebuild new file mode 100644 index 000000000000..529643c86ba3 --- /dev/null +++ b/games-arcade/savagewheels/savagewheels-1.6.1-r2.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +GAMEDATA="${PN}-gamedata-1.4.0" +inherit cmake + +DESCRIPTION="2D car crashing game similar to the old classic Destruction Derby" +HOMEPAGE="https://github.com/kenamick/savagewheels" +SRC_URI=" + https://github.com/kenamick/savagewheels/archive/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/kenamick/savagewheels/releases/download/v1.4/${PN}-gamedata.tar.gz -> ${GAMEDATA}.tar.gz +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="sound" + +RDEPEND=" + media-libs/libsdl[joystick] + sound? ( media-libs/sdl-mixer[mod,modplug] ) +" +DEPEND="${RDEPEND}" + +src_unpack() { + unpack ${P}.tar.gz + + cp "${FILESDIR}/${PN}.in" "${S}" || die + mkdir "${WORKDIR}/${GAMEDATA}" || die + cd "${WORKDIR}/${GAMEDATA}" || die + unpack "${GAMEDATA}.tar.gz" +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_DATADIR="${EPREFIX}"/usr/share/${PN} + -DCMAKE_INSTALL_LIBEXECDIR="${EPREFIX}"/usr/libexec/${PN} + -DSOUND=$(usex sound YES NO) # yes, 'NO' is important here. bug 773439 + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + insinto /usr/share/${PN} + doins -r "${WORKDIR}/${GAMEDATA}/." +} diff --git a/games-arcade/sdb/files/sdb-1.0.2-gcc-11.patch b/games-arcade/sdb/files/sdb-1.0.2-gcc-11.patch new file mode 100644 index 000000000000..f0a20657b900 --- /dev/null +++ b/games-arcade/sdb/files/sdb-1.0.2-gcc-11.patch @@ -0,0 +1,45 @@ +https://bugs.gentoo.org/787710 +--- a/src/md2.h ++++ b/src/md2.h +@@ -68,7 +68,7 @@ struct tMaterialInfo + { + char strName[255]; + char strFile[255]; +- byte color[3]; ++ sdb_byte color[3]; + int textureId; + float uTile; + float vTile; +@@ -151,8 +151,8 @@ struct tMd2Header + + struct tMd2AliasTriangle + { +- byte vertex[3]; +- byte lightNormalIndex; ++ sdb_byte vertex[3]; ++ sdb_byte lightNormalIndex; + }; + + struct tMd2Triangle +--- a/src/models.h ++++ b/src/models.h +@@ -43,7 +43,7 @@ struct tMaterialInfo + { + char strName[255]; // The texture name + char strFile[255]; // The texture file name (If this is set it's a texture map) +- byte color[3]; // The color of the object (R, G, B) ++ sdb_byte color[3]; // The color of the object (R, G, B) + int texureId; // the texture ID + float uTile; // u tiling of texture + float vTile; // v tiling of texture +--- a/src/sdb.h ++++ b/src/sdb.h +@@ -175,7 +175,7 @@ using namespace std; + #define MOUSE_BUTTON_2 -2 + #define MOUSE_BUTTON_3 -3 + +-typedef unsigned char byte; ++typedef unsigned char sdb_byte; + + enum TEXTURE_NAMES { + // Fonts diff --git a/games-arcade/sdb/files/sdb-1.0.2-return-type.patch b/games-arcade/sdb/files/sdb-1.0.2-return-type.patch new file mode 100644 index 000000000000..9750eedb9919 --- /dev/null +++ b/games-arcade/sdb/files/sdb-1.0.2-return-type.patch @@ -0,0 +1,56 @@ +Fix -Werror=return-type warnings to prevent gcc-8+ from +corrupting caller's stack. + +Also detected by -fsanitize=undefined as: +runtime error: execution reached the end of a value-returning +function without returning a value +--- a/src/input.cpp ++++ b/src/input.cpp +@@ -103,5 +103,6 @@ float InputHandler::bindingState(int key) + } + else + return 0.0; ++ return 0.0; + } + +--- a/src/objects.h ++++ b/src/objects.h +@@ -545,12 +545,12 @@ class Object : public LevelObject + bool Augmented() { return augmented; } + void Augment() { model[1].set(MDL_PLAYER_TORSO2); augmented = true; } + +- virtual Weapon* Wpn() {} +- virtual int CurrWeapon() {} ++ virtual Weapon* Wpn() { return 0; } ++ virtual int CurrWeapon() { return 0; } + virtual void selectWeapon(int wp) {} +- virtual char weaponState(int wp) {} +- virtual char keyState(int wp) {} +- virtual Vector2D* WeaponPoint() {} ++ virtual char weaponState(int wp) { return 0; } ++ virtual char keyState(int wp) { return 0; } ++ virtual Vector2D* WeaponPoint() { return 0; } + + void giveKey(int key) { keys |= 1 << key-1; } + virtual void givePowerup(int idx) {} +--- a/src/sdb.h ++++ b/src/sdb.h +@@ -370,7 +370,7 @@ class Vector2D + void set(float nx, float ny) { c[X] = nx; c[Y] = ny; c[Z] = 0; } + void apply() { glVertex3fv(c); } + void print() { printf("(%f, %f)\n", c[X], c[Y]); } +- Vector2D operator = (Vector2D v) { c[X] = v.c[X]; c[Y] = v.c[Y]; } ++ Vector2D operator = (Vector2D v) { c[X] = v.c[X]; c[Y] = v.c[Y]; return *this; } + void operator += (Vector2D v) { c[X] += v.c[X]; c[Y] += v.c[Y]; } + void operator -= (Vector2D v) { c[X] -= v.c[X]; c[Y] -= v.c[Y]; } + void operator += (float s) { c[X] += s; c[Y] += s; } +--- a/src/weapons.cpp ++++ b/src/weapons.cpp +@@ -135,6 +135,7 @@ bool Weapon::fire(float x, float y, float head, float h) + } + else + return false; ++ return false; + } + + void Weapon::releaseTrigger(float x, float y, float head, float h) diff --git a/games-arcade/sdb/metadata.xml b/games-arcade/sdb/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/sdb/metadata.xml +++ b/games-arcade/sdb/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/sdb/sdb-1.0.2-r1.ebuild b/games-arcade/sdb/sdb-1.0.2-r2.ebuild index 155c5d3a4e9c..c46b05fad7cd 100644 --- a/games-arcade/sdb/sdb-1.0.2-r1.ebuild +++ b/games-arcade/sdb/sdb-1.0.2-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit desktop +EAPI=7 +inherit desktop toolchain-funcs DESCRIPTION="A 2D top-down action game; escape a facility full of walking death machines" HOMEPAGE="http://sdb.gamecreation.org/" @@ -19,6 +19,14 @@ DEPEND="virtual/opengl media-libs/sdl-mixer" RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}"/${P}-endian.patch + "${FILESDIR}"/${P}-gcc43.patch + "${FILESDIR}"/${P}-ldflags.patch + "${FILESDIR}"/${P}-gcc-11.patch + "${FILESDIR}"/${P}-return-type.patch +) + src_prepare() { default sed -i \ @@ -27,16 +35,14 @@ src_prepare() { -e "s:sprites/:/usr/share/${PN}/sprites/:" \ -e "s:levels/:/usr/share/${PN}/levels/:" \ src/sdb.h src/game.cpp || die "setting game paths" - eapply \ - "${FILESDIR}"/${P}-endian.patch \ - "${FILESDIR}"/${P}-gcc43.patch \ - "${FILESDIR}"/${P}-ldflags.patch } src_compile() { emake \ -C src \ - CXXFLAGS="${CXXFLAGS} $(sdl-config --cflags)" + CXXFLAGS="${CXXFLAGS} $(sdl-config --cflags)" \ + CC="$(tc-getCC)" \ + CPP="$(tc-getCXX)" } src_install() { diff --git a/games-arcade/sdl-sopwith/metadata.xml b/games-arcade/sdl-sopwith/metadata.xml index a7ff32dedabd..00b9db664db9 100644 --- a/games-arcade/sdl-sopwith/metadata.xml +++ b/games-arcade/sdl-sopwith/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/sdlroids/files/sdlroids-1.3.4-Makefile.patch b/games-arcade/sdlroids/files/sdlroids-1.3.4-Makefile.patch new file mode 100644 index 000000000000..9577d4cb6582 --- /dev/null +++ b/games-arcade/sdlroids/files/sdlroids-1.3.4-Makefile.patch @@ -0,0 +1,15 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -23,9 +23,9 @@ + GFXDIR="$(datadir)/sdlroids/bmp/" + + install-data-local: +- @/bin/sh $(srcdir)/mkinstalldirs $(SOUNDSDIR) $(GFXDIR) +- $(INSTALL_DATA) $(srcdir)/sounds/*.wav $(SOUNDSDIR) +- $(INSTALL_DATA) $(srcdir)/bmp/*.bmp $(GFXDIR) ++ @/bin/sh $(srcdir)/mkinstalldirs $(DESTDIR)$(SOUNDSDIR) $(DESTDIR)$(GFXDIR) ++ $(INSTALL_DATA) $(srcdir)/sounds/*.wav $(DESTDIR)$(SOUNDSDIR) ++ $(INSTALL_DATA) $(srcdir)/bmp/*.bmp $(DESTDIR)$(GFXDIR) + + # Data directories + INCLUDES=-Wall -Wcast-align -DDATADIR=\"$(datadir)/sdlroids/\" diff --git a/games-arcade/sdlroids/files/sdlroids-1.3.4-fno-common.patch b/games-arcade/sdlroids/files/sdlroids-1.3.4-fno-common.patch new file mode 100644 index 000000000000..6288adf913b1 --- /dev/null +++ b/games-arcade/sdlroids/files/sdlroids-1.3.4-fno-common.patch @@ -0,0 +1,140 @@ +--- a/getargs.h ++++ b/getargs.h +@@ -37,4 +37,4 @@ + + /* getargs() prototype */ + void getargs(int, char *[]); +-int flagargs[NUMARGS]; ++extern int flagargs[NUMARGS]; +--- a/sdl.c ++++ b/sdl.c +@@ -282,7 +282,7 @@ + #define SGN(a) (((a)<0) ? -1 : 1) + + /* Draw an horizontal line in the current color */ +-inline void draw_horzline(Sint16 x1, Sint16 x2, Sint32 y) ++void draw_horzline(Sint16 x1, Sint16 x2, Sint32 y) + { + int i; + if (x1 < x2) { +@@ -296,7 +296,7 @@ + } + + /* Draw an vertical line in the current color */ +-inline void draw_vertline(Sint16 x, Sint16 y1, Sint32 y2) ++void draw_vertline(Sint16 x, Sint16 y1, Sint32 y2) + { + int i; + if (y1 < y2) { +@@ -310,7 +310,7 @@ + } + + /* Draw a line between two coordinates */ +-inline void drawline(int x1,int y1,int x2,int y2) ++void drawline(int x1,int y1,int x2,int y2) + { + int d, x, y, ax, ay, sx, sy, dx, dy; + if((dx = x2 - x1) == 0) { /* vertical line */ +@@ -358,7 +358,7 @@ + } + } + +-inline void MoveTo(int x,int y) ++void MoveTo(int x,int y) + { + current_x = convx(x); + current_y = convy(y); +@@ -366,12 +366,12 @@ + + + /* Scaling blit function by Greg Velichansky */ +-inline Uint32 ifloor(Uint32 i) ++Uint32 ifloor(Uint32 i) + { + return i & 0xFFFF0000; + } + +-inline Uint32 iceil(Uint32 i) ++Uint32 iceil(Uint32 i) + { + return (i & 0xFFFF) ? i : ifloor(i) + (1<<16); + } +@@ -379,7 +379,7 @@ + + /* The most pedantic-a%& getpixel and putpixel ever, hopefully. */ + /* There may still be endianness bugs! These will be fixed after adequte testing. XXX XXX XXX */ +-inline int SDL_GetPixel (SDL_Surface *f, Uint32 x, Uint32 y, ++int SDL_GetPixel (SDL_Surface *f, Uint32 x, Uint32 y, + Uint8 *r, Uint8 *g, Uint8 *b) + { + /*const Uint32 mask[] = {0x0, 0xff, 0xffff, 0xffffff, 0xffffffff};*/ +@@ -515,7 +515,7 @@ + SDL_UnlockSurface(screen); + } + } +-inline void lock_graphics() { ++void lock_graphics() { + if ( SDL_MUSTLOCK(screen) ) { + if ( SDL_LockSurface(screen) < 0 ) { + return; +@@ -523,13 +523,13 @@ + } + } + +-inline void ResetRefreshCoords() ++void ResetRefreshCoords() + { + minx = miny = -1; + maxx = maxy = 0; + } + +-inline void RedrawObject() { ++void RedrawObject() { + if(minx >= 0) { + rects[rec_counter].x = minx; + rects[rec_counter].y = miny; +@@ -540,7 +540,7 @@ + } + + static int is_poly=0; +-inline void LineTo(int x,int y) ++void LineTo(int x,int y) + { + x = convx(x); y = convy(y); + drawline(current_x,current_y,x,y); +@@ -549,7 +549,7 @@ + } + + +-inline void Polyline(POINT *pts,int n) ++void Polyline(POINT *pts,int n) + { + int f; + if(n<2) return; +@@ -560,7 +560,7 @@ + LineTo(pts->x, pts->y); + } + +-inline void Circle(Sint16 x, Sint16 y, Sint32 r) ++void Circle(Sint16 x, Sint16 y, Sint32 r) + { + x = convx(x); + y = convy(y); +@@ -569,7 +569,7 @@ + } + + /* doesn't set current_[xy] because hyperoid.c doesn't need it to */ +-inline void SetPixel(Sint16 x, Sint16 y,Uint32 c) ++void SetPixel(Sint16 x, Sint16 y,Uint32 c) + { + current_color = c; + x = convx(x); +@@ -578,7 +578,7 @@ + } + + +-inline void set_colour(int c) ++void set_colour(int c) + { + current_color = c; + } diff --git a/games-arcade/sdlroids/files/1.3.4-sound.patch b/games-arcade/sdlroids/files/sdlroids-1.3.4-sound.patch index eb2eb0c2ada4..eb2eb0c2ada4 100644 --- a/games-arcade/sdlroids/files/1.3.4-sound.patch +++ b/games-arcade/sdlroids/files/sdlroids-1.3.4-sound.patch diff --git a/games-arcade/sdlroids/metadata.xml b/games-arcade/sdlroids/metadata.xml index baad890bb595..6c1fa30b84ba 100644 --- a/games-arcade/sdlroids/metadata.xml +++ b/games-arcade/sdlroids/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/sdlroids/sdlroids-1.3.4-r4.ebuild b/games-arcade/sdlroids/sdlroids-1.3.4-r5.ebuild index 5500d6870314..dbf893cfb4c0 100644 --- a/games-arcade/sdlroids/sdlroids-1.3.4-r4.ebuild +++ b/games-arcade/sdlroids/sdlroids-1.3.4-r5.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit desktop +EAPI=7 + +inherit autotools desktop DESCRIPTION="Asteroids Clone for X using SDL" HOMEPAGE="http://david.hedbor.org/projects/sdlroids/" @@ -10,25 +11,28 @@ SRC_URI="mirror://sourceforge/sdlroids/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~x86" -IUSE="" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + media-libs/libsdl[joystick] + media-libs/sdl-mixer" +DEPEND="${RDEPEND}" -DEPEND="media-libs/libsdl - media-libs/sdl-mixer -" -RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}"/${P}-sound.patch + "${FILESDIR}"/${P}-Makefile.patch + "${FILESDIR}"/${P}-fno-common.patch +) src_prepare() { default - sed -i \ - -e 's/$(SOUNDSDIR)/$(DESTDIR)$(SOUNDSDIR)/' \ - -e 's/$(GFXDIR)/$(DESTDIR)$(GFXDIR)/' Makefile.in \ - || die "sed failed" - eapply "${FILESDIR}"/${PV}-sound.patch + mv configure.{in,ac} || die + eautoreconf } src_install() { default + newicon icons/sdlroids-48x48.xpm ${PN}.xpm make_desktop_entry ${PN} SDLRoids ${PN} } diff --git a/games-arcade/sdlsasteroids/metadata.xml b/games-arcade/sdlsasteroids/metadata.xml index 11957fc04bd7..a1c3bf538f2e 100644 --- a/games-arcade/sdlsasteroids/metadata.xml +++ b/games-arcade/sdlsasteroids/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/sdlsasteroids/sdlsasteroids-3.0.1-r1.ebuild b/games-arcade/sdlsasteroids/sdlsasteroids-3.0.1-r1.ebuild index ca199ae1cbe8..a4301c145864 100644 --- a/games-arcade/sdlsasteroids/sdlsasteroids-3.0.1-r1.ebuild +++ b/games-arcade/sdlsasteroids/sdlsasteroids-3.0.1-r1.ebuild @@ -1,32 +1,35 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + inherit desktop DESCRIPTION="Rework of Sasteroids using SDL" -HOMEPAGE="http://sdlsas.sourceforge.net/" +HOMEPAGE="https://sdlsas.sourceforge.net/" SRC_URI="mirror://sourceforge/sdlsas/SDLSasteroids-${PV}.tar.gz" +S="${WORKDIR}/SDLSasteroids-${PV}" LICENSE="sdlsasteroids GPL-2+ public-domain" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -DEPEND="virtual/opengl +DEPEND=" media-libs/sdl-mixer media-libs/libsdl[sound,joystick,video] media-libs/sdl-image[png] - media-libs/sdl-ttf" + media-libs/sdl-ttf + virtual/opengl + virtual/glu" RDEPEND="${DEPEND}" -S="${WORKDIR}/SDLSasteroids-${PV}" - src_prepare() { default + eapply \ "${FILESDIR}"/${P}-gcc43.patch \ "${FILESDIR}"/${P}-ldflags.patch + sed -i \ -e 's/make /$(MAKE) /' \ -e 's/--strip//' \ @@ -47,11 +50,13 @@ src_compile() { src_install() { dodir /usr/share/man/man6/ + emake \ GAMEDIR="${D}/usr/share/${PN}" \ BINDIR="${D}/usr/bin" \ MANDIR="${D}/usr/share/man/" \ install + dodoc ChangeLog README README.xast TODO description newicon graphics/sprite/bigast.png ${PN}.png make_desktop_entry sasteroids "Sasteroids" ${PN} diff --git a/games-arcade/shovel-knight/Manifest b/games-arcade/shovel-knight/Manifest index 3eb8934d6031..4d88cf4691f3 100644 --- a/games-arcade/shovel-knight/Manifest +++ b/games-arcade/shovel-knight/Manifest @@ -1 +1 @@ -DIST shovel_knight_treasure_trove_en_3_3_15418.sh 226753557 BLAKE2B 3103871333f5dec931b109ccc8a8820054f8bd934d01daf97bb5ad84e9dfaebd2c79d1943fb7049468f49c9db87c51dec0e08d38469e364bafb8bc50fbd9d40d SHA512 6832593440cc5059f0df37be991bb2e87c071c7ed566b2c6d0f6cc418190be92c4f793f2c694f620b9378914cde13abf9049eba8cdd90b9dfe961ae9a65dc42a +DIST shovel_knight_treasure_trove_4_1b_arby_s_46298.sh 338751327 BLAKE2B 6285266a6013331ed59b399fcbe4a3a2069e1efe403411c7e85a9c165a33e262c0a92085c7a5da7fca31573eaeb29b32915f006cc9093944be03214407e891ef SHA512 ecb5967de37e482aec8fcd992f4d7c269e8b676ed119785114f465dd85932453f3facfcd7e77d7bf3044033189d0d33692bb4de3332753ee57bac74b7adec499 diff --git a/games-arcade/shovel-knight/metadata.xml b/games-arcade/shovel-knight/metadata.xml index 26079e608bed..7c730d47817a 100644 --- a/games-arcade/shovel-knight/metadata.xml +++ b/games-arcade/shovel-knight/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/shovel-knight/shovel-knight-4.1b-r1.ebuild b/games-arcade/shovel-knight/shovel-knight-4.1b-r1.ebuild new file mode 100644 index 000000000000..185cfa3f331a --- /dev/null +++ b/games-arcade/shovel-knight/shovel-knight-4.1b-r1.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop unpacker wrapper xdg + +MY_PN="ShovelKnight" +DESCRIPTION="Sweeping classic action adventure with an 8-bit retro aesthetic" +HOMEPAGE="https://yachtclubgames.com/games/shovel-knight-treasure-trove/" +SRC_URI="${PN//-/_}_treasure_trove_4_1b_arby_s_46298.sh" +S="${WORKDIR}/data/noarch/game" + +LICENSE="Yacht-Club-Games-EULA" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="+joystick" +RESTRICT="bindist fetch splitdebug" + +# I packaged Box2D in the hope of unbundling it but it turns out this +# game uses a custom version. -- Chewi :( + +RDEPEND=" + media-libs/glew:1.10 + virtual/opengl + !x86? ( media-libs/libsdl2[joystick?,opengl,sound,video] ) + x86? ( !joystick? ( media-libs/libsdl2[opengl,sound,video] ) ) +" + +BDEPEND=" + dev-util/patchelf +" + +DIR="/opt/${PN}" +QA_PREBUILT="${DIR#/}/*" + +pkg_nofetch() { + einfo "Please buy and download ${SRC_URI} from:" + einfo " https://www.gog.com/game/${PN//-/_}" + einfo "and move it to your distfiles directory." +} + +src_unpack() { + unpack_zip ${A} +} + +src_install() { + local BITS=$(usex amd64 64 32) LIB= + + exeinto "${DIR}" + doexe ${BITS}/${MY_PN} + make_wrapper ${MY_PN} ./${MY_PN} "${DIR}" + + exeinto "${DIR}"/lib + doexe ${BITS}/lib/lib{Box2D.so.*,fmod*-*.so} + + for LIB in ${BITS}/lib/libfmod*-*.so; do + LIB=${LIB##*/} + + # The FMOD libraries are duplicated rather than symlinked, which is + # silly, so create our own symlinks. Both sets of names are needed. + dosym "${LIB}" "${DIR}/lib/${LIB%-*}.so" + + # The SONAMEs are also unset, which upsets our QA check, so fix. + patchelf --set-soname "${LIB%-*}.so" "${ED}${DIR}/lib/${LIB}" || die + done + + if use joystick; then + local SDL=libSDL2-2.0.so.0 + local SDLj=libSDL2-joystick.so + + if use x86; then + # Under x86, using our own SDL2 causes the game to crash when a + # controller is connected, even after applying the workaround below. + # It is seemingly caused by a change to the SDL_GetJoystickGUIDInfo + # signature. We must therefore use the bundled SDL2. + doexe ${BITS}/lib/${SDL} + else + # The game uses internal SDL2 joystick functions. These functions + # have since been hidden and some have been removed. Using our own + # SDL2 therefore causes the game to crash when a controller is + # connected. We still want to use our own SDL2 for things like + # Wayland, but we can work around this by loading both, using the + # bundled one as a fallback. + newexe ${BITS}/lib/${SDL} ${SDLj} + + # The bundled SDL2 SONAME has to be set to something different. + patchelf --set-soname ${SDLj} "${ED}${DIR}"/lib/${SDLj} || die + + # We need to add the new SONAME as a NEEDED entry, but the order is + # important, so we also need to remove the existing NEEDED entry + # first and add it back again afterwards. + patchelf \ + --remove-needed ${SDL} \ + --add-needed ${SDLj} \ + --add-needed ${SDL} \ + "${ED}${DIR}"/${MY_PN} || die + fi + fi + + # The RUNPATHs are not entirely correct so fix up. + patchelf --set-rpath '$ORIGIN/lib' "${ED}${DIR}"/${MY_PN} || die + patchelf --set-rpath '$ORIGIN' "${ED}${DIR}"/lib/libfmodevent*.so || die + + insinto "${DIR}" + doins -r data/ + + newicon -s 256 ../support/icon.png ${PN}.png + make_desktop_entry ${MY_PN} "Shovel Knight" +} diff --git a/games-arcade/shovel-knight/shovel-knight-3.3.ebuild b/games-arcade/shovel-knight/shovel-knight-4.1b.ebuild index 656b2c154484..f2b3660f73f9 100644 --- a/games-arcade/shovel-knight/shovel-knight-3.3.ebuild +++ b/games-arcade/shovel-knight/shovel-knight-4.1b.ebuild @@ -1,14 +1,16 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit eutils desktop unpacker xdg-utils +inherit desktop unpacker wrapper xdg MY_PN="ShovelKnight" DESCRIPTION="Sweeping classic action adventure with an 8-bit retro aesthetic" -HOMEPAGE="https://yachtclubgames.com/shovel-knight/" -SRC_URI="${PN//-/_}_treasure_trove_en_3_3_15418.sh" +HOMEPAGE="https://yachtclubgames.com/games/shovel-knight-treasure-trove/" +SRC_URI="${PN//-/_}_treasure_trove_4_1b_arby_s_46298.sh" +S="${WORKDIR}/data/noarch/game" + LICENSE="Yacht-Club-Games-EULA" SLOT="0" KEYWORDS="-* ~amd64 ~x86" @@ -23,8 +25,6 @@ RDEPEND=" virtual/opengl " -S="${WORKDIR}/data/noarch/game" - DIR="/opt/${PN}" QA_PREBUILT="${DIR#/}/*" @@ -61,6 +61,3 @@ src_install() { newicon -s 256 ../support/icon.png ${PN}.png make_desktop_entry ${MY_PN} "Shovel Knight" } - -pkg_postinst() { xdg_icon_cache_update; } -pkg_postrm() { xdg_icon_cache_update; } diff --git a/games-arcade/slimevolley/files/slimevolley-2.4.2-gcc10.patch b/games-arcade/slimevolley/files/slimevolley-2.4.2-gcc10.patch new file mode 100644 index 000000000000..15338a7bfaa0 --- /dev/null +++ b/games-arcade/slimevolley/files/slimevolley-2.4.2-gcc10.patch @@ -0,0 +1,263 @@ +Author: Reiner Herrmann <reiner@reiner-h.de> +Description: Fix FTBFS with GCC 10 +Bug-Debian: https://bugs.debian.org/957813 + +--- a/src/themes.h ++++ b/src/themes.h +@@ -41,28 +41,28 @@ + bool _charge_theme_act(char* theme_select); + void _theme_suivant(bool initial); + +-char nom_theme[32]; +-char theme_act[32]; ++extern char nom_theme[32]; ++extern char theme_act[32]; + +-int menu_decalage, menu_t_police, menu_ecart; ++extern int menu_decalage, menu_t_police, menu_ecart; + +-SDL_Color coul_txt_menu, coul_txt_dial, coul_txt_jeu, coul_filet, coul_sol, coul_fond; ++extern SDL_Color coul_txt_menu, coul_txt_dial, coul_txt_jeu, coul_filet, coul_sol, coul_fond; + +-SDL_Surface *sol, *filet, *balle_img, *fleche, *oeil, *icone_jg, *icone_jd, *icone_fen; ++extern SDL_Surface *sol, *filet, *balle_img, *fleche, *oeil, *icone_jg, *icone_jd, *icone_fen; + +-SDL_Surface **img_grand_jg, **img_grand_jd, **img_2J_jg, **img_2J_jd, **img_3J_jg, **img_3J_jd; +-Uint8 img_max_jg, img_max_jd; ++extern SDL_Surface **img_grand_jg, **img_grand_jd, **img_2J_jg, **img_2J_jd, **img_3J_jg, **img_3J_jd; ++extern Uint8 img_max_jg, img_max_jd; + +-SDL_Surface *fond, *fond_jeu; ++extern SDL_Surface *fond, *fond_jeu; + +-TTF_Font* police; /* La police de caract竪res */ +-TTF_Font* police_menu; ++extern TTF_Font* police; /* La police de caract竪res */ ++extern TTF_Font* police_menu; + +-Uint16 decalage_haut, decalage_gauche; +-float ratio_police; ++extern Uint16 decalage_haut, decalage_gauche; ++extern float ratio_police; + +-bool th_libere; ++extern bool th_libere; + +-char* chemin_moi; ++extern char* chemin_moi; + + #endif +--- a/src/themes_general.c ++++ b/src/themes_general.c +@@ -31,6 +31,21 @@ + #define RATIO_3J .6 + #define RATIO_IC .4 + ++char nom_theme[32]; ++char theme_act[32]; ++int menu_decalage, menu_t_police, menu_ecart; ++SDL_Color coul_txt_menu, coul_txt_dial, coul_txt_jeu, coul_filet, coul_sol, coul_fond; ++SDL_Surface *sol, *filet, *balle_img, *fleche, *oeil, *icone_jg, *icone_jd, *icone_fen; ++SDL_Surface **img_grand_jg, **img_grand_jd, **img_2J_jg, **img_2J_jd, **img_3J_jg, **img_3J_jd; ++Uint8 img_max_jg, img_max_jd; ++SDL_Surface *fond, *fond_jeu; ++TTF_Font* police; /* La police de caract竪res */ ++TTF_Font* police_menu; ++Uint16 decalage_haut, decalage_gauche; ++float ratio_police; ++bool th_libere; ++char* chemin_moi; ++ + SDL_Rect filet_rect = { FILET_GAUCHE, HAUT_ECRAN - HAUT_SOL - FILET_HAUT, 0, 0 }; + SDL_Rect sol_rect = { 0, HAUT_ECRAN - HAUT_SOL, 0, 0 }; + SDL_Rect fond_rect; +--- a/src/slime.c ++++ b/src/slime.c +@@ -53,6 +53,20 @@ + #endif + #endif + ++SDL_Event evenement; ++SDL_Surface *ecran; /* L'辿cran */ ++joueur tab_joueurs[NB_JOUEURS_T]; /* Ce tableau contient les configuration des joueurs */ ++touches_joueur touches[4]; ++Uint8 nb_balles; ++balle_obj tab_balles[MAX_BALLES]; ++config_slime conf; /* La configuration actuelle (modifiable) */ ++Uint8 act_conf; ++Uint32 ev_timer(Uint32 intervalle, void* param); ++Uint16 h_ecran, l_ecran; ++bool quitter; ++bool fen_ok; ++bool plein_ecran, aff_fps, aff_sc_perm; ++ + char conf_chemin[64] = CONFIG_NOM; + + void afficher(char* chaine, TTF_Font* police_texte, SDL_Color coul_texte, Uint16 posX, Uint16 posY) { +--- a/src/slime.h ++++ b/src/slime.h +@@ -68,7 +68,7 @@ + #define snprintf5(a, b, c, d, e) snprintf(a, b, c, d, e) + #endif + +-SDL_Event evenement; ++extern SDL_Event evenement; + + void afficher(char* chaine, TTF_Font* police_texte, SDL_Color coul_text, Uint16 posX, Uint16 posY); + void aff_aide(const char* texte); +@@ -85,23 +85,23 @@ + + /* Les variables globales n辿cessaires... */ + +-SDL_Surface *ecran; /* L'辿cran */ ++extern SDL_Surface *ecran; /* L'辿cran */ + +-joueur tab_joueurs[NB_JOUEURS_T]; /* Ce tableau contient les configuration des joueurs */ +-touches_joueur touches[4]; ++extern joueur tab_joueurs[NB_JOUEURS_T]; /* Ce tableau contient les configuration des joueurs */ ++extern touches_joueur touches[4]; + +-Uint8 nb_balles; +-balle_obj tab_balles[MAX_BALLES]; ++extern Uint8 nb_balles; ++extern balle_obj tab_balles[MAX_BALLES]; + +-config_slime conf; /* La configuration actuelle (modifiable) */ ++extern config_slime conf; /* La configuration actuelle (modifiable) */ + +-Uint8 act_conf; ++extern Uint8 act_conf; + +-Uint32 ev_timer(Uint32 intervalle, void* param); ++extern Uint32 ev_timer(Uint32 intervalle, void* param); + +-Uint16 h_ecran, l_ecran; ++extern Uint16 h_ecran, l_ecran; + +-bool quitter; +-bool fen_ok; +-bool plein_ecran, aff_fps, aff_sc_perm; ++extern bool quitter; ++extern bool fen_ok; ++extern bool plein_ecran, aff_fps, aff_sc_perm; + #endif +--- a/src/audio.c ++++ b/src/audio.c +@@ -26,6 +26,10 @@ + #include "slime.h" + #include "audio.h" + ++bool audio_desact; ++bool son_active; ++slime_son sons[NB_SONS]; ++ + SDL_AudioSpec format_obtenu; + + slime_son* son_act; +--- a/src/audio.h ++++ b/src/audio.h +@@ -40,8 +40,8 @@ + + void stop_son(void); + +-bool audio_desact; +-bool son_active; ++extern bool audio_desact; ++extern bool son_active; + + enum { + SON_RBD_SLIME = 0, +@@ -54,6 +54,6 @@ + NB_SONS = 7 + }; + +-slime_son sons[NB_SONS]; ++extern slime_son sons[NB_SONS]; + + #endif +--- a/src/reseau.c ++++ b/src/reseau.c +@@ -34,6 +34,11 @@ + #define PORT 2222 /* A changer aussi dans les messages */ + #define HANDSHAKE "HelloSV241" + ++Uint8 nb_reseau; /* Nombre de joueurs r辿seau */ ++Uint8 nb_total; /* Nombre de joueurs au total */ ++UDPpacket* paquet; ++Uint8 clt_id_joueur; ++ + UDPsocket res_socket; + IPaddress j_adresses[NB_JOUEURS_T]; + +--- a/src/reseau.h ++++ b/src/reseau.h +@@ -48,12 +48,12 @@ + Uint8 connecte_client(char* addr_ip); + void deconnecte_client(void); + +-Uint8 nb_reseau; /* Nombre de joueurs r辿seau */ +-Uint8 nb_total; /* Nombre de joueurs au total */ ++extern Uint8 nb_reseau; /* Nombre de joueurs r辿seau */ ++extern Uint8 nb_total; /* Nombre de joueurs au total */ + +-UDPpacket* paquet; ++extern UDPpacket* paquet; + +-Uint8 clt_id_joueur; ++extern Uint8 clt_id_joueur; + + #endif + #endif +--- a/src/menu.c ++++ b/src/menu.c +@@ -31,6 +31,11 @@ + + #define TEXTE_GAUCHE 170 + ++int decalage; /* Pour aligner les slimes par rapport au texte */ ++Sint8 menu_act; /* L'辿l辿ment de menu actuellement choisi */ ++Uint8 menu_raf; /* L'辿l辿ment de menu actuellement rafraichi */ ++Sint8 action; /* Indique la touche press辿e par l'utilisateur (gauche/retour/droite) */ ++ + void affiche_menu(menu_elem* fonctions, Uint8 n, char* nom_retour) { + Uint8 i; + +--- a/src/menu.h ++++ b/src/menu.h +@@ -41,10 +41,10 @@ + + void affiche_menu(menu_elem* fonctions, Uint8 n, char* nom_retour); + +-int decalage; /* Pour aligner les slimes par rapport au texte */ ++extern int decalage; /* Pour aligner les slimes par rapport au texte */ + +-Sint8 menu_act; /* L'lment de menu actuellement choisi */ +-Uint8 menu_raf; /* L'lment de menu actuellement rafraichi */ +-Sint8 action; /* Indique la touche presse par l'utilisateur (gauche/retour/droite) */ ++extern Sint8 menu_act; /* L'lment de menu actuellement choisi */ ++extern Uint8 menu_raf; /* L'lment de menu actuellement rafraichi */ ++extern Sint8 action; /* Indique la touche presse par l'utilisateur (gauche/retour/droite) */ + + #endif +--- a/src/menu_options.c ++++ b/src/menu_options.c +@@ -26,7 +26,7 @@ + #include "reseau.h" + #include "audio.h" + +-char tmp_chaine[64]; ++static char tmp_chaine[64]; + + void m_touches_act(void) { + configClavier(); +--- a/src/menu_princ.c ++++ b/src/menu_princ.c +@@ -27,7 +27,7 @@ + #include "slime.h" + #include "themes.h" + +-char tmp_chaine[64]; ++static char tmp_chaine[64]; + + char* m_vitesse_aff(void) { + const char* noms_confs[] = { N_("normal"), N_("turbo"), N_("sprint") , N_("fury") }; diff --git a/games-arcade/slimevolley/metadata.xml b/games-arcade/slimevolley/metadata.xml index 26079e608bed..7c730d47817a 100644 --- a/games-arcade/slimevolley/metadata.xml +++ b/games-arcade/slimevolley/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/slimevolley/slimevolley-2.4.2-r1.ebuild b/games-arcade/slimevolley/slimevolley-2.4.2-r1.ebuild index 5d5491639d34..14a3a044c3ce 100644 --- a/games-arcade/slimevolley/slimevolley-2.4.2-r1.ebuild +++ b/games-arcade/slimevolley/slimevolley-2.4.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,12 +7,11 @@ inherit cmake DESCRIPTION="A simple volleyball game" HOMEPAGE="http://slime.tuxfamily.org/index.php" -SRC_URI="http://downloads.tuxfamily.org/slime/v242/${PN}_${PV}.tar.bz2" +SRC_URI="http://downloads.tuxfamily.org/slime/v${PV//.}/${PN}_${PV}.tar.bz2" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" BDEPEND=" sys-devel/gettext @@ -31,6 +30,7 @@ DOCS=( docs/{README,TODO} ) PATCHES=( "${FILESDIR}"/${P}-nodatalocal.patch "${FILESDIR}"/${P}-underlink.patch + "${FILESDIR}"/${P}-gcc10.patch ) S="${WORKDIR}/${PN}" @@ -38,7 +38,7 @@ S="${WORKDIR}/${PN}" src_configure() { local mycmakeargs=( -DCMAKE_VERBOSE_MAKEFILE=TRUE - -DDATA_DIR=/usr/share/slimevolley + -DDATA_DIR="${EPREFIX}/usr/share/slimevolley" ) cmake_src_configure } diff --git a/games-arcade/solarwolf/Manifest b/games-arcade/solarwolf/Manifest index dd673590cfdb..a92669c7f334 100644 --- a/games-arcade/solarwolf/Manifest +++ b/games-arcade/solarwolf/Manifest @@ -1,2 +1,2 @@ DIST solarwolf-1.5.tar.gz 2045888 BLAKE2B 66498b1d9b202b45ff87ea9d4b1ab14dcb6e343e8b0761576cfbf1c84ee9575cbf665e4b94552eb764f5e4fbaa02739f62c9eb20217085a6d18483d3ca7eb587 SHA512 44d84976f7797e3b859f1e5e50f9f964e5c6d6d4437ad25cf04720035e8697cc0c86490fdbbf8d923320a5c15c6e3afd1fbcfb9f17e7e31ce6f7264004e991f2 -DIST solarwolf_1.5+dfsg1-1.debian.tar.xz 8392 BLAKE2B 099543a22e93775756a90867dfeb7926ab9131b8367fa356a6d74efb682d17c5426f5f5372079052967a752a0c75e1d2db36b2ce0b43d00010c65468da968817 SHA512 b4d8ad1a0e83e4cf97185b075a53b7f66fbc20f865e490f714295f678fc675a111d2318e7c0b543028b5d948677140070acb9c04b07fdab1165e37606f34d87a +DIST solarwolf_1.5+dfsg1-3.debian.tar.xz 8944 BLAKE2B 7d83da34338e069d5076e7852f87f233043bfd3f3b2fe93a03fc3fcc631545ff666922d776d25689dec0723b077a373b30aed70ff713e27fad2c0f77bcf3b40e SHA512 e443c6096d7fae2ead3a4d6cacd21590dbdd89ae3293bbd3a219a5337647088b417d6712cef0839c394bc18570d0255d2c3af12a0fc1aae718955ddc64dced95 diff --git a/games-arcade/solarwolf/metadata.xml b/games-arcade/solarwolf/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/solarwolf/metadata.xml +++ b/games-arcade/solarwolf/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/solarwolf/solarwolf-1.5-r2.ebuild b/games-arcade/solarwolf/solarwolf-1.5-r2.ebuild deleted file mode 100644 index 8f291786f9cb..000000000000 --- a/games-arcade/solarwolf/solarwolf-1.5-r2.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit desktop eutils python-r1 - -DESCRIPTION="Action/arcade recreation of SolarFox" -HOMEPAGE="http://www.pygame.org/shredwheat/solarwolf/" -SRC_URI=" - http://www.pygame.org/shredwheat/solarwolf/${P}.tar.gz - mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}+dfsg1-1.debian.tar.xz -" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~x86" - -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - >=dev-python/pygame-1.5.6[${PYTHON_USEDEP}] - media-libs/sdl-mixer[mod,vorbis] -" -DEPEND="${RDEPEND}" -BDEPEND="" - -src_prepare() { - default - - eapply -p1 "${WORKDIR}"/debian/patches/*.patch - - find . -name .xvpics -print0 | xargs -0 rm -fr - gunzip dist/${PN}.6.gz || die #619948 -} - -src_install() { - insinto /usr/share/${PN} - doins -r code data *py - make_wrapper ${PN} "python3 ./solarwolf.py" /usr/share/${PN} - newicon data/ship-big.png ${PN}.png - make_desktop_entry ${PN} SolarWolf - einstalldocs - doman dist/${PN}.6 -} diff --git a/games-arcade/solarwolf/solarwolf-1.5_p3.ebuild b/games-arcade/solarwolf/solarwolf-1.5_p3.ebuild new file mode 100644 index 000000000000..63dbad85cf2b --- /dev/null +++ b/games-arcade/solarwolf/solarwolf-1.5_p3.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +inherit desktop python-single-r1 + +MY_P="${PN}-$(ver_cut 1-2)" + +DESCRIPTION="Action/arcade recreation of SolarFox" +HOMEPAGE="https://www.pygame.org/shredwheat/solarwolf/index.shtml" +SRC_URI=" + http://www.pygame.org/shredwheat/solarwolf/${MY_P}.tar.gz + mirror://debian/pool/main/s/solarwolf/${MY_P/-/_}+dfsg1-${PV/*_p}.debian.tar.xz" +S="${WORKDIR}/${MY_P}" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~x86" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + ${PYTHON_DEPS} + $(python_gen_cond_dep 'dev-python/pygame[${PYTHON_USEDEP}]') + media-libs/sdl2-image[gif,png] + media-libs/sdl2-mixer[mod,vorbis]" +BDEPEND="${PYTHON_DEPS}" + +PATCHES=( + "${WORKDIR}"/debian/patches +) + +src_prepare() { + default + + sed -e "/CODEDIR = \"/s|= .*|= \"${EPREFIX}/usr/share/${PN}/code\"|" \ + -e "/DATADIR = \"/s|= .*|= \"${EPREFIX}/usr/share/${PN}\"|" \ + -i ${PN}.py || die + python_fix_shebang ${PN}.py + + # default to windowed given it forces resolution and menus can be invisible + sed -i '/^display = 1/s/1/0/' code/game.py || die + + rm -r data/.xvpics || die + gzip -d dist/${PN}.6.gz || die +} + +src_install() { + newbin ${PN}.py ${PN} + doman dist/${PN}.6 + + insinto /usr/share/${PN} + doins -r code data + + dodoc readme.txt + + newicon data/ship-big.png ${PN}.png + make_desktop_entry ${PN} SolarWolf +} diff --git a/games-arcade/spacerider/metadata.xml b/games-arcade/spacerider/metadata.xml index 6d3980e569e5..1c3ba213c494 100644 --- a/games-arcade/spacerider/metadata.xml +++ b/games-arcade/spacerider/metadata.xml @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> -<longdescription lang="en"> -spacerider is a space-shooter written in C++, using the SDL. -</longdescription> </pkgmetadata> diff --git a/games-arcade/spout/files/spout-1.3-Fix-implicit-function-declarations.patch b/games-arcade/spout/files/spout-1.3-Fix-implicit-function-declarations.patch new file mode 100644 index 000000000000..644166e914ab --- /dev/null +++ b/games-arcade/spout/files/spout-1.3-Fix-implicit-function-declarations.patch @@ -0,0 +1,30 @@ +From d2382ee06a8f9feb9bed39bf592ad88b5c02bbf6 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sun, 23 Oct 2022 13:21:55 +0100 +Subject: [PATCH] Fix implicit function declarations + +Bug: https://bugs.gentoo.org/875722 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/piece.c ++++ b/piece.c +@@ -15,6 +15,10 @@ int zoom, fullscreen; + + unsigned char *vBuffer = NULL; + ++void pceAppInit (void); ++void pceAppExit (void); ++int pceAppProc (int cnt); ++ + void + pceLCDDispStop () + { +--- a/spout.c ++++ b/spout.c +@@ -80,6 +80,7 @@ void sweep (unsigned char c1, unsigned char c2); + void initGrain (void); + GRAIN *allocGrain (void); + GRAIN *freeGrain (GRAIN * current); ++void pceAppInit (void); + + #ifdef HAVE_WORDEXP_H + wordexp_t *scorefile; diff --git a/games-arcade/spout/files/spout-1.3-fno-common.patch b/games-arcade/spout/files/spout-1.3-fno-common.patch new file mode 100644 index 000000000000..37c1098b0826 --- /dev/null +++ b/games-arcade/spout/files/spout-1.3-fno-common.patch @@ -0,0 +1,18 @@ +--- a/piece.c ++++ b/piece.c +@@ -11,6 +11,7 @@ + + SDL_Surface *video, *layer; + SDL_Rect layerRect; ++int zoom, fullscreen; + + unsigned char *vBuffer = NULL; + +--- a/piece.h ++++ b/piece.h +@@ -53,4 +53,4 @@ + + int pcePadGet (); + +-int zoom, fullscreen; ++extern int zoom, fullscreen; diff --git a/games-arcade/spout/metadata.xml b/games-arcade/spout/metadata.xml index 2e04b38a71db..7c730d47817a 100644 --- a/games-arcade/spout/metadata.xml +++ b/games-arcade/spout/metadata.xml @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> - <upstream> - <remote-id type="freshmeat">spout</remote-id> - </upstream> </pkgmetadata> diff --git a/games-arcade/spout/spout-1.3-r1.ebuild b/games-arcade/spout/spout-1.3-r3.ebuild index 876b18d55681..9f30a8242b0d 100644 --- a/games-arcade/spout/spout-1.3-r1.ebuild +++ b/games-arcade/spout/spout-1.3-r3.ebuild @@ -1,10 +1,12 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit desktop readme.gentoo-r1 +EAPI=8 + +inherit autotools desktop readme.gentoo-r1 MY_P="spout-unix-${PV}" + DESCRIPTION="Abstract Japanese caveflier / shooter" HOMEPAGE="http://freshmeat.net/projects/spout/" SRC_URI="http://rohanpm.net/files/old/${MY_P}.tar.bz2" @@ -12,31 +14,40 @@ SRC_URI="http://rohanpm.net/files/old/${MY_P}.tar.bz2" LICENSE="LGPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" DEPEND=">=media-libs/libsdl-1.2.6" RDEPEND="${DEPEND}" S="${WORKDIR}/${MY_P}" -DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS=" -To play in fullscreen mode, do 'spout f'. -To play in a greater resolution, do 'spout x', where -x is an integer; the larger x is, the higher the resolution. +PATCHES=( + "${FILESDIR}"/${P}-fno-common.patch + "${FILESDIR}"/${PN}-1.3-Fix-implicit-function-declarations.patch +) -To play: -* Accelerate - spacebar, enter, z, x -* Pause - escape -* Exit - shift+escape -* Rotate - left or right -" +src_prepare() { + default + + eautoreconf +} src_install() { dobin spout + einstalldocs + doicon spout.png make_desktop_entry spout "Spout" - einstalldocs + + local DOC_CONTENTS=" + To play in fullscreen mode, do 'spout f'. + To play in a greater resolution, do 'spout x', where + x is an integer; the larger x is, the higher the resolution. + + To play: + * Accelerate - spacebar, enter, z, x + * Pause - escape + * Exit - shift+escape + * Rotate - left or right" readme.gentoo_create_doc } diff --git a/games-arcade/stardork/files/stardork-0.7-clang16.patch b/games-arcade/stardork/files/stardork-0.7-clang16.patch new file mode 100644 index 000000000000..c815fcd281fb --- /dev/null +++ b/games-arcade/stardork/files/stardork-0.7-clang16.patch @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/871498 +--- a/stardork.c ++++ b/stardork.c +@@ -376,3 +376,3 @@ + +-void plot_wormhole(y, x) { ++void plot_wormhole(int y, int x) { + int r1, r2, i, j; +@@ -564,3 +564,3 @@ + +-void change_colors(color) { ++void change_colors(int color) { + if (has_colors() != FALSE) { diff --git a/games-arcade/stardork/metadata.xml b/games-arcade/stardork/metadata.xml index 9ec7c6ba6559..913c34a68458 100644 --- a/games-arcade/stardork/metadata.xml +++ b/games-arcade/stardork/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/stardork/stardork-0.7-r1.ebuild b/games-arcade/stardork/stardork-0.7-r1.ebuild deleted file mode 100644 index d2458f6571f1..000000000000 --- a/games-arcade/stardork/stardork-0.7-r1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs - -DESCRIPTION="An ncurses-based space shooter" -HOMEPAGE="http://stardork.sourceforge.net/" -SRC_URI="mirror://sourceforge/stardork/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" -IUSE="" - -RDEPEND="sys-libs/ncurses:0=" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -src_prepare() { - default - rm -f Makefile -} - -src_compile() { - emake CC="$(tc-getCC)" LDLIBS="$(pkg-config ncurses --libs)" ${PN} -} - -src_install() { - dobin ${PN} - einstalldocs -} diff --git a/games-arcade/stardork/stardork-0.7-r2.ebuild b/games-arcade/stardork/stardork-0.7-r2.ebuild new file mode 100644 index 000000000000..f6b1fece5104 --- /dev/null +++ b/games-arcade/stardork/stardork-0.7-r2.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="ncurses-based space shooter" +HOMEPAGE="https://stardork.sourceforge.net/" +SRC_URI="mirror://sourceforge/stardork/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" + +RDEPEND="sys-libs/ncurses:=" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-clang16.patch +) + +src_compile() { + tc-export CC + append-cppflags $($(tc-getPKG_CONFIG) ncurses --cflags || die) + append-libs $($(tc-getPKG_CONFIG) ncurses --libs || die) + + emake -f /dev/null LDLIBS="${LIBS}" ${PN} +} + +src_install() { + dobin ${PN} + einstalldocs +} diff --git a/games-arcade/supertransball2/metadata.xml b/games-arcade/supertransball2/metadata.xml index e1b87682aaf5..64c291ae9249 100644 --- a/games-arcade/supertransball2/metadata.xml +++ b/games-arcade/supertransball2/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/supertransball2/supertransball2-1.5-r1.ebuild b/games-arcade/supertransball2/supertransball2-1.5-r1.ebuild index 55a24219bd81..def712fd67b4 100644 --- a/games-arcade/supertransball2/supertransball2-1.5-r1.ebuild +++ b/games-arcade/supertransball2/supertransball2-1.5-r1.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit epatch desktop versionator +EAPI=7 -MY_PV="$(delete_all_version_separators)" +inherit desktop + +MY_PV="$(ver_rs 1- '')" MY_P="stransball2-v${MY_PV}" FILE="${MY_P}-linux" @@ -12,12 +13,13 @@ DESCRIPTION="Thrust clone" HOMEPAGE="http://www.braingames.getput.com/stransball2/" SRC_URI="http://braingames.bugreport.nl/stransball2/${FILE}.zip mirror://debian/pool/main/s/${PN}/${PN}_${PV}-8.debian.tar.xz" +S="${WORKDIR}/${P}/sources" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" +BDEPEND="app-arch/unzip" RDEPEND=" media-libs/libsdl[sound,video] media-libs/sdl-image @@ -25,24 +27,21 @@ RDEPEND=" media-libs/sdl-sound media-libs/sge " -DEPEND="${RDEPEND} - app-arch/unzip -" - -S="${WORKDIR}/${P}/sources" +DEPEND="${RDEPEND}" src_unpack() { unpack ${A} - mv -f "${FILE}" ${P} + mv -f "${FILE}" ${P} || die } src_prepare() { default + sed -i \ -e "s:/usr/share/games:/usr/share:" \ "${WORKDIR}"/debian/patches/0001-Fix-unix-paths-and-Makefile.patch || die - epatch "${WORKDIR}"/debian/patches/*.patch + eapply -p2 "${WORKDIR}"/debian/patches/*.patch sed -i \ -e "s: -I/usr/local/include/SDL::" \ @@ -52,7 +51,7 @@ src_prepare() { } src_install() { - cd .. + cd .. || die dobin ${PN} doicon ../debian/${PN}.png diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest index eaa21f152552..0af22cd61c13 100644 --- a/games-arcade/supertux/Manifest +++ b/games-arcade/supertux/Manifest @@ -1,2 +1 @@ -DIST SuperTux-v0.6.1.1-Source.tar.gz 163363780 BLAKE2B 313c25a74b950fc292821739c9edfe5c5878fad5f74e6ba6957fb3fa3740b2dafebc443211c090c46eb30aa9906768774cae6d245ea0c88d86ef80e77283e866 SHA512 9c4b535d5c55b3a582b05dab4ffb9658fd3d500165d428eb9e69c91b03e90dcf7517cadfa99554485950085764e6589e6a0a83304abebf7911e4c5a240270c10 -DIST SuperTux-v0.6.2-Source.tar.gz 174295862 BLAKE2B 1179a5ecf92dfb2ac56b87afe4fed21a2bdc1d7f91641fea8aafc2994ccfe49745420411f41b2145f06fa9714c73d75ecbc85160e85edcbd71c472026cefe708 SHA512 5baa783ee589b42a9bbce3740659dbb7b617ebfcc00c0a038c03d31b56700e3923c8548700ccebe42b325ca03bd85186bc5edef9f6580d93dc48d8aca88cbf74 +DIST SuperTux-v0.6.3-Source.tar.gz 182065428 BLAKE2B c4acbe2c61306e6e462a375205b4e95af174c87dbc391f15211e1fac365ab51147d7a83d20a90e35f7d7a994c72b560631ddf1686fee2e1f937f97a711fb1003 SHA512 c6540bab1b3befbd975756031c4587e5569d9613d9539dc829c728b574d1a4da92816d6a7e68947b32963cc13d9b8b52312701c199138640e9f89e5885433798 diff --git a/games-arcade/supertux/files/supertux-0.6.3-missing-include.patch b/games-arcade/supertux/files/supertux-0.6.3-missing-include.patch new file mode 100644 index 000000000000..4515c9a6003f --- /dev/null +++ b/games-arcade/supertux/files/supertux-0.6.3-missing-include.patch @@ -0,0 +1,10 @@ +--- a/external/partio_zip/zip_manager.hpp ++++ b/external/partio_zip/zip_manager.hpp +@@ -41,6 +41,7 @@ + #ifndef __ZIP__ + #define __ZIP__ + ++#include <memory> + #include <fstream> + #include <iostream> + #include <map> diff --git a/games-arcade/supertux/files/supertux-0.6.3-squirrel-CVE-2021-41556.patch b/games-arcade/supertux/files/supertux-0.6.3-squirrel-CVE-2021-41556.patch new file mode 100644 index 000000000000..a63e7a6c4e69 --- /dev/null +++ b/games-arcade/supertux/files/supertux-0.6.3-squirrel-CVE-2021-41556.patch @@ -0,0 +1,36 @@ +From 23a0620658714b996d20da3d4dd1a0dcf9b0bd98 Mon Sep 17 00:00:00 2001 +From: albertodemichelis <alberto@qnsoftware.com> +Date: Thu, 16 Sep 2021 22:36:53 +0800 +Subject: [PATCH] check max member count in class + +--- + squirrel/sqclass.cpp | 3 +++ + squirrel/sqclass.h | 1 + + 2 files changed, 4 insertions(+) + +diff --git a/squirrel/sqclass.cpp b/squirrel/sqclass.cpp +index fc619616..53a29763 100644 +--- a/external/squirrel/squirrel/sqclass.cpp ++++ b/external/squirrel/squirrel/sqclass.cpp +@@ -61,6 +61,9 @@ bool SQClass::NewSlot(SQSharedState *ss,const SQObjectPtr &key,const SQObjectPtr + _defaultvalues[_member_idx(temp)].val = val; + return true; + } ++ if (_members->CountUsed() >= MEMBER_MAX_COUNT) { ++ return false; ++ } + if(belongs_to_static_table) { + SQInteger mmidx; + if((sq_type(val) == OT_CLOSURE || sq_type(val) == OT_NATIVECLOSURE) && +diff --git a/squirrel/sqclass.h b/squirrel/sqclass.h +index 7d402172..60d3d21b 100644 +--- a/external/squirrel/squirrel/sqclass.h ++++ b/external/squirrel/squirrel/sqclass.h +@@ -17,6 +17,7 @@ typedef sqvector<SQClassMember> SQClassMemberVec; + + #define MEMBER_TYPE_METHOD 0x01000000 + #define MEMBER_TYPE_FIELD 0x02000000 ++#define MEMBER_MAX_COUNT 0x00FFFFFF + + #define _ismethod(o) (_integer(o)&MEMBER_TYPE_METHOD) + #define _isfield(o) (_integer(o)&MEMBER_TYPE_FIELD) diff --git a/games-arcade/supertux/files/supertux-0.6.3-squirrel-CVE-2022-30292.patch b/games-arcade/supertux/files/supertux-0.6.3-squirrel-CVE-2022-30292.patch new file mode 100644 index 000000000000..0a605616d606 --- /dev/null +++ b/games-arcade/supertux/files/supertux-0.6.3-squirrel-CVE-2022-30292.patch @@ -0,0 +1,21 @@ +From a6413aa690e0bdfef648c68693349a7b878fe60d Mon Sep 17 00:00:00 2001 +From: Alberto Demichelis <albertodemichelis@hotmail.com> +Date: Mon, 2 May 2022 12:04:58 +0200 +Subject: [PATCH] fix in thread.call + +--- + squirrel/sqbaselib.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/external/squirrel/squirrel/sqbaselib.cpp b/external/squirrel/squirrel/sqbaselib.cpp +index 8eff97c..5055f18 100644 +--- a/external/squirrel/squirrel/sqbaselib.cpp ++++ b/external/squirrel/squirrel/sqbaselib.cpp +@@ -1149,6 +1149,7 @@ static SQInteger thread_call(HSQUIRRELVM v) + SQObjectPtr o = stack_get(v,1); + if(sq_type(o) == OT_THREAD) { + SQInteger nparams = sq_gettop(v); ++ sq_reservestack(_thread(o), nparams + 3); + _thread(o)->Push(_thread(o)->_roottable); + for(SQInteger i = 2; i<(nparams+1); i++) + sq_move(_thread(o),v,i); diff --git a/games-arcade/supertux/metadata.xml b/games-arcade/supertux/metadata.xml index f4836cbdbe41..8e32847ac1dd 100644 --- a/games-arcade/supertux/metadata.xml +++ b/games-arcade/supertux/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/supertux/supertux-0.6.1.1.ebuild b/games-arcade/supertux/supertux-0.6.1.1.ebuild deleted file mode 100644 index 35562950c4e6..000000000000 --- a/games-arcade/supertux/supertux-0.6.1.1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -: ${CMAKE_MAKEFILE_GENERATOR:=emake} -inherit cmake flag-o-matic - -MY_P="SuperTux-v${PV}-Source" - -DESCRIPTION="A game similar to Super Mario Bros." -HOMEPAGE="https://supertux.org/" -SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${PV}/${MY_P}.tar.gz" - -LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -RDEPEND=">=dev-games/physfs-3.0 - dev-libs/boost:= - media-libs/glew:= - virtual/opengl - media-libs/libvorbis - media-libs/openal - >=media-libs/libsdl2-2.0.1[joystick,video] - >=media-libs/sdl2-image-2.0.0[png,jpeg] - >=net-misc/curl-7.21.7" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${PN}-0.5.0-tinygettext.patch - "${FILESDIR}"/${PN}-0.6.0-{license,icon,obstack}.patch -) - -src_prepare() { - cmake_src_prepare - - # This is not a developer release so switch the logo to the non-dev one. - sed -e 's@logo_dev@logo@' \ - -i data/images/objects/logo/logo.sprite || die -} - -src_configure() { - append-cxxflags -std=c++11 - - local mycmakeargs=( - -DWERROR=OFF - -DINSTALL_SUBDIR_BIN=bin - -DINSTALL_SUBDIR_DOC=share/doc/${PF} - -DINSTALL_SUBDIR_SHARE=share/${PN}2 - -DENABLE_SQDBG="$(usex debug)" - -DUSE_SYSTEM_PHYSFS=ON - ) - cmake_src_configure -} diff --git a/games-arcade/supertux/supertux-0.6.2.ebuild b/games-arcade/supertux/supertux-0.6.3-r2.ebuild index a107f3e14c29..2126e741ddad 100644 --- a/games-arcade/supertux/supertux-0.6.2.ebuild +++ b/games-arcade/supertux/supertux-0.6.3-r2.ebuild @@ -1,53 +1,56 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -: ${CMAKE_MAKEFILE_GENERATOR:=emake} -inherit cmake flag-o-matic +#: ${CMAKE_MAKEFILE_GENERATOR:=emake} +inherit cmake MY_PV="${PV/_rc/-rc.}" MY_P="SuperTux-v${MY_PV}-Source" -DESCRIPTION="A game similar to Super Mario Bros." -HOMEPAGE="https://supertux.org/" +DESCRIPTION="A game similar to Super Mario Bros" +HOMEPAGE="https://www.supertux.org" SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm64 ~x86" IUSE="debug" -RDEPEND=">=dev-games/physfs-3.0 - dev-libs/boost:= +# =media-libs/libsdl2-2.0.14-r0 can cause supertux binary to move entire +# content of ${HOME} to ${HOME}/.local/share/supertux2/ +# DO NOT REMOVE THIS BLOCKER!!! See bug #764959 +RDEPEND=" + !=media-libs/libsdl2-2.0.14-r0 + >=dev-games/physfs-3.0 + dev-libs/boost:=[nls] + media-libs/freetype media-libs/glew:= - virtual/opengl + media-libs/libpng:0= + >=media-libs/libsdl2-2.0.1[joystick,video] media-libs/libvorbis media-libs/openal - >=media-libs/libsdl2-2.0.1[joystick,video] >=media-libs/sdl2-image-2.0.0[png,jpeg] - >=net-misc/curl-7.21.7" + >=net-misc/curl-7.21.7 + virtual/opengl +" DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}" + media-libs/glm" +BDEPEND=" + virtual/pkgconfig +" PATCHES=( "${FILESDIR}"/${PN}-0.5.0-tinygettext.patch "${FILESDIR}"/${PN}-0.6.0-{license,icon,obstack}.patch + "${FILESDIR}"/${PN}-0.6.3-missing-include.patch + "${FILESDIR}"/${PN}-0.6.3-squirrel-CVE-2021-41556.patch + "${FILESDIR}"/${PN}-0.6.3-squirrel-CVE-2022-30292.patch ) -src_prepare() { - cmake_src_prepare - - # This is not a developer release so switch the logo to the non-dev one. - sed -e 's@logo_dev@logo@' \ - -i data/images/objects/logo/logo.sprite || die -} - src_configure() { - append-cxxflags -std=c++11 - local mycmakeargs=( -DWERROR=OFF -DINSTALL_SUBDIR_BIN=bin @@ -55,6 +58,7 @@ src_configure() { -DINSTALL_SUBDIR_SHARE=share/${PN}2 -DENABLE_SQDBG="$(usex debug)" -DUSE_SYSTEM_PHYSFS=ON + -DIS_SUPERTUX_RELEASE=ON ) cmake_src_configure } diff --git a/games-arcade/syobon/metadata.xml b/games-arcade/syobon/metadata.xml index 2febf6c19b63..d28f5ad166f5 100644 --- a/games-arcade/syobon/metadata.xml +++ b/games-arcade/syobon/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/tecnoballz/Manifest b/games-arcade/tecnoballz/Manifest index a80e1259baba..e9c8c838757a 100644 --- a/games-arcade/tecnoballz/Manifest +++ b/games-arcade/tecnoballz/Manifest @@ -1 +1 @@ -DIST tecnoballz-0.92.tgz 2763879 BLAKE2B a9414c402781e9d65da5e3c0cfe4815fd80978ff874fa245237baca960278c85ba33ff2a59debf0cd6547d75e20f39afc058bd1204405ecef27d62bb8bdfdbb7 SHA512 e3868e846cdebaed6ee78050560be86557c6d01ee6512375a09eccbcf70f0cd12e419c6997a348794a41dfb75f0f3cb70321f1bb9a9bf1156a90976b0e401e13 +DIST tecnoballz-0.93.1.tar.gz 1989092 BLAKE2B b623a11b9cbb599af85cd8a8cae712dc6403cc0e406f0ecee00f92e571a94db9ea3b8446d3abf9e6992fcb680775ea5e83cb5c58b563c71ddf83c6a969ac4e69 SHA512 5ccbff786398b191f56809180e7309a1e183852f69f51c1797e9e5db5e7ef04d8daa37940c31c2d5ab6911974d140da5d88d81d668122a0ffc37938ef856702b diff --git a/games-arcade/tecnoballz/files/tecnoballz-0.92-automake.patch b/games-arcade/tecnoballz/files/tecnoballz-0.92-automake.patch deleted file mode 100644 index b2f0379e4899..000000000000 --- a/games-arcade/tecnoballz/files/tecnoballz-0.92-automake.patch +++ /dev/null @@ -1,116 +0,0 @@ ---- Makefile.am.old 2008-10-07 10:42:11.000000000 +0200 -+++ Makefile.am 2008-10-07 10:49:35.000000000 +0200 -@@ -1,18 +1,6 @@ - --gamesdir = $(prefix)/games --scoredir = /var/games/tecnoballz --score = tecnoballz.hi -+localstate_DATA = tecnoballz.hi - --SUBDIRS = src -+SUBDIRS = src man - --pkgdatadir = $(mandir)/man6 --dist_pkgdata_DATA = man/tecnoballz.6 -- --install-data-hook: -- -chown root:games "$(DESTDIR)/$(gamesdir)/tecnoballz" -- -chmod 2755 "$(DESTDIR)/$(gamesdir)/tecnoballz" -- $(INSTALL) -d $(DESTDIR)/$(scoredir) -- $(INSTALL) $(score) $(DESTDIR)/$(scoredir) -- -chown root:games "$(DESTDIR)/$(scoredir)/$(score)" -- -chmod 664 "$(DESTDIR)/$(scoredir)/$(score)" - ---- src/Makefile.am.old 2008-10-07 11:16:44.000000000 +0200 -+++ src/Makefile.am 2008-10-07 11:18:32.000000000 +0200 -@@ -1,14 +1,12 @@ - - NULL = --gamesdir = $(prefix)/games --scoredir = /var/games/tecnoballz - score = tecnoballz.hi - - SUBDIRS = TecnoballZ - --games_PROGRAMS = tecnoballz -+bin_PROGRAMS = tecnoballz - tecnoballz_SOURCES = $(SOURCES_MAIN) --tecnoballz_CXXFLAGS = -DDATADIR=\"$(datadir)/tecnoballz\" -DSCOREFILE=\"$(scoredir)/$(score)\" @XLIB_CFLAGS@ @SDL_CFLAGS@ @MIKMOD_FLAGS@ -+tecnoballz_CXXFLAGS = -DDATADIR=\"$(datadir)/tecnoballz\" -DSCOREFILE=\"$(localstatedir)/$(score)\" @XLIB_CFLAGS@ @SDL_CFLAGS@ @MIKMOD_FLAGS@ - tecnoballz_LDADD = @XLIB_LIBS@ @SDL_LIBS@ @MM_LIBS@ @MIKMOD_LIBS@ -L. - - SOURCES_MAIN = \ ---- src/TecnoballZ/Makefile.am.old 2008-10-07 17:17:47.000000000 +0200 -+++ src/TecnoballZ/Makefile.am 2008-10-07 17:20:03.000000000 +0200 -@@ -1,6 +1,6 @@ - NULL = - --SUBDIRS = lores hires textures sounds musics -+SUBDIRS = lores hires textures sounds musics texts - - pkgdatadir = $(datadir)/tecnoballz - dist_pkgdata_DATA = \ -@@ -14,4 +14,5 @@ - tilemap-guardians_40.data \ - tilemap-menu_20.data \ - tilemap-menu_40.data \ -+ levels-data.xml \ - $(NULL) ---- /dev/null 2008-09-26 15:07:13.448004290 +0200 -+++ src/TecnoballZ/texts/Makefile.am 2008-10-07 17:30:18.000000000 +0200 -@@ -0,0 +1,11 @@ -+textsdir = $(pkgdatadir)/texts -+texts_DATA = main_menu_en.txt \ -+ main_menu_fr.txt \ -+ popup_menu_en.txt \ -+ popup_menu_fr.txt \ -+ scrolltext_en.txt \ -+ scrolltext_fr.txt \ -+ shop_en.txt \ -+ shop_fr.txt \ -+ short_info_messages_en.txt \ -+ short_info_messages_fr.txt ---- configure.ac.old 2008-10-08 23:10:26.000000000 +0200 -+++ configure.ac 2008-10-08 23:11:08.000000000 +0200 -@@ -50,21 +50,6 @@ - - LDFLAGS_="${LDFLAGS_save}" - --AC_CHECK_LIB(vorbisfile, ov_raw_seek, [ -- MM_LIBS="${MM_LIBS} -lvorbisfile" --],[ -- AC_MSG_ERROR(Could not find the vorbisfile lib : -lvorbisfile) --]) --AC_CHECK_LIB(ogg, ogg_stream_packetin, [ -- MM_LIBS="${MM_LIBS} -logg" --],[ -- AC_MSG_ERROR(Could not find the ogg lib : -logg) --]) --AC_CHECK_LIB(smpeg, SMPEG_play, [ -- MM_LIBS="${MM_LIBS} -lsmpeg" --],[ -- AC_MSG_ERROR(Could not find the smpeg lib : -lsmpeg) --]) - AC_SUBST(MM_LIBS) - - AC_CHECK_LIB(mikmod, Player_Stop, [ -@@ -81,5 +81,8 @@ - - - dnl Output makefiles --AC_OUTPUT(Makefile src/Makefile src/TecnoballZ/Makefile src/TecnoballZ/hires/Makefile src/TecnoballZ/lores/Makefile src/TecnoballZ/textures/Makefile src/TecnoballZ/musics/Makefile src/TecnoballZ/sounds/Makefile) -+AC_OUTPUT(Makefile src/Makefile src/TecnoballZ/Makefile src/TecnoballZ/hires/Makefile src/TecnoballZ/lores/Makefile src/TecnoballZ/textures/Makefile src/TecnoballZ/musics/Makefile src/TecnoballZ/sounds/Makefile -+ src/TecnoballZ/texts/Makefile -+ man/Makefile -+ man/fr/Makefile) - ---- /dev/null 2008-09-26 15:07:13.448004290 +0200 -+++ man/Makefile.am 2008-10-08 10:36:15.000000000 +0200 -@@ -0,0 +1,2 @@ -+SUBDIRS = fr -+man_MANS = tecnoballz.6 ---- /dev/null 2008-09-26 15:07:13.448004290 +0200 -+++ man/fr/Makefile.am 2008-10-08 10:36:15.000000000 +0200 -@@ -0,0 +1,2 @@ -+mandir = @mandir@/fr -+man_MANS = tecnoballz.6 diff --git a/games-arcade/tecnoballz/files/tecnoballz-0.92-gcc43.patch b/games-arcade/tecnoballz/files/tecnoballz-0.92-gcc43.patch deleted file mode 100644 index ae190abd64c6..000000000000 --- a/games-arcade/tecnoballz/files/tecnoballz-0.92-gcc43.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- include/surface_sdl.h.old 2008-10-07 10:16:25.000000000 +0200 -+++ include/surface_sdl.h 2008-10-07 10:16:38.000000000 +0200 -@@ -46,7 +46,7 @@ - ~surface_sdl (); - SDL_Surface* get_surface (); - char* get_pixel_data (); -- char* get_pixel_data (Uint32 coord_x, Uint32 coord_x); -+ char* get_pixel_data (Uint32 coord_x, Uint32 coord_y); - Uint32 get_row_size (); - Uint32 get_offset (Uint32 xcoord, Uint32 ycoord); - void clear (Uint32 color = 0); diff --git a/games-arcade/tecnoballz/files/tecnoballz-0.92-gcc6.patch b/games-arcade/tecnoballz/files/tecnoballz-0.92-gcc6.patch deleted file mode 100644 index f06a2ac2a0db..000000000000 --- a/games-arcade/tecnoballz/files/tecnoballz-0.92-gcc6.patch +++ /dev/null @@ -1,45 +0,0 @@ -Bug: https://bugs.gentoo.org/show_bug.cgi?id=610974 -Commit: https://github.com/brunonymous/tecnoballz/commit/29c5f137555897c8fb73b4780295524b214b24a2 - ---- a/include/tiles_background.h -+++ b/include/tiles_background.h -@@ -47,7 +47,7 @@ - static tiles_background* tiles_background_singleton; - static Sint32 table_pos1[16]; - static Sint32 table_pos2[16]; -- static char couleurs[448]; -+ static unsigned char couleurs[448]; - static const Sint32 TILES_32_WIDTH = 32; - static const Sint32 TILES_32_HEIGHT = 32; - static const Sint32 TILES_64_WIDTH = 64; -@@ -63,7 +63,7 @@ - * or TILES_32x32_WITH_4_COLORS */ - Uint32 type_of_tiles; - /** 4 color palette index */ -- Uint32 palette_index; -+ Sint32 palette_index; - - bitmap_data *current_tiles; - Uint32 *map_tiles; ---- a/src/tiles_background.cc -+++ b/src/tiles_background.cc -@@ -663,8 +663,8 @@ - - } - palette_index = pal_index; -- char *color = &couleurs[0]; -- unsigned char *colPT = (unsigned char *) (color) + pal_index; -+ unsigned char *color = &couleurs[0]; -+ unsigned char *colPT = (color) + pal_index; - SDL_Color *pal = display->get_palette (); - SDL_Color *lighted = pal + 1; - SDL_Color *dark = lighted + 128; -@@ -702,7 +702,7 @@ - * 4 * 4 : 16 composantes by palette - * 112 * 4 : 448 composantes - */ --char -+unsigned char - tiles_background::couleurs[448] = { - 0x00, 0x40, 0x20, 0x40, 0x00, 0x60, 0x40, 0x60, 0x00, 0x80, 0x60, 0x80, - 0x00, 0xA0, 0x80, 0xA0, 0x00, 0x00, 0x20, 0x40, 0x00, 0x20, diff --git a/games-arcade/tecnoballz/metadata.xml b/games-arcade/tecnoballz/metadata.xml index 5dbd2510d79a..c8f73d16bc45 100644 --- a/games-arcade/tecnoballz/metadata.xml +++ b/games-arcade/tecnoballz/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> @@ -12,4 +12,7 @@ attack weapons with an enormous power of fire that can be build by gaining bonuses. Numerous decors, musics and sounds complete this great game. This game was ported from the Commodore Amiga. </longdescription> +<upstream> + <remote-id type="github">brunonymous/tecnoballz</remote-id> +</upstream> </pkgmetadata> diff --git a/games-arcade/tecnoballz/tecnoballz-0.92.ebuild b/games-arcade/tecnoballz/tecnoballz-0.92.ebuild deleted file mode 100644 index 272be1639d8f..000000000000 --- a/games-arcade/tecnoballz/tecnoballz-0.92.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils autotools games - -DESCRIPTION="An exciting Brick Breaker" -HOMEPAGE="http://linux.tlk.fr/games/TecnoballZ/" -SRC_URI="http://linux.tlk.fr/games/TecnoballZ/download/${P}.tgz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="media-libs/libsdl - media-libs/sdl-mixer - media-libs/sdl-image[png] - media-libs/libmikmod:0" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-gcc43.patch \ - "${FILESDIR}"/${P}-gcc6.patch \ - "${FILESDIR}"/${P}-automake.patch - mv man/${PN}.fr.6 man/fr/${PN}.6 || die - # don't combine explicit and implicit rules for make 3.82 (bug #334629) - sed -i -e '/supervisor.c /s/.c /.cc /' src/Makefile.am || die - sed -i -e '/^CXXFLAGS=/d' configure.ac || die - eautoreconf -} - -src_install() { - default - fperms g+w "${GAMES_STATEDIR}"/${PN}.hi - make_desktop_entry ${PN} Tecnoballz - prepgamesdirs -} - -pkg_postinst() { - has_version "media-libs/sdl-mixer[mikmod]" \ - || ewarn "To have background music, emerge sdl-mixer with USE=mikmod" - games_pkg_postinst -} diff --git a/games-arcade/tecnoballz/tecnoballz-0.93.1.ebuild b/games-arcade/tecnoballz/tecnoballz-0.93.1.ebuild new file mode 100644 index 000000000000..e1697aa313e1 --- /dev/null +++ b/games-arcade/tecnoballz/tecnoballz-0.93.1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools desktop + +DESCRIPTION="An exciting Brick Breaker" +HOMEPAGE="https://linux.tlk.fr/games/TecnoballZ/" +SRC_URI="https://github.com/brunonymous/tecnoballz/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + dev-libs/tinyxml + media-libs/libsdl[joystick] + media-libs/sdl-mixer[mikmod] + media-libs/sdl-image[png] + media-libs/libmikmod:0" +RDEPEND="${DEPEND}" + +src_prepare() { + default + + mkdir man/fr || die + mv man/${PN}.fr.6 man/fr/${PN}.6 || die + + sed -i -e 's:\$(prefix)/games:\$(prefix)/bin:' src/Makefile.am || die + sed -i -e '/CXXFLAGS=/d' -e '/^else/d' configure.ac || die + + eautoreconf +} + +src_install() { + default + make_desktop_entry ${PN} Tecnoballz +} diff --git a/games-arcade/thinktanks-demo/Manifest b/games-arcade/thinktanks-demo/Manifest index 3aa674863fd4..f09409f2e0c6 100644 --- a/games-arcade/thinktanks-demo/Manifest +++ b/games-arcade/thinktanks-demo/Manifest @@ -1 +1 @@ -DIST ThinkTanksDemo_v1.1.sh.bin 12115802 BLAKE2B 398df35dc7f6020cadfcf36209ddec3c10229f62539f0a6cead3c5b815a36816a2d51e9d09315ccae2e60855a3e7e1310196276758b41e66c7b32e7f102ddfbc SHA512 9134c44c4e02df4bd7edbd3946125598c87dc3adbeff318f0b265dd2c5fbcebd49bd810d848cc5da29c86ad323fdb2c9adc0006b26680b0bd78b4d0de54419a1 +DIST ThinkTanksDemo_v1.1.sh.bin 11700992 BLAKE2B c5f0955606d12d6da042ae66322cfe6993486a963a0d76fa948f0c8eea439a25983ae78367130f181398299af712a4bb51ba45845ff92e17386e1c1305d33af7 SHA512 6c4116dd9f43ee6037a8c1d7fcb97f4f6d73725f2b608342e60bc200ff7286f6ea3c6c66e1e8713e69f215d95856dd9733ed15e742121eeb401ad1d5262f7a55 diff --git a/games-arcade/thinktanks-demo/metadata.xml b/games-arcade/thinktanks-demo/metadata.xml index 736bc171d9e2..1c9c3f5a8b22 100644 --- a/games-arcade/thinktanks-demo/metadata.xml +++ b/games-arcade/thinktanks-demo/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/thinktanks-demo/thinktanks-demo-1.1-r3.ebuild b/games-arcade/thinktanks-demo/thinktanks-demo-1.1-r4.ebuild index a672cd15f03e..7b6c73e06c39 100644 --- a/games-arcade/thinktanks-demo/thinktanks-demo-1.1-r3.ebuild +++ b/games-arcade/thinktanks-demo/thinktanks-demo-1.1-r4.ebuild @@ -1,18 +1,19 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + inherit desktop unpacker DESCRIPTION="Tank combat game with lighthearted, fast paced pandemonium" HOMEPAGE="http://www.garagegames.com/pg/product/view.php?id=12" -SRC_URI="ftp://ggdev-1.homelan.com/thinktanks/ThinkTanksDemo_v${PV}.sh.bin" +SRC_URI="http://demos.garagegames.com/thinktanks/ThinkTanksDemo_v${PV}.sh.bin" +S="${WORKDIR}" LICENSE="THINKTANKS" SLOT="0" KEYWORDS="-* ~amd64 ~x86" -IUSE="" -RESTRICT="strip" +RESTRICT="bindist mirror strip" RDEPEND=" media-libs/libsdl[video,joystick,abi_x86_32(-)] @@ -21,9 +22,7 @@ RDEPEND=" x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] " -DEPEND="" -S="${WORKDIR}" dir="/opt/${PN}" QA_PREBUILT="${dir:1}/ThinkTanks.bin" diff --git a/games-arcade/tomatoes/files/tomatoes-1.55-c_str.patch b/games-arcade/tomatoes/files/tomatoes-1.55-c_str.patch index dd6927e54153..f001179a837f 100644 --- a/games-arcade/tomatoes/files/tomatoes-1.55-c_str.patch +++ b/games-arcade/tomatoes/files/tomatoes-1.55-c_str.patch @@ -1,5 +1,5 @@ ---- src/config.cpp.orig 2004-09-27 11:35:48.000000000 +0200 -+++ src/config.cpp 2006-02-13 00:00:01.000000000 +0100 +--- a/src/config.cpp ++++ b/src/config.cpp @@ -78,6 +78,7 @@ // makefile. char *get_config_location(bool write) { diff --git a/games-arcade/tomatoes/files/tomatoes-1.55-gcc43.patch b/games-arcade/tomatoes/files/tomatoes-1.55-gcc43.patch index cd85e31e5936..95bf7ba6eddb 100644 --- a/games-arcade/tomatoes/files/tomatoes-1.55-gcc43.patch +++ b/games-arcade/tomatoes/files/tomatoes-1.55-gcc43.patch @@ -1,5 +1,5 @@ ---- src/config.cpp -+++ src/config.cpp +--- a/src/config.cpp ++++ b/src/config.cpp @@ -27,8 +27,9 @@ *************************************************************************/ diff --git a/games-arcade/tomatoes/files/tomatoes-1.55-underlink.patch b/games-arcade/tomatoes/files/tomatoes-1.55-underlink.patch index c028c79ba4a7..bc7763bf492e 100644 --- a/games-arcade/tomatoes/files/tomatoes-1.55-underlink.patch +++ b/games-arcade/tomatoes/files/tomatoes-1.55-underlink.patch @@ -1,5 +1,5 @@ ---- makefile.old 2011-06-18 17:35:38.947020335 +0200 -+++ makefile 2011-06-18 17:37:42.337811088 +0200 +--- a/makefile ++++ b/makefile @@ -48,7 +47,7 @@ LDFLAGS = `sdl-config --libs` -lSDL_image -lSDL_mixer -lGL -lGLU -pg else diff --git a/games-arcade/tomatoes/metadata.xml b/games-arcade/tomatoes/metadata.xml index b774279148e4..72957bd5064c 100644 --- a/games-arcade/tomatoes/metadata.xml +++ b/games-arcade/tomatoes/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild b/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild deleted file mode 100644 index dd5658f861bf..000000000000 --- a/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils games - -DATA_PV=1.5 -DESCRIPTION="How many tomatoes can you smash in ten short minutes?" -HOMEPAGE="http://tomatoes.sourceforge.net/about.html" -SRC_URI="mirror://sourceforge/tomatoes/tomatoes-linux-src-${PV}.tar.bz2 - mirror://sourceforge/tomatoes/tomatoes-linux-${DATA_PV}.tar.bz2" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" -IUSE="" - -DEPEND="virtual/opengl - virtual/glu - media-libs/libsdl[sound,video] - media-libs/sdl-image[jpeg,png] - media-libs/sdl-mixer[mod]" -RDEPEND="${DEPEND}" - -src_prepare() { - mv ../tomatoes-1.5/* . || die "mv failed" - mv icon.png ${PN}.png - - epatch \ - "${FILESDIR}"/${P}-c_str.patch \ - "${FILESDIR}"/${P}-underlink.patch \ - "${FILESDIR}"/${P}-gcc43.patch - - sed -i \ - -e "/^MPKDIR = /s:./:${GAMES_DATADIR}/${PN}/:" \ - -e "/^MUSICDIR = /s:./music/:${GAMES_DATADIR}/${PN}/music/:" \ - -e "/^HISCOREDIR = /s:./:${GAMES_STATEDIR}/${PN}/:" \ - -e "/^CONFIGDIR = /s:./:${GAMES_SYSCONFDIR}/${PN}/:" \ - -e "/^OVERRIDEDIR = /s:./data/:${GAMES_DATADIR}/${PN}/data/:" \ - makefile \ - || die "sed failed" -} - -src_install() { - dogamesbin tomatoes - dodoc README README-src - - insinto "${GAMES_DATADIR}"/${PN} - doins -r tomatoes.mpk music - - doicon ${PN}.png - make_desktop_entry tomatoes "I Have No Tomatoes" - - dodir "${GAMES_STATEDIR}"/${PN} - touch "${D}${GAMES_STATEDIR}"/${PN}/hiscore.lst || die "touch failed" - fperms 660 "${GAMES_STATEDIR}"/${PN}/hiscore.lst - - insinto "${GAMES_SYSCONFDIR}"/${PN} - doins config.cfg - - prepgamesdirs -} diff --git a/games-arcade/tomatoes/tomatoes-1.55-r4.ebuild b/games-arcade/tomatoes/tomatoes-1.55-r4.ebuild new file mode 100644 index 000000000000..9f3ae080d89a --- /dev/null +++ b/games-arcade/tomatoes/tomatoes-1.55-r4.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop toolchain-funcs + +DATA_PV=1.5 +DESCRIPTION="How many tomatoes can you smash in ten short minutes?" +HOMEPAGE="https://tomatoes.sourceforge.net/about.html" +SRC_URI="mirror://sourceforge/tomatoes/tomatoes-linux-src-${PV}.tar.bz2 + mirror://sourceforge/tomatoes/tomatoes-linux-${DATA_PV}.tar.bz2" + +LICENSE="ZLIB" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" + +DEPEND=" + media-libs/libsdl[sound,video] + media-libs/sdl-image[jpeg,png] + media-libs/sdl-mixer[mod] + virtual/opengl + virtual/glu +" +RDEPEND=" + ${DEPEND} + acct-group/gamestat +" + +PATCHES=( + "${FILESDIR}"/${P}-c_str.patch + "${FILESDIR}"/${P}-underlink.patch + "${FILESDIR}"/${P}-gcc43.patch +) + +src_prepare() { + default + + mv ../tomatoes-1.5/* . || die "mv failed" + mv icon.png ${PN}.png || die + + sed -i \ + -e "/^MPKDIR = /s:./:/usr/share/${PN}/:" \ + -e "/^MUSICDIR = /s:./music/:/usr/share/${PN}/music/:" \ + -e "/^HISCOREDIR = /s:./:/var/games/${PN}/:" \ + -e "/^CONFIGDIR = /s:./:/etc/${PN}/:" \ + -e "/^OVERRIDEDIR = /s:./data/:/usr/share/${PN}/data/:" \ + makefile \ + || die "sed failed" +} + +src_configure() { + tc-export CXX +} + +src_install() { + dobin tomatoes + dodoc README README-src + + insinto /usr/share/${PN} + doins -r tomatoes.mpk music + + doicon ${PN}.png + make_desktop_entry tomatoes "I Have No Tomatoes" + + dodir /var/games/${PN} + touch "${ED}"/var/games/${PN}/hiscore.lst || die "touch failed" + + fperms 660 /var/games/${PN}/hiscore.lst + fowners -R root:gamestat /var/games/${PN} /usr/bin/${PN} + fperms g+s /usr/bin/${PN} + + insinto /etc/${PN} + doins config.cfg +} diff --git a/games-arcade/trailblazer/metadata.xml b/games-arcade/trailblazer/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/trailblazer/metadata.xml +++ b/games-arcade/trailblazer/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/tuxanci/files/tuxanci-20110429-no-glver.patch b/games-arcade/tuxanci/files/tuxanci-20110429-no-glver.patch new file mode 100644 index 000000000000..210e55d11998 --- /dev/null +++ b/games-arcade/tuxanci/files/tuxanci-20110429-no-glver.patch @@ -0,0 +1,9 @@ +https://bugs.gentoo.org/715132 +https://bugs.gentoo.org/798651 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -189,3 +189,3 @@ + IF ( WITH_OPENGL ) +- pkg_check_modules(OPENGL REQUIRED gl>=7.5) ++ pkg_check_modules(OPENGL REQUIRED gl) + INCLUDE_DIRECTORIES ( ${OPENGL_INCLUDE_DIRS} ) diff --git a/games-arcade/tuxanci/metadata.xml b/games-arcade/tuxanci/metadata.xml index 9aff45b12b1e..1d7cd1181dd1 100644 --- a/games-arcade/tuxanci/metadata.xml +++ b/games-arcade/tuxanci/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/tuxanci/tuxanci-20110429-r1.ebuild b/games-arcade/tuxanci/tuxanci-20110429-r1.ebuild deleted file mode 100644 index a03b0ba4176b..000000000000 --- a/games-arcade/tuxanci/tuxanci-20110429-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="Tuxanci is first tux shooter inspired by game Bulanci" -HOMEPAGE="https://repo.or.cz/w/tuxanci.git" - -if [[ ${PV} = *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://repo.or.cz/tuxanci.git" -else - SRC_URI="mirror://gentoo/${P}.tar.xz" - KEYWORDS="~amd64 ~ppc64 ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="debug dedicated +ipv6 nls opengl physfs +sound" - -# >=x11-libs/cairo-1.8.8[X,svg] -RDEPEND=" - !dedicated? ( - >=media-libs/fontconfig-2.7.0 - media-libs/libsdl[X,opengl?] - media-libs/sdl-ttf[X] - >=media-libs/sdl-image-1.2.10[png] - sound? ( - >=media-libs/sdl-mixer-1.2.11[vorbis] - ) - ) - physfs? ( dev-games/physfs[zip] ) - !physfs? ( >=dev-libs/libzip-0.9 ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -src_configure() { - local mycmakeargs=( - -DWITH_AUDIO=$(usex sound) - -DBUILD_SERVER=$(usex dedicated) - -DWITH_NLS=$(usex nls) - -DWITH_PHYSFS=$(usex physfs) - -DWITH_OPENGL=$(usex opengl) - -DENABLE_IPV6=$(usex ipv6) - -DDEVELOPER=$(usex debug) - -DCMAKE_INSTALL_ICONDIR="${EPREFIX}"/usr/pixmaps/ - -DCMAKE_INSTALL_DESKTOPDIR="${EPREFIX}"/usr/applications/ - -DCMAKE_DATA_PATH="${EPREFIX}"/usr/share/ - -DCMAKE_LOCALE_PATH="${EPREFIX}"/usr/share/locale/ - -DCMAKE_DOC_PATH="${EPREFIX}"/usr/share/doc/${PF} - -DCMAKE_CONF_PATH="${EPREFIX}"/etc - ) - cmake-utils_src_configure -} diff --git a/games-arcade/tuxanci/tuxanci-20110429-r2.ebuild b/games-arcade/tuxanci/tuxanci-20110429-r2.ebuild new file mode 100644 index 000000000000..4428d33da87f --- /dev/null +++ b/games-arcade/tuxanci/tuxanci-20110429-r2.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="First Tux shooter multi-player network game inspired by Bulanci" +HOMEPAGE="https://repo.or.cz/w/tuxanci.git" +SRC_URI="mirror://gentoo/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" +IUSE="dedicated opengl physfs" + +RDEPEND=" + !dedicated? ( + media-libs/fontconfig + media-libs/libsdl[opengl?,sound,video] + media-libs/sdl-image[png] + media-libs/sdl-mixer[vorbis] + media-libs/sdl-ttf + opengl? ( virtual/opengl ) + ) + physfs? ( dev-games/physfs[zip] ) + !physfs? ( dev-libs/libzip:= )" +DEPEND="${RDEPEND}" +BDEPEND="sys-devel/gettext" + +PATCHES=( + "${FILESDIR}"/${P}-no-glver.patch +) + +src_configure() { + local mycmakeargs=( + -DBUILD_SERVER=$(usex dedicated) + -DCMAKE_CONF_PATH="${EPREFIX}"/etc + -DCMAKE_DOC_PATH="${EPREFIX}"/usr/share/doc/${PF} + -DENABLE_DEBUG=no + -DWITH_OPENGL=$(usex opengl) + -DWITH_PHYSFS=$(usex physfs) + ) + cmake_src_configure +} diff --git a/games-arcade/tuxanci/tuxanci-99999999.ebuild b/games-arcade/tuxanci/tuxanci-99999999.ebuild deleted file mode 100644 index a03b0ba4176b..000000000000 --- a/games-arcade/tuxanci/tuxanci-99999999.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="Tuxanci is first tux shooter inspired by game Bulanci" -HOMEPAGE="https://repo.or.cz/w/tuxanci.git" - -if [[ ${PV} = *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://repo.or.cz/tuxanci.git" -else - SRC_URI="mirror://gentoo/${P}.tar.xz" - KEYWORDS="~amd64 ~ppc64 ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="debug dedicated +ipv6 nls opengl physfs +sound" - -# >=x11-libs/cairo-1.8.8[X,svg] -RDEPEND=" - !dedicated? ( - >=media-libs/fontconfig-2.7.0 - media-libs/libsdl[X,opengl?] - media-libs/sdl-ttf[X] - >=media-libs/sdl-image-1.2.10[png] - sound? ( - >=media-libs/sdl-mixer-1.2.11[vorbis] - ) - ) - physfs? ( dev-games/physfs[zip] ) - !physfs? ( >=dev-libs/libzip-0.9 ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -src_configure() { - local mycmakeargs=( - -DWITH_AUDIO=$(usex sound) - -DBUILD_SERVER=$(usex dedicated) - -DWITH_NLS=$(usex nls) - -DWITH_PHYSFS=$(usex physfs) - -DWITH_OPENGL=$(usex opengl) - -DENABLE_IPV6=$(usex ipv6) - -DDEVELOPER=$(usex debug) - -DCMAKE_INSTALL_ICONDIR="${EPREFIX}"/usr/pixmaps/ - -DCMAKE_INSTALL_DESKTOPDIR="${EPREFIX}"/usr/applications/ - -DCMAKE_DATA_PATH="${EPREFIX}"/usr/share/ - -DCMAKE_LOCALE_PATH="${EPREFIX}"/usr/share/locale/ - -DCMAKE_DOC_PATH="${EPREFIX}"/usr/share/doc/${PF} - -DCMAKE_CONF_PATH="${EPREFIX}"/etc - ) - cmake-utils_src_configure -} diff --git a/games-arcade/tuxdash/metadata.xml b/games-arcade/tuxdash/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/tuxdash/metadata.xml +++ b/games-arcade/tuxdash/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/tuxpuck/metadata.xml b/games-arcade/tuxpuck/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/tuxpuck/metadata.xml +++ b/games-arcade/tuxpuck/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/tuxpuck/tuxpuck-0.8.2-r2.ebuild b/games-arcade/tuxpuck/tuxpuck-0.8.2-r2.ebuild index d2fdb0c45bcc..64ac2c58278e 100644 --- a/games-arcade/tuxpuck/tuxpuck-0.8.2-r2.ebuild +++ b/games-arcade/tuxpuck/tuxpuck-0.8.2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="http://home.no.net/munsuun/tuxpuck/files/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~x86" +KEYWORDS="~amd64 ~x86" RDEPEND=" media-libs/libsdl diff --git a/games-arcade/vor/Manifest b/games-arcade/vor/Manifest index 658ed76cd43f..0005682ec035 100644 --- a/games-arcade/vor/Manifest +++ b/games-arcade/vor/Manifest @@ -1 +1 @@ -DIST vor-0.5.7.tgz 358032 BLAKE2B 96813207a8529d6a7ae5863811fa02666d51b4108afd96cf5b4aed0405d6cc32668f0a7abfbc571141877803a15678c46c8664fe3599cd12e0c6fe95ab5d880f SHA512 32dbfe95971298f9f0191cc95fdb5e9ec34c5f6771df1566554b128644770bfba618df3aac7242e647c8af2f41fc59c9e5620a4c56932d3af72197f6a19f0bce +DIST vor-0.5.8.tgz 361789 BLAKE2B b6391a03d175520ef97db7c4b80425f6f15193614f5e582b4d96019ce426b9ea21b93e9f503e5e22d5f976fe938cc883e4810803b2942ee3e373025397045c2a SHA512 95633e54c09f947c3e256fc07b1d7c061e98f69b89ce459b7736174410b7f021f4384afe65ec58eb6b89933cb6c8fe166b4491078b98671ae12640c6fc7019f5 diff --git a/games-arcade/vor/metadata.xml b/games-arcade/vor/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/vor/metadata.xml +++ b/games-arcade/vor/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/vor/vor-0.5.7-r1.ebuild b/games-arcade/vor/vor-0.5.7-r1.ebuild deleted file mode 100644 index 3e8d444e5b97..000000000000 --- a/games-arcade/vor/vor-0.5.7-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit desktop gnome2-utils - -DESCRIPTION="Variations on Rockdodger: Dodge the rocks until you die" -HOMEPAGE="https://jasonwoof.org/vor" -SRC_URI="https://jasonwoof.com/downloads/vor/${P}.tgz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="media-libs/libsdl[sound,video] - media-libs/sdl-image[png] - media-libs/sdl-mixer[mod]" -RDEPEND="${DEPEND}" - -src_install() { - dodir /usr/bin - DOCS="README* todo" default - newicon -s 48 data/icon.png ${PN}.png - make_desktop_entry ${PN} VoR -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-arcade/vor/vor-0.5.8.ebuild b/games-arcade/vor/vor-0.5.8.ebuild new file mode 100644 index 000000000000..b5a8c53de2ed --- /dev/null +++ b/games-arcade/vor/vor-0.5.8.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop + +DESCRIPTION="Variations on Rockdodger: Dodge the rocks until you die" +HOMEPAGE="https://sametwice.com/vor" +SRC_URI="https://jasonwoof.com/downloads/vor/${P}.tgz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + media-libs/libsdl[sound,video] + media-libs/sdl-image[png] + media-libs/sdl-mixer[mod]" +DEPEND="${RDEPEND}" + +src_install() { + dodir /usr/bin + + default + + newicon data/icon.png ${PN}.png + make_desktop_entry ${PN} VoR +} diff --git a/games-arcade/whichwayisup/Manifest b/games-arcade/whichwayisup/Manifest index 909f726905b9..017edb5d67fa 100644 --- a/games-arcade/whichwayisup/Manifest +++ b/games-arcade/whichwayisup/Manifest @@ -1 +1,3 @@ +DIST whichwayisup.png 6720 BLAKE2B 26514e025341ce7d5145d69295a24477ea3575afcfb0a11bbbddb1dd716feadef9a030ec9dc4171b75842fafc78670ed1fc7656dac8dbd6695b9592b73bb1383 SHA512 469b847955a745177c7629dd13f1975191766863bfe263e3818105356d71aaaeb66cbe34846d0bd908bf494e2d7d42b7f33499868da2fa346f96f8080bccc0b2 +DIST whichwayisup_0.7.9-8.debian.tar.xz 17196 BLAKE2B 8b2cb1933a6c5480edb1091a824b2a61d9c41ed1a4a3b534a11a28163f9db3a3790d89faa1eb1995b459bb3c03515c154ca2714bfcf63c2c43669c60abf4d75f SHA512 cb1402f0210c0457dbeb5a1151679c755b10b022c20cbb8a0bdc23bf7b463a7e0db4e92141906e3995a894fd3d0aeb21b48358b3e2c221f37deec4c008128edc DIST whichwayisup_b079.zip 1001890 BLAKE2B bfc8f15376ae7c93cc3921a7c0537d44bca44cbfd5e19533912c56151b8811a40e96271e0f3b8634a6fc4625bd32c9668fc3c321f1d2ea0306517067f3d31e24 SHA512 49ac6b8224f3cf7b0711b297c9dd96ff2a0969f7c16fa1da500bef1ea5d793bd900be124a9b9874239c98db6fd2db92917b8ce2ee09b685e184cfd87bf519809 diff --git a/games-arcade/whichwayisup/files/whichwayisup-0.7.9-check_for_joystick_axes_not_null.patch b/games-arcade/whichwayisup/files/whichwayisup-0.7.9-check_for_joystick_axes_not_null.patch deleted file mode 100644 index b97856a0d2b9..000000000000 --- a/games-arcade/whichwayisup/files/whichwayisup-0.7.9-check_for_joystick_axes_not_null.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Markus Koschany <apo@debian.org> -Date: Tue, 28 May 2013 18:40:34 +0200 -Subject: check for joystick axes not null - ---- - lib/game.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/game.py b/lib/game.py -index f0afd84..30f86fd 100644 ---- a/lib/game.py -+++ b/lib/game.py -@@ -138,7 +138,7 @@ def parse_inputs(joystick = None): - if keys[K_F10]:
- inputs["SPECIAL"] = True
-
-- if joystick != None: # Parse joystick input
-+ if joystick != None and joystick.get_numaxes() != 0: # Parse joystick input
-
- axis0 = joystick.get_axis(0)
-
diff --git a/games-arcade/whichwayisup/files/whichwayisup-0.7.9-initialize_only_required_pygame_modules.patch b/games-arcade/whichwayisup/files/whichwayisup-0.7.9-initialize_only_required_pygame_modules.patch deleted file mode 100644 index 5bfea4ddd6e6..000000000000 --- a/games-arcade/whichwayisup/files/whichwayisup-0.7.9-initialize_only_required_pygame_modules.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Markus Koschany <apo@debian.org> -Date: Tue, 28 May 2013 18:21:54 +0200 -Subject: initialize only required pygame modules. - ---- - lib/main.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/main.py b/lib/main.py -index cfe9046..6a0376a 100644 ---- a/lib/main.py -+++ b/lib/main.py -@@ -60,7 +60,9 @@ def main(): -
- #Initializing pygame and screen
-
-- pygame.init()
-+ pygame.joystick.init()
-+ pygame.display.init()
-+ pygame.mixer.init()
- screen = pygame.display.set_mode((SCREEN_WIDTH,SCREEN_HEIGHT))
- caption = "Which way is up?"
- if (Variables.vdict["devmode"]):
diff --git a/games-arcade/whichwayisup/files/whichwayisup-0.7.9-python3.patch b/games-arcade/whichwayisup/files/whichwayisup-0.7.9-python3.patch deleted file mode 100644 index 5b2026405516..000000000000 --- a/games-arcade/whichwayisup/files/whichwayisup-0.7.9-python3.patch +++ /dev/null @@ -1,470 +0,0 @@ -Author: Reiner Herrmann <reiner@reiner-h.de> -Description: Port game to python3 -Bug-Debian: https://bugs.debian.org/912500 - ---- a/run_game.py -+++ b/run_game.py -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /usr/bin/env python3 - - import sys - import os ---- a/lib/util.py -+++ b/lib/util.py -@@ -113,12 +113,12 @@ - try:
- conffile = codecs.open(file_path, "w", "utf_8")
- for world in WORLDS:
-- print >> conffile, "unlocked\t%(world)s\t%(unlocked)s" % {"world": world, "unlocked": Variables.vdict["unlocked" + world]}
-- print >> conffile, "hiscore\t%(world)s\t%(hiscore)s" % {"world": world, "hiscore": Variables.vdict["hiscore" + world]}
-- print >> conffile, "besttime\t%(world)s\t%(besttime)s" % {"world": world, "besttime": Variables.vdict["besttime" + world]}
-- print >> conffile, "sound\t%s" % bool_to_str(Variables.vdict["sound"])
-- print >> conffile, "dialogue\t%s" % bool_to_str(Variables.vdict["dialogue"])
-- print >> conffile, "fullscreen\t%s" % bool_to_str(Variables.vdict["fullscreen"])
-+ print("unlocked\t%(world)s\t%(unlocked)s" % {"world": world, "unlocked": Variables.vdict["unlocked" + world]}, file=conffile)
-+ print("hiscore\t%(world)s\t%(hiscore)s" % {"world": world, "hiscore": Variables.vdict["hiscore" + world]}, file=conffile)
-+ print("besttime\t%(world)s\t%(besttime)s" % {"world": world, "besttime": Variables.vdict["besttime" + world]}, file=conffile)
-+ print("sound\t%s" % bool_to_str(Variables.vdict["sound"]), file=conffile)
-+ print("dialogue\t%s" % bool_to_str(Variables.vdict["dialogue"]), file=conffile)
-+ print("fullscreen\t%s" % bool_to_str(Variables.vdict["fullscreen"]), file=conffile)
- except:
- error_message("Could not write configuration file to " + file_path)
- return False
-@@ -136,13 +136,13 @@ - count += 1
- if count > MAX_OLD_LOG_LINES:
- break
-- if Variables.vdict.has_key("log"):
-+ if "log" in Variables.vdict:
- try:
- conffile = codecs.open(file_path, "w", "utf_8")
-- print >> conffile, "Log updated " + str(datetime.date.today())
-- print >> conffile, Variables.vdict["log"]
-- print >> conffile, ""
-- print >> conffile, old_log
-+ print("Log updated " + str(datetime.date.today()), file=conffile)
-+ print(Variables.vdict["log"], file=conffile)
-+ print("", file=conffile)
-+ print(old_log, file=conffile)
- except:
- error_message("Could not write log file to " + file_path)
- return False
-@@ -166,7 +166,7 @@ - The constant colors can be found from locals.py.
- '''
- def render_text(string, color = COLOR_GUI, bgcolor = COLOR_GUI_BG):
-- if Util.cached_text_images.has_key(string + str(color) + str(bgcolor)):
-+ if (string + str(color) + str(bgcolor)) in Util.cached_text_images:
- final_image = Util.cached_text_images[string + str(color) + str(bgcolor)]
- else:
- text_image_bg = Util.smallfont.render(string, True, bgcolor)
-@@ -200,8 +200,8 @@ - rendered_string = string[0:phase]
- string_image = render_text(rendered_string)
- string_rect = string_image.get_rect()
-- string_rect.centerx = SCREEN_WIDTH / 2
-- string_rect.centery = SCREEN_HEIGHT / 2
-+ string_rect.centerx = SCREEN_WIDTH // 2
-+ string_rect.centery = SCREEN_HEIGHT // 2
-
- if key == "p":
- skip_image = Util.cached_images["key_p"]
-@@ -209,7 +209,7 @@ - skip_image = Util.cached_images["key_z"]
-
- skip_rect = skip_image.get_rect()
-- skip_rect.centerx = SCREEN_WIDTH / 2
-+ skip_rect.centerx = SCREEN_WIDTH // 2
- skip_rect.top = string_rect.bottom + 5
-
- bg_rect = pygame.Rect(string_rect.left - 10, string_rect.top - 5, string_rect.width + 20, string_rect.height + skip_rect.height + 15)
---- a/lib/animation.py -+++ b/lib/animation.py -@@ -58,9 +58,9 @@ - self.finished = True
- else:
- self.i = 0
-- if Animation.cached_frames.has_key(self.cache_name + str(self.i)):
-+ if (self.cache_name + str(self.i)) in Animation.cached_frames:
- self.image = Animation.cached_frames[self.cache_name + str(self.i)]
- else:
- self.image = (self.frames[self.i]).get_image()
- Animation.cached_frames[self.cache_name + str(self.i)] = self.image
-- return self.image -\ No newline at end of file -+ return self.image
---- a/lib/edit_utils.py -+++ b/lib/edit_utils.py -@@ -16,23 +16,23 @@ - return
-
- def update(self, inputs):
-- if inputs.has_key("REMOVE_TILE"):
-+ if "REMOVE_TILE" in inputs:
- return Change("remove", self.cursor)
-- if inputs.has_key("ADD_TILE_WALL"):
-+ if "ADD_TILE_WALL" in inputs:
- return Change("W", self.cursor)
-- if inputs.has_key("ADD_TILE_SPIKES"):
-+ if "ADD_TILE_SPIKES" in inputs:
- return Change("S", self.cursor)
-- if inputs.has_key("ADD_TILE_BARS"):
-+ if "ADD_TILE_BARS" in inputs:
- return Change("B", self.cursor)
-- if inputs.has_key("SAVE_TILES"):
-+ if "SAVE_TILES" in inputs:
- return Change("save", (0, 0))
-- if inputs.has_key("EDIT_RIGHT") and self.cursor[0] < (TILES_HOR - 1):
-+ if "EDIT_RIGHT" in inputs and self.cursor[0] < (TILES_HOR - 1):
- self.cursor[0] += 1
-- if inputs.has_key("EDIT_LEFT") and self.cursor[0] > 0:
-+ if "EDIT_LEFT" in inputs and self.cursor[0] > 0:
- self.cursor[0] -= 1
-- if inputs.has_key("EDIT_DOWN") and self.cursor[1] < (TILES_VER - 1):
-+ if "EDIT_DOWN" in inputs and self.cursor[1] < (TILES_VER - 1):
- self.cursor[1] += 1
-- if inputs.has_key("EDIT_UP") and self.cursor[1] > 0:
-+ if "EDIT_UP" in inputs and self.cursor[1] > 0:
- self.cursor[1] -= 1
- return None
-
---- a/lib/game.py -+++ b/lib/game.py -@@ -265,7 +265,7 @@ - trigger = None
-
- if scripted_event_on:
-- if inputs.has_key("JUMP") or inputs.has_key("DOWN"):
-+ if "JUMP" in inputs or "DOWN" in inputs:
- cleared = True
-
- moved = False
-@@ -277,20 +277,20 @@ - #There isn't anything special going on: player can control the character
- #Translates input to commands to the player object
- add_time = True
-- if inputs.has_key("LEFT"):
-+ if "LEFT" in inputs:
- player.move((-PLAYER_MAX_ACC, 0))
- moved = True
-
-- if inputs.has_key("RIGHT"):
-+ if "RIGHT" in inputs:
- player.move((PLAYER_MAX_ACC, 0))
- moved = True
-
-- if inputs.has_key("JUMP"):
-+ if "JUMP" in inputs:
- if (player.on_ground):
- count = 0
- while (count < 5):
- count += 1
-- particles.append(Particle(screen, 10, player.rect.centerx - player.dx / 4 + random.uniform(-3, 3), player.rect.bottom, -player.dx * 0.1, -0.5, 0.3, level.dust_color, 4))
-+ particles.append(Particle(screen, 10, player.rect.centerx - player.dx // 4 + random.uniform(-3, 3), player.rect.bottom, -player.dx * 0.1, -0.5, 0.3, level.dust_color, 4))
- player.jump()
-
- #The blobs always try to jump when the player jumps
-@@ -299,10 +299,10 @@ - if o.itemclass == "blob":
- o.jump()
-
-- if inputs.has_key("UP") and not player.on_ground:
-+ if "UP" in inputs and not player.on_ground:
- player.jump()
-
-- if inputs.has_key("DOWN"):
-+ if "DOWN" in inputs:
- pick_up_item = level.pick_up(player.x, player.y)
- if pick_up_item != None:
- play_sound("coins")
-@@ -314,10 +314,10 @@ - trigger = level.trigger(player.x, player.y)
-
- #Debug command for flipping:
-- if inputs.has_key("SPECIAL"):
-+ if "SPECIAL" in inputs:
- trigger = Trigger(TRIGGER_FLIP, player.x, player.y)
-
-- if inputs.has_key("PAUSE") and player.current_animation != "dying":
-+ if "PAUSE" in inputs and player.current_animation != "dying":
- paused = not paused
-
- #Decelerates the player, if he doesn't press any movement keys or when he is dead and on the ground
-@@ -344,7 +344,7 @@ - #Dust effect rising from the character's feet:
-
- if (player.current_animation == "walking"):
-- particles.append(Particle(screen, 10, player.rect.centerx - player.dx / 2 + random.uniform(-2, 2), player.rect.bottom, -player.dx * 0.1, 0.1, 0.3, level.dust_color))
-+ particles.append(Particle(screen, 10, player.rect.centerx - player.dx // 2 + random.uniform(-2, 2), player.rect.bottom, -player.dx * 0.1, 0.1, 0.3, level.dust_color))
-
- #Updating level and objects:
-
-@@ -455,7 +455,7 @@ - player.orientation = current_scripted_event_element.orientation
- current_scripted_event_element.finished = True
- elif current_scripted_event_element.event_type == "change_level":
-- score.score += (5 + score_mod) * ((player.life + 4) / 5 + 12)
-+ score.score += (5 + score_mod) * ((player.life + 4) // 5 + 12)
- score.levels += 1
- current_scripted_event_element.finished = True
- if player.current_animation != "gone":
---- a/lib/level.py -+++ b/lib/level.py -@@ -129,8 +129,8 @@ - self.bg_animations["default"] = Animation(self.set + "_background", "static")
- self.current_animation = "default"
- self.rect = (self.bg_animations[self.current_animation].update_and_get_image()).get_rect()
-- self.rect.centerx = SCREEN_WIDTH / 2
-- self.rect.centery = SCREEN_HEIGHT / 2
-+ self.rect.centerx = SCREEN_WIDTH // 2
-+ self.rect.centery = SCREEN_HEIGHT // 2
-
- self.reset_active_tiles()
- return
-@@ -217,7 +217,7 @@ -
- #Checks the point for solid ground
- def ground_check(self, x, y):
-- if self.cached_ground_check.has_key(str(x) + "_" + str(y)):
-+ if (str(x) + "_" + str(y)) in self.cached_ground_check:
- return self.cached_ground_check[str(x) + "_" + str(y)]
- else:
- if x > SCREEN_WIDTH or y > SCREEN_HEIGHT or x < 0 or y < 0:
-@@ -333,7 +333,7 @@ - def remove_tile(self, coords):
- """Remove a tile from the level with coordinates relative to the corner of the area currently visible."""
- for t in self.active_tiles:
-- if t.rect.collidepoint(coords[0]*TILE_DIM + TILE_DIM / 2, coords[1]*TILE_DIM + TILE_DIM / 2):
-+ if t.rect.collidepoint(coords[0]*TILE_DIM + TILE_DIM // 2, coords[1]*TILE_DIM + TILE_DIM // 2):
- self.active_tiles.remove(t)
- self.tiles.remove(t)
- self.edited = True
---- a/lib/log.py -+++ b/lib/log.py -@@ -15,7 +15,7 @@ - """Add a message to the message log, which can be written on disk later."""
-
- #Multiple messages of the same type aren't added to the log:
-- if Variables.vdict.has_key("last_log_message"):
-+ if "last_log_message" in Variables.vdict:
- if string == Variables.vdict["last_log_message"]:
- return
-
-@@ -24,9 +24,9 @@ -
- Variables.vdict["last_log_message"] = string
-
-- if Variables.vdict.has_key("log"):
-+ if "log" in Variables.vdict:
- Variables.vdict["log"] = string + "\n" + Variables.vdict["log"]
- else:
- Variables.vdict["log"] = string
-
-- return -\ No newline at end of file -+ return
---- a/lib/sound.py -+++ b/lib/sound.py -@@ -25,7 +25,7 @@ - if not Variables.vdict["sound"]:
- return
- snd = None
-- if (not sounds.has_key(sound_id)):
-+ if sound_id not in sounds:
- try:
- sound_path = data.filepath(os.path.join("sounds", sound_id + ".ogg"))
- snd = sounds[sound_id] = pygame.mixer.Sound(sound_path)
---- a/lib/visibleobject.py -+++ b/lib/visibleobject.py -@@ -27,9 +27,9 @@ - self.x = x
- self.y = y
- if (self.x == None):
-- self.x = SCREEN_WIDTH / 2
-+ self.x = SCREEN_WIDTH // 2
- if (self.y == None):
-- self.y = SCREEN_HEIGHT / 2
-+ self.y = SCREEN_HEIGHT // 2
-
- self.flipping = False
- self.flipcounter = 0
-@@ -122,7 +122,7 @@ -
- def die(self):
- """Make the object die - if the object has a death animation, it will be played first."""
-- if self.animations.has_key("dying"):
-+ if "dying" in self.animations:
- self.current_animation = "dying"
- else:
- self.dead = True
---- a/lib/player.py -+++ b/lib/player.py -@@ -79,7 +79,7 @@ -
- blood = []
-
-- if collision_type > 0:
-+ if collision_type and collision_type > 0:
- blood = self.take_damage(collision_type)
- if self.current_animation != "dying":
- self.dy -= collision_type*PLAYER_JUMP_ACC / 4.5
---- a/lib/object.py -+++ b/lib/object.py -@@ -34,7 +34,7 @@ - self.initial_y = y
- self.gravity = gravity
- self.colliding = colliding
-- self.active = (self.x + self.rect.width / 2 > 0) and (self.y + self.rect.height / 2 > 0)
-+ self.active = (self.x + self.rect.width // 2 > 0) and (self.y + self.rect.height // 2 > 0)
-
- self.on_ground = False
-
-@@ -76,7 +76,7 @@ - VisibleObject.update(self)
-
- if self.flip_finished and self.itemclass != "player":
-- self.active = (self.x + self.rect.width / 2 > 0) and (self.y + self.rect.height / 2 > 0)
-+ self.active = (self.x + self.rect.width // 2 > 0) and (self.y + self.rect.height // 2 > 0)
-
- if self.flipping:
- return
-@@ -101,9 +101,9 @@ - """Make the object flip with the level to either direction"""
- if VisibleObject.flip(self, flip_direction):
- if flip_direction == CLOCKWISE:
-- self.initial_x, self.initial_y = -self.initial_y + PLAY_AREA_WIDTH / TILES_HOR * (TILES_HOR*2 - FULL_TILES_HOR), self.initial_x
-+ self.initial_x, self.initial_y = -self.initial_y + PLAY_AREA_WIDTH // TILES_HOR * (TILES_HOR*2 - FULL_TILES_HOR), self.initial_x
- else:
-- self.initial_x, self.initial_y = self.initial_y, -self.initial_x + PLAY_AREA_WIDTH / TILES_HOR * (TILES_HOR*2 - FULL_TILES_HOR)
-+ self.initial_x, self.initial_y = self.initial_y, -self.initial_x + PLAY_AREA_WIDTH // TILES_HOR * (TILES_HOR*2 - FULL_TILES_HOR)
- return
-
- def check_collisions(self, level):
-@@ -116,25 +116,25 @@ -
- self.on_ground = False
-
-- if self.x < 0 + self.rect.width / 2:
-- self.x = 0 + self.rect.width / 2
-+ if self.x < 0 + self.rect.width // 2:
-+ self.x = 0 + self.rect.width // 2
- self.dx = 0
- collision_type = 0
-
-- if self.x > PLAY_AREA_WIDTH - self.rect.width / 2:
-- self.x = PLAY_AREA_WIDTH - self.rect.width / 2
-+ if self.x > PLAY_AREA_WIDTH - self.rect.width // 2:
-+ self.x = PLAY_AREA_WIDTH - self.rect.width // 2
- self.dx = 0
- collision_type = 0
-
- # The commented block is the collision code for the upper edge of the screen.
- # The spiders and projectiles might need this, but they use simplified
- # collision detection for better performance anyway.
-- '''if self.y < 0 + self.rect.height / 2:
-- self.y = 0 + self.rect.height / 2
-+ '''if self.y < 0 + self.rect.height // 2:
-+ self.y = 0 + self.rect.height // 2
- self.dy = 0'''
-
-- if self.y > PLAY_AREA_HEIGHT - self.rect.height / 2:
-- self.y = PLAY_AREA_HEIGHT - self.rect.height / 2
-+ if self.y > PLAY_AREA_HEIGHT - self.rect.height // 2:
-+ self.y = PLAY_AREA_HEIGHT - self.rect.height // 2
- self.dy = 0
- self.on_ground = True
- collision_type = 0
---- a/lib/locals.py -+++ b/lib/locals.py -@@ -16,8 +16,8 @@ -
- TILE_DIM = 40
-
--PLAY_AREA_CENTER_X = (-FULL_TILES_HOR / 2 + TILES_HOR) * TILE_DIM
--PLAY_AREA_CENTER_Y = (-FULL_TILES_VER / 2 + TILES_VER) * TILE_DIM
-+PLAY_AREA_CENTER_X = (-FULL_TILES_HOR // 2 + TILES_HOR) * TILE_DIM
-+PLAY_AREA_CENTER_Y = (-FULL_TILES_VER // 2 + TILES_VER) * TILE_DIM
-
- GRAVITY = 1.0
- GRAVITY_PARTICLE = 0.5
---- a/lib/mainmenu.py -+++ b/lib/mainmenu.py -@@ -73,19 +73,19 @@ -
- menu_image = render_text("World " + str(self.world.number) + ": " + self.world.name, COLOR_GUI)
- rect = menu_image.get_rect()
-- rect.centerx = SCREEN_WIDTH / 2
-+ rect.centerx = SCREEN_WIDTH // 2
- rect.top = GUI_MENU_TOP - 75
- self.bgscreen.blit(menu_image, rect)
-
- menu_image = render_text(score_text, COLOR_GUI)
- rect = menu_image.get_rect()
-- rect.centerx = SCREEN_WIDTH / 2
-+ rect.centerx = SCREEN_WIDTH // 2
- rect.top = GUI_MENU_TOP - 50
- self.bgscreen.blit(menu_image, rect)
-
- menu_image = render_text(time_text, COLOR_GUI)
- rect = menu_image.get_rect()
-- rect.centerx = SCREEN_WIDTH / 2
-+ rect.centerx = SCREEN_WIDTH // 2
- rect.top = GUI_MENU_TOP - 30
- self.bgscreen.blit(menu_image, rect)
-
---- a/lib/menu.py -+++ b/lib/menu.py -@@ -91,14 +91,14 @@ -
- menu_bg = pygame.image.load(data.picpath("menu", "bg")).convert_alpha()
- rect = menu_bg.get_rect()
-- rect.centerx = SCREEN_WIDTH / 2
-+ rect.centerx = SCREEN_WIDTH // 2
- rect.top = GUI_MENU_TOP
- self.screen.blit(menu_bg, rect)
-
- if self.heading_text != None:
- menu_head = render_text(self.heading_text)
- rect = menu_head.get_rect()
-- rect.centerx = SCREEN_WIDTH / 2
-+ rect.centerx = SCREEN_WIDTH // 2
- rect.top = GUI_MENU_TOP + 50 + menu_offset
- self.screen.blit(menu_head, rect)
-
-@@ -120,7 +120,7 @@ - else:
- menu_image = render_text(m, COLOR_GUI)
- rect = menu_image.get_rect()
-- rect.centerx = SCREEN_WIDTH / 2
-+ rect.centerx = SCREEN_WIDTH // 2
- rect.top = GUI_MENU_TOP + 60 + (menu_visible + 1) * 20 + menu_offset
- self.screen.blit(menu_image, rect)
- current_menu_index += 1
---- a/lib/particle.py -+++ b/lib/particle.py -@@ -28,9 +28,9 @@ - self.radius = radius
- self.gravity = gravity
- if (self.x == None):
-- self.x = SCREEN_WIDTH / 2
-+ self.x = SCREEN_WIDTH // 2
- if (self.y == None):
-- self.y = SCREEN_HEIGHT / 2
-+ self.y = SCREEN_HEIGHT // 2
- if (self.dx == None):
- self.dx = 0.0
- if (self.dy == None):
---- a/lib/tile.py -+++ b/lib/tile.py -@@ -47,8 +47,8 @@ - def realign(self):
- self.rect.centerx = self.x
- self.rect.centery = self.y
-- self.x = round((float(self.rect.right)/float(TILE_DIM)), 0)*TILE_DIM - self.rect.width / 2
-- self.y = round((float(self.rect.bottom)/float(TILE_DIM)), 0)*TILE_DIM - self.rect.height / 2
-+ self.x = round((float(self.rect.right)/float(TILE_DIM)), 0)*TILE_DIM - self.rect.width // 2
-+ self.y = round((float(self.rect.bottom)/float(TILE_DIM)), 0)*TILE_DIM - self.rect.height // 2
- if self.rect.height % 2 == 1:
- self.y -= 1
- if self.rect.width % 2 == 1:
diff --git a/games-arcade/whichwayisup/files/whichwayisup-32.xpm b/games-arcade/whichwayisup/files/whichwayisup-32.xpm deleted file mode 100644 index f5a6ff33c0dc..000000000000 --- a/games-arcade/whichwayisup/files/whichwayisup-32.xpm +++ /dev/null @@ -1,67 +0,0 @@ -/* XPM */ -static char * whichwayisup_32_xpm[] = { -"32 32 32 1", -" c None", -". c #03151B", -"+ c #016C87", -"@ c #225361", -"# c #363636", -"$ c #387D9A", -"% c #0A2B35", -"& c #4E4F50", -"* c #ECEBEB", -"= c #9D866F", -"- c #E3D9D3", -"; c #A8947C", -"> c #CDCDCD", -", c #C5BDA7", -"' c #B2A38C", -") c #D0C9B4", -"! c #AEACAB", -"~ c #FDFDFD", -"{ c #020202", -"] c #856B5D", -"^ c #262524", -"/ c #6E6E6E", -"( c #888987", -"_ c #121111", -": c #9E9D9D", -"< c #4F6871", -"[ c #BCBDBD", -"} c #023B4A", -"| c #6E4C3B", -"1 c #7D5945", -"2 c #4F2C21", -"3 c #401D14", -" .+@@# ", -" ++++$ ", -" #%&@&@@@. ", -" *=-;>,'- ", -" )*=!~ ", -" {{#]]]#{{ ", -" {{^^%+@/(%_/#_ ", -" {{&:*>@+<&<<%[~[&{ ", -" _#:~~~~<+@/@&&(-~~/_ ", -" _#>~~[<^{}%%@{_&{<>~:{ ", -" _#-~>&{{ }}.+{ {^:~({ ", -" ^>~>_^(;>,:((((--,) {(~& ", -" {(~*#{ ,),))))))),,; _>[{ ", -" #^*~({ ;',,,,,),,,=| {&*# ", -" _/~~&{ ;;',)),)),=1] ^*/{ ", -" _(~*^_ =;;'),,))=|11 {>[_ ", -" _!~*_{ ====',,,=|1|2 {:-^ ", -" _:~*^{ ;;;';')=|]1## {:*^ ", -" {(~*^{ ;=;=;=]||12&2 {:~^ ", -" _&~~&{ ==;==|321^:/^ {[~^ ", -" _>~/{ =';;13222&~#3 {#~>_ ", -" {/~!{ =;=|3333_[~^# {:~(^ ", -" ^_>~^{ ''|3222_#~*^| {#~*^ ", -" {#~:{&'123232{/~*^^{_>~/{ ", -" {&*&^|323333{(~*&{#>~:{ ", -" {&!# {(~~[!*~:{{ ", -" {^#_ {/~*~~~:{{ ", -" __{{ {#~~~~~:^{ ", -" _>~~~~~-/_{ ", -" {#([*~~~~[&_{ ", -" {{^&(:[**!&{ ", -" {{_^&&#{"}; diff --git a/games-arcade/whichwayisup/metadata.xml b/games-arcade/whichwayisup/metadata.xml index e60b4379f974..2a032548b810 100644 --- a/games-arcade/whichwayisup/metadata.xml +++ b/games-arcade/whichwayisup/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/whichwayisup/whichwayisup-0.7.9-r3.ebuild b/games-arcade/whichwayisup/whichwayisup-0.7.9-r3.ebuild deleted file mode 100644 index 0644c6c31c39..000000000000 --- a/games-arcade/whichwayisup/whichwayisup-0.7.9-r3.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit desktop python-r1 - -MY_PV="${PV//./}" -MY_P="${PN}_b${MY_PV}" - -DESCRIPTION="A traditional and challenging 2D platformer game with a slight rotational twist" -HOMEPAGE="http://hectigo.net/puskutraktori/whichwayisup/" -SRC_URI="http://hectigo.net/puskutraktori/whichwayisup/${MY_P}.zip" - -LICENSE="GPL-2 CC-BY-3.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - dev-python/pygame[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" -BDEPEND="app-arch/unzip" - -S="${WORKDIR}/${PN}" - -PATCHES=( - # Fixes from Fedora - "${FILESDIR}"/${P}-check_for_joystick_axes_not_null.patch - "${FILESDIR}"/${P}-initialize_only_required_pygame_modules.patch - "${FILESDIR}"/${P}-python3.patch -) - -src_prepare() { - default - sed -i \ - -e "s:libdir\ =\ .*:libdir\ =\ \"/usr/$(get_libdir)/${PN}\":" \ - run_game.py || die - sed -i \ - -e "s:data_dir\ =\ .*:data_dir\ =\ \"/usr/share/${PN}\":" \ - lib/data.py || die - rm data/pictures/Thumbs.db || die -} - -src_install() { - newbin run_game.py ${PN} - - insinto "/usr/$(get_libdir)/${PN}" - doins lib/*.py - - einstalldocs - - insinto "/usr/share/${PN}" - doins -r data/* - - newicon "${FILESDIR}"/${PN}-32.xpm ${PN}.xpm - make_desktop_entry ${PN} "Which Way Is Up?" -} diff --git a/games-arcade/whichwayisup/whichwayisup-0.7.9_p8.ebuild b/games-arcade/whichwayisup/whichwayisup-0.7.9_p8.ebuild new file mode 100644 index 000000000000..c8c7fe0a4dd2 --- /dev/null +++ b/games-arcade/whichwayisup/whichwayisup-0.7.9_p8.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +inherit desktop python-single-r1 + +DESCRIPTION="Traditional and challenging 2D platformer game with a slight rotational twist" +HOMEPAGE="https://www.oletus.fi/static/whichwayisup/" +SRC_URI=" + https://www.oletus.fi/static/whichwayisup/${PN}_b079.zip + mirror://debian/pool/main/${P::1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}.png" +S="${WORKDIR}/${PN}" + +LICENSE="BitstreamVera CC-BY-3.0 GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + ${PYTHON_DEPS} + $(python_gen_cond_dep 'dev-python/pygame[${PYTHON_USEDEP}]') + media-libs/sdl2-image[png] + media-libs/sdl2-mixer[vorbis]" +BDEPEND=" + ${PYTHON_DEPS} + app-arch/unzip" + +PATCHES=( + "${WORKDIR}"/debian/patches +) + +src_prepare() { + # drop Debian specific patch + rm "${WORKDIR}"/debian/patches/font_path.patch || die + + default + + sed -i "/libdir =/s|= .*|= \"${EPREFIX}/usr/share/${PN}/lib\"|" run_game.py || die + python_fix_shebang run_game.py + + rm data/pictures/Thumbs.db || die +} + +src_install() { + newbin run_game.py ${PN} + + insinto /usr/share/${PN} + doins -r data lib + + dodoc README.txt changelog.txt + + doicon "${DISTDIR}"/${PN}.png + make_desktop_entry ${PN} "Which Way Is Up?" +} diff --git a/games-arcade/wop/metadata.xml b/games-arcade/wop/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/wop/metadata.xml +++ b/games-arcade/wop/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/xbill/Manifest b/games-arcade/xbill/Manifest index b1b8dba1c1fb..2de057050fc8 100644 --- a/games-arcade/xbill/Manifest +++ b/games-arcade/xbill/Manifest @@ -1 +1,2 @@ DIST xbill-2.1.tar.gz 77610 BLAKE2B aeadc62fa01a3d37b1ae6388987e5d5e3a2d73b9c5afa99b9a2c61155eeb5fb2efc4a36dd2cbeb3fd2f677b385550146d75964afa5f7e83a27f6dc7a16db83c9 SHA512 127604d88258db0ec47084209c656f8817146d70b0fe16f5a1d79883415cf38200594834b39080d78c627104ae6d204f3c12caf127fa094108c4edfbfa98d966 +DIST xbill.png 49325 BLAKE2B a2b5cacee2f5aaf62bcea941dbde26c4cf17ef29c0018ecbd66aefb64e6d1240ac756a32b84d631e4675774b7a06d7c56756debe80df8252684181e0e638a9a0 SHA512 cb41e8603f400cf7b4f8fde2739e798872cefd6e45ff0ff17ddf1f02958f572195022adcdc7ac308cb4236fb79ff68433673cfbaefaf5ccdb426d6070f39e854 diff --git a/games-arcade/xbill/files/xbill-2.1-clang16.patch b/games-arcade/xbill/files/xbill-2.1-clang16.patch new file mode 100644 index 000000000000..524fdde63ae4 --- /dev/null +++ b/games-arcade/xbill/files/xbill-2.1-clang16.patch @@ -0,0 +1,27 @@ +Drop -I. to prevent <strings.h> from including ./strings.h +https://bugs.gentoo.org/874624 +--- a/Bucket.c ++++ b/Bucket.c +@@ -1,2 +1,2 @@ +-#include <util.h> ++#include "util.h" + +--- a/Game.c ++++ b/Game.c +@@ -4,2 +4,3 @@ + #include <string.h> ++#include <strings.h> + #include <time.h> +--- a/Makefile.in ++++ b/Makefile.in +@@ -22,3 +22,3 @@ + +-ALL_CFLAGS = $(CFLAGS) $(CPPFLAGS) -I$(srcdir) ++ALL_CFLAGS = $(CFLAGS) $(CPPFLAGS) + ALL_LDFLAGS = $(CFLAGS) $(LDFLAGS) +--- a/UI.c ++++ b/UI.c +@@ -3,2 +3,3 @@ + #include <string.h> ++#include <strings.h> + diff --git a/games-arcade/xbill/files/xbill-2.1-gtk2.patch b/games-arcade/xbill/files/xbill-2.1-gtk2.patch deleted file mode 100644 index 829475badd72..000000000000 --- a/games-arcade/xbill/files/xbill-2.1-gtk2.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/configure.in 2007-12-05 22:37:57.000000000 +0100 -+++ b/configure.in 2007-12-05 22:54:57.000000000 +0100 -@@ -88,12 +88,11 @@ - [ --enable-gtk build with the GTK widget set]) - - if test "$enable_gtk" != "no"; then -- AC_CHECK_PROG(GTKCONFIG, gtk-config, yes, no) -+ PKG_CHECK_MODULES(GTK, gtk+-2.0) - -- if test "X$GTKCONFIG" = X"yes"; then -+ if test $pkg_failed = no; then - AC_DEFINE(USE_GTK) -- GTK_CFLAGS="`gtk-config --cflags`" -- WIDGET_LIBS="$WIDGET_LIBS `gtk-config --libs`" -+ WIDGET_LIBS="$WIDGET_LIBS $GTK_LIBS" - WIDGET_OBJS="$WIDGET_OBJS gtk.o" - fi - fi diff --git a/games-arcade/xbill/metadata.xml b/games-arcade/xbill/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/xbill/metadata.xml +++ b/games-arcade/xbill/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/xbill/xbill-2.1-r3.ebuild b/games-arcade/xbill/xbill-2.1-r3.ebuild deleted file mode 100644 index 70378b00ceb9..000000000000 --- a/games-arcade/xbill/xbill-2.1-r3.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools desktop - -DESCRIPTION="A game about an evil hacker called Bill!" -HOMEPAGE="http://www.xbill.org/" -SRC_URI="http://www.xbill.org/download/${P}.tar.gz" - -LICENSE="GPL-1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~x86" -IUSE="gtk" - -RDEPEND="acct-group/gamestat - media-fonts/font-misc-misc - gtk? ( x11-libs/gtk+:2 ) - !gtk? ( x11-libs/libXaw )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${P}-gtk2.patch - "${FILESDIR}"/${P}-gentoo.patch -) - -src_prepare() { - default - mv configure.in configure.ac || die - eautoreconf -} - -src_configure() { - econf \ - --disable-motif \ - $(use_enable gtk) \ - $(use_enable !gtk athena) -} - -src_install() { - default - newicon pixmaps/icon.xpm ${PN}.xpm - make_desktop_entry ${PN} XBill ${PN} - fowners :gamestat /var/lib/xbill/scores - fperms 664 /var/lib/xbill/scores -} diff --git a/games-arcade/xbill/xbill-2.1-r6.ebuild b/games-arcade/xbill/xbill-2.1-r6.ebuild new file mode 100644 index 000000000000..9f53fb25981f --- /dev/null +++ b/games-arcade/xbill/xbill-2.1-r6.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools desktop + +DESCRIPTION="Game about an evil hacker called Bill!" +HOMEPAGE="http://www.xbill.org/" +SRC_URI=" + http://www.xbill.org/download/${P}.tar.gz + https://dashboard.snapcraft.io/site_media/appmedia/2018/04/xbill.png" + +LICENSE="GPL-1" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + acct-group/gamestat + media-fonts/font-misc-misc + x11-libs/libXaw" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-clang16.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + local econfargs=( + --disable-motif + --disable-gtk + --enable-athena + ) + + econf "${econfargs[@]}" +} + +src_install() { + default + + doicon "${DISTDIR}"/${PN}.png + make_desktop_entry ${PN} XBill ${PN} + + fowners :gamestat /var/lib/xbill/scores /usr/bin/${PN} + fperms 664 /var/lib/xbill/scores +} diff --git a/games-arcade/xboing/files/xboing-2.4-clang16.patch b/games-arcade/xboing/files/xboing-2.4-clang16.patch new file mode 100644 index 000000000000..72c632850de0 --- /dev/null +++ b/games-arcade/xboing/files/xboing-2.4-clang16.patch @@ -0,0 +1,37 @@ +Ideally would want to enable -DNeedFunctionPrototypes=1 +but it leads to more issues not handled here. + +https://bugs.gentoo.org/870412 +--- a/eyedude.c ++++ b/eyedude.c +@@ -51,2 +51,3 @@ + #include <stdio.h> ++#include <stdlib.h> + #include <math.h> +--- a/include/intro.h ++++ b/include/intro.h +@@ -84,2 +84,3 @@ + void DrawIntroTitle(Display *display, Window window, int x, int y); ++void HandleBlink(Display *display, Window window); + #else +@@ -92,2 +93,3 @@ + void DoIntroTitle(); ++void HandleBlink(); + #endif +--- a/include/level.h ++++ b/include/level.h +@@ -74,2 +74,3 @@ + void DisplayLevelInfo(Display *display, Window window, u_long level); ++void DisplayLevelNumber(Display *display, Window window, u_long level); + void CheckGameRules(Display *display, Window window); +@@ -113,2 +114,3 @@ + void DisplayLevelInfo(); ++void DisplayLevelNumber(); + void CheckGameRules(); +--- a/main.c ++++ b/main.c +@@ -231,3 +231,3 @@ + { +- static oldx = 0; ++ static int oldx = 0; + int x, y; diff --git a/games-arcade/xboing/files/xboing-2.4-musl.patch b/games-arcade/xboing/files/xboing-2.4-musl.patch new file mode 100644 index 000000000000..b24084e9206e --- /dev/null +++ b/games-arcade/xboing/files/xboing-2.4-musl.patch @@ -0,0 +1,11 @@ +diff -ruN xboing.orig/include/file.h xboing/include/file.h +--- xboing.orig/include/file.h 1996-11-22 02:28:34.000000000 +0100 ++++ xboing/include/file.h 2023-04-08 20:27:45.157804561 +0200 +@@ -52,6 +52,7 @@ + + #include <stdio.h> + #include <time.h> ++#include <sys/types.h> + + /* + * Constants and macros: diff --git a/games-arcade/xboing/metadata.xml b/games-arcade/xboing/metadata.xml index 84503c2b1c29..8f60dddae30a 100644 --- a/games-arcade/xboing/metadata.xml +++ b/games-arcade/xboing/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"><email>dilfridge@gentoo.org</email></maintainer> </pkgmetadata> diff --git a/games-arcade/xboing/xboing-2.4-r3.ebuild b/games-arcade/xboing/xboing-2.4-r3.ebuild deleted file mode 100644 index d47824221347..000000000000 --- a/games-arcade/xboing/xboing-2.4-r3.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic eutils - -DESCRIPTION="Blockout type game where you bounce a ball trying to destroy blocks" -HOMEPAGE="http://www.techrescue.org/xboing/" -SRC_URI="http://www.techrescue.org/xboing/${PN}${PV}.tar.gz - mirror://gentoo/xboing-${PV}-debian.patch.bz2" - -LICENSE="xboing" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="" - -RDEPEND="acct-group/gamestat - x11-libs/libXpm" -DEPEND="${RDEPEND} - app-text/rman - x11-misc/gccmakedep - x11-misc/imake -" - -S=${WORKDIR}/${PN} - -src_prepare() { - epatch "${WORKDIR}"/xboing-${PV}-debian.patch - epatch "${FILESDIR}"/xboing-${PV}-buffer.patch - epatch "${FILESDIR}"/xboing-${PV}-sleep.patch - sed -i '/^#include/s:xpm\.h:X11/xpm.h:' *.c || die - eapply_user -} - -src_configure() { - xmkmf -a || die - sed -i -e "s:GENTOO_VER:${PF/${PN}-/}:" Imakefile || die - append-cflags -fcommon -} - -src_compile() { - emake \ - CXXOPTIONS="${CXXFLAGS}" \ - CDEBUGFLAGS="${CFLAGS}" \ - LOCAL_LDFLAGS="${LDFLAGS}" \ - XBOING_DIR="/usr/share/${PN}" -} - -src_install() { - make \ - PREFIX="${D}" \ - BINDIR="${D}/usr/bin" \ - LOCAL_LDFLAGS="${LDFLAGS}" \ - XBOING_DIR="/usr/share/${PN}" \ - install || die - newman xboing.man xboing.6 - dodoc README docs/*.doc - - fowners root:gamestat /var/games/xboing.score /usr/bin/xboing - fperms 660 /var/games/xboing.score - fperms 2755 /usr/bin/xboing -} diff --git a/games-arcade/xboing/xboing-2.4-r4.ebuild b/games-arcade/xboing/xboing-2.4-r4.ebuild new file mode 100644 index 000000000000..d427db516466 --- /dev/null +++ b/games-arcade/xboing/xboing-2.4-r4.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Blockout type game where you bounce a ball trying to destroy blocks" +HOMEPAGE="http://www.techrescue.org/xboing/" +SRC_URI="http://www.techrescue.org/xboing/${PN}${PV}.tar.gz + mirror://gentoo/${P}-debian.patch.bz2" +S="${WORKDIR}/${PN}" + +LICENSE="xboing" +SLOT="0" +KEYWORDS="amd64 ~x86" + +RDEPEND=" + acct-group/gamestat + x11-libs/libX11 + x11-libs/libXpm" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto" +BDEPEND=" + app-text/rman + sys-devel/gcc + x11-misc/gccmakedep + >=x11-misc/imake-1.0.8-r1" + +PATCHES=( + "${WORKDIR}"/${P}-debian.patch + "${FILESDIR}"/${P}-buffer.patch + "${FILESDIR}"/${P}-sleep.patch + "${FILESDIR}"/${P}-clang16.patch + "${FILESDIR}"/${P}-musl.patch +) + +src_prepare() { + default + sed -i '/^#include/s:xpm\.h:X11/xpm.h:' *.c || die + sed -i "s:GENTOO_VER:${PF/${PN}-/}:" Imakefile || die +} + +src_configure() { + append-cflags -fcommon #707214 + + CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ + IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf -a || die +} + +src_compile() { + local myemakeargs=( + CC="$(tc-getCC)" + CDEBUGFLAGS="${CFLAGS}" + LOCAL_LDFLAGS="${LDFLAGS}" + HIGH_SCORE_DIR="${EPREFIX}/var/games" + XBOING_DIR="${EPREFIX}/usr/share/${PN}" + ) + emake "${myemakeargs[@]}" +} + +src_install() { + local myemakeargs=( + CC="$(tc-getCC)" + LOCAL_LDFLAGS="${LDFLAGS}" + PREFIX="${D}" + BINDIR="${ED}/usr/bin" + HIGH_SCORE_DIR="${EPREFIX}/var/games" + XBOING_DIR="${EPREFIX}/usr/share/${PN}" + ) + emake "${myemakeargs[@]}" install + + newman xboing.man xboing.6 + dodoc README docs/*.doc + + fowners root:gamestat /var/games/xboing.score /usr/bin/xboing + fperms 660 /var/games/xboing.score + fperms 2755 /usr/bin/xboing +} diff --git a/games-arcade/xbubble/metadata.xml b/games-arcade/xbubble/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/xbubble/metadata.xml +++ b/games-arcade/xbubble/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/xbubble/xbubble-0.5.8-r1.ebuild b/games-arcade/xbubble/xbubble-0.5.8-r2.ebuild index 67c8f575299f..0aa90265c24a 100644 --- a/games-arcade/xbubble/xbubble-0.5.8-r1.ebuild +++ b/games-arcade/xbubble/xbubble-0.5.8-r2.ebuild @@ -1,7 +1,8 @@ -# 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 desktop DESCRIPTION="A Puzzle Bobble clone similar to Frozen-Bubble" @@ -10,28 +11,30 @@ SRC_URI="http://www.ibiblio.org/pub/mirrors/gnu/ftp/savannah/files/${PN}/${P}.ta LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~x86" +KEYWORDS="~amd64 ~x86" IUSE="nls" RDEPEND=" x11-libs/libX11 x11-libs/libXt - media-libs/libpng:0= + media-libs/libpng:= nls? ( virtual/libintl ) " -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext ) -" +DEPEND="${RDEPEND}" +BDEPEND="nls? ( sys-devel/gettext )" DOCS=( AUTHORS ChangeLog NEWS NetworkProtocol README TODO ) +PATCHES=( + "${FILESDIR}"/${P}-xpaths.patch + "${FILESDIR}"/${P}-locale.patch + "${FILESDIR}"/${P}-libpng14.patch + "${FILESDIR}"/${P}-png15.patch +) + src_prepare() { default - eapply \ - "${FILESDIR}"/${P}-xpaths.patch \ - "${FILESDIR}"/${P}-locale.patch \ - "${FILESDIR}"/${P}-libpng14.patch \ - "${FILESDIR}"/${P}-png15.patch + sed -i \ -e '/^AM_CFLAGS/d' \ src/Makefile.in || die @@ -45,6 +48,7 @@ src_configure() { } src_install() { + default newicon data/themes/fancy/Bubble_black_DEAD_01.png ${PN}.png make_desktop_entry ${PN} XBubble diff --git a/games-arcade/xgalaga/files/xgalaga-2.1.1.0-function-and-ints.patch b/games-arcade/xgalaga/files/xgalaga-2.1.1.0-function-and-ints.patch new file mode 100644 index 000000000000..349f01216f35 --- /dev/null +++ b/games-arcade/xgalaga/files/xgalaga-2.1.1.0-function-and-ints.patch @@ -0,0 +1,24 @@ +Bug: https://bugs.gentoo.org/877287 +--- a/title.c ++++ b/title.c +@@ -5,6 +5,7 @@ + + #include <stdio.h> + #include <stdlib.h> ++#include <unistd.h> + #ifdef HAVE_FCNTL_H + # include <fcntl.h> + #endif +@@ -17,9 +18,9 @@ + #include "proto.h" + + /* for scrolling credits */ +-const LINESIZE= 70; +-const VISIBLELINES=7; +-const SPEEDFACTOR=5; ++const int LINESIZE=70; ++const int VISIBLELINES=7; ++const int SPEEDFACTOR=5; + char *gchLBuf; + int giCreditLines=0, giActCreditLine=0; + diff --git a/games-arcade/xgalaga/files/xgalaga-2.1.1.0-respect-AR.patch b/games-arcade/xgalaga/files/xgalaga-2.1.1.0-respect-AR.patch new file mode 100644 index 000000000000..8a4991d4299b --- /dev/null +++ b/games-arcade/xgalaga/files/xgalaga-2.1.1.0-respect-AR.patch @@ -0,0 +1,24 @@ +Allow user to specify AR. Derive ar from --host=. + +Bug: https://bugs.gentoo.org/730796 +--- a/configure.in ++++ b/configure.in +@@ -14,6 +14,7 @@ AC_PROG_INSTALL + AC_PROG_LN_S + AC_PROG_MAKE_SET + AC_PROG_RANLIB ++AC_CHECK_TOOL(AR, ar) + + AC_ARG_WITH(xpm-lib,[ --with-xpm-lib Directory containing libXpm (may be autodetected)],xpm_lib=$withval) + AC_ARG_WITH(sound, [ --with-sound Type of sound to use (native or nas)],sound_type=$withval) +--- a/libsprite/Makefile.in ++++ b/libsprite/Makefile.in +@@ -8,7 +8,7 @@ VPATH = @srcdir@ + .SUFFIXES: + .SUFFIXES: .c .o + +-AR = ar ++AR = @AR@ + AR_FLAGS = rc + RANLIB = @RANLIB@ + diff --git a/games-arcade/xgalaga/metadata.xml b/games-arcade/xgalaga/metadata.xml index 70dbf6fb8a56..14eb84768812 100644 --- a/games-arcade/xgalaga/metadata.xml +++ b/games-arcade/xgalaga/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/xgalaga/xgalaga-2.1.1.0.ebuild b/games-arcade/xgalaga/xgalaga-2.1.1.0-r2.ebuild index 4d3b86a97566..2d3054441fd4 100644 --- a/games-arcade/xgalaga/xgalaga-2.1.1.0.ebuild +++ b/games-arcade/xgalaga/xgalaga-2.1.1.0-r2.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=7 + +inherit autotools desktop DESCRIPTION="A clone of the classic game Galaga for the X Window System" HOMEPAGE="https://sourceforge.net/projects/xgalaga" @@ -10,8 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~x86" -IUSE="" +KEYWORDS="~amd64 ~x86" RDEPEND="x11-libs/libX11 x11-libs/libXmu @@ -21,34 +21,46 @@ RDEPEND="x11-libs/libX11 DEPEND="${RDEPEND} x11-base/xorg-proto" +RDEPEND+=" acct-group/gamestat" + +PATCHES=( + "${FILESDIR}"/${PN}-2.1.1.0-respect-AR.patch + "${FILESDIR}"/${PN}-2.1.1.0-function-and-ints.patch +) + src_prepare() { + default + + eautoreconf + sed -i \ -e "/LEVELDIR\|SOUNDDIR/ s:prefix:datadir/${PN}:" \ -e "/\/scores/ s:prefix:localstatedir/${PN}:" \ - configure \ - || die "sed configure failed" + configure || die "sed configure failed" + sed -i \ -e "/SOUNDDEFS/ s:(SOUNDSRVDIR):(SOUNDSRVDIR)/bin:" \ -e 's:make ;:$(MAKE) ;:' \ - Makefile.in \ - || die "sed Makefile.in failed" + Makefile.in || die "sed Makefile.in failed" } src_install() { - dogamesbin xgalaga xgal.sndsrv.oss xgalaga-hyperspace + dobin xgalaga xgal.sndsrv.oss xgalaga-hyperspace dodoc README README.SOUND CHANGES newman xgalaga.6x xgalaga.6 - insinto "${GAMES_DATADIR}/${PN}/sounds" + insinto /usr/share/${PN}/sounds doins sounds/*.raw - insinto "${GAMES_DATADIR}/${PN}/levels" + insinto /usr/share/${PN}/levels doins levels/*.xgl make_desktop_entry ${PN} XGalaga - dodir "${GAMES_STATEDIR}/${PN}" - touch "${D}${GAMES_STATEDIR}/${PN}/scores" - fperms 660 "${GAMES_STATEDIR}/${PN}/scores" - prepgamesdirs + dodir /var/games/${PN} + touch "${ED}"/var/games/${PN}/scores || die + + fperms -R 660 /var/games/${PN} + fowners -R root:gamestat /var/games/${PN} /usr/bin/{xgalaga,xgal.sndsrv.oss,xgalaga-hyperspace} + fperms g+s /usr/bin/{xgalaga,xgal.sndsrv.oss,xgalaga-hyperspace} } diff --git a/games-arcade/xjump/files/xjump-2.7.5-c99.patch b/games-arcade/xjump/files/xjump-2.7.5-c99.patch new file mode 100644 index 000000000000..1f2958faf686 --- /dev/null +++ b/games-arcade/xjump/files/xjump-2.7.5-c99.patch @@ -0,0 +1,16 @@ +Polymorphism, C way +--- a/record.c 2024-04-04 11:22:00.801603415 +0000 ++++ b/record.c 2024-04-04 11:26:16.515731335 +0000 +@@ -198,8 +198,11 @@ + + /* ソート比較関数 */ + +-static int sort_cmp( record_t *r1, record_t *r2 ) ++static int sort_cmp(const void *v1, const void *v2 ) + { ++ const record_t *r1 = (const record_t *) v1; ++ const record_t *r2 = (const record_t *) v2; ++ + if( r1->score > r2->score ) + return -1; + else if( r1->score < r2->score ) diff --git a/games-arcade/xjump/files/xjump-2.7.5-ldflags.patch b/games-arcade/xjump/files/xjump-2.7.5-ldflags.patch index a30736811318..7cff45c60653 100644 --- a/games-arcade/xjump/files/xjump-2.7.5-ldflags.patch +++ b/games-arcade/xjump/files/xjump-2.7.5-ldflags.patch @@ -1,5 +1,5 @@ ---- Makefile.old 2010-10-01 07:05:03.000000000 +0200 -+++ Makefile 2010-10-01 07:05:39.000000000 +0200 +--- a/Makefile ++++ b/Makefile @@ -28,7 +28,7 @@ ########################################################## diff --git a/games-arcade/xjump/metadata.xml b/games-arcade/xjump/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/xjump/metadata.xml +++ b/games-arcade/xjump/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/xjump/xjump-2.7.5-r3.ebuild b/games-arcade/xjump/xjump-2.7.5-r3.ebuild new file mode 100644 index 000000000000..65704b65f41a --- /dev/null +++ b/games-arcade/xjump/xjump-2.7.5-r3.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DEBIAN_PATCH="6.1" +DESCRIPTION="An X game where one tries to jump up as many levels as possible" +HOMEPAGE="http://packages.debian.org/stable/games/xjump" +SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz + mirror://debian/pool/main/x/${PN}/${PN}_${PV}-${DEBIAN_PATCH}.debian.tar.gz" +S="${WORKDIR}"/${P}.orig + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="x11-libs/libX11 + x11-libs/libXaw + x11-libs/libXpm + x11-libs/libXt" +DEPEND="${RDEPEND} + x11-base/xorg-proto" + +RDEPEND+=" acct-group/gamestat" + +PATCHES=( + "${WORKDIR}"/debian/patches/01_overflow.patch + "${WORKDIR}"/debian/patches/02_fix_repeat.patch + "${WORKDIR}"/debian/patches/03_source_warnings.patch + "${WORKDIR}"/debian/patches/04_makefile_respect_cflags.patch + "${WORKDIR}"/debian/patches/05_unneded_deps.patch + "${FILESDIR}"/${P}-ldflags.patch + "${FILESDIR}"/${P}-c99.patch +) + +src_prepare() { + default + + # set up where we will keep the highscores file: + sed -i \ + -e "/^CC/d" \ + -e "/^CFLAGS/d" \ + -e "s,/record,/xjump.hiscores," \ + Makefile || die +} + +src_configure() { + tc-export CC +} + +src_install() { + dobin xjump + dodoc README.euc + + # Set up the hiscores file + dodir /var/games/${PN} + touch "${ED}"/var/games/${PN}/xjump.hiscores || die + + fperms -R 660 /var/games/${PN} + fowners -R root:gamestat /var/games/${PN} /usr/bin/${PN} + fperms g+s /usr/bin/${PN} +} diff --git a/games-arcade/xjump/xjump-2.7.5.ebuild b/games-arcade/xjump/xjump-2.7.5.ebuild deleted file mode 100644 index 58d403ffe1bd..000000000000 --- a/games-arcade/xjump/xjump-2.7.5.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils games - -DEBIAN_PATCH="6.1" -DESCRIPTION="An X game where one tries to jump up as many levels as possible" -HOMEPAGE="http://packages.debian.org/stable/games/xjump" -SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz - mirror://debian/pool/main/x/${PN}/${PN}_${PV}-${DEBIAN_PATCH}.debian.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="x11-libs/libX11 - x11-libs/libXaw - x11-libs/libXpm - x11-libs/libXt" - -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -S=${WORKDIR}/${P}.orig - -src_prepare() { - # Where we will keep the highscore file: - HISCORE_FILENAME=xjump.hiscores - HISCORE_FILE="${GAMES_STATEDIR}/${HISCORE_FILENAME}" - - epatch \ - "${WORKDIR}"/debian/patches/0*.patch \ - "${FILESDIR}"/${P}-ldflags.patch - - # set up where we will keep the highscores file: - sed -i \ - -e "/^CC/d" \ - -e "/^CFLAGS/d" \ - -e "s,/var/games/xjump,${GAMES_STATEDIR}," \ - -e "s,/record,/${HISCORE_FILENAME}," \ - Makefile || die -} - -src_install() { - dogamesbin xjump - dodoc README.euc - - # Set up the hiscores file: - dodir "${GAMES_STATEDIR}" - touch "${D}/${HISCORE_FILE}" - fperms 660 "${HISCORE_FILE}" - prepgamesdirs -} diff --git a/games-arcade/xrick/files/xrick-021212-Makefile.patch b/games-arcade/xrick/files/xrick-021212-Makefile.patch new file mode 100644 index 000000000000..2911f4715d45 --- /dev/null +++ b/games-arcade/xrick/files/xrick-021212-Makefile.patch @@ -0,0 +1,30 @@ +--- a/Makefile ++++ b/Makefile +@@ -71,10 +71,8 @@ + all: + @echo "ROOTDIR=$(ROOTDIR)" > Makefile.global + @echo "XOBJ=$(XOBJ)" >> Makefile.global +- @echo "CFLAGS=-g -ansi -pedantic -Wall -W -O2 -I $(ROOTDIR)/include $(shell sdl-config --cflags)" >> Makefile.global +- @echo "LDFLAGS=-lz $(shell sdl-config --libs)" >> Makefile.global +- @echo "CC=gcc" >> Makefile.global +- @echo "CPP=gcc -E" >> Makefile.global ++ @echo "CFLAGS+=-pedantic -Wall -I$(ROOTDIR)/include $(shell sdl-config --cflags)" >> Makefile.global ++ @echo "LIBS+=-lz $(shell sdl-config --libs)" >> Makefile.global + $(MAKE) -C src all + + clean: +--- a/src/Makefile ++++ b/src/Makefile +@@ -40,10 +40,10 @@ + all: $(TARGET) + + $(TARGET): $(OBJECTS) $(XOBJ) +- $(CC) $(OBJECTS) $(XOBJ) $(LDFLAGS) -o $(TARGET) ++ $(CC) $(LDFLAGS) $(OBJECTS) $(XOBJ) -o $(TARGET) $(LIBS) + + %.o: %.c +- $(CC) $(CFLAGS) -c $< -o $@ ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ + + xrick.res: xrick.rc + windres $< -O coff -o $@ diff --git a/games-arcade/xrick/files/xrick-021212-fno-common.patch b/games-arcade/xrick/files/xrick-021212-fno-common.patch new file mode 100644 index 000000000000..d3c05c30dbef --- /dev/null +++ b/games-arcade/xrick/files/xrick-021212-fno-common.patch @@ -0,0 +1,34 @@ +--- a/include/img.h ++++ b/include/img.h +@@ -27,7 +27,7 @@ + U8 *pixels; + } img_t; + +-img_t *IMG_SPLASH; ++extern img_t *IMG_SPLASH; + + #endif + +--- a/src/dat_snd.c ++++ b/src/dat_snd.c +@@ -19,14 +19,14 @@ + + sound_t *WAV_WAA; + sound_t *WAV_BOMB; +-sound_t *WAV_BULLET; +-sound_t *WAV_WALK; +-sound_t *WAV_JUMP; ++extern sound_t *WAV_BULLET; ++extern sound_t *WAV_WALK; ++extern sound_t *WAV_JUMP; + sound_t *WAV_TING; +-sound_t *WAV_BOMBSHHT; +-sound_t *WAV_BONUS; ++extern sound_t *WAV_BOMBSHHT; ++extern sound_t *WAV_BONUS; + sound_t *WAV_SHHT; +-sound_t *WAV_BOX; ++extern sound_t *WAV_BOX; + sound_t *WAV_DDDING; + + #endif /* ENABLE_SOUND */ diff --git a/games-arcade/xrick/metadata.xml b/games-arcade/xrick/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/xrick/metadata.xml +++ b/games-arcade/xrick/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/xrick/xrick-021212-r2.ebuild b/games-arcade/xrick/xrick-021212-r2.ebuild index c24058e2784b..eaa56d752fbc 100644 --- a/games-arcade/xrick/xrick-021212-r2.ebuild +++ b/games-arcade/xrick/xrick-021212-r2.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit desktop +EAPI=7 + +inherit desktop toolchain-funcs DESCRIPTION="Clone of the Rick Dangerous adventure game from the 80's" HOMEPAGE="http://www.bigorno.net/xrick/" @@ -11,44 +12,52 @@ SRC_URI="http://www.bigorno.net/xrick/${P}.tgz" LICENSE="GPL-1+ xrick" SLOT="0" KEYWORDS="~amd64 ~ppc64 ~x86" -IUSE="" RESTRICT="mirror bindist" # bug #149097 DEPEND="media-libs/libsdl[video]" -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + !~media-libs/libsdl-1.2.60" + +PATCHES=( + "${FILESDIR}"/${P}-exit.patch + "${FILESDIR}"/${P}-fullscreen.patch + "${FILESDIR}"/${P}-zlib.patch + "${FILESDIR}"/${P}-Makefile.patch + "${FILESDIR}"/${P}-fno-common.patch +) src_unpack() { unpack ${A} - cd "${S}" + cd "${S}" || die unpack ./xrick.6.gz } src_prepare() { default - eapply "${FILESDIR}"/${P}*.patch + sed -i \ -e "/^run from/d" \ - -e "/data.zip/ s:the directory where xrick is:$(get_libdir)/${PN}.:" \ + -e "/data.zip/ s:the directory where xrick is:$(get_libdir)/xrick.:" \ xrick.6 || die sed -i \ - -e "s:data.zip:/usr/$(get_libdir)/${PN}/data.zip:" \ + -e "s:data.zip:${EPREFIX}/usr/$(get_libdir)/xrick/data.zip:" \ src/xrick.c || die +} - sed -i \ - -e "s/-g -ansi -pedantic -Wall -W -O2/${CFLAGS}/" \ - -e '/LDFLAGS/s/=/+=/' \ - -e '/CC=/d' \ - -e "/CPP=/ { s/gcc/\$(CC)/; s/\"/'/g }" \ - Makefile || die +src_configure() { + tc-export CC } src_install() { dobin xrick - insinto /usr/"$(get_libdir)"/${PN} + + insinto /usr/$(get_libdir)/xrick doins data.zip - newicon src/xrickST.ico ${PN}.ico - make_desktop_entry ${PN} ${PN} /usr/share/pixmaps/${PN}.ico + dodoc README KeyCodes doman xrick.6 + + newicon src/xrickST.ico xrick.ico + make_desktop_entry xrick xrick /usr/share/pixmaps/xrick.ico } diff --git a/games-arcade/xscavenger/Manifest b/games-arcade/xscavenger/Manifest index 4767eec34c89..613e7aa425d5 100644 --- a/games-arcade/xscavenger/Manifest +++ b/games-arcade/xscavenger/Manifest @@ -1 +1,2 @@ -DIST xscavenger-1.4.4.tgz 193346 BLAKE2B eb86b97fad8a9d261935579d298f43e7063fbd0624e8fd654c72b4130e98db38541d54c59938375c8d6df4b50193436f86826c49b8bafe123b4be5c80d3f75d8 SHA512 5f200912b9114ea0c09f0bfcc3f06be2e7c2e1700a744319081f5f3a22c8b93663477076af27837326acf9830af6f597cf8f8fb44562db7d00128321487841ec +DIST xscavenger-1.4.5.tgz 192990 BLAKE2B 5df2ca8b7b331d9c17ef8f287a8967f4f95a8737660fb42e4f5012f00ab24698d555e3f76bd82f3ba7b55423244e9d0a4392ccce99c84bed6cf80dee15ab3bf6 SHA512 ebdde5c74409dc881503ee6eeecb7194218141c6e7c169c2febd1a4339625e1532a654fc1ac2ce7b3256e8a721f656dfb7bddc4394e0513a5130e3cc8795dfe7 +DIST xscavenger.png 3096 BLAKE2B c1e346a2950affdd41bf89358d9138196af7a5c422e64a863f9480b9876320ff381cbd301be644d02013754552303e2141a0962b2dcc16bddc6d0a2c646405d7 SHA512 9a9a8f70baac35d0818c6d34d6af0420db27e5f44cd0072e14d520d4f142ad41f5234868cda4cd0a03157987e2fc030df552ac37b02d07934c4de0c7c8b46947 diff --git a/games-arcade/xscavenger/files/1.4.4-gentoo.patch b/games-arcade/xscavenger/files/1.4.4-gentoo.patch deleted file mode 100644 index df5936ed3de8..000000000000 --- a/games-arcade/xscavenger/files/1.4.4-gentoo.patch +++ /dev/null @@ -1,200 +0,0 @@ -diff -urN xscavenger-1.4.4.orig/src/Imakefile xscavenger-1.4.4/src/Imakefile ---- xscavenger-1.4.4.orig/src/Imakefile -+++ xscavenger-1.4.4/src/Imakefile -@@ -1,20 +1,36 @@ - # set this to the path where data files should be stored. LIBDIR - # is automatically defined by imake, usually to /usr/X11R6/lib/X11, so - # this should be a good default. --LIBNAME = $(LIBDIR)/scavenger -+LIBNAME = GENTOO_DATADIR/scavenger - - SRCS = anim.c edit.c scav.c x.c sound.c - OBJS = $(SRCS:.c=.o) - -+# the "subst" hack below is because imake uses the C preprocessor, which -+# will interpret an unquoted "/*" as a comment beginning. -+#LIB_DATA = $(subst S,/,..SdataS*) - LIB_DATA = \ -- ../data/badguy.lbm ../data/brownblue.lbm ../data/death.raw \ -- ../data/dig.raw ../data/fall.raw ../data/levels.scl \ -- ../data/microman.lbm ../data/pop.raw ../data/redbrick.lbm \ -- ../data/reddevil.lbm ../data/regularguy.lbm ../data/spiralthing.lbm \ -+ ../data/badguy.lbm \ -+ ../data/brownblue.lbm \ -+ ../data/death.raw \ -+ ../data/dig.raw \ -+ ../data/fall.raw \ -+ ../data/flashspiral.lbm \ -+ ../data/gems.lbm \ -+ ../data/jungle.lbm \ -+ ../data/levels.scl \ -+ ../data/microman.lbm \ -+ ../data/pop.raw \ -+ ../data/redbrick.lbm \ -+ ../data/reddevil.lbm \ -+ ../data/regularguy.lbm \ -+ ../data/spiralthing.lbm \ - ../data/victory.raw - - LOCAL_LIBRARIES = $(XLIB) - EXTRA_DEFINES = -DLIBNAME=\"$(LIBNAME)\" - --ComplexProgramTarget(scavenger) -+AllTarget(scavenger) -+NormalProgramTarget(scavenger,$(OBJS),,,$(XLIB)) -+InstallProgram(scavenger,GENTOO_BINDIR) - InstallMultipleFlags($(LIB_DATA),$(LIBNAME),-m 644) -diff -urN xscavenger-1.4.4.orig/src/scav.c xscavenger-1.4.4/src/scav.c ---- xscavenger-1.4.4.orig/src/scav.c -+++ xscavenger-1.4.4/src/scav.c -@@ -240,15 +240,19 @@ - - - -+/* 14 Dec 2002: re-wrote to be more portable - don't assume two's-complement -+ * representation for integers, and fix bug when sizeof(long) > 4. -+ */ - long readlong() - { --long val1=0; -- -- val1=myci()<<24L; -- val1|=myci()<<16L; -- val1|=myci()<<8; -- val1|=myci(); -+ long val1=0; -+ int i,j; - -+ for (i=0; i<4; i++) { -+ j = myci(); -+ if (j==-1) return -1L; -+ val1 = (val1<<8) + j; -+ } - return val1; - } - int rbs() -@@ -309,7 +313,7 @@ - bmw=bmh=byteswide=0; - while( (type=readlong()) ) - { -- if(type==0xffffffffL) break; -+ if(type==-1L) break; - size=readlong(); - if(size&1) size++; - if(type==BMHD) -@@ -402,16 +406,16 @@ - input=open(resourcename,O_RDONLY); - if(input<0) return -1; - got=read(input,buff,8); -- if(got!=8) return -2; -- if (strncmp(buff,"SCAV",4)) return -3; -+ if(got!=8) {close(input);return -2;} -+ if (strncmp(buff,"SCAV",4)) {close(input);return -3;} - max=(buff[4]<<24) | (buff[5]<<16) | (buff[6]<<8) | buff[7]; -- if(num>=max) return 0; -+ if(num>=max) {close(input);return 0;} - lseek(input,(num+1)<<3,SEEK_SET); - got=read(input,buff,8); - offset=(buff[0]<<24) | (buff[1]<<16) | (buff[2]<<8) | buff[3]; - length=(buff[4]<<24) | (buff[5]<<16) | (buff[6]<<8) | buff[7]; - if(len>length) len=length; -- if(!offset || !len) return 0; -+ if(!offset || !len) {close(input);return 0;} - lseek(input,offset,SEEK_SET); - got=read(input,put,len); - close(input); -@@ -448,8 +452,8 @@ - input=open(resourcename,O_RDONLY); - if(input==-1) return -4; - got=read(input,buff,8); -- if(got!=8) return -2; -- if(strncmp(buff,"SCAV",4)) return -3; -+ if(got!=8) {close(input);return -2;} -+ if(strncmp(buff,"SCAV",4)) {close(input);return -3;} - output=creat(bakname,00600); - if(output==-1) {close(input);return -6;} - -@@ -473,12 +477,12 @@ - for(i=0;i<max;i++) - if(headers[i+i]) - headers[i+i]+=delta; -- if (write(output,"SCAV",4) != 4) return -200; -- if (!rlout(output,max)) return -200; -+ if (write(output,"SCAV",4) != 4) {close(input);close(output);return -200;} -+ if (!rlout(output,max)) {close(input);close(output);return -200;} - headers[num+num]=0; - headers[num+num+1]=len; - for(i=0;i<max+max;i++) -- if (!rlout(output,headers[i])) return -200; -+ if (!rlout(output,headers[i])) {close(input);close(output);return -200;} - - if(offset) - { -@@ -487,8 +491,8 @@ - while(count) - { - got=count>1024 ? 1024 : count; -- if (read(input,copybuff,got) != got) return -200; -- if (write(output,copybuff,got) != got) return -200; -+ if (read(input,copybuff,got) != got) {close(input);close(output);return -200;} -+ if (write(output,copybuff,got) != got) {close(input);close(output);return -200;} - count-=got; - } - lseek(input,length,SEEK_CUR); -@@ -498,17 +502,17 @@ - { - got=read(input, copybuff, 1024); - if (!got) break; -- if (write (output, copybuff, got) != got) return -200; -+ if (write (output, copybuff, got) != got) {close(input);close(output);return -200;} - offset += got; - } - if(len) - { -- if (write (output, take, len) != len) return -200; -+ if (write (output, take, len) != len) {close(input);close(output);return -200;} - lseek (output, (num+1) << 3, SEEK_SET); -- if (!rlout (output, offset)) return -200; -+ if (!rlout (output, offset)) {close(input);close(output);return -200;} - } - close (input); -- if (fsync(output)) return -200; -+ if (fsync(output)) {close(output);return -200;} - if (close(output)) return -200; - err=rename(bakname,resourcename); - if(err) return -1; -@@ -1382,6 +1386,7 @@ - break; - } - } -+ close(file); - } - - void remslash(char *str) -@@ -1416,6 +1421,8 @@ - return -3; - } - } while(len); -+ close(input); -+ close(output); - return 0; - } - -@@ -1448,7 +1455,7 @@ - printf("Failed to create directory %s, exiting\n",temp); - exit(1); - } -- } -+ } else close(file); - - sprintf(resourcename,"%s/%s/%s",localname,localdirname,LEVELSNAME); - file=open(resourcename,O_RDONLY); -@@ -1485,7 +1492,7 @@ - printf("Couldn't create %s\n",temp); - exit(1); - } -- } -+ } else close(file); - } - - void makercname(char *str) diff --git a/games-arcade/xscavenger/files/xscavenger-1.4.5-misc-fixes.patch b/games-arcade/xscavenger/files/xscavenger-1.4.5-misc-fixes.patch new file mode 100644 index 000000000000..be45c6c4083b --- /dev/null +++ b/games-arcade/xscavenger/files/xscavenger-1.4.5-misc-fixes.patch @@ -0,0 +1,130 @@ +* Missing return value (needed by clang) +* Implicit declarations (string.h and doall) +* Datafile loading broken on architectures where sizeof(long)>4 + https://bugs.debian.org/56139 +* Scavenger leaks file descriptors + https://bugs.debian.org/175128 +* Font mapping with clang or gcc-7+ + https://svnweb.freebsd.org/ports?view=revision&revision=444423 +--- a/src/edit.c ++++ b/src/edit.c +@@ -3,2 +3,3 @@ + #include <stdio.h> ++#include <string.h> + #include <unistd.h> +--- a/src/scav.c ++++ b/src/scav.c +@@ -246,7 +246,9 @@ + +- val1=myci()<<24L; +- val1|=myci()<<16L; +- val1|=myci()<<8; +- val1|=myci(); ++ int i,j; + ++ for (i=0; i<4; i++) { ++ j = myci(); ++ if (j==-1) return -1L; ++ val1 = (val1<<8) + j; ++ } + return val1; +@@ -404,6 +406,6 @@ + got=read(input,buff,8); +- if(got!=8) return -2; +- if (strncmp(buff,"SCAV",4)) return -3; ++ if(got!=8) {close(input);return -2;} ++ if (strncmp(buff,"SCAV",4)) {close(input);return -3;} + max=(buff[4]<<24) | (buff[5]<<16) | (buff[6]<<8) | buff[7]; +- if(num>=max) return 0; ++ if(num>=max) {close(input);return 0;} + lseek(input,(num+1)<<3,SEEK_SET); +@@ -413,3 +415,3 @@ + if(len>length) len=length; +- if(!offset || !len) return 0; ++ if(!offset || !len) {close(input);return 0;} + lseek(input,offset,SEEK_SET); +@@ -450,4 +452,4 @@ + got=read(input,buff,8); +- if(got!=8) return -2; +- if(strncmp(buff,"SCAV",4)) return -3; ++ if(got!=8) {close(input);return -2;} ++ if(strncmp(buff,"SCAV",4)) {close(input);return -3;} + output=creat(bakname,00600); +@@ -475,4 +477,4 @@ + headers[i+i]+=delta; +- if (write(output,"SCAV",4) != 4) return -200; +- if (!rlout(output,max)) return -200; ++ if (write(output,"SCAV",4) != 4) {close(input);close(output);return -200;} ++ if (!rlout(output,max)) {close(input);close(output);return -200;} + headers[num+num]=0; +@@ -480,3 +482,3 @@ + for(i=0;i<max+max;i++) +- if (!rlout(output,headers[i])) return -200; ++ if (!rlout(output,headers[i])) {close(input);close(output);return -200;} + +@@ -489,4 +491,4 @@ + got=count>1024 ? 1024 : count; +- if (read(input,copybuff,got) != got) return -200; +- if (write(output,copybuff,got) != got) return -200; ++ if (read(input,copybuff,got) != got) {close(input);close(output);return -200;} ++ if (write(output,copybuff,got) != got) {close(input);close(output);return -200;} + count-=got; +@@ -500,3 +502,3 @@ + if (!got) break; +- if (write (output, copybuff, got) != got) return -200; ++ if (write (output, copybuff, got) != got) {close(input);close(output);return -200;} + offset += got; +@@ -505,8 +507,8 @@ + { +- if (write (output, take, len) != len) return -200; ++ if (write (output, take, len) != len) {close(input);close(output);return -200;} + lseek (output, (num+1) << 3, SEEK_SET); +- if (!rlout (output, offset)) return -200; ++ if (!rlout (output, offset)) {close(input);close(output);return -200;} + } + close (input); +- if (fsync(output)) return -200; ++ if (fsync(output)) {close(output);return -200;} + if (close(output)) return -200; +@@ -1384,2 +1386,3 @@ + } ++ close(file); + } +@@ -1418,2 +1421,4 @@ + } while(len); ++ close(input); ++ close(output); + return 0; +@@ -1450,3 +1455,3 @@ + } +- } ++ } else close(file); + +@@ -1487,3 +1492,3 @@ + } +- } ++ } else close(file); + } +@@ -1574,3 +1579,3 @@ + puts(err); +- return; ++ return 1; + } +--- a/src/sound.c ++++ b/src/sound.c +@@ -50,2 +50,3 @@ + ++void doall(); + void opendsp(int samplerate) +@@ -201,3 +202,3 @@ + +-doall() ++void doall() + { +--- a/src/x.c ++++ b/src/x.c +@@ -447,3 +447,3 @@ + { +- fmap[tolower(*p)]=fmap[*p++]=i++; ++ fmap[tolower(*p)]=fmap[*p]=i++; p++; + } diff --git a/games-arcade/xscavenger/metadata.xml b/games-arcade/xscavenger/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-arcade/xscavenger/metadata.xml +++ b/games-arcade/xscavenger/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/xscavenger/xscavenger-1.4.4-r1.ebuild b/games-arcade/xscavenger/xscavenger-1.4.4-r1.ebuild deleted file mode 100644 index 6a578398112d..000000000000 --- a/games-arcade/xscavenger/xscavenger-1.4.4-r1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit desktop epatch toolchain-funcs - -DESCRIPTION="Lode-Runner-like arcade game" -HOMEPAGE="http://www.xdr.com/dash/scavenger.html" -SRC_URI="http://www.xdr.com/dash/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="x11-libs/libXext" -DEPEND="${RDEPEND} - x11-misc/imake -" - -S="${WORKDIR}/${P}/src" - -src_prepare() { - default - epatch "${FILESDIR}/${PV}-gentoo.patch" - sed -i \ - -e "s:GENTOO_DATADIR:/usr/share:" \ - -e "s:GENTOO_BINDIR:/usr/bin:" \ - Imakefile \ - || die -} - -src_configure() { - xmkmf || die -} - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - CDEBUGFLAGS="${CFLAGS}" \ - EXTRA_LDOPTIONS="${LDFLAGS}" -} - -src_install() { - emake DESTDIR="${D}" install - dodoc ../{CREDITS,DOC,README,TODO,changelog} - make_desktop_entry scavenger "XScavenger" -} diff --git a/games-arcade/xscavenger/xscavenger-1.4.5.ebuild b/games-arcade/xscavenger/xscavenger-1.4.5.ebuild new file mode 100644 index 000000000000..d8525d0d2ccd --- /dev/null +++ b/games-arcade/xscavenger/xscavenger-1.4.5.ebuild @@ -0,0 +1,56 @@ +# 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="Lode-Runner-like arcade game" +HOMEPAGE="https://www.linuxmotors.com/linux/scavenger/index.html" +SRC_URI=" + https://www.linuxmotors.com/linux/scavenger/downloads/${P}.tgz + https://dev.gentoo.org/~ionen/distfiles/${PN}.png" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + media-libs/alsa-lib + x11-libs/libX11" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-misc-fixes.patch +) + +src_compile() { + tc-export CC + append-cflags -std=gnu89 # old codebase, incompatible with c2x + + # skip using imake for simplicity + local cppargs=( + -DLIBNAME="'\"${EPREFIX}/usr/share/${PN}\"'" + $($(tc-getPKG_CONFIG) --cflags alsa x11) + ) + append-cppflags "${cppargs[@]}" + + LDLIBS="$($(tc-getPKG_CONFIG) --libs alsa x11)" \ + emake -C src -E "scav: anim.o edit.o x.o sound.o" +} + +src_install() { + newbin src/scav scavenger + doman src/scavenger.6 + + dodoc CREDITS DOC README TODO changelog + + insinto /usr/share/${PN} + doins -r data/. + + doicon "${DISTDIR}"/${PN}.png + make_desktop_entry scavenger XScavenger +} diff --git a/games-arcade/xsfcave/metadata.xml b/games-arcade/xsfcave/metadata.xml index 2eaca6d18e4d..bb0054d77acf 100644 --- a/games-arcade/xsfcave/metadata.xml +++ b/games-arcade/xsfcave/metadata.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> <longdescription lang="en"> -xsfcave is a X11 sfcave clone. The game consist of surviving in a tunel by not -hitting in the walls and obstacles. The first versions of the game are greatly -influenced by the Java version of this game. -</longdescription> + xsfcave is a X11 sfcave clone. The game consist of surviving in a tunel by not + hitting in the walls and obstacles. The first versions of the game are greatly + influenced by the Java version of this game. + </longdescription> <upstream> <remote-id type="sourceforge">scrap</remote-id> </upstream> diff --git a/games-arcade/xtux/metadata.xml b/games-arcade/xtux/metadata.xml index b9b705622a97..13c68bafab9a 100644 --- a/games-arcade/xtux/metadata.xml +++ b/games-arcade/xtux/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-arcade/xtux/xtux-20030306-r1.ebuild b/games-arcade/xtux/xtux-20030306-r1.ebuild index 55e94f38231a..12c2955621c2 100644 --- a/games-arcade/xtux/xtux-20030306-r1.ebuild +++ b/games-arcade/xtux/xtux-20030306-r1.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit desktop toolchain-funcs +inherit desktop flag-o-matic toolchain-funcs DESCRIPTION="Multiplayer Gauntlet-style arcade game" -HOMEPAGE="http://xtux.sourceforge.net/" +HOMEPAGE="https://xtux.sourceforge.net/" SRC_URI="mirror://sourceforge/xtux/xtux-src-${PV}.tar.gz" +S="${WORKDIR}/${PN}" LICENSE="GPL-2" SLOT="0" @@ -17,8 +18,6 @@ DEPEND="x11-libs/libXpm" RDEPEND="${DEPEND} media-fonts/font-adobe-75dpi" -S="${WORKDIR}/${PN}" - PATCHES=( "${FILESDIR}"/${P}-Makefile.patch "${FILESDIR}"/${P}-particles.patch @@ -32,6 +31,9 @@ src_prepare() { } src_configure() { + # bug #858605 + filter-lto + tc-export AR CC RANLIB } diff --git a/games-arcade/yarsrevenge/files/yarsrevenge-0.99-configure-clang16.patch b/games-arcade/yarsrevenge/files/yarsrevenge-0.99-configure-clang16.patch new file mode 100644 index 000000000000..eae341836880 --- /dev/null +++ b/games-arcade/yarsrevenge/files/yarsrevenge-0.99-configure-clang16.patch @@ -0,0 +1,14 @@ +autoreconf fails and it's a trivial fix to the generated configure, so let's +just patch that instead. This is fixed in autoconf itself in newer versions. + +https://bugs.gentoo.org/879689 +--- a/configure ++++ b/configure +@@ -6289,6 +6289,7 @@ cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include <ctype.h> ++#include <stdlib.h> + #if ((' ' & 0x0FF) == 0x020) + # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') + # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) diff --git a/games-arcade/yarsrevenge/metadata.xml b/games-arcade/yarsrevenge/metadata.xml index 9a4a1e47a78a..8660bc1c72c6 100644 --- a/games-arcade/yarsrevenge/metadata.xml +++ b/games-arcade/yarsrevenge/metadata.xml @@ -1,15 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> <longdescription> -A rather weird shoot-em-up game that originated on the Atari 2600. It's more -fun than it looks. Just released so might be tweaked. -</longdescription> - <upstream> - <remote-id type="freshmeat">yarsrevenge</remote-id> - </upstream> + A rather weird shoot-em-up game that originated on the Atari 2600. It's more + fun than it looks. Just released so might be tweaked. + </longdescription> </pkgmetadata> diff --git a/games-arcade/yarsrevenge/yarsrevenge-0.99-r1.ebuild b/games-arcade/yarsrevenge/yarsrevenge-0.99-r2.ebuild index 6ec048d1f79f..cc35efd61d0e 100644 --- a/games-arcade/yarsrevenge/yarsrevenge-0.99-r1.ebuild +++ b/games-arcade/yarsrevenge/yarsrevenge-0.99-r2.ebuild @@ -1,7 +1,8 @@ -# 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 desktop DESCRIPTION="Remake of the Atari 2600 classic Yar's Revenge" @@ -11,7 +12,6 @@ SRC_URI="http://www.autismuk.freeserve.co.uk/yar-${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" DEPEND="media-libs/libsdl[sound,joystick,video]" RDEPEND="${DEPEND}" @@ -22,6 +22,7 @@ PATCHES=( "${FILESDIR}"/${PV}-math.patch "${FILESDIR}"/${P}-gcc43.patch "${FILESDIR}"/${P}-gcc44.patch + "${FILESDIR}"/${P}-configure-clang16.patch ) src_install() { |
