gentoo resync : 16.09.2020

4 files changed, 64 insertions, 14 deletions

diff --git a/app-i18n/libskk/Manifest b/app-i18n/libskk/Manifest
index fe515d78cdc0..178db0ef8683 100644
--- a/app-i18n/libskk/Manifest
+++ b/app-i18n/libskk/Manifest
@@ -1,3 +1,5 @@
 DIST libskk-1.0.2.tar.gz 867572 BLAKE2B 32f599e83bf7ced796d2f37f6f4bf5e45f47c90e144784b7b3e082866cc619a26e3aca4f16051685baa4d8ac54b0462930193f978bc1e8220b378679269c5833 SHA512 f8fff94b216c18f66bf1004ee068f8d737177f1b70ac36d054d9a68ce02ba9b8d1b7b4127d9a330f64054b2fe06f352070c750a3562d4be36fecf20cb854e6c0
-EBUILD libskk-1.0.2.ebuild 970 BLAKE2B 0f32293b6de350ef5520297717534a513a733886916ca04bb734a0e7a64fa6e3737955c4d6cafe3d59c67913c7e99cba777a9acde8c1b3a1213af555de8ef84a SHA512 59036b59358024d1b7fe583c59b6b7fdb9638678d91dfd7ec6c168079b79b08571e444d4aab8d54d52a32c3260aa594d7d7f66f5730a5b3e8ca8934d3c67a590
-MISC metadata.xml 320 BLAKE2B d8aac0823caa1962d5f1219492766ddec90fc92728b0f9f6f802d8f98d4d1c4cce00d3f6e688faf43729e8872f981582d9bbd586fcdc1cbf82aa7d54cd759d78 SHA512 a62e6d05067067cbcae666b635047834bca3c4ca7a4b217ffb20ace08fb05ba8917d8f413319a0ebe14d54c9fdf803c247644da9b22764335f5e9fc41529f67d
+DIST libskk-1.0.5.tar.xz 564488 BLAKE2B e7108bd2f44e5a0a0756cd25da4b07376b36604d6d2159b283e8a5f4ef76006210ff993d58b653cbce01ae4c9e003acf4acbd93ebc40711fec2600e514c49e9f SHA512 6db675edba89b83da0c29afb42644c39bcb0ccfc47f067a18e0eda817df4f58a86c86e8747080018c132d8734754a6fd8a30fe6578050eb93ff636edeed534ab
+EBUILD libskk-1.0.2.ebuild 1003 BLAKE2B 07baeb3e83de3b216fc0907650ab26c1fc4b27e4716e491c69f5fd7efd1d7ffbfc1a4af31fb65acd9427fdb76ed95cf0ed5cdce7a011718238409aff10ab7e39 SHA512 47b42411854c92f92e33539bd98d40b6ce021d1eb3f541c506cbd9c0020c65ec95e0d4345733c6c0ab9bb6ea3ce94cde9af6970b02d85ea476348e6688ad3c7c
+EBUILD libskk-1.0.5.ebuild 1009 BLAKE2B 2aa468ec81a2e21308128f5cd7d7040e7a94641a1b2dd4d05eeddfb1542ffafc73fd1c2cadc9282c07dc5408029a109324a35ab7c413c4cfd00ff265df7ba6ef SHA512 a3020515616d84e13604803a7d4c29f1b05ee337945e26f14e9a771cae2588c2761483bfaa1ed98280bde890513a805c817f8c21b69002b58b6558dfe58fe870
+MISC metadata.xml 310 BLAKE2B 5591da5bdb083505412172e1f9aab4b34554ad28101e40bf63a2ad1ab3160a5eb4e7246d507edbfff61ce57939445c4148a1a0390837cdffa19f17024f87a34d SHA512 dc3b62a6475657da51c53e59d48611ff3bfd1c779c20c5c67f2f0489402ccd3e9c5f51847e39f8392c1452719d31b5046b1f6c6316c026070c282b2ef604e81b
diff --git a/app-i18n/libskk/libskk-1.0.2.ebuild b/app-i18n/libskk/libskk-1.0.2.ebuild
index 559b09d8e283..593469dc3036 100644
--- a/app-i18n/libskk/libskk-1.0.2.ebuild
+++ b/app-i18n/libskk/libskk-1.0.2.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit ltprune vala virtualx
+inherit vala virtualx
 
 DESCRIPTION="GObject-based library to deal with Japanese kana-to-kanji conversion method"
 HOMEPAGE="https://github.com/ueno/libskk"
 SRC_URI="https://github.com/ueno/${PN}/releases/download/${PV}/${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+introspection nls static-libs"
@@ -44,5 +44,5 @@ src_test() {
 
 src_install() {
 	default
-	prune_libtool_files
+	use static-libs || find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-i18n/libskk/libskk-1.0.5.ebuild b/app-i18n/libskk/libskk-1.0.5.ebuild
new file mode 100644
index 000000000000..eab92a1f7f0c
--- /dev/null
+++ b/app-i18n/libskk/libskk-1.0.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit vala virtualx
+
+DESCRIPTION="GObject-based library to deal with Japanese kana-to-kanji conversion method"
+HOMEPAGE="https://github.com/ueno/libskk"
+SRC_URI="https://github.com/ueno/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection nls static-libs"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libgee:0.8
+	x11-libs/libxkbcommon
+	introspection? ( dev-libs/gobject-introspection )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	vala_src_prepare
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable introspection) \
+		$(use_enable nls) \
+		$(use_enable static-libs static)
+}
+
+src_test() {
+	export GSETTINGS_BACKEND="memory"
+	virtx emake check
+}
+
+src_install() {
+	default
+	use static-libs || find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-i18n/libskk/metadata.xml b/app-i18n/libskk/metadata.xml
index 47d519fd6058..8d9f83d4f2e9 100644
--- a/app-i18n/libskk/metadata.xml
+++ b/app-i18n/libskk/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">ueno/libskk</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ueno/libskk</remote-id>
+	</upstream>
 </pkgmetadata>