gentoo resync : 28.04.2021

5 files changed, 43 insertions, 24 deletions

diff --git a/games-util/antimicro/Manifest b/games-util/antimicro/Manifest
index 87bcfacffea3..27d1bcfc2cae 100644
--- a/games-util/antimicro/Manifest
+++ b/games-util/antimicro/Manifest
@@ -1,4 +1,6 @@
-AUX antimicro-2.23-linking-errors.patch 1794 BLAKE2B 3af65cd406cb334a88df3721bb1b0f33e38839ac9f31a72ee3f37d7780406d3809ea34b2ae7c2ede3a86dcf6723daff1bdf84be927c6e601edc06f0dbf37453e SHA512 4733e02a00910ce19f7958930f5886e41eecbeccb4b2b3158596fcdb221256e5f7a6ba7086e934d750f812a9007b42d0b28ece51168cf039169ebb290e9ecfae
+AUX antimicro-2.23-SDL2-include.patch 311 BLAKE2B c5aef415ceefb4ed2b127eb488c69112a116337233c0ef7e236946b84e56495418181f681fb546286dfe30b0ec02b20fc3624876fadbb7994e9503454e358a2e SHA512 f73a5ca33334c97912ff4fcc2fdc735eb8c3e0b54e3e33e2521d7120fdd2cad8123fde53f5bb26d869cbd5b7c815acacccb1cd20c281e11c09ad52d9dc243bba
+AUX antimicro-2.23-linking-errors.patch 1659 BLAKE2B c77959abef962ef6448baa6b882e3cdfb6873b8c4c19eb4043bcd53125cd2036984adc9713b642b1141e09182332bbd135ff9ebb3b99273ace1157d9d6e52227 SHA512 e5dfa1442d97d3d16fca7584d8f8979ad33d39e0d007b2ccf3068f65dc225974702884429e26e5b9eb25c0de6dc6651ae44377f435943f9ba09c3c1805763f7d
+AUX antimicro-2.23-no-compress-man-page.patch 443 BLAKE2B 7bc8db24413c9870f5d38ed0b75a97c15f31aada47a3b9ab6f70b2d57550c5e5092384f5fe6392b66c78ea14d8774348f6d11176901d97bd1bab4ac15a408837 SHA512 3aba1a14c28febcd127dce7aa6d9184f4d23003bd7a99a4daf646bcb4c7cbe95a1962efd8f362ea7d05297365b3a850a604187dd529ba1c95781c102fd050573
 DIST antimicro-2.23.tar.gz 1157299 BLAKE2B 4577588414f3145f5e6a817160214d6f2d0fc3cc3c9dda456173c42586247420f413785b7ca26b9d02397fb970e005c386675a478fd07330d5b13683094f28ab SHA512 cd58b5a9771d35fc937306a3452e8776ef754bb5a4fa44aeedb735d8366a38b318c1bf14f105bf8003e4264c35f129224becdade32d2a7b61067ec5a705a1e7e
-EBUILD antimicro-2.23.ebuild 1080 BLAKE2B a448fb8996b8314d1c003652a5881b39f04da503e8e3e7d005c4f7079af8d3c2edc08c01a8448d3db65a978e197a351696de521eed3308c4932c4a05d563f0c0 SHA512 e8aed948e266392cc2698c68bc3c33703115776294d5fcac043c268ede38a87f279640874ba31187cf26e2efcd83037de7798168f5e489c594da4b9c7bfa7b33
+EBUILD antimicro-2.23.ebuild 1067 BLAKE2B 8d3293624ff524a39b5965f61c552ed224dcda6adf661bf82a71318a97aa34de6aec4265dc75e41946988a2927ca79bc4a77013822f80f15f95610e4378df4b8 SHA512 41128a18d59ae99308ef2b7422bfa8ac00b9d1618f6f67ce62535b5715dc0d3018d352be679d4d61164f4c6ddc581429377adda1327f8908c9f83a8d75e91ba0
 MISC metadata.xml 336 BLAKE2B 356b2f4e6c4e30467d1d84264432d49a2bc60d6dcfdde3f7e019c8191b91d2f105016832990d188cfa0451509c88b543a7f5f0b99a843295dd92d1d838268ce8 SHA512 6df67abd609cd6d4e29875695481bca8857c6a1d1c8f4803c40d584cacd47a46ed3f9fdaa6a7369950a795ce07cc61ad47fa096ea35a463a6594916ae52a4968
