[gentoo-commits] repo/gentoo:master commit in: games-util/higan-purify/files/, games-util/higan-purify/, profiles/

[Jakov Smolić]

commit:     4332d5f7a26c38065adeb1f752473789895bea41
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  1 21:25:12 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Tue Feb  1 21:25:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4332d5f7

games-util/higan-purify: treeclean

Closes: https://bugs.gentoo.org/821121
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 games-util/higan-purify/Manifest                   |  1 -
 .../higan-purify/files/higan-purify-03-QA.patch    | 42 ------------------
 .../files/higan-purify-03-respect-CXX.patch        | 28 ------------
 games-util/higan-purify/higan-purify-03.ebuild     | 50 ----------------------
 games-util/higan-purify/metadata.xml               |  8 ----
 profiles/package.mask                              |  8 ----
 6 files changed, 137 deletions(-)

diff --git a/games-util/higan-purify/Manifest b/games-util/higan-purify/Manifest
deleted file mode 100644
index 2ebd9ee81d45..000000000000
--- a/games-util/higan-purify/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST purify_v03-source.tar.xz 196924 BLAKE2B f4d22ccc34d1c345a2dee20c14bab2614b71b0df2660f3f0883df1b56b5e5fc7fc99872f73ebe674faca8bb455f1a90e5bf79ce9b893f980e99b94546bbcf400 SHA512 095b62013f5a33e720b87c48f32c41239d8cef4c6ddc2b6d119d15b3f8b92bc15d744afa0b2bc8d7a49ef53f8f3fa7f2247be490499a9b194863534f9c1a4b3d

diff --git a/games-util/higan-purify/files/higan-purify-03-QA.patch b/games-util/higan-purify/files/higan-purify-03-QA.patch
deleted file mode 100644
index 5b2d1e6c3d3a..000000000000
--- a/games-util/higan-purify/files/higan-purify-03-QA.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -2,8 +2,8 @@
- include phoenix/Makefile
- 
- path := /usr/local/bin
--flags := -I. -O3 -fomit-frame-pointer
--link := -s
-+flags := -I. $(CXXFLAGS)
-+link := $(LDFLAGS)
- objects := obj/phoenix.o obj/purify.o
- 
- ifeq ($(platform),x)
-@@ -22,7 +22,7 @@
- 
- build: $(objects)
- ifeq ($(platform),x)
--	$(cpp) -pthread $(link) -o purify $(objects) $(phoenixlink)
-+	$(cpp) $(flags) -pthread $(link) -o purify $(objects) $(phoenixlink)
- else ifeq ($(platform),win)
- 	windres phoenix/windows/phoenix.rc obj/phoenix-resource.o
- 	$(cpp) -shared -o phoenix.dll obj/phoenix.o $(phoenixlink)
---- a/phoenix/Makefile
-+++ b/phoenix/Makefile
-@@ -4,13 +4,13 @@
-   endif
- 
-   ifeq ($(phoenix),gtk)
--    phoenixflags := -DPHOENIX_GTK `pkg-config --cflags gtk+-2.0`
--    phoenixlink := `pkg-config --libs gtk+-2.0`
-+    phoenixflags := -DPHOENIX_GTK `${PKG_CONFIG} --cflags gtk+-2.0 x11`
-+    phoenixlink := `${PKG_CONFIG} --libs gtk+-2.0 x11` -ldl
-   endif
- 
-   ifeq ($(phoenix),qt)
--    phoenixflags := -DPHOENIX_QT `pkg-config --cflags QtCore QtGui`
--    phoenixlink := `pkg-config --libs QtCore QtGui`
-+    phoenixflags := -DPHOENIX_QT `${PKG_CONFIG} --cflags QtCore QtGui x11`
-+    phoenixlink := `${PKG_CONFIG} --libs QtCore QtGui x11` -ldl
-   endif
- else ifeq ($(platform),win)
-   phoenixflags := -DPHOENIX_WINDOWS

