gentoo resync : 31.05.2021

4 files changed, 15 insertions, 138 deletions

diff --git a/games-puzzle/sgt-puzzles/Manifest b/games-puzzle/sgt-puzzles/Manifest
index 90679039316b..895dedbed43b 100644
--- a/games-puzzle/sgt-puzzles/Manifest
+++ b/games-puzzle/sgt-puzzles/Manifest
@@ -2,7 +2,5 @@ AUX sgt-puzzles-20161207-builtin-help.patch 3086 BLAKE2B 80af8579911c9abd0932466
 AUX sgt-puzzles.directory 65 BLAKE2B c51b022658d8bcc7b004f953f58c9848a992e5f82cfe5354d5dd3399fb12f355f609a33f3216998398572efc328cb19dc2228b70f55fb3488d8f05be3b089eb7 SHA512 b6cada99b9afae8407b494e066ce271cd65980e2d225e512d55b1905e93e70af3763e7e6e76fcdf30314005dfa309a5daa7e2ac6d83d312edaf2f74869d8079c
 AUX sgt-puzzles.menu 556 BLAKE2B 3e7ca65d13dbdd2d54520d549728cbf5d53e59f7d6cd836fa5807d8b883de157dbc006a8023831e15bdcceaa5828f5ce5cb19bbf89e635a352cbe0e864b18691 SHA512 2b3d68ae2eef33199953fe85af08c87ba91cfc8c1ea92b535af90c5f07fcbbccec124a0b9701b8cafe92786d945f2ed499e046a55d1e6da1bbb02ae5f02e5ee9
 DIST puzzles-20190415.e2135d5.tar.gz 3286744 BLAKE2B 6b19cde3f95b5375bde74923a5f8e3deb9abb7d4d737ad5f2d18aa7895b973a9ca1ed4a495cf80da8390ed7fb63f1eb973c8053d52145e5752c56e38d3ac19d7 SHA512 5f38c96cff4e745a1c1615762c0e5f3f3dd056ff7dbf0f80a5953e658ae1460503c6394fe29301f5682485d6a6121869853a270dc60327821a3059ca6d971fa1
-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 452 BLAKE2B 09a78c3be305df1ea55191c08026c582615d9b066de3497af93e9207eea812e9cb609bdf2b34c8f938f3c066ceb89d7494a51af2096a332646612986e016ec89 SHA512 7ae57620feaf828ac60d169acdd5b6d57600dbf2671507e995d91791d288e2a9d2858d5b2b73df175fa891b9fe3f9b39b60051f64f13a27b06d5f54b9da4eb3c
+EBUILD sgt-puzzles-20190415.ebuild 2367 BLAKE2B 6305a6337800502058b6c6206a55476e5a30b6091feba72245096e077f0c88dd5387aed6f03dca44be51d3ac224b734f009cc45da13c11321ebc3bc841f204fc SHA512 6f87d0fb32b1ee19ec1cd69b21e5e0643542674c34fe897439f0ae0670fbed71377a5112cfce71c20f1143e13c73b15b8d107efe3e848fc5db588dc49b680fef
+MISC metadata.xml 363 BLAKE2B befdd0efc6674eb9ef882b1a94d2132164aaaf48fbebf9439a4e397f8542cc00e78dc05a69e927123b4cd890404787fa15afd5a071a4dd444dffd8af0e290117 SHA512 b8a999849f72770de7bed980e7341652b6c3ec0dc5ec8120c69aca114bd1d962c8ad85f339387651ac36a8158ee1eb732e1be168f1fc48c522e201704bd63184
diff --git a/games-puzzle/sgt-puzzles/metadata.xml b/games-puzzle/sgt-puzzles/metadata.xml
index 697024d76f6e..fa736384b59a 100644
--- a/games-puzzle/sgt-puzzles/metadata.xml
+++ b/games-puzzle/sgt-puzzles/metadata.xml
@@ -9,7 +9,4 @@
 		<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>
-	</use>
 </pkgmetadata>
diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-20190415.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-20190415.ebuild
index 2988d396d974..902b9c928920 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-20190415.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-20190415.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils gnome2-utils toolchain-funcs autotools
+inherit autotools desktop toolchain-funcs xdg-utils
 
 if [[ ${PV} == "99999999" ]] ; then
 	inherit git-r3
@@ -22,16 +22,17 @@ HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="+doc gtk3"
+IUSE="+doc"
 
 COMMON_DEPEND="
