[gentoo-commits] repo/gentoo:master commit in: profiles/default/linux/musl/, profiles/, games-emulation/nestra/, ...

[Ionen Wolkens]

commit:     5f10d8cc41de845a5d99841b65af7991f6ad8d57
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 12 14:45:44 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Oct 12 14:54:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f10d8cc

games-emulation/nestra: treeclean

Closes: https://bugs.gentoo.org/701414
Closes: https://bugs.gentoo.org/739188
Closes: https://bugs.gentoo.org/739222
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/nestra/Manifest                    |  2 -
 .../nestra/files/nestra-0.66-exec-stack.patch      | 10 ---
 .../nestra/files/nestra-0.66-include.patch         | 73 ----------------------
 games-emulation/nestra/metadata.xml                |  8 ---
 games-emulation/nestra/nestra-0.66-r3.ebuild       | 49 ---------------
 profiles/arch/amd64/no-multilib/package.mask       |  1 -
 profiles/default/linux/musl/package.mask           |  3 +-
 profiles/package.mask                              |  7 ---
 8 files changed, 1 insertion(+), 152 deletions(-)

diff --git a/games-emulation/nestra/Manifest b/games-emulation/nestra/Manifest
deleted file mode 100644
index 40544bba409..00000000000
--- a/games-emulation/nestra/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST nestra-0.66.tar.gz 49757 BLAKE2B 0ec8603cd9afc33a1b194e1c39cdc8d3173d1ad4c7c76e6e00214883cdfcd8f2cf35bfb4b74e131822aaf8c7864a50980d642bc87aca26372f06b8fab145a7cf SHA512 25f9d0c0359b46ddcd451552e7737b0f955a18e7a4ebd30d5494b12f787b9c45a49579207328c06c10efc7f8283bc688eb2061c538523ed257825b2394d978ce
-DIST nestra_0.66-10.diff.gz 2414 BLAKE2B 5b83ac9eee4d8c141dc473000b5f713ab4eb0a38707334d4fd044b9617f01b83c4a19670ef27874f6511f1f9b1d578ba35d5ba9ac244621b19ca3b9c00d5a30d SHA512 4ea1ad97f6c2eca0434dee4031e0486cc1c7c25237a467d4bf33bd0656b52441143855e07b29e1bdcf95514e19fe68ecb8f73d0972d17d9e3b6fd7a92d2db8c6

diff --git a/games-emulation/nestra/files/nestra-0.66-exec-stack.patch b/games-emulation/nestra/files/nestra-0.66-exec-stack.patch
deleted file mode 100644
index d9e9b3c6114..00000000000
--- a/games-emulation/nestra/files/nestra-0.66-exec-stack.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/x86.S.orig	2006-01-09 20:02:58.000000000 -0500
-+++ b/x86.S	2006-01-09 20:03:38.000000000 -0500
-@@ -1458,3 +1458,7 @@
-  leal   0x1(%eax),%ebx
-  popl   %eax
-  jmp i_next
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif

diff --git a/games-emulation/nestra/files/nestra-0.66-include.patch b/games-emulation/nestra/files/nestra-0.66-include.patch
deleted file mode 100644
index 096fd18af47..00000000000
--- a/games-emulation/nestra/files/nestra-0.66-include.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- a/comptbl.c
-+++ b/comptbl.c
-@@ -9,6 +9,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <errno.h>
-+#include <stdlib.h>
- 
- #define ALLOC_SIZE 0x400000 /* 4MB */
- #define TBL_BASE ((unsigned char *)0x10000000)
---- a/d6502.c
-+++ b/d6502.c
-@@ -1,6 +1,7 @@
- /* 6502 disassembler */
- /* Public Domain */
- 
-+#include <stdio.h>
- #include "globals.h"
- 
- char Opcodes_6502[256][4]={
---- a/emu.c
-+++ b/emu.c
-@@ -12,6 +12,7 @@
- #include <sys/mman.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- 
- #include "mapper.h"
- #include "io.h"
---- a/fb.c
-+++ b/fb.c
-@@ -2,6 +2,8 @@
- /* Framebuffer/pixmap rendering */
- /* Public Domain */
- 
-+#include <stdlib.h>
-+#include <string.h>
- #include <stdio.h>
- #include "mapper.h"
- #include "globals.h"
---- a/io.c
-+++ b/io.c
-@@ -5,6 +5,7 @@
-    to do I/O operations. */
- 
- #include <stdio.h>
-+#include <string.h>
- #include "mapper.h"
- #include "io.h"
- #include "globals.h"
---- a/mapper.c
-+++ b/mapper.c
-@@ -1,6 +1,7 @@
- /* Nestra mapper.c */
- /* Public Domain */
- 
-+#include <string.h>
- #include "mapper.h"
- #include "consts.h"
- 
---- a/x11.c
-+++ b/x11.c
-@@ -1,6 +1,9 @@
- /* Nestra x11.c */
- /* Public Domain */
- 
-+#include <stdlib.h>
-+#include <string.h>
-+#include <stdio.h>
- #include <X11/Xlib.h>
- #include <X11/keysym.h>
- #include <X11/Xutil.h>

diff --git a/games-emulation/nestra/metadata.xml b/games-emulation/nestra/metadata.xml
deleted file mode 100644
index 1c3ba213c49..00000000000
--- a/games-emulation/nestra/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@g.o</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>

diff --git a/games-emulation/nestra/nestra-0.66-r3.ebuild b/games-emulation/nestra/nestra-0.66-r3.ebuild
deleted file mode 100644
index 73ec6ac1948..00000000000
--- a/games-emulation/nestra/nestra-0.66-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic
-
-PATCH="${P/-/_}-10.diff"
-DESCRIPTION="NES emulation for Linux/x86"
-HOMEPAGE="http://nestra.linuxgames.com/"
-SRC_URI="http://nestra.linuxgames.com/${P}.tar.gz
-	mirror://debian/pool/contrib/n/nestra/${PATCH}.gz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="x11-libs/libX11[abi_x86_32(-)]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	eapply "${WORKDIR}"/${PATCH}
-	eapply "${FILESDIR}"/${P}-exec-stack.patch
-	eapply "${FILESDIR}"/${P}-include.patch
-
-	append-ldflags -Wl,-z,noexecstack
-	use amd64 && multilib_toolchain_setup x86
-
-	sed -i \
-		-e "s:-L/usr/X11R6/lib:${LDFLAGS}:" \
-		-e 's:-O2 ::' \
-		-e "s:gcc:$(tc-getCC) ${CFLAGS}:" \
-		-e "s:ld:$(tc-getLD) -m elf_i386 $(raw-ldflags):" \
-		Makefile || die
-}
-
-src_compile() {
-	use amd64 && multilib_toolchain_setup x86
-	default
-}
-
-src_install() {
-	dobin nestra
-	einstalldocs
-	doman nestra.6
-}

diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index d753dcd3504..00637a39be9 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -61,7 +61,6 @@ games-arcade/jardinains
 games-arcade/thinktanks-demo
 games-emulation/caps
 games-emulation/gens
-games-emulation/nestra
 <games-emulation/pcsx2-9999
 games-emulation/vgba
 games-emulation/zinc

diff --git a/profiles/default/linux/musl/package.mask b/profiles/default/linux/musl/package.mask
index b3990d52750..c0b4d10a84c 100644
--- a/profiles/default/linux/musl/package.mask
+++ b/profiles/default/linux/musl/package.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 sys-libs/uclibc-ng
@@ -35,7 +35,6 @@ games-arcade/barbarian-bin
 games-arcade/dynamitejack
 games-arcade/jardinains
 games-arcade/thinktanks-demo
-games-emulation/nestra
 games-emulation/zinc
 games-emulation/zsnes
 games-fps/etqw-demo

diff --git a/profiles/package.mask b/profiles/package.mask
index c9aecb6ef6b..9fb0a93bde5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -291,13 +291,6 @@ games-emulation/caps
 # Removal on 2021-10-12. bug #776904
 media-libs/sdl-terminal
 
-# Ionen Wolkens <ionen@g.o> (2021-09-12)
-# Stuck on x86 / amd64-multilib, no upstream, code relies on
-# several implicit constructs and undefined behavior, ebuild
-# semi-broken and runtime seems broken even if built.
-# Removal on 2021-10-12. bug #701414, bug #739188.
-games-emulation/nestra
-
 # Anna Vyalkova <cyber+gentoo@×××××.in> (2021-09-07)
 # Mask backwards-incompatible version to avoid autodeletion of previous one.
 # Data migration is not supported upstream and can't be done automatically.