diff --git a/games-util/higan-purify/files/higan-purify-03-respect-CXX.patch b/games-util/higan-purify/files/higan-purify-03-respect-CXX.patch
deleted file mode 100644
index 00a6a1e4c69b..000000000000
--- a/games-util/higan-purify/files/higan-purify-03-respect-CXX.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 2a56366..59a3795 100755
---- a/Makefile
-+++ b/Makefile
-@@ -15,18 +15,18 @@ endif
- all: build;
- 
- obj/phoenix.o: phoenix/phoenix.cpp
--	$(cpp) $(flags) -o obj/phoenix.o -c phoenix/phoenix.cpp $(phoenixflags)
-+	$(CXX) $(flags) -o obj/phoenix.o -c phoenix/phoenix.cpp $(phoenixflags)
- 
- obj/purify.o: purify.cpp
--	$(cpp) $(flags) -o obj/purify.o -c purify.cpp
-+	$(CXX) $(flags) -o obj/purify.o -c purify.cpp
- 
- build: $(objects)
- ifeq ($(platform),x)
--	$(cpp) $(flags) -pthread $(link) -o purify $(objects) $(phoenixlink)
-+	$(CXX) $(flags) -pthread $(link) -o purify $(objects) $(phoenixlink)
- else ifeq ($(platform),win)
- 	windres phoenix/windows/phoenix.rc obj/phoenix-resource.o
--	$(cpp) -shared -o phoenix.dll obj/phoenix.o $(phoenixlink)
--	$(cpp) -o purify obj/purify.o obj/phoenix-resource.o $(link) -L. -lphoenix
-+	$(CXX) -shared -o phoenix.dll obj/phoenix.o $(phoenixlink)
-+	$(CXX) -o purify obj/purify.o obj/phoenix-resource.o $(link) -L. -lphoenix
- endif
- 
- resource: force

diff --git a/games-util/higan-purify/higan-purify-03.ebuild b/games-util/higan-purify/higan-purify-03.ebuild
deleted file mode 100644
index 7f5fcaa1f834..000000000000
--- a/games-util/higan-purify/higan-purify-03.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_P=purify_v${PV}-source
-DESCRIPTION="Rom purifier for higan"
-HOMEPAGE="http://byuu.org/higan/"
-SRC_URI="https://higan.googlecode.com/files/${MY_P}.tar.xz"
-S="${WORKDIR}"/${MY_P}/purify
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-games/higan-ananke
-	x11-libs/gtk+:2
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-QA.patch
-	"${FILESDIR}"/${PN}-03-respect-CXX.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "/handle/s#/usr/local/lib#/usr/$(get_libdir)#" \
-		nall/dl.hpp || die
-}
-
-src_compile() {
-	tc-export CXX
-
-	emake \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-		platform="x" \
-		compiler="$(tc-getCXX)" \
-		phoenix="gtk"
-}
-
-src_install() {
-	dobin purify
-}

diff --git a/games-util/higan-purify/metadata.xml b/games-util/higan-purify/metadata.xml
deleted file mode 100644
index 7c730d47817a..000000000000
--- a/games-util/higan-purify/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/profiles/package.mask b/profiles/package.mask
index db98abe28bc5..1d3e187d3501 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -353,14 +353,6 @@ sys-cluster/onesis
 # Removal after 2022-02-04. Bug #830588.
 games-util/springlobby
 
-# Ionen Wolkens <ionen@g.o> (2022-01-03)
-# Obsolete, higan-purify is now provided by games-emulation/higan
-# as the icarus utility (bug #821121) and dev-games/higan-ananke
-# has no known uses without higan-purify (bug #821124). Further
-# stuck on gtk2 with dead HOMEPAGE / SRC_URI.
-# Removal after 2022-02-02.
-games-util/higan-purify
-
 # Florian Schmaus <flow@g.o> (2022-01-02)
 # Unmaintained, upstream gone, only packaged by
 # Gentoo, and the whole idea to unlock based on