gentoo resync : 13.11.2021

13 files changed, 79 insertions, 59 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 69d57a01bd53..2f0c1ecd7334 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus-table-others/Manifest b/app-i18n/ibus-table-others/Manifest
index ecf7fb7c07cb..12cd3e9bca34 100644
--- a/app-i18n/ibus-table-others/Manifest
+++ b/app-i18n/ibus-table-others/Manifest
@@ -1,3 +1,5 @@
 DIST ibus-table-others-1.3.11.tar.gz 662398 BLAKE2B a600535b51b731c482eeecb78b8bff6ca14795e411348ed0e2cd4207ad1a89aed7d338c6b706695dd734f405ee5203e23dfffa370cae12ad763eabf6bbdfe848 SHA512 bfa17338e3a6a3e392bb3e5e5736af9bfa5584a897aea4ca72aec0df2c84dc94a0737f8fb87ced382e6acac3f8169ed2aef93a2f94330a4829048d009cb96ee0
+DIST ibus-table-others-1.3.12.tar.gz 673850 BLAKE2B a0633ecca428c1d2723ba0e5f87a9fabc74d3c9f69995c63a22c1163c1d00880103ad764d820b3a13e10825d4067e3192e61ecb61f312b3a891668fa8348e447 SHA512 526b3664ec0d7dc89f5456a5da82c5e42e267654fba88f6b3134ab35f3b196d6fd3f1f8815be0e36c817b28550681005caeefa04f7c7c2c8560965dfceaa4d87
 EBUILD ibus-table-others-1.3.11.ebuild 550 BLAKE2B 17ad3e0df0cbb970720096eab210c6a594fa8246a13848a571f49b404639e08e1ed3497291e87ce43900e304da17c66961dab70c6874f2daedf0ce2ec74b61fe SHA512 a70c392425112b866ce7f3e7dc77959fe72834ef53c73bd3321d7369136f6dffe85c2ea4fa87c2d692b4c93c672a06ecfd51a9ed9ebad6c21be1113910e072ac
+EBUILD ibus-table-others-1.3.12.ebuild 552 BLAKE2B 04f207a7fdfea1d1cd9f5871a609785c94722ece0c466c9e9137c5aa2c3bd2d9bd9d7c6de3e3403bbbb5efacd1136969da21a94c3cc0f17daddf4e4ae9a16aec SHA512 5c4b277df0c2e9e8a9604930b197bd23a7971f0adcd6ad8833a0618e37e89b8d95b203925f224b16d8de573f96eedf32286a3700ecd73834abf814c4b584fb75
 MISC metadata.xml 642 BLAKE2B 0eb23a3102a282b9ff6e77a623f119ed41d1aff2afada1a32e4124de6b97ad4239bcba7738b9f3663f1277e70972314047a25c6da3a61d04ff7b0f6aa6caa896 SHA512 51b6e52fa107591db67c5ddddee30653475882125228c04ad37729eb7cf09fe9a39e016816177a2793a3bbb51a3001422b3f958c95832055867bfd98ea0367ba
diff --git a/app-i18n/ibus-table-others/ibus-table-others-1.3.12.ebuild b/app-i18n/ibus-table-others/ibus-table-others-1.3.12.ebuild
new file mode 100644
index 000000000000..65f07652f849
--- /dev/null
+++ b/app-i18n/ibus-table-others/ibus-table-others-1.3.12.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Various tables for IBus-Table"
+HOMEPAGE="https://github.com/moebiuscurve/ibus-table-others"
+SRC_URI="https://github.com/moebiuscurve/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-i18n/ibus-table
+	!app-i18n/ibus-table-code
+	!app-i18n/ibus-table-cyrillic
+	!app-i18n/ibus-table-latin
+	!app-i18n/ibus-table-tv"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
diff --git a/app-i18n/tegaki-zinnia-japanese/Manifest b/app-i18n/tegaki-zinnia-japanese/Manifest
index 94e51054011d..653dc5e393b4 100644
--- a/app-i18n/tegaki-zinnia-japanese/Manifest
+++ b/app-i18n/tegaki-zinnia-japanese/Manifest
@@ -1,3 +1,3 @@
 DIST tegaki-zinnia-japanese-0.3.zip 18134281 BLAKE2B 006fb90656444afb2ca824a534947f1ba16502cba8035977b93150ae242e476170eebfc02d069f04d3fbda24773a602f69bea91eb88019cfe58ab71171b19331 SHA512 fd11f94c8b5446ca22e1119ead20da9ebc01e8033beef664d94c0affc8cef6e315344c4d5e61288358bf7ff4f7c49135dcf5743c4070573f7d8e45e70abba113
