gentoo resync : 23.09.2020

10 files changed, 19 insertions, 241 deletions

diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 555026da4f94..aa71b6b08569 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/garden/Manifest b/games-action/garden/Manifest
index 1f69fce98d6f..4df77bf75029 100644
--- a/games-action/garden/Manifest
+++ b/games-action/garden/Manifest
@@ -1,5 +1,6 @@
 AUX garden-1.0.9-dash.patch 968 BLAKE2B a743565fe606251d2b5506a51fdb2683ed5a71beb078f0e32563c3a4e411183280b4184a507f90f26048dbcf8619a04157b2a7f50ed5150c5152426678dec5e0 SHA512 1033ce1f4056ee07203b739e852d777e35f908548c0fe582be27c38dac8227e4761a2fa80bc71d5bfe8ce09853f8250a6c745d99e02c70aad1e3b2a35b1188d5
+AUX garden-1.0.9-fnocommon.patch 445 BLAKE2B 8386434973891bcfef0d188c34cedb676a2e2b5dd11fae320a928d9cd604220d04055a202a063389c8d5ac6c6b22e3db7a983d10e6c94029f878808ac77e25ac SHA512 fcf4f4a70b46de1deac3e2cc93fd5b0d43b023407709fee927494d54748ccd9dfcaf3a9103b71d812acde1afaa2cddc7360cce7c4a099f68ff33b580cae16840
 AUX garden-1.0.9-resources.patch 200 BLAKE2B 83053911919ac1b0e9ae87f612cdc1bb936b6e3ad20605dde41cbaf342d817904384ced5cffb6f223e1b964ca63f714fb5585ffadd267edb7edbf4c941c7c069 SHA512 f9ecabf264c60eab75ffdc3c2d875d1809f446eb86118432e67d19c0b3189f4200a28fcc1e798919dcf5472ac21f47c37a779a39d6cbc8b373811dffa6e5d904
 DIST garden-1.0.9.tar.gz 2714783 BLAKE2B e6d7c54db88e4683e760f53c2d58f68be7bcde08445dba4edabd85c7d4032f7000225ddfcb3f9f2cbc424216fe03bca5d81f0878be13849bf36a8360b0f4b711 SHA512 e8f52fc0ebf9eaa7933ae1faa5610e8a27a5e7cfc59d033714c4306a53680feeddd52b1fb3050f2d72addba03ee383e71e57eac02270f3d2369aed054a9a9848
-EBUILD garden-1.0.9-r1.ebuild 927 BLAKE2B 2027d60a462a10a13aaba22d30f8213da04f231cbfaa9b31433b62479a86710c3592291185e139977b07e428ad76ccce3ec6c1adc397922c7496cbf58f6eeaed SHA512 8bff3e8ec31616737d735f6781bad4097009f76cedc7458ffd3d09c31f27d004d72bdf083a794af979025c2f163d3e4d3944c45c9079c11c67b2c99389706bc4
+EBUILD garden-1.0.9-r2.ebuild 943 BLAKE2B 4955e6ebf9585a735fac0328f4e9545fcff196f4a4b28228f3b13d7657df8e34526e0d0407497993217497f70bc107c9969e5792364eb10f1a07e1a11e150066 SHA512 b2528971c17a0018a22a6b4cee2656be22ba5b7f01692488a66a8c5f12258cf2598c14fecf298e9fb8328d27f9501c0ff56a9aeb6234af0687322e2777597fd1
 MISC metadata.xml 329 BLAKE2B 5ea0479d19fbe4a39186a5fa10b2114ec9fc7d4e7026d34ceab239f0c25b2a03da1b670b44b4e088ccefd35dc680b0e38d11963ae09113bb55403b33be05eaf8 SHA512 af05d41aaf7aa63a304e442bb6e6dd4617409434ae439ec14461739362bc0d4ebf03dc791435586dddfec81273a19bea91a78f7ccd573f420ea67d59665e69d7
