gentoo resync : 21.12.2017

4 files changed, 43 insertions, 64 deletions

diff --git a/games-util/qjoypad/Manifest b/games-util/qjoypad/Manifest
index 0aff13abcb9e..b4c6b5147b6a 100644
--- a/games-util/qjoypad/Manifest
+++ b/games-util/qjoypad/Manifest
@@ -1,4 +1,3 @@
-AUX qjoypad-4.1.0-underlink.patch 248 BLAKE2B 5a907e32b983c956c775b02c1d5af19adab1bcfde8b268c69afe885c298fb259c5840219685a80a935cc6142710d20fc813d761e9d4dc727690bffd2af89d2fc SHA512 e2c81e08402afa6f06dc915b2bd16598248ac360617a5646f188d7fa2cd9b5a4f1ed88fe29cbd2b79a4eebfd7d4ca7f9c348d10bb515f68452b0941d4bdd6f6f
-DIST qjoypad-4.1.0.tar.gz 82306 BLAKE2B dbacfae302d07afc0e34d9c7d1511d7f0bc89accc7c58d673682434cca664232c7e5004302bf827bef6bc05d32e9a631d900ed6cdef0108a65b36328858b67dc SHA512 c14705aa24ead7c358dc2c82284ae5145df4eb041f47d4a017391346719b6330a8a1146e37ebd1f5d25d755385b611965b94b5835f9df0f6b2ef5e6a4ea3bc7b
-EBUILD qjoypad-4.1.0.ebuild 1055 BLAKE2B 72a9e55a004d33553b3f1a000c6737fb2dbe3a7551bf19bf6e45b6f47a8960eca5074f4cb557c9d6bc3d7a3f145cd1f64eadd8a726d62a248178c5ff54a39149 SHA512 0863e33e1273b0c2d18ac5f3ba54f5600dd1c866f59a5026b472d1e3cbf183855491b0dcdb96e844b49ef64f017cdad7afc9714c5206194373c42ae069d56fa4
+DIST qjoypad-4.3.0.tar.gz 89134 BLAKE2B f035ac024176e352f2c0f88f0677cb4f30e643f64fd2f1214808c0273b0db8cf0a8b133e216b39fddf0ed9717c3e18955357e459ff30c494176ea7cf979b6943 SHA512 99febfc67fff149c476fffeed47eddd9e626e448afcb179eadc8dbe071da42ac692d153f3f43419c4280265527f5e84ede72cb4d59ba574819f7755e3d090e51
+EBUILD qjoypad-4.3.0.ebuild 804 BLAKE2B cb9da358351406e3a373fc6f4c75dafb7cdfa2564443bd559a65a537c717d41091ab42e594ab596b63312898fa96325247080f4af3d8382d93f28a1f8b83bf41 SHA512 4db14b7feafcccd93137c29fc8aa5d30bcba55eec31dca54327068508232e5c464c4ab84ebf6bbafa58e1d81005f5449b43f8cff318f39e071076a3b5070e04e
 MISC metadata.xml 330 BLAKE2B 60b6d79e8bd61ce2911a3ca77273e844d36cad02c50e88d7c0cb67fd30181f237a0c763ae53c79fe29d4f03f4c4e5d7fd2122af6156c3ee28902c2821099faf4 SHA512 007937b334543dcc52d271b9dd594d167b9f003af545c346c81aab34cdfdf5e3f13a7dca30d67044d41d092539e7f9c589e6cd0a6c026b32ac2d7e7b321f2bb3
diff --git a/games-util/qjoypad/files/qjoypad-4.1.0-underlink.patch b/games-util/qjoypad/files/qjoypad-4.1.0-underlink.patch
deleted file mode 100644
index 8fde419546a7..000000000000
--- a/games-util/qjoypad/files/qjoypad-4.1.0-underlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qjoypad.pro.old	2011-06-22 06:54:06.001667461 +0200
-+++ qjoypad.pro	2011-06-22 06:56:17.580044446 +0200
-@@ -32,7 +32,7 @@
- 
- TEMPLATE = app
- INCLUDEPATH += .
--QMAKE_LIBS += -lXtst
-+QMAKE_LIBS += -lXtst -lm -lX11
- 
- # Input
- HEADERS += axis.h \
diff --git a/games-util/qjoypad/qjoypad-4.1.0.ebuild b/games-util/qjoypad/qjoypad-4.1.0.ebuild
deleted file mode 100644
index 5b05d7cec0d4..000000000000
--- a/games-util/qjoypad/qjoypad-4.1.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils qt4-r2
-
-DESCRIPTION="Translate gamepad/joystick input into key strokes/mouse actions in X"
-HOMEPAGE="http://qjoypad.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qjoypad/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	x11-libs/libXtst
-	dev-qt/qtgui:4"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/xextproto
-	x11-proto/xproto"
-
-S=${WORKDIR}/${P}/src
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-underlink.patch
-	# fixup the icon tray support (bug #436426)
-	sed -i \
-		-e '/^icons.extra/d' \
-		-e '/^icons/s:/qjoypad::' \
-		-e 's/icon24.png/qjoypad4-24x24.png/' \
-		-e 's/icon64.png/qjoypad4-64x64.png/' \
-		qjoypad.pro || die
-}
-
-src_configure() {
-	eqmake4 qjoypad.pro PREFIX=/usr DEVDIR=/dev/input
-}
-
-src_install() {
-	local i
-	dobin qjoypad
-	dodoc ../README.txt
-	cd ../icons
-	for i in *; do
-		newicon ${i} ${i/gamepad/qjoypad}
-	done
-	make_desktop_entry qjoypad QJoypad ${PN}4-64x64
-}
diff --git a/games-util/qjoypad/qjoypad-4.3.0.ebuild b/games-util/qjoypad/qjoypad-4.3.0.ebuild
new file mode 100644
index 000000000000..3f027a2a35af
--- /dev/null
+++ b/games-util/qjoypad/qjoypad-4.3.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils desktop
+
+DESCRIPTION="Translate gamepad/joystick input into key strokes/mouse actions in X"
+HOMEPAGE="https://github.com/panzi/qjoypad"
+SRC_URI="https://github.com/panzi/qjoypad/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	virtual/libudev
+	x11-libs/libxcb
+	x11-libs/libXtst
+"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+
+src_install() {
+	cmake-utils_src_install
+
+	local i
+	cd icons || die
+	for i in *.png; do
+		newicon ${i} ${i/gamepad/qjoypad}
+	done
+	make_desktop_entry ${PN} QJoypad ${PN}
+}