gentoo auto-resync : 26:04:2024 - 23:59:36

5 files changed, 84 insertions, 8 deletions

diff --git a/app-i18n/skk-jisyo/Manifest b/app-i18n/skk-jisyo/Manifest
index 30c493dfefa1..1d26a87b282b 100644
--- a/app-i18n/skk-jisyo/Manifest
+++ b/app-i18n/skk-jisyo/Manifest
@@ -1,4 +1,6 @@
 DIST skk-jisyo-202005.tar.xz 6836292 BLAKE2B 6d73e6d2e38de178c6683ae447b0ea79054036739b7a01fe386d677cc99556d37f47adf4156e1d571681195b85a2134cac710b12fa08df87e4fe5e5098289119 SHA512 7cc639b307d56d4cb5d04280a003ffa2cfb326f7821d70dddb619e117c1b8358417e44f8137de1b8027ec7f97df8bff8fba845019c015cf8c48ed5d91753155c
-EBUILD skk-jisyo-202005.ebuild 1369 BLAKE2B 2ba2ccd6d9b46a08c081a0ebf7d18b5afdd8832d7e7f9b417d7c99711e1917b2646c7f1fb61af42b5eb863309842dd88e7e5acd74e59bb723a60c6da3697ad32 SHA512 35df58ee2ffb6d8ec2d8d85bb5905390ae5dc01938deca65d54a3c708f876c1301328f4dedbaae56b2abfb9da8516ee33ac3c4e1769cf085e1ae3cd55b112d43
-EBUILD skk-jisyo-999999.ebuild 1702 BLAKE2B d39afcaa431c0c4f16257a62d5021cf37a8b4dd2364bdc4bf2bafe6837ee2c3a78b6131e4fce5103c5d84f5c1e22e54fee237fea0333c220b2639fe7a0a377a6 SHA512 b5a1699c2859e17159a52164afa93b3a5de445369ea34ecc6367ebfc8463a33d96c42efc40258600f1ce54bed506621e1d162310df0741f1c92b394f66be2673
-MISC metadata.xml 235 BLAKE2B a3e5a3109b59e3f97ef14f8d55ba13b16dc5371a1b7d6f238230aa4494db32dd4a42e3ee012ec8b18fae394feb2b1b56882bc70504aa7c6b969c1b20140f0ece SHA512 7c4e5f5dea465e45c662f5f53513626088aff514e1326593426af227d77e63d8a00d8af05aa208881a399f83dd41e73cd2ef81c8b7f275a2fa891f295231d67c
+DIST skk-jisyo-202402.tar.xz 7009372 BLAKE2B 4db4be482e537c67861d1f855e34289ce4e7cd790850c012f1a16962196a683170541486468c42fb071a33a498801a2784807793bb49a4a5ca0fa4c805819798 SHA512 72957b207fd28017fc3fbbc43987aa6e7b46b011788036fe96c15172c7934011e3100a45d7e207ebb84cd15f1db667ba366b316f485fecad279f5bd5608920ed
+EBUILD skk-jisyo-202005.ebuild 1362 BLAKE2B b870bf87b6d56f8690870a95c62d55a14f816469ec920e84c82ee8d4808b93b16d44566655da84290f7ea94d428a50a0bb347a0257e5d953b05ad13d50942551 SHA512 a08c689ffaf5722c341e9dea1b29c337edea9745d13afe15bd9bd68de86dacbfd489781021be693b824ae119655bda96906fe326296eed16389a3470bbd09a5e
+EBUILD skk-jisyo-202402.ebuild 1367 BLAKE2B 9547426eb01ab8f3d77e65bfdd9972a1ac249a9c68f0df3702a3677eed1563111f71be622cb8e7f3bd10c623eb71dfe6e538c1b23d95b58177f9cb436246c39e SHA512 230e6aa92189364645ac95bc42e2383fc7f8754082d49efee9786e2aa71115a8984a3c12004ec9305041ca9099764171e7ef3ceae4b5aaffed5e159b638d472e
+EBUILD skk-jisyo-999999.ebuild 1695 BLAKE2B 5f24c7c45661c59106bce7072ffde752fb3ce14f07b501c8c1b4f85279724ea6a801cf920c7830ee744eca6967833c9a2b5efe0d27deb15620bc071d88a7dce6 SHA512 9c26feb0e20c59db36b44335d4bebfeeb950563cae5fd35115e3a5c47f3ba14abc3ca88f191ebf694576509a96ad1250abfc4260030c6e4a8cdbae87a447fa50
+MISC metadata.xml 312 BLAKE2B 8b6e84e5a32d60e0d05f0e2afea5315ef06803e2ed0f278ddd6acb86b4648c115030f236c36b87aa976252da9c3cdbe3cbc190af0bea514be8b07949da469bbc SHA512 1c5a795f36dfdb228cb15c1f5a765506e61d4a8f658ba437d08810779a27ca925cdd7e89820eab5096e7155b0b2d065ca8fac511690d55b4b76a3fb3474d5973
diff --git a/app-i18n/skk-jisyo/metadata.xml b/app-i18n/skk-jisyo/metadata.xml
index a94766977fa6..18319445e66e 100644
--- a/app-i18n/skk-jisyo/metadata.xml
+++ b/app-i18n/skk-jisyo/metadata.xml
@@ -5,4 +5,7 @@
 		<email>cjk@gentoo.org</email>
 		<name>Cjk</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">skk-dev/dict</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/skk-jisyo/skk-jisyo-202005.ebuild b/app-i18n/skk-jisyo/skk-jisyo-202005.ebuild
