gentoo resync : 27.03.2021

5 files changed, 3 insertions, 63 deletions

diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 378f27f0941d..89c367119840 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/fish-fillets/Manifest b/games-puzzle/fish-fillets/Manifest
index 94be9b9a33ed..c7a02db77ccf 100644
--- a/games-puzzle/fish-fillets/Manifest
+++ b/games-puzzle/fish-fillets/Manifest
@@ -1,5 +1,4 @@
 DIST fillets-ng-1.0.1.tar.gz 380290 BLAKE2B 675839cb451686c35611120b0b8e1044bc6511ce2369157f7d7c934eb0477b10e925268ffb35d5415070f25d7469da249027f148ac06ba65bd139fbddfb20a03 SHA512 fe4a5186f94e953cbc85fe8b0ce804c881c96feda385cfc36e1840e448cf094c3d815fdbe32976a6697a855038951f97a384c277a1c52a048520e8da71136718
 DIST fillets-ng-data-1.0.0.tar.gz 146418413 BLAKE2B 0359cee1db5d54a124f76520c4c416d954969bd9fc79eb9305613549722133684c2f6696b754729316ca4f4ebcc3aff63db845fd71ffc955d5e9584d89a50999 SHA512 61c7fe3980510a7dbd85f4c246e7e42a0f79d8e2aacd96a0c7a14189c5dee92292efb030ac92299474162995039073288283fee0f352cf08be6975a2c86703e7
-EBUILD fish-fillets-1.0.1-r1.ebuild 1292 BLAKE2B 0b87179878b44942f3341a23c965f96db07abe3e86eeb312e0081484196648d363a29635b9dc152ca6a2ef65c63cc6e55d216902e3812b1edc80a0e398f93891 SHA512 84a81e5956a0a23143d8f2c75936938b865c2705f093091a0ade7fb1808c26629c41beab6c5de90a1b585421836511ed33a943188fbcdb7f2c6825d36bfb92c6
 EBUILD fish-fillets-1.0.1-r100.ebuild 1351 BLAKE2B 51ba3f69f88854f500d7f317b2436fe4d705696239d32c88379eae206a52d7bb70f823f7d106b41480f52cf3bb725d0340cfc686798a2d18ddd62fbecd23afdb SHA512 73f695e1d79c557a781c2be67f9e24a31361e84399919ea72b1c72f6d544050da6772c24effecfd507bb2492c7596aec0bc26df57a81c31e2eb731d390dc802c
 MISC metadata.xml 330 BLAKE2B 47ef211faf9977fbf1b3f58ead7b59c2b025e3b731433586d948d82b3f25b95470beb1904981bc001cd4f086deb133c809ac4676c553135502f0b00699c6b996 SHA512 dbe794bba7ca2d4414f5ea3b4ef5b8958268abf2f8bd45705300baddcca5cbb485ddc24b3328e25568b9aa741c50251417ee4100f3f118827fcc5c1a285dba66
