gentoo resync : 25.08.2018

4 files changed, 97 insertions, 35 deletions

diff --git a/games-util/antimicro/Manifest b/games-util/antimicro/Manifest
index 8bbd4e2c0a7a..87bcfacffea3 100644
--- a/games-util/antimicro/Manifest
+++ b/games-util/antimicro/Manifest
@@ -1,3 +1,4 @@
-DIST antimicro-2.20.2.tar.gz 1069469 BLAKE2B 8507c4f46e3e016c54d6cc0081ad5e90a0473bd1b99c30e6ceb74804564fdde6cd4bcb4897be5ae06272ae0aa55f36976d91ee9b1d531fce2013dad81379c1bb SHA512 09847c804b6a1d022f2990d269c9124cfdfab821e0fd1cb1ab5e27e4c6a3bd250fab5977ca614f03c46456ca6e1c7111135b9b4d8f75e54c435e0b712653e282
-EBUILD antimicro-2.20.2.ebuild 707 BLAKE2B 9ed42f69bc1865cae0e080bcf4a5a319c55ed23ff1798b992670ac27f3e64e560f8472fd2502852af8f42801f5f1d03a71ccfe4fd6133b010a32b1481994e6fd SHA512 18e36314e3be0461d4b3c3b729953df70f354e4ee8c92054fbed1b57768dd42e03e7c1000403e02358c157cc8bc36ad3c5461db62880bcaba95d443751f9f7e9
+AUX antimicro-2.23-linking-errors.patch 1794 BLAKE2B 3af65cd406cb334a88df3721bb1b0f33e38839ac9f31a72ee3f37d7780406d3809ea34b2ae7c2ede3a86dcf6723daff1bdf84be927c6e601edc06f0dbf37453e SHA512 4733e02a00910ce19f7958930f5886e41eecbeccb4b2b3158596fcdb221256e5f7a6ba7086e934d750f812a9007b42d0b28ece51168cf039169ebb290e9ecfae
+DIST antimicro-2.23.tar.gz 1157299 BLAKE2B 4577588414f3145f5e6a817160214d6f2d0fc3cc3c9dda456173c42586247420f413785b7ca26b9d02397fb970e005c386675a478fd07330d5b13683094f28ab SHA512 cd58b5a9771d35fc937306a3452e8776ef754bb5a4fa44aeedb735d8366a38b318c1bf14f105bf8003e4264c35f129224becdade32d2a7b61067ec5a705a1e7e
+EBUILD antimicro-2.23.ebuild 1080 BLAKE2B a448fb8996b8314d1c003652a5881b39f04da503e8e3e7d005c4f7079af8d3c2edc08c01a8448d3db65a978e197a351696de521eed3308c4932c4a05d563f0c0 SHA512 e8aed948e266392cc2698c68bc3c33703115776294d5fcac043c268ede38a87f279640874ba31187cf26e2efcd83037de7798168f5e489c594da4b9c7bfa7b33
 MISC metadata.xml 336 BLAKE2B 356b2f4e6c4e30467d1d84264432d49a2bc60d6dcfdde3f7e019c8191b91d2f105016832990d188cfa0451509c88b543a7f5f0b99a843295dd92d1d838268ce8 SHA512 6df67abd609cd6d4e29875695481bca8857c6a1d1c8f4803c40d584cacd47a46ed3f9fdaa6a7369950a795ce07cc61ad47fa096ea35a463a6594916ae52a4968
diff --git a/games-util/antimicro/antimicro-2.20.2.ebuild b/games-util/antimicro/antimicro-2.20.2.ebuild
deleted file mode 100644
index c720d534fcee..000000000000
--- a/games-util/antimicro/antimicro-2.20.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils cmake-utils
-
-DESCRIPTION="Map keyboard and mouse buttons to gamepad buttons"
-HOMEPAGE="https://github.com/Ryochan7/antimicro"
-SRC_URI="https://github.com/Ryochan7/antimicro/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtnetwork:5
-	media-libs/libsdl2[X,joystick]
-	x11-libs/libX11
-	x11-libs/libXtst"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_SDL_2=ON
-	)
-
-	QT_SELECT=5 cmake-utils_src_configure
-}
diff --git a/games-util/antimicro/antimicro-2.23.ebuild b/games-util/antimicro/antimicro-2.23.ebuild
new file mode 100644
index 000000000000..62d39364b1de
--- /dev/null
+++ b/games-util/antimicro/antimicro-2.23.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils xdg-utils
+
+DESCRIPTION="Map keyboard and mouse buttons to gamepad buttons"
+HOMEPAGE="https://github.com/AntiMicro/antimicro"
+SRC_URI="https://github.com/AntiMicro/antimicro/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	media-libs/libsdl2[X,joystick]
+	x11-libs/libX11
+	x11-libs/libXtst
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${P}-linking-errors.patch" )
+
+src_configure() {
+	# TODO: Currently does not build w/o X
+	# (!X would be: -DWITH_XTEST=OFF -DWITH_UINPUT=ON)
+	local mycmakeargs=(
+		-DUSE_QT5=ON
+		-DUSE_SDL_2=ON
+		-DWITH_X11=ON
+		-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
+}
diff --git a/games-util/antimicro/files/antimicro-2.23-linking-errors.patch b/games-util/antimicro/files/antimicro-2.23-linking-errors.patch
new file mode 100644
index 000000000000..88d03e876704
--- /dev/null
+++ b/games-util/antimicro/files/antimicro-2.23-linking-errors.patch
@@ -0,0 +1,40 @@
+From d5cfe429edb8c5f6f039153a0f646f2198c06b16 Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
+Date: Mon, 29 Jan 2018 12:19:55 +0100
+Subject: [PATCH] cmake: Stop calling QT5_WRAP_CPP().
+
+The USE_QT5 code path already unconditionally sets CMAKE_AUTOMOC to on.
+
+Calling QT5_WRAP_CPP() used to be just redundant, as antimicro_HEADERS_MOC
+was never actually added as a source dependency of the antimicro target. In
+other words, CMake's own automoc infrastructure was actually being used and
+the moc invocations from QT5_WRAP_CPP() were not being made at all.
+
+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)
+         find_package(Qt5Network REQUIRED)
+         find_package(Qt5LinguistTools REQUIRED)
+ 
+-        QT5_WRAP_CPP(antimicro_HEADERS_MOC ${antimicro_HEADERS})
+         QT5_WRAP_UI(antimicro_FORMS_HEADERS ${antimicro_FORMS})
+         QT5_ADD_RESOURCES(antimicro_RESOURCES_RCC ${antimicro_RESOURCES})
+         add_subdirectory("share/antimicro/translations")
+@@ -550,7 +549,6 @@ elseif(WIN32)
+     find_package(Qt5Network REQUIRED)
+     find_package(Qt5LinguistTools REQUIRED)
+ 
+-    QT5_WRAP_CPP(antimicro_HEADERS_MOC ${antimicro_HEADERS})
+     QT5_WRAP_UI(antimicro_FORMS_HEADERS ${antimicro_FORMS})
+     QT5_ADD_RESOURCES(antimicro_RESOURCES_RCC ${antimicro_RESOURCES})
+     add_subdirectory("share/antimicro/translations")