index e7694ee1860e..ac92d76c7105 100644
--- a/app-i18n/skk-jisyo/skk-jisyo-202005.ebuild
+++ b/app-i18n/skk-jisyo/skk-jisyo-202005.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -6,7 +6,7 @@ EAPI="8"
 MY_PN=${PN^^}
 
 DESCRIPTION="Jisyo (dictionary) files for the SKK Japanese-input software"
-HOMEPAGE="http://openlab.ring.gr.jp/skk/dic.html"
+HOMEPAGE="https://skk-dev.github.io/dict/"
 SRC_URI="mirror://gentoo/${P}.tar.xz
 	https://dev.gentoo.org/~hattya/distfiles/${P}.tar.xz"
 
diff --git a/app-i18n/skk-jisyo/skk-jisyo-202402.ebuild b/app-i18n/skk-jisyo/skk-jisyo-202402.ebuild
new file mode 100644
index 000000000000..6f9e6363e3c4
--- /dev/null
+++ b/app-i18n/skk-jisyo/skk-jisyo-202402.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+MY_PN=${PN^^}
+
+DESCRIPTION="Jisyo (dictionary) files for the SKK Japanese-input software"
+HOMEPAGE="https://skk-dev.github.io/dict/"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	https://dev.gentoo.org/~hattya/distfiles/${P}.tar.xz"
+
+LICENSE="CC-BY-SA-3.0 GPL-2+ public-domain unicode"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="cdb"
+
+DEPEND="app-alternatives/awk
+	cdb? (
+		|| (
+			dev-db/tinycdb
+			dev-db/cdb
+		)
+	)"
+RDEPEND=""
+
+DOCS=( ChangeLog{,.{1..3}} committers.md )
+HTML_DOCS=( edict_doc.html )
+
+src_prepare() {
+	rm -f ${MY_PN}.{hukugougo,noregist,notes,pubdic+,requested,unannotated,*wrong*}
+
+	default
+}
+
+cdb_make() {
+	cdbmake "${1}" "${1}.tmp"
+}
+
+tinycdb_make() {
+	cdb -c "${1}"
+}
+
+src_compile() {
+	if use cdb; then
+		local cdbmake=cdb_make f
+		if has_version dev-db/tinycdb; then
+			cdbmake=tinycdb_make
+		fi
+		for f in {,zipcode/}${MY_PN}.*; do
+			LC_ALL=C awk '
+				/^[^;]/ {
+					s = substr($0, index($0, " ") + 1)
+					print "+" length($1) "," length(s) ":" $1 "->" s
+				}
+				END {
+					print ""
+				}
+			' ${f} | ${cdbmake} ${f}.cdb || die
+		done
+	fi
+}
+
+src_install() {
+	insinto /usr/share/skk
+	doins {,zipcode/}${MY_PN}.*
+
+	einstalldocs
+	docinto zipcode
+	dodoc zipcode/README.md
+}
diff --git a/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild b/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild
index f680501ee5c9..85a8a3c57df4 100644
--- a/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild
+++ b/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -9,7 +9,7 @@ inherit git-r3 ruby-single
 MY_PN=${PN^^}
 
 DESCRIPTION="Jisyo (dictionary) files for the SKK Japanese-input software"
-HOMEPAGE="http://openlab.ring.gr.jp/skk/dic.html"
+HOMEPAGE="https://skk-dev.github.io/dict/"
 EGIT_REPO_URI="https://github.com/skk-dev/dict"
 
 LICENSE="CC-BY-SA-3.0 GPL-2+ public-domain unicode"
@@ -18,8 +18,8 @@ KEYWORDS=""
 IUSE="cdb ${USE_RUBY//ruby/ruby_targets_ruby}"
 
 DEPEND="${RUBY_DEPS}
-	app-i18n/skktools
 	app-alternatives/awk
+	app-i18n/skktools
 	cdb? (
 		|| (
 			dev-db/tinycdb