-EBUILD tegaki-zinnia-japanese-0.3.ebuild 535 BLAKE2B 3a1339c6722574cbf43cd1e28de013bf2c76552099d723c0a4feb5cc44b43f36cc18342307b24ba5c122eb7fd4a6c2fb3e15b05460146f807c8b4d7fba834a83 SHA512 399a433e82deefe465cf6330eb45df49ae3a1f33cafb913968fa2a16ba6cfd669f61cbad09e71a1b80f9ba031c468abc66253055a780b2bf4c7227dd479f12bf
-MISC metadata.xml 231 BLAKE2B c2fdc9ca113ea1fb6cb14f865609798058c3443d097117d61de82b4f53e8d293bc187413600b6a6eb3e1c744ae7712bf8c55db53562076e7bc5de5eae0c1f209 SHA512 281ccb55b01108f6fd9953a4fc8723e312c6416b885b11a32d2a0d4d532ebbc361990c814402bc8061e360c02b8074797b1b68ee9a8bc96d37f2cb6455e5949c
+EBUILD tegaki-zinnia-japanese-0.3.ebuild 574 BLAKE2B 83ca2a79692b27587e1bef6c961b26bbf5dca5701c9dca09daf973f03f320d9c8d9e128e748d97afae3d2342e041eac2798f002b9a25ece9d5fd8d58759f917c SHA512 d5af9a575db61f4b811f305edf551fb3af6833dcaefa965bd5b947046bea15a599efc1d83dfa11c92d7ae79881f55155c3d80ed9e734078c697359a0c719b814
+MISC metadata.xml 313 BLAKE2B 713e67f1fe1ccbd378edf344cdb280a66dbca2990a43e27c8c8be133bd28c12fcf3e577a078898babbe2937b9994742d60f1aa75ba78c1ed725d450dea4066d0 SHA512 95bc7aa6e7866c83af2df489d20b1f0c427953386a6af160d0df8746016fc806f2e91e05633cad2ab37bfc73a270b69e1eb6f7a3d8319fa2d5037fb1f93f4edd
diff --git a/app-i18n/tegaki-zinnia-japanese/metadata.xml b/app-i18n/tegaki-zinnia-japanese/metadata.xml
index 1d892a124fa3..e35768875127 100644
--- a/app-i18n/tegaki-zinnia-japanese/metadata.xml
+++ b/app-i18n/tegaki-zinnia-japanese/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>cjk@gentoo.org</email>
-	<name>Cjk</name>
-</maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tegaki/tegaki</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/tegaki-zinnia-japanese/tegaki-zinnia-japanese-0.3.ebuild b/app-i18n/tegaki-zinnia-japanese/tegaki-zinnia-japanese-0.3.ebuild
index b2edab87d288..98633580a6e4 100644
--- a/app-i18n/tegaki-zinnia-japanese/tegaki-zinnia-japanese-0.3.ebuild
+++ b/app-i18n/tegaki-zinnia-japanese/tegaki-zinnia-japanese-0.3.ebuild
@@ -1,23 +1,28 @@
-# Copyright 2013-2020 Gentoo Authors
+# Copyright 2013-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI="8"
 
 DESCRIPTION="Handwriting model data of Japanese"
-HOMEPAGE="http://tegaki.org/"
-SRC_URI="http://www.tegaki.org/releases/${PV}/models/${P}.zip"
+HOMEPAGE="https://tegaki.github.io/"
+SRC_URI="https://github.com/tegaki/tegaki/releases/download/v${PV}/${P}.zip"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
-DEPEND="app-arch/unzip"
 RDEPEND=""