diff --git a/games-puzzle/fish-fillets/fish-fillets-1.0.1-r1.ebuild b/games-puzzle/fish-fillets/fish-fillets-1.0.1-r1.ebuild
deleted file mode 100644
index 722c291c1dd8..000000000000
--- a/games-puzzle/fish-fillets/fish-fillets-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop
-
-DATA_PV="1.0.0"
-DESCRIPTION="Underwater puzzle game - find a safe way out"
-HOMEPAGE="http://fillets.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fillets/fillets-ng-${PV}.tar.gz
-	mirror://sourceforge/fillets/fillets-ng-data-${DATA_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=media-libs/libsdl-1.2[sound,video]
-	>=media-libs/sdl-mixer-1.2.5[vorbis]
-	>=media-libs/sdl-image-1.2.2[png]
-	media-libs/smpeg
-	x11-libs/libX11
-	media-libs/sdl-ttf
-	dev-libs/fribidi
-	>=dev-lang/lua-5:0
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/fillets-ng-${PV}"
-
-src_prepare() {
-	default
-	#.mod was renamed to .fmod in lua 5.1.3 - bug #223271
-	sed -i \
-		-e 's/\.mod(/.fmod(/' \
-		$(grep -rl "\.mod\>" "${WORKDIR}"/fillets-ng-data-${DATA_PV}) \
-		|| die "sed failed"
-	rm -f missing
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --datadir="/usr/share/${PN}"
-}
-
-src_install() {
-	default
-	insinto "/usr/share/${PN}"
-	cd "${WORKDIR}"/fillets-ng-data-${DATA_PV} || die
-	rm -f COPYING
-	einstalldocs
-	doins -r *
-	newicon images/icon.png ${PN}.png
-	make_desktop_entry fillets "Fish Fillets NG"
-}
diff --git a/games-puzzle/sgt-puzzles/Manifest b/games-puzzle/sgt-puzzles/Manifest
index 575accd1b1ba..90679039316b 100644
--- a/games-puzzle/sgt-puzzles/Manifest
+++ b/games-puzzle/sgt-puzzles/Manifest
@@ -5,4 +5,4 @@ DIST puzzles-20190415.e2135d5.tar.gz 3286744 BLAKE2B 6b19cde3f95b5375bde74923a5f
 DIST sgt-puzzles-icons-20160315.tar.xz 715536 BLAKE2B c50b3a6a0d0f8a052215dd9fba7c3eca5822bc7f866a825ad5e92391bb1867d141793877bc7c4545cc6da674bf273752612f7d3578a6a05b22cc2552ea798ce6 SHA512 2fe2c02984eb8c36ac6fb4195be7895b336b84f40ce8baeb23dc8a32aca9937ccf1d33050b4da3cfba3c87e124ecbdd940ee4e990b37eabe8e2af897c2e23b57
 EBUILD sgt-puzzles-20190415.ebuild 2455 BLAKE2B d1f6ee48d4a2ac94caf9bef15af2819135683bd46f77edea40d4402d93607f367be518d7bb10d44b5713465aba386acc4c85bee4a13bf286e6b5b1a3ed815451 SHA512 e0a51ab6924e3bb90a11bb2ae7328c55b19ac4ef29471ab397bdb89319891c45e24edc5a9d8f05dcef0f7b3a833d26b024ab7a05c5479287a7ebd80bcd97bd9d
 EBUILD sgt-puzzles-99999999.ebuild 2455 BLAKE2B d1f6ee48d4a2ac94caf9bef15af2819135683bd46f77edea40d4402d93607f367be518d7bb10d44b5713465aba386acc4c85bee4a13bf286e6b5b1a3ed815451 SHA512 e0a51ab6924e3bb90a11bb2ae7328c55b19ac4ef29471ab397bdb89319891c45e24edc5a9d8f05dcef0f7b3a833d26b024ab7a05c5479287a7ebd80bcd97bd9d
-MISC metadata.xml 450 BLAKE2B dd64e755862b5c621530b5dc2f612247acb16fda51d5f6018bfb9ca580cc7176d8cd62eda86b540cb260d2056572a887ecf7fdad8ddd563aaf13c494d42689db SHA512 1f1187d3e661b3913f0a9c02fc9b2980c90bc7829daf87ef5f59b03d87fb32680f30cbf2c922b92fde7c79f961872d1d7b13368db8b8eacba79340c6de2778ff
+MISC metadata.xml 452 BLAKE2B 09a78c3be305df1ea55191c08026c582615d9b066de3497af93e9207eea812e9cb609bdf2b34c8f938f3c066ceb89d7494a51af2096a332646612986e016ec89 SHA512 7ae57620feaf828ac60d169acdd5b6d57600dbf2671507e995d91791d288e2a9d2858d5b2b73df175fa891b9fe3f9b39b60051f64f13a27b06d5f54b9da4eb3c
diff --git a/games-puzzle/sgt-puzzles/metadata.xml b/games-puzzle/sgt-puzzles/metadata.xml
index 744f27f1fda6..697024d76f6e 100644
--- a/games-puzzle/sgt-puzzles/metadata.xml
+++ b/games-puzzle/sgt-puzzles/metadata.xml
@@ -6,8 +6,8 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>NP-Hardass@gentoo.org</email>
-		<name>NP-Hardass</name>
+		<email>np-hardass@gentoo.org</email>
+		<name>Adam Feldman</name>
 	</maintainer>
 	<use>
 		<flag name="gtk3">Use x11-libs/gtk+:3 instead of x11-libs/gtk+:2</flag>