From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1A52E1382C5 for ; Thu, 11 Feb 2021 02:44:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5E506E0AF0; Thu, 11 Feb 2021 02:44:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 35AD3E0AF0 for ; Thu, 11 Feb 2021 02:44:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DD8A7340EC4 for ; Thu, 11 Feb 2021 02:44:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BDF144C9 for ; Thu, 11 Feb 2021 02:44:05 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1613010839.82ab9f319bbe8213c5a393703cfff7a2c88b328f.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/klavaro/, app-misc/klavaro/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/klavaro/files/klavaro-3.0.1-datadir.patch app-misc/klavaro/files/klavaro-3.0.1-out-of-source.patch app-misc/klavaro/files/klavaro-3.0.1-static.patch app-misc/klavaro/files/klavaro-desktop-keywords.patch app-misc/klavaro/klavaro-3.0.1.ebuild X-VCS-Directories: app-misc/klavaro/ app-misc/klavaro/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 82ab9f319bbe8213c5a393703cfff7a2c88b328f X-VCS-Branch: master Date: Thu, 11 Feb 2021 02:44:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 87d0b2f7-3d3f-44ac-9769-f50db2d133c6 X-Archives-Hash: 6e5270d3cf2670cc18edd4f49ee6f44b commit: 82ab9f319bbe8213c5a393703cfff7a2c88b328f Author: Sam James gentoo org> AuthorDate: Thu Feb 11 02:33:59 2021 +0000 Commit: Sam James gentoo org> CommitDate: Thu Feb 11 02:33:59 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82ab9f31 app-misc/klavaro: port to EAPI 7 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> app-misc/klavaro/files/klavaro-3.0.1-datadir.patch | 8 ++++---- .../files/klavaro-3.0.1-out-of-source.patch | 4 ++-- app-misc/klavaro/files/klavaro-3.0.1-static.patch | 4 ++-- .../klavaro/files/klavaro-desktop-keywords.patch | 4 ++-- app-misc/klavaro/klavaro-3.0.1.ebuild | 23 +++++++++++----------- 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 21047a197cc..869d8238ea8 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 5e4a9d48fbd..bade41bd666 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 010cd11de00..8dea56970bf 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 fbf39ab954b..5d497480e86 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 41246e2a5e5..a3d9834df2f 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 +}