diff --git a/games-util/antimicro/antimicro-2.23.ebuild b/games-util/antimicro/antimicro-2.23.ebuild
index 62d39364b1de..1363ec031a9d 100644
--- a/games-util/antimicro/antimicro-2.23.ebuild
+++ b/games-util/antimicro/antimicro-2.23.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg
 
 DESCRIPTION="Map keyboard and mouse buttons to gamepad buttons"
 HOMEPAGE="https://github.com/AntiMicro/antimicro"
@@ -12,7 +12,6 @@ SRC_URI="https://github.com/AntiMicro/antimicro/archive/${PV}.tar.gz -> ${P}.tar
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	dev-qt/qtcore:5
@@ -23,12 +22,22 @@ RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXtst
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig
 "
 
-PATCHES=( "${FILESDIR}/${P}-linking-errors.patch" )
+PATCHES=(
+	"${FILESDIR}"/${P}-linking-errors.patch
+	"${FILESDIR}"/${PN}-2.23-no-compress-man-page.patch
+	"${FILESDIR}"/${PN}-2.23-SDL2-include.patch
+)
+
+src_prepare() {
+	xdg_environment_reset
+	cmake_src_prepare
+}
 
 src_configure() {
 	# TODO: Currently does not build w/o X
@@ -40,15 +49,6 @@ src_configure() {
 		-DWITH_XTEST=ON
 		-DWITH_UINPUT=OFF
 	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
 
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
+	cmake_src_configure
 }
diff --git a/games-util/antimicro/files/antimicro-2.23-SDL2-include.patch b/games-util/antimicro/files/antimicro-2.23-SDL2-include.patch
new file mode 100644
index 000000000000..a71e9b4b862a
--- /dev/null
+++ b/games-util/antimicro/files/antimicro-2.23-SDL2-include.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/649242
+Thanks-to: Tim Barnes
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -585,6 +585,7 @@
+     endif(WITH_XTEST)
+ 
+     if(USE_SDL_2)
++        include_directories(${SDL2_INCLUDE_DIRS})
+         list(APPEND LIBS ${SDL2_LIBRARIES})
+     else()
+         list(APPEND LIBS ${SDL_LIBRARIES})
diff --git a/games-util/antimicro/files/antimicro-2.23-linking-errors.patch b/games-util/antimicro/files/antimicro-2.23-linking-errors.patch
index 88d03e876704..e62a8353c6ca 100644
--- a/games-util/antimicro/files/antimicro-2.23-linking-errors.patch
+++ b/games-util/antimicro/files/antimicro-2.23-linking-errors.patch
@@ -14,12 +14,6 @@ Starting with Qt 5.9.4, calling QT5_WRAP_CPP() disables the AUTOMOC property
 on the macro's input files, which means neither CMake's automoc
 infrastructure not QT5_WRAP_CPP()'s code were being used and we ended up
 with several 'undefined reference to vtable' errors when linking.
----
- CMakeLists.txt | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 63ef851..0e47889 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -499,7 +499,6 @@ if (UNIX)
diff --git a/games-util/antimicro/files/antimicro-2.23-no-compress-man-page.patch b/games-util/antimicro/files/antimicro-2.23-no-compress-man-page.patch
new file mode 100644
index 000000000000..7eebc42393f1
--- /dev/null
+++ b/games-util/antimicro/files/antimicro-2.23-no-compress-man-page.patch
@@ -0,0 +1,11 @@
+--- a/other/CMakeLists.txt
++++ b/other/CMakeLists.txt
+@@ -1,7 +1,3 @@
+ add_subdirectory(appdata)
+ 
+-add_custom_target(manpage)
+-add_custom_command(TARGET manpage PRE_BUILD
+-    COMMAND gzip -c "${PROJECT_SOURCE_DIR}/other/antimicro.1" > "antimicro.1.gz" VERBATIM
+-)
+-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/antimicro.1.gz" DESTINATION "share/man/man1")
++install(FILES "${PROJECT_SOURCE_DIR}/other/antimicro.1" DESTINATION "share/man/man1")