From 8b4ace9c50842c5b83401ea7b179dcab940387e1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 23 Sep 2020 10:22:15 +0100 Subject: gentoo resync : 23.09.2020 --- games-arcade/pacmanarena/Manifest | 3 +- .../files/pacmanarena-0.15-fnocommon.patch | 15 ++++++ .../pacmanarena/pacmanarena-0.15-r1.ebuild | 56 -------------------- .../pacmanarena/pacmanarena-0.15-r2.ebuild | 59 ++++++++++++++++++++++ 4 files changed, 76 insertions(+), 57 deletions(-) create mode 100644 games-arcade/pacmanarena/files/pacmanarena-0.15-fnocommon.patch delete mode 100644 games-arcade/pacmanarena/pacmanarena-0.15-r1.ebuild create mode 100644 games-arcade/pacmanarena/pacmanarena-0.15-r2.ebuild (limited to 'games-arcade/pacmanarena') diff --git a/games-arcade/pacmanarena/Manifest b/games-arcade/pacmanarena/Manifest index 3cc584225bec..952fce059b27 100644 --- a/games-arcade/pacmanarena/Manifest +++ b/games-arcade/pacmanarena/Manifest @@ -1,5 +1,6 @@ +AUX pacmanarena-0.15-fnocommon.patch 326 BLAKE2B c03c3e59c5a071a5b55242272dfe0551bb4fd82b1ddd49ae167cacee5a8ee5904143a1f6bb6370f4294b05663021c0a28475462ff56f32e38c5a888a8cbe8ae3 SHA512 5cfd02505b26218c5430861c19ef814f98dd363e8bce9026cbdd0488345fb0c09e6d8f6a2a566c58c1ff41085454b8520b68a7a1832b8fa6184fd5c408ccc78e AUX pacmanarena-0.15-underlink.patch 317 BLAKE2B e0cd8d59918c75a149abf32b5d1979d29ed15189c57a4e13858442de826cb23aa2abb094c03055481cfb1dc750d01967b115e56ca032d275d6a37d7dfc282e80 SHA512 afffb103e4394f7cd367e4fe1b2acab034786539b025f6d86118bbf88610b49cb60975ba92be0534fb025def49973e3442df325a00fd11b742c765cbcd2611e1 DIST pacman-arena-0.15.tar.bz2 100112 BLAKE2B c4324ec83ad5033a40061935c8cfe982b4f36e7e466fbd10e836728fd0cdf01bda812a86f9cdfbd33c2a4f67b577026a836390e9ce61953372aab7dcded6aa19 SHA512 40e8092cf223d075dbb5654766f095ce57d61ff329aee5dc0f3c95655e3894ac507d8b48014326b7fd9265c81b9340624aaa349641efbdcde55bda0b1098f398 DIST pacman-data-0.0.zip 11994364 BLAKE2B cc83c490387bfe859bb7e41068c00ea4c4f7fd4ed8ab718cff3d1fbb6c5eb5590837eb73b43a6b3be8cd76e3ef8f8b6b3ca8229a2bb645c48580cc302f02b88e SHA512 f3619ab876ff9c0f354fff9e9b0acefaa1a1a094e8ef215fe1b57f617f79540ae87681dae0ec3c1df672615064be345f74e52a6f2f241bfe70d78f5b8c7fadc7 -EBUILD pacmanarena-0.15-r1.ebuild 1156 BLAKE2B fcc651259b78970cbb6265d264a7774d0eebe55edd0a5c60ac313a6eceec221c71ecd255cc7a3ba355226e76f6cfbab3ee8700cc7829b61d9f6a88576d6404da SHA512 9140cc8a57f6873d8f858b949e8169e9b91204906e50b3f3cd745056ab68cd93075321345aceb943d9120a1a232537d107b55c42ba1354a7cfc51ba0fe59c601 +EBUILD pacmanarena-0.15-r2.ebuild 1199 BLAKE2B 55790d9dd5ef60d527a638c4e5bac22ada350c6f0f4b522e6ee0e6a44a23348917eb4f2f73c1d54b5f0188172a72e05c9d8506d0dd4e85a79483e062b413a18b SHA512 e01998d51138d92abf430a75c1570c9b8f6c020ed807b742d1776c0a52888401122a7b81507954c1cda2e74a601ce068c8be95744021425030c86b5c6b9133c6 MISC metadata.xml 334 BLAKE2B 034963dd5af81911ac555bc717bbedf63c92413161b71d0771774ee6ad88317aaccfdee893c17a8a630a14aad726fc7dc9acbb19383b21468dd29f3b768e6780 SHA512 0ac8a4136638b425aa6122eaedb145adde764ecbe83e0388800c1f690abb27be59dd9b49933849e56111df0fc9741d71d8fe580f923bc6bf504ea8c66bd523c9 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/pacmanarena-0.15-r1.ebuild b/games-arcade/pacmanarena/pacmanarena-0.15-r1.ebuild deleted file mode 100644 index e803d7748359..000000000000 --- a/games-arcade/pacmanarena/pacmanarena-0.15-r1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools desktop - -DESCRIPTION="3D Pacman clone with a few surprises. Rockets, bombs and explosions abound" -HOMEPAGE="http://pacmanarena.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/pacman-arena-${PV}.tar.bz2 - mirror://sourceforge/${PN}/pacman-data-0.0.zip" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~x86" -IUSE="" - -RDEPEND=" - virtual/opengl - virtual/glu - media-libs/libsdl[sound] - media-libs/sdl-mixer[vorbis] - media-libs/sdl-net -" -DEPEND="${RDEPEND} - app-arch/unzip -" - -S="${WORKDIR}/pacman" - -src_unpack() { - unpack pacman-arena-${PV}.tar.bz2 - cd "${S}" - unpack pacman-data-0.0.zip -} - -src_prepare() { - default - sed -i \ - -e "/^CFLAGS/ s:pacman:${PN}:" \ - -e '1i CC=@CC@' \ - Makefile.in || die - sed -i \ - -e '/CFLAGS/s:-g::' \ - configure || die - eapply "${FILESDIR}"/${P}-underlink.patch - eautoreconf -} - -src_install() { - newbin pacman ${PN} - insinto /usr/share/${PN} - doins -r gfx sfx - newicon gfx/pacman_arena1.tga ${PN}.tga - make_desktop_entry ${PN} "Pacman Arena" /usr/share/pixmaps/${PN}.tga - einstalldocs -} diff --git a/games-arcade/pacmanarena/pacmanarena-0.15-r2.ebuild b/games-arcade/pacmanarena/pacmanarena-0.15-r2.ebuild new file mode 100644 index 000000000000..4b16585222e4 --- /dev/null +++ b/games-arcade/pacmanarena/pacmanarena-0.15-r2.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools desktop + +DESCRIPTION="3D Pacman clone with a few surprises. Rockets, bombs and explosions abound" +HOMEPAGE="http://pacmanarena.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/pacman-arena-${PV}.tar.bz2 + mirror://sourceforge/${PN}/pacman-data-0.0.zip" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~x86" + +RDEPEND=" + media-libs/libsdl[sound] + media-libs/sdl-mixer[vorbis] + media-libs/sdl-net + virtual/glu + virtual/opengl +" +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}" + unpack pacman-data-0.0.zip +} + +src_prepare() { + default + sed -i \ + -e "/^CFLAGS/ s:pacman:${PN}:" \ + -e '1i CC=@CC@' \ + Makefile.in || die + sed -i \ + -e '/CFLAGS/s:-g::' \ + configure.ac || die + eautoreconf +} + +src_install() { + newbin pacman ${PN} + insinto /usr/share/${PN} + doins -r gfx sfx + newicon gfx/pacman_arena1.tga ${PN}.tga + make_desktop_entry ${PN} "Pacman Arena" /usr/share/pixmaps/${PN}.tga + einstalldocs +} -- cgit v1.2.3