+BDEPEND="app-arch/unzip"
 
 src_prepare() {
-	sed -i -e "/^installpath=/s:local/::" Makefile || die
-	sed -i -e "/^installpath=/s:installpath=:installpath=${ED}:" Makefile || die
+	default
+
+	sed -i \
+		-e "/^installpath=/s|local/||" \
+		-e "/^installpath=/s|=|=${EPREFIX}|" \
+		-e "s/\(\$(inst\)/\$(DESTDIR)\1/" \
+		Makefile
 }
 
 src_compile() {
diff --git a/app-i18n/zinnia-tomoe/Manifest b/app-i18n/zinnia-tomoe/Manifest
index 54c8052b5634..79828a66d53f 100644
--- a/app-i18n/zinnia-tomoe/Manifest
+++ b/app-i18n/zinnia-tomoe/Manifest
@@ -1,3 +1,3 @@
 DIST zinnia-tomoe-0.6.0-20080911.tar.bz2 30666390 BLAKE2B 5bb5c68ebe4dd60b4b6f573f442d52626bd2594e78395882c69020089a036ed3e61454a8760dee8a6608fb90390d5de977228b5664a3cddd7be18b39910d9d78 SHA512 5c5cf06de46b8feebebca38d8ee4908af1d58f921e30bbbf92b9e5b79acb37e9c78466a1771dc01ddabe4740a0f03f41c50dce55fc38a414b582a1b4708886f5
-EBUILD zinnia-tomoe-0.6.0_p20080911.ebuild 701 BLAKE2B dfba0d31827c25ba3720a230118ab5989047cbde09a129facb91459c8c267f8707c67da464bf58728da877c324f03fbf989cba6891f6339e8dff6d6d98df4236 SHA512 2c24b794aa67102317c1fd21e85c0de4619573f24c90d87abf23798966ccce28cee9651a212bde926fc330b32734416f9c077bb0bcacb652214ee2677dc62671
+EBUILD zinnia-tomoe-0.6.0_p20080911.ebuild 694 BLAKE2B 92887e643afbeaa411b044cb6d70b63cb92dd560d5d419b8c25f37bb3fdc31af35827aea4c420605d8fe9278adbd48997b6d616010fd93542b61029abe56156a SHA512 cf3350b63efba2c977b4a27ced9ecc69045e0107f08ddf1628473caba4bfb600bea790dc78027806a23b08a3ad1c895e75092ec9b825d4848ba3e2d7559bb2a3
 MISC metadata.xml 365 BLAKE2B afee91a0ba5206261ec19c78e18b7c8f139d6732d169f6d38d16120c4b51eabaf635766e1f4b5881e3af2a09d58353f5bc1d3779bf43623d7c4e175331a0d328 SHA512 968bf10405fd2d4864bad421f37bd88c24412132e4e996bf9dd44a672f61753a79a0175485237c8b27c55fed076856f6000beaf070b83dba27bec7f474fd1445
diff --git a/app-i18n/zinnia-tomoe/zinnia-tomoe-0.6.0_p20080911.ebuild b/app-i18n/zinnia-tomoe/zinnia-tomoe-0.6.0_p20080911.ebuild
index 59e943d8c1f0..81cfc5262b16 100644
--- a/app-i18n/zinnia-tomoe/zinnia-tomoe-0.6.0_p20080911.ebuild
+++ b/app-i18n/zinnia-tomoe/zinnia-tomoe-0.6.0_p20080911.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2013-2020 Gentoo Authors
+# Copyright 2013-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="8"
 
 inherit autotools
 
@@ -11,21 +11,21 @@ DESCRIPTION="Handwriting model files trained with Tomoe data"
 HOMEPAGE="https://taku910.github.io/zinnia/ https://github.com/taku910/zinnia https://sourceforge.net/projects/zinnia/"
 SRC_URI="mirror://sourceforge/zinnia/${MY_P}.tar.bz2"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
-DEPEND="app-i18n/zinnia"
-RDEPEND="${DEPEND}"
-
+RDEPEND="app-i18n/zinnia"
+DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MY_P}"
 
-DOCS=(AUTHORS)
+DOCS=( AUTHORS )
 
 src_prepare() {
 	default
-	mv configure.in configure.ac || die
-	sed -e "/^modeldir[[:space:]]*=/s/lib/$(get_libdir)/" -i Makefile.am || die
+	sed -i "/^modeldir[[:space:]]*=/s/lib/$(get_libdir)/" Makefile.am || die
+
+	mv configure.{in,ac} || die
 	eautoreconf
 }
