diff options
Diffstat (limited to 'app-misc')
5 files changed, 22 insertions, 21 deletions
diff --git a/app-misc/klavaro/files/klavaro-3.0.1-datadir.patch b/app-misc/klavaro/files/klavaro-3.0.1-datadir.patch index 21047a197ccb..869d8238ea89 100644 --- a/app-misc/klavaro/files/klavaro-3.0.1-datadir.patch +++ b/app-misc/klavaro/files/klavaro-3.0.1-datadir.patch @@ -1,5 +1,5 @@ ---- data/Makefile.am 2014-12-18 23:16:47.513887559 -0500 -+++ data/Makefile.am 2014-12-18 23:16:59.060609420 -0500 +--- a/data/Makefile.am ++++ b/data/Makefile.am @@ -151,11 +151,11 @@ EXTRA_DIST = $(klavaro_data) else @@ -14,8 +14,8 @@ appdata_in_files = klavaro.appdata.xml.in appdata_DATA = $(appdata_in_files:.xml.in=.xml) DISTCLEANFILES = $(desktop_DATA) \ ---- src/Makefile.am 2014-12-18 23:17:35.956725053 -0500 -+++ src/Makefile.am 2014-12-18 23:17:45.309501898 -0500 +--- a/src/Makefile.am ++++ b/src/Makefile.am @@ -20,7 +20,7 @@ AM_CPPFLAGS = @GTK_CFLAGS@ \ 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 index 5e4a9d48fbd1..bade41bd6664 100644 --- 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 @@ -1,5 +1,5 @@ ---- src/Makefile.am 2014-09-05 10:26:56.000000000 -0400 -+++ src/Makefile.am 2014-12-18 21:27:55.443335860 -0500 +--- a/src/Makefile.am ++++ b/src/Makefile.am @@ -29,7 +29,7 @@ klavaro_LDADD = @GTK_LIBS@ \ diff --git a/app-misc/klavaro/files/klavaro-3.0.1-static.patch b/app-misc/klavaro/files/klavaro-3.0.1-static.patch index 010cd11de005..8dea56970bf1 100644 --- a/app-misc/klavaro/files/klavaro-3.0.1-static.patch +++ b/app-misc/klavaro/files/klavaro-3.0.1-static.patch @@ -1,5 +1,5 @@ ---- gtkdatabox/Makefile.am 2014-12-18 21:26:18.129806730 -0500 -+++ gtkdatabox/Makefile.am 2014-12-18 21:26:30.528364491 -0500 +--- a/gtkdatabox/Makefile.am ++++ b/gtkdatabox/Makefile.am @@ -1,4 +1,4 @@ -lib_LTLIBRARIES = libgtkdataboks.la +noinst_LTLIBRARIES = libgtkdataboks.la diff --git a/app-misc/klavaro/files/klavaro-desktop-keywords.patch b/app-misc/klavaro/files/klavaro-desktop-keywords.patch index fbf39ab954be..5d497480e869 100644 --- a/app-misc/klavaro/files/klavaro-desktop-keywords.patch +++ b/app-misc/klavaro/files/klavaro-desktop-keywords.patch @@ -1,5 +1,5 @@ ---- data/klavaro.desktop.in 2015-01-07 21:52:37.877646655 -0500 -+++ data/klavaro.desktop.in 2015-01-07 21:52:56.391720366 -0500 +--- a/data/klavaro.desktop.in ++++ b/data/klavaro.desktop.in @@ -2,7 +2,7 @@ Name=Klavaro _Comment=A very flexible and efficient touch typing tutor. diff --git a/app-misc/klavaro/klavaro-3.0.1.ebuild b/app-misc/klavaro/klavaro-3.0.1.ebuild index 41246e2a5e58..a3d9834df2f7 100644 --- a/app-misc/klavaro/klavaro-3.0.1.ebuild +++ b/app-misc/klavaro/klavaro-3.0.1.ebuild @@ -1,22 +1,19 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -AUTOTOOLS_AUTORECONF=yes - -inherit autotools-utils versionator - -MY_P="${PN}-$(delete_version_separator 2)" +inherit autotools +MY_P="${PN}-$(ver_rs 2 '')" DESCRIPTION="Another free touch typing tutor program" HOMEPAGE="http://klavaro.sourceforge.net/" SRC_URI="mirror://sourceforge/project/${PN}/${MY_P}.tar.bz2" +S="${WORKDIR}"/${MY_P} LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" RDEPEND=" net-misc/curl @@ -31,13 +28,17 @@ DEPEND="${RDEPEND} dev-util/intltool >=sys-devel/gettext-0.18.3 dev-util/gtk-builder-convert - " +" PATCHES=( "${FILESDIR}"/${P}-out-of-source.patch "${FILESDIR}"/${P}-static.patch "${FILESDIR}"/${P}-datadir.patch "${FILESDIR}"/${PN}-desktop-keywords.patch - ) +) -S="${WORKDIR}"/${MY_P} +src_prepare() { + default + + eautoreconf +} |