gentoo resync : 24.06.2021

7 files changed, 7 insertions, 90 deletions

diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 2dcb2aee8b32..6bba06d0aeee 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/braincurses/Manifest b/games-puzzle/braincurses/Manifest
index 0898ec061e46..9de5e3c59351 100644
--- a/games-puzzle/braincurses/Manifest
+++ b/games-puzzle/braincurses/Manifest
@@ -1,7 +1,3 @@
-AUX braincurses-0.5b-as-needed.patch 696 BLAKE2B e0d234562842a30aceec3b686c9315be7f856e14b0398c14a3f7c7350a9ccf34d9bd96d7a10e62978b372a28e99178ce81b54960416e08c23bb347935eebd2c3 SHA512 8788fe4ef94d3b501104e66dc31a4df43b55b0949ef35b1fe9d6acf936e178d8a7bacbc331af6db093a056218658e845a816e51746000085581f8e623fbcd42c
-AUX braincurses-0.5b-gcc43.patch 192 BLAKE2B 4f557c7666e4d1b772feb1de5a793868aaf38dcdec583f9feb795bc72b98262078924a5734e137cd5719cdd77cc35c596f758677d0682035859f6575b6c8eb6d SHA512 94a6664162be766918280af07201ba3eb55c22e0eabbf8701aecb5c7f0eb5151e24d7b65aadb6db4262373c1323b170c332f3700f5e90a74f048511600f88f64
-DIST braincurses-0.5b.tar.gz 18487 BLAKE2B 4d3874eb6625781e866ba2250da45ff165d662abaeabda2c4525bb300479b33e1efb91f997165310b7a4edc61f81ac841b00b940d319ef0c18b8684dd5355d60 SHA512 7f90da3a5c480e0bf736dd4a53efc08abeb85969e727882e3d06f888b2a4b6002f9fd9bc1554ac2256c9821dea5fabf2638eba4a672046a09c1adb8690803a0e
 DIST braincurses-1.1.0.tar.gz 12996 BLAKE2B 3f0c5edabd65175e581280413f7fea841d4d4b7ff9f4b39c4c3a0084e0e4c0a159605fe9ed320769a9bc85d671845af115456df33305e20f1eef6c53626c01a4 SHA512 7f27512c321ca2f2c3b38a891fc4e1ab0e2371412ada827f69dc262e27abbf750861b7ab859d0d8407ba25e4814ea6c33bc36a2c8ccdeda4977fa4bebb5457cd
-EBUILD braincurses-0.5b-r1.ebuild 643 BLAKE2B cdec155c182c713d4d603ccf1f258f22961243bbc7e5765d86ea0b0a02e4e0a2b70d3bfa3ce466987d7231b3113afab3df78387cb19ea57da0e1bedab3544c43 SHA512 a369e231f9a396d5c019ae0741cd4f980cfd1655ae68f357293740fd65a11a9452fe494ecc3e003059a41e8bcaca70b2e2dbac2f00f82c5871e5a6dfad496208
 EBUILD braincurses-1.1.0.ebuild 606 BLAKE2B 90987817255b907f1122f715406200f1a0409c6bae245eaf1cbff0929782bba0b4b6cd0f47610e58f9437e13de7ffc8edeec7b3b22f05e5f1c7a1162a88b2aca SHA512 6e967e3945475a756c8455e01c2e286ea5930c986f81b2e750c4846540f57286fb60973f8a1ee302dcd7f91fdf4d7e1723f566281100ec13bace619651b4dd64
 MISC metadata.xml 337 BLAKE2B d32672d3c35740ec028a8cf238945686d62c66a374eaf02e785a098505d5b3533a40dd3d90d0c20c7544ee50253aab1e7db89adf4e156726f524d2ca44a9e409 SHA512 90b46ca1664d9f5b6f4f51f0c988a258293c3d60f0ec0a0708da360df1e21872d603f5dc5a84ff1dbff52d8b1146b5248f8ce42ee47313dc86f1a47ec03a9c7b