diff --git a/games-action/garden/files/garden-1.0.9-fnocommon.patch b/games-action/garden/files/garden-1.0.9-fnocommon.patch
new file mode 100644
index 000000000000..59d011f5f402
--- /dev/null
+++ b/games-action/garden/files/garden-1.0.9-fnocommon.patch
@@ -0,0 +1,11 @@
+--- a/src/main.c	2020-09-18 22:43:49.545959883 -0000
++++ b/src/main.c	2020-09-18 22:43:40.465778941 -0000
+@@ -55,7 +55,7 @@ struct enemystruct enemy [NO_ENEMIES];
+ struct ebulletstruct ebullet [NO_EBULLETS];
+ struct pbulletstruct pbullet [NO_PBULLETS];
+ struct arenastruct arena;
+-struct eclassstruct eclass [NO_ENEMY_TYPES];
++extern struct eclassstruct eclass [NO_ENEMY_TYPES];
+ struct cloudstruct cloud [NO_CLOUDS];
+ struct bossstruct boss;
+ 
diff --git a/games-action/garden/garden-1.0.9-r1.ebuild b/games-action/garden/garden-1.0.9-r2.ebuild
index 57bdc0f0e9c5..5200fa04163f 100644
--- a/games-action/garden/garden-1.0.9-r1.ebuild
+++ b/games-action/garden/garden-1.0.9-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit desktop gnome2-utils autotools flag-o-matic
+inherit autotools desktop flag-o-matic xdg-utils
 
 DESCRIPTION="Multiplatform vertical shoot-em-up with non-traditional elements"
 HOMEPAGE="http://garden.sourceforge.net/"
@@ -12,7 +12,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="<media-libs/allegro-5"
 RDEPEND="${DEPEND}"
@@ -20,6 +19,7 @@ RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}/${P}-dash.patch"
 	"${FILESDIR}/${P}-resources.patch"
