Gentoo Archives: gentoo-commits

From: "Vadim A. Misbakh-Soloviov" <mva@×××.name>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gamerlay:master commit in: games-util/rejoystick/, games-util/qjoypad/, games-util/qjoypad/files/
Date: Thu, 25 Aug 2016 16:09:52
Message-Id: 1472141353.eb38cc005b5bff118e0fe47d7148362ab84a57c4.mva@gentoo
1 commit: eb38cc005b5bff118e0fe47d7148362ab84a57c4
2 Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
3 AuthorDate: Thu Aug 25 16:09:13 2016 +0000
4 Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
5 CommitDate: Thu Aug 25 16:09:13 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=eb38cc00
7
8 qjoypad,rejoystick: bump
9
10 .../qjoypad/files/qjoypad-4.1.0-underlink.patch | 11 +++++
11 games-util/qjoypad/metadata.xml | 11 +++++
12 games-util/qjoypad/qjoypad-4.3.0.ebuild | 50 ++++++++++++++++++++++
13 games-util/rejoystick/rejoystick-0.8.1.ebuild | 35 +++++++++++----
14 4 files changed, 99 insertions(+), 8 deletions(-)
15
16 diff --git a/games-util/qjoypad/files/qjoypad-4.1.0-underlink.patch b/games-util/qjoypad/files/qjoypad-4.1.0-underlink.patch
17 new file mode 100644
18 index 0000000..8fde419
19 --- /dev/null
20 +++ b/games-util/qjoypad/files/qjoypad-4.1.0-underlink.patch
21 @@ -0,0 +1,11 @@
22 +--- qjoypad.pro.old 2011-06-22 06:54:06.001667461 +0200
23 ++++ qjoypad.pro 2011-06-22 06:56:17.580044446 +0200
24 +@@ -32,7 +32,7 @@
25 +
26 + TEMPLATE = app
27 + INCLUDEPATH += .
28 +-QMAKE_LIBS += -lXtst
29 ++QMAKE_LIBS += -lXtst -lm -lX11
30 +
31 + # Input
32 + HEADERS += axis.h \
33
34 diff --git a/games-util/qjoypad/metadata.xml b/games-util/qjoypad/metadata.xml
35 new file mode 100644
36 index 0000000..38b576b
37 --- /dev/null
38 +++ b/games-util/qjoypad/metadata.xml
39 @@ -0,0 +1,11 @@
40 +<?xml version="1.0" encoding="UTF-8"?>
41 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
42 +<pkgmetadata>
43 + <maintainer type="project">
44 + <email>games@g.o</email>
45 + <name>Gentoo Games Project</name>
46 + </maintainer>
47 + <upstream>
48 + <remote-id type="sourceforge">qjoypad</remote-id>
49 + </upstream>
50 +</pkgmetadata>
51
52 diff --git a/games-util/qjoypad/qjoypad-4.3.0.ebuild b/games-util/qjoypad/qjoypad-4.3.0.ebuild
53 new file mode 100644
54 index 0000000..9735942
55 --- /dev/null
56 +++ b/games-util/qjoypad/qjoypad-4.3.0.ebuild
57 @@ -0,0 +1,50 @@
58 +# Copyright 1999-2016 Gentoo Foundation
59 +# Distributed under the terms of the GNU General Public License v2
60 +
61 +EAPI=6
62 +inherit eutils cmake-utils
63 +
64 +DESCRIPTION="Translate gamepad/joystick input into key strokes/mouse actions in X"
65 +HOMEPAGE="https://github.com/panzi/qjoypad"
66 +SRC_URI="https://github.com/panzi/qjoypad/archive/v${PV}.tar.gz -> ${P}.tar.gz"
67 +
68 +LICENSE="GPL-2"
69 +SLOT="0"
70 +KEYWORDS="~amd64 ~ppc ~x86"
71 +IUSE=""
72 +
73 +RDEPEND="
74 + x11-libs/libXtst
75 + dev-qt/qtgui:4"
76 +DEPEND="${RDEPEND}
77 + x11-proto/inputproto
78 + x11-proto/xextproto
79 + x11-proto/xproto"
80 +
81 +#S=${WORKDIR}/${P}/src
82 +
83 +#src_prepare() {
84 +# epatch "${FILESDIR}"/${P}-underlink.patch
85 +# # fixup the icon tray support (bug #436426)
86 +# sed -i \
87 +# -e '/^icons.extra/d' \
88 +# -e '/^icons/s:/qjoypad::' \
89 +# -e 's/icon24.png/qjoypad4-24x24.png/' \
90 +# -e 's/icon64.png/qjoypad4-64x64.png/' \
91 +# qjoypad.pro || die
92 +#}
93 +
94 +#src_configure() {
95 +# eqmake5 qjoypad.pro PREFIX=/usr DEVDIR=/dev/input
96 +#}
97 +
98 +#src_install() {
99 +# local i
100 +# dobin qjoypad
101 +# dodoc ../README.txt
102 +# cd ../icons
103 +# for i in *; do
104 +# newicon ${i} ${i/gamepad/qjoypad}
105 +# done
106 +# make_desktop_entry qjoypad QJoypad ${PN}4-64x64
107 +#}
108
109 diff --git a/games-util/rejoystick/rejoystick-0.8.1.ebuild b/games-util/rejoystick/rejoystick-0.8.1.ebuild
110 index 3b592ab..0b59a45 100644
111 --- a/games-util/rejoystick/rejoystick-0.8.1.ebuild
112 +++ b/games-util/rejoystick/rejoystick-0.8.1.ebuild
113 @@ -1,8 +1,9 @@
114 -# Copyright 1999-2009 Gentoo Foundation
115 +# Copyright 1999-2016 Gentoo Foundation
116 # Distributed under the terms of the GNU General Public License v2
117 -# $Header: $
118
119 -EAPI="2"
120 +EAPI="6"
121 +
122 +inherit flag-o-matic
123
124 DESCRIPTION="Program which translates gamepad/joystick input into key strokes/mouse actions in X"
125 HOMEPAGE="http://rejoystick.sourceforge.net/"
126 @@ -13,15 +14,33 @@ SLOT="0"
127 KEYWORDS="~amd64 ~x86"
128 IUSE=""
129
130 -RDEPEND="x11-libs/gtk+:2
131 +RDEPEND="
132 + x11-libs/gtk+:2
133 + x11-libs/gdk-pixbuf:2
134 x11-libs/libXtst
135 + x11-libs/libX11
136 media-libs/libsdl[joystick]"
137 DEPEND="${RDEPEND}
138 dev-util/pkgconfig"
139
140 -src_configure() {
141 - econf --disable-dependency-tracking
142 +src_prepare() {
143 + # dirty hack
144 + sed -r \
145 + -e '/version.mk/s@\.\ version.mk@eval $(cat version.mk)@' \
146 + -e '/^\t\tCFLAGS.*-s"$/s@-s@@' \
147 + -e "/-O2/s@-O2@${CFLAGS}@g" \
148 + -e '/INSTALL_STRIP_PROGRAM/s@-s@@' \
149 + -i configure
150 +
151 + sed -r \
152 + -e '/^LIBS/s@$@ -lX11@' \
153 + -i {,src/}Makefile.in
154 + # /dirty hack
155 +
156 + default
157 }
158 -src_install() {
159 - emake DESTDIR="${D}" install || die "emake failed"
160 +
161 +src_configure() {
162 + append-cflags "-Wno-implicit-function-declaration"
163 + econf --disable-dependency-tracking --with-x --with-pic
164 }