diff --git a/games-puzzle/braincurses/braincurses-0.5b-r1.ebuild b/games-puzzle/braincurses/braincurses-0.5b-r1.ebuild
deleted file mode 100644
index 37bd4eef30f1..000000000000
--- a/games-puzzle/braincurses/braincurses-0.5b-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="An ncurses-based mastermind clone"
-HOMEPAGE="https://github.com/bderrly/braincurses"
-SRC_URI="mirror://sourceforge/braincurses/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	default
-
-	eapply "${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-as-needed.patch
-
-	# fix buffer overflow (bug #301033)
-	sed -i \
-		-e 's/guessLabel\[2/guessLabel[3/' \
-		curses/windows.cpp \
-		|| die 'sed failed'
-}
-
-src_install() {
-	dobin braincurses
-	einstalldocs
-}
diff --git a/games-puzzle/braincurses/files/braincurses-0.5b-as-needed.patch b/games-puzzle/braincurses/files/braincurses-0.5b-as-needed.patch
deleted file mode 100644
index 2101602c6372..000000000000
--- a/games-puzzle/braincurses/files/braincurses-0.5b-as-needed.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/Makefile.old	2009-02-09 16:04:47.000000000 +0100
-+++ b/Makefile	2009-02-09 16:14:41.000000000 +0100
-@@ -1,22 +1,9 @@
- # Makefile for braincurses game
- # written by Brian Derr
- 
--CC=g++
--CFLAGS=-Wall
--CURSES_LIBS=-lncurses
-+LDLIBS=-lncurses
- 
--ncurses: curses/windows.o braincurses.o 
--	${CC} ${CURSES_LIBS} ${CFLAGS} -o braincurses curses/windows.o \
--	braincurses.o
--
--windows.o: windows.cpp
--	${CC} ${CFLAGS} -c curses/windows.cpp
--
--braincurses.o: braincurses.cpp
--	${CC} ${CFLAGS} -c braincurses.cpp
--
--#top_scores.o: top_scores.cpp
--#	${CC} ${CFLAGS} -c top_scores.cpp
-+braincurses: curses/windows.cpp braincurses.cpp 
- 
- install:
- 	install -o root -g root braincurses /usr/local/bin/
diff --git a/games-puzzle/braincurses/files/braincurses-0.5b-gcc43.patch b/games-puzzle/braincurses/files/braincurses-0.5b-gcc43.patch
deleted file mode 100644
index 6fa5509a7786..000000000000
--- a/games-puzzle/braincurses/files/braincurses-0.5b-gcc43.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/braincurses.h
-+++ b/braincurses.h
-@@ -12,6 +12,7 @@
- #include <cstddef>
- #include <cstdlib>
- #include <ctime>
-+#include <cstring>
- #include <iostream>
- #include <map>
- #include <string>
diff --git a/games-puzzle/wmpuzzle/Manifest b/games-puzzle/wmpuzzle/Manifest
index 70f208cb6b54..ee84832f3441 100644
--- a/games-puzzle/wmpuzzle/Manifest
+++ b/games-puzzle/wmpuzzle/Manifest
@@ -1,4 +1,4 @@
 AUX wmpuzzle-0.5.2-gcc-10.patch 665 BLAKE2B ddc74e6467bd3803b34e322c9eb464be708b54b912ebd797b17c258e798bff8899cc2d36eb9ed45e8bf629d1554e33cab939dc1f31ab37e42d3cc952069506d2 SHA512 a18407df8416a95930323b51ef5d3e8977154136cbdcd2aa346acf6566b93db72ffeb445b12513be1f99c6154d47286e3f743a817c6e071ce0130afc875b7ac2
 DIST wmpuzzle-0.5.2.tar.gz 87373 BLAKE2B c2187fce6fbfe4f68b969da605755f379d14d47a478c6ca43da25dcb607939cf63552e108073d7031ef0dfc2d5455aade5d2f8617cbadad62587ffcaef95ed1f SHA512 7d171d307e3829005dff4d718161655785e87129b07917d494bb498eff904adafc7c6f83e71f996759ee9e365fe70c67858a5ec9d2647fe573e0a1505126f6c0
-EBUILD wmpuzzle-0.5.2-r1.ebuild 747 BLAKE2B 9cd57edd8213d1f8eba0bc5e726bfbbed5a46083c83f450e1eb00967750c3317a5bc4f5fc326ec843c7f7d065674c231ba5c9a619ee6a572b5af7800fa5ac8af SHA512 4c7db1397b0394a8d88c4d24078b5727baf6bb5385f0722da9e258c2c7e2d4e3c78e48d0a0e72a87dd39a2dcefa7bbba95299c05930ff81c038ad64cd21bb29d
+EBUILD wmpuzzle-0.5.2-r1.ebuild 642 BLAKE2B 026fce9fca519718edf1e5d701a80e24c2e2ee23c3a09cb448dd1eddc1b4f7ef3d72b41a8295e2b6d8a77e0d175d0ed66f7b83b66e1dcc05efa00199dae0dea7 SHA512 f76b3f84a8b24e360d576ca6c93f1ecdea65c22080eeea91539d6292efde62c26d436aa9191b3ad412cd9e23f6b2486f628106b15e0d2ce4b42d26433ed246cf
 MISC metadata.xml 441 BLAKE2B 32c3a0ed8a9f2fd02246c333adea24fad083490055a0a8beaa4ec743c0efe07286d2bf8cb4318a7c4424a7c4a079d2bec9ae04908e352c35b40099f5c7d8371f SHA512 12d6a5472ef0f13f5703f22b584bdb75364db3018f0d280b18d2813f741d2820aa1daf3dec24e64e88c1df27822695680a269169ef682ebd95af26d130401714
diff --git a/games-puzzle/wmpuzzle/wmpuzzle-0.5.2-r1.ebuild b/games-puzzle/wmpuzzle/wmpuzzle-0.5.2-r1.ebuild
index 46f9171fc914..f6a66f8c7579 100644
--- a/games-puzzle/wmpuzzle/wmpuzzle-0.5.2-r1.ebuild
+++ b/games-puzzle/wmpuzzle/wmpuzzle-0.5.2-r1.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils gnome2-utils
+EAPI=7
 
-DESCRIPTION="a 4x4 puzzle on a 64x64 mini window"
+inherit desktop xdg
+
+DESCRIPTION="4x4 puzzle on a 64x64 mini window"
 HOMEPAGE="https://people.debian.org/~godisch/wmpuzzle/"
 SRC_URI="https://people.debian.org/~godisch/wmpuzzle/${P}.tar.gz"
+S="${WORKDIR}/${P}/src"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
@@ -19,7 +20,6 @@ RDEPEND="x11-libs/libX11
 DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch )
-S=${WORKDIR}/${P}/src
 
 src_install() {
 	dobin ${PN}
@@ -29,11 +29,3 @@ src_install() {
 	doman ${PN}.6
 	make_desktop_entry ${PN}
 }
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}