gentoo auto-resync : 15:09:2022 - 23:13:44

7 files changed, 2 insertions, 97 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index b817dee6f327..b59fd2574fb8 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/klavaro/Manifest b/app-misc/klavaro/Manifest
index 7d441223ea64..5076093b7f8f 100644
--- a/app-misc/klavaro/Manifest
+++ b/app-misc/klavaro/Manifest
@@ -1,11 +1,6 @@
-AUX klavaro-3.0.1-datadir.patch 860 BLAKE2B c30fc29835a4cc2d5c38d2be9a6a836d6c2b762128ca8d6c9a44800d6a89cc6ac46d6bf4c0251bac14e24ea96e636eff28025e7570aa9576da6bc23fd63934cd SHA512 85c06039f4f84eff348b7dabbf6a2eaabd29c7217f608eb77cc38a17cacc13bad4afb676f19f7e08297428f543b094c9a89c7c4a465d680b5334b818f4918410
-AUX klavaro-3.0.1-out-of-source.patch 266 BLAKE2B 7244226db930cabc35bd29e6e6f1a4d84ee65c57576b7d04433f970b03d0b237eee919aefa271fdc5ccb856beca79504786fa8198a4bd3cb6936f45d05ff7ac6 SHA512 74cc5a686a2db2c5b0170b763e13861171c5ebf696b8717a6ca091f9512cb71397c14e7ae41a7ccaa09ed7f4a4e7805926d5f37eaa67ce827787b0326265250b
-AUX klavaro-3.0.1-static.patch 227 BLAKE2B 8ed9f3ee511784c75248a1cb14a06ce09e7a8fdb0b69bb9067cf8afecf225c059915eddb04aaf01a0f305f3f51e6d020b635e2942237c6d76742ad9408338f69 SHA512 30b76f6454302527d043bf3d29b97ac65cdd17bac48d394ce5b9f7c391a9640a976a54ca066b301f23a5f78b200641072513cb4f5eee5a89ac24510fa5b84104
 AUX klavaro-3.13-datadir.patch 514 BLAKE2B 0e3b3080d211634269588006e46d949b980144b837dc0a3d57fbe663dd7c63d866f7985035629155e76aabae30c451262c8260134225320ffaccf6d31ad8e34d SHA512 5b8707459ebd372834e65edb9497505823970c798fd4a1e6fedf10dd3d37c55f43ad249288b6ab012732a940a9df2e0a58d1c4915de71c984e0d8ff3a36c6271
 AUX klavaro-3.13-desktop-keywords.patch 4364 BLAKE2B 080e88df774c9e29826a1c7e7b7fbcadc96ba06e17ce29b858ec1161f0b11cea1bed84cfea8bd36a19576ed0e3c6894ded9fa9cb2598c376bb0f9981d4cc63f2 SHA512 96b1213c39b5258fef6f7a8adbbcaf1b815a2cb71d55481a7196a8eaf3dcd141c248b57f4586d036381ab1af1234f9606a15e5b91f9f6245bee04cf0b8cf9476
 AUX klavaro-desktop-keywords.patch 420 BLAKE2B 14dea4731492e2c728517053c3c9a15c99e8bca0d36f25d23a6e7dbc9a54e59b5878100ae8924ae78740ff2e7ceb4cbffae1c968eeff8039fb9f539329fd0073 SHA512 f526da8a40a7de95564f9a8edf4176b043aeb3b5ee600691f66ca27a820da1d2f0d87b6c4da45b8a3a3009aeb440a1a24a65f728174ea079e6712e08c3fe5606
-DIST klavaro-3.01.tar.bz2 1140146 BLAKE2B fcd26cc6dfabd7ae0147fc279361a890ab928e42e02837a3322eae51fc6e959b02896ce789fae6a10b2f600eeb026c45955571d5264a29950cc7183eeb22a4cf SHA512 5d58269867d2b39309e07ca9dd6c525d67acaca93dea0010332e39e8f3dd444070dbc75abad00ac4ca3fd4155f41cf871cb8ccee3dc332aa31f85c8b17d7c48b
 DIST klavaro-3.13.tar.bz2 1237015 BLAKE2B f6cf83005217e924ff1ea9a596d1154a3225298142722eb51609411f74444d73cb5d4a98fc11634185c3ca857b566d33396c841cb40f925e2d84b7180c357c57 SHA512 17765be33305a722f8d23006353c5de812075decc7931c596bd8c7efe2d93657687847f007adb4e7f758a535fd3cded36581fd1e9f5b4af7d6d3b441b7245b36