-	!gtk3? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )"
+	x11-libs/gtk+:3"
 
 RDEPEND="${COMMON_DEPEND}
 	x11-misc/xdg-utils" # Used by builtin help patch
 
-DEPEND="${COMMON_DEPEND}
+DEPEND="${COMMON_DEPEND}"
+
+BDEPEND="
 	dev-lang/perl
 	virtual/pkgconfig
 	doc? ( >=app-doc/halibut-1.2 )"
@@ -67,7 +68,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		--program-prefix="${PN}_" \
-		--with-gtk=$(usex gtk3 3 2)
+		--with-gtk=3
 }
 
 src_compile() {
@@ -86,12 +87,12 @@ src_install() {
 		name=$(awk -F: '/exe:/ { print $3 }' "${file}")
 		file=${file%.R}
 		newicon -s 48 icons/${file}-48d24.png ${PN}_${file}.png
-		make_desktop_entry "${PN}_${file}" "${name}" "${PN}_${file}" "Game;LogicGame;X-${PN};"
+		make_desktop_entry "${PN}_${file}" "${name}" "${PN}_${file}" "LogicGame;X-${PN};"
 	done
 
 	if use doc ; then
-		DOCS=( puzzles.{pdf,ps,txt} )
-		HTML_DOCS=( *.html )
+		local DOCS=( puzzles.{pdf,ps,txt} )
+		local HTML_DOCS=( *.html )
 		einstalldocs
 		doinfo puzzles.info{,-1,-2,-3}
 	fi
@@ -102,14 +103,10 @@ src_install() {
 	doins "${FILESDIR}/${PN}.directory"
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
deleted file mode 100644
index 2988d396d974..000000000000
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnome2-utils toolchain-funcs autotools
-
-if [[ ${PV} == "99999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.tartarus.org/simon/puzzles.git"
-	GENTOO_ICONS="20160315"
-	SRC_URI="https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz"
-else
-	MAGIC=e2135d5
-	SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz"
-	S=${WORKDIR}/puzzles-${PV}.${MAGIC}
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Simon Tatham's Portable Puzzle Collection"
-HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+doc gtk3"
-
-COMMON_DEPEND="
-	!gtk3? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )"
-
-RDEPEND="${COMMON_DEPEND}
-	x11-misc/xdg-utils" # Used by builtin help patch
-
-DEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	virtual/pkgconfig
-	doc? ( >=app-doc/halibut-1.2 )"
-
-PATCHES=( "${FILESDIR}/${PN}-20161207-builtin-help.patch" )
-
-src_unpack() {
-	default
-	if [[ ${PV} == "99999999" ]]; then
-		git-r3_src_unpack
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's|-Werror||g' \
-		configure.ac || die
-	sed -i \
-		-e 's/-O2 -Wall .* -g/-Wall/' \
-		-e "s/libstr =/libstr = '\$(LDFLAGS) ' ./" \
-		mkfiles.pl || die
-	./mkfiles.pl || die
-	eautoreconf
-
-	# Import icons from latest Gentoo tarball for live
-	if [[ ${PV} == "99999999" ]]; then
-		cp -R ../${PN}-icons/icons . || die
-	fi
-}
-
-src_configure() {
-	econf \
-		--program-prefix="${PN}_" \
-		--with-gtk=$(usex gtk3 3 2)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-	if use doc ; then
-		halibut --text --html --info --pdf --ps puzzles.but || die
-	fi
-}
-
-src_install() {
-	default
-
-	local file name
-	for file in *.R ; do
-		[[ ${file} == "nullgame.R" ]] && continue
-		name=$(awk -F: '/exe:/ { print $3 }' "${file}")
-		file=${file%.R}
-		newicon -s 48 icons/${file}-48d24.png ${PN}_${file}.png
-		make_desktop_entry "${PN}_${file}" "${name}" "${PN}_${file}" "Game;LogicGame;X-${PN};"
-	done
-
-	if use doc ; then
-		DOCS=( puzzles.{pdf,ps,txt} )
-		HTML_DOCS=( *.html )
-		einstalldocs
-		doinfo puzzles.info{,-1,-2,-3}
-	fi
-
-	insinto /etc/xdg/menus/applications-merged
-	doins "${FILESDIR}/${PN}.menu"
-	insinto /usr/share/desktop-directories
-	doins "${FILESDIR}/${PN}.directory"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}