[gentoo-commits] repo/gentoo:master commit in: games-util/antimicro/files/

2021-04-05 Thread Sam James
commit: 8e968d484cff13ba399890008210bece0ca7bb6d
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr  5 23:42:12 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr  5 23:42:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e968d48

games-util/antimicro: remove patch cruft

Signed-off-by: Sam James  gentoo.org>

 games-util/antimicro/files/antimicro-2.23-linking-errors.patch  | 6 --
 .../antimicro/files/antimicro-2.23-no-compress-man-page.patch   | 2 --
 2 files changed, 8 deletions(-)

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 88d03e87670..e62a8353c6c 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
index b18e6f2dfb4..7eebc42393f 100644
--- 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
@@ -1,5 +1,3 @@
-diff --git a/other/CMakeLists.txt b/other/CMakeLists.txt
-index bb8977b..3e7ebe7 100644
 --- a/other/CMakeLists.txt
 +++ b/other/CMakeLists.txt
 @@ -1,7 +1,3 @@



[gentoo-commits] repo/gentoo:master commit in: games-util/antimicro/files/, games-util/antimicro/

2021-04-05 Thread Sam James
commit: 34d19240e2fde41dd63ac28cf2b86c4ada24f3fc
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr  5 23:17:27 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr  5 23:24:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34d19240

games-util/antimicro: port to cmake.eclass (cmake-utils--), fix compressed man

Closes: https://bugs.gentoo.org/750518
Signed-off-by: Sam James  gentoo.org>

 games-util/antimicro/antimicro-2.23.ebuild | 31 +++---
 .../antimicro-2.23-no-compress-man-page.patch  | 13 +
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/games-util/antimicro/antimicro-2.23.ebuild 
b/games-util/antimicro/antimicro-2.23.ebuild
index 62d39364b1d..13efec5688b 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,21 @@ 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
+)
+
+src_prepare() {
+   xdg_environment_reset
+   cmake_src_prepare
+}
 
 src_configure() {
# TODO: Currently does not build w/o X
@@ -40,15 +48,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-no-compress-man-page.patch 
b/games-util/antimicro/files/antimicro-2.23-no-compress-man-page.patch
new file mode 100644
index 000..b18e6f2dfb4
--- /dev/null
+++ b/games-util/antimicro/files/antimicro-2.23-no-compress-man-page.patch
@@ -0,0 +1,13 @@
+diff --git a/other/CMakeLists.txt b/other/CMakeLists.txt
+index bb8977b..3e7ebe7 100644
+--- 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")