+	"${FILESDIR}/${P}-fnocommon.patch"
 )
 
 src_prepare() {
@@ -40,9 +40,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/games-action/openclonk/Manifest b/games-action/openclonk/Manifest
deleted file mode 100644
index ae173a6c9a51..000000000000
--- a/games-action/openclonk/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX openclonk-7.0-paths.patch 2792 BLAKE2B e8ff47e3881236795cabb3c3c7374059da692bbdf8edd1866d303c6f63389d529ccbf854a80e70a73cabbabe06c41a9820ddd5a918798319ec31c1ec6c3dd5a4 SHA512 3079ce128cba9b822bdb2df404a51a28df4152041d86bc55f10f6ddd057e29127b57da71471dd256fe48de9e30c1a33c760d99868c6611806e7468a2164d886c
-AUX openclonk-7.0-postinst.patch 668 BLAKE2B 7f39cf553e209fad91466ad99682bf92eaee809616828e558562d28fac088d2cdc5fde744093e855eb7d4153dbe3bc98d9424559fa5e1ca17bbe8bed05679136 SHA512 77258633e8a4601f53666520561c40a533699d8de3429463d66a2b9659105c7838a099371648a92d91d1b1226abd6dd277717645e7409aed7ee40439bfab3634
-AUX openclonk-wrapper-script.sh 229 BLAKE2B 5645fe9fd40d59a8284a71fdbea5d3c9728d1209cc11ce6e0d6a67ecba6bdc1b43e55c58c3664d452097c7236bd0f0b226c3fefb3a78ffdd9c960ca9f8c1c32d SHA512 d31a2ffa6dbb014cfe3761d5a8b52b33f6b658cda317d0f7fc91ad8cc869fd93c486f9808da9ebe03e75255b7b2fedc2ef6c4f6372f1dce0575771ae9471a8a3
-DIST openclonk-7.0-src.tar.bz2 102143348 BLAKE2B 2ea6aa1aaca21795c80ee668b17fbfbfe0d5bc4fb4607066eb75e3d25ba0e81de06959e335ab8076cda04b05c4569ea1fcc02d9856e010f12e7ad678ead8519b SHA512 b7ea557b5441986c0527abcb9c074c462f73bf45dd7ac4835329169d63ace5cc02e122d0dee7241da8621a7727ce9b09a2ad17e06dfc5610fcb529d350a51577
-EBUILD openclonk-7.0.ebuild 2368 BLAKE2B cbda193cbd9501c28eb0516559aeeae096b6043d3c90553751bbc923ca3a58484187671f2bea18e69fa783c255e9c3851a1aec4d2276f6f7d084016d54f73b6e SHA512 2847e5ae6d5f000a0b9112d3807952551851befd3b48aa1ea3367dc4e2c001b47a4e37ea2edb93f507eeda6ec83b000bf2943728b7544848b3aaa62e60584e0e
-MISC metadata.xml 1027 BLAKE2B 65056dd55948b37edd79afa73dfd801581b9aa178fe515b387a3a41bee4d4e500a5a4572592d4eba328e8ea0250d2f2d16278ebc1a18ee9b57db158e0829efe7 SHA512 566eb22d22644a7a16f94246b0f461ac7cac26702e2a21c443790f735155b8d30507862728847ab93f4e9c036561580363ef29de2173499e4b802a828ab1616f
diff --git a/games-action/openclonk/files/openclonk-7.0-paths.patch b/games-action/openclonk/files/openclonk-7.0-paths.patch
deleted file mode 100644
index 4ebd6034a59b..000000000000
--- a/games-action/openclonk/files/openclonk-7.0-paths.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Updated for openclonk-6.0, based on this patch:
-  From: Julian Ospald <hasufell@gentoo.org>
-  Date: Thu Feb  6 19:58:45 UTC 2014
-  Subject: make paths modifiable
-
---- openclonk-release-6.0-src.orig/CMakeLists.txt
-+++ openclonk-release-6.0-src/CMakeLists.txt
-@@ -42,6 +42,16 @@
- 	set(${_var} "${_string}" PARENT_SCOPE)
- endfunction()
- 
-+
-+############################################################################
-+# User selectable paths
-+############################################################################
-+set(INSTALL_BINDIR "bin/" CACHE PATH "Binary install destination")
-+set(INSTALL_GAMES_BINDIR "games/bin" CACHE PATH "Games binary install destination")
-+set(INSTALL_DATAROOTDIR "share/" CACHE PATH "Data root install destination")
-+set(INSTALL_DATADIR "${INSTALL_DATAROOTDIR}" CACHE PATH "Data install destination")
-+
-+
- ############################################################################
- # User selectable options
- ############################################################################
-@@ -1212,10 +1222,16 @@
- # Assemble compiler flags
- ############################################################################
- if(UNIX)
-+	if(NOT IS_ABSOLUTE "${INSTALL_DATADIR}")
-+		set(ABSOLUTE_INSTALL_DATADIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_DATADIR}")
-+	else()
-+		set(ABSOLUTE_INSTALL_DATADIR "${INSTALL_DATADIR}")
-+	endif()
-+
- 	# Don't put this into CMAKE_CXX_FLAGS because otherwise it is cached,
- 	# and when the path is changed both the old and new definition appears
- 	# in the list of flags.
--	add_definitions("-DOC_SYSTEM_DATA_DIR=\"${CMAKE_INSTALL_PREFIX}/share/games/openclonk\"")
-+	add_definitions("-DOC_SYSTEM_DATA_DIR=\"${ABSOLUTE_INSTALL_DATADIR}/openclonk\"")
- endif()
- if(OC_CXX_FLAGS)
- 	list(REMOVE_DUPLICATES OC_CXX_FLAGS)
-@@ -1537,7 +1553,7 @@
- 			DEPENDS "${native_c4group}"
- 			VERBATIM
- 		)
--		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${group} DESTINATION share/games/openclonk)
-+		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${group} DESTINATION "${INSTALL_DATADIR}/openclonk")
- 	endif()
- endforeach()
- 
-@@ -1546,13 +1562,13 @@
- 	add_dependencies(data groups)
- 	
- 	# Install new files
--	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/openclonk.desktop DESTINATION share/applications)
-+	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/openclonk.desktop DESTINATION "${INSTALL_DATAROOTDIR}/applications")
- 	# Update the MIME cache -- this makes the clonk:// protocol handler actually work
- 	install(CODE "execute_process(COMMAND update-desktop-database)")
- 
- 	# Install binaries
--	install(TARGETS openclonk DESTINATION games)
--	install(TARGETS c4group DESTINATION bin)
-+	install(TARGETS openclonk DESTINATION "${INSTALL_GAMES_BINDIR}")
-+	install(TARGETS c4group DESTINATION "${INSTALL_BINDIR}")
- else()
- 	install(TARGETS openclonk
- 		BUNDLE DESTINATION .
diff --git a/games-action/openclonk/files/openclonk-7.0-postinst.patch b/games-action/openclonk/files/openclonk-7.0-postinst.patch
deleted file mode 100644
index 26ad61ec6784..000000000000
--- a/games-action/openclonk/files/openclonk-7.0-postinst.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-update-desktop-database is called from the pkg_postinst stage instead.
-
---- openclonk-release-6.0-src.orig/CMakeLists.txt
-+++ openclonk-release-6.0-src/CMakeLists.txt
-@@ -1564,7 +1564,8 @@
- 	# Install new files
- 	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/openclonk.desktop DESTINATION "${INSTALL_DATAROOTDIR}/applications")
- 	# Update the MIME cache -- this makes the clonk:// protocol handler actually work
--	install(CODE "execute_process(COMMAND update-desktop-database)")
-+	# --> ebuild, pkg_postinst stage
-+	#install(CODE "execute_process(COMMAND update-desktop-database)")
- 
- 	# Install binaries
- 	install(TARGETS openclonk DESTINATION "${INSTALL_GAMES_BINDIR}")
diff --git a/games-action/openclonk/files/openclonk-wrapper-script.sh b/games-action/openclonk/files/openclonk-wrapper-script.sh
deleted file mode 100644
index 9f7e64442887..000000000000
--- a/games-action/openclonk/files/openclonk-wrapper-script.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-# wrapper prevents the game to look for .ocp files in the current dir
-# which can lead to weird behavior and game freeze
-
-[ -d ~/.clonk/openclonk ] || mkdir -p ~/.clonk/openclonk
-
-cd ~/.clonk/openclonk
-
-exec clonk "$@"
diff --git a/games-action/openclonk/metadata.xml b/games-action/openclonk/metadata.xml
deleted file mode 100644
index 8d041fd7d412..000000000000
--- a/games-action/openclonk/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<changelog>http://hg.openclonk.org/openclonk/</changelog>
-		<doc lang="en">http://wiki.openclonk.org/w/C4Script_Documentation</doc>
-		<bugs-to>http://bugs.openclonk.org/</bugs-to>
-	</upstream>
-	<longdescription lang="en">
-		OpenClonk is the Open source successor of the Clonk gaming series.
-		OpenClonk is a project dedicated to the further development of the
-		Clonk game series. Our goal is to improve and make the real strengths
-		of Clonk more fun to play: Bustling mining, production lines and
-		economy, fast and fiddly melees. Another focus lies on the further
-		enchancement of the game engine and the extensibility/modability of
-		the game content with C4Script which has always been one of the most
-		important features of Clonk.
-	</longdescription>
-</pkgmetadata>
diff --git a/games-action/openclonk/openclonk-7.0.ebuild b/games-action/openclonk/openclonk-7.0.ebuild
deleted file mode 100644
index 5543cc1292e8..000000000000
--- a/games-action/openclonk/openclonk-7.0.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit cmake-utils eutils gnome2-utils python-any-r1 fdo-mime toolchain-funcs games
-
-MY_P=${PN}-release-${PV}-src
-
-DESCRIPTION="A free multiplayer action game where you control clonks"
-HOMEPAGE="https://openclonk.org/"
-SRC_URI="http://www.openclonk.org/builds/release/${PV}/openclonk-${PV}-src.tar.bz2"
-
-LICENSE="BSD ISC CLONK-trademark LGPL-2.1 POSTGRESQL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated doc"
-
-RDEPEND="
-	>=dev-libs/boost-1.40:=
-	dev-libs/tinyxml
-	net-libs/libupnp
-	media-libs/libpng:0=
-	sys-libs/zlib
-	!dedicated? (
-		dev-libs/glib:2
-		media-libs/freealut
-		media-libs/freetype:2
-		media-libs/glew
-		media-libs/libsdl[X,opengl,sound,video]
-		media-libs/libvorbis
-		media-libs/openal
-		media-libs/sdl-mixer[mp3,vorbis,wav]
-		virtual/jpeg:0=
-		virtual/opengl
-		virtual/glu
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:3
-		x11-libs/libXrandr
-		x11-libs/libX11
-	)
-	dedicated? ( sys-libs/readline:0= )"
-DEPEND="${RDEPEND}
-	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
-	virtual/pkgconfig
-	doc? (
-		${PYTHON_DEPS}
-		dev-libs/libxml2[python]
-		sys-devel/gettext
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-paths.patch
-	"${FILESDIR}"/${P}-postinst.patch
-)
-S=${WORKDIR}/${P}-src
-
-pkg_setup() {
-	games_pkg_setup
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(usex dedicated \
-			"-DUSE_CONSOLE=ON -DUSE_X11=OFF -DUSE_GTK=OFF -DUSE_GTK3=OFF" \
-			"-DUSE_CONSOLE=OFF -DUSE_X11=ON -DUSE_GTK=ON -DUSE_GTK3=ON")
-		-DWITH_AUTOMATIC_UPDATE=OFF
-		-DINSTALL_GAMES_BINDIR="${GAMES_BINDIR}"
-		-DINSTALL_DATADIR="${GAMES_DATADIR}"
-		-DUSE_STATIC_BOOST=OFF
-		-DUSE_SYSTEM_TINYXML=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && emake -C docs
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if ! use dedicated; then
-		mv "${ED%/}${GAMES_BINDIR}/"{openclonk,clonk} || die
-		newgamesbin "${FILESDIR}"/${PN}-wrapper-script.sh ${PN}
-	fi
-	use doc && dohtml -r docs/online/*
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}