-EBUILD klavaro-3.0.1-r1.ebuild 796 BLAKE2B 768ddb51a9f83dd152420c80ced8083364a396620849ddbc4a5d1011f432c9f26b32f3e2459559289638dda7a374cfd012aceaa0b39288f86c476ffa0bd457c0 SHA512 d322a9b5cbf6ad30e7df6ebeff2098da5bd63da86fde85bc4d3c497826ee4c328ef3a745bc808cd244c5b686f992a4405314350579cab676918c5fb4ec99cd7e
-EBUILD klavaro-3.13-r1.ebuild 945 BLAKE2B 84b9812a281c87a8d6d7911a348699cb65aa3e7d859e58c55c6f7a8bcb843906e420a32b50cc214c8e6064fcc1149856a7933e4b38ee0d6ce0325a10e358fc28 SHA512 9b6de04c697efa9bae3ef072bf1872976bcc1ce25c53a61312c7cc770b2ac931d5b274bc166380b5575f4b11646343b423c625e847f8911fb0b7c0cd0a6cd37b
+EBUILD klavaro-3.13-r1.ebuild 943 BLAKE2B 6d19aa558607a3733c4ec49b9f7929e4a33252e42fcdd45ae172e43eed3ec0f44a936bcd3d464c0f25506798c4c2bf1c2123aa2390e5f7ce772304c7d4f1fc03 SHA512 49778c08d8c2b542bd6b116bdc2ea7d47b905ecc8414c5d3b72dd600cf58c5148a5e874b2f1a3b2ee9462e8dd67a1ae72e2ce1132517fdb1683b007dc95dfb38
 MISC metadata.xml 245 BLAKE2B a4b272a16070570fe0ba833073cc83891b08d2ec1123961e384d4b5e1cdb945b466da642243ff3197d71fbfa784cdc0f1ad07b906056f8f4618549df6f7a08d7 SHA512 94dab4934d91e76395edcdba99cdc609a3c658d5b72d524a427389f496dc391fb4ff5351b2984c96d2283c64c4090e27a0277efe60dab5a19f8aabd10e51e255
diff --git a/app-misc/klavaro/files/klavaro-3.0.1-datadir.patch b/app-misc/klavaro/files/klavaro-3.0.1-datadir.patch
deleted file mode 100644
index 869d8238ea89..000000000000
--- a/app-misc/klavaro/files/klavaro-3.0.1-datadir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/data/Makefile.am
-+++ b/data/Makefile.am
-@@ -151,11 +151,11 @@
- EXTRA_DIST = $(klavaro_data)
- else
- @INTLTOOL_DESKTOP_RULE@
--desktopdir = $(prefix)/$(DATADIRNAME)/applications
-+desktopdir = $(datadir)/applications
- desktop_in_file = klavaro.desktop.in
- desktop_DATA = $(desktop_in_file:.desktop.in=.desktop)
- @INTLTOOL_XML_RULE@
--appdatadir = $(prefix)/$(DATADIRNAME)/appdata
-+appdatadir = $(datadir)/appdata
- appdata_in_files = klavaro.appdata.xml.in
- appdata_DATA = $(appdata_in_files:.xml.in=.xml)
- DISTCLEANFILES = $(desktop_DATA) \
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -20,7 +20,7 @@
- 
- AM_CPPFLAGS = @GTK_CFLAGS@ \
- 	      -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
--	      -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
-+	      -DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\"
- 
- AM_CFLAGS = -Wextra \
- 	    -I$(top_srcdir)/gtkdatabox
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
deleted file mode 100644
index bade41bd6664..000000000000
--- a/app-misc/klavaro/files/klavaro-3.0.1-out-of-source.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -29,7 +29,7 @@
- 
- klavaro_LDADD = @GTK_LIBS@ \
- 		-lgmodule-2.0 \
--	       	$(top_srcdir)/gtkdatabox/libgtkdataboks.la
-+	       	$(top_builddir)/gtkdatabox/libgtkdataboks.la
- 
- if IS_POSIX
- AM_CFLAGS += -export-dynamic
diff --git a/app-misc/klavaro/files/klavaro-3.0.1-static.patch b/app-misc/klavaro/files/klavaro-3.0.1-static.patch
deleted file mode 100644
index 8dea56970bf1..000000000000
--- a/app-misc/klavaro/files/klavaro-3.0.1-static.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/gtkdatabox/Makefile.am
-+++ b/gtkdatabox/Makefile.am
-@@ -1,4 +1,4 @@
--lib_LTLIBRARIES		= libgtkdataboks.la
-+noinst_LTLIBRARIES		= libgtkdataboks.la
- libgtkdataboks_la_SOURCES= \
- 			gtkdatabox.c\
- 			gtkdatabox_marshal.c\
diff --git a/app-misc/klavaro/klavaro-3.0.1-r1.ebuild b/app-misc/klavaro/klavaro-3.0.1-r1.ebuild
deleted file mode 100644
index e30b2929d8ed..000000000000
--- a/app-misc/klavaro/klavaro-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P="${PN}-$(ver_rs 2 '')"
-DESCRIPTION="Another free touch typing tutor program"
-HOMEPAGE="https://klavaro.sourceforge.io/"
-SRC_URI="mirror://sourceforge/project/${PN}/${MY_P}.tar.bz2"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	dev-util/intltool
-	>=sys-devel/gettext-0.18.3
-"
-RDEPEND="
-	net-misc/curl
-	x11-libs/cairo
-	x11-libs/gtk+:3
-	x11-libs/pango
-"
-# gtk+3 version needed
-#	x11-libs/gtkdatabox
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-out-of-source.patch
-	"${FILESDIR}"/${P}-static.patch
-	"${FILESDIR}"/${P}-datadir.patch
-	"${FILESDIR}"/${PN}-desktop-keywords.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
diff --git a/app-misc/klavaro/klavaro-3.13-r1.ebuild b/app-misc/klavaro/klavaro-3.13-r1.ebuild
index 8314937d582c..182aa6990121 100644
--- a/app-misc/klavaro/klavaro-3.13-r1.ebuild
+++ b/app-misc/klavaro/klavaro-3.13-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	dev-util/intltool