diff --git a/app-i18n/zinnia/Manifest b/app-i18n/zinnia/Manifest
index 9c40b0836aa6..c2a9daa1fa5f 100644
--- a/app-i18n/zinnia/Manifest
+++ b/app-i18n/zinnia/Manifest
@@ -1,6 +1,6 @@
-AUX zinnia-0.06-c++-2011.patch 235 BLAKE2B 5a2dfa58d70b76198c8101e7a2f7b925e26dd8b5b29242990e84bc239dd5d7d7e62c554eba7b7f47c96273b5126d59bb8908518dacafe8b991528d43f9732e94 SHA512 23d856c2d14b28d4a2863767f1888701eba2693f5b7dda20bdb7959311d7ce875bb2df2776c576979d7f5dfb8106086a472af7a5e37b3972f8e16e2cc4ed1d6f
-AUX zinnia-0.06-flags.patch 367 BLAKE2B 8f43fefa0822909054eaae843d98f51e0c0b007f95b546b768b2024bcce348139d0b8f738d8e3f64640267e8c2a5de600e034fd0f480bdd87f2c8855550b0d42 SHA512 f43f238cc037293a7914a00bf364068f977f5e4451e6a23959b7a6346f20d1cf5ae20d61c9e031dae0897f582ae62e3a8fb8cd77de72fe474b010ebbcc2d10b4
-AUX zinnia-0.06-perl_build.patch 336 BLAKE2B f8eb4d1ac570bad3a0cbb9fe2c09ac5e826f895741a7bf4b1e82ac439e03153936a915f4e24980d066905d9621c00a4892a65bd394e02423dee2995e319213aa SHA512 f3eeea5a6d23c07e50dc99d66b5799c5a03ff42d16afa43b97c8ff1ee9f63efe45864ba4eddb3c1bf69c38a632a4469a5f823ce13d1f57299ae027a1f698c9d0
+AUX zinnia-0.06-c++11.patch 237 BLAKE2B d6a0713e714d209f460169de1ba2b4157fc292415eaffc529c9303cf1b98fd48ef128330be3427beca8f4ec9a7b2d5212362a35b69297c635530a094f08dfbd1 SHA512 51f690d9a9d73d4f4739fa4c30b1fa145e8fae8e89f833e9c29e26451f0cbb4e0074bde088fa6109cdb730aac226b9f1a524d0c330e36ab4dbc7504a8cd14ad4
+AUX zinnia-0.06-flags.patch 369 BLAKE2B bbbb76ae8123fad5e8f5fc8853f748d8a1a1e09f5a155e79f6f6b38de28dd92a8182fd10f241987cf40f328b39650dc3a72014d107f48c00957e0b5b7eff7590 SHA512 6a40374cf473c4a196770417f63ad0a65aa6dd9151fe8b2c967ec6a618ae2b55097380784d61b4f4374963099f27463401e2be73ed8345402a66e04ebccec4f5
+AUX zinnia-0.06-perl.patch 338 BLAKE2B 500246d5415ab86329b434a27e5445599ddd510af2db43a21cf8700b8882f313b5b929a514daefac0e1b77846511e580d5c7237f04658d7a201c223e6c70f2dc SHA512 4154e4f3c0cb6a8bcce926cdc3845d4fd59fcb41e2078fe619c5b4faa52b09020d62594103b473382f504c73862f1215c96f7b678b4745a1fdb1695bc87fce2e
 DIST zinnia-0.06.tar.gz 457415 BLAKE2B 3c401735fec424030dd9f8d6d14f90a83cd6ad5eb8e0ec1b0d2d15285cecf14c793043fb9ad0982d6614e48bdbe913360d2f3933bb2e1a623c7920536cb3bd14 SHA512 b9a44dc3664302269c4d8481225964a3188c1921f5af7f136fdccdc452917f6ff934884e266436a0f1e0a32af19d3bea5f5e4416e694a653983039a513277b53
-EBUILD zinnia-0.06-r3.ebuild 1692 BLAKE2B c62874df0f5364ca243190204e3545707a51501f89b53864cb62cb92dd3b3efcae628ccc367028585b2bcac21116fea64d11a1f13205435b19493f4464a585dd SHA512 a383d157c6f7501b7dab47daebb39e6be7b889eca2a8f570771e32e2cfeed7f5287e58b8206ba2a329c431ede53e90228ad1ced0af559703bff09d6bc7a052ec
+EBUILD zinnia-0.06-r3.ebuild 1574 BLAKE2B e1abc28a5b1050726f46d07e9d61449ff5d4382457248aa88b72d1f73eabb58655ae69c2cf7d2f9d668823c193a7df6320619fea4fca4a1c2972254422e7c4c1 SHA512 a3267fea9be4a881409e5c43ba6e8f7e9a46f24da3171dc9d1cade3f5f8413751f18b2046ffd20420869fa0e1a0bce9fa135a2014a2330c9ea217587292db68e
 MISC metadata.xml 365 BLAKE2B afee91a0ba5206261ec19c78e18b7c8f139d6732d169f6d38d16120c4b51eabaf635766e1f4b5881e3af2a09d58353f5bc1d3779bf43623d7c4e175331a0d328 SHA512 968bf10405fd2d4864bad421f37bd88c24412132e4e996bf9dd44a672f61753a79a0175485237c8b27c55fed076856f6000beaf070b83dba27bec7f474fd1445
