commit: cc004e37edf36b288566b2f288675a77e1fd789b Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> AuthorDate: Tue Aug 20 17:51:47 2024 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Tue Aug 20 17:51:47 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc004e37
games-arcade/sdl-sopwith: treeclean Closes: https://bugs.gentoo.org/936299 (pkgremoved) Closes: https://bugs.gentoo.org/880529 (pkgremoved) Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> games-arcade/sdl-sopwith/Manifest | 2 - .../files/sdl-sopwith-1.7.5-nogtk.patch | 42 ------------------- .../files/sdl-sopwith-1.7.5-video-fix.patch | 24 ----------- games-arcade/sdl-sopwith/metadata.xml | 11 ----- .../sdl-sopwith/sdl-sopwith-1.7.5-r2.ebuild | 48 ---------------------- profiles/package.mask | 5 --- 6 files changed, 132 deletions(-) diff --git a/games-arcade/sdl-sopwith/Manifest b/games-arcade/sdl-sopwith/Manifest deleted file mode 100644 index 3d8727fea588..000000000000 --- a/games-arcade/sdl-sopwith/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST sopwith-1.7.5.tar.gz 280883 BLAKE2B 57a2d6cf90d1bba1ac5dedbcebaa7b2f58004cee1ee7682d43be800184809e7949603490e93944d8aa1e4b9e6d33f24a9bdb386dadda945b9f9f3b9c4e8ed48c SHA512 ea78706d0190648be269142a29d10340c5181563959b0a329b802b9d9128a9dcb1e01760737269ec22883adf5b6c02c5049c8fc7b44e4eaa9f381b87abc7acae -DIST sopwith.png 675 BLAKE2B a380311db8861a75d8cbb035616523d1a21a220be758bda931340f65d658af0e844b0247e478da746d654249cd7a28ab9b681fc82b9798f909b379f38242d03f SHA512 7bcfec11930a623ff9077203640b4415e222570d32ffecdb943f5c78ed8fb11db4fefa42298b895c4aa29b46f963a82cdb90492beaf89a04d119e6e756f5ec57 diff --git a/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-nogtk.patch b/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-nogtk.patch deleted file mode 100644 index a5dbc59f3c72..000000000000 --- a/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-nogtk.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/configure.in.old -+++ b/configure.in -@@ -61,11 +61,6 @@ - SOPWITH_SUBDIRS="$SOPWITH_SUBDIRS sdl" - ],) - --PKG_CHECK_MODULES(GTK, glib-2.0 >= 2.0 gtk+-2.0 >= 2.0, [ -- SOPWITH_BINS="$SOPWITH_BINS" # gtksopwith" -- SOPWITH_SUBDIRS="$SOPWITH_SUBDIRS" # gtk" --],) -- - AC_SUBST(SOPWITH_BINS) - AC_SUBST(SOPWITH_SUBDIRS) - -@@ -71,7 +71,7 @@ - - dnl check for TCPIP support - --AC_CHECK_HEADER(netinet/ip.h, AC_DEFINE(TCPIP),,) -+AC_CHECK_HEADER(netinet/ip.h, AC_DEFINE([TCPIP], [1], [TCP/IP support]),,) - - dnl generate Makefiles - ---- a/src/Makefile.am.old -+++ b/src/Makefile.am -@@ -6,7 +6,7 @@ - bin_PROGRAMS = @SOPWITH_BINS@ - EXTRA_PROGRAMS = sopwith gtksopwith psopwith - --CFLAGS = @CFLAGS@ -I.. -+AM_CFLAGS = @SDL_CFLAGS@ -I.. - - COMMON_SRC = \ - video.h swcollsn.c swgames.h swmain.h swutil.h \ ---- a/src/sdl/Makefile.am.old -+++ b/src/sdl/Makefile.am -@@ -1,4 +1,4 @@ --CFLAGS=@CFLAGS@ @SDL_CFLAGS@ -I.. -+AM_CFLAGS = @SDL_CFLAGS@ -I.. - - noinst_LIBRARIES = libsdlsopwith.a - diff --git a/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-video-fix.patch b/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-video-fix.patch deleted file mode 100644 index e9da16c43905..000000000000 --- a/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-video-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -Upstream patch: fix segfault while video device detection. -Discovered here - https://bugs.gentoo.org/show_bug.cgi?id=458504 - ---- a/src/sdl/video.c.orig 2013-02-21 11:48:57.000000000 -0400 -+++ b/src/sdl/video.c 2013-02-21 11:49:35.000000000 -0400 -@@ -364,11 +364,17 @@ - int n; - int w, h; - int flags = 0; -+ int status; - - printf("CGA Screen Emulation\n"); - printf("init screen: "); - -- SDL_Init(SDL_INIT_VIDEO); -+ status = SDL_Init(SDL_INIT_VIDEO); -+ if (status == -1) -+ { -+ fprintf(stderr, "Unable to locate video device. Exiting.\n"); -+ exit(1); -+ } - - srand(time(NULL)); - set_icon(symbol_plane[rand() % 2][rand() % 16]); diff --git a/games-arcade/sdl-sopwith/metadata.xml b/games-arcade/sdl-sopwith/metadata.xml deleted file mode 100644 index 00b9db664db9..000000000000 --- a/games-arcade/sdl-sopwith/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Games Project</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">sdl-sopwith</remote-id> - </upstream> -</pkgmetadata> diff --git a/games-arcade/sdl-sopwith/sdl-sopwith-1.7.5-r2.ebuild b/games-arcade/sdl-sopwith/sdl-sopwith-1.7.5-r2.ebuild deleted file mode 100644 index d136074ceffd..000000000000 --- a/games-arcade/sdl-sopwith/sdl-sopwith-1.7.5-r2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools desktop toolchain-funcs - -MY_P="${P/sdl-/}" -DESCRIPTION="Port of the classic Sopwith game using LibSDL" -HOMEPAGE="http://sdl-sopwith.sourceforge.net/"; -SRC_URI=" - https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz - https://src.fedoraproject.org/rpms/sopwith/raw/master/f/sopwith.png -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=">=media-libs/libsdl-1.1.3[video]" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - rm acconfig.h || die - - eapply "${FILESDIR}"/${P}-nogtk.patch - # bug 458504 - eapply "${FILESDIR}"/${P}-video-fix.patch - - mv configure.in configure.ac || die - eautoreconf -} - -src_compile() { - emake AR="$(tc-getAR)" -} - -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS ChangeLog FAQ NEWS README TODO doc/*txt - rm -rf "${ED}/usr/share/doc/sopwith" - - newicon "${DISTDIR}"/sopwith.png ${PN}.png - make_desktop_entry sopwith "Sopwith" ${PN} -} diff --git a/profiles/package.mask b/profiles/package.mask index 672160ff30e3..138d6fd25277 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -191,11 +191,6 @@ dev-util/cucumber-cucumber-expressions:16 dev-util/cucumber-gherking:22 dev-util/cucumber-html-formatter:20 -# Arthur Zamarin <[email protected]> (2024-07-19) -# EAPI=6 games. Feel free to drop any package after bumping it's EAPI. -# Removal on 2024-08-18. Bug #936299. -games-arcade/sdl-sopwith - # Leonardo Hernández Hernández <[email protected]> (2024-07-07) # New major ffmpeg version. Tracker bug #928905. >=media-video/ffmpeg-7.0
