1 |
commit: f6ad7d8754c7f4cf9d871d78a191d3ba6f198b64 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jun 24 20:36:07 2020 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 24 20:38:57 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6ad7d87 |
7 |
|
8 |
x11-apps/xinput_calibrator: Port to EAPI 7 |
9 |
|
10 |
And drop IUSE=gtk since it depends on gtkmm:2.4. |
11 |
|
12 |
Closes: https://bugs.gentoo.org/421363 |
13 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
14 |
|
15 |
...-0.7.5-r1.ebuild => xinput_calibrator-0.7.5-r2.ebuild} | 15 +++++++-------- |
16 |
1 file changed, 7 insertions(+), 8 deletions(-) |
17 |
|
18 |
diff --git a/x11-apps/xinput_calibrator/xinput_calibrator-0.7.5-r1.ebuild b/x11-apps/xinput_calibrator/xinput_calibrator-0.7.5-r2.ebuild |
19 |
similarity index 71% |
20 |
rename from x11-apps/xinput_calibrator/xinput_calibrator-0.7.5-r1.ebuild |
21 |
rename to x11-apps/xinput_calibrator/xinput_calibrator-0.7.5-r2.ebuild |
22 |
index 79564888e2c..7a3d3101534 100644 |
23 |
--- a/x11-apps/xinput_calibrator/xinput_calibrator-0.7.5-r1.ebuild |
24 |
+++ b/x11-apps/xinput_calibrator/xinput_calibrator-0.7.5-r2.ebuild |
25 |
@@ -1,8 +1,8 @@ |
26 |
# Copyright 1999-2020 Gentoo Authors |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
|
29 |
-EAPI=5 |
30 |
-inherit autotools-utils flag-o-matic |
31 |
+EAPI=7 |
32 |
+inherit flag-o-matic |
33 |
|
34 |
DESCRIPTION="A generic touchscreen calibration program for X.Org" |
35 |
HOMEPAGE="https://www.freedesktop.org/wiki/Software/xinput_calibrator" |
36 |
@@ -11,21 +11,20 @@ SRC_URI="https://github.com/downloads/tias/${PN}/${P}.tar.gz" |
37 |
LICENSE="MIT" |
38 |
SLOT="0" |
39 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
40 |
-IUSE="gtk" |
41 |
+IUSE="" |
42 |
|
43 |
RDEPEND="x11-libs/libX11 |
44 |
x11-libs/libXext |
45 |
x11-libs/libXi |
46 |
- x11-libs/libXrandr |
47 |
- gtk? ( dev-cpp/gtkmm:2.4 )" |
48 |
+ x11-libs/libXrandr" |
49 |
DEPEND="${RDEPEND} |
50 |
x11-base/xorg-proto" |
51 |
|
52 |
src_configure() { |
53 |
append-cxxflags -std=c++11 #566594 |
54 |
|
55 |
- local myeconfargs=( |
56 |
- --with-gui=$(use gtk && echo "gtkmm" || echo "x11") |
57 |
+ local myconf=( |
58 |
+ --with-gui=x11 |
59 |
) |
60 |
- autotools-utils_src_configure |
61 |
+ econf "${myconf[@]}" |
62 |
} |