diff --git a/app-i18n/zinnia/files/zinnia-0.06-c++-2011.patch b/app-i18n/zinnia/files/zinnia-0.06-c++11.patch
index 0ef6ae40e434..66a78a5a6997 100644
--- a/app-i18n/zinnia/files/zinnia-0.06-c++-2011.patch
+++ b/app-i18n/zinnia/files/zinnia-0.06-c++11.patch
@@ -1,5 +1,5 @@
---- /trainer.cpp
-+++ /trainer.cpp
+--- a/trainer.cpp
++++ b/trainer.cpp
 @@ -103,7 +103,7 @@
      if (!fn) {
        return false;
diff --git a/app-i18n/zinnia/files/zinnia-0.06-flags.patch b/app-i18n/zinnia/files/zinnia-0.06-flags.patch
index 80442ee4880f..5c26415f6018 100644
--- a/app-i18n/zinnia/files/zinnia-0.06-flags.patch
+++ b/app-i18n/zinnia/files/zinnia-0.06-flags.patch
@@ -1,5 +1,5 @@
---- /configure.in
-+++ /configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -59,15 +59,6 @@
  AC_SUBST([pkgconfigdir])
  AC_MSG_NOTICE([pkgconfig directory is ${pkgconfigdir}])
diff --git a/app-i18n/zinnia/files/zinnia-0.06-perl_build.patch b/app-i18n/zinnia/files/zinnia-0.06-perl.patch
index 4da9e1eeb900..02d52faf93a7 100644
--- a/app-i18n/zinnia/files/zinnia-0.06-perl_build.patch
+++ b/app-i18n/zinnia/files/zinnia-0.06-perl.patch
@@ -1,5 +1,5 @@
---- /perl/Makefile.PL
-+++ /perl/Makefile.PL
+--- a/perl/Makefile.PL
++++ b/perl/Makefile.PL
 @@ -4,7 +4,7 @@
      'CC'                => 'c++',
      'LD'                => 'c++',
diff --git a/app-i18n/zinnia/zinnia-0.06-r3.ebuild b/app-i18n/zinnia/zinnia-0.06-r3.ebuild
index 70d37abf609e..383852add5d2 100644
--- a/app-i18n/zinnia/zinnia-0.06-r3.ebuild
+++ b/app-i18n/zinnia/zinnia-0.06-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2010-2020 Gentoo Authors
+# Copyright 2010-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="8"
 
 inherit autotools flag-o-matic perl-module toolchain-funcs
 
@@ -15,25 +15,19 @@ KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="perl static-libs"
 
 PATCHES=(
-	"${FILESDIR}/${P}-flags.patch"
-	"${FILESDIR}/${P}-perl_build.patch"
-	"${FILESDIR}/${P}-c++-2011.patch"
+	"${FILESDIR}"/${P}-c++11.patch
+	"${FILESDIR}"/${P}-flags.patch
+	"${FILESDIR}"/${P}-perl.patch
 )
 
-DOCS=(AUTHORS)
+HTML_DOCS=( doc/{index{,-ja}.html,${PN}.css} )
 
 src_prepare() {
 	default
-	mv configure.in configure.ac || die
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
-	eautoreconf
+	sed -i "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" configure.in || die
 
-	if use perl; then
-			pushd perl > /dev/null
-			PATCHES=()
-			perl-module_src_prepare
-			popd > /dev/null
-	fi
+	mv configure.{in,ac} || die
+	eautoreconf
 }
 
 src_configure() {
@@ -44,8 +38,7 @@ src_compile() {
 	default
 
 	if use perl; then
-			pushd perl > /dev/null
-
+			cd perl >/dev/null || die
 			# We need to run this here as otherwise it won't pick up the
 			# just-built -lzinnia and cause the extension to have
 			# undefined symbols.
@@ -60,7 +53,7 @@ src_compile() {
 				OPTIMIZE="${CPPFLAGS} ${CXXFLAGS}" \
 				LDDLFLAGS="-shared" \
 				OTHERLDFLAGS="${LDFLAGS}"
-			popd > /dev/null
+			cd - >/dev/null || die
 	fi
 }
 
@@ -70,16 +63,12 @@ src_test() {
 
 src_install() {
 	default
+	einstalldocs
 	find "${D}" -name "*.la" -delete || die
 
 	if use perl; then
-			pushd perl > /dev/null
+			cd perl >/dev/null || die
 			perl-module_src_install
-			popd > /dev/null
+			cd - >/dev/null || die
 	fi
-
-	(
-		docinto html
-		dodoc doc/*.css doc/*.html
-	)
 }