[gentoo-commits] proj/gamerlay:master commit in: games-util/rejoystick/, games-util/qjoypad/, games-util/qjoypad/files/

[gentoo-commits] proj/gamerlay:master commit in: games-util/rejoystick/, games-util/qjoypad/, games-util/qjoypad/files/

[Vadim A. Misbakh-Soloviov]

commit:     eb38cc005b5bff118e0fe47d7148362ab84a57c4
Author:     Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Thu Aug 25 16:09:13 2016 +0000
Commit:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Thu Aug 25 16:09:13 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=eb38cc00

qjoypad,rejoystick: bump

 .../qjoypad/files/qjoypad-4.1.0-underlink.patch    | 11 +++++
 games-util/qjoypad/metadata.xml                    | 11 +++++
 games-util/qjoypad/qjoypad-4.3.0.ebuild            | 50 ++++++++++++++++++++++
 games-util/rejoystick/rejoystick-0.8.1.ebuild      | 35 +++++++++++----
 4 files changed, 99 insertions(+), 8 deletions(-)

diff --git a/games-util/qjoypad/files/qjoypad-4.1.0-underlink.patch b/games-util/qjoypad/files/qjoypad-4.1.0-underlink.patch
new file mode 100644
index 0000000..8fde419
--- /dev/null
+++ b/games-util/qjoypad/files/qjoypad-4.1.0-underlink.patch
@@ -0,0 +1,11 @@
+--- 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/metadata.xml b/games-util/qjoypad/metadata.xml
new file mode 100644
index 0000000..38b576b
--- /dev/null
+++ b/games-util/qjoypad/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+		<remote-id type="sourceforge">qjoypad</remote-id>
+	</upstream>
+</pkgmetadata>

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 0000000..9735942
--- /dev/null
+++ b/games-util/qjoypad/qjoypad-4.3.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils cmake-utils
+
+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 ~ppc ~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() {
+#	eqmake5 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/rejoystick/rejoystick-0.8.1.ebuild b/games-util/rejoystick/rejoystick-0.8.1.ebuild
index 3b592ab..0b59a45 100644
--- a/games-util/rejoystick/rejoystick-0.8.1.ebuild
+++ b/games-util/rejoystick/rejoystick-0.8.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
-EAPI="2"
+EAPI="6"
+
+inherit flag-o-matic
 
 DESCRIPTION="Program which translates gamepad/joystick input into key strokes/mouse actions in X"
 HOMEPAGE="http://rejoystick.sourceforge.net/"
@@ -13,15 +14,33 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="x11-libs/gtk+:2
+RDEPEND="
+	x11-libs/gtk+:2
+	x11-libs/gdk-pixbuf:2
 	x11-libs/libXtst
+	x11-libs/libX11
 	media-libs/libsdl[joystick]"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-src_configure() {
-	econf --disable-dependency-tracking
+src_prepare() {
+	# dirty hack
+	sed -r \
+		-e '/version.mk/s@\.\ version.mk@eval $(cat version.mk)@' \
+		-e '/^\t\tCFLAGS.*-s"$/s@-s@@' \
+		-e "/-O2/s@-O2@${CFLAGS}@g" \
+		-e '/INSTALL_STRIP_PROGRAM/s@-s@@' \
+		-i configure
+
+	sed -r \
+		-e '/^LIBS/s@$@ -lX11@' \
+		-i {,src/}Makefile.in
+	# /dirty hack
+
+	default
 }
-src_install() {
-	emake DESTDIR="${D}" install || die "emake failed"
+
+src_configure() {
+	append-cflags "-Wno-implicit-function-declaration"
+	econf --disable-dependency-tracking --with-x --with-pic
 }