From b059cf30a816f9d2900346ec0b7677302d24b8aa Mon Sep 17 00:00:00 2001
From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Sat, 31 Aug 2019 09:46:34 +0200
Subject: [PATCH] x11-plugins/gkrellflynn: Remove last-rited pkg
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Closes: https://bugs.gentoo.org/686260
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 profiles/package.mask                         |  5 ---
 x11-plugins/gkrellflynn/Manifest              |  1 -
 .../files/gkrellflynn-0.8-makefile.patch      | 37 -------------------
 .../gkrellflynn/gkrellflynn-0.8.ebuild        | 24 ------------
 x11-plugins/gkrellflynn/metadata.xml          |  5 ---
 5 files changed, 72 deletions(-)
 delete mode 100644 x11-plugins/gkrellflynn/Manifest
 delete mode 100644 x11-plugins/gkrellflynn/files/gkrellflynn-0.8-makefile.patch
 delete mode 100644 x11-plugins/gkrellflynn/gkrellflynn-0.8.ebuild
 delete mode 100644 x11-plugins/gkrellflynn/metadata.xml

diff --git a/profiles/package.mask b/profiles/package.mask
index f9e80cd673bc..0727bdff2b20 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -476,11 +476,6 @@ app-emulation/rkt
 #     https://www.postgresql.org/developer/beta/
 dev-db/postgresql:12
 
-# Jonas Stein <jstein@gentoo.org> (2019-05-22)
-# Masked for removal after 2019-06-23. (bug #686260)
-# Wrong license, ships non-GPL image, maintainer needed.
-x11-plugins/gkrellflynn
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2019-05-11)
 # Perl 5.24 will be removed soon. Please upgrade.
 <dev-lang/perl-5.26.2
diff --git a/x11-plugins/gkrellflynn/Manifest b/x11-plugins/gkrellflynn/Manifest
deleted file mode 100644
index e841d86d5b15..000000000000
--- a/x11-plugins/gkrellflynn/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gkrellflynn-0.8.tar.gz 26722 BLAKE2B 92c11c57181ec800b6b4dd34fe26d20cb6160b668d3a8a0f0fdf5a67126a691993aac3673283fb3fcec811afc25cfa847dc96b1d13edade891e589c8687f9ef7 SHA512 36c643adcfb1ecb994eb6c2bb590225df1f268e885508ede28ea8b9760bdca33bfb48821d356ce0c56e38be5f7b16ad7062bc191e8a77aef1c792bd02da2f366
diff --git a/x11-plugins/gkrellflynn/files/gkrellflynn-0.8-makefile.patch b/x11-plugins/gkrellflynn/files/gkrellflynn-0.8-makefile.patch
deleted file mode 100644
index bcfef8b8f824..000000000000
--- a/x11-plugins/gkrellflynn/files/gkrellflynn-0.8-makefile.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -3,11 +3,10 @@
- #
- # updated for gkrellm2.0
- 
--CC = gcc
--CFLAGS = -c -O -Wall -fPIC `${EXTRACONF}`
-+CC = $(CC)
-+INCLUDE = -c -fPIC `${EXTRACONF}`
- 
--LD = $(CC)
--LDFLAGS = -shared -Wl -o
-+LDFLAGS = $(LDFLAGS)
- INCPATH  = -I.
- INCPATH += ${GKRELL_INC}
- 
-@@ -25,10 +24,10 @@
- 	(make GKRELL_INC=-DGKRELLM EXTRACONF="gtk-config --cflags;imlib-config --cflags-gdk" ${TARGET})
- 
- gkrellm2:
--	(make GKRELL_INC=-DGKRELLM2 EXTRACONF="pkg-config --cflags gtk+-2.0 gthread-2.0" ${TARGET})
-+	($(MAKE) GKRELL_INC=-DGKRELLM2 EXTRACONF="pkg-config --cflags gtk+-2.0 gthread-2.0" ${TARGET})
- 
- ${TARGET}:	${OBJS}
--		${LD} ${DEBUG} ${LDFLAGS} ${TARGET} ${OBJS}
-+		${CC} -shared ${LDFLAGS} ${CFLAGS} -o ${TARGET} ${OBJS} 
- 
- clean:
- 	rm -f ${OBJS}
-@@ -47,5 +46,5 @@
- 	./install-sub.sh	${TARGET} gkrellm2
- 
- %.o :	%.c
--	${CC} ${CFLAGS} $(INCPATH) -o $@ $<
-+	${CC} ${CFLAGS} $(INCLUDE) ${LDFLAGS} $(INCPATH) -o $@ $<
- 
diff --git a/x11-plugins/gkrellflynn/gkrellflynn-0.8.ebuild b/x11-plugins/gkrellflynn/gkrellflynn-0.8.ebuild
deleted file mode 100644
index 10c704f676c6..000000000000
--- a/x11-plugins/gkrellflynn/gkrellflynn-0.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin toolchain-funcs
-
-HOMEPAGE="http://bax.comlab.uni-rostock.de/en/projects/flynn.html"
-SRC_URI="http://bax.comlab.uni-rostock.de/fileadmin/downloads/${P}.tar.gz"
-DESCRIPTION="A funny GKrellM2 load monitor (for Doom(tm) fans)"
-
-KEYWORDS="alpha amd64 ppc sparc x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-RDEPEND="app-admin/gkrellm:2[X]"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
-
-src_compile() {
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" gkrellm2
-}
diff --git a/x11-plugins/gkrellflynn/metadata.xml b/x11-plugins/gkrellflynn/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/x11-plugins/gkrellflynn/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
-- 
2.26.2