1 |
commit: 82ab9f319bbe8213c5a393703cfff7a2c88b328f |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 11 02:33:59 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 11 02:33:59 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82ab9f31 |
7 |
|
8 |
app-misc/klavaro: port to EAPI 7 |
9 |
|
10 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
app-misc/klavaro/files/klavaro-3.0.1-datadir.patch | 8 ++++---- |
14 |
.../files/klavaro-3.0.1-out-of-source.patch | 4 ++-- |
15 |
app-misc/klavaro/files/klavaro-3.0.1-static.patch | 4 ++-- |
16 |
.../klavaro/files/klavaro-desktop-keywords.patch | 4 ++-- |
17 |
app-misc/klavaro/klavaro-3.0.1.ebuild | 23 +++++++++++----------- |
18 |
5 files changed, 22 insertions(+), 21 deletions(-) |
19 |
|
20 |
diff --git a/app-misc/klavaro/files/klavaro-3.0.1-datadir.patch b/app-misc/klavaro/files/klavaro-3.0.1-datadir.patch |
21 |
index 21047a197cc..869d8238ea8 100644 |
22 |
--- a/app-misc/klavaro/files/klavaro-3.0.1-datadir.patch |
23 |
+++ b/app-misc/klavaro/files/klavaro-3.0.1-datadir.patch |
24 |
@@ -1,5 +1,5 @@ |
25 |
---- data/Makefile.am 2014-12-18 23:16:47.513887559 -0500 |
26 |
-+++ data/Makefile.am 2014-12-18 23:16:59.060609420 -0500 |
27 |
+--- a/data/Makefile.am |
28 |
++++ b/data/Makefile.am |
29 |
@@ -151,11 +151,11 @@ |
30 |
EXTRA_DIST = $(klavaro_data) |
31 |
else |
32 |
@@ -14,8 +14,8 @@ |
33 |
appdata_in_files = klavaro.appdata.xml.in |
34 |
appdata_DATA = $(appdata_in_files:.xml.in=.xml) |
35 |
DISTCLEANFILES = $(desktop_DATA) \ |
36 |
---- src/Makefile.am 2014-12-18 23:17:35.956725053 -0500 |
37 |
-+++ src/Makefile.am 2014-12-18 23:17:45.309501898 -0500 |
38 |
+--- a/src/Makefile.am |
39 |
++++ b/src/Makefile.am |
40 |
@@ -20,7 +20,7 @@ |
41 |
|
42 |
AM_CPPFLAGS = @GTK_CFLAGS@ \ |
43 |
|
44 |
diff --git a/app-misc/klavaro/files/klavaro-3.0.1-out-of-source.patch b/app-misc/klavaro/files/klavaro-3.0.1-out-of-source.patch |
45 |
index 5e4a9d48fbd..bade41bd666 100644 |
46 |
--- a/app-misc/klavaro/files/klavaro-3.0.1-out-of-source.patch |
47 |
+++ b/app-misc/klavaro/files/klavaro-3.0.1-out-of-source.patch |
48 |
@@ -1,5 +1,5 @@ |
49 |
---- src/Makefile.am 2014-09-05 10:26:56.000000000 -0400 |
50 |
-+++ src/Makefile.am 2014-12-18 21:27:55.443335860 -0500 |
51 |
+--- a/src/Makefile.am |
52 |
++++ b/src/Makefile.am |
53 |
@@ -29,7 +29,7 @@ |
54 |
|
55 |
klavaro_LDADD = @GTK_LIBS@ \ |
56 |
|
57 |
diff --git a/app-misc/klavaro/files/klavaro-3.0.1-static.patch b/app-misc/klavaro/files/klavaro-3.0.1-static.patch |
58 |
index 010cd11de00..8dea56970bf 100644 |
59 |
--- a/app-misc/klavaro/files/klavaro-3.0.1-static.patch |
60 |
+++ b/app-misc/klavaro/files/klavaro-3.0.1-static.patch |
61 |
@@ -1,5 +1,5 @@ |
62 |
---- gtkdatabox/Makefile.am 2014-12-18 21:26:18.129806730 -0500 |
63 |
-+++ gtkdatabox/Makefile.am 2014-12-18 21:26:30.528364491 -0500 |
64 |
+--- a/gtkdatabox/Makefile.am |
65 |
++++ b/gtkdatabox/Makefile.am |
66 |
@@ -1,4 +1,4 @@ |
67 |
-lib_LTLIBRARIES = libgtkdataboks.la |
68 |
+noinst_LTLIBRARIES = libgtkdataboks.la |
69 |
|
70 |
diff --git a/app-misc/klavaro/files/klavaro-desktop-keywords.patch b/app-misc/klavaro/files/klavaro-desktop-keywords.patch |
71 |
index fbf39ab954b..5d497480e86 100644 |
72 |
--- a/app-misc/klavaro/files/klavaro-desktop-keywords.patch |
73 |
+++ b/app-misc/klavaro/files/klavaro-desktop-keywords.patch |
74 |
@@ -1,5 +1,5 @@ |
75 |
---- data/klavaro.desktop.in 2015-01-07 21:52:37.877646655 -0500 |
76 |
-+++ data/klavaro.desktop.in 2015-01-07 21:52:56.391720366 -0500 |
77 |
+--- a/data/klavaro.desktop.in |
78 |
++++ b/data/klavaro.desktop.in |
79 |
@@ -2,7 +2,7 @@ |
80 |
Name=Klavaro |
81 |
_Comment=A very flexible and efficient touch typing tutor. |
82 |
|
83 |
diff --git a/app-misc/klavaro/klavaro-3.0.1.ebuild b/app-misc/klavaro/klavaro-3.0.1.ebuild |
84 |
index 41246e2a5e5..a3d9834df2f 100644 |
85 |
--- a/app-misc/klavaro/klavaro-3.0.1.ebuild |
86 |
+++ b/app-misc/klavaro/klavaro-3.0.1.ebuild |
87 |
@@ -1,22 +1,19 @@ |
88 |
-# Copyright 1999-2020 Gentoo Authors |
89 |
+# Copyright 1999-2021 Gentoo Authors |
90 |
# Distributed under the terms of the GNU General Public License v2 |
91 |
|
92 |
-EAPI=5 |
93 |
+EAPI=7 |
94 |
|
95 |
-AUTOTOOLS_AUTORECONF=yes |
96 |
- |
97 |
-inherit autotools-utils versionator |
98 |
- |
99 |
-MY_P="${PN}-$(delete_version_separator 2)" |
100 |
+inherit autotools |
101 |
|
102 |
+MY_P="${PN}-$(ver_rs 2 '')" |
103 |
DESCRIPTION="Another free touch typing tutor program" |
104 |
HOMEPAGE="http://klavaro.sourceforge.net/" |
105 |
SRC_URI="mirror://sourceforge/project/${PN}/${MY_P}.tar.bz2" |
106 |
+S="${WORKDIR}"/${MY_P} |
107 |
|
108 |
LICENSE="GPL-3" |
109 |
SLOT="0" |
110 |
KEYWORDS="amd64 x86" |
111 |
-IUSE="" |
112 |
|
113 |
RDEPEND=" |
114 |
net-misc/curl |
115 |
@@ -31,13 +28,17 @@ DEPEND="${RDEPEND} |
116 |
dev-util/intltool |
117 |
>=sys-devel/gettext-0.18.3 |
118 |
dev-util/gtk-builder-convert |
119 |
- " |
120 |
+" |
121 |
|
122 |
PATCHES=( |
123 |
"${FILESDIR}"/${P}-out-of-source.patch |
124 |
"${FILESDIR}"/${P}-static.patch |
125 |
"${FILESDIR}"/${P}-datadir.patch |
126 |
"${FILESDIR}"/${PN}-desktop-keywords.patch |
127 |
- ) |
128 |
+) |
129 |
|
130 |
-S="${WORKDIR}"/${MY_P} |
131 |
+src_prepare() { |
132 |
+ default |
133 |
+ |
134 |
+ eautoreconf |
135 |
+} |