diff --git a/acct-group/canna/canna-0.ebuild b/acct-group/canna/canna-0.ebuild
new file mode 100644
index 0000000000..e7d06cc773
--- /dev/null
+++ b/acct-group/canna/canna-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=-1
diff --git a/acct-group/canna/metadata.xml b/acct-group/canna/metadata.xml
new file mode 100644
index 0000000000..6c0bdfd682
--- /dev/null
+++ b/acct-group/canna/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ lssndrbarbieri@gmail.com
+ Alessandro Barbieri
+
+
diff --git a/acct-user/canna/canna-0.ebuild b/acct-user/canna/canna-0.ebuild
new file mode 100644
index 0000000000..1039e33a36
--- /dev/null
+++ b/acct-user/canna/canna-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for Canna language server"
+ACCT_USER_ID=-1
+ACCT_USER_GROUPS=( canna )
+ACCT_USER_HOME="/var/lib/${PN}"
+
+acct-user_add_deps
diff --git a/acct-user/canna/metadata.xml b/acct-user/canna/metadata.xml
new file mode 100644
index 0000000000..6c0bdfd682
--- /dev/null
+++ b/acct-user/canna/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ lssndrbarbieri@gmail.com
+ Alessandro Barbieri
+
+
diff --git a/app-admin/himitsu-ssh/Manifest b/app-admin/himitsu-ssh/Manifest
new file mode 100644
index 0000000000..0aeec05c54
--- /dev/null
+++ b/app-admin/himitsu-ssh/Manifest
@@ -0,0 +1 @@
+DIST himitsu-ssh-0.1.tar.gz 18378 BLAKE2B 92c9f9838dbab8df7d57321c1692fdfaa5e342eed14d08aac7eacb088e0eacaf5abe05b396eb05f14d0feb1f8d85034365464087729cc79b168a76253778b311 SHA512 f1bb3dfe2ee5843e867748f5177f1f34007674e3b6f2cb9ba701edc2dca8e979ba9882dc5012197b10053583b7536d71b0a214c57aa03e2576d08cb12e9e1e4c
diff --git a/app-admin/himitsu-ssh/himitsu-ssh-0.1.ebuild b/app-admin/himitsu-ssh/himitsu-ssh-0.1.ebuild
new file mode 100644
index 0000000000..d42518941e
--- /dev/null
+++ b/app-admin/himitsu-ssh/himitsu-ssh-0.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ "${PV}" = "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/himitsu-ssh"
+else
+ SRC_URI="https://git.sr.ht/~sircmpwn/himitsu-ssh/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~riscv"
+fi
+
+DESCRIPTION="SSH integration for Himitsu"
+HOMEPAGE="https://git.sr.ht/~sircmpwn/himitsu-ssh"
+LICENSE="GPL-3"
+SLOT="0"
+
+IUSE=""
+
+RDEPEND="app-admin/himitsu"
+DEPEND="
+ ${RDEPEND}
+ dev-lang/hare:=
+"
+BDEPEND="app-text/scdoc"
+
+src_configure() {
+ sed -i 's;^PREFIX=.*;PREFIX=/usr;' Makefile || die
+}
diff --git a/app-admin/himitsu-ssh/himitsu-ssh-9999.ebuild b/app-admin/himitsu-ssh/himitsu-ssh-9999.ebuild
new file mode 100644
index 0000000000..d42518941e
--- /dev/null
+++ b/app-admin/himitsu-ssh/himitsu-ssh-9999.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ "${PV}" = "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/himitsu-ssh"
+else
+ SRC_URI="https://git.sr.ht/~sircmpwn/himitsu-ssh/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~riscv"
+fi
+
+DESCRIPTION="SSH integration for Himitsu"
+HOMEPAGE="https://git.sr.ht/~sircmpwn/himitsu-ssh"
+LICENSE="GPL-3"
+SLOT="0"
+
+IUSE=""
+
+RDEPEND="app-admin/himitsu"
+DEPEND="
+ ${RDEPEND}
+ dev-lang/hare:=
+"
+BDEPEND="app-text/scdoc"
+
+src_configure() {
+ sed -i 's;^PREFIX=.*;PREFIX=/usr;' Makefile || die
+}
diff --git a/app-admin/himitsu-ssh/metadata.xml b/app-admin/himitsu-ssh/metadata.xml
new file mode 100644
index 0000000000..c698af2344
--- /dev/null
+++ b/app-admin/himitsu-ssh/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ contact@hacktivis.me
+ Haelwenn (lanodan) Monnier
+
+
diff --git a/app-dicts/canna-2ch/Manifest b/app-dicts/canna-2ch/Manifest
new file mode 100644
index 0000000000..0cf8a347e2
--- /dev/null
+++ b/app-dicts/canna-2ch/Manifest
@@ -0,0 +1 @@
+DIST canna-2ch-20040519.tar.gz 53168 BLAKE2B 247b30f7a97258eac52f9a1d32bd2a785dcfaccd50430fd251a287a80b7a7ab12d1f2c4894d9eb026552f033854b50fbc967a50b66b84d3d5fe68e1954beb6fb SHA512 62b6f633fd0d345e09ce1e0603f61fe1363880ecdc72932e7a8d6d4c17a23be619a749974a3f54a78642396834888f628f047f1a88db3c8d36a758468bd6d296
diff --git a/app-dicts/canna-2ch/canna-2ch-20040519.ebuild b/app-dicts/canna-2ch/canna-2ch-20040519.ebuild
new file mode 100644
index 0000000000..c358e306db
--- /dev/null
+++ b/app-dicts/canna-2ch/canna-2ch-20040519.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cannadic
+
+DESCRIPTION="Japanese Canna dictionary for 2channelers"
+HOMEPAGE="http://omaemona.sourceforge.net/packages/Canna"
+SRC_URI="https://dev.gentoo.org/~naota/files/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="canna"
+
+BDEPEND="canna? ( app-i18n/canna )"
+
+CANNADICS=( 2ch )
+DICSDIRFILE="${FILESDIR}/052ch.dics.dir"
+
+src_compile() {
+ # Anthy users do not need binary dictionary
+ if use canna; then
+ mkbindic nichan.ctd || die
+ fi
+}
diff --git a/app-dicts/canna-2ch/files/052ch.dics.dir b/app-dicts/canna-2ch/files/052ch.dics.dir
new file mode 100644
index 0000000000..1ddc85d643
--- /dev/null
+++ b/app-dicts/canna-2ch/files/052ch.dics.dir
@@ -0,0 +1,2 @@
+nichan.cbd(nichan.mwd) -2ch---
+nichan.cld(nichan.mwd) -2ch---
diff --git a/app-dicts/canna-2ch/metadata.xml b/app-dicts/canna-2ch/metadata.xml
new file mode 100644
index 0000000000..18992678c8
--- /dev/null
+++ b/app-dicts/canna-2ch/metadata.xml
@@ -0,0 +1,15 @@
+
+
+
+
+ co-maintainers welcome
+ Alessandro Barbieri
+ lssndrbarbieri@gmail.com
+
+
+
+ omaemona
+
+
diff --git a/app-dicts/canna-bonobo/Manifest b/app-dicts/canna-bonobo/Manifest
new file mode 100644
index 0000000000..829db8a0da
--- /dev/null
+++ b/app-dicts/canna-bonobo/Manifest
@@ -0,0 +1 @@
+DIST pubdic-bonobo-20021025.tar.bz2 16654 BLAKE2B 594b0632da121ffb6172b4d3455e3a8f8da050f2829f20841d30576434afd2b265005c86f3fd205531efad62a8e26c4ed930c27e40e984523f8a872438029045 SHA512 d858df12e2e5eff6d9473f4c6a20722010caade7f1aa5df7de5e647d2ed3f0eaed269c36891fbaecc5ff68df5e708b1a78b9b68b82de4c0362c905a0e2dd5edb
diff --git a/app-dicts/canna-bonobo/canna-bonobo-20021025.ebuild b/app-dicts/canna-bonobo/canna-bonobo-20021025.ebuild
new file mode 100644
index 0000000000..7f350de929
--- /dev/null
+++ b/app-dicts/canna-bonobo/canna-bonobo-20021025.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CANNADICS=( bonobo )
+DICSDIRFILE="${FILESDIR}/bonobo.dics.dir"
+MYPN="pubdic-bonobo"
+
+inherit cannadic
+
+DESCRIPTION="supporting dictionaries for Canna"
+HOMEPAGE="http://bonobo.gnome.gr.jp/~nakai/canna/"
+SRC_URI="http://bonobo.gnome.gr.jp/~nakai/canna/${MYPN}-${PV}.tar.bz2"
+S="${WORKDIR}/${MYPN}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=app-i18n/canna-3.6_p3"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+ cat bonobo.p | sort >> y.p || die
+ cat y.p | /usr/libexec/canna/pod - -p -i -2 > bonobo.spl || die
+ mergeword < bonobo.spl > bonobo.t || die
+ rm -rf bonobo.spl || die
+}
diff --git a/app-dicts/canna-bonobo/files/bonobo.dics.dir b/app-dicts/canna-bonobo/files/bonobo.dics.dir
new file mode 100644
index 0000000000..4771cf8cc1
--- /dev/null
+++ b/app-dicts/canna-bonobo/files/bonobo.dics.dir
@@ -0,0 +1,2 @@
+bonobo.cbd(bonobo.mwd) -bonobo---
+bonobo.cld(bonobo.mwd) -bonobo---
diff --git a/app-dicts/canna-bonobo/metadata.xml b/app-dicts/canna-bonobo/metadata.xml
new file mode 100644
index 0000000000..5c9aa72537
--- /dev/null
+++ b/app-dicts/canna-bonobo/metadata.xml
@@ -0,0 +1,9 @@
+
+
+
+
+ co-maintainers welcome
+ Alessandro Barbieri
+ lssndrbarbieri@gmail.com
+
+
diff --git a/app-dicts/canna-canada-med/Manifest b/app-dicts/canna-canada-med/Manifest
new file mode 100644
index 0000000000..a60a3a012a
--- /dev/null
+++ b/app-dicts/canna-canada-med/Manifest
@@ -0,0 +1 @@
+DIST canna-canada-med-20030309.tar.gz 2032221 BLAKE2B 5a57242e537491d86f2e52ad30c2e9dfa15b75c3d3753e7336d40b920b602961c022686ceaf4d7f508669507f301c99114f7cf244f30a36352452a7fea77f36f SHA512 d8da724fc39742bdf22a79a61cb1ed8547b969a8c4b55d715e402cccc705ba7b1b09bf194ef7f88536e8b5d1c9c983a9bf41cf360e24c5e6c7eacd1c7d67f1ab
diff --git a/app-dicts/canna-canada-med/canna-canada-med-20030309.ebuild b/app-dicts/canna-canada-med/canna-canada-med-20030309.ebuild
new file mode 100644
index 0000000000..269b608dea
--- /dev/null
+++ b/app-dicts/canna-canada-med/canna-canada-med-20030309.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CANNADICS=( med henkaku oldchar medinst medx sfx )
+
+inherit cannadic
+
+DESCRIPTION="medical term dictionary for canna"
+HOMEPAGE="https://web.archive.org/web/20050723235132/http://spica.onh.go.jp/med_dic/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+S="${WORKDIR}/canada_med"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=app-i18n/canna-3.6_p3"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ default
+ mv dics.dir.add canadamed.dics.dir || die
+ export DICSDIRFILE="${S}/canadamed.dics.dir"
+}
diff --git a/app-dicts/canna-canada-med/metadata.xml b/app-dicts/canna-canada-med/metadata.xml
new file mode 100644
index 0000000000..5c9aa72537
--- /dev/null
+++ b/app-dicts/canna-canada-med/metadata.xml
@@ -0,0 +1,9 @@
+
+
+
+
+ co-maintainers welcome
+ Alessandro Barbieri
+ lssndrbarbieri@gmail.com
+
+
diff --git a/app-dicts/canna-cannadic/Manifest b/app-dicts/canna-cannadic/Manifest
new file mode 100644
index 0000000000..02c8a7cc8a
--- /dev/null
+++ b/app-dicts/canna-cannadic/Manifest
@@ -0,0 +1 @@
+DIST cannadic-0.95c.tar 3072000 BLAKE2B f7359ea3f329d88e50b621628a303c3b5e04a4aeff91278b5990509f9d493c566a971dec6bb8f05c9fc20ab14ba899700b622f04d268b4cc492977d16a2fda2e SHA512 1b9c80fc941a24c25b110617e300d988fa520cf0b22302891bfaefb738fc84b58094d62375cbd2a28e9ce2f3ebddff7f870693a4fcfee4dc533f0b6456483beb
diff --git a/app-dicts/canna-cannadic/canna-cannadic-0.95c.ebuild b/app-dicts/canna-cannadic/canna-cannadic-0.95c.ebuild
new file mode 100644
index 0000000000..68d1b53028
--- /dev/null
+++ b/app-dicts/canna-cannadic/canna-cannadic-0.95c.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CANNADICS=( gcanna gcannaf )
+DICSDIRFILE="${FILESDIR}/05cannadic.dics.dir"
+MY_P="${P/canna-/}"
+
+inherit cannadic
+
+DESCRIPTION="Japanese dictionary as a supplement/replacement to Canna3.5b2"
+HOMEPAGE="https://web.archive.org/web/20150905224451/http://cannadic.oucrc.org/"
+SRC_URI="https://web.archive.org/web/20150919101016if_/http://cannadic.oucrc.org/${MY_P}.tar.gz -> ${MY_P}.tar"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="app-i18n/canna"
+
+src_compile() {
+ emake maindic
+}
diff --git a/app-dicts/canna-cannadic/files/05cannadic.dics.dir b/app-dicts/canna-cannadic/files/05cannadic.dics.dir
new file mode 100644
index 0000000000..fbbd5b4cd8
--- /dev/null
+++ b/app-dicts/canna-cannadic/files/05cannadic.dics.dir
@@ -0,0 +1,3 @@
+gcanna.cbd(gcanna.mwd) -gcanna---
+gcanna.cld(gcanna.mwd) -gcanna---
+gcannaf.ctd(.swd) -gcannaf---
diff --git a/app-dicts/canna-cannadic/metadata.xml b/app-dicts/canna-cannadic/metadata.xml
new file mode 100644
index 0000000000..5c9aa72537
--- /dev/null
+++ b/app-dicts/canna-cannadic/metadata.xml
@@ -0,0 +1,9 @@
+
+
+
+
+ co-maintainers welcome
+ Alessandro Barbieri
+ lssndrbarbieri@gmail.com
+
+
diff --git a/app-dicts/canna-shion/Manifest b/app-dicts/canna-shion/Manifest
new file mode 100644
index 0000000000..03e6048bf0
--- /dev/null
+++ b/app-dicts/canna-shion/Manifest
@@ -0,0 +1,2 @@
+DIST canna-shion_0.0.20010204-13.debian.tar.xz 3948 BLAKE2B 9c213f7ec8eb63782ee1677c4d51772846a6bb110d25406972bc03fe60fc504d8274c7293e0db14b5eb08cb19f968dbb5dedca36b464b0c8f6e1c929c4e6a58f SHA512 67a2568ad403f8132d18b9a832ae8030aae3d6d497cc35b372dc00f813462433850470e758682c824dd50cf1c556a900aa7ab3a012afcc9402c715dfe768ff74
+DIST canna-shion_0.0.20010204.orig.tar.gz 1396657 BLAKE2B ff3ed61c40d5f58df6e07f71e93b5ad683f00bf82f012f787f88e2eed0c3d5c9535805d0ad356a98caf297ced366fe5059d9555ea8950faa28aa2f1b5571cfe2 SHA512 bf375fdc4cf1549a2808fbb53b77b5fadec6fd5e45ae72445356c3cf3504d297285f776eec19fc476b5a487e092917ce71a25992995831f9fd8bf673316c93e9
diff --git a/app-dicts/canna-shion/canna-shion-0.0.20010204_p13.ebuild b/app-dicts/canna-shion/canna-shion-0.0.20010204_p13.ebuild
new file mode 100644
index 0000000000..75df98b0e8
--- /dev/null
+++ b/app-dicts/canna-shion/canna-shion-0.0.20010204_p13.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CANNADICS=( basho kaom keisan pub scien sup )
+DEBIAN="${PN}_${PV/_p/-}"
+MYPV="$(ver_cut 1-3)"
+
+inherit cannadic
+
+DESCRIPTION="supporting dictionaries for Canna"
+HOMEPAGE="https://web.archive.org/web/20051217013038/http://www.coolbrain.net:80/shion.html"
+SRC_URI="
+ mirror://debian/pool/main/c/${PN}/${PN}_${MYPV}.orig.tar.gz
+ mirror://debian/pool/main/c/${PN}/${DEBIAN}.debian.tar.xz
+"
+S="${WORKDIR}/${PN}-${MYPV}.orig"
+
+LICENSE="shion"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=app-i18n/canna-3.6_p3"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-remove-first-line.patch" )
+
+src_prepare() {
+ default
+ mv "${WORKDIR}/debian/shion.dics.dir.off" "${WORKDIR}/debian/shion.dics.dir" || die
+ export DICSDIRFILE="${WORKDIR}/debian/shion.dics.dir"
+}
diff --git a/app-dicts/canna-shion/files/canna-shion-0.0.20010204_p13-remove-first-line.patch b/app-dicts/canna-shion/files/canna-shion-0.0.20010204_p13-remove-first-line.patch
new file mode 100644
index 0000000000..3d4b0c043c
--- /dev/null
+++ b/app-dicts/canna-shion/files/canna-shion-0.0.20010204_p13-remove-first-line.patch
@@ -0,0 +1,42 @@
+--- a/basho.ctd
++++ b/basho.ctd
+@@ -1,4 +1,3 @@
+-# $Id: basho.ctd,v 1.1 2001/01/26 21:02:02 lain Exp $
+ あいお #CN 秋穂
+ あいおい #CN 相生
+ あいかわ #JCN*1 愛川
+--- a/kaom.ctd
++++ b/kaom.ctd
+@@ -1,4 +1,3 @@
+-# $Id: kaom.ctd,v 1.1 2001/01/21 23:42:22 lain Exp $
+ あうー、 #T35 (>.<)
+ あげて、 #T35 (ノ^^)ノ
+ あせ、 #T35*15 (^^; (;^_^A
+--- a/keisan.ctd
++++ b/keisan.ctd
+@@ -1,4 +1,3 @@
+-# $Id: keisan.ctd,v 1.1 2001/01/26 21:15:34 lain Exp $
+ あーかいば #T35*1 アーカイバ
+ あーかいぶ #T30*8 アーカイブ
+ あーきてくちゃ #T35*25 アーキテクチャ
+--- a/pub.ctd
++++ b/pub.ctd
+@@ -1,4 +1,3 @@
+-# $Id: kaom.ctd,v 1.1 2001/05/30 19:57:12 lain Exp $
+ ! #T35*76 ! 感嘆符
+ !! #T35*76 !!
+ != #T35*76 ≠
+--- a/scien.ctd
++++ b/scien.ctd
+@@ -1,4 +1,3 @@
+-# $Id: suppli.ctd,v 1.1 2001/01/26 21:28:56 lain Exp $
+ あーかいぶ #T30 アーカイブ
+ あーく #T35 アーク
+ あーくこうげん #T35 アーク光源
+--- a/sup.ctd
++++ b/sup.ctd
+@@ -1,4 +1,3 @@
+-# $Id: suppli.ctd,v 1.1 2001/05/30 20:00:09 lain Exp $
+ あーかいう゛ #T30 アーカイヴ
+ あーかんそー #CN アーカンソー
+ あーけーど #T35 アーケード
diff --git a/app-dicts/canna-shion/metadata.xml b/app-dicts/canna-shion/metadata.xml
new file mode 100644
index 0000000000..5c9aa72537
--- /dev/null
+++ b/app-dicts/canna-shion/metadata.xml
@@ -0,0 +1,9 @@
+
+
+
+
+ co-maintainers welcome
+ Alessandro Barbieri
+ lssndrbarbieri@gmail.com
+
+
diff --git a/app-dicts/canna-skk-dictionaries/Manifest b/app-dicts/canna-skk-dictionaries/Manifest
new file mode 100644
index 0000000000..60ff8ff0fe
--- /dev/null
+++ b/app-dicts/canna-skk-dictionaries/Manifest
@@ -0,0 +1 @@
+DIST skk-dictionaries.patch 6286237 BLAKE2B cd677cff3eaa872a204a125ee323f5eac563ec4eba060572618edd2472baf63f1eb8c57fbacd88ee17748d02a08f91b42e05ee348e6cf1a726559b24d3847e25 SHA512 380fda2d95a1cad1ba74fa0c434294e749f02c9f57f84017a27a0cbee0995ed3a3ccdfc86dfb42338ecbf14e4a9da75d5ef2beb0dc1f2e1b3e4bc90ba0990df2
diff --git a/app-dicts/canna-skk-dictionaries/canna-skk-dictionaries-0.ebuild b/app-dicts/canna-skk-dictionaries/canna-skk-dictionaries-0.ebuild
new file mode 100644
index 0000000000..054155fad1
--- /dev/null
+++ b/app-dicts/canna-skk-dictionaries/canna-skk-dictionaries-0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CANNADICS=( geo zipcode )
+DICSDIRFILE="${FILESDIR}/02skk-dictionaries.dics.dir"
+MYPN="${PN/canna-/}"
+
+inherit cannadic
+
+DESCRIPTION="skk jisyo zipcode and geo datasets for canna"
+HOMEPAGE="https://src.fedoraproject.org/rpms/Canna"
+SRC_URI="https://src.fedoraproject.org/rpms/Canna/raw/f29/f/${MYPN}.patch"
+S="${WORKDIR}"
+
+LICENSE="public-domain GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=app-i18n/canna-3.6_p3"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+ mkdir -p dic/ideo/words/ || die
+ tail -n +30 "${DISTDIR}/${MYPN}.patch" | patch -p1 || die
+ mv dic/ideo/words/*.t -t . || die
+ sed -e '/\# This/d' -e '/\# Date/d' -i *.t || die
+}
+
+src_compile() {
+ mkbindic zipcode.t || die
+ mkbindic geo.t || die
+}
diff --git a/app-dicts/canna-skk-dictionaries/files/02skk-dictionaries.dics.dir b/app-dicts/canna-skk-dictionaries/files/02skk-dictionaries.dics.dir
new file mode 100644
index 0000000000..c62d75a30b
--- /dev/null
+++ b/app-dicts/canna-skk-dictionaries/files/02skk-dictionaries.dics.dir
@@ -0,0 +1,5 @@
+zipcode.cbd(zipcode.mwd) -zipcode---
+zipcode.cld(zipcode.mwd) -zipcode---
+
+geo.cbd(geo.mwd) -geo---
+geo.cld(geo.mwd) -geo---
diff --git a/app-dicts/canna-skk-dictionaries/metadata.xml b/app-dicts/canna-skk-dictionaries/metadata.xml
new file mode 100644
index 0000000000..5c9aa72537
--- /dev/null
+++ b/app-dicts/canna-skk-dictionaries/metadata.xml
@@ -0,0 +1,9 @@
+
+
+
+
+ co-maintainers welcome
+ Alessandro Barbieri
+ lssndrbarbieri@gmail.com
+
+
diff --git a/app-dicts/canna-yubin/Manifest b/app-dicts/canna-yubin/Manifest
new file mode 100644
index 0000000000..9c8f788a03
--- /dev/null
+++ b/app-dicts/canna-yubin/Manifest
@@ -0,0 +1 @@
+DIST canna-yubin-0.4.0.20210430.0.tar.xz 1913580 BLAKE2B 0c7663f3b71e2409022afdd030150753b7483a01ce718e2931bbb8cf8322ac863db789f6488d48342efa6dad29e7b37f2bf81da6cb3b68de9550a6b6344efa13 SHA512 e5a9d4979b05d0b6d32a2f80c5be7aa6749fb462eab2a88725b843622b37140fb171e8e4cfcf5a494e90b940561d383332cddbb0950e9bc0b26f7a5ef86d9923
diff --git a/app-dicts/canna-yubin/canna-yubin-0.4.0.20210430.0.ebuild b/app-dicts/canna-yubin/canna-yubin-0.4.0.20210430.0.ebuild
new file mode 100644
index 0000000000..846a74d7b1
--- /dev/null
+++ b/app-dicts/canna-yubin/canna-yubin-0.4.0.20210430.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CANNADICS=( yubin7 )
+DICSDIRFILE="${FILESDIR}/yubin.dics.dir"
+
+inherit cannadic
+
+DESCRIPTION="Japanese postal code number extension dictionary for Canna"
+HOMEPAGE="https://osdn.net/projects/canna-yubin/"
+SRC_URI="https://jaist.dl.osdn.jp/${PN}/75047/${P}.tar.xz"
+
+LICENSE="GPL-2+ public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=app-i18n/canna-3.6_p3"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+ MAKEOPTS="-j1" emake
+}
diff --git a/app-dicts/canna-yubin/files/yubin.dics.dir b/app-dicts/canna-yubin/files/yubin.dics.dir
new file mode 100644
index 0000000000..f18f7f086e
--- /dev/null
+++ b/app-dicts/canna-yubin/files/yubin.dics.dir
@@ -0,0 +1,2 @@
+yubin7.cbd(yubin7.mwd) -yubin7---
+yubin7.cld(yubin7.mwd) -yubin7---
diff --git a/app-dicts/canna-yubin/metadata.xml b/app-dicts/canna-yubin/metadata.xml
new file mode 100644
index 0000000000..5c9aa72537
--- /dev/null
+++ b/app-dicts/canna-yubin/metadata.xml
@@ -0,0 +1,9 @@
+
+
+
+
+ co-maintainers welcome
+ Alessandro Barbieri
+ lssndrbarbieri@gmail.com
+
+
diff --git a/app-editors/neovim-qt/neovim-qt-0.2.16.1.ebuild b/app-editors/neovim-qt/neovim-qt-0.2.16.1.ebuild
index 5dfcfa5861..14609e0162 100644
--- a/app-editors/neovim-qt/neovim-qt-0.2.16.1.ebuild
+++ b/app-editors/neovim-qt/neovim-qt-0.2.16.1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit cmake
+inherit cmake xdg-utils
DESCRIPTION="Neovim client library and GUI, in Qt5"
HOMEPAGE="https://github.com/equalsraf/neovim-qt"
@@ -12,13 +12,14 @@ SRC_URI="https://github.com/equalsraf/neovim-qt/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="ISC"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="gcov"
+IUSE=""
DEPEND="
dev-libs/msgpack
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
+ dev-qt/qtsvg:5
dev-qt/qttest:5
dev-qt/qtwidgets:5"
RDEPEND="${DEPEND}
@@ -26,9 +27,19 @@ RDEPEND="${DEPEND}
src_configure() {
local mycmakeargs=(
- -DUSE_GCOV=$(usex gcov ON OFF)
-DUSE_SYSTEM_MSGPACK=ON
+ -DUSE_GCOV=OFF
+ -DENABLE_TESTS=OFF
+ -DBUILD_SHARED_LIBS=OFF # it links to static lib
)
cmake_src_configure
}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
diff --git a/app-emacs/yc/Manifest b/app-emacs/yc/Manifest
new file mode 100644
index 0000000000..c25b225a8d
--- /dev/null
+++ b/app-emacs/yc/Manifest
@@ -0,0 +1 @@
+DIST yc-5.2.1.el.gz 33305 BLAKE2B 8bed47715f49466425afefd036cf562055025564e50ae219e027848104e3851b6cba29f74bcf81487d2494d314a290eabe27e128968dbba9d475562e248a267b SHA512 11c8d63a9f6cb94118a00976518949ab50496f8b8f994a8e1c352be5deefc549540935e0727b036c2b3c493366cfb8c47f040fcc425174b6668ec9f5e8d499dc
diff --git a/app-emacs/yc/files/50yc-gentoo.el b/app-emacs/yc/files/50yc-gentoo.el
new file mode 100644
index 0000000000..431f7e90ae
--- /dev/null
+++ b/app-emacs/yc/files/50yc-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/yc/files/sample.dot.emacs b/app-emacs/yc/files/sample.dot.emacs
new file mode 100644
index 0000000000..101532e704
--- /dev/null
+++ b/app-emacs/yc/files/sample.dot.emacs
@@ -0,0 +1,12 @@
+;;;; -*- mode: lisp-interaction; syntax: elisp; coding: iso-2022-7bit -*-
+
+;;;; Configuration for yc
+(setq yc-server-host "unix")
+;If you use inet socket service, enable the following line.
+;(setq yc-server-host "localhost")
+(setq yc-use-color t)
+(if (eq window-system 'x)
+ (setq yc-use-fence nil)
+ (setq yc-use-fence t))
+(load "yc")
+(global-yc-mode 1)
diff --git a/app-emacs/yc/files/sample.hosts.canna b/app-emacs/yc/files/sample.hosts.canna
new file mode 100644
index 0000000000..960d75f526
--- /dev/null
+++ b/app-emacs/yc/files/sample.hosts.canna
@@ -0,0 +1,2 @@
+localhost
+unix
diff --git a/app-emacs/yc/files/yc-5.2.1-emacs-26.patch b/app-emacs/yc/files/yc-5.2.1-emacs-26.patch
new file mode 100644
index 0000000000..19925c65c4
--- /dev/null
+++ b/app-emacs/yc/files/yc-5.2.1-emacs-26.patch
@@ -0,0 +1,11 @@
+--- a/yc.el
++++ b/yc.el
+@@ -2071,7 +2071,7 @@
+ ;; $BJ8@a$r;XDj$7$J$$>l9g!"8=:_$NJ8@a$,BP>]$H$J$k(B
+ ;; $BFI$_$rl9g!";XDjJ8@a0J9_$NFI$_$r:o=|$9$k(B
+-(defun yc-yomi (&optional idx &optional cut)
++(defun yc-yomi (&optional idx cut)
+ (if (integerp idx)
+ (yc-put-bunsetsu-yomi idx (yc-get-bunsetsu-yomi idx cut) cut)
+ (yc-put-bunsetsu-yomi yc-mark (yc-get-bunsetsu-yomi yc-mark cut) cut)))
diff --git a/app-emacs/yc/metadata.xml b/app-emacs/yc/metadata.xml
new file mode 100644
index 0000000000..37185a78fe
--- /dev/null
+++ b/app-emacs/yc/metadata.xml
@@ -0,0 +1,9 @@
+
+
+
+
+ co-maintainers welcome
+ Alessandro Barbieri
+ lssndrbarbieri@gmail.com
+
+
diff --git a/app-emacs/yc/yc-5.2.1.ebuild b/app-emacs/yc/yc-5.2.1.ebuild
new file mode 100644
index 0000000000..f76978fa94
--- /dev/null
+++ b/app-emacs/yc/yc-5.2.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Yet another Canna client on Emacsen"
+HOMEPAGE="http://www.ceres.dti.ne.jp/~knak/yc.html"
+SRC_URI="http://www.ceres.dti.ne.jp/~knak/${P}.el.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="app-i18n/canna"
+
+ELISP_PATCHES="${P}-emacs-26.patch"
+SITEFILE="50${PN}-gentoo.el"
+
+src_install() {
+ elisp_src_install
+
+ dodoc "${FILESDIR}"/sample.{dot.emacs,hosts.canna}
+}
+
+pkg_postinst() {
+ elisp_pkg_postinst
+
+ elog "See the sample.dot.emacs in ${EPREFIX}/usr/share/doc/${PF}."
+ elog
+ elog "And If you use unix domain socket for connecting the canna server,"
+ elog "please confirm that there's *no* following line in your ~/.emacs:"
+ elog ' (setq yc-server-host "localhost")'
+ elog
+ elog "If you use inet domain socket for connecting the canna server,"
+ elog "please modify as following in ${EPREFIX}/etc/conf.d/canna:"
+ elog ' CANNASERVER_OPTS="-inet"'
+ elog
+ elog "And create ${EPREFIX}/etc/hosts.canna."
+ elog "See the sample.hosts.canna in ${EPREFIX}/usr/share/doc/${PF}."
+}
diff --git a/app-i18n/canfep/Manifest b/app-i18n/canfep/Manifest
new file mode 100644
index 0000000000..8b3ed0252f
--- /dev/null
+++ b/app-i18n/canfep/Manifest
@@ -0,0 +1 @@
+DIST canfep-1.0.tar.gz 8067 BLAKE2B 1a6e8af357d2b7aaccf442b0f8bab577ed05a5a0fdf2fb4c189105c2c41f739c2e559e740584bf393fcc52d3f3bd0bb6216e06e2b685f62f7dded9d576e95bed SHA512 0fd7c8ca56282fa537b76fe33f46e03d4f0f4727528ccad95cd4726888372da9158fc8bed2cdc67d645defb479040cd4a4d0999f69d38fd8b4080f7ece4e67d6
diff --git a/app-i18n/canfep/canfep-1.0-r1.ebuild b/app-i18n/canfep/canfep-1.0-r1.ebuild
new file mode 100644
index 0000000000..5c5fdabb81
--- /dev/null
+++ b/app-i18n/canfep/canfep-1.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Canna Japanese kana-kanji frontend processor on console"
+HOMEPAGE="https://web.archive.org/web/20170517105759/http://www.geocities.co.jp/SiliconValley-Bay/7584/canfep/"
+SRC_URI="https://web.archive.org/web/20181106043248if_/http://www.geocities.co.jp/SiliconValley-Bay/7584/${PN}/${P}.tar.gz"
+
+LICENSE="canfep"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ app-i18n/canna
+ sys-libs/ncurses:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${P}-utf8.patch"
+ "${FILESDIR}/${PN}-posix-pty.patch"
+ "${FILESDIR}/${PN}-termcap.patch"
+ "${FILESDIR}/${P}-respect-flags.patch"
+)
+
+src_compile() {
+ tc-export CXX
+ LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" emake
+}
+
+src_install() {
+ dobin "${PN}"
+ dodoc 00{changes,readme}
+}
diff --git a/app-i18n/canfep/files/canfep-1.0-respect-flags.patch b/app-i18n/canfep/files/canfep-1.0-respect-flags.patch
new file mode 100644
index 0000000000..4dbcbec77f
--- /dev/null
+++ b/app-i18n/canfep/files/canfep-1.0-respect-flags.patch
@@ -0,0 +1,24 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,5 @@
+ # Linux
+-CC=c++
+-LIBS=-lcanna -ltermcap
+-CFLAGS=-O2 -g
++LIBS += -lcanna
+
+ # Solaris 2.6J
+ #CC=c++
+@@ -19,10 +17,10 @@
+ all: $(TARGET)
+
+ $(TARGET): $(OBJS)
+- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS)
++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -fPIE -o $@ $(OBJS) $(LIBS)
+
+ .C.o:
+- $(CC) $(CFLAGS) -c $<
++ $(CXX) $(CXXFLAGS) -fPIC -c $<
+
+ clean:
+ rm -rf $(TARGET) $(OBJS)
diff --git a/app-i18n/canfep/files/canfep-1.0-utf8.patch b/app-i18n/canfep/files/canfep-1.0-utf8.patch
new file mode 100644
index 0000000000..e798d109d2
--- /dev/null
+++ b/app-i18n/canfep/files/canfep-1.0-utf8.patch
@@ -0,0 +1,190 @@
+--- a/canna.C
++++ b/canna.C
+@@ -4,10 +4,87 @@
+ #define FEP_KEY 15
+ #define ESC_KEY 27
+
++void Canna::write_utf8(int fd, char *p, int len)
++{
++ if (eucjp_to_utf8_cd == (iconv_t)-1)
++ write(fd, p, strlen(p));
++ else
++ {
++ char *putf8 = iconv_string(eucjp_to_utf8_cd, p, len);
++ write(fd, putf8, strlen(putf8));
++ free(putf8);
++ }
++}
++
++char * Canna::iconv_string(iconv_t fd, char *str, int slen)
++{
++ char *from;
++ size_t fromlen;
++ char *to;
++ size_t tolen;
++ size_t len = 0;
++ size_t done = 0;
++ char *result = NULL;
++ char *p;
++ int l;
++
++ from = (char *)str;
++ fromlen = slen;
++ for (;;)
++ {
++ if (len == 0 || errno == E2BIG)
++ {
++ /* Allocate enough room for most conversions. When re-allocating
++ * increase the buffer size. */
++ len = len + fromlen * 2 + 40;
++ p = (char*)malloc((unsigned)len);
++ if (p != NULL && done > 0)
++ memcpy(p, result, done);
++ free(result);
++ result = p;
++ if (result == NULL) /* out of memory */
++ break;
++ }
++
++ to = (char *)result + done;
++ tolen = len - done - 2;
++ /* Avoid a warning for systems with a wrong iconv() prototype by
++ * casting the second argument to void *. */
++ if (iconv(fd, &from, &fromlen, &to, &tolen) != (size_t)-1)
++ {
++ /* Finished, append a NUL. */
++ *to = 0;
++ break;
++ }
++ /* Check both ICONV_EILSEQ and EILSEQ, because the dynamically loaded
++ * iconv library may use one of them. */
++ if (errno == EILSEQ || errno == EILSEQ)
++ {
++ /* Can't convert: insert a '?' and skip a character. This assumes
++ * conversion from 'encoding' to something else. In other
++ * situations we don't know what to skip anyway. */
++ *to++ = *from++;
++ fromlen -= 1;
++ }
++ else if (errno != E2BIG)
++ {
++ /* conversion failed */
++ free(result);
++ result = NULL;
++ break;
++ }
++ /* Not enough room or skipping illegal sequence. */
++ done = to - (char *)result;
++ }
++ return result;
++}
++
+ // コンストラクタだよん
+ Canna::Canna(int ac, char** av, char* amsg, char* emsg):
+ Pty(ac, av, amsg, emsg)
+ {
++ char *p_lang = getenv("LANG");
++
+ // かんなの初期化
+ jrKanjiControl(0, KC_INITIALIZE, 0);
+ jrKanjiControl(0, KC_SETAPPNAME, "canfep");
+@@ -15,6 +92,9 @@
+ jrKanjiControl(0, KC_QUERYMODE, (char*) saveMode);
+ jrKanjiControl(0, KC_SETWIDTH, (char*) 72);
+
++ if (p_lang == NULL || strstr(p_lang, "-8"))
++ eucjp_to_utf8_cd = iconv_open("utf-8", "euc-jp");
++
+ mode(saveMode);
+ }
+
+@@ -25,6 +105,8 @@
+ jrKanjiControl(0, KC_KILL, (char*) &ksv);
+ jrKanjiControl(0, KC_FINALIZE, 0);
+
++ if (eucjp_to_utf8_cd != (iconv_t)-1)
++ iconv_close(eucjp_to_utf8_cd);
+ mode(saveMode);
+ }
+
+@@ -32,7 +114,7 @@
+ void
+ Canna::kakutei(unsigned char* p)
+ {
+- write(wfd, p, strlen((char*) p));
++ write_utf8(wfd, (char*)p, strlen((char*) p));
+ }
+
+ // 変換中(未確定)の文字列を出力する
+@@ -42,13 +124,13 @@
+ write(rfd, sc, strlen(sc));
+ write(rfd, rc, strlen(rc));
+ write(rfd, us, strlen(us));
+- write(rfd, p, pos);
++ write_utf8(rfd, (char*)p, pos);
+ write(rfd, ue, strlen(ue));
+ write(rfd, so, strlen(so));
+- write(rfd, p + pos, len);
++ write_utf8(rfd, (char*)p + pos, len);
+ write(rfd, se, strlen(se));
+ write(rfd, us, strlen(us));
+- write(rfd, p + pos + len, strlen((char*) p + pos + len));
++ write_utf8(rfd, (char*)p + pos + len, strlen((char*) p + pos + len));
+ write(rfd, ue, strlen(ue));
+ }
+
+@@ -73,7 +155,7 @@
+ write(rfd, sc, strlen(sc));
+ write(rfd, ts, strlen(ts));
+ write(rfd, ce, strlen(ce));
+- write(rfd, p, strlen((char*) p));
++ write_utf8(rfd, (char*)p, strlen((char*) p));
+ write(rfd, fs, strlen(fs));
+ }
+
+@@ -84,13 +166,13 @@
+ write(rfd, sc, strlen(sc));
+ write(rfd, ts, strlen(ts));
+ write(rfd, ce, strlen(ce));
+- write(rfd, p, strlen((char*) p));
++ write_utf8(rfd, (char*)p, strlen((char*) p));
+ write(rfd, " ", 1);
+- write(rfd, l, pos);
++ write_utf8(rfd, (char*)l, pos);
+ write(rfd, so, strlen(so));
+- write(rfd, l + pos, len);
++ write_utf8(rfd, (char*)l + pos, len);
+ write(rfd, se, strlen(se));
+- write(rfd, l + pos + len, strlen((char*) l + pos +len));
++ write_utf8(rfd, (char*)l + pos + len, strlen((char*) l + pos +len));
+ write(rfd, fs, strlen(fs));
+ }
+
+--- a/canna.H
++++ b/canna.H
+@@ -5,6 +5,8 @@
+ #include
+ #include
+ #include
++#include
++#include
+ #include
+
+ #include "pty.H"
+@@ -17,6 +19,7 @@
+ jrKanjiStatus ks;
+ jrKanjiStatusWithValue ksv;
+ private:
++ iconv_t eucjp_to_utf8_cd;
+ unsigned char currentMode[BUFSIZ];
+ unsigned char saveMode[BUFSIZ];
+ private:
+@@ -25,6 +28,8 @@
+ void delhenkan(int len);
+ void mode(unsigned char* p);
+ void gline(unsigned char* p, unsigned char* l, int pos, int len);
++ void write_utf8(int fd, char *p, int len);
++ char* iconv_string(iconv_t fd, char *str, int slen);
+ public:
+ void loop();
+ };
diff --git a/app-i18n/canfep/files/canfep-posix-pty.patch b/app-i18n/canfep/files/canfep-posix-pty.patch
new file mode 100644
index 0000000000..caa451232e
--- /dev/null
+++ b/app-i18n/canfep/files/canfep-posix-pty.patch
@@ -0,0 +1,67 @@
+https://bugs.gentoo.org/show_bug.cgi?id=212709
+
+Author: OKUMURA N. Shin-ya
+
+--- a/pty.C
++++ b/pty.C
+@@ -257,6 +257,23 @@
+ }
+ }
+
++#if defined(_POSIX_C_SOURCE)
++ // BSD pty が開けないので、POSIX の方法を試す
++ if ((master = posix_openpt(O_RDWR)) >= 0) {
++ if (grantpt(master) == 0 && unlockpt(master) == 0) {
++ // マスタデバイス名は固定
++ strcpy(line, "/dev/ptmx");
++ tcgetattr(0, &tt);
++ tt.c_iflag &= ~ISTRIP;
++ ioctl(0, TIOCGWINSZ, (char*) &win);
++ return;
++ }
++ close(master);
++ } else {
++ perror("/dev/ptmx");
++ }
++#endif // _POSIX_C_SOURCE
++
+ printf("Out of pty's\n");
+ fail();
+ }
+@@ -265,12 +282,36 @@
+ void
+ Pty::getslave()
+ {
++#if defined(_POSIX_C_SOURCE)
++ // マスタデバイスが POSIX 方式の場合
++ if (strcmp(line, "/dev/ptmx") == 0) {
++ char *slave_devname = ptsname(master);
++ if (slave_devname == NULL) {
++ perror("ptsname");
++ fail();
++ }
++ slave = open(slave_devname, O_RDWR);
++ if (slave < 0) {
++ perror(slave_devname);
++ fail();
++ }
++ strcpy(line, slave_devname);
++ } else {
++ line[strlen("/dev/")] = 't';
++ slave = open(line, O_RDWR);
++ if (slave < 0) {
++ perror(line);
++ fail();
++ }
++ }
++#else // ! _POSIX_C_SOURCE
+ line[strlen("/dev/")] = 't';
+ slave = open(line, O_RDWR);
+ if (slave < 0) {
+ perror(line);
+ fail();
+ }
++#endif // _POSIX_C_SOURCE
+ tcsetattr(slave, TCSAFLUSH, &tt);
+ if (!hs)
+ win.ws_row--;
diff --git a/app-i18n/canfep/files/canfep-termcap.patch b/app-i18n/canfep/files/canfep-termcap.patch
new file mode 100644
index 0000000000..afd215b07e
--- /dev/null
+++ b/app-i18n/canfep/files/canfep-termcap.patch
@@ -0,0 +1,266 @@
+--- a/pty.C
++++ b/pty.C
+@@ -4,9 +4,18 @@
+ int Pty::child = 0;
+ struct termios Pty::tt;
+ int Pty::wfd = 0;
++char Pty::buf[] = "";
++char Pty::funcstr[] = "";
+ int Pty::hs = 0;
++char* Pty::so = 0;
++char* Pty::se = 0;
++char* Pty::us = 0;
++char* Pty::ue = 0;
++char* Pty::sc = 0;
++char* Pty::rc = 0;
+ char* Pty::ce = 0;
+ char* Pty::ts = 0;
++char* Pty::fs = 0;
+ char* Pty::ds = 0;
+ char Pty::endstr[] = "";
+ char Pty::endmsg[] = "";
+@@ -14,88 +23,7 @@
+ // コンストラクタだよん
+ Pty::Pty(int ac, char** av, char* amsg, char* emsg)
+ {
+- // 環境変数 TERM のエントリを取得
+- char buff[BUFSIZ];
+- char* term = getenv("TERM");
+- if (!term)
+- term = "vt100";
+- int ret = tgetent(buff, term);
+- if (ret != 1) {
+- tgetent(buff, "vt100");
+- putenv("TERM=vt100");
+- }
+-
+- // termcap から装飾用のエントリを取ってくる
+- char funcstr[BUFSIZ];
+- char* pt = funcstr;
+-
+- // スタンドアウト (反転)
+- so = tgetstr("so", &pt);
+- adjstr(so);
+- se = tgetstr("se", &pt);
+- adjstr(se);
+-
+- // アンダーライン (下線)
+- us = tgetstr("us", &pt);
+- adjstr(us);
+- ue = tgetstr("ue", &pt);
+- adjstr(ue);
+-
+- // カーソル位置の保存,保存した位置への復帰
+- sc = tgetstr("sc", &pt);
+- adjstr(sc);
+- rc = tgetstr("rc", &pt);
+- adjstr(rc);
+-
+- // カーソル位置から行の最後までを削除する
+- ce = tgetstr("ce", &pt);
+- adjstr(ce);
+-
+- // ステータスラインを持っているかどうか
+- hs = tgetflag("hs");
+-
+- // kon と jfbterm ではステータスラインを使わない
+- if (strcmp(term, "kon") == 0)
+- hs = 0;
+- if (strcmp(term, "jfbterm") == 0)
+- hs = 0;
+-
+- // ステータスラインへ移動,戻る
+- if (hs) {
+- ts = tgoto(tgetstr("ts", &pt), 0, 0);
+- adjstr(ts);
+- fs = tgetstr("fs", &pt);
+- adjstr(fs);
+- ds = tgetstr("ds", &pt);
+- adjstr(ds);
+- if (ds) {
+- strcat(endstr, ds);
+- strcat(endstr, ce);
+- }
+- }
+- else {
+- char* cs = tgoto(tgetstr("cs", &pt), tgetnum("li") - 2, 0);
+- adjstr(cs);
+- if (cs) {
+- write(1, ce, strlen(ce));
+- write(1, cs, strlen(cs));
+- }
+- char* cl = tgetstr("cl", &pt);
+- adjstr(cl);
+- if (cl) {
+- write(1, cl, strlen(cl));
+- strcat(endstr, cl);
+- }
+- ds = tgoto(tgetstr("cs", &pt), tgetnum("li") - 1, 0);
+- adjstr(ds);
+- if (ds) {
+- strcat(endstr, ds);
+- strcat(endstr, ce);
+- }
+- ts = tgoto(tgetstr("cm", &pt), 0, tgetnum("li") - 1);
+- adjstr(ts);
+- fs = rc;
+- }
++ gettermcap();
+
+ // 開始と終了のメッセージ
+ if (amsg && ac == 1)
+@@ -209,21 +137,75 @@
+ done();
+ }
+
+-// termcap エントリからパディングを削除する
+ void
+-Pty::adjstr(char* str)
++Pty::gettermcap()
+ {
+- char* sp = strdup(str);
+- char* p = sp;
+- while (*p != '\0') {
+- if (strncmp(p, "$<", 2) == 0) {
+- while (*p != '>')
+- p++;
+- *p = '\0';
++ // 環境変数 TERM のエントリを取得
++ char* term = getenv("TERM");
++ if (!term)
++ term = "vt100";
++ int ret = tgetent(buf, term);
++ if (ret != 1) {
++ tgetent(buf, "vt100");
++ putenv("TERM=vt100");
++ }
++
++ // termcap から装飾用のエントリを取ってくる
++ char* pt = funcstr;
++
++ // スタンドアウト (反転)
++ so = tgetstr("so", &pt);
++ se = tgetstr("se", &pt);
++
++ // アンダーライン (下線)
++ us = tgetstr("us", &pt);
++ ue = tgetstr("ue", &pt);
++
++ // カーソル位置の保存,保存した位置への復帰
++ sc = tgetstr("sc", &pt);
++ rc = tgetstr("rc", &pt);
++
++ // カーソル位置から行の最後までを削除する
++ ce = tgetstr("ce", &pt);
++
++ // ステータスラインを持っているかどうか
++ hs = tgetflag("hs");
++
++ // kon と jfbterm ではステータスラインを使わない
++ if (strcmp(term, "kon") == 0)
++ hs = 0;
++ if (strcmp(term, "jfbterm") == 0)
++ hs = 0;
++
++ // ステータスラインへ移動,戻る
++ if (hs) {
++ ts = tgoto(tgetstr("ts", &pt), 0, 0);
++ fs = tgetstr("fs", &pt);
++ ds = tgetstr("ds", &pt);
++ if (ds) {
++ strcat(endstr, ds);
++ strcat(endstr, ce);
+ }
+- *str++ = *p++;
+ }
+- free(sp);
++ else {
++ char* cs = tgoto(tgetstr("cs", &pt), tgetnum("li") - 2, 0);
++ if (cs) {
++ write(1, ce, strlen(ce));
++ write(1, cs, strlen(cs));
++ }
++ char* cl = tgetstr("cl", &pt);
++ if (cl) {
++ write(1, cl, strlen(cl));
++ strcat(endstr, cl);
++ }
++ ds = tgoto(tgetstr("cs", &pt), tgetnum("li") - 1, 0);
++ if (ds) {
++ strcat(endstr, ds);
++ strcat(endstr, ce);
++ }
++ ts = tgoto(tgetstr("cm", &pt), 0, tgetnum("li") - 1);
++ fs = rc;
++ }
+ }
+
+ // マスタデバイスを取る
+@@ -327,34 +309,7 @@
+ {
+ signal(SIGWINCH, SIG_IGN);
+
+- // ステータスラインが使えない場合は cs/ds/ts を取り直す
+- if (!hs) {
+- char buff[BUFSIZ];
+- char* term = getenv("TERM");
+- tgetent(buff, term);
+- char funcstr[BUFSIZ];
+- char* pt = funcstr;
+- char* cs = tgoto(tgetstr("cs", &pt), tgetnum("li") - 2, 0);
+- adjstr(cs);
+- if (cs) {
+- write(1, ce, strlen(ce));
+- write(1, cs, strlen(cs));
+- }
+- char* cl = tgetstr("cl", &pt);
+- adjstr(cl);
+- if (cl) {
+- write(1, cl, strlen(cl));
+- strcpy(endstr, cl);
+- }
+- ds = tgoto(tgetstr("cs", &pt), tgetnum("li") - 1, 0);
+- adjstr(ds);
+- if (ds) {
+- strcat(endstr, ds);
+- strcat(endstr, ce);
+- }
+- ts = tgoto(tgetstr("cm", &pt), 0, tgetnum("li") - 1);
+- adjstr(ts);
+- }
++ gettermcap();
+
+ // ウィンドウのサイズを設定し直す (stty -a の 行数/桁数 等)
+ struct winsize win;
+--- a/pty.H
++++ b/pty.H
+@@ -50,18 +50,21 @@
+ int rfd;
+ static int wfd;
+ private:
+- static void adjstr(char* str);
++ static char buf[BUFSIZ];
++ static char funcstr[BUFSIZ];
++private:
++ static void gettermcap();
+ protected:
+ static int hs;
+- char* so;
+- char* se;
+- char* us;
+- char* ue;
+- char* sc;
+- char* rc;
++ static char* so;
++ static char* se;
++ static char* us;
++ static char* ue;
++ static char* sc;
++ static char* rc;
+ static char* ce;
+ static char* ts;
+- char* fs;
++ static char* fs;
+ static char* ds;
+ private:
+ static void finish();
diff --git a/app-i18n/canfep/metadata.xml b/app-i18n/canfep/metadata.xml
new file mode 100644
index 0000000000..37185a78fe
--- /dev/null
+++ b/app-i18n/canfep/metadata.xml
@@ -0,0 +1,9 @@
+
+
+
+
+ co-maintainers welcome
+ Alessandro Barbieri
+ lssndrbarbieri@gmail.com
+
+
diff --git a/app-i18n/canna/Manifest b/app-i18n/canna/Manifest
new file mode 100644
index 0000000000..56de9dcb26
--- /dev/null
+++ b/app-i18n/canna/Manifest
@@ -0,0 +1,2 @@
+DIST 09_fix_manpages_error.patch 35789 BLAKE2B 83765aef44cf459922b027d6ea5e083fc793da5cff422fd4aae68d4fd2b921553b32f0d5afb488141dd8b87ceeb3495f256b33a3bb55fcd6c959a117da5ea015 SHA512 6b80744743a0421fdac30d4d470f3e0cc53c5aedaa3b9ca0c7b12db587c2dd02333d166fabda428dd8618a36b5b559dfd6a64db44b98d490d8a920703c38f6b4
+DIST Canna37p3.tar.bz2 1263065 BLAKE2B b5fb496c0ef71dc57b2da1409eea2238ea62ece3286d498d694bc7a18cb0f5e052dca95d692b4302988acd2199d350b893ae4aedc91aab0b737c3e0675be9cba SHA512 82846f2393aa2654dd2c97a93178098b8bd11e5409b584447f1b6fdf303adacc9802e2293cafd98b68af8b69622625ed00aa9712bf270feaa119adfdf4211158
diff --git a/app-i18n/canna/canna-3.7_p3-r4.ebuild b/app-i18n/canna/canna-3.7_p3-r4.ebuild
new file mode 100644
index 0000000000..16d07b2a77
--- /dev/null
+++ b/app-i18n/canna/canna-3.7_p3-r4.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools cannadic edo systemd tmpfiles toolchain-funcs
+
+MY_P="Canna${PV//[._]/}"
+MYPV="${PV/_/}"
+
+DESCRIPTION="A client-server based Kana-Kanji conversion system"
+HOMEPAGE="http://canna.osdn.jp/"
+SRC_URI="
+ mirror://sourceforge.jp/${PN}/9565/${MY_P}.tar.bz2
+ https://sources.debian.org/data/main/c/${PN}/${MYPV}-19/debian/patches/09_fix_manpages_error.patch
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="canuum doc ipv6"
+
+RDEPEND="
+ acct-group/canna
+ acct-user/canna
+ canuum? (
+ dev-libs/libspt
+ sys-libs/ncurses:=
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ x11-misc/gccmakedep
+ x11-misc/imake
+ canuum? ( virtual/pkgconfig )
+ doc? (
+ app-text/ghostscript-gpl
+ dev-texlive/texlive-langjapanese
+ dev-texlive/texlive-latexrecommended
+ )
+"
+PATCHES=(
+ "${FILESDIR}/Canna-3.6-dont-grab-ctrl-o.patch"
+ "${FILESDIR}/Canna-oldsock.patch"
+ "${FILESDIR}/Canna-3.6-fix-warnings.patch"
+ "${FILESDIR}/Canna-3.6-wconv.patch"
+ "${FILESDIR}/Canna-3.7p1-fix-duplicated-strings.patch"
+ "${FILESDIR}/Canna-3.7p1-notimeout.patch"
+ "${FILESDIR}/Canna-3.7p3-fix-gcc4-warning.patch"
+ "${FILESDIR}/Canna-3.7p3-redecl.patch"
+ "${FILESDIR}/Canna-3.7p3-yenbs.patch"
+ "${FILESDIR}/${PN}-gentoo.patch"
+ "${FILESDIR}/${PN}-05_fix_spelling_error.patch"
+ "${FILESDIR}/${PN}-06_fix_manpages_error.patch"
+ "${FILESDIR}/${PN}-07_fix_ftbfs_on_hurd-i386.patch"
+ "${FILESDIR}/${PN}-Wformat.patch"
+ "${FILESDIR}/${PN}-Wformat-security.patch"
+ "${DISTDIR}/09_fix_manpages_error.patch"
+ "${FILESDIR}/${PN}-10_fix_configure.ac.patch"
+ "${FILESDIR}/${PN}-11_fix_spelling_error_in_binary.patch"
+ "${FILESDIR}/${PN}-12_make_the_output_of_mkbindic_reproducible.patch"
+ "${FILESDIR}/${PN}-canuum.patch"
+ "${FILESDIR}/${PN}-kpdef.patch"
+ "${FILESDIR}/${PN}-overflow.patch"
+ "${FILESDIR}/${PN}-posix-sort.patch"
+ "${FILESDIR}/${PN}-respect-flags.patch"
+ "${FILESDIR}/${PN}-rundir.patch"
+)
+
+src_prepare() {
+ tc-export CC LD AR
+ export CDEBUGFLAGS="${CFLAGS}"
+ export LOCAL_LDFLAGS="${LDFLAGS}"
+ export SHLIBGLOBALSFLAGS="${LDFLAGS}"
+ export LOCAL_LDFLAGS="${LDFLAGS}"
+ export CCOPTIONS="${CFLAGS} ${CPPFLAGS}"
+
+ default
+
+ sed \
+ -e "/DefLibCannaDir/s:/lib$:/$(get_libdir):" \
+ -e "/UseInet6/s:0:$(usex ipv6 1 0):" \
+ -i ${PN^c}.conf \
+ || die
+
+ eautoreconf
+ rm -rf autom4te.cache || die
+ if use canuum; then
+ pushd canuum || die
+ mv configure.{in,ac} || die
+ eautoreconf
+ rm -rf autom4te.cache || die
+ popd || die
+ fi
+}
+
+src_configure() {
+ xmkmf -a || die
+
+ if use canuum; then
+ pushd canuum >/dev/null || die
+ xmkmf -a || die
+ # workaround for sys-libs/ncurses[tinfo]
+ sed -i "/^TERMCAP_LIB/s:=.*:=$($(tc-getPKG_CONFIG) --libs ncurses):" Makefile || die
+ popd >/dev/null || die
+ fi
+ if use doc; then
+ pushd doc/man/guide/tex >/dev/null || die
+ xmkmf -a || die
+ popd >/dev/null || die
+ fi
+}
+
+src_compile() {
+ # bug #279706
+ emake -j1 canna \
+ CC="${CC}" \
+ AR="${AR} -cq" \
+ CDEBUGFLAGS="${CFLAGS}" \
+ LOCAL_LDFLAGS="${LDFLAGS}" \
+ SHLIBGLOBALSFLAGS="${LDFLAGS}" \
+ CCOPTIONS="${CFLAGS} ${CPPFLAGS}"
+
+ edo ${CC} ${CFLAGS} ${LDFLAGS} -fPIE "${FILESDIR}/cannaping.c" -o ./misc/cannaping -I./include -L./lib/canna -lcanna
+
+ if use canuum; then
+ einfo "Compiling canuum"
+ emake -C canuum -j1 canuum \
+ CC="${CC}" \
+ AR="${AR} -cq" \
+ CDEBUGFLAGS="${CFLAGS}" \
+ LOCAL_LDFLAGS="${LDFLAGS}" \
+ SHLIBGLOBALSFLAGS="${LDFLAGS}" \
+ CCOPTIONS="${CFLAGS} ${CPPFLAGS}"
+ fi
+
+ if use doc; then
+ # NOTE: build fails if infinality enabled in fontconfig
+ einfo "Compiling DVI, PS, and PDF documents"
+ # bug #223077
+ export JLATEXCMD="platex -kanji=euc"
+ export DVI2PSCMD="dvips"
+ export VARTEXFONTS="${T}/fonts"
+ emake -C doc/man/guide/tex -j1 canna.ps canna.pdf
+ fi
+}
+
+src_install() {
+ emake DESTDIR="${D}" install install.man
+ einstalldocs
+ dodoc *CHANGES* INSTALL* RKCCONF* WHATIS*
+
+ if use canuum; then
+ emake -C canuum DESTDIR="${D}" install install.man
+ docinto canuum
+ dodoc README.jp
+ fi
+
+ use doc && dodoc doc/man/guide/tex/canna.{dvi,ps,pdf}
+
+ # for backward compatibility
+ dosbin "${FILESDIR}/update-canna-dics_dir"
+
+ dobin ./misc/cannaping
+ exeinto /usr/libexec/canna
+ doexe dic/ideo/pubdic/pod
+
+ insinto /etc
+ newins "${FILESDIR}/canna.hosts" hosts.canna
+
+ insinto /etc/canna
+ newins "${FILESDIR}/dot-canna" "default.canna"
+ newins "${FILESDIR}/canna.hosts" "cannahosts"
+
+ insinto /etc/canna/dics.dir.d
+ newins "${ED}/var/lib/canna/dic/canna/dics.dir" 00canna.dics.dir
+ rm -r "${ED}/var/lib/canna/dic/canna/dics.dir" || die
+
+ keepdir /var/lib/canna/dic/{user,group}
+ fowners canna:canna /var/lib/canna
+ fperms 0775 /var/lib/canna/dic/{user,group}
+
+ keepdir /var/log/canna
+ fowners canna:canna /var/log/canna
+
+ newconfd "${FILESDIR}/canna.confd" canna
+ newinitd "${FILESDIR}/canna.initd" canna
+
+ systemd_dounit "${FILESDIR}/canna.service"
+ newtmpfiles "${FILESDIR}/canna-tmpfiles.conf" "canna.conf"
+
+ find "${ED}" -type f -name "*.a" -delete || die
+}
+
+pkg_postinst() {
+ tmpfiles_process canna.conf
+ update-cannadic-dir
+
+ if ! locale -a | grep -iq "ja_JP.eucjp"; then
+ elog "Some dictionary tools in this package require ja_JP.EUC-JP locale."
+ elog
+ elog "# echo 'ja_JP.EUC-JP EUC-JP' >> ${EROOT}/etc/locale.gen"
+ elog "# locale-gen"
+ elog
+ fi
+}
diff --git a/app-i18n/canna/files/Canna-3.6-dont-grab-ctrl-o.patch b/app-i18n/canna/files/Canna-3.6-dont-grab-ctrl-o.patch
new file mode 100644
index 0000000000..c5fccdbd76
--- /dev/null
+++ b/app-i18n/canna/files/Canna-3.6-dont-grab-ctrl-o.patch
@@ -0,0 +1,11 @@
+--- a/lib/canna/alphamap.h
++++ b/lib/canna/alphamap.h
+@@ -65,7 +65,7 @@
+ /* C-l */ CANNA_FN_SelfInsert,
+ /* C-m */ CANNA_FN_SelfInsert,
+ /* C-n */ CANNA_FN_SelfInsert,
+-/* C-o */ CANNA_FN_JapaneseMode,
++/* C-o */ CANNA_FN_SelfInsert,
+ /* C-p */ CANNA_FN_SelfInsert,
+ /* C-q */ CANNA_FN_SelfInsert,
+ /* C-r */ CANNA_FN_SelfInsert,
diff --git a/app-i18n/canna/files/Canna-3.6-fix-warnings.patch b/app-i18n/canna/files/Canna-3.6-fix-warnings.patch
new file mode 100644
index 0000000000..74f134eb1b
--- /dev/null
+++ b/app-i18n/canna/files/Canna-3.6-fix-warnings.patch
@@ -0,0 +1,10 @@
+--- a/lib/canna/kctrl.c
++++ b/lib/canna/kctrl.c
+@@ -27,6 +27,7 @@
+ #include "canna.h"
+
+ #include
++#include
+ #include
+ #include
+
diff --git a/app-i18n/canna/files/Canna-3.6-wconv.patch b/app-i18n/canna/files/Canna-3.6-wconv.patch
new file mode 100644
index 0000000000..90fa049f01
--- /dev/null
+++ b/app-i18n/canna/files/Canna-3.6-wconv.patch
@@ -0,0 +1,18 @@
+--- a/server/wconvert.c
++++ b/server/wconvert.c
+@@ -2096,12 +2096,12 @@
+ char *buf = (char *)0;
+
+ if (validcontext(cxnum, client, wThrough)) {
+- buf = malloc((int)Request.type20.bufsize);
++ content_size = Request.type20.datalen - (SIZEOFINT * 2 + SIZEOFSHORT);
++ buf = malloc(content_size);
+ if (buf) {
+- content_size = Request.type20.datalen - (SIZEOFINT * 2 + SIZEOFSHORT);
+ bcopy(Request.type20.buf, buf, content_size);
+ stat = size = RkThrough(cxnum, Request.type20.command,
+- buf, content_size, (int)Request.type20.bufsize);
++ buf, content_size, content_size);
+ }
+ }
+ retval = SendType6Reply(client, wThrough, EXTPROTO, stat, buf, size);
diff --git a/app-i18n/canna/files/Canna-3.7p1-fix-duplicated-strings.patch b/app-i18n/canna/files/Canna-3.7p1-fix-duplicated-strings.patch
new file mode 100644
index 0000000000..303f792559
--- /dev/null
+++ b/app-i18n/canna/files/Canna-3.7p1-fix-duplicated-strings.patch
@@ -0,0 +1,93 @@
+--- a/lib/canna/romaji.c
++++ b/lib/canna/romaji.c
+@@ -21,7 +21,7 @@
+ */
+
+ #if !defined(lint) && !defined(__CODECENTER__)
+-static char rcs_id[] = "@(#) 102.1 $Id: romaji.c,v 1.10 2003/09/17 08:50:53 aida_s Exp $";
++static char rcs_id[] = "@(#) 102.1 $Id: romaji.c,v 1.11 2004/03/15 04:33:23 aida_s Exp $";
+ #endif /* lint */
+
+ #include "canna.h"
+@@ -2626,6 +2626,7 @@
+ yc->englishtype = CANNA_ENG_KANA;
+ yc->cStartp = yc->cRStartp = 0;
+ yc->jishu_kEndp = 0;
++ yc->n_susp_chars = 0;
+ }
+
+ static int
+@@ -2782,8 +2783,13 @@
+ }
+ yc->last_rule = 0;
+ howManyDelete = howFarToGoBackward(yc);
+- if (howManyDelete > 0 && (yc->generalFlags & CANNA_YOMI_BREAK_ROMAN)) {
+- yc->generalFlags &= ~CANNA_YOMI_BREAK_ROMAN;
++ if (howManyDelete > 0 && (yc->generalFlags & CANNA_YOMI_BREAK_ROMAN)
++ && (yc->kAttr[yc->kCurs] & SENTOU)) {
++ /*
++ * ローマ字1文字に対応する仮名を消した時はローマ字、仮名とも
++ * SENTOUフラグが1個減る。
++ * そうでないときはSENTOUフラグの個数は変わらない
++ */
+ yc->rStartp = yc->rCurs - 1;
+ while ( yc->rStartp > 0 && !(yc->rAttr[yc->rStartp] & SENTOU) ) {
+ yc->rStartp--;
+@@ -2792,16 +2798,23 @@
+ yc->kRStartp = yc->kCurs - 1;
+ while ( yc->kRStartp > 0 && !(yc->kAttr[yc->kRStartp] & SENTOU) )
+ yc->kRStartp--;
++ /* これ必ず真では? */
+ prevflag = (yc->kAttr[yc->kRStartp] & SENTOU);
+ kanaReplace(yc->kRStartp - yc->kCurs,
+ yc->romaji_buffer + yc->rStartp,
+ yc->rCurs - yc->rStartp,
+ 0);
++ /* ローマ字1文字に対応する仮名を消したときは最初からSENTOUである */
+ yc->kAttr[yc->kRStartp] |= prevflag;
+ yc->n_susp_chars = 0; /* とりあえずクリアしておく */
+ makePhonoOnBuffer(d, yc, (unsigned char)0, 0, 0);
++ /* 以前は常にフラグを下げていたが、未変換ローマ字が残っているときは
++ * フラグを下げないことにする */
++ if (yc->kRStartp == yc->kCurs)
++ yc->generalFlags &= ~CANNA_YOMI_BREAK_ROMAN;
+ }
+ else {
++ yc->generalFlags &= ~CANNA_YOMI_BREAK_ROMAN;
+ if ( yc->kAttr[yc->kCurs - howManyDelete] & HENKANSUMI ) {
+ if (yc->kAttr[yc->kCurs - howManyDelete] & SENTOU) {
+ /* ローマ字かな変換の先頭だったら */
+@@ -2821,6 +2834,12 @@
+ yc->rEndp -= n;
+ }
+ else {
++ /* 仮名のカーソル位置は先頭になるのでローマ字のカーソルも動かす*/
++ while ( yc->rCurs > 0 && !(yc->rAttr[--yc->rCurs] & SENTOU) )
++ ;
++ if (yc->rCurs < yc->rStartp) {
++ yc->rStartp = yc->rCurs;
++ }
+ yc->kAttr[yc->kCurs] |= SENTOU;
+ }
+ }
+@@ -2829,6 +2848,12 @@
+ romajiReplace(-howManyDelete, (wchar_t *)NULL, 0, 0);
+ }
+ kanaReplace(-howManyDelete, (wchar_t *)NULL, 0, 0);
++ if ((yc->rAttr[yc->rCurs] & SENTOU) && yc->kRStartp == yc->kCurs) {
++ /* 未変換のローマ字を消してしまったので、次に入力したローマ字は
++ * SENTOUになる方が自然だろう
++ */
++ yc->rStartp = yc->rCurs;
++ }
+ }
+ debug_yomi(yc);
+ return(0);
+@@ -2944,6 +2969,7 @@
+ currentModeInfo(d);
+ }
+ makeYomiReturnStruct(d);
++ debug_yomi(yc);
+ return 0;
+ }
+
diff --git a/app-i18n/canna/files/Canna-3.7p1-notimeout.patch b/app-i18n/canna/files/Canna-3.7p1-notimeout.patch
new file mode 100644
index 0000000000..3f27a32cc5
--- /dev/null
+++ b/app-i18n/canna/files/Canna-3.7p1-notimeout.patch
@@ -0,0 +1,12 @@
+ゃ若祉<ゃCanna37p1.orig/lib/RKC/.wconvert.c.swpCanna37p1/lib/RKC/.wconvert.c.swp障
+--- a/lib/RKC/conf.c
++++ b/lib/RKC/conf.c
+@@ -1496,7 +1496,7 @@
+ };
+
+ const NumberDefaultRec host_num_defaults[] = {
+- { CONF_SERVER_TIMEOUT, 1500u },
++ { CONF_SERVER_TIMEOUT, 0u },
+ };
+
+ const char *
diff --git a/app-i18n/canna/files/Canna-3.7p3-fix-gcc4-warning.patch b/app-i18n/canna/files/Canna-3.7p3-fix-gcc4-warning.patch
new file mode 100644
index 0000000000..42e9ee3a87
--- /dev/null
+++ b/app-i18n/canna/files/Canna-3.7p3-fix-gcc4-warning.patch
@@ -0,0 +1,136 @@
+--- a/cmd/crxgram/crxgram.c
++++ b/cmd/crxgram/crxgram.c
+@@ -485,7 +485,7 @@
+ int j;
+
+ nextS = scanToken(nextS, namevec, sizeof(namevec));
+- name = strtok(namevec, SEP);
++ name = strtok((char *)namevec, SEP);
+ for (j = 0; name && j < 255;) {
+ if (r = probeIdent(Row, name))
+ rdata[i][j++] = r->rownum;
+--- a/cmd/cshost/cshost.c
++++ b/cmd/cshost/cshost.c
+@@ -152,12 +152,12 @@
+ goto protoerr;
+ assert(wp + 2 <= endp);
+ printf("HOST NAME:%s\n", wp ) ;
+- wp += strlen( wp ) + 1 ;
++ wp += strlen((char *) wp ) + 1 ;
+ if( *wp ) {
+ printf("USER NAME:" ) ;
+ while( *wp ) {
+ printf("%s ", wp ) ;
+- wp += strlen( wp ) + 1 ;
++ wp += strlen((char *) wp ) + 1 ;
+ }
+ } else
+ printf("ALL USER" ) ;
+--- a/cmd/wtoc/wtoc.c
++++ b/cmd/wtoc/wtoc.c
+@@ -144,8 +144,8 @@
+ int hindo;
+ {
+ if( !strcmp((char *)hinshi,"#kxuru") || !strcmp((char *)hinshi,"#sxuru")){
+- strcat(yomi,"る");
+- strcat(kouho,"る");
++ strcat((char *)yomi,"る");
++ strcat((char *)kouho,"る");
+ }
+ if( hindo == 0 )
+ fprintf( fp, "%s %s %s \n", yomi, hinshi, kouho );
+--- a/lib/canna/ebind.c
++++ b/lib/canna/ebind.c
+@@ -364,7 +364,7 @@
+ /* list_cbはKC_setListCallbackでd->elistcbに引っ越す */
+ list_cb.client_data = (char *)arg;
+ list_cb.callback_func = &EUCListCallback;
+- ret = XwcKanjiControl2(display, window, request, (char *)&list_cb);
++ ret = XwcKanjiControl2(display, window, request, (BYTE *)&list_cb);
+ goto return_ret;
+ /* FALLTHROUGH */
+ default: /* ワイドでもEUCでも変わらないもの */
+--- a/lib/canna/obind.c
++++ b/lib/canna/obind.c
+@@ -500,7 +500,7 @@
+ /* list_cbはKC_setListCallbackでd->elistcbに引っ越す */
+ list_cb.client_data = (char *)arg;
+ list_cb.callback_func = &owcListCallback;
+- ret = XwcKanjiControl2(display, window, request, (char *)&list_cb);
++ ret = XwcKanjiControl2(display, window, request, (BYTE *)&list_cb);
+ goto return_ret;
+ default: /* 新ワイドと変わらないもの */
+ ret = XwcKanjiControl2(display, window, request, arg);
+--- a/server/convert.c
++++ b/server/convert.c
+@@ -1506,7 +1506,7 @@
+ const char *username;
+ const char *hostname;
+ {
+- int (*ReqCallFunc) pro((char *, int)) ;
++ int (*ReqCallFunc) pro((BYTE *, int)) ;
+ register Req0 *req0 = &Request.Request0 ;
+ const char *username0 = username ? username : "";
+ const char *hostname0 = hostname ? hostname : "";
+--- a/server/wconvert.c
++++ b/server/wconvert.c
+@@ -189,7 +189,7 @@
+ size_t size;
+ {
+ ir_debug( Dmsg(10, "WriteClient:") );
+- ir_debug( DebugDump( 10, buf, size ) );
++ ir_debug( DebugDump( 10, (const char *)buf, size ) );
+ return ClientBuf_store_reply(client->client_buf, buf, size);
+ }
+ #else
+@@ -1372,8 +1372,8 @@
+ /* 以下、パーミッションのチェック */
+ stat = ACCES;
+ if (checkPermissionToRead(client, dirname, (char *)0) >= 0) {
+- stat = RkwListDic(cxnum, (unsigned char *)dirname,
+- (unsigned char *)dicnames, requestsize);
++ stat = RkwListDic(cxnum, (char *)dirname,
++ (char *)dicnames, requestsize);
+ }
+
+ listdicdone:
+@@ -1403,7 +1403,7 @@
+ ir_debug( Dmsg(5, "dicname = %s\n",
+ (req->dicname)?req->dicname:null) );
+
+- stat = (char)RkwCreateDic(cxnum, (unsigned char *)req->dicname,
++ stat = (char)RkwCreateDic(cxnum, (char *)req->dicname,
+ req->mode);
+ }
+
+@@ -1438,7 +1438,7 @@
+ ir_debug( Dmsg(5, "dicname = %s\n",
+ (req->dicname)?req->dicname:null) );
+
+- stat = (char)RkwRemoveDic(cxnum, (unsigned char *)req->dicname,
++ stat = (char)RkwRemoveDic(cxnum, (char *)req->dicname,
+ req->mode);
+ }
+
+@@ -1456,8 +1456,8 @@
+
+ if (validcontext(cxnum, client, wRenameDictionary)) {
+ diclen = strlen(req->dicname) + 1 ;
+- stat = RkwRenameDic(cxnum, (unsigned char *)req->dicname,
+- (unsigned char *)&(req->dicname)[diclen],
++ stat = RkwRenameDic(cxnum, (char *)req->dicname,
++ (char *)&(req->dicname)[diclen],
+ req->mode);
+ }
+ return SendType2Reply(client, wRenameDictionary, EXTPROTO, stat);
+@@ -1950,8 +1950,8 @@
+ ir_debug( Dmsg(5, "dicname = %s\n", Request.type15.dicname) );
+ ir_debug( Dmsg(5, "username = %s\n", username) );
+
+- stat = (RkwQueryDic(cxnum, (unsigned char *)username,
+- (unsigned char *)Request.type15.dicname,
++ stat = (RkwQueryDic(cxnum, (char *)username,
++ (char *)Request.type15.dicname,
+ dicinfo) < 0) ? -1 : 0;
+
+ if (stat < 0) {
diff --git a/app-i18n/canna/files/Canna-3.7p3-redecl.patch b/app-i18n/canna/files/Canna-3.7p3-redecl.patch
new file mode 100644
index 0000000000..816b73887b
--- /dev/null
+++ b/app-i18n/canna/files/Canna-3.7p3-redecl.patch
@@ -0,0 +1,11 @@
+--- a/lib/canna/lisp.c
++++ b/lib/canna/lisp.c
+@@ -1355,8 +1355,6 @@
+ static int
+ tyi()
+ {
+- char *gets(), *fgets();
+-
+ if (untyibuf) {
+ int ret = untyibuf[--untyip];
+ if (untyip == 0) {
diff --git a/app-i18n/canna/files/Canna-3.7p3-yenbs.patch b/app-i18n/canna/files/Canna-3.7p3-yenbs.patch
new file mode 100644
index 0000000000..837fecdca1
--- /dev/null
+++ b/app-i18n/canna/files/Canna-3.7p3-yenbs.patch
@@ -0,0 +1,11 @@
+--- a/lib/RK/RkGetDic.man
++++ b/lib/RK/RkGetDic.man
+@@ -41,7 +41,7 @@
+ Dictionary names are got in the area \f2dics\f1 in the following format:
+ .P
+ .RS 0.2c
+-dictionary-name-1 ¥0 dictionary-name-2 ¥0 ... dictionary-name-n ¥0 ¥0
++dictionary-name-1 \\0 dictionary-name-2 \\0 ... dictionary-name-n \\0 \\0
+ .RE
+ .P
+ The size of the area \f2dics\f1 is given in bytes by \f2maxdics\f1. The dictionary list is truncated in character strings when it exceeds this size.
diff --git a/app-i18n/canna/files/Canna-oldsock.patch b/app-i18n/canna/files/Canna-oldsock.patch
new file mode 100644
index 0000000000..f62ee6c979
--- /dev/null
+++ b/app-i18n/canna/files/Canna-oldsock.patch
@@ -0,0 +1,29 @@
+--- a/lib/RKC/wconvert.c
++++ b/lib/RKC/wconvert.c
+@@ -150,8 +150,25 @@
+ if ((ServerFD = socket((int) addr->sa_family, SOCK_STREAM, 0)) >= 0){
+ if( try_connect( ServerFD, addr, sizeof unaddr ) < 0 ) {
+ close( ServerFD ) ;
+- return( -1 ) ;
++ ServerFD = -1;
++ }
++ }
++ if (ServerFD < 0) {
++ /* for the backward compatibility */
++#define OLD_IR_UNIX_PATH "/tmp/.iroha_unix/IROHA"
++
++ if (number)
++ sprintf (unaddr.sun_path, "%s:%d", OLD_IR_UNIX_PATH, number);
++ else
++ strcpy (unaddr.sun_path, OLD_IR_UNIX_PATH);
++
++ if ((ServerFD = socket ((int) addr->sa_family, SOCK_STREAM, 0)) >= 0) {
++ if (try_connect (ServerFD, addr, sizeof (unaddr)) < 0) {
++ close (ServerFD);
++ return -1;
++ }
+ }
++#undef OLD_IR_UNIX_PATH
+ }
+ return( ServerFD ) ;
+ }
diff --git a/app-i18n/canna/files/canna-05_fix_spelling_error.patch b/app-i18n/canna/files/canna-05_fix_spelling_error.patch
new file mode 100644
index 0000000000..372c7a6272
--- /dev/null
+++ b/app-i18n/canna/files/canna-05_fix_spelling_error.patch
@@ -0,0 +1,63 @@
+## 06_fix_spelling_error by HIGUCHI Daisuke (VDR dai)
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: eliminate lintian warning: spelling-error-in-{binary,manpages}
+
+--- a/cmd/wtoc/wtoc.c
++++ b/cmd/wtoc/wtoc.c
+@@ -195,7 +195,7 @@ main(argc,argv)
+ #endif
+ }
+ else { /* 引数が不正 */
+- fprintf(stderr,gettxt("cannacmd:50", "Usage: wtoc [-f part-of-speach table] [wnndic] [cannadic]\n"));
++ fprintf(stderr,gettxt("cannacmd:50", "Usage: wtoc [-f part-of-speech table] [wnndic] [cannadic]\n"));
+ exit(2);
+ }
+ if( argc >= (2 + option*2) ) { /* Wnn辞書をオープン */
+--- a/cmd/ctow/ctow.c
++++ b/cmd/ctow/ctow.c
+@@ -256,9 +256,9 @@ char *argv[];
+ hinshis = chghinshi(h, hinshiSize, taiou, fsize);
+ if (!strcmp(hinshis,"")) {
+ fprintf(stderr,gettxt("cannacmd:13",
+- "reading:%s nomination:%s a part of speach:%s\n"),y,k,h);
++ "reading:%s nomination:%s a part of speech:%s\n"),y,k,h);
+ fprintf(stderr,gettxt("cannacmd:14",
+- "This part of speach is undefined. Cannot convert.\n"));
++ "This part of speech is undefined. Cannot convert.\n"));
+ }
+ else {
+ for ( ; *hinshis; hinshis++, p++) {
+--- a/lib/canna/lisp.c
++++ b/lib/canna/lisp.c
+@@ -3610,7 +3610,7 @@
+ numtostr(xnum(e2), ee);
+ num = howManyCharsAre(ss, ee, &sku, &sten, &cs);
+ if (num <= 0) {
+- error("Inconsistent range of charcter code ", buf);
++ error("Inconsistent range of character code ", buf);
+ /* NOTREACHED */
+ }
+ kigolen = kigolen + (cswidth[cs] + 1) * num;
+--- a/lib/canna/uilib.man
++++ b/lib/canna/uilib.man
+@@ -809,7 +809,7 @@ data input:
+ int length; /* length of echo string */
+ int revPos; /* reverse position */
+ int revLen; /* reverse length */
+- unsigned long info; /* other informations */
++ unsigned long info; /* other information */
+ unsigned char *mode; /* mode information */
+ struct {
+ unsigned char *line; /* a grance of Kanji characters */
+--- a/lib/canna/uilib.jmn
++++ b/lib/canna/uilib.jmn
+@@ -749,7 +749,7 @@ XCompose構造体へのポインタを指定します。
+ int revPos; /* reverse position */
+ int revLen; /* reverse length */
+ .mc \(br
+- unsigned long info; /* other informations */
++ unsigned long info; /* other information */
+ unsigned char *mode; /* mode information */
+ struct {
+ unsigned char *line; /* a grance of Kanji characters */
diff --git a/app-i18n/canna/files/canna-06_fix_manpages_error.patch b/app-i18n/canna/files/canna-06_fix_manpages_error.patch
new file mode 100644
index 0000000000..7b1cd03283
--- /dev/null
+++ b/app-i18n/canna/files/canna-06_fix_manpages_error.patch
@@ -0,0 +1,37 @@
+## 07_fix_manpage_error by HIGUCHI Daisuke (VDR dai)
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: eliminate lintian warning: manpage-has-errors-from-man
+
+--- a/cmd/dpromdic/dpromdic.man
++++ b/cmd/dpromdic/dpromdic.man
+@@ -1,7 +1,7 @@
+ .TH DPROMDIC 1
+-.S HNAME
++.SH NAME
+ dpromdic \- Convert the binary-form Romaji-to-Kana conversion table into the text-form table
+-.SHSYNOPSYS
++.SH SYNOPSYS
+ .B dpromdic
+ [
+ .I file
+--- a/cmd/dicar/dicar.man
++++ b/cmd/dicar/dicar.man
+@@ -28,7 +28,7 @@ dicar \- Archive Binary Dictionary
+ archives binary dictionary
+ .I bindic1.
+ The hyphen of each option may be omitted.
+-.OPTIONS
++.SH OPTIONS
+ .TP
+ .B \-t
+ Displays the dictionaries contained in binary dictionary file
+--- a/cmd/cshost/cshost.man
++++ b/cmd/cshost/cshost.man
+@@ -1,5 +1,5 @@
+ .TH CSHOST 1
+-.SH "NAMES"
++.SH "NAME"
+ cshost \- Server access control program for canna
+ .SH "SYNOPSIS"
+ .B "cshost [{\-cs|\-cannaserver} \fIcannaserver\fP]"
diff --git a/app-i18n/canna/files/canna-07_fix_ftbfs_on_hurd-i386.patch b/app-i18n/canna/files/canna-07_fix_ftbfs_on_hurd-i386.patch
new file mode 100644
index 0000000000..2b3bc3c07e
--- /dev/null
+++ b/app-i18n/canna/files/canna-07_fix_ftbfs_on_hurd-i386.patch
@@ -0,0 +1,16 @@
+## 08_fix_ftbfs_on_hurd-i386 by HIGUCHI Daisuke (VDR dai)
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix FTBFS on hurd-i386. use O_RDONLY instead of bare 0.
+
+--- a/cmd/crxdic/crxdic.c
++++ b/cmd/crxdic/crxdic.c
+@@ -1228,7 +1228,7 @@ main (argc, argv)
+ if (!(dic->gramdata = RkiReadWholeFile(fp, &dic->gramsz)))
+ goto gram_err;
+ fclose(fp);
+- if ((fd = open(gfile, 0)) < 0 || !(gram = RkReadGram(fd, dic->gramsz)))
++ if ((fd = open(gfile, O_RDONLY)) < 0 || !(gram = RkReadGram(fd, dic->gramsz)))
+ goto gram_err;
+ close(fd);
+ goto gram_ok;
diff --git a/app-i18n/canna/files/canna-10_fix_configure.ac.patch b/app-i18n/canna/files/canna-10_fix_configure.ac.patch
new file mode 100644
index 0000000000..d53f3f2333
--- /dev/null
+++ b/app-i18n/canna/files/canna-10_fix_configure.ac.patch
@@ -0,0 +1,19 @@
+Description: fix FTBFS caused after the DH level has bumped.
+Author: Francisco Vilmar Cardoso Ruviaro
+Last-Update: 2020-06-20
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,9 +3,9 @@ AC_INIT([canna], [3.7p3], [canna-dev@lis
+ AC_CONFIG_SRCDIR([WHATIS.jp])
+ AC_CONFIG_HEADER([accanna.h])
+
+-if test "x$IN_MAKE" != xyes; then
+- AC_MSG_ERROR([You cannot invloke configure directly.])
+-fi
++#if test "x$IN_MAKE" != xyes; then
++# AC_MSG_ERROR([You cannot invloke configure directly.])
++#fi
+
+ # Checks for programs.
+ AC_PROG_CC
diff --git a/app-i18n/canna/files/canna-11_fix_spelling_error_in_binary.patch b/app-i18n/canna/files/canna-11_fix_spelling_error_in_binary.patch
new file mode 100644
index 0000000000..77ff26b279
--- /dev/null
+++ b/app-i18n/canna/files/canna-11_fix_spelling_error_in_binary.patch
@@ -0,0 +1,91 @@
+Description: Fix spelling error in binaries.
+Author: Francisco Vilmar Cardoso Ruviaro
+Last-Update: 2020-07-16
+
+--- a/cmd/catdic/can.c
++++ b/cmd/catdic/can.c
+@@ -281,7 +281,7 @@ int sig;
+ */
+ (void) RkFinalize();
+ fprintf(stderr,"\n");
+- Message(gettxt("cannacmd:232", "Process was intrrupted."));
++ Message(gettxt("cannacmd:232", "Process was interrupted."));
+ exit(ERR_VALUE);
+ }
+
+@@ -323,7 +323,7 @@ int sig;
+ (void) RkFinalize();
+ }
+
+- Message(gettxt("cannacmd:232", "Process was intrrupted."));
++ Message(gettxt("cannacmd:232", "Process was interrupted."));
+ exit(ERR_VALUE);
+ }
+
+@@ -1475,7 +1475,7 @@ int force;
+ }
+ else {
+ fprintf(stderr, gettxt("cannacmd:174",
+- "Specified dictionary \"%s\" does not overwite.\n"),dicname2);
++ "Specified dictionary \"%s\" does not overwrite.\n"),dicname2);
+ ret = 1;
+ }
+ break;
+--- a/cmd/crfreq/crfreq.c
++++ b/cmd/crfreq/crfreq.c
+@@ -199,7 +199,7 @@ main(argc, argv)
+
+ if ((fr = create(freqfile, 0666)) == -1) {
+ (void)close(fd);
+- (void)fprintf(stderr, "%s: cannot create freqency file %s\n", program, freqfile);
++ (void)fprintf(stderr, "%s: cannot create frequency file %s\n", program, freqfile);
+ exit(1);
+ }
+ #ifdef __CYGWIN32__
+--- a/server/convert.c
++++ b/server/convert.c
+@@ -887,7 +887,7 @@ ClientPtr *clientp ;
+ if ((ret = RkwStoreYomi( cxnum, (Ushort *)cbuf, ret )) >= 0) {
+ size = getFirstKouho(cxnum, bunsetu, ret, &stat, &lbufp);
+ } else {
+- PrintMsg("%s RkwStoreYomi faild\n", irerrhdr(client));
++ PrintMsg("%s RkwStoreYomi failed\n", irerrhdr(client));
+ }
+ } else {
+ print_context_error(client);
+--- a/server/misc.c
++++ b/server/misc.c
+@@ -316,7 +316,7 @@ BecomeDaemon ()
+
+ #ifndef __EMX__
+ if ((parent = fork()) == -1) {
+- PrintMsg( "Fork faild\n" );
++ PrintMsg( "Fork failed\n" );
+ exit( 1 ) ;
+ }
+ if ( parent ) {
+@@ -989,11 +989,11 @@ DetachTTY()
+ sprintf(errfile,"%s/%s%d%s", ERRDIR, ERRFILE, PortNumberPlus, ERRFILE2);
+
+ if((errfd = open(errfile, O_CREAT | O_RDWR | O_TRUNC, 0644)) < 0) {
+- (void)fprintf(stderr, "Warning: %s: %s open faild\n", Name, errfile);
++ (void)fprintf(stderr, "Warning: %s: %s open failed\n", Name, errfile);
+ (void)perror("");
+ } else {
+ if(dup2( errfd, fileno(stderr)) < 0) {
+- (void)fprintf(stderr, "Warning: %s: %s dup2 faild\n", Name, errfile);
++ (void)fprintf(stderr, "Warning: %s: %s dup2 failed\n", Name, errfile);
+ (void)perror("");
+ close(fileno(stderr));
+ }
+--- a/server/wconvert.c
++++ b/server/wconvert.c
+@@ -1153,7 +1153,7 @@ ClientPtr *clientp ;
+ sizeof(local_buffer) / sizeof(Ushort), &bufp);
+ RkwGoTo(cxnum, bunsetu);
+ } else {
+- PrintMsg("%s RkwStoreYomi faild\n",
++ PrintMsg("%s RkwStoreYomi failed\n",
+ irwerrhdr(client, wStoreYomi));
+ stat = -1 ;
+ }
diff --git a/app-i18n/canna/files/canna-12_make_the_output_of_mkbindic_reproducible.patch b/app-i18n/canna/files/canna-12_make_the_output_of_mkbindic_reproducible.patch
new file mode 100644
index 0000000000..5019ec0ee7
--- /dev/null
+++ b/app-i18n/canna/files/canna-12_make_the_output_of_mkbindic_reproducible.patch
@@ -0,0 +1,61 @@
+Description: make the output of mkbindic reproducible.
+Author: Chris Lamb
+Bug-Debian: https://bugs.debian.org/861955
+Forwarded: no
+Reviewed-By: Francisco Vilmar Cardoso Ruviaro
+Last-Update: 2020-08-17
+
+--- a/cmd/crxdic/crxdic.c
++++ b/cmd/crxdic/crxdic.c
+@@ -31,6 +31,7 @@ static char rcsid[]="@(#) 102.1 $Id: crx
+ #include
+ #include
+ #include
++#include
+ #include
+ #include "ccompat.h"
+ #include "RKindep/file.h"
+@@ -932,6 +933,9 @@ makeHeader(dic)
+ unsigned i;
+ RkiCksumCalc calc;
+ unsigned off;
++ char *source_date_epoch;
++ unsigned long long epoch;
++ char *endptr;
+
+ if (RkiCksumCRCInit(&calc)
+ || RkiCksumAdd(&calc, dic->Dir->buf, dic->Dir->dirsiz)) {
+@@ -963,7 +967,32 @@ makeHeader(dic)
+ hd.data[HD_CMPV].var = 0x300702L;
+ hd.flag[HD_CMPV] = -1;
+ }
+- hd.data[HD_TIME].var = tloc = time(0);
++ source_date_epoch = getenv("SOURCE_DATE_EPOCH");
++ if (source_date_epoch) {
++ errno = 0;
++ epoch = strtoull(source_date_epoch, &endptr, 10);
++ if ((errno == ERANGE && (epoch == ULLONG_MAX || epoch == 0))
++ || (errno != 0 && epoch == 0)) {
++ fprintf(stderr, "Environment variable $SOURCE_DATE_EPOCH: strtoull: %s\n", strerror(errno));
++ exit(EXIT_FAILURE);
++ }
++ if (endptr == source_date_epoch) {
++ fprintf(stderr, "Environment variable $SOURCE_DATE_EPOCH: No digits were found: %s\n", endptr);
++ exit(EXIT_FAILURE);
++ }
++ if (*endptr != '\0') {
++ fprintf(stderr, "Environment variable $SOURCE_DATE_EPOCH: Trailing garbage: %s\n", endptr);
++ exit(EXIT_FAILURE);
++ }
++ if (epoch > ULONG_MAX) {
++ fprintf(stderr, "Environment variable $SOURCE_DATE_EPOCH: value must be smaller than or equal to %lu but was found to be: %llu \n", ULONG_MAX, epoch);
++ exit(EXIT_FAILURE);
++ }
++ tloc = epoch;
++ } else {
++ tloc = time(0);
++ }
++ hd.data[HD_TIME].var = tloc;
+ hd.flag[HD_TIME] = -1;
+ hd.data[HD_DMNM].ptr = (unsigned char *)STrdup(dic->name);
+ hd.flag[HD_DMNM] = strlen(dic->name);
diff --git a/app-i18n/canna/files/canna-Wformat-security.patch b/app-i18n/canna/files/canna-Wformat-security.patch
new file mode 100644
index 0000000000..c83552b5cb
--- /dev/null
+++ b/app-i18n/canna/files/canna-Wformat-security.patch
@@ -0,0 +1,199 @@
+--- a/cmd/catdic/can.c
++++ b/cmd/catdic/can.c
+@@ -1236,7 +1236,7 @@
+ break;
+ default:
+ if (init[0] == '/') {
+- (void)fprintf(stderr,msg_abnl);
++ (void)fprintf(stderr,"%s",msg_abnl);
+ } else {
+ (void)fprintf(stderr,msg_abnls,init);
+ }
+@@ -1297,11 +1297,11 @@
+
+ if ( opt_fq ) {
+ if ( opt_s ) {
+- (void) fprintf(stderr,msg_sfq);
++ (void) fprintf(stderr,"%s",msg_sfq);
+ exit(ERR_VALUE) ;
+ }
+ if ( opt_l || opt_std ) {
+- (void) fprintf(stderr,msg_l);
++ (void) fprintf(stderr,"%s",msg_l);
+ exit(ERR_VALUE) ;
+ }
+ mode = mode | PL_DIC ;
+@@ -1491,7 +1491,7 @@
+ break;
+ default:
+ if(init[0] == '/') {
+- fprintf(stderr,msg_abnl );
++ fprintf(stderr,"%s",msg_abnl );
+ }
+ else {
+ fprintf(stderr,msg_abnls,init);
+--- a/cmd/catdic/rutil.c
++++ b/cmd/catdic/rutil.c
+@@ -271,7 +271,7 @@
+ "Dictionary \"%s\" does not exist.\n"), dicname);
+ break;
+ case NOTALC :
+- (void)fprintf(stderr, msg_mem);
++ (void)fprintf(stderr, "%s", msg_mem);
+ break;
+ case BADF :
+ (void)fprintf(stderr, gettxt("cannacmd:196",
+@@ -297,7 +297,7 @@
+ (void)fprintf(stderr,msg_abnls,init);
+ }
+ else {
+- (void)fprintf(stderr,msg_abnl);
++ (void)fprintf(stderr,"%s",msg_abnl);
+ }
+ break;
+ }
+@@ -321,7 +321,7 @@
+ (void)fprintf(stderr, msg_abnls, init);
+ }
+ else {
+- (void)fprintf(stderr, msg_abnl);
++ (void)fprintf(stderr, "%s", msg_abnl);
+ }
+ ret = -1;
+ return ret;
+@@ -332,13 +332,13 @@
+ (void)fprintf(stderr, msg_mnts, init);
+ }
+ else {
+- (void)fprintf(stderr, msg_mnt);
++ (void)fprintf(stderr, "%s", msg_mnt);
+ }
+ ret = -1;
+ return ret;
+ }
+ if ((mode & PL_DIC) == PL_DIC ) {
+- (void)fprintf(stderr,msg_fq);
++ (void)fprintf(stderr,"%s",msg_fq);
+ ret = -1 ;
+ return ret ;
+ }
+@@ -359,7 +359,7 @@
+ ret = 0;
+ break;
+ case NOTALC :
+- (void)fprintf(stderr, msg_mem);
++ (void)fprintf(stderr, "%s", msg_mem);
+ ret = -1;
+ break;
+ case BADF :
+@@ -421,7 +421,7 @@
+ ret = -1;
+ break;
+ case BADCONT :
+- (void)fprintf(stderr,msg_cnt);
++ (void)fprintf(stderr,"%s",msg_cnt);
+ ret = -1;
+ break;
+ default:
+@@ -429,7 +429,7 @@
+ (void)fprintf(stderr, msg_abnls, init);
+ }
+ else {
+- (void)fprintf(stderr, msg_abnl);
++ (void)fprintf(stderr, "%s", msg_abnl);
+ }
+ exit(ERR_VALUE);
+ break;
+@@ -448,7 +448,7 @@
+ ret = 0;
+ break;
+ case NOTALC :
+- (void)fprintf(stderr, msg_mem);
++ (void)fprintf(stderr, "%s", msg_mem);
+ ret = -1;
+ break;
+ case BADF :
+@@ -509,11 +509,11 @@
+ ret = -1;
+ break;
+ case BADARG :
+- (void)fprintf(stderr,msg_fq);
++ (void)fprintf(stderr,"%s",msg_fq);
+ ret = -1;
+ break;
+ case BADCONT :
+- (void)fprintf(stderr,msg_cnt);
++ (void)fprintf(stderr,"%s",msg_cnt);
+ ret = -1;
+ break;
+ case NOENT : /* 91.12.03 */
+@@ -526,7 +526,7 @@
+ (void)fprintf(stderr, msg_abnls, init);
+ }
+ else {
+- (void)fprintf(stderr, msg_abnl);
++ (void)fprintf(stderr, "%s", msg_abnl);
+ }
+ exit(ERR_VALUE);
+ break;
+@@ -556,7 +556,7 @@
+ (void)fprintf(stderr, msg_abnls,init);
+ }
+ else {
+- (void)fprintf(stderr, msg_abnl);
++ (void)fprintf(stderr, "%s", msg_abnl);
+ }
+ ret = -1;
+ return ret;
+@@ -567,13 +567,13 @@
+ (void)fprintf(stderr, msg_mnts, init);
+ }
+ else {
+- (void)fprintf(stderr, msg_mnt);
++ (void)fprintf(stderr, "%s", msg_mnt);
+ }
+ ret = -1;
+ return ret;
+ }
+ if ((mode & PL_DIC) == PL_DIC ) {
+- (void)fprintf(stderr, msg_fq);
++ (void)fprintf(stderr, "%s", msg_fq);
+ ret = -1 ;
+ return ret ;
+ }
+@@ -608,7 +608,7 @@
+ ret = -2; /* 93.03.03 */
+ break;
+ case BADCONT :
+- (void)fprintf(stderr, msg_cnt);
++ (void)fprintf(stderr, "%s", msg_cnt);
+ ret = -1;
+ break;
+ default:
+@@ -616,7 +616,7 @@
+ (void)fprintf(stderr, msg_abnls, init);
+ }
+ else {
+- (void)fprintf(stderr, msg_abnl);
++ (void)fprintf(stderr, "%s", msg_abnl);
+ }
+ ret = -1;
+ break;
+@@ -651,7 +651,7 @@
+ ret = -2; /* 93.03.03 */
+ break;
+ case BADCONT :
+- (void)fprintf(stderr, msg_cnt);
++ (void)fprintf(stderr, "%s", msg_cnt);
+ ret = -1;
+ break;
+ default:
+@@ -659,7 +659,7 @@
+ (void)fprintf(stderr, msg_abnls, init);
+ }
+ else {
+- (void)fprintf(stderr, msg_abnl);
++ (void)fprintf(stderr, "%s", msg_abnl);
+ }
+ ret = -1;
+ break;
diff --git a/app-i18n/canna/files/canna-Wformat.patch b/app-i18n/canna/files/canna-Wformat.patch
new file mode 100644
index 0000000000..a8f5aa3716
--- /dev/null
+++ b/app-i18n/canna/files/canna-Wformat.patch
@@ -0,0 +1,11 @@
+--- a/doc/man/guide/tex/cannaindex.c
++++ b/doc/man/guide/tex/cannaindex.c
+@@ -198,7 +198,7 @@
+ }
+ inf = fopen(argv[1], "r");
+ if (!inf) {
+- fprintf(stderr, "%s: Can not open file \"%s\".\n", argv[1]);
++ fprintf(stderr, "%s: Can not open file \"%s\".\n", program, argv[1]);
+ exit(1);
+ }
+ pages = readindex(inf, entries);
diff --git a/app-i18n/canna/files/canna-canuum.patch b/app-i18n/canna/files/canna-canuum.patch
new file mode 100644
index 0000000000..293ffbb54c
--- /dev/null
+++ b/app-i18n/canna/files/canna-canuum.patch
@@ -0,0 +1,34 @@
+--- a/canuum/configure.in
++++ b/canuum/configure.in
+@@ -401,7 +401,7 @@
+ dnl
+ olibs="$LIBS"
+ AC_MSG_CHECKING(--with-term-libs argument)
+-AC_ARG_WITH(tlib,
++AC_ARG_WITH(term-libs,
+ [ --with-term-libs=-lLIB terminal library to be used ],)
+ if test -n "$with_term_libs"; then
+ AC_MSG_RESULT($with_term_libs)
+--- a/canuum/wnn_config.h
++++ b/canuum/wnn_config.h
+@@ -149,8 +149,8 @@
+ #define TTY_KCODE J_EUJIS
+ #define PTY_KCODE J_EUJIS
+ # else /* !DGUX */
+-#define TTY_KCODE J_JIS
+-#define PTY_KCODE J_JIS
++#define TTY_KCODE J_EUJIS
++#define PTY_KCODE J_EUJIS
+ # endif
+ #endif
+
+--- a/canuum/wnn_os.h
++++ b/canuum/wnn_os.h
+@@ -41,6 +41,7 @@
+ #include
+ #if STDC_HEADERS
+ # include
++# include
+ # include
+ #endif /* STDC_HEADERS */
+
diff --git a/app-i18n/canna/files/canna-gentoo.patch b/app-i18n/canna/files/canna-gentoo.patch
new file mode 100644
index 0000000000..7ff274c2c5
--- /dev/null
+++ b/app-i18n/canna/files/canna-gentoo.patch
@@ -0,0 +1,146 @@
+--- a/Canna.conf
++++ b/Canna.conf
+@@ -109,12 +109,12 @@
+ # define DefErrDir $(cannaPrefix)/log
+ # define DefLibCannaDir $(cannaExecPrefix)/lib
+ #else
+-# define DefCannaPrefix /usr/local/canna
++# define DefCannaPrefix $(EPREFIX)/usr
+ # ifdef ObsoleteInstallDir
+ # define DefErrDir /usr/spool/canna
+ # define DefLibCannaDir /usr/lib
+ # else
+-# define DefErrDir /var/log
++# define DefErrDir $(EPREFIX)/var/log/$(PN)
+ # define DefLibCannaDir $(cannaExecPrefix)/lib
+ # endif
+ #endif
+@@ -123,7 +123,7 @@
+ # define DefCannaLibDir $(cannaPrefix)/lib
+ #else
+ # define DefCannaSrvDir $(cannaExecPrefix)/sbin
+-# define DefCannaLibDir $(cannaPrefix)/share/canna
++# define DefCannaLibDir /etc/canna
+ #endif
+
+ #if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) \
+@@ -147,9 +147,11 @@
+ XCOMM cannaLibDir = /var/lib/canna
+ XCOMM cannaLibDir = /var/db/canna
+ cannaLibDir = DefCannaLibDir
+-XCOMM cannaManDir = $(cannaPrefix)/share/man
+-cannaManDir = $(cannaPrefix)/man
+-cannaIncDir = $(cannaPrefix)/include/canna
++cannaManDir = $(cannaPrefix)/share/man
++XCOMM cannaManDir = $(cannaPrefix)/man
++cannaIncDir = $(cannaPrefix)/include/$(PN)
++cannaShareDir = $(cannaPrefix)/share/$(PN)
++cannaDocDir = $(cannaPrefix)/share/doc/$(PF)
+
+ libCannaDir = DefLibCannaDir
+ ErrDir = DefErrDir
+@@ -237,7 +239,7 @@
+ /* #define UseInstalledLibCanna YES */
+ #define UseInstalledLibCanna NO
+
+-DicDir = $(cannaLibDir)/dic
++DicDir = $(EPREFIX)/var/lib/$(PN)/dic
+
+ /* ここから下は変更不要です */
+
+--- a/Imakefile
++++ b/Imakefile
+@@ -87,6 +87,7 @@
+ echo "#define CANNAHOSTFILE \"$(cannaLibDir)/cannahost\"";\
+ echo "/* for lib/canna */";\
+ echo "#define CANNALIBDIR \"$(cannaLibDir)\""; \
++ echo "#define CANNASHAREDIR \"$(cannaShareDir)\""; \
+ echo "#define SUPPORT_OLD_WCHAR $(supportOldWchar)"; \
+ echo "/* for scripts */";\
+ echo "#define CANNABINDIR $(cannaBinDir)"; \
+--- a/dic/phono/Imakefile
++++ b/dic/phono/Imakefile
+@@ -27,9 +27,10 @@
+
+ ROMAJI_DIC_DEF = -DSHIFT
+
+- DICDIR = $(cannaLibDir)/dic
+- SAMPLEDIR = $(cannaLibDir)/sample
+- SAMPLESRCDIR = $(cannaLibDir)/sample/src
++ DICDIR = $(DicDir)
++ CANNASHAREDIR = $(cannaShareDir)
++ SAMPLEDIR = $(cannaDocDir)/sample
++ SAMPLESRCDIR = $(cannaDocDir)/sample/src
+
+ KPDEF = default.kpdef jdaemon.kpdef just.kpdef kaisoku.kpdef kana.kpdef \
+ lan5.kpdef matsu.kpdef newjis.kpdef romaji.kpdef sokuon.kpdef \
+@@ -69,7 +70,7 @@
+ MakeDirectories(install,$(DICDIR))
+ MakeDirectories(install,$(SAMPLESRCDIR))
+
+-InstallMultiple($(ROMKANA_TABLES),$(DICDIR))
++InstallMultiple($(ROMKANA_TABLES),$(CANNASHAREDIR))
+
+ #ifdef USE_OBSOLETE_STYLE_FILENAME
+ InstallNonExec(default.kpdef,$(SAMPLESRCDIR))
+--- a/lib/canna/romaji.c
++++ b/lib/canna/romaji.c
+@@ -427,7 +427,6 @@
+ }
+ }
+
+-#if 0 /* currently CANNASHAREDDIR is not defined */
+ if (retval == (struct RkRxDic *)NULL) { /* added for Debian by ISHIKAWA Mutsumi */
+ extern jrUserInfoStruct *uinfo;
+
+@@ -450,7 +449,6 @@
+ }
+ }
+ }
+-#endif
+
+ if (retval == (struct RkRxDic *)NULL) { /* 全部オープンできない */
+ sprintf(rdic,
+--- a/misc/Imakefile
++++ b/misc/Imakefile
+@@ -48,7 +48,7 @@
+ MakeLintLibSubdirs($(SUBDIRS))
+ MakeLintSubdirs($(SUBDIRS),install.ln,install.ln)
+
+-MakeDirectories(install,$(cannaLibDir)/sample/src)
++MakeDirectories(install,$(cannaDocDir)/sample/src)
+
+ #ifdef USE_OBSOLETE_STYLE_FILENAME
+ default.canna: default.ca
+@@ -58,8 +58,8 @@
+ $(CP) default.ca default.canna
+ #endif
+
+ InstallNonExec(default.canna,$(cannaLibDir))
+-InstallNonExec(is.c,$(cannaLibDir)/sample/src)
++InstallNonExec(is.c,$(cannaDocDir)/sample/src)
+
+ clean::
+ $(RM) $(PROGRAMS)
+--- a/misc/initfiles/Imakefile
++++ b/misc/initfiles/Imakefile
+@@ -6,7 +6,7 @@
+ #endif
+
+ CANNAROOT = ../..
+- SAMPLEDIR = $(cannaLibDir)/sample
++ SAMPLEDIR = $(cannaDocDir)/sample
+
+ all::
+
+--- a/server/Imakefile
++++ b/server/Imakefile
+@@ -6,7 +6,7 @@
+ #ifdef __EMX__
+ INSTFLAGS = $(INSTUGIDFLAGS)
+ #else
+- INSTFLAGS = -s $(INSTUGIDFLAGS)
++ INSTFLAGS = $(INSTUGIDFLAGS)
+ #endif
+ DEFINES = $(CANNASERVER_DEFINES) $(SIGNAL_DEFINES) ConnectionFlags
+ INCLUDES = -I$(CANNAROOT)/include
diff --git a/app-i18n/canna/files/canna-kpdef.patch b/app-i18n/canna/files/canna-kpdef.patch
new file mode 100644
index 0000000000..b0b71b4442
--- /dev/null
+++ b/app-i18n/canna/files/canna-kpdef.patch
@@ -0,0 +1,18 @@
+--- a/dic/phono/default.kpdef
++++ b/dic/phono/default.kpdef
+@@ -350,3 +350,15 @@
+ _ _
+ / /
+ \\ ¥
++
++# some useful romkan symbols
++z, ‥
++z- 〜
++z. …
++z/ ・
++z[ 『
++z] 』
++zh ←
++zj ↓
++zk ↑
++zl →
diff --git a/app-i18n/canna/files/canna-overflow.patch b/app-i18n/canna/files/canna-overflow.patch
new file mode 100644
index 0000000000..ef3b6ad1b9
--- /dev/null
+++ b/app-i18n/canna/files/canna-overflow.patch
@@ -0,0 +1,20 @@
+--- a/cmd/catdic/rutil.c
++++ b/cmd/catdic/rutil.c
+@@ -384,7 +384,7 @@
+ (void)fprintf(stderr,gettxt("cannacmd:205",
+ "Specified dictionary \"%s\" already exists. Do you overwrite it ? (y/n)"),
+ dicname);
+- fgets(ans,80,stdin);
++ fgets(ans,sizeof(ans),stdin);
+ } else {
+ (void)fprintf(stderr,gettxt("cannacmd:206",
+ "Specified dictionary \"%s\" already exists."),dicname);
+@@ -474,7 +474,7 @@
+ if (isatty(fileno(stdin)) != 0) {
+ (void)fprintf(stderr,gettxt("cannacmd:216",
+ "Personal learning file of dictionary \"%s\" exists. Do you overwrite it ? (y/n)"),dicname);
+- fgets(ans,80,stdin);
++ fgets(ans,sizeof(ans),stdin);
+ } else {
+ (void)fprintf(stderr,gettxt("cannacmd:217",
+ "Personal learning file of system dictionary \"%s\" already exists."),
diff --git a/app-i18n/canna/files/canna-posix-sort.patch b/app-i18n/canna/files/canna-posix-sort.patch
new file mode 100644
index 0000000000..1f98aaf5ef
--- /dev/null
+++ b/app-i18n/canna/files/canna-posix-sort.patch
@@ -0,0 +1,11 @@
+--- a/cmd/mkbindic/mkbindic.cpp
++++ b/cmd/mkbindic/mkbindic.cpp
+@@ -40,7 +40,7 @@
+ bck_text=;
+ flag=;
+ compat_flag=;
+-sortcmd="sort -d -s +0 -1"
++sortcmd="sort -d -s -k 1,1"
+ usage="usage: mkbindic [-m|-s] [-name dicname] [-c version] textfile [cpp-args ...]";
+ : ${TMPDIR:=/tmp}
+
diff --git a/app-i18n/canna/files/canna-respect-flags.patch b/app-i18n/canna/files/canna-respect-flags.patch
new file mode 100644
index 0000000000..13fb1ed9c6
--- /dev/null
+++ b/app-i18n/canna/files/canna-respect-flags.patch
@@ -0,0 +1,29 @@
+--- /var/tmp/portage/app-i18n/canna-3.7_p3-r4/work/Canna37p3/canuum/Imakefile
++++ Canna37p3/canuum/Imakefile
+@@ -51,6 +51,8 @@
+ $(CONFIGURE_CMD)
+ XCOMM Invoked from confwrapper
+ cwenv.sh:
+- $(CANNAROOT)/confwrapper mkenv CPPFLAGS $(ALLDEFINES) > $@
+- $(CANNAROOT)/confwrapper mkenv CC env $(CC) >> $@
++ $(CANNAROOT)/confwrapper mkenv CPPFLAGS $(ALLDEFINES) $(CPPFLAGS) > $@
++ $(CANNAROOT)/confwrapper mkenv CC $(CC) >> $@
++ $(CANNAROOT)/confwrapper mkenv AR $(AR) >> $@
+ $(CANNAROOT)/confwrapper mkenv CFLAGS $(PURE_CFLAGS) >> $@
++ $(CANNAROOT)/confwrapper mkenv LDFLAGS $(LDFLAGS) >> $@
+--- /var/tmp/portage/app-i18n/canna-3.7_p3-r4/work/Canna37p3/Imakefile
++++ Canna37p3/Imakefile
+@@ -117,9 +117,11 @@
+ $(CONFIGURE_CMD)
+ XCOMM Invoked from confwrapper
+ cwenv.sh:
+- $(CANNAROOT)/confwrapper mkenv CPPFLAGS $(ALLDEFINES) > $@
+- $(CANNAROOT)/confwrapper mkenv CC env $(CC) >> $@
++ $(CANNAROOT)/confwrapper mkenv CPPFLAGS $(ALLDEFINES) $(CPPFLAGS) > $@
++ $(CANNAROOT)/confwrapper mkenv CC $(CC) >> $@
++ $(CANNAROOT)/confwrapper mkenv AR $(AR) >> $@
+ $(CANNAROOT)/confwrapper mkenv CFLAGS $(PURE_CFLAGS) >> $@
++ $(CANNAROOT)/confwrapper mkenv LDFLAGS $(LDFLAGS) >> $@
+
+ CANNAROOT = .
+ SERVERDIR = server dic/phono dic/ideo
diff --git a/app-i18n/canna/files/canna-rundir.patch b/app-i18n/canna/files/canna-rundir.patch
new file mode 100644
index 0000000000..d8c58be493
--- /dev/null
+++ b/app-i18n/canna/files/canna-rundir.patch
@@ -0,0 +1,15 @@
+--- a/Canna.conf
++++ b/Canna.conf
+@@ -341,10 +341,10 @@
+ #endif
+
+ #ifdef InstallAsUser
+-UnixSockDir = $(cannaPrefix)/tmp/.iroha_unix
++UnixSockDir = $(cannaPrefix)/run/.iroha_unix
+ AccessFile = $(cannaPrefix)/etc/hosts.canna
+ #else
+-UnixSockDir = /tmp/.iroha_unix
++UnixSockDir = /run/.iroha_unix
+ AccessFile = /etc/hosts.canna
+ #endif
+ UnixSockName = IROHA
diff --git a/app-i18n/canna/files/canna-tmpfiles.conf b/app-i18n/canna/files/canna-tmpfiles.conf
new file mode 100644
index 0000000000..8b70ef1a13
--- /dev/null
+++ b/app-i18n/canna/files/canna-tmpfiles.conf
@@ -0,0 +1,2 @@
+d /run/.iroha_unix 0755 canna canna -
+
diff --git a/app-i18n/canna/files/canna.confd b/app-i18n/canna/files/canna.confd
new file mode 100644
index 0000000000..d3fdce5425
--- /dev/null
+++ b/app-i18n/canna/files/canna.confd
@@ -0,0 +1,7 @@
+CANNASERVER_ENABLE_SYSLOG="yes"
+
+# Specify user to run as
+CANNASERVER_OWNER="bin"
+
+# Options for cannaserver
+CANNASERVER_OPTS=""
diff --git a/app-i18n/canna/files/canna.hosts b/app-i18n/canna/files/canna.hosts
new file mode 100644
index 0000000000..509143d863
--- /dev/null
+++ b/app-i18n/canna/files/canna.hosts
@@ -0,0 +1 @@
+unix
diff --git a/app-i18n/canna/files/canna.initd b/app-i18n/canna/files/canna.initd
new file mode 100644
index 0000000000..fdfc3fc20b
--- /dev/null
+++ b/app-i18n/canna/files/canna.initd
@@ -0,0 +1,31 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/${RC_SVCNAME}server"
+command_args="${CANNASERVER_OPTS}"
+
+# CANNASERVER_OPTS and CANNASERVER_OWNER is defined in /etc/conf.d/canna
+CANNASERVER_LOGFILE="/var/log/${RC_SVCNAME}/CANNA0msgs"
+
+depend() {
+ use logger
+ need net
+}
+
+start_pre() {
+ if [ "${CANNASERVER_ENABLE_SYSLOG}" = "yes" ]; then
+ command_args="${command_args} -syslog"
+ elif [ -z "${CANNASERVER_OWNER}" ]; then
+ checkpath "${CANNASERVER_LOGFILE}"
+ else
+ checkpath -o "${CANNASERVER_OWNER}" "${CANNASERVER_LOGFILE}"
+ command_args="${command_args} -u ${CANNASERVER_OWNER}"
+ fi
+}
+
+stop() {
+ ebegin "Stopping ${name:-${RC_SVCNAME}}"
+ /usr/sbin/${RC_SVCNAME}kill
+ eend ${?}
+}
diff --git a/app-i18n/canna/files/canna.service b/app-i18n/canna/files/canna.service
new file mode 100644
index 0000000000..1bd0498fb4
--- /dev/null
+++ b/app-i18n/canna/files/canna.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Canna Japanese Conversion Engine
+After=syslog.target
+
+[Service]
+User=canna
+Type=forking
+ExecStart=/usr/sbin/cannaserver -syslog
+ExecStop=/usr/sbin/cannakill
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-i18n/canna/files/cannaping.c b/app-i18n/canna/files/cannaping.c
new file mode 100644
index 0000000000..67f49808b6
--- /dev/null
+++ b/app-i18n/canna/files/cannaping.c
@@ -0,0 +1,46 @@
+/*
+ * cannaping - the minimal cannaserver check program
+ *
+ * Copyright (C) 2003 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * Bugs & suggestions about this program are welcome:
+ * http://bugzilla.redhat.com/
+ *
+ * 2003/02/04
+ * Yukihiro Nakai
+ */
+
+#include
+#include
+#include
+
+int main() {
+ char** warning = NULL;
+ int res = jrKanjiControl(0, KC_INITIALIZE, (char*)&warning);
+
+ if( res != 0 ) {
+ exit(-1);
+ } else if( warning ) {
+ exit(-1);
+ }
+
+ jrKanjiControl(0, KC_FINALIZE, 0);
+ return 0;
+}
diff --git a/app-i18n/canna/files/dot-canna b/app-i18n/canna/files/dot-canna
new file mode 100644
index 0000000000..37fdc2f27c
--- /dev/null
+++ b/app-i18n/canna/files/dot-canna
@@ -0,0 +1,195 @@
+;; Copyright 1992 NEC Corporation, Tokyo, Japan.
+;;
+;; Permission to use, copy, modify, distribute and sell this software
+;; and its documentation for any purpose is hereby granted without
+;; fee, provided that the above copyright notice appear in all copies
+;; and that both that copyright notice and this permission notice
+;; appear in supporting documentation, and that the name of NEC
+;; Corporation not be used in advertising or publicity pertaining to
+;; distribution of the software without specific, written prior
+;; permission. NEC Corporation makes no representations about the
+;; suitability of this software for any purpose. It is provided "as
+;; is" without express or implied warranty.
+;;
+;; NEC CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+;; INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+;; NO EVENT SHALL NEC CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+;; CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+;; USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+;; OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+;; PERFORMANCE OF THIS SOFTWARE.
+
+;; $Id: dot-canna,v 1.1 2005/09/26 09:29:14 tagoh Exp $
+
+;; 記号置き換え変換を利用するか。
+
+(setq use-symbolic-definition t)
+
+;;; ローマ字かな変換の設定
+;
+; ローマ字かな変換テーブルを指定します。ローマ字かな変換テーブルは
+; (1) カレントディレクトリ
+; (2) ホームディレクトリ
+; (3) /usr/lib/canna/dic
+; の順にサーチされます。
+;
+
+;(setq romkana-table "unix.cbp")
+(setq romkana-table "default.cbp")
+
+;; 外来語変換
+;(setq english-table "canna/english.cbp")
+
+
+;;; 利用する辞書
+;
+; ただ単に書き並べているのは単語登録を行わない辞書でシステム辞書などが
+; これに当たります。
+;
+; 部首辞書に関しては :bushu を先行させて記述します。
+;
+; 単語登録をしたい辞書に関しては :user を先行させて記述します。単語登
+; 録をする辞書はテキスト形式辞書でなければなりません。単語登録させたい
+; 辞書は mkdic user の様なコマンドを打つことでで簡単に作成することがで
+; きます。
+;
+(use-dictionary
+ "gcanna"
+ "gcannaf"
+ "chimei"
+; "iroha"
+ "fuzokugo"
+ "hojomwd"
+ "hojoswd"
+ "software"
+ "keishiki"
+ "zipcode"
+ "geo"
+; "zip99"
+ "basho"
+ "keisan"
+ "pub"
+ "scien"
+ "sup"
+ "bonobo"
+ :bushu "bushu"
+ :user "user"
+ )
+
+;;; さまざまなパラメタの設定
+;
+; 真理値を設定するものについては真については t 、偽については nil を設
+; 定します。
+
+; 一番右で右に行こうとすると左端にいくようにするか
+(setq cursor-wrap t) ; default t
+
+; 一覧表示で数字を打ったときにカーソル移動に留める(nil)か選択までして
+; しまうか(t)
+(setq select-direct t) ; default t
+
+; 一覧表示で数字で選択するか(t)。nilの時は数字が表示されません
+(setq numerical-key-select t) ; default t
+
+; 候補表示時に文節の区切りに空白をいれるか
+(setq bunsetsu-kugiri nil) ; default nil
+
+; 文字ベースの移動をするか(t)。 nilの時はローマ字かな変換の単位でカー
+; ソル移動が行われます。
+(setq character-based-move t) ; default t
+
+; 入力中の読み全体をリバースするか
+(setq reverse-widely nil) ; default nil
+
+; 頻度学習をするか
+(setq gakushu t) ; default t
+
+; 一覧の最後までいったら一旦一覧表示をやめるか
+(setq quit-if-end-of-ichiran nil); default nil
+
+; 文節の右端で右移動をすると全体が確定してしまうか
+(setq kakutei-if-end-of-bunsetsu nil) ; default nil
+
+; 一覧選択後同じ文節にとどまるか(t)。nilの時は一覧選択を行うとひとつ先
+; の文節に移動します。
+(setq stay-after-validate t) ; default t
+
+; 読みを入力中にバックスペースを打つとローマ字までバラバラにするか
+(setq break-into-roman t) ; default nil
+
+; 何回の変換キーで一覧表示を行うか。0を入れると変換キーだけでは
+; 一覧表示には移りません。その場合には C-w を入力して一覧表示して
+; 下さい。
+(setq n-henkan-for-ichiran 2) ; default 2
+
+; 単語登録時に文法関連の質問をするか(t)。nilの時は適当な品詞を付けてし
+; まいます。
+(setq gramatical-question t) ; default t
+
+; 候補が全体の何番目かを表示するか
+(setq kouho-count t) ; default t
+
+; 逐次変換をするか
+(setq auto nil) ; default nil
+
+; 逐次変換をする時に何個の文節までを未確定で保持するか
+(setq n-kouho-bunsetsu 16) ; default 16
+
+; ローマ字かな変換でイリーガルなローマ字を捨てるか
+(setq abandon-illegal-phonogram nil) ; default nil
+
+; 一覧の時も次の入力を認めるか
+(setq allow-next-input t) ; default t
+
+; 一文字レベルのローマ字かな変換の補助テーブル
+(if use-symbolic-definition
+ (progn
+ (defsymbol ?- "ー" "-" "−" "‐")
+ (defsymbol ?/ "/" "/" "・")
+ (defsymbol ?\\ "\\" "\" "¥")
+ (defsymbol
+ ?( "(" "(" "【"
+ ?) ")" ")" "】" )
+ (defsymbol
+ ?[ "「" "『" "[" "〔" "["
+ ?] "」" "』" "]" "〕" "]")
+ (defsymbol
+ ?. "。" "." "."
+ ?, "、" "," "," )
+ (defsymbol
+ ?0 "0" "0" "〇" "零"
+ ?1 "1" "1" "一" "壱"
+ ?2 "2" "2" "二" "弐"
+ ?3 "3" "3" "三" "参"
+ ?4 "4" "4" "四" "四"
+ ?5 "5" "5" "五" "伍"
+ ?6 "6" "6" "六" "六"
+ ?7 "7" "7" "七" "七"
+ ?8 "8" "8" "八" "八"
+ ?9 "9" "9" "九" "九" )
+ (defsymbol
+ ?? "?" "?"
+ ?! "!" "!")
+ (defsymbol ?# "#" "#")
+ (defsymbol ?$ "$" "$")
+ (defsymbol ?% "%" "%")
+ (defsymbol ?& "&" "&")
+ (defsymbol ?+ "+" "+")
+ (defsymbol ?* "*" "*" "×")
+ (defsymbol ?_ "_" "_")
+ (defsymbol ?' "'" "’")
+ (defsymbol ?` "`" "‘")
+ (defsymbol ?\" "\"" "”")
+ ))
+
+;; delete キーもバックスペースと同じ処理をさせる
+(global-set-key "\Delete" 'delete-previous) ; necessary in using Emacs
+
+;; Help がない人もいるので F1 でも同じ動作をさせる。
+(global-set-key "\F1" 'extend-mode)
+
+;; Escape key should escape from the mode.
+(global-set-key "\Escape" 'quit)
+
+;; Ctrl-o の抑制
+(global-unbind-key-function 'japanese-mode)
diff --git a/app-i18n/canna/files/update-canna-dics_dir b/app-i18n/canna/files/update-canna-dics_dir
new file mode 100644
index 0000000000..b4061c8858
--- /dev/null
+++ b/app-i18n/canna/files/update-canna-dics_dir
@@ -0,0 +1,36 @@
+#!/bin/sh
+# update-canna-dics_dir
+# compiles dics.dir files for Canna Server
+# Copyright 2001 ISHIKAWA Mutsumi
+# Licensed under the GNU General Public License, version 2. See the file
+# /usr/share/common-licenses/GPL or .
+
+SRC=/etc/canna/dics.dir.d
+DEST=/var/lib/canna/dic/canna
+
+for DIR in $SRC $DEST; do
+ VALID=yes
+ if [ ! -d $DIR ]; then
+ echo "$0: $DIR does not exist or is not a directory." >&2
+ VALID=
+ fi
+done
+
+if [ -n "$VALID" ]; then
+ # write new dics.dir file in case we are interrupted
+ echo '# dics.dir -- automatically generated file. DO NOT EDIT.' > $DEST/dics.dir.update-new
+# echo '# To modify, see update-canna-dics_dir(8). >> $DEST/dics.dir.update-new
+ # are there any files to process?
+ if [ "$(echo $SRC/*.dics.dir)" != "$SRC/*.dics.dir" ]; then
+ for file in $SRC/*.dics.dir; do
+ echo "# $file" >> $DEST/dics.dir.update-new
+ cat $file >> $DEST/dics.dir.update-new
+ done
+ mv $DEST/dics.dir.update-new $DEST/dics.dir
+ else
+ # no files to process, remove the one
+ rm -f $DEST/dics.dir
+ fi
+fi
+
+exit
diff --git a/app-i18n/canna/metadata.xml b/app-i18n/canna/metadata.xml
new file mode 100644
index 0000000000..88181e8f09
--- /dev/null
+++ b/app-i18n/canna/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ co-maintainers welcome
+ Alessandro Barbieri
+ lssndrbarbieri@gmail.com
+
+
+
diff --git a/app-i18n/im-canna/Manifest b/app-i18n/im-canna/Manifest
new file mode 100644
index 0000000000..224e02e830
--- /dev/null
+++ b/app-i18n/im-canna/Manifest
@@ -0,0 +1 @@
+DIST im-canna-0.3.2.2.tar.gz 314633 BLAKE2B 971ab1d00645a0bd977a156abd6a1d3ad767505b5bd45792332a399685388b53b08e3133bc435adb7a7e27125fb1ad2d538f78af2420679c6d6d17878251b2ac SHA512 6ec4253038ca97e3e6319c024e4d11ca5418bf478280c4b19b81a9c628310a06bcd4ec35334d3a2bbdff0245bdfa660c1cdfd949ddd6b768d3b73d78648edc81
diff --git a/app-i18n/im-canna/files/im-canna-gentoo.patch b/app-i18n/im-canna/files/im-canna-gentoo.patch
new file mode 100644
index 0000000000..959e8697eb
--- /dev/null
+++ b/app-i18n/im-canna/files/im-canna-gentoo.patch
@@ -0,0 +1,35 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-moduledir = ${libdir}/gtk-2.0/2.4.0/immodules
++moduledir = ${libdir}/gtk-2.0/${GTK_BINARY_VERSION}/immodules
+ ## Makefile.am for gtk+/modules/input
+ if PLATFORM_WIN32
+ no_undefined = -no-undefined
+@@ -6,11 +6,11 @@
+
+ SUBDIRS = po
+
+-INCLUDES = @GTK_DEP_CFLAGS@ -I/usr/include/canna -DIM_LOCALEDIR=\"${datadir}/locale\"
++INCLUDES = @GTK_DEP_CFLAGS@ -DIM_LOCALEDIR=\"${datadir}/locale\"
+
+ DEPS =
+
+-LDADDS = @GTK_DEP_LIBS@ -lcanna
++LDADDS = @GTK_DEP_LIBS@
+
+ EXTRA_DIST= \
+ im-canna.spec \
+--- a/configure.in
++++ b/configure.in
+@@ -21,8 +21,10 @@
+
+ GTK_DEP_CFLAGS=`pkg-config gtk+-2.0 --cflags`
+ GTK_DEP_LIBS=`pkg-config gtk+-2.0 --libs`
++GTK_BINARY_VERSION=`pkg-config gtk+-2.0 --variable=gtk_binary_version`
+ AC_SUBST(GTK_DEP_CFLAGS)
+ AC_SUBST(GTK_DEP_LIBS)
++AC_SUBST(GTK_BINARY_VERSION)
+
+ LT_RELEASE=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION
+ LT_CURRENT=2
diff --git a/app-i18n/im-canna/im-canna-0.3.2.2-r1.ebuild b/app-i18n/im-canna/im-canna-0.3.2.2-r1.ebuild
new file mode 100644
index 0000000000..2e14c27db4
--- /dev/null
+++ b/app-i18n/im-canna/im-canna-0.3.2.2-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools gnome2-utils
+
+DESCRIPTION="Japanese Canna input method module for GTK+2"
+HOMEPAGE="http://bonobo.gnome.gr.jp/~nakai/immodule/"
+SRC_URI="http://bonobo.gnome.gr.jp/~nakai/immodule/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ app-i18n/canna
+ x11-libs/gtk+:2
+"
+DEPEND="
+ ${RDEPEND}
+ sys-devel/gettext
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${PN}-gentoo.patch" )
+
+src_prepare() {
+ default
+
+ mv configure.{in,ac} || die
+ eautoreconf
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ gnome2_query_immodules_gtk2
+}
+
+pkg_postrm() {
+ gnome2_query_immodules_gtk2
+}
diff --git a/app-i18n/im-canna/metadata.xml b/app-i18n/im-canna/metadata.xml
new file mode 100644
index 0000000000..37185a78fe
--- /dev/null
+++ b/app-i18n/im-canna/metadata.xml
@@ -0,0 +1,9 @@
+
+
+
+
+ co-maintainers welcome
+ Alessandro Barbieri
+ lssndrbarbieri@gmail.com
+
+
diff --git a/app-misc/fastfetch/Manifest b/app-misc/fastfetch/Manifest
index afb080563b..5b2a0c5f00 100644
--- a/app-misc/fastfetch/Manifest
+++ b/app-misc/fastfetch/Manifest
@@ -1 +1 @@
-DIST fastfetch-1.5.4.tar.gz 345879 BLAKE2B fac422642e6d2af4658d8f7c23c83b3c15a485eda8705626eda9eba024a4714b814e654f688015932cef3b80332c9e6ea5308d371848719786daca4e73ae059e SHA512 20a305235018ddb1af911246222c7f625311abaf95aa3feed6d7dc06e98b974453f80c34933e286709c721a48238d06b532f2770e72cb3f4018ad54de399a084
+DIST fastfetch-1.5.5.tar.gz 346289 BLAKE2B db6e321150429343a1660ea384b43a8a35a2bbf11cd6acdf9089f0d020059afa28cd4f42ac8d956974f8bb0cd6c3fe9750393ecb154f5449ab5d14a27057daaa SHA512 3c51ff0e82982bf1974b113709eacf323c5a4080a8292d4ffd4575b10cf8ddbd0a55bda57dcaec5bd61bebe4b4f16e6634fa067d01d8df5be0120b2b5f5f886c
diff --git a/app-misc/fastfetch/fastfetch-1.5.4-r1.ebuild b/app-misc/fastfetch/fastfetch-1.5.5.ebuild
similarity index 100%
rename from app-misc/fastfetch/fastfetch-1.5.4-r1.ebuild
rename to app-misc/fastfetch/fastfetch-1.5.5.ebuild
diff --git a/app-misc/mangadesk/Manifest b/app-misc/mangadesk/Manifest
index 2f1ca88fee..161cba156e 100644
--- a/app-misc/mangadesk/Manifest
+++ b/app-misc/mangadesk/Manifest
@@ -1,2 +1,2 @@
-DIST mangadesk-0.7.6.tar.gz 7378260 BLAKE2B 2ccbf74c8df89dee1d6642a88163f1fefe3ecb8c41b45bf2134730e4af0603113bbb35019f820cefc9073435c23d716cab8b70ae428a4c39c9b1d0cadc382375 SHA512 6314628f9e303ab4598a87c4daabca250d1651f4c67dfe7c69051119d20e3060f748f89a5d6500a8791a5b36f37c922f2c0be107f2675ec385c6fe47c18d933c
DIST mangadesk-0.7.7.tar.gz 7400071 BLAKE2B 72b0af2e56227c114d7978d6449f983b628e289d5d7725b6d4b0971204671c6940e6e769652eaba6a2e6b70183728a14a30e617ca149acf9116942150434f210 SHA512 fc50110835a1143433d55b1522961fa80f102e50c816674b648291a116955191ad99febf3a49a7a87657ef67ec0c8d2399dd3583d16a34b6042333ceeeea4c3f
+DIST mangadesk-0.7.8.tar.gz 7406633 BLAKE2B 8fa74981c1afe3cdd524fa84bae4efbfc00efac9d721c3824d1ec73644a046c44c6777af33100eb970733eecdae0d0fa85a9f342da9a16f21ada6d69cc62ce5c SHA512 77b6601551517c67af72411663285c8c9be8c3af2b0ffe6fa0dff5b216d1b361543beba01cf93a5e5f879b604bc6b662f8781afebb380651b7f5c638492967af
diff --git a/app-misc/mangadesk/mangadesk-0.7.6.ebuild b/app-misc/mangadesk/mangadesk-0.7.8.ebuild
similarity index 100%
rename from app-misc/mangadesk/mangadesk-0.7.6.ebuild
rename to app-misc/mangadesk/mangadesk-0.7.8.ebuild
diff --git a/app-misc/watchexec/Manifest b/app-misc/watchexec/Manifest
index f6d1bc832c..991979c4af 100644
--- a/app-misc/watchexec/Manifest
+++ b/app-misc/watchexec/Manifest
@@ -509,6 +509,7 @@ DIST watchexec-1.17.1.tar.gz 177405 BLAKE2B e85769d4a2fa39ec9c96b3f9dd878f1ddb80
DIST watchexec-1.18.12.tar.gz 245324 BLAKE2B e4279f062471c231dd0995bba2f9e17260e1d504629d707fa612e44cd554ad00597c5af2e2d21a6d4da928ac2cc9c4afe672b03693d97debcaa346ef436a414b SHA512 280bf08d1887dd733ae4984c8e2185675a349bc629fd98c3d25ce7a0580024c9c5eca1ce90737d6be3f2a0e32f09e97411d03d456620a98ef814825a3034b239
DIST watchexec-1.19.0.tar.gz 246191 BLAKE2B de98c2abbbb2f0b7c95862324d98c581695a35b92a3cea22b6c5b76182682251e763346b8f6e8d462f29c5cf31b6ad20be223cc77a520f3d8d4c6cedb9625d50 SHA512 84184353673a4834d7089ccaca117bf9acfd7382b9fea7ca0cbedefb2ff8980de3f3b2ef233ba850f3a2cd4219dce454a9e66f823af16830c6be8aaf96adb7eb
DIST watchexec-1.20.0.tar.gz 265026 BLAKE2B 254adddd9410256faaa77eed95c30aaf34ae840700ffe21477fce70c23b544b4861da52c58e6e9c79a4e030b995474bb97c146b5f2d156cf8d0531bce678c7f7 SHA512 761440fe13c3180431bea8e82c0e6b5e63c745eb514e06d017d714c419383f8e96871e643a02c4714ee15b816f95401b3bb294043c2b10a0ded6730df2a3cd80
+DIST watchexec-1.20.1.tar.gz 265472 BLAKE2B eb4ca4b6024b3a683b7d1124eb196d4d4a2b4af76e964bc1601bc6cebe89ca3f2000473433350b6142c24b65be29995c5e6fbbe725112bc3bc26e1b87b1ccac0 SHA512 8040074d63396ffc8f1d0cf4e803b970341407fd050ec56f0bcbe4f349b8decd174ebd23010cead1c017c7cacc78396f7dc397d6cb21f78f395234235aca94dc
DIST wepoll-ffi-0.1.2.crate 31309 BLAKE2B cd1b01c9fdb6482baff3ab12a9926c1a5a9b6e430e4609890a94b13480f8223de166558724b4d6926d6e9dd7f466926c783df54f9beabc75d646edf4f3429a73 SHA512 f0f5c379d08642aee9c6ef36175b9d858ee1cb7d444b832d6e7ad194167a4db2de5aaee3b2356ca42ef9f48a9872928c61b456305c05dd40cc53e5204686b8a7
DIST which-4.1.0.crate 7684 BLAKE2B 4d8eb0a263c14b506f446fa808d9326c6e4e781cc2d79a1f6efcf7b9bb9a294d3266a2f3de4526ac0ec08ca65a18622ac064e9ae1e86dd1b325b122f684371f8 SHA512 4fffd3dd4ac73f5c232ee8a53bbc948a7295a2a51ec3f792d5d0aa84ceb6c2322fc11b35d29f5d3181c763b34c434c5ea2807ae6cc3393cd30d68b0fd44c7a22
DIST which-4.2.4.crate 9259 BLAKE2B 0371c0c04843ba3c72b4bae2df5ae4539a4750e0d2da0105e370350b7a8985e7fc7a57815dcfe6b3a48ea7c0161b5ca5db3c03b9bf65bd8252adde77fb8055a5 SHA512 9ca2bbec727040197fc12efdc7cd70bc94bd1b4abd03bf86f6043fd960de73053b84c7d101d897563583b8d6d85377025e1e7213640987ebdfdd54fa629e3b80
diff --git a/app-misc/watchexec/watchexec-1.20.1.ebuild b/app-misc/watchexec/watchexec-1.20.1.ebuild
new file mode 100644
index 0000000000..3d7e96ab14
--- /dev/null
+++ b/app-misc/watchexec/watchexec-1.20.1.ebuild
@@ -0,0 +1,338 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.5.2-dev
+
+EAPI=8
+
+CRATES="
+ addr2line-0.17.0
+ adler-1.0.2
+ aho-corasick-0.7.18
+ ansi_term-0.12.1
+ anyhow-1.0.57
+ assert_cmd-2.0.4
+ async-broadcast-0.4.0
+ async-channel-1.6.1
+ async-executor-1.4.1
+ async-io-1.7.0
+ async-lock-2.5.0
+ async-priority-channel-0.1.0
+ async-recursion-0.3.2
+ async-recursion-1.0.0
+ async-stream-0.3.3
+ async-stream-impl-0.3.3
+ async-task-4.2.0
+ async-trait-0.1.56
+ atomic-take-1.0.0
+ atty-0.2.14
+ autocfg-1.1.0
+ axum-0.5.7
+ axum-core-0.2.5
+ backtrace-0.3.65
+ base64-0.13.0
+ bitflags-1.3.2
+ block-0.1.6
+ bstr-0.2.17
+ byteorder-1.4.3
+ bytes-1.1.0
+ cache-padded-1.2.0
+ cc-1.0.73
+ cfg-if-0.1.10
+ cfg-if-1.0.0
+ clap-3.1.18
+ clap_lex-0.2.0
+ clearscreen-1.0.10
+ command-group-1.0.8
+ concurrent-queue-1.2.2
+ console-0.15.0
+ console-api-0.3.0
+ console-subscriber-0.1.6
+ crc32fast-1.3.2
+ crossbeam-channel-0.5.4
+ crossbeam-utils-0.8.8
+ derivative-2.2.0
+ difflib-0.4.0
+ dirs-2.0.2
+ dirs-4.0.0
+ dirs-next-2.0.0
+ dirs-sys-0.3.7
+ dirs-sys-next-0.1.2
+ doc-comment-0.3.3
+ dunce-1.0.2
+ easy-parallel-3.2.0
+ either-1.6.1
+ embed-resource-1.7.2
+ encode_unicode-0.3.6
+ enumflags2-0.7.5
+ enumflags2_derive-0.7.4
+ event-listener-2.5.2
+ failure-0.1.8
+ failure_derive-0.1.8
+ fastrand-1.7.0
+ filetime-0.2.16
+ flate2-1.0.24
+ fnv-1.0.7
+ fsevent-sys-4.1.0
+ futures-0.3.21
+ futures-channel-0.3.21
+ futures-core-0.3.21
+ futures-executor-0.3.21
+ futures-io-0.3.21
+ futures-lite-1.12.0
+ futures-macro-0.3.21
+ futures-sink-0.3.21
+ futures-task-0.3.21
+ futures-util-0.3.21
+ getrandom-0.1.16
+ getrandom-0.2.6
+ gimli-0.26.1
+ git-config-0.2.1
+ git-features-0.20.0
+ git-hash-0.9.5
+ globset-0.4.9
+ h2-0.3.13
+ hashbrown-0.11.2
+ hdrhistogram-7.5.0
+ heck-0.3.3
+ hermit-abi-0.1.19
+ hex-0.4.3
+ http-0.2.8
+ http-body-0.4.5
+ http-range-header-0.3.0
+ httparse-1.7.1
+ httpdate-1.0.2
+ humantime-2.1.0
+ hyper-0.14.19
+ hyper-timeout-0.4.1
+ ignore-0.4.18
+ indexmap-1.8.2
+ inotify-0.9.6
+ inotify-sys-0.1.5
+ insta-1.14.1
+ instant-0.1.12
+ is_ci-1.1.1
+ itertools-0.10.3
+ itoa-1.0.2
+ kqueue-1.0.6
+ kqueue-sys-1.0.3
+ lazy_static-1.4.0
+ libc-0.2.126
+ libmimalloc-sys-0.1.25
+ linked-hash-map-0.5.4
+ lock_api-0.4.7
+ log-0.4.17
+ mac-notification-sys-0.5.0
+ malloc_buf-0.0.6
+ matchers-0.1.0
+ matchit-0.5.0
+ memchr-2.5.0
+ memoffset-0.6.5
+ miette-4.7.1
+ miette-derive-4.7.1
+ mimalloc-0.1.29
+ mime-0.3.16
+ minimal-lexical-0.2.1
+ miniz_oxide-0.5.3
+ mio-0.8.3
+ nix-0.22.3
+ nix-0.23.1
+ nix-0.24.1
+ nom-5.1.2
+ nom-7.1.1
+ notify-5.0.0-pre.15
+ notify-rust-4.5.8
+ num-traits-0.2.15
+ num_cpus-1.13.1
+ num_threads-0.1.6
+ objc-0.2.7
+ objc-foundation-0.1.1
+ objc_id-0.1.1
+ object-0.28.4
+ once_cell-1.12.0
+ ordered-stream-0.0.1
+ os_str_bytes-6.1.0
+ owo-colors-3.4.0
+ parking-2.0.0
+ parking_lot-0.11.2
+ parking_lot_core-0.8.5
+ percent-encoding-2.1.0
+ phf-0.8.0
+ phf_codegen-0.8.0
+ phf_generator-0.8.0
+ phf_shared-0.8.0
+ pin-project-1.0.10
+ pin-project-internal-1.0.10
+ pin-project-lite-0.2.9
+ pin-utils-0.1.0
+ polling-2.2.0
+ ppv-lite86-0.2.16
+ predicates-2.1.1
+ predicates-core-1.0.3
+ predicates-tree-1.0.5
+ proc-macro-crate-1.1.3
+ proc-macro2-1.0.39
+ prost-0.10.4
+ prost-derive-0.10.1
+ prost-types-0.10.1
+ pwd-1.3.1
+ quick-error-2.0.1
+ quote-1.0.18
+ rand-0.7.3
+ rand-0.8.5
+ rand_chacha-0.2.2
+ rand_chacha-0.3.1
+ rand_core-0.5.1
+ rand_core-0.6.3
+ rand_hc-0.2.0
+ rand_pcg-0.2.1
+ redox_syscall-0.2.13
+ redox_users-0.4.3
+ regex-1.5.6
+ regex-automata-0.1.10
+ regex-syntax-0.6.26
+ remove_dir_all-0.5.3
+ rustc-demangle-0.1.21
+ rustc_version-0.4.0
+ ryu-1.0.10
+ same-file-1.0.6
+ scopeguard-1.1.0
+ semver-1.0.10
+ serde-1.0.137
+ serde_derive-1.0.137
+ serde_json-1.0.81
+ serde_repr-0.1.8
+ serde_yaml-0.8.24
+ sha1-0.6.1
+ sha1_smol-1.0.0
+ sharded-slab-0.1.4
+ signal-hook-registry-1.4.0
+ similar-2.1.0
+ siphasher-0.3.10
+ slab-0.4.6
+ smallvec-1.8.0
+ smawk-0.3.1
+ socket2-0.4.4
+ static_assertions-1.1.0
+ strsim-0.10.0
+ strum-0.22.0
+ strum_macros-0.22.0
+ supports-color-1.3.0
+ supports-hyperlinks-1.2.0
+ supports-unicode-1.0.2
+ syn-1.0.96
+ sync_wrapper-0.1.1
+ synstructure-0.12.6
+ tempfile-3.3.0
+ termcolor-1.1.3
+ terminal_size-0.1.17
+ terminfo-0.7.3
+ termtree-0.2.4
+ textwrap-0.15.0
+ thiserror-1.0.31
+ thiserror-impl-1.0.31
+ thread_local-1.1.4
+ time-0.3.9
+ tokio-1.19.2
+ tokio-io-timeout-1.2.0
+ tokio-macros-1.8.0
+ tokio-stream-0.1.9
+ tokio-util-0.7.3
+ toml-0.5.9
+ tonic-0.7.2
+ tower-0.4.12
+ tower-http-0.3.4
+ tower-layer-0.3.1
+ tower-service-0.3.1
+ tracing-0.1.35
+ tracing-attributes-0.1.21
+ tracing-core-0.1.27
+ tracing-futures-0.2.5
+ tracing-log-0.1.3
+ tracing-serde-0.1.3
+ tracing-subscriber-0.3.11
+ try-lock-0.2.3
+ uds_windows-1.0.2
+ unicase-2.6.0
+ unicode-bom-1.1.4
+ unicode-ident-1.0.0
+ unicode-linebreak-0.1.2
+ unicode-segmentation-1.9.0
+ unicode-width-0.1.9
+ unicode-xid-0.2.3
+ valuable-0.1.0
+ version_check-0.9.4
+ vswhom-0.1.0
+ vswhom-sys-0.1.1
+ wait-timeout-0.2.0
+ waker-fn-1.1.0
+ walkdir-2.3.2
+ want-0.3.0
+ wasi-0.9.0+wasi-snapshot-preview1
+ wasi-0.10.2+wasi-snapshot-preview1
+ wasi-0.11.0+wasi-snapshot-preview1
+ wepoll-ffi-0.1.2
+ which-4.2.5
+ winapi-0.3.9
+ winapi-i686-pc-windows-gnu-0.4.0
+ winapi-util-0.1.5
+ winapi-x86_64-pc-windows-gnu-0.4.0
+ windows-0.24.0
+ windows-sys-0.36.1
+ windows_aarch64_msvc-0.36.1
+ windows_i686_gnu-0.24.0
+ windows_i686_gnu-0.36.1
+ windows_i686_msvc-0.24.0
+ windows_i686_msvc-0.36.1
+ windows_x86_64_gnu-0.24.0
+ windows_x86_64_gnu-0.36.1
+ windows_x86_64_msvc-0.24.0
+ windows_x86_64_msvc-0.36.1
+ winreg-0.10.1
+ winrt-notification-0.5.1
+ xml-rs-0.8.4
+ yaml-rust-0.4.5
+ zbus-2.2.0
+ zbus_macros-2.2.0
+ zbus_names-2.1.0
+ zvariant-3.2.1
+ zvariant_derive-3.2.1
+"
+
+inherit cargo
+
+DESCRIPTION="Executes commands in response to file modifications"
+HOMEPAGE="https://github.com/watchexec/watchexec"
+SRC_URI="https://github.com/watchexec/${PN}/archive/refs/tags/cli-v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" $(cargo_crate_uris)"
+
+LICENSE="Apache-2.0 BSD CC0-1.0 CC-PD ISC MIT WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# Prevent portage from trying to fetch bunch of *.crate from mirror despite they are not mirrored.
+RESTRICT="mirror"
+
+S="${WORKDIR}/${PN}-cli-v${PV}"
+DOCS=( README.md )
+HTML_DOCS=( doc/watchexec.1.html )
+
+QA_FLAGS_IGNORED="usr/bin/watchexec"
+
+src_compile() {
+ cargo_src_compile --manifest-path=crates/cli/Cargo.toml
+}
+
+src_test() {
+ cargo_src_test --manifest-path crates/lib/Cargo.toml --lib
+ cargo_src_test --manifest-path crates/cli/Cargo.toml
+}
+
+src_install() {
+ cargo_src_install --path crates/cli
+
+ einstalldocs
+ doman doc/watchexec.1
+
+ insinto /usr/share/zsh/site-functions
+ newins completions/zsh _watchexec
+}
diff --git a/app-office/sc-im/sc-im-0.8.2-r1.ebuild b/app-office/sc-im/sc-im-0.8.2-r1.ebuild
index d95a385a13..8f65e8d0f5 100644
--- a/app-office/sc-im/sc-im-0.8.2-r1.ebuild
+++ b/app-office/sc-im/sc-im-0.8.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/andmarti1424/sc-im/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="BSD-4"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
IUSE="X plots wayland xls xlsx lua ods tmux"
REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
diff --git a/app-portage/appswipe/appswipe-1.1.14.ebuild b/app-portage/appswipe/appswipe-1.1.14.ebuild
index 2f77e8206e..fe58480659 100644
--- a/app-portage/appswipe/appswipe-1.1.14.ebuild
+++ b/app-portage/appswipe/appswipe-1.1.14.ebuild
@@ -18,6 +18,7 @@ DEPEND="
dev-qt/qtcore
dev-qt/qtgui
dev-qt/qtsql[sqlite]
+ dev-qt/qtwidgets
"
RDEPEND="
diff --git a/app-portage/pacvis/pacvis-0.4.2.ebuild b/app-portage/pacvis/pacvis-0.4.2.ebuild
index a55cfb8eb9..438221b9e0 100644
--- a/app-portage/pacvis/pacvis-0.4.2.ebuild
+++ b/app-portage/pacvis/pacvis-0.4.2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-hare/hare-ssh/hare-ssh-9999.ebuild b/dev-hare/hare-ssh/hare-ssh-9999.ebuild
new file mode 100644
index 0000000000..1a123cd621
--- /dev/null
+++ b/dev-hare/hare-ssh/hare-ssh-9999.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit git-r3
+
+DESCRIPTION="SSH library for Hare"
+HOMEPAGE="https://git.sr.ht/~sircmpwn/hare-ssh"
+EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/hare-ssh"
+LICENSE="MPL-2.0"
+SLOT="0"
+
+RDEPEND="dev-lang/hare"
+DEPEND="${DEPEND}"
+
+src_prepare() {
+ default
+ sed -i 's;^PREFIX=.*;PREFIX=/usr;' Makefile || die
+}
diff --git a/dev-hare/hare-ssh/metadata.xml b/dev-hare/hare-ssh/metadata.xml
new file mode 100644
index 0000000000..c698af2344
--- /dev/null
+++ b/dev-hare/hare-ssh/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ contact@hacktivis.me
+ Haelwenn (lanodan) Monnier
+
+
diff --git a/dev-java/expression-tree/Manifest b/dev-java/expression-tree/Manifest
new file mode 100644
index 0000000000..2466c20147
--- /dev/null
+++ b/dev-java/expression-tree/Manifest
@@ -0,0 +1 @@
+DIST mesp1.02.zip 217310 BLAKE2B 128a9e549ced122bc32f0bd815b98ca6fa1db43d4e87c0507e2914c7caecb81fe75a8c622acd2bb32d40ebe27073b3ddc3e8a47878c99de55f6bf40b5a044218 SHA512 1c9c12207929b0de56aa16d486884cf09f13e58a5342565902130396c52ac9ae93aa8dfcbbdee793d6ab39807497d7dcecb28d4b524a54559dc0f810d2382127
diff --git a/dev-java/expression-tree/expression-tree-1.02.ebuild b/dev-java/expression-tree/expression-tree-1.02.ebuild
new file mode 100644
index 0000000000..1513d972b3
--- /dev/null
+++ b/dev-java/expression-tree/expression-tree-1.02.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MYPN="mesp"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Parser for mathematical expressions written in Java"
+HOMEPAGE="https://sourceforge.net/projects/expression-tree"
+SRC_URI="mirror://sourceforge/${PN}/${MYPN}${PV}.zip"
+S="${WORKDIR}/${MYPN}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
+
+JAVA_JAR_FILENAME="Mesp.jar"
+JAVA_SRC_DIR=(
+ "src/com/graphbuilder/struc"
+ "src/com/graphbuilder/math/func"
+ "src/com/graphbuilder/math"
+)
+
+src_prepare() {
+ java-pkg_clean
+ default
+}
+
+src_install() {
+ java-pkg_dojar Mesp.jar
+ dodoc {readme,release-notes}.txt
+}
diff --git a/dev-java/expression-tree/metadata.xml b/dev-java/expression-tree/metadata.xml
new file mode 100644
index 0000000000..f87428db20
--- /dev/null
+++ b/dev-java/expression-tree/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ Alessandro Barbieri
+ lssndrbarbieri@gmail.com
+
+
+ expression-tree
+
+
diff --git a/dev-java/gluegen/Manifest b/dev-java/gluegen/Manifest
new file mode 100644
index 0000000000..352a9d8bfa
--- /dev/null
+++ b/dev-java/gluegen/Manifest
@@ -0,0 +1,2 @@
+DIST gluegen-2.3.2.gh.tar.gz 77819799 BLAKE2B ec8b628fcd0663aa83609ea04db6a2fb7bc6a16e223a88a4849d8128949b18e48af77904d767b5355679518f59c266aaef969bd460db36587ce46ecac6d5d883 SHA512 1871ff479de52eab5d8d80537de94debfe601379e9f2539478e11bbaa6c970856a3ed2d8d96e0a293482d80021b0d5304bf7d13b65bc96514042fa4b2f8bdd95
+DIST gluegen-jcpp-2.3.2.gh.tar.gz 47485 BLAKE2B f8d26f9e6656400089b4e82b3e8ce1e589e731eb1269d110426588c7790a08e51f7ec2852b8e520cf8a7b7807a86180204b8dece4a1d579c7ce13be89625455e SHA512 1825caf95bdd3009b9b096ac7cec94711c30e55c2fc48812b41622e4a60e34fc888b959ad47cc5e22b8ae9134d01a5b5b089ceb8ba30985f599714650fecb65d
diff --git a/dev-java/gluegen/files/gluegen-2.2.4-dont-copy-jars.patch b/dev-java/gluegen/files/gluegen-2.2.4-dont-copy-jars.patch
new file mode 100644
index 0000000000..ca972dcfc1
--- /dev/null
+++ b/dev-java/gluegen/files/gluegen-2.2.4-dont-copy-jars.patch
@@ -0,0 +1,15 @@
+--- a/make/build.xml
++++ b/make/build.xml
+@@ -806,12 +806,6 @@
+
+
+
+-
+-
+-
+
+
diff --git a/dev-java/gluegen/files/gluegen-2.2.4-dont-strip.patch b/dev-java/gluegen/files/gluegen-2.2.4-dont-strip.patch
new file mode 100644
index 0000000000..2e4ed462f6
--- /dev/null
+++ b/dev-java/gluegen/files/gluegen-2.2.4-dont-strip.patch
@@ -0,0 +1,20 @@
+--- a/make/gluegen-cpptasks-base.xml
++++ b/make/gluegen-cpptasks-base.xml
+@@ -1511,17 +1511,6 @@
+ - Helper strip.libraries for stripping off debug information
+ -->
+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+
+
+
diff --git a/dev-java/gluegen/files/gluegen-2.2.4-dont-test-archive.patch b/dev-java/gluegen/files/gluegen-2.2.4-dont-test-archive.patch
new file mode 100644
index 0000000000..a4f4507cf5
--- /dev/null
+++ b/dev-java/gluegen/files/gluegen-2.2.4-dont-test-archive.patch
@@ -0,0 +1,14 @@
+--- a/make/build-test.xml
++++ b/make/build-test.xml
+@@ -614,9 +614,11 @@ chmod 644 ${results}/* \${line.separator}
+
+
+
++
+
+
+
diff --git a/dev-java/gluegen/files/gluegen-2.3.2-remove-static-lib.patch b/dev-java/gluegen/files/gluegen-2.3.2-remove-static-lib.patch
new file mode 100644
index 0000000000..1b43c67213
--- /dev/null
+++ b/dev-java/gluegen/files/gluegen-2.3.2-remove-static-lib.patch
@@ -0,0 +1,106 @@
+--- a/make/gluegen-cpptasks-base.xml
++++ b/make/gluegen-cpptasks-base.xml
+@@ -1216,21 +1216,12 @@
+
+
+
+-
+-
+-
+-
+-
+
+
+-
+-
+
+
+
+
+-
+-
+
+
+
+
+
+@@ -1324,8 +1305,6 @@
+
+
+
+-
+-
+
+
+
+@@ -1334,16 +1313,12 @@
+
+
+
+-
+-
+
+
+
+
+
+
+-
+-
+
+
+
+@@ -1351,8 +1326,6 @@
+
+
+
+-
+-
+
+
+
+@@ -1360,8 +1333,6 @@
+
+
+
+-
+-
+
+
+
diff --git a/dev-java/gluegen/files/gluegen-2.3.2-respect-flags.patch b/dev-java/gluegen/files/gluegen-2.3.2-respect-flags.patch
new file mode 100644
index 0000000000..1f5ab7d907
--- /dev/null
+++ b/dev-java/gluegen/files/gluegen-2.3.2-respect-flags.patch
@@ -0,0 +1,23 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,18 +1,16 @@
+ BITS=32
+
+ ifeq ($(BITS),32)
+- CC=gcc32
+ NS=win-x86
+ SCFLAGS=
+ else
+ BITS=64
+- CC=gcc64
+ NS=win-x64
+ SCFLAGS=-D_MSC_VER=1400
+ endif
+
+-CFLAGS=-m$(BITS) -shared -c -fno-rtti -fPIC $(SCFLAGS) -I/usr/lib/jvm/java-6-sun/include -I../common/platform-libs/jre-include/win32
+-LFLAGS=-m$(BITS) -shared -fno-rtti -fPIC
++CFLAGS += -m$(BITS) -shared -c -fPIC $(SCFLAGS) -I/usr/lib/jvm/java-6-sun/include -I../common/platform-libs/jre-include/win32
++LFLAGS = $(LDFLAGS) -m$(BITS) -shared -fPIC
+
+ SRC1=src/native/common/CPU.c
+ SRC2=src/native/windows/WindowsDynamicLinkerImpl_JNI.c
diff --git a/dev-java/gluegen/gluegen-2.3.2.ebuild b/dev-java/gluegen/gluegen-2.3.2.ebuild
new file mode 100644
index 0000000000..af18e61b69
--- /dev/null
+++ b/dev-java/gluegen/gluegen-2.3.2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EANT_BUILD_TARGET="all.no_junit"
+EANT_BUILD_XML="make/build.xml"
+EANT_DOC_TARGET=""
+EANT_EXTRA_ARGS="-Dc.strip.libraries=false"
+EANT_GENTOO_CLASSPATH="antlr,ant-core,jsr305"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/build/${PN}{,-rt}.jar"
+EANT_NEEDS_TOOLS="yes"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+EANT_TEST_TARGET="junit.run"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_PKG_IUSE="doc source test"
+WANT_ANT_TASKS="ant-antlr ant-contrib dev-java/cpptasks:0"
+
+inherit java-pkg-2 java-ant-2 toolchain-funcs
+
+DESCRIPTION="Automatically generate the JNI code necessary to call C libraries"
+HOMEPAGE="
+ https://jogamp.org/gluegen/www/
+ https://github.com/sgothel/gluegen
+"
+SRC_URI="
+ https://github.com/sgothel/gluegen/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
+ https://github.com/sgothel/jcpp/archive/refs/tags/v${PV}.tar.gz -> gluegen-jcpp-${PV}.gh.tar.gz
+"
+#TODO: unbundle jcpp if possible
+
+LICENSE="BSD Apache-2.0"
+SLOT="2.3"
+KEYWORDS="~amd64"
+
+COMMON_DEP="
+ dev-java/ant-core:0
+ dev-java/antlr:0
+ dev-java/jsr305:0
+"
+RDEPEND="
+ ${COMMON_DEP}
+ >=virtual/jre-1.8:*
+"
+DEPEND="
+ ${COMMON_DEP}
+ >=virtual/jdk-1.8:*
+ dev-java/cpptasks:0
+ test? (
+ dev-java/junit:4
+ dev-java/ant-junit4
+ )
+"
+BDEPEND="dev-vcs/git"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.2.4-dont-copy-jars.patch"
+ "${FILESDIR}/${PN}-2.2.4-dont-strip.patch"
+ "${FILESDIR}/${PN}-2.2.4-dont-test-archive.patch"
+ "${FILESDIR}/${P}-remove-static-lib.patch"
+ "${FILESDIR}/${P}-respect-flags.patch"
+)
+
+src_prepare() {
+ tc-export CC
+ mv "${WORKDIR}"/jcpp-${PV}/* jcpp/ || die
+ rm -rf make/lib || die
+ default
+ java-ant_bsfix_files "${S}/make/build-test.xml"
+
+ #it want a git repo
+ git init || die
+ git config --global user.email "you@example.com" || die
+ git config --global user.name "Your Name" || die
+ git add . || die
+ git commit -m 'init' || die
+}
+
+src_test() {
+ EANT_TASKS="ant-junit4" java-pkg-2_src_test
+}
+
+src_install() {
+ java-pkg_dojar build/${PN}{,-rt}.jar
+ java-pkg_doso build/obj/*.so
+
+ use doc && dodoc -r doc/manual
+ use source && java-pkg_dosrc src/java/*
+
+ # for building jogl
+ insinto /usr/share/${PN}-${SLOT}/make
+ doins -r make/*
+ insinto /usr/share/${PN}-${SLOT}/build
+ doins build/artifact.properties
+}
diff --git a/dev-java/gluegen/metadata.xml b/dev-java/gluegen/metadata.xml
new file mode 100644
index 0000000000..cb03c9e5c9
--- /dev/null
+++ b/dev-java/gluegen/metadata.xml
@@ -0,0 +1,23 @@
+
+
+
+
+ co-maintainers welcome
+ Alessandro Barbieri
+ lssndrbarbieri@gmail.com
+
+
+GlueGen is a tool which automatically generates the Java and JNI code necessary
+to call C libraries. It reads as input ANSI C header files and separate
+configuration files which provide control over many aspects of the glue code
+generation. GlueGen uses a complete ANSI C parser and an internal representation
+(IR) capable of representing all C types to represent the APIs for which it
+generates interfaces. It has the ability to perform significant transformations
+on the IR before glue code emission. GlueGen is currently powerful enough to
+bind even low-level APIs such as the Java Native Interface (JNI) and the AWT
+Native Interface (JAWT) back up to the Java programming language.
+
+
+ sgothel/gluegen
+
+
diff --git a/dev-java/jargs/Manifest b/dev-java/jargs/Manifest
new file mode 100644
index 0000000000..11d9b1f0f6
--- /dev/null
+++ b/dev-java/jargs/Manifest
@@ -0,0 +1 @@
+DIST jargs-1.0.zip 202051 BLAKE2B dbf74d90a5c229f9ca1ba42c8d0b3b35404b3eb7c5dc7af0a76fc222465707b9dbfe44fef63cb1ffbc64821fa2f0c7e8144466e44de9bbf84cf198f5a107e31c SHA512 c121a8850c43fda1561df2ead211d526596b3aa8d01074df86ef0fa68eab83021fbb99ba16f05a0a20185b027f820643189c591bc8b79fb29d579eff4745b359
diff --git a/dev-java/jargs/jargs-1.0.ebuild b/dev-java/jargs/jargs-1.0.ebuild
new file mode 100644
index 0000000000..3b32729361
--- /dev/null
+++ b/dev-java/jargs/jargs-1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EANT_BUILD_TARGET="runtimejar"
+EANT_TEST_TARGET="test"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_PKG_IUSE="doc"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Command-line argument parsing library in Java"
+HOMEPAGE="https://github.com/purcell/jargs"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+S="${WORKDIR}/${P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ dev-java/junit:4
+"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
+
+src_prepare() {
+ sed -e "s|/usr/share/java/junit.jar|/usr/share/junit-4/lib/junit.jar|g" -i build.xml || die
+ java-pkg_clean
+ default
+}
+
+src_install() {
+ dodoc README
+ java-pkg_newjar lib/jargs.jar
+ use doc && java-pkg_dojavadoc target/site/apidocs
+}
diff --git a/dev-java/jargs/metadata.xml b/dev-java/jargs/metadata.xml
new file mode 100644
index 0000000000..287cf7eb8c
--- /dev/null
+++ b/dev-java/jargs/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+
+ co-maintainers welcome
+ Alessandro Barbieri
+ lssndrbarbieri@gmail.com
+
+
+ purcell/jargs
+ jargs
+
+
diff --git a/dev-java/jcommon/Manifest b/dev-java/jcommon/Manifest
new file mode 100644
index 0000000000..7995b449d0
--- /dev/null
+++ b/dev-java/jcommon/Manifest
@@ -0,0 +1 @@
+DIST jcommon-1.0.24.gh.tar.gz 451355 BLAKE2B 5d5c7e5315da28b3d76c124bf92f0f83bff356a5024b044f78f2babd075d620af46a2c4094bac5d6ef2a1a46ddafa2ffb766d6a668ddbd0f529ac6590a44caa6 SHA512 7adc982aa9cde8ed51642b0e48b70d88bb2c27b09afb16b704699c8abd481fc956197f01d24fe2e61d51316eedb6efbc65b487b4714111b2b91959c61e8da44e
diff --git a/dev-java/jcommon/jcommon-1.0.24.ebuild b/dev-java/jcommon/jcommon-1.0.24.ebuild
new file mode 100644
index 0000000000..8bc83b5346
--- /dev/null
+++ b/dev-java/jcommon/jcommon-1.0.24.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EANT_BUILD_TARGET="compile"
+EANT_BUILD_XML="ant/build.xml"
+EANT_DOC_TARGET="javadocs"
+EANT_NEEDS_TOOLS="true"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_PKG_IUSE="doc source test"
+MY_P="${PN}-$(ver_rs 3 -)"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A collection of useful classes used by JFreeChart, JFreeReport and others"
+HOMEPAGE="
+ https://www.jfree.org/jcommon
+ https://github.com/jfree/jcommon
+"
+SRC_URI="https://github.com/jfree/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+#S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2"
+SLOT="1.0"
+KEYWORDS="~amd64"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ test? ( dev-java/junit:4 )
+"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
+
+src_prepare() {
+ java-pkg_clean
+ default
+}
+
+src_install() {
+ java-pkg_newjar ${P}.jar ${PN}.jar
+ dodoc README.md
+ use doc && java-pkg_dojavadoc javadoc
+ use source && java-pkg_dosrc src/main/java/com src/main/java/org
+}
diff --git a/dev-java/jcommon/metadata.xml b/dev-java/jcommon/metadata.xml
new file mode 100644
index 0000000000..43cc09db02
--- /dev/null
+++ b/dev-java/jcommon/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ co-maintainers welcome
+ Alessandro Barbieri
+ lssndrbarbieri@gmail.com
+
+
+ jfree/jcommon
+
+
diff --git a/dev-java/jcuber/Manifest b/dev-java/jcuber/Manifest
new file mode 100644
index 0000000000..2af2680c63
--- /dev/null
+++ b/dev-java/jcuber/Manifest
@@ -0,0 +1 @@
+DIST jcuber-4.7.tar.gz 554300 BLAKE2B 308a111a24e667804e83237fbdfa30a648029edc9d4fb005ebf76c6199d910f5fedfee7e45c1d118f39aaaa39d557cb48e956e009eeb3e94d4fb6ae700dac845 SHA512 c60874292887e949d35e36a676fdcf05027e9af02b2ce62ab2611a2caa408feca297087207a814010f760171f30ff4058b9816643fc54331ba8621e166a3e767
diff --git a/dev-java/jcuber/jcuber-4.7.ebuild b/dev-java/jcuber/jcuber-4.7.ebuild
new file mode 100644
index 0000000000..5b2c0cab0e
--- /dev/null
+++ b/dev-java/jcuber/jcuber-4.7.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java reader library"
+HOMEPAGE="https://www.scalasca.org/scalasca/software/cube-4.x/download.html"
+SRC_URI="http://apps.fz-juelich.de/scalasca/releases/cube/${PV}/dist/${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CDEPEND="dev-java/xerces:2"
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.8:*
+"
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.8:*
+"
+
+src_prepare() {
+ java-pkg_clean
+ default
+ pushd build-frontend || die
+ java-pkg_jar-from xerces-2
+ popd || die
+ eautoreconf
+}
+
+src_configure() {
+ econf
+}
+
+src_compile() {
+ MAKEOPTS="-j1" emake
+}
+
+src_install() {
+ DESTDIR="${D}" emake install
+ mv "${ED}/usr/share/doc/${PN}/example" "${ED}/usr/share/doc/${PF}/examples" || die
+ java-pkg_dojar "${ED}/usr/share/java/CubeReader.jar"
+ rm -r "${ED}/usr/share/java/CubeReader.jar" || die
+}
diff --git a/dev-java/jcuber/metadata.xml b/dev-java/jcuber/metadata.xml
new file mode 100644
index 0000000000..067d40ebdd
--- /dev/null
+++ b/dev-java/jcuber/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ lssndrbarbieri@gmail.com
+ Alessandro Barbieri
+
+
diff --git a/dev-java/jfreechart/Manifest b/dev-java/jfreechart/Manifest
new file mode 100644
index 0000000000..b7458ca749
--- /dev/null
+++ b/dev-java/jfreechart/Manifest
@@ -0,0 +1 @@
+DIST jfreechart-1.0.19.zip 8050676 BLAKE2B be5ac67befd6a16c9771f50bca59c3543251984b60e00e8aef350cadb1121caf391a8dddc383fa08ed89b0346e2a057a8da6a70b224d7f843f19535a4df873b2 SHA512 6345e6a6b4a82862f3908794efb70a6f5413f313ba5bcff1dfb713d21948034d80c743a0cea61be81921c62736b07209ed4b942fedca0c76226b1202a4596b31
diff --git a/dev-java/jfreechart/files/jfreechart-1.0.19-build.xml.patch b/dev-java/jfreechart/files/jfreechart-1.0.19-build.xml.patch
new file mode 100644
index 0000000000..3c03f2aaf2
--- /dev/null
+++ b/dev-java/jfreechart/files/jfreechart-1.0.19-build.xml.patch
@@ -0,0 +1,25 @@
+--- a/ant/build.xml
++++ b/ant/build.xml
+@@ -40,10 +40,9 @@
+
+
+
+-
+-
+-
+-
++
++
++
+
+
+
+@@ -321,7 +320,7 @@
+
+
+
+
+
diff --git a/dev-java/jfreechart/files/jfreechart-1.0.19-fix-TimeSeriesCollectionTest.patch b/dev-java/jfreechart/files/jfreechart-1.0.19-fix-TimeSeriesCollectionTest.patch
new file mode 100644
index 0000000000..e378224415
--- /dev/null
+++ b/dev-java/jfreechart/files/jfreechart-1.0.19-fix-TimeSeriesCollectionTest.patch
@@ -0,0 +1,24 @@
+--- a/tests/org/jfree/data/time/TimeSeriesCollectionTest.java
++++ b/tests/org/jfree/data/time/TimeSeriesCollectionTest.java
+@@ -339,6 +339,10 @@
+ * java.util.List, boolean)} method.
+ */
+ public void testFindDomainBounds() {
++ // store the current time zone
++ TimeZone saved = TimeZone.getDefault();
++ TimeZone.setDefault(TimeZone.getTimeZone("Europe/Paris"));
++
+ TimeSeriesCollection dataset = new TimeSeriesCollection();
+ List visibleSeriesKeys = new java.util.ArrayList();
+ Range r = DatasetUtilities.findDomainBounds(dataset, visibleSeriesKeys,
+@@ -351,10 +355,6 @@
+ r = DatasetUtilities.findDomainBounds(dataset, visibleSeriesKeys, true);
+ assertNull(r);
+
+- // store the current time zone
+- TimeZone saved = TimeZone.getDefault();
+- TimeZone.setDefault(TimeZone.getTimeZone("Europe/Paris"));
+-
+ s1.add(new Year(2008), 8.0);
+ r = DatasetUtilities.findDomainBounds(dataset, visibleSeriesKeys, true);
+ assertEquals(1199142000000.0, r.getLowerBound(), EPSILON);
diff --git a/dev-java/jfreechart/jfreechart-1.0.19-r1.ebuild b/dev-java/jfreechart/jfreechart-1.0.19-r1.ebuild
new file mode 100644
index 0000000000..b5bdab8e2f
--- /dev/null
+++ b/dev-java/jfreechart/jfreechart-1.0.19-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JFreeChart is a free Java class library for generating charts"
+HOMEPAGE="http://www.jfree.org/jfreechart"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="1.0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+CDEPEND="
+ dev-java/hamcrest-core:1.3
+ >=dev-java/jcommon-1.0.23:1.0
+ dev-java/jfreesvg:3
+ dev-java/orson-charts:1
+ dev-java/orsonpdf:1
+ java-virtuals/servlet-api:3.0
+"
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.8:*
+"
+DEPEND="
+ ${CDEPEND}
+ test? (
+ dev-java/ant-junit:0
+ dev-java/junit:4
+ )
+ app-arch/unzip
+ >=virtual/jdk-1.8:*
+"
+
+RESTRICT="test"
+PATCHES=(
+ "${FILESDIR}/${PN}-1.0.19-build.xml.patch"
+ "${FILESDIR}/${PN}-1.0.19-fix-TimeSeriesCollectionTest.patch"
+)
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_BUILD_XML="ant/build.xml"
+EANT_BUILD_TARGET="compile-experimental"
+EANT_DOC_TARGET="javadoc"
+EANT_GENTOO_CLASSPATH="
+ hamcrest-core-1.3
+ jfreesvg-3
+ jcommon-1.0
+ orsonpdf-1
+ orson-charts-1
+ servlet-api-3.0
+"
+
+src_prepare() {
+ java-pkg_clean
+ default
+ pushd lib || die
+ java-pkg_jar-from jfreesvg-3 jfreesvg.jar jfreesvg-3.2.jar
+ java-pkg_jar-from orson-charts-1 orsoncharts.jar orsoncharts-1.4-eval-nofx.jar
+ java-pkg_jar-from orsonpdf-1 orsonpdf.jar orsonpdf-1.6-eval.jar
+ java-pkg_jar-from --virtual servlet-api-3.0 servlet-api.jar servlet.jar
+ java-pkg_jar-from jcommon-1.0 jcommon.jar jcommon-1.0.23.jar
+ java-pkg_jar-from hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
+ popd || die
+}
+
+src_install() {
+ java-pkg_newjar "lib/${P}.jar" "${PN}.jar"
+ java-pkg_newjar "lib/${P}-experimental.jar" "${PN}-experimental.jar"
+
+ dodoc README.txt ChangeLog NEWS
+
+ use doc && java-pkg_dojavadoc javadoc
+ use source && java-pkg_dosrc source/org
+}
diff --git a/dev-java/jfreechart/metadata.xml b/dev-java/jfreechart/metadata.xml
new file mode 100644
index 0000000000..b6ee6ec148
--- /dev/null
+++ b/dev-java/jfreechart/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+
+ co-maintainers welcome
+ Alessandro Barbieri
+ lssndrbarbieri@gmail.com
+
+
+ https://github.com/jfree/jfreechart/issues
+ jfree/jfreechart
+
+
diff --git a/dev-java/jfreesvg/Manifest b/dev-java/jfreesvg/Manifest
new file mode 100644
index 0000000000..97801136d8
--- /dev/null
+++ b/dev-java/jfreesvg/Manifest
@@ -0,0 +1 @@
+DIST jfreesvg-3.4.3.gh.tar.gz 73625 BLAKE2B fc9e1614b5f861ce1f887196e93a3ff5a95987bd3c02c69c7a9ae3729f87953b0ec43145379db12fa3ae74c795d5930fd978f2208373ed5df736c67dd4e6392a SHA512 4cb4042567d254a1cfb6b79bce3e67bac514f163044968d5abe24cd51da5753eae324cd0728b6039f7926cd5df644e574e0687e928f5ca8a60ed1454a4f1ae4f
diff --git a/dev-java/jfreesvg/jfreesvg-3.4.3.ebuild b/dev-java/jfreesvg/jfreesvg-3.4.3.ebuild
new file mode 100644
index 0000000000..4942ed414b
--- /dev/null
+++ b/dev-java/jfreesvg/jfreesvg-3.4.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COMMIT="b31353849855e1c1ab3fefb6f705f6ccb148c1b8"
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JFreeSVG is a fast, light-weight, vector graphics library for the Java platform"
+HOMEPAGE="
+ https://www.jfree.org/jfreesvg/
+ https://github.com/jfree/jfreesvg
+"
+SRC_URI="https://github.com/jfree/${PN}/archive/${COMMIT}.tar.gz -> ${PF}.gh.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-3+"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_SRC_DIR="src/main/java/org/jfree/graphics2d"
+
+src_prepare() {
+ java-pkg_clean
+ default
+}
+
+src_install() {
+ java-pkg_dojar "${PN}.jar"
+ dodoc README.md
+ use source && java-pkg_dosrc src/main/java
+}
diff --git a/dev-java/jfreesvg/metadata.xml b/dev-java/jfreesvg/metadata.xml
new file mode 100644
index 0000000000..21c2edfce2
--- /dev/null
+++ b/dev-java/jfreesvg/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+
+ co-maintainers welcome
+ Alessandro Barbieri
+ lssndrbarbieri@gmail.com
+
+
+ https://github.com/jfree/jfreesvg/issues
+ jfree/jfreesvg
+
+
diff --git a/dev-java/jgraph/Manifest b/dev-java/jgraph/Manifest
new file mode 100644
index 0000000000..1d2c7bb6c4
--- /dev/null
+++ b/dev-java/jgraph/Manifest
@@ -0,0 +1 @@
+DIST libjgraph-java_5.12.4.2+dfsg.orig.tar.gz 901267 BLAKE2B ed3cf36c9144ed79a45d2f4e3041de228c6fdc1e3ae01db54b9d4839eab3089d14e27894d135b98e91eed6f146b86bce753ddad566078982f84769398aad6af2 SHA512 b5f5020dd8b2c1a0f3d0d5d5cb75378eabdba57bc4735564b0d8c67abb7054c22cb06d0e6d07f4f9ddbd7b26ab4d75d06da8b2069d1e122d4d49a88b05172926
diff --git a/dev-java/jgraph/jgraph-5.12.4.2.ebuild b/dev-java/jgraph/jgraph-5.12.4.2.ebuild
new file mode 100644
index 0000000000..8b3873ca4d
--- /dev/null
+++ b/dev-java/jgraph/jgraph-5.12.4.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MYPN="lib${PN}-java"
+MYPV="${PV}+dfsg.orig"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Open-source graph component for Java"
+SRC_URI="mirror://debian/pool/main/libj/${MYPN}/${MYPN}_${MYPV}.tar.gz"
+HOMEPAGE="https://www.jgraph.com"
+S="${WORKDIR}/${MYPN}-${MYPV}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples source"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( README WHATSNEW LICENSE ChangeLog )
+
+JAVA_SRC_DIR="src"
+
+src_prepare() {
+ default
+ einstalldocs
+ java-pkg_clean
+}
diff --git a/dev-java/jgraph/metadata.xml b/dev-java/jgraph/metadata.xml
new file mode 100644
index 0000000000..2121749e54
--- /dev/null
+++ b/dev-java/jgraph/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ co-maintainers welcome
+ Alessandro Barbieri
+ lssndrbarbieri@gmail.com
+
+
+ jgraph
+
+
diff --git a/dev-java/jogl/Manifest b/dev-java/jogl/Manifest
new file mode 100644
index 0000000000..1444411745
--- /dev/null
+++ b/dev-java/jogl/Manifest
@@ -0,0 +1 @@
+DIST jogl-2.3.2.gh.tar.gz 50627694 BLAKE2B b6fb1a43101497df1cf744abad5f907fd67aad9f743b0b550999159072a00c4a6940b908e2848e93982fe68c994c762d2e502be4c4153f6e619dbd153f16246d SHA512 613155d0b01f37efccc0e720710b624c356e6595de85c3a302ba79f2d5f6d0b59a775c648e72de7b1f13856fc835bf28168c136362e86af5ac9e9d750f55b78c
diff --git a/dev-java/jogl/jogl-2.3.2.ebuild b/dev-java/jogl/jogl-2.3.2.ebuild
new file mode 100644
index 0000000000..849dae9465
--- /dev/null
+++ b/dev-java/jogl/jogl-2.3.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EANT_BUILD_TARGET="init build.nativewindow build.jogl build.newt build.oculusvr one.dir tag.build"
+EANT_BUILD_XML="make/build.xml"
+EANT_DOC_TARGET=""
+EANT_GENTOO_CLASSPATH="gluegen-${SLOT},antlr,ant-core,swt-3.7"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/build/${PN}/*.jar:${S}/build/nativewindow/*.jar"
+EANT_NEEDS_TOOLS="yes"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_PKG_BSFIX_NAME+=" build-jogl.xml build-nativewindow.xml build-newt.xml"
+JAVA_PKG_IUSE="doc source"
+WANT_ANT_TASKS="ant-antlr ant-contrib dev-java/cpptasks:0"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java(TM) Binding fot the OpenGL(TM) API"
+HOMEPAGE="
+ https://jogamp.org/jogl/www/
+ https://github.com/sgothel/jogl
+"
+SRC_URI="https://github.com/sgothel/jogl/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="2.3"
+KEYWORDS="~amd64"
+IUSE="cg"
+
+CDEPEND="
+ ~dev-java/gluegen-${PV}:${SLOT}
+ dev-java/antlr:0
+ dev-java/ant-core:0
+ x11-libs/libX11
+ x11-libs/libXxf86vm
+ dev-java/swt:3.7
+ virtual/opengl
+ cg? ( media-gfx/nvidia-cg-toolkit )
+"
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.8:*
+"
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.8:*
+"
+
+# upstream has a crude way to call the junit tests, which cause a lot of trouble to pass
+# our test classpath...
+RESTRICT="test"
+
+src_prepare() {
+ default
+ #we keep make/lib/plugin3/plugin3-public.jar
+ find -name 'make/lib/swt/*.jar' -delete -print || die
+
+ # Empty filesets are never out of date!
+ sed -i -e 's///' make/build*xml || die
+
+ EANT_EXTRA_ARGS+=" -Dcommon.gluegen.build.done=true"
+ EANT_EXTRA_ARGS+=" -Dgluegen.root=/usr/share/gluegen-${SLOT}/"
+ EANT_EXTRA_ARGS+=" -Dgluegen.jar=$(java-pkg_getjar gluegen-${SLOT} gluegen.jar)"
+ EANT_EXTRA_ARGS+=" -Dgluegen-rt.jar=$(java-pkg_getjar gluegen-${SLOT} gluegen-rt.jar)"
+
+ use cg && EANT_EXTRA_ARGS+=" -Djogl.cg=1 -Dx11.cg.lib=/usr/lib"
+}
+
+src_install() {
+ java-pkg_dojar build/jar/*.jar
+ java-pkg_doso build/lib/*.so
+
+ use doc && dodoc -r doc
+ use source && java-pkg_dosrc src/jogl/classes/*
+}
diff --git a/dev-java/jogl/metadata.xml b/dev-java/jogl/metadata.xml
new file mode 100644
index 0000000000..41da371c92
--- /dev/null
+++ b/dev-java/jogl/metadata.xml
@@ -0,0 +1,19 @@
+
+
+
+
+ co-maintainers welcome
+ Alessandro Barbieri
+ lssndrbarbieri@gmail.com
+
+
+JOGL provides Java with a Binding for the OpenGL速 API (JSR-231), and is designed
+to provide hardware-supported 3D graphics to applications written in Java.
+
+
+
+ sgothel/jogl
+
+
diff --git a/dev-java/orson-charts/Manifest b/dev-java/orson-charts/Manifest
new file mode 100644
index 0000000000..1f4632d1bf
--- /dev/null
+++ b/dev-java/orson-charts/Manifest
@@ -0,0 +1 @@
+DIST orson-charts-1.7.tar.gz 684519 BLAKE2B baf592634d9d3b1843671d47cb3ae121f435f965510ec40e943869082c54fec0afcd36b20f3b19f6f85e031c71a3b86e1f10ea73f284f96ae27cd7952f71d6ec SHA512 906acd8b73c8e91804f3fd24394c6af5beab638a009957b807b1948b8b270cfdccab57b51349f0bef4b45d001d5b3e590a68ab05396cfa582e41f46d22d5d80f
diff --git a/dev-java/orson-charts/metadata.xml b/dev-java/orson-charts/metadata.xml
new file mode 100644
index 0000000000..fe296b6019
--- /dev/null
+++ b/dev-java/orson-charts/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ Alessandro Barbieri
+ lssndrbarbieri@gmail.com
+
+
+ https://github.com/jfree/orsoncharts/issues
+ jfree/orsoncharts
+
+
diff --git a/dev-java/orson-charts/orson-charts-1.7.ebuild b/dev-java/orson-charts/orson-charts-1.7.ebuild
new file mode 100644
index 0000000000..9404b49a83
--- /dev/null
+++ b/dev-java/orson-charts/orson-charts-1.7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_SRC_DIR=(
+ "src/main/java/com/orsoncharts"
+ "src/main/java/com/orsoncharts/axis"
+ "src/main/java/com/orsoncharts/data"
+ "src/main/java/com/orsoncharts/data/category"
+ "src/main/java/com/orsoncharts/data/function"
+ "src/main/java/com/orsoncharts/data/xyz"
+ "src/main/java/com/orsoncharts/graphics3d"
+ "src/main/java/com/orsoncharts/interaction"
+ "src/main/java/com/orsoncharts/label"
+ "src/main/java/com/orsoncharts/legend"
+ "src/main/java/com/orsoncharts/marker"
+ "src/main/java/com/orsoncharts/plot"
+ "src/main/java/com/orsoncharts/renderer"
+ "src/main/java/com/orsoncharts/renderer/category"
+ "src/main/java/com/orsoncharts/renderer/category/doc-files"
+ "src/main/java/com/orsoncharts/renderer/xyz"
+ "src/main/java/com/orsoncharts/style"
+ "src/main/java/com/orsoncharts/table"
+ "src/main/java/com/orsoncharts/util"
+ "src/main/java/com/orsoncharts/util/json"
+ "src/main/java/com/orsoncharts/util/json/parser"
+)
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A fast, lightweight charts generator for the Java platform"
+HOMEPAGE="https://github.com/jfree/orson-charts"
+SRC_URI="https://github.com/jfree/orson-charts/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="GPL-3+"
+SLOT="1"
+KEYWORDS="~amd64"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+RESTRICT="test"
+
+src_prepare() {
+ java-pkg_clean
+ default
+}
+
+src_install() {
+ java-pkg_newjar orson-charts.jar orsoncharts.jar
+ dodoc README.md
+}
diff --git a/dev-java/orsonpdf/Manifest b/dev-java/orsonpdf/Manifest
new file mode 100644
index 0000000000..8fc4404ec7
--- /dev/null
+++ b/dev-java/orsonpdf/Manifest
@@ -0,0 +1 @@
+DIST orsonpdf-1.9.tar.gz 49407 BLAKE2B 9646c969215a8aad4a6bcbfed7743c7b0dc5f915bea2d6d27900d95d8bd3481b22fe88410f9165c2d57e99892537c6128cb87453f3d795c18a3d294b62f0ceb0 SHA512 21acab18ef4261fb9d60a7410d632aa773451d5de9cfc76ccf58ff2a04c806954e72dfa6df5cc8c07c41c10152c98f73b185f9247bd1d95fd6f643bda4be08dc
diff --git a/dev-java/orsonpdf/metadata.xml b/dev-java/orsonpdf/metadata.xml
new file mode 100644
index 0000000000..5d480e8a0c
--- /dev/null
+++ b/dev-java/orsonpdf/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ Alessandro Barbieri
+ lssndrbarbieri@gmail.com
+
+
+ https://github.com/jfree/orsonpdf/issues
+ jfree/orsonpdf
+
+
diff --git a/dev-java/orsonpdf/orsonpdf-1.9.ebuild b/dev-java/orsonpdf/orsonpdf-1.9.ebuild
new file mode 100644
index 0000000000..8e2d7bbb82
--- /dev/null
+++ b/dev-java/orsonpdf/orsonpdf-1.9.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_SRC_DIR=(
+ "src/main/java/com/orsonpdf"
+ "src/main/java/com/orsonpdf/filter"
+ "src/main/java/com/orsonpdf/shading"
+ "src/main/java/com/orsonpdf/util"
+)
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A fast, lightweight PDF generator for the Java platform"
+HOMEPAGE="https://github.com/jfree/orsonpdf"
+SRC_URI="https://github.com/jfree/orsonpdf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="GPL-3+ BSD"
+SLOT="1"
+KEYWORDS="~amd64"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+RESTRICT="test"
+
+src_prepare() {
+ java-pkg_clean
+ default
+}
+
+src_install() {
+ java-pkg_dojar orsonpdf.jar
+ dodoc README.md
+}
diff --git a/dev-java/paceRegression/Manifest b/dev-java/paceRegression/Manifest
new file mode 100644
index 0000000000..7e133a974c
--- /dev/null
+++ b/dev-java/paceRegression/Manifest
@@ -0,0 +1 @@
+DIST paceRegression1.0.1.zip 135779 BLAKE2B 6ea05cbef2e56d23fd55f054390a5ebdf633ffba7d60c726b0e297499381d32f8b63c040b29465bce0e66247373ea4bb283c61458f9fce048eab9655a53450fa SHA512 d8964b6640628e29bd0b39e062c9373c9022e555d63e4d93a7ca504e5977343d483d7e8bc00ee8adfbeb0d648e04103bd5633b21241555d9da31dfec54e89a5e
diff --git a/dev-java/paceRegression/files/paceRegression-1.0.1-no-build-docs.patch b/dev-java/paceRegression/files/paceRegression-1.0.1-no-build-docs.patch
new file mode 100644
index 0000000000..a81cfc0352
--- /dev/null
+++ b/dev-java/paceRegression/files/paceRegression-1.0.1-no-build-docs.patch
@@ -0,0 +1,11 @@
+--- a/build_package.xml
++++ b/build_package.xml
+@@ -150,7 +150,7 @@
+
+
+
+-
+
diff --git a/dev-java/paceRegression/metadata.xml b/dev-java/paceRegression/metadata.xml
new file mode 100644
index 0000000000..8b7347903e
--- /dev/null
+++ b/dev-java/paceRegression/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ Alessandro Barbieri
+ lssndrbarbieri@gmail.com
+
+
+ weka
+
+
diff --git a/dev-java/paceRegression/paceRegression-1.0.1.ebuild b/dev-java/paceRegression/paceRegression-1.0.1.ebuild
new file mode 100644
index 0000000000..697cff92d7
--- /dev/null
+++ b/dev-java/paceRegression/paceRegression-1.0.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EANT_BUILD_TARGET="exejar"
+EANT_BUILD_XML="build_package.xml"
+EANT_GENTOO_CLASSPATH="weka"
+EANT_EXTRA_ARGS="-Dpackage=paceRegression"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Class for building pace regression linear models and using them for prediction"
+HOMEPAGE="https://weka.sourceforge.net/doc.packages/paceRegression"
+SRC_URI="mirror://sourceforge/weka/${PN}${PV}.zip"
+S="${WORKDIR}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CDEPEND=">=dev-util/weka-3.7.1:0"
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.8:*
+"
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.8:*
+"
+BDEPEND="app-arch/unzip"
+
+PATCHES=( "${FILESDIR}/${P}-no-build-docs.patch" )
+
+src_prepare() {
+ java-pkg_clean
+ default
+ java-ant_rewrite-classpath build_package.xml
+}
+
+src_install() {
+ java-pkg_dojar "dist/${PN}.jar"
+}
diff --git a/dev-lang/hare/hare-0_pre20220624.ebuild b/dev-lang/hare/hare-0_pre20220624-r1.ebuild
similarity index 97%
rename from dev-lang/hare/hare-0_pre20220624.ebuild
rename to dev-lang/hare/hare-0_pre20220624-r1.ebuild
index 2fe1678f5a..a9096c3d75 100644
--- a/dev-lang/hare/hare-0_pre20220624.ebuild
+++ b/dev-lang/hare/hare-0_pre20220624-r1.ebuild
@@ -9,7 +9,7 @@ EGIT_COMMIT="65449ddbbbf39659bfaf84a2cb78510409a4ab7a"
SRC_URI="https://git.sr.ht/~sircmpwn/hare/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
LICENSE="MPL-2.0 GPL-3"
-SLOT="0"
+SLOT="0/${PV}"
KEYWORDS="~amd64 ~arm64 ~riscv"
DEPEND="
diff --git a/dev-lang/harec/harec-0_pre20220624.ebuild b/dev-lang/harec/harec-0_pre20220624.ebuild
index 6a49f84d21..cae9c81c73 100644
--- a/dev-lang/harec/harec-0_pre20220624.ebuild
+++ b/dev-lang/harec/harec-0_pre20220624.ebuild
@@ -3,22 +3,39 @@
EAPI=8
+if [[ "${PV}" = "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/harec"
+ S="${WORKDIR}/${P}/build"
+else
+ EGIT_COMMIT="62d4204f21332d97ad7697f628eade9137e9c3bc"
+ SRC_URI="https://git.sr.ht/~sircmpwn/harec/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/${PN}-${EGIT_COMMIT}/build"
+
+ KEYWORDS="~amd64 ~arm64 ~riscv"
+fi
+
+
DESCRIPTION="The Hare compiler"
HOMEPAGE="https://harelang.org/"
-EGIT_COMMIT="62d4204f21332d97ad7697f628eade9137e9c3bc"
-SRC_URI="https://git.sr.ht/~sircmpwn/harec/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}/build"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
DEPEND="sys-devel/qbe"
RDEPEND="${DEPEND}"
src_unpack() {
default
- git-r3_src_unpack
- mkdir -p "${S}" || die
+
+ [[ "${PV}" = "9999" ]] && git-r3_src_unpack
+
+ mkdir "${S}" || die
+}
+
+src_prepare() {
+ default
+
+ sed -i 's; -Werror ; ;' ../config.sh || die
}
src_configure() {
diff --git a/dev-lang/harec/harec-9999.ebuild b/dev-lang/harec/harec-9999.ebuild
index 6227b5845f..cae9c81c73 100644
--- a/dev-lang/harec/harec-9999.ebuild
+++ b/dev-lang/harec/harec-9999.ebuild
@@ -1,14 +1,23 @@
# Copyright 2021-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
+
+if [[ "${PV}" = "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/harec"
+ S="${WORKDIR}/${P}/build"
+else
+ EGIT_COMMIT="62d4204f21332d97ad7697f628eade9137e9c3bc"
+ SRC_URI="https://git.sr.ht/~sircmpwn/harec/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/${PN}-${EGIT_COMMIT}/build"
+
+ KEYWORDS="~amd64 ~arm64 ~riscv"
+fi
-inherit git-r3
DESCRIPTION="The Hare compiler"
HOMEPAGE="https://harelang.org/"
-EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/harec"
-S="${WORKDIR}/${P}/build"
LICENSE="GPL-3"
SLOT="0"
@@ -17,8 +26,16 @@ RDEPEND="${DEPEND}"
src_unpack() {
default
- git-r3_src_unpack
- mkdir "${WORKDIR}/${P}/build" || die
+
+ [[ "${PV}" = "9999" ]] && git-r3_src_unpack
+
+ mkdir "${S}" || die
+}
+
+src_prepare() {
+ default
+
+ sed -i 's; -Werror ; ;' ../config.sh || die
}
src_configure() {
diff --git a/dev-libs/cubelib/cubelib-4.7-r2.ebuild b/dev-libs/cubelib/cubelib-4.7-r2.ebuild
index d713e5f664..3500e446e5 100644
--- a/dev-libs/cubelib/cubelib-4.7-r2.ebuild
+++ b/dev-libs/cubelib/cubelib-4.7-r2.ebuild
@@ -21,7 +21,6 @@ IUSE_CUBELIB_STRATEGY="
IUSE="R ${IUSE_CUBELIB_STRATEGY}"
RDEPEND="
- sys-cluster/scorep
sys-libs/binutils-libs
sys-libs/zlib
R? (
@@ -78,7 +77,6 @@ src_configure() {
--disable-platform-mic
--with-compression=full
--with-custom-compilers
- --with-scorep="${EPREFIX}/usr"
--with-strategy="${strategy}"
--with-system-parser
$(use_with R cube_dump_r)
diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest
index 38a512d808..34410a6bd5 100644
--- a/dev-libs/open62541/Manifest
+++ b/dev-libs/open62541/Manifest
@@ -1 +1 @@
-DIST open62541-1.3.tar.gz 3884462 BLAKE2B 7d6b935c450c8badc64aadca6d2a9ef4913873dcce8f3521add5eafd0489573583ff7df4fee887e0fabca2cf8ceef8e751d6dfe85f21499afa46cfd005391a6d SHA512 636f04d0dd7501616f06682ec4f3c7d9b90f78167f7101ddbb14f88796ba0e3a3560526839fe88b4247359a4e61eab8ac46ac0bba21a7a01d313ae60c9c5f5d5
+DIST open62541-1.3.1.tar.gz 3886706 BLAKE2B 3c53ea267e4ae1abb8047fc6f86a85fe327c4b528e30576d402b547bd8ab749596db6224fd12cc6baf506d60871bb30831fab32894a9d93be86f01a71db774df SHA512 49b2869c39205eebe5226c0238ee7cedc5eae42f140d205f6cf1df6f359e0a1cb04a50616ac846438569824b18a3af4d18d316288313f0368bcf9cd0f4282d5c
diff --git a/dev-libs/open62541/files/open62541-1.3-disable-xdp.patch b/dev-libs/open62541/files/open62541-1.3.1-disable-xdp.patch
similarity index 100%
rename from dev-libs/open62541/files/open62541-1.3-disable-xdp.patch
rename to dev-libs/open62541/files/open62541-1.3.1-disable-xdp.patch
diff --git a/dev-libs/open62541/files/open62541-1.3-tests.patch b/dev-libs/open62541/files/open62541-1.3.1-tests.patch
similarity index 100%
rename from dev-libs/open62541/files/open62541-1.3-tests.patch
rename to dev-libs/open62541/files/open62541-1.3.1-tests.patch
diff --git a/dev-libs/open62541/open62541-1.3.ebuild b/dev-libs/open62541/open62541-1.3.1.ebuild
similarity index 92%
rename from dev-libs/open62541/open62541-1.3.ebuild
rename to dev-libs/open62541/open62541-1.3.1.ebuild
index 2f5c0abfa3..7e3c2224a8 100644
--- a/dev-libs/open62541/open62541-1.3.ebuild
+++ b/dev-libs/open62541/open62541-1.3.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{8..10} )
inherit cmake python-single-r1
DESCRIPTION="Open source C implementation of OPC UA"
-HOMEPAGE="https://open62541.org/"
+HOMEPAGE="https://www.open62541.org/"
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MPL-2.0"
@@ -54,13 +54,6 @@ PATCHES=(
"${FILESDIR}/${P}-tests.patch"
)
-src_prepare() {
- # bug 780912
- sed -i -e 's/check_add_cc_flag("-Werror")//g' CMakeLists.txt || die
-
- cmake_src_prepare
-}
-
src_configure() {
local mycmakeargs=(
-DBUILD_SHARED_LIBS=ON
@@ -70,6 +63,7 @@ src_configure() {
-DUA_BUILD_UNIT_TESTS=$(usex test)
-DUA_ENABLE_PUBSUB=$(usex pubsub)
-DUA_ENABLE_PUBSUB_ETH_UADP=$(usex pubsub)
+ -DUA_FORCE_WERROR=OFF
)
if use encryption; then
diff --git a/dev-python/TakeTheTime/TakeTheTime-0.3.1.ebuild b/dev-python/TakeTheTime/TakeTheTime-0.3.1.ebuild
index 2c4e5ca59d..8cd9ab4dd6 100644
--- a/dev-python/TakeTheTime/TakeTheTime-0.3.1.ebuild
+++ b/dev-python/TakeTheTime/TakeTheTime-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/dev-python/asyncssh/Manifest b/dev-python/asyncssh/Manifest
index 95cc262dc3..8421cacba4 100644
--- a/dev-python/asyncssh/Manifest
+++ b/dev-python/asyncssh/Manifest
@@ -1 +1,2 @@
DIST asyncssh-2.10.1.tar.gz 483000 BLAKE2B a588d671b3afe9f77f15974578f27e9001e8138284e4313d8188766c66e81942a8d37598ba79af4971c11f900fa7009311c20c86fce0e058d1fdeeec72c9320a SHA512 adaf68f2e4209e9bf91c2018298a281dab490d723bda9d6f7db892aa43e796e38ff904cf39f56c8b545439ca71c89b419e53521f323cb753cf7a2290beb04e12
+DIST asyncssh-2.11.0.tar.gz 482916 BLAKE2B fd410771d4032996b4a75c0cf7250f481a8e5f5498f6a4c31227468eff3dba8f4936c2711e11aadbf313989e395ee679d11b0a28646735f1868bd81680c3f3e3 SHA512 d9736d0d9e486c4a062fbf493d28f2c5b1074baa32879430750115a686600fa97c947ea34b47a1d9962cc44cc32ce6b31fdb0baa455fbde9b63660c5b8454810
diff --git a/dev-python/asyncssh/asyncssh-2.11.0.ebuild b/dev-python/asyncssh/asyncssh-2.11.0.ebuild
new file mode 100644
index 0000000000..c574e23a19
--- /dev/null
+++ b/dev-python/asyncssh/asyncssh-2.11.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_BUILDER="sphinx"
+DOCS_DIR="docs"
+EPYTEST_DESELECT=(
+ tests/test_connection.py::_TestConnection::test_connect_timeout_exceeded
+ tests/test_connection.py::_TestConnection::test_connect_timeout_exceeded_string
+ tests/test_connection.py::_TestConnection::test_connect_timeout_exceeded_tunnel
+) # network tests
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 docs optfeature
+
+DESCRIPTION="Asynchronous SSHv2 client and server library"
+HOMEPAGE="
+ https://asyncssh.timeheart.net
+ https://pypi.org/project/asyncssh/
+ https://github.com/ronf/asyncssh
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ECL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ >=dev-python/cryptography-3.1[${PYTHON_USEDEP}]
+ >=dev-python/typing-extensions-3.6[${PYTHON_USEDEP}]
+"
+DEPEND="${REDEPEND}"
+BDEPEND="
+ test? (
+ >=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
+ >=dev-python/gssapi-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/libnacl-1.4.2[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-17.0.0[${PYTHON_USEDEP}]
+ >=dev-python/python-pkcs11-0.7.0[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
+
+pkg_postinst() {
+ optfeature "support for OpenSSH private key encryption" dev-python/bcrypt
+ optfeature "support for key exchange and authentication with U2F/FIDO2 security keys" dev-python/fido2
+ optfeature "support for accessing PIV keys on PKCS#11 security tokens" dev-python/python-pkcs11
+ optfeature "support for GSSAPI key exchange and authentication on UNIX" dev-python/gssapi
+ optfeature "if you have a version of OpenSSL older than 1.1.1b installed and you want support for Curve25519 key exchange, Ed25519 keys and certificates, or the Chacha20-Poly1305 cipher" dev-python/libnacl
+ optfeature "support for UMAC cryptographic hashes" dev-python/libnettle
+ optfeature "support for X.509 certificate authentication" dev-python/pyopenssl
+}
diff --git a/dev-python/axisregistry/Manifest b/dev-python/axisregistry/Manifest
index 43c707a492..1ae17b1615 100644
--- a/dev-python/axisregistry/Manifest
+++ b/dev-python/axisregistry/Manifest
@@ -1 +1,2 @@
DIST axisregistry-0.2.0.tar.gz 15996 BLAKE2B f773aa03d8d51e29ae188a71ceb6f7505d35575739332bf7f6c0706bb659815a3d21ef2916d752872f335bf504c6a2662ec0ba447e651d50088f6d7b449b4e3a SHA512 ca069eba5d6ea036e8908d3bc74ec6f65345cad9ef7e6255cf111741e798f68ca24a4528a9dba473a196d1a5d658491677339fd80885e8023aa09d710056f76e
+DIST axisregistry-0.3.2.tar.gz 3497066 BLAKE2B eefeb7c315afbdae46adf0c55c29d328cf32f8e6a59c3b0eb84ce4bf94a02a1725e80dfbc8ef6fc53500c8db497c0cd8d48fc43854a31d1437a86db5b2cfa42d SHA512 0e59e7c6a7d9acb78a9d5dd0ebffe38004c477866352b35d91394f1ae953f919f78c25604a60d83b7cb9e67b742cac35d2f0dfc1832f5c0827b7bd1a36bc8792
diff --git a/dev-python/axisregistry/axisregistry-0.3.2.ebuild b/dev-python/axisregistry/axisregistry-0.3.2.ebuild
new file mode 100644
index 0000000000..0339faa33d
--- /dev/null
+++ b/dev-python/axisregistry/axisregistry-0.3.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python API to access data from the Google Fonts variable fonts Axis Registry"
+HOMEPAGE="
+ https://github.com/googlefonts/axisregistry
+ https://pypi.org/project/axisregistry/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="dev-python/protobuf-python[${PYTHON_USEDEP}]"
+DEPEND="
+ ${RDEPEND}
+ >=dev-python/setuptools_scm-4[${PYTHON_USEDEP}]
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.2.0-remove-setuptools_scm-constraint.patch" )
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+ distutils-r1_python_prepare_all
+}
diff --git a/dev-python/compreffor/Manifest b/dev-python/compreffor/Manifest
index fe4babae38..d1f00dd2d9 100644
--- a/dev-python/compreffor/Manifest
+++ b/dev-python/compreffor/Manifest
@@ -1 +1,2 @@
DIST compreffor-0.5.1.post1.tar.gz 75132 BLAKE2B ed37118c45d616029dad90451240ff7d5eb131ecd080c713ccc8241d3288a869f5e2950524b0faf58e895c8f1e76e0da8df24cc0526a1ce342d509de856fc0e2 SHA512 eaab7e01b158f68c28c946f39af80bd8313b9338301aee8a4119de243442791d68cf7edc0e8ac86efc0cadf6115de89f38ec445cf5ce13055aed44dcfaeb3eed
+DIST compreffor-0.5.2.tar.gz 76299 BLAKE2B 254329875fbafd9a4887a696a2b21ae1695e03fe337fb0f5e48c2b2e242941114d7cf16c966e85c690302152da06bd21f7bb713fe92c139893299468b461e466 SHA512 9806141022163804f02b1ee14552bc2e8e9b7350110c42aca1c74bd6af049f3032920e5299dd59961bb24e69b97fa748478f8be2f25fd90ae2e3d0d1ce4c22c0
diff --git a/dev-python/compreffor/compreffor-0.5.2.ebuild b/dev-python/compreffor/compreffor-0.5.2.ebuild
new file mode 100644
index 0000000000..3c6e720fc8
--- /dev/null
+++ b/dev-python/compreffor/compreffor-0.5.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_P="${PN}-${PV/_p/.post}"
+DESCRIPTION="A CFF table subroutinizer for FontTools"
+HOMEPAGE="
+ https://github.com/googlefonts/compreffor
+ https://pypi.org/project/compreffor/
+"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND=">=dev-python/fonttools-4[${PYTHON_USEDEP}]"
+DEPEND=">=dev-python/cython-0.29.24[${PYTHON_USEDEP}]"
+BDEPEND="
+ app-arch/unzip
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.5.1_p1-remove-unwanted-dependencies.patch" )
+
+distutils_enable_tests pytest
+
+python_test() {
+ cd "${T}" || die
+ epytest --pyargs compreffor
+}
diff --git a/dev-python/confluent-kafka/Manifest b/dev-python/confluent-kafka/Manifest
index 51177ae93c..1964de802a 100644
--- a/dev-python/confluent-kafka/Manifest
+++ b/dev-python/confluent-kafka/Manifest
@@ -1 +1,2 @@
DIST confluent-kafka-1.8.2.gh.tar.gz 250172 BLAKE2B 9fabaaf2417343ae2743b662c359925487011cee9c63e5f8d07bfa049212e0f9890530072b463fd39fcc991d46e8e2e4ce07d79b8a63b367685c7da9d658291d SHA512 6db66371b7cac822aafeaa4acb491556d9a866f8502d76e2acfe52d18b282caab338cd3f51f84845eab2ec5b2c44ed80426a7ad8afd0314a8a5ddc1a9299d693
+DIST confluent-kafka-1.9.0.gh.tar.gz 260481 BLAKE2B 814a6ce0421c866ed9082aa0cf566b476223453f82d84ee20d58d5fd1045fefbb4b92d6d14a9a8301ea8283c19679236efd237bbe21c57199d0bbfcd6427cd9b SHA512 979878ae3ee61d7fcda67803cc5645cdf28749afe7919c7188e1fba9b34e68ab2950536a4817d47de5492bed751fb2eabcdf30f33adec864250c14cf48512bfe
diff --git a/dev-python/confluent-kafka/confluent-kafka-1.9.0.ebuild b/dev-python/confluent-kafka/confluent-kafka-1.9.0.ebuild
new file mode 100644
index 0000000000..bb04a6a993
--- /dev/null
+++ b/dev-python/confluent-kafka/confluent-kafka-1.9.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EPYTEST_IGNORE=( tests/integration )
+MYPN="${PN}-python"
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Confluent's Kafka Python Client"
+HOMEPAGE="
+ https://pypi.org/project/confluent-kafka/
+ https://github.com/confluentinc/confluent-kafka-python
+"
+SRC_URI="https://github.com/confluentinc/${MYPN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${MYPN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/librdkafka"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ test? (
+ >=dev-python/fastavro-1.0[${PYTHON_USEDEP}]
+ >=dev-python/avro-1.10.0[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/pytest-timeout[${PYTHON_USEDEP}]
+ dev-python/requests-mock[${PYTHON_USEDEP}]
+ >=dev-python/trivup-0.8.3[${PYTHON_USEDEP}]
+
+ dev-python/protobuf-python[${PYTHON_USEDEP}]
+ dev-python/jsonschema[${PYTHON_USEDEP}]
+ dev-python/pyflakes[${PYTHON_USEDEP}]
+ dev-python/pyrsistent[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+ distutils-r1_python_install_all
+ rm "${ED}/usr/LICENSE.txt" || die
+}
+
+pkg_postinst() {
+ optfeature "avro support" dev-python/fastavro dev-python/avro dev-python/requests
+ optfeature "json support" dev-python/jsonschema dev-python/pyrsistent dev-python/requests
+ optfeature "protobuf support" dev-python/protobuf-python dev-python/requests
+ optfeature "schema-registry support" dev-python/requests
+}
diff --git a/dev-python/cx-oracle/Manifest b/dev-python/cx-oracle/Manifest
index 6c7e35094d..8fc09e49f9 100644
--- a/dev-python/cx-oracle/Manifest
+++ b/dev-python/cx-oracle/Manifest
@@ -1 +1 @@
-DIST cx_Oracle-8.2.1.tar.gz 359269 BLAKE2B ad972b6607a7e77794b5642bce49f494715e32e989fd7c12c3a64ea556e6967bda02f0d937e42e1dd2dae931f75c33e63fa8c13a9dcd439e85b751720773c3d1 SHA512 879f25323ea037499c773be860d7c9a4f9bc675f7107a79a1ac027db45f6a4d71b47579b656fba267b85dacb76316f012de238ffda66ea33395ce5989b982116
+DIST cx_Oracle-8.3.0.tar.gz 363886 BLAKE2B a58b9cd201e8bd6038a0f7e50031c76197c1739ac2f022a7f91bd77f44032bc87d551c88e8b54c38dcb6b1fcd565e2220d4115ddd195c5f8b8b390590076fe57 SHA512 9a2f50b929802311271e5270f118c96968886c6fd3c8677d2e08949d61e9d4d26846bc9e44c674e0bd12a7f8b57bcced9b979f3622a37656e0969ad8ea4e7f70
diff --git a/dev-python/cx-oracle/cx-oracle-8.2.1.ebuild b/dev-python/cx-oracle/cx-oracle-8.3.0.ebuild
similarity index 96%
rename from dev-python/cx-oracle/cx-oracle-8.2.1.ebuild
rename to dev-python/cx-oracle/cx-oracle-8.3.0.ebuild
index 216938ef47..e7ca2440b0 100644
--- a/dev-python/cx-oracle/cx-oracle-8.2.1.ebuild
+++ b/dev-python/cx-oracle/cx-oracle-8.3.0.ebuild
@@ -3,7 +3,7 @@
EAPI="8"
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
inherit distutils-r1
diff --git a/dev-python/fastavro/Manifest b/dev-python/fastavro/Manifest
index 6372a7097e..5edfe9d9f6 100644
--- a/dev-python/fastavro/Manifest
+++ b/dev-python/fastavro/Manifest
@@ -1,2 +1,2 @@
-DIST fastavro-1.4.12.tar.gz 760518 BLAKE2B 7422e6e664ff6ceface6b3d8d39e6437233b12d62f771d1516920e7e7c3a0c8d23ac2fc82ff2acdac5d21314c0f2978b97fce96bbe2fedb587001672e3984e10 SHA512 fe5de909081dfaa4fa8575355f03d533ebe628182bc9716529a7f6c668444a34e8975ae90bc4d588dac2271a0913a49ac6457db0d256c54637995e16cd98281d
DIST fastavro-1.5.1.tar.gz 761574 BLAKE2B fd520edaf533120022cbe6f3cabe5919c952b43bd4d131bb2aacbaded6fbda4d60e8610c12850310c28ac0fc5696301f4ef725c8369057dff9c73b9b35653ada SHA512 6fa2169d4cc26c2176e61da159129e6456296d99bce2d973916d6a0f071feec7b930f985167d7e1e3e0939ec2a5ff387f67e221ff6f52523015af99d4823bf1e
+DIST fastavro-1.5.2.tar.gz 761565 BLAKE2B 16e4408fa85ee2703a66cb9e8d125a651d879c69475e3137f95283ed974a3b158f0fc7a67de660db06731d45b7952d04b510a08d472fc5a7d86fe5e57a9d264b SHA512 9885291f9ed15da05ee1fc816a95b6fcb269a6c5814efa9f94188c39e5bb0b31dd5afc1c76ae10268a4e128306d66f60c2087d5c0335c1e918e477fabe7f6cf0
diff --git a/dev-python/fastavro/fastavro-1.4.12.ebuild b/dev-python/fastavro/fastavro-1.5.2.ebuild
similarity index 94%
rename from dev-python/fastavro/fastavro-1.4.12.ebuild
rename to dev-python/fastavro/fastavro-1.5.2.ebuild
index 7a5627d28e..2802e6c4db 100644
--- a/dev-python/fastavro/fastavro-1.4.12.ebuild
+++ b/dev-python/fastavro/fastavro-1.5.2.ebuild
@@ -32,6 +32,7 @@ RDEPEND=""
DEPEND="
${RDEPEND}
dev-python/cython[${PYTHON_USEDEP}]
+ dev-python/wheel[${PYTHON_USEDEP}]
"
BDEPEND="
test? (
@@ -43,9 +44,4 @@ BDEPEND="
)
"
-src_configure() {
- export FASTAVRO_USE_CYTHON=1
- default
-}
-
distutils_enable_tests pytest
diff --git a/dev-python/fontParts/Manifest b/dev-python/fontParts/Manifest
index 2ab0eef0ef..96716cd8d6 100644
--- a/dev-python/fontParts/Manifest
+++ b/dev-python/fontParts/Manifest
@@ -1 +1 @@
-DIST fontParts-0.10.5.tar.gz 431282 BLAKE2B f0585b0220b35f9b6fc18ace6b517b69fecf87e2d0e1fda7ea5753512851e49b2fd122af628286a638d9c178212602e0ca467b38a94577d11ea3bb117d944a6b SHA512 961507c60de82da516f5cefbb3ca998533751234953c01c28e2ca534d47916e534c1cd6dc95add182e7da10ff57b1a0e0e5ad20fcbe4c385d5f2f58dde0be927
+DIST fontParts-0.10.6.gh.tar.gz 431799 BLAKE2B e1fdc0e4ac54a62ec025bf73596e9abb2472dbb4eff5f2eea2667da31c5b75cf37a1db9cc25b2fac8afb8815b721aa7439f91129e03df018ba77e9a4b37886cd SHA512 77b888c7393a92153fbd0c61a6e3e30a1c8c9416db4132799cfd938f819ff415f408d31326b87e8bd5b9b9876559a82a61251328684933b7ecc33ccc9735b843
diff --git a/dev-python/fontParts/fontParts-0.10.5.ebuild b/dev-python/fontParts/fontParts-0.10.6.ebuild
similarity index 96%
rename from dev-python/fontParts/fontParts-0.10.5.ebuild
rename to dev-python/fontParts/fontParts-0.10.6.ebuild
index aa83179012..332501e01c 100644
--- a/dev-python/fontParts/fontParts-0.10.5.ebuild
+++ b/dev-python/fontParts/fontParts-0.10.6.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="An API for interacting with the parts of fonts"
HOMEPAGE="https://github.com/robotools/fontParts"
-SRC_URI="https://github.com/robotools/fontParts/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/robotools/fontParts/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
KEYWORDS="~amd64 ~x86"
LICENSE="MIT"
diff --git a/dev-python/glyphsets/Manifest b/dev-python/glyphsets/Manifest
index 6a1b8f7a7b..4267e053c1 100644
--- a/dev-python/glyphsets/Manifest
+++ b/dev-python/glyphsets/Manifest
@@ -1 +1,2 @@
DIST glyphsets-0.5.0.gh.tar.gz 1473150 BLAKE2B d745b7689c9eee7cd1a25035d13f19d6eb6db7c8e603ecf87ed689f0cb2e2d1a421b4d5a4f08c7d470def2d5d8db7636a01941f3445579a0712f2ab506a9571a SHA512 94d6ab956a5ab16f061b57e5210ea59733486a27bde3093e8af279ac8f5f1e2efce71d5135ac7182ec027916e31d86433939e743084c405653250893d9221a02
+DIST glyphsets-0.5.1.gh.tar.gz 1473698 BLAKE2B 414ac3c1647ab483545d65f7503c84f19f9d2a0132d246011f88dd11835a297657a16873645d8dc383a77658f275983546b91b96d9c2fa15f47d8fc03562e027 SHA512 9237a2ee86ba25f5023f3ea863739b06374fb16d1655458fdc680b64cb54a1cec0134a2826b4cd1646bae70a33def601d547d2b2432275d68f0c6eb472ea376a
diff --git a/dev-python/glyphsets/glyphsets-0.5.1.ebuild b/dev-python/glyphsets/glyphsets-0.5.1.ebuild
new file mode 100644
index 0000000000..5bc52409c7
--- /dev/null
+++ b/dev-python/glyphsets/glyphsets-0.5.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python API for evaluating coverage of glyph sets in font projects"
+HOMEPAGE="
+ https://github.com/googlefonts/glyphsets
+ https://pypi.org/project/glyphsets/
+"
+SRC_URI="https://github.com/googlefonts/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+SLOT="0"
+
+#ufoLib2 is an indirect dependency
+RDEPEND="
+ dev-python/fonttools[${PYTHON_USEDEP}]
+ dev-python/ufoLib2[${PYTHON_USEDEP}]
+"
+DEPEND="
+ ${RDEPEND}
+ >=dev-python/setuptools_scm-4[${PYTHON_USEDEP}]
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.5.0-remove-setuptools_scm.constraint.patch" )
+
+python_prepare_all() {
+ export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+ distutils-r1_python_prepare_all
+}
diff --git a/dev-python/hyperglot/Manifest b/dev-python/hyperglot/Manifest
index 03ad41e793..201a724026 100644
--- a/dev-python/hyperglot/Manifest
+++ b/dev-python/hyperglot/Manifest
@@ -1 +1,2 @@
DIST hyperglot-0.3.8.gh.tar.gz 7535789 BLAKE2B ea95372cfff195d2f991cc9a6bc3e26a9576e234167dde0c3a550979f6657e23b2169beb9d67b05fe8de1922e8a299ae24653da611e4277027798b2d139bc12f SHA512 32b8a08795fad10bfe909ddcab9578a53d1a0faf5a9ac79c2a129d2529d00166336560528f298ff8433fdc1149791da948fa2ef4f4d67780bd79b8f8126bdaf6
+DIST hyperglot-0.3.9.gh.tar.gz 7534924 BLAKE2B 504907a27e10977cba079cc03db489d1ee169de84e07d32308f4c682fda9be9e9d4b0af10f3ea0d0b3756582130ab3ab4474a730804b4a5ccd2acd0d97cfe787 SHA512 9bf3fad12e66d475dbca627164674a8f3d06779b44e3fac56b95de7058c863421ce107e76fab51dbf95d3ce7d6be5d9aeb340c73521dd85183f2982d36383758
diff --git a/dev-python/hyperglot/hyperglot-0.3.9.ebuild b/dev-python/hyperglot/hyperglot-0.3.9.ebuild
new file mode 100644
index 0000000000..6f30fd58e6
--- /dev/null
+++ b/dev-python/hyperglot/hyperglot-0.3.9.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Detect language support for font binaries"
+HOMEPAGE="
+ https://hyperglot.rosettatype.com/
+ https://github.com/rosettatype/hyperglot
+ https://pypi.org/project/hyperglot/
+"
+SRC_URI="https://github.com/rosettatype/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-3+ OFL"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="
+ >=dev-python/click-7.0[${PYTHON_USEDEP}]
+ >=dev-python/fonttools-4.0.2[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-5.3[${PYTHON_USEDEP}]
+ >=dev-python/unicodedata2-13.0.0[${PYTHON_USEDEP}]
+ >=dev-python/colorlog-4.7.2[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/oslo-cache/oslo-cache-2.8.1.ebuild b/dev-python/oslo-cache/oslo-cache-2.8.1.ebuild
index efdaf774c8..3bc55cfc18 100644
--- a/dev-python/oslo-cache/oslo-cache-2.8.1.ebuild
+++ b/dev-python/oslo-cache/oslo-cache-2.8.1.ebuild
@@ -17,7 +17,6 @@ HOMEPAGE="
https://github.com/openstack/oslo.cache
"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="Apache-2.0"
@@ -33,19 +32,20 @@ RDEPEND="
>=dev-python/oslo-utils-4.2.0[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}"
-BDEPEND="
- test? (
- >=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
- >=dev-python/pifpaf-0.10.0[${PYTHON_USEDEP}]
- >=dev-python/pymemcache-3.4.0[${PYTHON_USEDEP}]
- >=dev-python/python-binary-memcached-0.29.0[${PYTHON_USEDEP}]
- >=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
- >=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
- >=dev-python/etcd3gw-0.2.0[${PYTHON_USEDEP}]
- )
-"
+#BDEPEND="
+# test? (
+# >=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+# >=dev-python/pifpaf-0.10.0[${PYTHON_USEDEP}]
+# >=dev-python/pymemcache-3.4.0[${PYTHON_USEDEP}]
+# >=dev-python/python-binary-memcached-0.29.0[${PYTHON_USEDEP}]
+# >=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
+# >=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
+# >=dev-python/etcd3gw-0.2.0[${PYTHON_USEDEP}]
+# )
+#"
+# dev-python/python-binary-memcached is masked
RESTRICT="test"
-PROPERTIES="test_network"
+#PROPERTIES="test_network"
distutils_enable_tests pytest
diff --git a/dev-python/persist-queue/persist-queue-0.8.0.ebuild b/dev-python/persist-queue/persist-queue-0.8.0.ebuild
index 6c795e57fe..e45bcaedcc 100644
--- a/dev-python/persist-queue/persist-queue-0.8.0.ebuild
+++ b/dev-python/persist-queue/persist-queue-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/dev-python/pytest-harvest/Manifest b/dev-python/pytest-harvest/Manifest
index 71ce9a5df4..82a97c9aee 100644
--- a/dev-python/pytest-harvest/Manifest
+++ b/dev-python/pytest-harvest/Manifest
@@ -1 +1,2 @@
DIST pytest-harvest-1.10.3.tar.gz 77312 BLAKE2B 301a9c890c527213025f33e72fc9a9e7d23354ef174e489b3e40e3597bf5b180ecd15f584cd736d379a4010f739e0aedcb5914012f0db767a45c7dfd4f38d126 SHA512 ba76e86a9109daeef70ac5ee454e92655468e2dbf4ade39d62e80b67f09978e78cc7f41bdf366f946d6a859b0b3f6d1f937155b4a486799b5806b9f68634e7ae
+DIST pytest-harvest-1.10.4.tar.gz 77384 BLAKE2B 93acd363b9874ef0a8e776c3472cde27417776850d004e83f00ecd52c7c9acbf1758d0062bd14fb83889c9b688a1f92352e42afe2dd6a9b01c567e8afe9d2f1c SHA512 61e371478b0fe809cb5e39040596a241ef3630641d7465799a5e24a953453924f3f6b5b8b94e67a51f1f5b2cb744bb2a698a7d50b6d638dc866a856bf74abe7a
diff --git a/dev-python/pytest-harvest/pytest-harvest-1.10.4.ebuild b/dev-python/pytest-harvest/pytest-harvest-1.10.4.ebuild
new file mode 100644
index 0000000000..98597a6aec
--- /dev/null
+++ b/dev-python/pytest-harvest/pytest-harvest-1.10.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="dev-python/mkdocs-material"
+DOCS_DIR="docs"
+inherit distutils-r1 docs
+
+DESCRIPTION="Store and retrieve data created during your pytest tests execution"
+HOMEPAGE="https://pypi.org/project/pytest-harvest/ https://github.com/smarie/python-pytest-harvest"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ dev-python/decopatch[${PYTHON_USEDEP}]
+ >=dev-python/makefun-1.5[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+ test? (
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/pandas[${PYTHON_USEDEP}]
+ dev-python/pytest-cases[${PYTHON_USEDEP}]
+ dev-python/tabulate[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ sed "/pytest-runner/d" -i setup.cfg || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ docs_compile
+}
+
+python_test() {
+ epytest pytest_harvest/tests --doctest-modules
+}
diff --git a/dev-python/python-designateclient/Manifest b/dev-python/python-designateclient/Manifest
index 2bae8957d5..f811437c1a 100644
--- a/dev-python/python-designateclient/Manifest
+++ b/dev-python/python-designateclient/Manifest
@@ -1 +1,2 @@
DIST python-designateclient-4.5.0.tar.gz 70182 BLAKE2B 83c127935434367d64b4eac6f10040d5d0c59f58fc89db2a92e52f33c7b0f473d8c991fdb98ea1d3fddfd2111e91c6e162047cda061dd8fd897a430baa9c7629 SHA512 0229b925d9c659af777e5b7151830746b20d990e17a2328ad03cbdea3e04d7d5de78a16778d644b112b9d7b6f04a2a52ae57c9404c32fdab018c2be60ba3ca4e
+DIST python-designateclient-4.5.1.tar.gz 70307 BLAKE2B 0f5763251b7ba092f9b2f611a0ad3a55233ae60016ae658c3f7c7c50d5116dc997a1da2ed92aba510eabb963f71cba68add6e221b11adc540993e661adeece88 SHA512 6abddcfb817a48ae2b978b63c75765a7df0d21a3fdba718d9664848f411feca81305f415c44630fac7d7ef21cc35ffdc3d24bcb63724c95c0f1c993ec43b3d95
diff --git a/dev-python/python-designateclient/python-designateclient-4.5.1.ebuild b/dev-python/python-designateclient/python-designateclient-4.5.1.ebuild
new file mode 100644
index 0000000000..c862f0f6f4
--- /dev/null
+++ b/dev-python/python-designateclient/python-designateclient-4.5.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EPYTEST_IGNORE=( designateclient/functionaltests/ )
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings to the Designate API"
+HOMEPAGE="
+ https://github.com/openstack/python-designateclient
+ https://opendev.org/openstack/python-blazarclient
+ https://pypi.org/project/python-blazarclient/
+ https://launchpad.net/python-designateclient
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ >=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+ >=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+ >=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+ >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+ ${RDEPEND}
+ test? (
+ >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+ >=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+ >=dev-python/os-testr-1.0.0[${PYTHON_USEDEP}]
+ >=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+ >=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/reno-3.1.0[${PYTHON_USEDEP}]
+ >=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/sphinx-click/Manifest b/dev-python/sphinx-click/Manifest
index 105169e7c8..5a5a6771e0 100644
--- a/dev-python/sphinx-click/Manifest
+++ b/dev-python/sphinx-click/Manifest
@@ -1 +1,2 @@
DIST sphinx-click-4.1.0.tar.gz 21146 BLAKE2B 0510bdcfa051e1272796ef049b4fe40e936526937b99bec5c20b714507d285a5524bd341f41042a74c1b6715fbda7a892e14aee08a397df61ff47f39b2ebc52a SHA512 a57efbcfe8ab4f82298917937b573480401a51ce81889eb37b56f6eac0b2d6123a94a877f5bc460c4998c55040072453a48400f9c94d902a7cab6cd622d13d62
+DIST sphinx-click-4.2.0.tar.gz 21265 BLAKE2B 3f0cd707d6eb26bb63d81cd86324b715eecbb85d038a94104599034563be024d4d4cab5ed488b1d1fb55d4f7c6abb599f48c96f8ea582be0c3d4a37169e7638d SHA512 9b9fee96b17242a1a2cfc097a49aaaa0134e47d250231481d13c438abfdd17b149adf2bde9c3591a94e4e17f02dc800c2b48002eb74994b43fec0d50ddb1083e
diff --git a/dev-python/sphinx-click/sphinx-click-4.2.0.ebuild b/dev-python/sphinx-click/sphinx-click-4.2.0.ebuild
new file mode 100644
index 0000000000..cf32023f4f
--- /dev/null
+++ b/dev-python/sphinx-click/sphinx-click-4.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx plugin to automatically document click-based applications"
+HOMEPAGE="
+ https://github.com/click-contrib/sphinx-click
+ https://pypi.org/project/sphinx-click/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="
+ >=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
+ >=dev-python/click-7.0[${PYTHON_USEDEP}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+"
+BDEPEND=">=dev-python/pbr-2.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs --no-autodoc
diff --git a/dev-python/statmake/Manifest b/dev-python/statmake/Manifest
index 59b00d62e7..d8d3f04e69 100644
--- a/dev-python/statmake/Manifest
+++ b/dev-python/statmake/Manifest
@@ -1 +1,2 @@
DIST statmake-0.5.0.gh.tar.gz 39835 BLAKE2B cad6a4c8a803666ce45d165c46ce6278cdcb56de7a90166315ba229f07ac1202d4bd2e4db678e644e0eaea445b97b81c2eb2c24cdb9ad7d7d4fbee3465fb4bf8 SHA512 c28c85e5fce6904b109858b156ab607204b3ff906bb3ec09ca75a170f5640eba83fbdd310f6a5b70f123cfbff1b1af72af1bea541cfdec8175e52be273f8ac00
+DIST statmake-0.5.1.gh.tar.gz 39644 BLAKE2B 25af1c6e6ebacbdbd3b2004a2c686b2f732a953bb8d1293226581781bb10cd4d8c5d1002659f0377179f9f45525ec55de9df9ba3009756df9d31e9cc1c8f390b SHA512 9b2a6f614372a07a11e03c5f1c26e1f2c1a1f554c2d9ae887a3820e3e5b3766f8388db4d6e39cf338b0e85444fc499c3f04d4a8a169c0b70391b72530965a092
diff --git a/dev-python/statmake/statmake-0.5.1.ebuild b/dev-python/statmake/statmake-0.5.1.ebuild
new file mode 100644
index 0000000000..75176044b5
--- /dev/null
+++ b/dev-python/statmake/statmake-0.5.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Generate STAT tables for variable fonts from .stylespace files"
+HOMEPAGE="https://github.com/daltonmaag/statmake"
+SRC_URI="https://github.com/daltonmaag/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+ $(python_gen_cond_dep '
+ >=dev-python/attrs-21.3[${PYTHON_USEDEP}]
+ >=dev-python/cattrs-22.1[${PYTHON_USEDEP}]
+ >=dev-python/fonttools-4.11[${PYTHON_USEDEP}]
+ ')
+"
+BDEPEND="
+ test? (
+ $(python_gen_cond_dep '
+ >=dev-python/ufo2ft-2.7[${PYTHON_USEDEP}]
+ >=dev-python/ufoLib2-0.4[${PYTHON_USEDEP}]
+ ')
+ )
+"
+
+distutils_enable_tests pytest
+
+python_install() {
+ distutils-r1_python_install --skip-build
+ python_domodule "src/${PN}"
+}
+
+python_test() {
+ local -x PYTHONPATH="${S}/src:${PYTHONPATH}"
+ epytest
+}
diff --git a/dev-python/taskflow/Manifest b/dev-python/taskflow/Manifest
index 5731b781d9..6fee83b374 100644
--- a/dev-python/taskflow/Manifest
+++ b/dev-python/taskflow/Manifest
@@ -1,2 +1,2 @@
-DIST taskflow-4.6.4.tar.gz 1076719 BLAKE2B b202a6981deb9c9b6c86e9de740d44492a2028e0bd48ff9779e2db7f1ccb1076e5c4fa9195b0cdf5a8fb2af52a30e1ae8b6b3900a268f1b706b014f13df13cf8 SHA512 f8826e2d106123bc3d3c57826c2004c4aeaf17434931a660777ce2866dc659f82427c95bbf6e25459b2fb5ab303bb8ec11a898f53b4cb8b52f614965a56d298a
DIST taskflow-4.7.0.tar.gz 1076831 BLAKE2B 5f0490ae2dbcea518ec00094a2f6c577734facf8f4e28cdddd52d10db52c1aa942dd9e86693b37444dfe5262b1fe298188966f040581b3c810186f31d9482c84 SHA512 2c57dc81b371ecaecbf8511ff91e4064fcb084a7f728a476a1b0270690844b7c46c006d2ac39583d5c081711900a07a3e90204232da71a5c329000cad1b3a186
+DIST taskflow-5.0.0.tar.gz 1075544 BLAKE2B fca4c206c5d202da43485ffcdab12c99a6826f918420a66e885725b560eda2ac06b3864d286c465c4554d676bed601769fdcf4ec9882e0f19f9360384b222f84 SHA512 87536c564021e63677682f24d794742e20c7ef33ca1fd9ba50bdeeef055a33e72143076ee323319db91f5e6c1cd647965e1b78e33b27715eee8189c084bb8294
diff --git a/dev-python/taskflow/taskflow-4.6.4.ebuild b/dev-python/taskflow/taskflow-5.0.0.ebuild
similarity index 97%
rename from dev-python/taskflow/taskflow-4.6.4.ebuild
rename to dev-python/taskflow/taskflow-5.0.0.ebuild
index e9e80a6d83..c936153be9 100644
--- a/dev-python/taskflow/taskflow-4.6.4.ebuild
+++ b/dev-python/taskflow/taskflow-5.0.0.ebuild
@@ -21,7 +21,6 @@ KEYWORDS="~amd64"
DEPEND="
>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
>=dev-python/networkx-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/timeslot/timeslot-0.1.2.ebuild b/dev-python/timeslot/timeslot-0.1.2.ebuild
index b27215477b..efcd5b8c53 100644
--- a/dev-python/timeslot/timeslot-0.1.2.ebuild
+++ b/dev-python/timeslot/timeslot-0.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/dev-python/types-paramiko/Manifest b/dev-python/types-paramiko/Manifest
index c585fdf3db..da549096fa 100644
--- a/dev-python/types-paramiko/Manifest
+++ b/dev-python/types-paramiko/Manifest
@@ -1 +1,2 @@
DIST types-paramiko-2.10.0.tar.gz 20325 BLAKE2B c918598110ada99b739579d9fd0b968b272e7cb654df2fd24f3fbfa96b9730fab27c6575220b62d2a6680c4cd5c6122594e1d710afcb5cdde2444fcfeb7a77ea SHA512 e376f8fd060f6667c610c53cf42b7dbb38ab19cbc3e8ad68f9a68f982b7498c7e06201e4ff35b662fb0d7a17b24d12a245cdc8f5731cf21cf5c0a14085853fb0
+DIST types-paramiko-2.11.1.tar.gz 20406 BLAKE2B 84ee3c357044711c4252171d018bfc4e1fbedd0cefc7dc17da8a7ea5d215d72ea5ce58d272f0d44f6c5e4be316497833ad3e40800dcd2b1be37a7a8d74742120 SHA512 54c4566342919d9b890ca87ebb07177d31108e5d6f9408ef2939499db950f1a44fab8ab553465a676099c51a61169d6c5b60b3900388af48d675721e4d746f7c
diff --git a/dev-python/types-paramiko/types-paramiko-2.11.1.ebuild b/dev-python/types-paramiko/types-paramiko-2.11.1.ebuild
new file mode 100644
index 0000000000..8b3f480950
--- /dev/null
+++ b/dev-python/types-paramiko/types-paramiko-2.11.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Typing stubs for paramiko"
+HOMEPAGE="
+ https://pypi.org/project/types-paramiko/
+ https://github.com/python/typeshed/tree/master/stubs/paramiko
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-python/cryptography-3.4.4[${PYTHON_USEDEP}]"
diff --git a/dev-python/types-python-dateutil/Manifest b/dev-python/types-python-dateutil/Manifest
index 97b8c5ae9f..0005964193 100644
--- a/dev-python/types-python-dateutil/Manifest
+++ b/dev-python/types-python-dateutil/Manifest
@@ -1,2 +1,2 @@
-DIST types-python-dateutil-2.8.16.tar.gz 6973 BLAKE2B 2e883f73af0e79faf57f8469733ec742b9881e974a253ddd40e80628302ea29a9046a319088d75b9bc47792b0e225fe2c2f376ea4a5d794d710cf7aea7af7af3 SHA512 1d2927c6bd85fa8222c7519d3ac8ae6179da746ebb29ca4e9002ca410131e10445b8ebc2b70bb6df1b3e8ed90098827884bf5f928039d1627ca760c86cdcc113
DIST types-python-dateutil-2.8.17.tar.gz 7018 BLAKE2B 261aa401e656a6524b96fd3c7ccf2cccf1dd8826c5597958ca1dde8b05ea656af7486b8487c57915b679c409befac004294e26a9fe401beefbe07060dfefc352 SHA512 ef33af71fd007175967b436a9115c1ce2defbb2a4d154c153e58ed72286e5090c73c959f3be0498a3613391b3b0519784a47678182d0d685007d386ae3005565
+DIST types-python-dateutil-2.8.18.tar.gz 7078 BLAKE2B 2ee7edf31c8b034a914a6bbad72107670b1fdb884d1c4977d10cabb572dcd5ef55fad533980d583d9cbfbb192a631f01605663587ddc90d0e71e7e7102aad789 SHA512 e1ed05d39940aadf7d748d7f84781506324bf080bf243c39c801543a3e4c91a2ab132bea0efbbfc5d20c90f217a93b93a3f6893a99d03cd0f5cfa87ccfb71a6e
diff --git a/dev-python/types-python-dateutil/types-python-dateutil-2.8.16.ebuild b/dev-python/types-python-dateutil/types-python-dateutil-2.8.18.ebuild
similarity index 100%
rename from dev-python/types-python-dateutil/types-python-dateutil-2.8.16.ebuild
rename to dev-python/types-python-dateutil/types-python-dateutil-2.8.18.ebuild
diff --git a/dev-python/types-pytz/Manifest b/dev-python/types-pytz/Manifest
index 580204ad72..389d100aa9 100644
--- a/dev-python/types-pytz/Manifest
+++ b/dev-python/types-pytz/Manifest
@@ -1 +1,2 @@
DIST types-pytz-2021.3.8.tar.gz 3253 BLAKE2B 873f8126ecaf5055bcd9aa87f8632cee8cf92f7bfe51f0d0df7217af51053f40fe98f18f511db42eefc2d904cf3f1f11b228cf8c6fa15f5afcbc2e8e91f539fe SHA512 5b7dcf5279be55225ec66f9f9cc657cb3ae21acdcd41322a194a8cc6ccd79e60052191cb664378f414172d9f5d92573ab1f3322e9909ecd1e4ed95b36c7630ba
+DIST types-pytz-2022.1.1.tar.gz 3374 BLAKE2B 837fe74a59c960fb8ceab6730bf0adf8d6e20a0c2e916d3736f5a7b9c282fd3606cfe3fdc1de767cc1f52c290088e82a0cee17d1baee122814379be0db9ce8ed SHA512 980972ee68e836b582574ee114a7adbfdaff4c5e7bdcd7499a677e6da25939c280fc34284db688d59a757b4ce96d4305a48f4de422a50b59b19921f53e7f8b6d
diff --git a/dev-python/types-pytz/types-pytz-2022.1.1.ebuild b/dev-python/types-pytz/types-pytz-2022.1.1.ebuild
new file mode 100644
index 0000000000..611ea0a5c5
--- /dev/null
+++ b/dev-python/types-pytz/types-pytz-2022.1.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Typing stubs for pytz"
+HOMEPAGE="
+ https://pypi.org/project/types-pytz/
+ https://github.com/python/typeshed/tree/master/stubs/pytz
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
diff --git a/dev-python/types-requests/Manifest b/dev-python/types-requests/Manifest
index 002128e90c..a90365311a 100644
--- a/dev-python/types-requests/Manifest
+++ b/dev-python/types-requests/Manifest
@@ -1,2 +1,2 @@
-DIST types-requests-2.27.29.tar.gz 11366 BLAKE2B 4791fbcc95bbb16de6aa341afdf7b08d5f147628d3f2bc5b43c512e9df509a8fcdf95ac4f9c7f4f924aa5463040157730b33953a15144afd2d9b4adb7c16e48a SHA512 136acd5d1ae2334ecbe19c2dcac59d2c8d7c567bb5c4a0d15c279bcf61be1abebfb934743d5ad3c2792eaca6c6cc76756e9efa550448a831727de0846548f0a9
DIST types-requests-2.27.30.tar.gz 11473 BLAKE2B 717e3c68b24a7123259f755ffcd427811fc8a45a1eb0c22708ac676f29b55af257c2a8bcdb21b35e019aa9efccd96c38ddc6b0dd1d8321456f8f0117efbdb6d0 SHA512 edebb63b1f5c64604de40462b2acd9cc86839f2e5affcfa0fab91afebf3b0050e4a713cdabb4d12a6f5203eee78637c33e173ba73b9f1b953d94633dc21354a0
+DIST types-requests-2.28.0.tar.gz 11532 BLAKE2B 003869728f26bc64dd9cc755e20ccdd1eba0619aaf8cc3cbc27d6cebd62eb399ff757568624b2ffcf23cfc6dd5972a94b0e0e086a8f196111391e73fa7d2e431 SHA512 7d14642f3d54bc8c9e3f7c678b90a5f22a9464d4e66878783aeb30cb46bb8ff8b32c8db4309e0cd2e1e0fad243320ac3e1905c5e9ab10112856b7cb3e81673e4
diff --git a/dev-python/types-requests/types-requests-2.27.29.ebuild b/dev-python/types-requests/types-requests-2.28.0.ebuild
similarity index 100%
rename from dev-python/types-requests/types-requests-2.27.29.ebuild
rename to dev-python/types-requests/types-requests-2.28.0.ebuild
diff --git a/dev-python/vharfbuzz/Manifest b/dev-python/vharfbuzz/Manifest
index a0c417d00d..d23b7890d1 100644
--- a/dev-python/vharfbuzz/Manifest
+++ b/dev-python/vharfbuzz/Manifest
@@ -1 +1,2 @@
DIST vharfbuzz-0.1.3.gh.tar.gz 9359 BLAKE2B c4d7e2a1a939c59f63008f99cc6cf4ce622adebe493248c3536632051e32fe0e1ca9d48b91273ef3c157afefbfcc0062232d964cba954f1b867d91bbdc16ad41 SHA512 0b2e90da6ba613cbc24bf67d2815d6d2e857463e077410a6c86e4a4d77a734bc6b3ddaf3fbd564d06fcd2295eda13e095da55241cc31c38959703114b0cf56bf
+DIST vharfbuzz-0.1.4.gh.tar.gz 9362 BLAKE2B 6a688990e9a56e6b53cda8d1293681c3e84a888f6052e4eb3e8f62d95b145a465f3b3ed2e20f1cafc0eb3befadc5a23417fcb8d4770c1b3b009eacc985a65ca7 SHA512 0c0cf27238c0d7a763a1c683df3c2ec1d48fc11af0c347a1039d0f957efb91b21c4292d66a3c9dff60dacc1c21e3ace35fa162f262e9f3e50c24048647092a21
diff --git a/dev-python/vharfbuzz/vharfbuzz-0.1.4.ebuild b/dev-python/vharfbuzz/vharfbuzz-0.1.4.ebuild
new file mode 100644
index 0000000000..9cc1e42f64
--- /dev/null
+++ b/dev-python/vharfbuzz/vharfbuzz-0.1.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A user-friendlier way to use Harfbuzz in Python"
+HOMEPAGE="https://github.com/simoncozens/vharfbuzz"
+SRC_URI="https://github.com/simoncozens/vharfbuzz/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="
+ dev-python/fonttools[${PYTHON_USEDEP}]
+ dev-python/uharfbuzz[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+distutils_enable_sphinx docs
diff --git a/dev-util/deblob/deblob-9999.ebuild b/dev-util/deblob/deblob-9999.ebuild
index 0098040e48..e58f82a29f 100644
--- a/dev-util/deblob/deblob-9999.ebuild
+++ b/dev-util/deblob/deblob-9999.ebuild
@@ -19,12 +19,6 @@ DEPEND="
"
RDEPEND=""
-src_compile() {
- default
- mv "${P}" "${PN}" || die
-}
-
src_install() {
- emake install DESTDIR="${D}" PREFIX="/usr"
- einstalldocs
+ PREFIX="/usr" default
}
diff --git a/dev-util/fnm/files/fnm-1.31.0-skip-npm-installing-tests.patch b/dev-util/fnm/files/fnm-1.31.0-skip-npm-installing-tests.patch
new file mode 100644
index 0000000000..4a03b66382
--- /dev/null
+++ b/dev-util/fnm/files/fnm-1.31.0-skip-npm-installing-tests.patch
@@ -0,0 +1,29 @@
+--- a/src/downloader.rs
++++ b/src/downloader.rs
+@@ -149,26 +149,6 @@ mod tests {
+ assert_eq!(result.trim(), "v12.0.0");
+ }
+
+- #[test_log::test]
+- fn test_installing_npm() {
+- let installations_dir = tempdir().unwrap();
+- let npm_path = install_in(installations_dir.path()).join(if cfg!(windows) {
+- "npm.cmd"
+- } else {
+- "npm"
+- });
+-
+- let stdout = duct::cmd(npm_path.to_str().unwrap(), vec!["--version"])
+- .stdout_capture()
+- .run()
+- .expect("Can't run npm")
+- .stdout;
+-
+- let result = String::from_utf8(stdout).expect("Can't read npm output");
+-
+- assert_eq!(result.trim(), "6.9.0");
+- }
+-
+ fn install_in(path: &Path) -> PathBuf {
+ let version = Version::parse("12.0.0").unwrap();
+ let arch = Arch::X64;
diff --git a/dev-util/fnm/files/fnm-1.31.0-tests.patch b/dev-util/fnm/files/fnm-1.31.0-skip-windows-related-tests.patch
similarity index 100%
rename from dev-util/fnm/files/fnm-1.31.0-tests.patch
rename to dev-util/fnm/files/fnm-1.31.0-skip-windows-related-tests.patch
diff --git a/dev-util/fnm/fnm-1.31.0.ebuild b/dev-util/fnm/fnm-1.31.0-r2.ebuild
similarity index 96%
rename from dev-util/fnm/fnm-1.31.0.ebuild
rename to dev-util/fnm/fnm-1.31.0-r2.ebuild
index 0f3e134d49..d09158fa20 100644
--- a/dev-util/fnm/fnm-1.31.0.ebuild
+++ b/dev-util/fnm/fnm-1.31.0-r2.ebuild
@@ -388,8 +388,14 @@ QA_FLAGS_IGNORED="usr/bin/${PN}"
src_prepare() {
eapply "${FILESDIR}/${P}-cargo.patch"
- eapply "${FILESDIR}/${P}-tests.patch"
sed -i "s|@@REQWEST_PATH@@|\"${WORKDIR}/reqwest-${REQWEST_COMMIT}\"|g" "${S}/Cargo.toml" || die "Cannot patch reqwuest cargo dependency"
+
+ # Skip testing against PowerShell and WinCmd
+ eapply "${FILESDIR}/${P}-skip-windows-related-tests.patch"
+
+ # https://bugs.gentoo.org/854366
+ eapply "${FILESDIR}/${P}-skip-npm-installing-tests.patch"
+
default
}
@@ -404,8 +410,8 @@ src_install() {
newins fnm.zsh-completion _fnm
${D}/usr/bin/fnm completions --shell fish > fnm.fish-completion || die "Cannot generate fish completions"
- insinto /usr/share/fish/completion
- newins fnm.fish-completion fnm
+ insinto /usr/share/fish/vendor_completions.d/
+ newins fnm.fish-completion fnm.fish
dodoc CHANGELOG.md README.md
}
diff --git a/dev-vcs/got/Manifest b/dev-vcs/got/Manifest
index 46507c7eaf..17d3b1e2ea 100644
--- a/dev-vcs/got/Manifest
+++ b/dev-vcs/got/Manifest
@@ -1,2 +1,2 @@
-DIST got-portable-0.68.1.tar.gz 699014 BLAKE2B 2dba0b1d7a4a715b3604676874a563338ecd189ce9c9a9a55b6e243c34302237ce192a3930e1be29cd6f968517816fc5703d352c4e50494d327149f63fdfa4e7 SHA512 6a7a66dc95d8b8e94de67f091b7871ba1b1a2c55c640a8b12a2f6cde376c8a7f6a8c8967d6b50fb8fab76bd324fad896145bdfee954936b21685f3a5e66184da
DIST got-portable-0.70.tar.gz 726825 BLAKE2B 63bc71246635fbbc00abd050e2f0f137664fa69cf43def964bc0073732cf89a48182d3bde747f7ec6c77e93f6c5e9b7820d22ba2130f7d4b4857c1f36f20ed8e SHA512 3f4b83964cf26dae717af653213bd698900b604d901bbcc1b382d73a7e6e3601eab233729d0be738cb624a970d2805256fbece5d7669ffb8f7be40fe3eabf8a1
+DIST got-portable-0.71.tar.gz 736740 BLAKE2B f9788490881ae2b32b72139358f8bdd965b6c6c80009385db969d0305b3b5649feb4469048f247fbab1a7dcca1dd557165977af2a302ab31641e19328d1d8e2b SHA512 c48932b981ac6cc784fcc6e64b7d4a492840db43c6f0aec355474400ad3df0ea34620c0d4cf543b3583abb6f3908b6381752a235306b34cf81b00749ae19ada4
diff --git a/dev-vcs/got/got-0.68.1.ebuild b/dev-vcs/got/got-0.71.ebuild
similarity index 100%
rename from dev-vcs/got/got-0.68.1.ebuild
rename to dev-vcs/got/got-0.71.ebuild
diff --git a/eclass/boinc-app.eclass b/eclass/boinc-app.eclass
index 496dbb337d..2b6fc5e40d 100644
--- a/eclass/boinc-app.eclass
+++ b/eclass/boinc-app.eclass
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: boinc-app.eclass
@@ -142,6 +142,21 @@ get_project_root() {
echo "$(get_boincdir)/projects/$(get_project_dirname)"
}
+# @FUNCTION: _boinc-app_fix_permissions
+# @USAGE:
+# @INTERNAL
+# @DESCRIPTION:
+# Fix owner and permissions for the project root.
+_boinc-app_fix_permissions() {
+ local paths=(
+ $(get_boincdir)
+ $(get_boincdir)/projects
+ $(get_project_root)
+ )
+ fowners boinc:boinc "${paths[@]}"
+ fperms 0771 "${paths[@]}"
+}
+
# @FUNCTION: boinc-app_appinfo_prepare
# @USAGE:
# @DESCRIPTION:
@@ -151,7 +166,7 @@ boinc-app_appinfo_prepare() {
debug-print-function ${FUNCNAME} "${@}"]
sed -i "$1" \
- -e "s:%PV%:${PV}:g" \
+ -e "s:@PV@:${PV}:g" \
|| die "app_info.xml sed failed"
}
@@ -176,7 +191,7 @@ boinc-app_appinfo_prepare() {
# doappinfo "${FILESDIR}"/app_info_${PV}.xml
#
# exeinto $(get_project_root)
-# exeopts -m 0755 --owner boinc --group boinc
+# exeopts -m 0755 --owner root --group boinc
# newexe bin/${PN} example_app_v${PV}
# }
# @CODE
@@ -196,9 +211,11 @@ doappinfo() {
( # subshell to avoid pollution of calling environment
insinto $(get_project_root)
- insopts -m 0644 --owner boinc --group boinc
+ insopts -m 0644 --owner root --group boinc
doins "${T}"/app_info.xml
) || die "failed to install app_info.xml"
+
+ _boinc-app_fix_permissions
}
# @FUNCTION: boinc-wrapper_foreach_wrapper_job
@@ -262,11 +279,13 @@ dowrapper() {
( # subshell to avoid pollution of calling environment
insinto $(get_project_root)
- insopts -m 0644 --owner boinc --group boinc
- doins "${T}"/${wrapperjob}
+ insopts -m 0644 --owner root --group boinc
+ doins "${T}/${wrapperjob}"
dosym -r /usr/bin/boinc-wrapper "$(get_project_root)/${wrapperexe}"
) || die "failed to install '${app}' wrapper app"
done
+
+ _boinc-app_fix_permissions
}
# @FUNCTION: boinc-app_pkg_postinst
@@ -276,8 +295,8 @@ dowrapper() {
boinc-app_pkg_postinst() {
debug-print-function ${FUNCNAME} "${@}"]
- if [[ -f "${EROOT}$(get_boincdir)/master_$(get_project_dirname).xml" ]]; then
- if [[ ! ${REPLACING_VERSIONS} ]]; then
+ if [[ -f "${EROOT}/$(get_boincdir)/master_$(get_project_dirname).xml" ]]; then
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
# most likely replacing applications downloaded
# by the BOINC client from project's website
elog "Restart the BOINC daemon for changes to take place:"
@@ -311,18 +330,18 @@ boinc-app_pkg_postinst() {
boinc-app_pkg_postrm() {
debug-print-function ${FUNCNAME} "${@}"]
- if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ if [[ -z ${REPLACED_BY_VERSION} ]]; then
local gui_rpc_auth="$(get_boincdir)/gui_rpc_auth.cfg"
- local passwd=$(cat "${EROOT}${gui_rpc_auth}")
- if [[ ! ${passwd} ]]; then
+ local passwd=$(cat "${EROOT}/${gui_rpc_auth}" 2>/dev/null)
+ if [[ -z ${passwd} ]]; then
passwd="\$(cat ${gui_rpc_auth})"
fi
- elog
elog "You should detach this project from the BOINC client"
elog "to stop current tasks and delete remaining project files:"
elog
elog "$ boinccmd --passwd ${passwd} --project ${BOINC_MASTER_URL} detach"
+ elog
fi
}
diff --git a/eclass/boinc.eclass b/eclass/boinc.eclass
index cf5cd8515f..73aa24fe72 100644
--- a/eclass/boinc.eclass
+++ b/eclass/boinc.eclass
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: boinc.eclass
@@ -34,7 +34,7 @@ esac
if [[ ! ${_BOINC_ECLASS} ]]; then
-inherit autotools toolchain-funcs
+inherit autotools edo toolchain-funcs
fi
@@ -199,8 +199,7 @@ boinc_src_configure() {
boinc_builddir_check
pushd "${BOINC_BUILD_DIR}" >/dev/null || die
- bash ./generate_svn_version.sh || \
- die "generating svn_version.h failed"
+ edo bash ./generate_svn_version.sh
if [[ ${_BOINC_RUN_AUTOTOOLS} ]]; then
econf "${_BOINC_ECONF_ARGS[@]}"
diff --git a/eclass/cannadic.eclass b/eclass/cannadic.eclass
new file mode 100644
index 0000000000..4e8914f399
--- /dev/null
+++ b/eclass/cannadic.eclass
@@ -0,0 +1,149 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: cannadic.eclass
+# @MAINTAINER:
+# Alessandro Barbieri
+# @AUTHOR:
+# Mamoru KOMACHI
+# @SUPPORTED_EAPIS: 8
+# @BLURB: Function for Canna compatible dictionaries
+# @DESCRIPTION:
+# The cannadic eclass is used for installation and setup of Canna
+# compatible dictionaries.
+
+case ${EAPI} in
+ 8) ;;
+ *) die "EAPI=${EAPI:-0} is not supported" ;;
+esac
+
+EXPORT_FUNCTIONS src_install pkg_postinst pkg_postrm
+
+if [[ -z ${_CANNADIC_ECLASS} ]]; then
+_CANNADIC_ECLASS=1
+
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+# You don't need to modify these
+readonly _CANNADIC_CANNA_DIR="/var/lib/canna/dic/canna"
+readonly _CANNADIC_DICS_DIR="/etc/canna/dics.dir.d/"
+
+# @FUNCTION: cannadic-install
+# @DESCRIPTION:
+# Installs dictionaries to ${EPREFIX}/var/lib/canna/dic/canna
+cannadic-install() {
+ insinto ${_CANNADIC_CANNA_DIR}
+ insopts -m 0664 -o canna -g canna
+ doins "${@}"
+}
+
+# @FUNCTION: dicsdir-install
+# @DESCRIPTION:
+# Installs dics.dir from ${DICSDIRFILE}
+dicsdir-install() {
+ insinto ${_CANNADIC_DICS_DIR}
+ doins ${DICSDIRFILE}
+}
+
+# @FUNCTION: cannadic_src_install
+# @DESCRIPTION:
+# Installs all dictionaries under ${WORKDIR}
+# plus dics.dir and docs
+cannadic_src_install() {
+ keepdir ${_CANNADIC_CANNA_DIR}
+ fowners canna:canna ${_CANNADIC_CANNA_DIR}
+ fperms 0775 ${_CANNADIC_CANNA_DIR}
+
+ local f
+ for f in *.c[btl]d *.t; do
+ if [[ -s ${f} ]]; then
+ cannadic-install "${f}"
+ fi
+ done 2> /dev/null
+
+ dicsdir-install
+
+ einstalldocs
+}
+
+# @FUNCTION: update-cannadic-dir
+# @DESCRIPTION:
+# Updates dics.dir for Canna Server, script for this part taken from Debian GNU/Linux
+#
+# compiles dics.dir files for Canna Server
+# Copyright 2001 ISHIKAWA Mutsumi
+# Licensed under the GNU General Public License, version 2. See the file
+# /usr/portage/license/GPL-2 or .
+update-cannadic-dir() {
+ einfo
+ einfo "Updating dics.dir for Canna ..."
+ einfo
+
+ # write new dics.dir file in case we are interrupted
+ cat <<-EOF > "${EROOT}${_CANNADIC_CANNA_DIR}/dics.dir.update-new" || die
+ # dics.dir -- automatically generated file by Portage.
+ # DO NOT EDIT BY HAND.
+ EOF
+
+ local f
+ for f in "${EROOT}${_CANNADIC_DICS_DIR}"/*.dics.dir; do
+ echo "# ${f}" >> "${EROOT}${_CANNADIC_CANNA_DIR}/dics.dir.update-new" || die
+ cat "${f}" >> "${EROOT}${_CANNADIC_CANNA_DIR}/dics.dir.update-new" || die
+ einfo "Added ${f}."
+ done
+
+ mv "${EROOT}${_CANNADIC_CANNA_DIR}/dics.dir.update-new" "${EROOT}${_CANNADIC_CANNA_DIR}/dics.dir" || die
+
+ einfo
+ einfo "Done."
+ einfo
+}
+
+# @FUNCTION: cannadic_pkg_postinst
+# @DESCRIPTION:
+# Updates dics.dir and print out notice after install
+cannadic_pkg_postinst() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ update-cannadic-dir
+
+ einfo "Please restart cannaserver for changes to propagate."
+ einfo "You need to modify your config file (~/.canna) to enable dictionaries."
+
+ if [[ -n ${CANNADICS} ]]; then
+ einfo "e.g) add"
+ einfo
+ einfo " $(IFS=' ' ; echo ${CANNADICS[*]})"
+ einfo
+ einfo "to section use-dictionary()."
+ einfo "For details, see documents under ${EROOT}/usr/share/doc/${PF}."
+ fi
+
+ einfo "If you do not have ~/.canna, you can find sample files in ${EROOT}/usr/share/canna."
+ ewarn "If you are upgrading from existing dictionary, you may need to recreate"
+ ewarn "user dictionary if you have one."
+}
+
+# @FUNCTION: cannadic_pkg_postrm
+# @DESCRIPTION:
+# Updates dics.dir and print out notice after uninstall
+cannadic_pkg_postrm() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ update-cannadic-dir
+
+ einfo "Please restart cannaserver for changes to propagate."
+ einfo "and modify your config file (~/.canna) to disable dictionary."
+
+ if [[ -n ${CANNADICS} ]]; then
+ einfo "e.g) delete"
+ einfo
+ einfo " $(IFS=' ' ; echo ${CANNADICS[*]})"
+ einfo
+ einfo "from section use-dictionary()."
+ fi
+
+ einfo
+}
+
+fi
diff --git a/gui-apps/swaync/Manifest b/gui-apps/swaync/Manifest
index 09acf4972b..d60c977cf2 100644
--- a/gui-apps/swaync/Manifest
+++ b/gui-apps/swaync/Manifest
@@ -1 +1 @@
-DIST swaync-0.6.1.tar.gz 3138806 BLAKE2B 84959d5e12448780ffbfa068799793a373ba70bb4bb3249ac2a7db786dee9eb1031dde068e9c052910e88b61f06e6860b17dd3f0c91192997cee6b0fde14da67 SHA512 68a72a84114f9d6620e3f80218ee5f3142526d2d377de7277fdd005e2523dc7a221910fd6609a1ec6e664bd2fd5692fecdf8fe27fa0614eeaf99836f2373ddd1
+DIST swaync-0.6.3.tar.gz 3141358 BLAKE2B ceedaa93ad84e87c23f6998e9c4b8f172290b4005b3ea816b54230e3720a1f3e58c7f5c28cd2e38051630a362eee5cc55aef86a5f3bc74cfdd395e57591b4246 SHA512 b0e9703ba74395e6c6b88417e9b92351c18d3adb5fe80e18e1514c5b08b4131bfd5b72e1424667b7c78fc08ec3003d57d87d128bccc7f0b043443db829391493
diff --git a/gui-apps/swaync/swaync-0.6.1.ebuild b/gui-apps/swaync/swaync-0.6.3.ebuild
similarity index 100%
rename from gui-apps/swaync/swaync-0.6.1.ebuild
rename to gui-apps/swaync/swaync-0.6.3.ebuild
diff --git a/gui-libs/cubegui/cubegui-4.7.ebuild b/gui-libs/cubegui/cubegui-4.7.ebuild
index f77b38c89c..00067af6a7 100644
--- a/gui-libs/cubegui/cubegui-4.7.ebuild
+++ b/gui-libs/cubegui/cubegui-4.7.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit autotools bash-completion-r1 qmake-utils toolchain-funcs
+inherit bash-completion-r1 qmake-utils toolchain-funcs
DESCRIPTION="CUBE Uniform Behavioral Encoding GUI"
HOMEPAGE="https://www.scalasca.org/scalasca/software/cube-4.x"
@@ -31,15 +31,9 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="app-doc/doxygen[dot]"
-PATCHES=( "${FILESDIR}/${P}-autotroll.patch" )
-
-src_prepare() {
- default
- pushd build-frontend || die
- eautoreconf
- popd || die
- eautoreconf
-}
+PATCHES=(
+ "${FILESDIR}/${P}-custom-compiler.patch"
+)
src_configure() {
tc-export CC CXX FC F77 CPP AR
@@ -106,6 +100,7 @@ src_configure() {
--with-plugin-treeitem-marker
--with-plugin-vampir
--with-qt="$(qt5_get_bindir)"
+ --with-qt-specs="$(qmake5 -query QMAKE_SPEC || die)"
$(use_enable debug)
$(use_with concurrent)
diff --git a/gui-libs/cubegui/files/cubegui-4.7-autotroll.patch b/gui-libs/cubegui/files/cubegui-4.7-autotroll.patch
deleted file mode 100644
index fe3a5f7d0c..0000000000
--- a/gui-libs/cubegui/files/cubegui-4.7-autotroll.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/build-config/m4/autotroll.m4
-+++ b/build-config/m4/autotroll.m4
-@@ -742,29 +742,6 @@
- # | sed -e "s,-lQt,-L${QT_PATH}/../lib -lQt,g"`
- ])
-
-- echo "Adjust Qt libraries list to the cannonical one"
-- # replace list of .so files by the -l libraries
-- AS_IF([ test "x$QT_PATH" != "x" ],
-- [
-- LIBPATH=`echo $QT_PATH | sed "s,/bin,,g"`"/lib"
-- ],
-- [ # in case of standard installation -> path to the libraries is encoded in the path to .so libraries
-- for i in $at_cv_env_QT_LIBS; do
-- _LIBPATH=`echo $i | grep '.so'`
-- AS_IF([ test "x$_LIBPATH" != "x" ], # test if the path has been line .so , other wise try the next one... (for the case of list -l... libraries)
-- [
-- LIBPATH=$(dirname $_LIBPATH)
-- break
-- ])
--
-- done
-- ])
--AS_IF([ test "x$LIBPATH" != "x" ], # perform correction only if one has found .so libraries instead of -lXXXX
--[
-- at_cv_env_QT_LIBS="-L$LIBPATH "`echo $at_cv_env_QT_LIBS | sed "s,.so , ,g;s,.a , ,g;s,$LIBPATH/lib,-l,g;s,$(readlink -m $LIBPATH)/lib,-l,g"`
-- echo "Fixed libraries are: $at_cv_env_QT_LIBS"
--])
-- AC_SUBST([QT_LIBS], [$at_cv_env_QT_LIBS])
-
-
- # Find the Compiler of Qt (Should have been named )
diff --git a/gui-libs/cubegui/files/cubegui-4.7-custom-compiler.patch b/gui-libs/cubegui/files/cubegui-4.7-custom-compiler.patch
new file mode 100644
index 0000000000..ca890e9239
--- /dev/null
+++ b/gui-libs/cubegui/files/cubegui-4.7-custom-compiler.patch
@@ -0,0 +1,304 @@
+--- a/configure
++++ b/configure
+@@ -5042,6 +5042,7 @@
+ fi
+
+
++
+ if test ! -n "$ac_scorep_platform_data_provided" || \
+ test "x${ac_scorep_platform_data_provided}" = "xno"; then :
+
+@@ -6528,17 +6529,137 @@
+
+ QT_CXX=`basename $at_cv_env_QT_CXX`
+
+- case $QT_CXX in #(
+- "g++") :
++ ac_ext=cpp
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler vendor" >&5
++$as_echo_n "checking for C++ compiler vendor... " >&6; }
++if ${ax_cv_cxx_compiler_vendor+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++
++ vendors="
++ intel: __ICC,__ECC,__INTEL_COMPILER
++ ibm: __xlc__,__xlC__,__IBMC__,__IBMCPP__,__ibmxl__clang__,__ibmxl__
++ pathscale: __PATHCC__,__PATHSCALE__
++ clang: __clang__
++ cray: _CRAYC,_CRAYFTN
++ fujitsu: __FUJITSU
++ sdcc: SDCC,__SDCC
++ sx: _SX
++ portland: __PGI
++ flang: __flang__,__PGLLVM__
++ gnu: __GNUC__
++ sun: __SUNPRO_C,__SUNPRO_CC,__SUNPRO_F90,__SUNPRO_F95
++ hp: __HP_cc,__HP_aCC
++ dec: __DECC,__DECCXX,__DECC_VER,__DECCXX_VER
++ borland: __BORLANDC__,__CODEGEARC__,__TURBOC__
++ comeau: __COMO__
++ kai: __KCC
++ lcc: __LCC__
++ sgi: __sgi,sgi
++ microsoft: _MSC_VER
++ metrowerks: __MWERKS__
++ watcom: __WATCOMC__
++ tcc: __TINYC__
++ unknown: UNKNOWN
++ "
++ for ventest in $vendors; do
++ case $ventest in #(
++ *:)
++ vendor=${ventest%:*}
++ continue
++ ;; #(
++ *)
++ vencpp="defined("`echo $ventest | sed 's/,/) || defined(/g'`")"
++ ;;
++ esac
++
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++#if !($vencpp)
++ thisisanerror;
++#endif
++
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_compile "$LINENO"; then :
++ break
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ done
++
++ ax_cv_cxx_compiler_vendor=$vendor
++
++ flang_variants="classic: __PGLLVM__"
++ portland_variants="llvm: __PGLLVM__"
++ eval variants=\"\$${ax_cv_cxx_compiler_vendor}_variants : NONE\"
++ for vartest in $variants; do
++ case $vartest in #(
++ *:)
++ variant=${vartest%:*};
++ continue
++ ;; #(
++ *)
++ varcpp="defined("`echo $vartest | sed 's/,/) && defined(/g'`")"
++ ;;
++ esac
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++#if !($varcpp)
++ thisisanerror;
++#endif
++
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_compile "$LINENO"; then :
++ break
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ done
++ as_fn_append ax_cv_cxx_compiler_vendor ${variant:+/$variant}
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compiler_vendor" >&5
++case "$ax_cv_cxx_compiler_vendor" in #(
++ yes|ok|yes[\ ,]*) :
++ $as_echo "${as__grn}$ax_cv_cxx_compiler_vendor${as__std}" >&6 ;; #(
++ no|failed|unsupported|no[\ ,]*) :
++ $as_echo "${as__red}$ax_cv_cxx_compiler_vendor${as__std}" >&6 ;; #(
++ *) :
++ $as_echo "${as__blu}$ax_cv_cxx_compiler_vendor${as__std}" >&6 ;;
++esac; }
++
++ ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++ case ${ax_cv_cxx_compiler_vendor%/*} in #(
++ gnu) :
+ qt_compiler="gcc" ;; #(
+- "xlC") :
+- qt_compiler="ibm" ;; #(
+- "clang++") :
++ clang) :
+ qt_compiler="clang" ;; #(
+- "icpc") :
++ intel) :
+ qt_compiler="intel" ;; #(
+- "openCC") :
+- qt_compiler="open64" ;; #(
+ *) :
+ as_fn_error $? "Qt compiler \"${QT_CXX}\" is not supported by --with-frontend-compiler-suite." "$LINENO" 5 ;;
+ esac
+--- a/build-frontend/configure
++++ b/build-frontend/configure
+@@ -22090,17 +22090,137 @@
+
+ QT_CXX=`basename $at_cv_env_QT_CXX`
+
+- case $QT_CXX in #(
+- "g++") :
++ ac_ext=cpp
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler vendor" >&5
++$as_echo_n "checking for C++ compiler vendor... " >&6; }
++if ${ax_cv_cxx_compiler_vendor+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++
++ vendors="
++ intel: __ICC,__ECC,__INTEL_COMPILER
++ ibm: __xlc__,__xlC__,__IBMC__,__IBMCPP__,__ibmxl__clang__,__ibmxl__
++ pathscale: __PATHCC__,__PATHSCALE__
++ clang: __clang__
++ cray: _CRAYC,_CRAYFTN
++ fujitsu: __FUJITSU
++ sdcc: SDCC,__SDCC
++ sx: _SX
++ portland: __PGI
++ flang: __flang__,__PGLLVM__
++ gnu: __GNUC__
++ sun: __SUNPRO_C,__SUNPRO_CC,__SUNPRO_F90,__SUNPRO_F95
++ hp: __HP_cc,__HP_aCC
++ dec: __DECC,__DECCXX,__DECC_VER,__DECCXX_VER
++ borland: __BORLANDC__,__CODEGEARC__,__TURBOC__
++ comeau: __COMO__
++ kai: __KCC
++ lcc: __LCC__
++ sgi: __sgi,sgi
++ microsoft: _MSC_VER
++ metrowerks: __MWERKS__
++ watcom: __WATCOMC__
++ tcc: __TINYC__
++ unknown: UNKNOWN
++ "
++ for ventest in $vendors; do
++ case $ventest in #(
++ *:)
++ vendor=${ventest%:*}
++ continue
++ ;; #(
++ *)
++ vencpp="defined("`echo $ventest | sed 's/,/) || defined(/g'`")"
++ ;;
++ esac
++
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++#if !($vencpp)
++ thisisanerror;
++#endif
++
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_compile "$LINENO"; then :
++ break
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ done
++
++ ax_cv_cxx_compiler_vendor=$vendor
++
++ flang_variants="classic: __PGLLVM__"
++ portland_variants="llvm: __PGLLVM__"
++ eval variants=\"\$${ax_cv_cxx_compiler_vendor}_variants : NONE\"
++ for vartest in $variants; do
++ case $vartest in #(
++ *:)
++ variant=${vartest%:*};
++ continue
++ ;; #(
++ *)
++ varcpp="defined("`echo $vartest | sed 's/,/) && defined(/g'`")"
++ ;;
++ esac
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++#if !($varcpp)
++ thisisanerror;
++#endif
++
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_compile "$LINENO"; then :
++ break
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ done
++ as_fn_append ax_cv_cxx_compiler_vendor ${variant:+/$variant}
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compiler_vendor" >&5
++case "$ax_cv_cxx_compiler_vendor" in #(
++ yes|ok|yes[\ ,]*) :
++ $as_echo "${as__grn}$ax_cv_cxx_compiler_vendor${as__std}" >&6 ;; #(
++ no|failed|unsupported|no[\ ,]*) :
++ $as_echo "${as__red}$ax_cv_cxx_compiler_vendor${as__std}" >&6 ;; #(
++ *) :
++ $as_echo "${as__blu}$ax_cv_cxx_compiler_vendor${as__std}" >&6 ;;
++esac; }
++
++ ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++ case ${ax_cv_cxx_compiler_vendor%/*} in #(
++ gnu) :
+ qt_compiler="gcc" ;; #(
+- "xlC") :
+- qt_compiler="ibm" ;; #(
+- "clang++") :
++ clang) :
+ qt_compiler="clang" ;; #(
+- "icpc") :
++ intel) :
+ qt_compiler="intel" ;; #(
+- "openCC") :
+- qt_compiler="open64" ;; #(
+ *) :
+ as_fn_error $? "Qt compiler \"${QT_CXX}\" is not supported by --with-frontend-compiler-suite." "$LINENO" 5 ;;
+ esac
diff --git a/licenses/canfep b/licenses/canfep
new file mode 100644
index 0000000000..382f80114f
--- /dev/null
+++ b/licenses/canfep
@@ -0,0 +1,11 @@
+篏罔
+------
+
+紊с違с障э若絅純筝鐚
+腱鐚c莢篁祉障鐚
+
+---
+
+Gentoo license note: Above terms in Japanese (from 00readme) state:
+- You are allowed to do whatever you want with the program.
+- The author will not take any responsibity for any result.
diff --git a/licenses/shion b/licenses/shion
new file mode 100644
index 0000000000..883b5cb2b4
--- /dev/null
+++ b/licenses/shion
@@ -0,0 +1,12 @@
+This package was debianized by Yoshito Komatsu on
+Thu, 27 Sep 2001 18:36:36 +0900.
+
+It was downloaded from http://web.archive.org/web/20051217013038/http://www.coolbrain.net/shion.html
+
+Upstream Author: lain
+But he is missing. Now I, Yukiharu YABUKI, am going to take over canna-shion dict. It is possbile below Lisense.
+If you have a problem please contact Yukiharu YABUKI
+
+Copyright: 2000 DISTORTION in the SHELL, by lain
+
+ You are free to redistibute it and/or modify it.
diff --git a/media-gfx/zw3d/Manifest b/media-gfx/zw3d/Manifest
index c2c28bcf42..996f78c910 100644
--- a/media-gfx/zw3d/Manifest
+++ b/media-gfx/zw3d/Manifest
@@ -1 +1 @@
-DIST ZW3D-2022-Professional-V1.0_amd64.deb 833573660 BLAKE2B b909085f4e56e76a87ca2f94270bcdf5ce416dad185daf6b966ca894b6bc9b1b67590ef8025b86a5a07902a7f5b20711fc7ba7043195f13cbdf75dcd5e0a09c2 SHA512 c045476c67d6976f826c67aba2ffe1ae2d3c51e5a917c7c16fe37bb74cfad7394877b903f4123509ce1fd0f7b956ae8e8c31445c40d6c7f63bba7be657069f30
+DIST zw3d-2022.0.3.1.deb 830137436 BLAKE2B d2f5976ec8e00ab31f2e34b690b5f8e2c637500ea7a599d2409ebe07db2c36bb1bb0c98b17b3515672dbfe26d9ddf05e36f0f91a5c0a535a7b87ffaaf389fa6b SHA512 fba4aa4b3752895bbc644b77624a1548dbea0449c13f31ded12cb213feec26ba28b205c13b77fa99fce7cf93d082583865d67d12775b94e9e46585b71214f5f0
diff --git a/media-gfx/zw3d/metadata.xml b/media-gfx/zw3d/metadata.xml
index 1fac258f92..174021f959 100644
--- a/media-gfx/zw3d/metadata.xml
+++ b/media-gfx/zw3d/metadata.xml
@@ -1,5 +1,5 @@
-
+
vowstar@gmail.com
diff --git a/media-gfx/zw3d/zw3d-2022.26.00-r1.ebuild b/media-gfx/zw3d/zw3d-2022.0.3.1.ebuild
similarity index 66%
rename from media-gfx/zw3d/zw3d-2022.26.00-r1.ebuild
rename to media-gfx/zw3d/zw3d-2022.0.3.1.ebuild
index 9e849cc8a0..67438eb207 100644
--- a/media-gfx/zw3d/zw3d-2022.26.00-r1.ebuild
+++ b/media-gfx/zw3d/zw3d-2022.0.3.1.ebuild
@@ -8,7 +8,7 @@ inherit unpacker xdg
DESCRIPTION="CAD/CAM software for 3D design and processing"
HOMEPAGE="https://www.zwsoft.cn/product/zw3d/linux"
-SRC_URI="https://download.zwcad.com/zw3d/3d_linux/2022/ZW3D-2022-Professional-V1.0_amd64.deb"
+SRC_URI="https://home-store-packages.uniontech.com/appstore/pool/appstore/c/${MY_PGK_NAME}/${MY_PGK_NAME}_${PV}_amd64.deb -> ${P}.deb"
LICENSE="all-rights-reserved"
SLOT="0"
@@ -19,16 +19,25 @@ RESTRICT="strip mirror bindist"
RDEPEND="
app-arch/bzip2
app-arch/xz-utils
+ app-text/djvu
+ dev-db/sqlite:3
dev-libs/atk
dev-libs/glib:2
dev-libs/libpcre
dev-libs/libxml2
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtprintsupport:5
dev-qt/qtsvg:5
- dev-qt/qtwayland:5
+ media-fonts/noto-cjk
media-gfx/imagemagick
+ media-libs/jbigkit
media-libs/libglvnd
media-libs/libpng
+ media-libs/opencollada
media-libs/tiff
+ net-libs/zeromq
sys-libs/zlib
x11-libs/cairo
x11-libs/gdk-pixbuf:2
@@ -46,7 +55,10 @@ RDEPEND="
DEPEND="${RDEPEND}"
-BDEPEND="dev-util/patchelf"
+BDEPEND="
+ dev-util/bbe
+ dev-util/patchelf
+"
S=${WORKDIR}
@@ -64,10 +76,12 @@ src_install() {
# Use \x7fELF header to separate ELF executables and libraries
[[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue
local RPATH_ROOT="/opt/apps/${MY_PGK_NAME}/files"
- local RPATH_S="${RPATH_ROOT}/:${RPATH_ROOT}/lib/:${RPATH_ROOT}/lib/xlator/:${RPATH_ROOT}/lib/xlator/InterOp/:${RPATH_ROOT}/libqt/:${RPATH_ROOT}/libqt/plugins/designer/:${RPATH_ROOT}/lib3rd/"
+ local RPATH_S="${RPATH_ROOT}/:${RPATH_ROOT}/lib/:${RPATH_ROOT}/lib/xlator/:${RPATH_ROOT}/lib/xlator/InterOp/:${RPATH_ROOT}/libqt/:${RPATH_ROOT}/libqt/plugins/designer/:${RPATH_ROOT}/lib3rd/:/usr/lib64/"
patchelf --set-rpath "${RPATH_S}" "${x}" || \
die "patchelf failed on ${x}"
- patchelf --replace-needed libMagickCore-6.Q16.so.7 libMagickCore-7.Q16.so "${x}" || \
+ # patchelf --replace-needed libMagickCore-6.Q16.so.7 libMagickCore-7.Q16.so "${x}" || \
+ # die "patchelf failed on ${x}"
+ patchelf --replace-needed libjbig.so.0 libjbig.so "${x}" || \
die "patchelf failed on ${x}"
done
popd || die
@@ -88,8 +102,16 @@ sh /opt/apps/${MY_PGK_NAME}/files/zw3drun.sh \$*
ln -s /opt/apps/${MY_PGK_NAME}/zw3d "${S}"/usr/bin/zw3d || die
# Use system libraries
- rm -rf "${S}"/opt/apps/${MY_PGK_NAME}/files/lib3rd/libMagickCore* || die
- rm -rf "${S}"/opt/apps/${MY_PGK_NAME}/files/lib3rd/libjpeg* || die
+ # rm -rf "${S}"/opt/apps/${MY_PGK_NAME}/files/lib3rd/libMagickCore* || die
+ # rm -rf "${S}"/opt/apps/${MY_PGK_NAME}/files/lib3rd/libjpeg* || die
+
+ # Fix coredump while draw 2D sketch due to not find fonts
+ # media-fonts/noto-cjk is required
+ # and should use /usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc
+ local MY_FONT_PATH_OLD="/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc"
+ local MY_FONT_PATH_NEW="//////usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc"
+ bbe -e "s|${MY_FONT_PATH_OLD}|${MY_FONT_PATH_NEW}|" "${S}/opt/apps/${MY_PGK_NAME}/files/lib/libdisp.so" > "${S}/opt/apps/${MY_PGK_NAME}/files/lib/libdisp.so.tmp" && \
+ mv "${S}/opt/apps/${MY_PGK_NAME}/files/lib/libdisp.so.tmp" "${S}/opt/apps/${MY_PGK_NAME}/files/lib/libdisp.so" || die
# Install package and fix permissions
insinto /opt/apps
diff --git a/media-plugins/chrome-widevine/chrome-widevine-88.0.4324.96.ebuild b/media-plugins/chrome-widevine/chrome-widevine-88.0.4324.96.ebuild
index ffb332bb53..941fe7061c 100644
--- a/media-plugins/chrome-widevine/chrome-widevine-88.0.4324.96.ebuild
+++ b/media-plugins/chrome-widevine/chrome-widevine-88.0.4324.96.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/media-sound/nulloy/Manifest b/media-sound/nulloy/Manifest
new file mode 100644
index 0000000000..96d9bfaa24
--- /dev/null
+++ b/media-sound/nulloy/Manifest
@@ -0,0 +1,2 @@
+DIST nulloy-0.9.3.tar.gz 374184 BLAKE2B 49dc31e3e30b89bab62dcdaeea56a71da4a54a19a866df47034708659494aaca3c622c1466a62ffd1d9f6247e14d06eb2d6992d9779c619c6bcf07154ae10731 SHA512 884828a0968c651af770042aade1ed4491e8d8f49c5e7b16df0115841a3883df00f190da6c1478f2eb9ed065ef0372ff7635e2c5d8d32ec5af8b55b00302b0a9
+DIST nulloy-theme-night-v1.0.tar.gz 350556 BLAKE2B dbb9b81c1fce9bcc1da4a99ef0369280770e221b2615e9421f7165d450362d96e180a6460b839d0adc21c16286309cffcefe04dba9e1fe5b31c9df729415c883 SHA512 5e4c43d4a5cb1cb41b23e243d12ade6abc7309136caf69a8e0fa24becab22edf5c9b955e5933e3cb9f104e5cd953f9a46344ad04beb3e08e154725de7c852a70
diff --git a/media-sound/nulloy/files/nulloy.patch b/media-sound/nulloy/files/nulloy.patch
new file mode 100644
index 0000000000..155879b1b3
--- /dev/null
+++ b/media-sound/nulloy/files/nulloy.patch
@@ -0,0 +1,12 @@
+index 4ddee63..5f02c60 100644
+--- a/src/skins/skins.pri
++++ b/src/skins/skins.pri
+@@ -12,7 +12,7 @@ win32 {
+ ZIP_DEL_CMD = 7z d -tzip
+ }
+
+-unix:SKINS = metro silver slim
++unix:SKINS = metro silver slim night
+ win32:SKINS = Metro Silver Slim
+ for(skin, SKINS) {
+ _depends = $$SRC_DIR/skins/$$lower($${skin})/*
diff --git a/media-sound/nulloy/metadata.xml b/media-sound/nulloy/metadata.xml
new file mode 100644
index 0000000000..7e06a7d4b3
--- /dev/null
+++ b/media-sound/nulloy/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ zdanevich.vitaly@ya.ru
+ Vitaly Zdanevich
+
+
+
diff --git a/media-sound/nulloy/nulloy-0.9.3.ebuild b/media-sound/nulloy/nulloy-0.9.3.ebuild
new file mode 100644
index 0000000000..2a8ed1a329
--- /dev/null
+++ b/media-sound/nulloy/nulloy-0.9.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg
+
+DESCRIPTION="Music player with a waveform progress bar (sound visualization like in audio editors)"
+HOMEPAGE="https://nulloy.com"
+
+NAME="nulloy-theme-night-v1.0"
+SRC_URI="https://github.com/nulloy/nulloy/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+ skins? ( https://gitlab.com/vitaly-zdanevich/nulloy-theme-night/-/archive/v1.0/${NAME}.tar.gz )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+skins"
+
+BDEPEND="dev-qt/linguist-tools"
+
+DEPEND="
+ dev-qt/qtcore
+ dev-qt/designer
+ dev-qt/linguist
+ dev-qt/qtscript
+ dev-qt/qtx11extras
+ media-libs/gstreamer
+ media-libs/gst-plugins-base
+ media-plugins/gst-plugins-meta
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ if use skins ; then
+ eapply "${FILESDIR}"/nulloy.patch
+
+ cp -r $WORKDIR/$NAME src/skins/night
+ fi
+
+ default
+}
+
+src_configure() {
+ # Upstream ./configure script does not support specifying an option's
+ # value after an equal sign like in '--prefix="${EPREFIX}/usr"', so we
+ # have to set up all the options ourselves and call the script directly
+ local myconfargs=(
+ $(use skins || echo --no-skins)
+ --no-update-check
+ --no-taglib
+ --gstreamer-tagreader
+ --prefix "${EPREFIX}/usr"
+ --libdir "$(get_libdir)"
+ )
+
+ ./configure "${myconfargs[@]}" || die
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+ einstalldocs
+}
diff --git a/media-sound/nulloy/nulloy-9999.ebuild b/media-sound/nulloy/nulloy-9999.ebuild
new file mode 100644
index 0000000000..4cd2267fd7
--- /dev/null
+++ b/media-sound/nulloy/nulloy-9999.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit git-r3 xdg
+
+DESCRIPTION="Music player with a waveform progress bar (sound visualization like in audio editors)"
+HOMEPAGE="https://nulloy.com"
+
+EGIT_REPO_URI="https://github.com/nulloy/nulloy"
+EGIT_CLONE_TYPE="shallow"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+skins"
+
+BDEPEND="dev-qt/linguist-tools"
+
+DEPEND="
+ dev-qt/qtcore
+ dev-qt/designer
+ dev-qt/linguist
+ dev-qt/qtscript
+ dev-qt/qtx11extras
+ media-libs/gstreamer
+ media-libs/gst-plugins-base
+ media-plugins/gst-plugins-meta
+"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+ git-r3_src_unpack
+
+ if use skins ; then
+ EGIT_REPO_URI=https://gitlab.com/vitaly-zdanevich/nulloy-theme-night.git
+ EGIT_CHECKOUT_DIR=${WORKDIR}/night
+ git-r3_src_unpack
+ fi
+}
+
+src_prepare() {
+ if use skins ; then
+ default
+
+ eapply "${FILESDIR}"/nulloy.patch
+ cp -r $WORKDIR/night src/skins
+ fi
+}
+
+src_configure() {
+ # Upstream ./configure script does not support specifying an option's
+ # value after an equal sign like in '--prefix="${EPREFIX}/usr"', so we
+ # have to set up all the options ourselves and call the script directly
+ local myconfargs=(
+ $(use skins || echo --no-skins)
+ --no-update-check
+ --no-taglib
+ --gstreamer-tagreader
+ --prefix "${EPREFIX}/usr"
+ --libdir "$(get_libdir)"
+ )
+
+ ./configure "${myconfargs[@]}" || die
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+ einstalldocs
+}
diff --git a/media-video/uxplay/Manifest b/media-video/uxplay/Manifest
index f512ec4175..f55a58111e 100644
--- a/media-video/uxplay/Manifest
+++ b/media-video/uxplay/Manifest
@@ -1,2 +1 @@
-DIST uxplay-1.50a.tar.gz 361683 BLAKE2B 096d016e64bf98fab6a9e2d0eb7905e4056ad6580cdc99b675bc85bb490bdc5f1d17fbf9f79ae3144539796f1efb9972e70397d2fe6bb0c77c2551bbe2477fda SHA512 8f25f7bf32e08e4e27fd1d927a154a0e020e021d1a9fb3be5e2cbb5db22de9be408ad98cf073302b2abdcc3f2529b0df175887c537811f148247c9e0fe301a2a
-DIST uxplay-1.52.tar.gz 373262 BLAKE2B 504b5d31cd034d4923079e68c48496629437db9106aa1fab8b50f5a9d7eef1788f93e55adec9b75e00d533b3eab3c8ac7e8da2b8d08b7f5f9c82926e7dfd1d1a SHA512 b95d6a90bf209ea29f91e589d27118550cfb4269a7b155bed7f44f9a4de1d8465047b4bde4d6319281842390501170c52bf27ebde1ea1a5aa48610270279b074
+DIST uxplay-1.54.tar.gz 368601 BLAKE2B 088b1fb088776aa1589a0fac8096f3fb9394f7f78baf54e15d854176adbbfc792527b37fb2b0c580924e142237662e8b25d2203d0b189f22fe679ac18104fe58 SHA512 e5eb194fc37e0d62c4768f80b702c6b47837ccc2ce5535e3c8b59a0976b7ce03795593ac2d9c156ea8414dca3c20e6d9ebe4ff4c347c7ca85b108b71abb65114
diff --git a/media-video/uxplay/uxplay-1.50a.ebuild b/media-video/uxplay/uxplay-1.50a.ebuild
deleted file mode 100644
index 7c9280ff6c..0000000000
--- a/media-video/uxplay/uxplay-1.50a.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="UxPlay"
-MY_PV="${PV}"
-
-inherit cmake
-
-DESCRIPTION="AirPlay Unix mirroring server"
-HOMEPAGE="https://github.com/FDH2/UxPlay"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/FDH2/${MY_PN}.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/FDH2/${MY_PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~x86"
- S="${WORKDIR}/${MY_PN}-${MY_PV}"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+vaapi +zoomfix"
-
-RDEPEND="
- app-pda/libplist
- dev-libs/openssl
- media-libs/gstreamer
- media-libs/gst-plugins-bad
- media-libs/gst-plugins-base
- media-plugins/gst-plugins-libav
- vaapi? ( media-plugins/gst-plugins-vaapi )
- net-dns/avahi[mdnsresponder-compat]
- zoomfix? ( x11-libs/libX11 )
-"
-
-DEPEND="
- ${RDEPEND}
-"
-
-BDEPEND="
- virtual/pkgconfig
-"
-
-src_configure() {
- local mycmakeargs=(
- -DZOOMFIX=$(usex zoomfix ON OFF)
- )
-
- cmake_src_configure
-}
diff --git a/media-video/uxplay/uxplay-1.52.ebuild b/media-video/uxplay/uxplay-1.54.ebuild
similarity index 100%
rename from media-video/uxplay/uxplay-1.52.ebuild
rename to media-video/uxplay/uxplay-1.54.ebuild
diff --git a/net-libs/orcania/Manifest b/net-libs/orcania/Manifest
new file mode 100644
index 0000000000..4c61cf2318
--- /dev/null
+++ b/net-libs/orcania/Manifest
@@ -0,0 +1 @@
+DIST orcania-2.3.0.tar.gz 66940 BLAKE2B 724f998acca244ee047420602249522eaaa3980739d04752addd0f5ec5ee10c70202cdb347e6ea7016b3fe3ac566e064ad2499bd8640ce1e4ad562b31c11e86f SHA512 dfaa67b83569d22d5ceeabc2e7d7ef2a035aa9ac79576ea5bd1425eb8962bef85a54cbfc21ab768e15e2ac874d695b00a477c6ffef544ba5adab31e460e31393
diff --git a/net-libs/orcania/metadata.xml b/net-libs/orcania/metadata.xml
new file mode 100644
index 0000000000..22a506d621
--- /dev/null
+++ b/net-libs/orcania/metadata.xml
@@ -0,0 +1,19 @@
+
+
+
+
+ kurt@kmk-computers.de
+ Kurt Kanzenbach
+
+
+ Library for angharad programs.
+
+ Different functions for different purposes but that can be shared between
+ other projects.
+
+ Basically these are used for other programs in the anghard project.
+
+
+ babelouest/orcania
+
+
diff --git a/net-libs/orcania/orcania-2.3.0.ebuild b/net-libs/orcania/orcania-2.3.0.ebuild
new file mode 100644
index 0000000000..0347150fac
--- /dev/null
+++ b/net-libs/orcania/orcania-2.3.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Library for angharad programs"
+HOMEPAGE="https://github.com/babelouest/orcania/"
+SRC_URI="https://github.com/babelouest/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+RESTRICT="test"
+
+BDEPEND="
+ virtual/pkgconfig
+"
+DEPEND="
+"
+RDEPEND="
+ ${DEPEND}
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_BASE64URL=OFF
+ -DBUILD_ORCANIA_DOCUMENTATION=$(usex doc)
+ )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+ use doc && cmake_build doc
+}
+
+src_install() {
+ use doc && local HTML_DOCS=( doc/html/* )
+ cmake_src_install
+}
diff --git a/net-libs/ulfius/Manifest b/net-libs/ulfius/Manifest
new file mode 100644
index 0000000000..15482fa5c8
--- /dev/null
+++ b/net-libs/ulfius/Manifest
@@ -0,0 +1 @@
+DIST ulfius-2.7.10.tar.gz 419473 BLAKE2B 8241f9e861bbf1e393e81c24453e670adc1923ae959ec4231a1c0b3833a7e85c655b08c771cb3497331a40df4788b6118de005f13d7c5f2df309d8f748276868 SHA512 7ecbaa6cf4329b12c45a9c8d50c7781327a03de2c9226db371b27b7bcba20738e99b2af26fb845fed74b61a9b6867f984dcee70d1addbf3fe40941537be572e1
diff --git a/net-libs/ulfius/metadata.xml b/net-libs/ulfius/metadata.xml
new file mode 100644
index 0000000000..5e9dfd182c
--- /dev/null
+++ b/net-libs/ulfius/metadata.xml
@@ -0,0 +1,27 @@
+
+
+
+
+ kurt@kmk-computers.de
+ Kurt Kanzenbach
+
+
+ Web Framework for REST Applications in C.
+
+ Based on GNU Libmicrohttpd for the backend web server, Jansson for the json
+ manipulation library, and Libcurl for the http/smtp client API.
+
+ Used to facilitate creation of web applications in C programs with a small
+ memory footprint, as in embedded systems applications.
+
+ One can create webservices in HTTP or HTTPS mode, stream data, or implement
+ server websockets.
+
+
+
+ babelouest/ulfius
+
+
diff --git a/net-libs/ulfius/ulfius-2.7.10.ebuild b/net-libs/ulfius/ulfius-2.7.10.ebuild
new file mode 100644
index 0000000000..e5d9c08a27
--- /dev/null
+++ b/net-libs/ulfius/ulfius-2.7.10.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="HTTP Framework for REST Applications in C"
+HOMEPAGE="https://github.com/babelouest/ulfius/"
+SRC_URI="https://github.com/babelouest/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl doc jansson ssl websocket"
+RESTRICT="test"
+
+BDEPEND="
+ virtual/pkgconfig
+"
+DEPEND="
+ curl? ( net-misc/curl )
+ doc? ( app-doc/doxygen )
+ jansson? ( dev-libs/jansson:= )
+ ssl? ( net-libs/gnutls:= )
+ net-libs/libmicrohttpd:=
+ net-libs/orcania
+ sys-libs/zlib
+"
+RDEPEND="
+ ${DEPEND}
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_ULFIUS_DOCUMENTATION=$(usex doc)
+ -DDOWNLOAD_DEPENDENCIES=OFF
+ -DWITH_CURL=$(usex curl)
+ -DWITH_GNUTLS=$(usex ssl)
+ -DWITH_JANSSON=$(usex jansson)
+ -DWITH_WEBSOCKET=$(usex websocket)
+ -DWITH_YDER=OFF
+ )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+ use doc && cmake_build doc
+}
+
+src_install() {
+ use doc && local HTML_DOCS=( doc/html/* )
+ cmake_src_install
+}
diff --git a/net-misc/yacy/files/yacy.confd b/net-misc/yacy/files/yacy.confd
index 8ddd3e6ddc..e076dcb9de 100644
--- a/net-misc/yacy/files/yacy.confd
+++ b/net-misc/yacy/files/yacy.confd
@@ -1,6 +1,5 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
# home-directory
YACY_HOME="/usr/share/yacy"
diff --git a/net-misc/yacy/files/yacy.rc b/net-misc/yacy/files/yacy.rc
index 225cd38db9..045a045c32 100644
--- a/net-misc/yacy/files/yacy.rc
+++ b/net-misc/yacy/files/yacy.rc
@@ -1,7 +1,6 @@
#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
depend() {
need net
diff --git a/net-misc/yacy/yacy-1.924.20210209.10069.ebuild b/net-misc/yacy/yacy-1.924.20210209.10069.ebuild
index 6663b8ccda..14fbd68dd4 100644
--- a/net-misc/yacy/yacy-1.924.20210209.10069.ebuild
+++ b/net-misc/yacy/yacy-1.924.20210209.10069.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/profiles/desc/cubelib_strategy.desc b/profiles/desc/cubelib_strategy.desc
index aec00b964b..9e119c7342 100644
--- a/profiles/desc/cubelib_strategy.desc
+++ b/profiles/desc/cubelib_strategy.desc
@@ -3,7 +3,7 @@
# This file contains descriptions of CUBELIB_STRATEGY USE_EXPAND flags.
-keepall - Set the data loading strategy to keepall
-lastn - Set the data loading strategy to lastn
-manual - Set the data loading strategy to manual
-preload - Set the data loading strategy to preload
+keepall - Set the data loading strategy to: keep all in memory, load on demand
+lastn - Set the data loading strategy to: keep last n rows in memory
+manual - Set the data loading strategy to: manual loading
+preload - Set the data loading strategy to: keep all in memory, preloaded
diff --git a/profiles/license_groups b/profiles/license_groups
index 6d42fee7fc..69efda4dfc 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -1,10 +1,9 @@
GPL-COMPATIBLE GPL-2+-with-Pyinstaller-Bootloader-exception
-MISC-FREE AOM Unicode_Fonts_for_Ancient_Scripts noweb powell sunpro
-FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED @MISC-FREE
+MISC-FREE AOM Unicode_Fonts_for_Ancient_Scripts canfep noweb powell sunpro
OPEN-CONTENT CC-BY-2.0 CC-BY-2.5 CC-BY-3.0 CC-BY-4.0 CC-BY-SA-1.0 CC-BY-SA-2.0 CC-BY-SA-2.5 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0
OPEN-DEFINITION @OPEN-CONTENT FDL-1.1 FDL-1.1+ FDL-1.2 FDL-1.2+ FDL-1.3 FDL-1.3+ Free-Art-1.2 Free-Art-1.3 MirOS OAL-1.0.1 ODC-By-1.0
FREE @FREE-SOFTWARE @OPEN-DEFINITION
-DFSG @FREE lablgtk-examples meschach VOSTROM
+DFSG @FREE lablgtk-examples meschach shion VOSTROM
BINARY-REDISTRIBUTABLE PGP-2 RSAREF
EULA Enpass-EULA excavator-EULA RTCW-ETEULA technic Typora-EULA Warframe-EULA
COPYFREE 0BSD BEER-WARE BSL-1.1 BSD BSD-2 CC0-1.0 Clear-BSD HPND MIT OPENLDAP POSTGRESQL tcltk Unlicense WTFPL ZSH
diff --git a/profiles/package.mask b/profiles/package.mask
index 0afc4127bb..6b10f2dec7 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -65,3 +65,14 @@ net-mail/remail
# Andrew Ammerlaan (2022-06-18)
# depends on non-existent dev-java/guava:20
dev-java/gradle-hashing
+
+# Alessandro Barbieri (2022-06-26)
+# depends on non-existent dev-python/m2r
+# https://github.com/jaysonsantos/python-binary-memcached/issues/249
+dev-python/python-binary-memcached
+
+# Huang Rui (2022-06-27)
+# the version strategy has changed and follows deepin's strategy
+=zw3d/zw3d-2022.26.00
+=zw3d/zw3d-2022.26.00-r1
+
diff --git a/profiles/package.use.mask b/profiles/package.use.mask
index a4539c7165..7f31b8a56e 100644
--- a/profiles/package.use.mask
+++ b/profiles/package.use.mask
@@ -65,3 +65,7 @@ media-libs/skia ffmpeg
# cmake failure
# https://github.com/mfem/mfem/issues/2243
sci-libs/mfem netcdf
+
+# Alessandro Barbieri (2022-06-26)
+# depend on masked dev-python/python-binary-memcached
+dev-python/oslo-cache test
diff --git a/sci-biology/cmdock/cmdock-0.1.4-r1.ebuild b/sci-biology/cmdock/cmdock-0.1.4-r2.ebuild
similarity index 74%
rename from sci-biology/cmdock/cmdock-0.1.4-r1.ebuild
rename to sci-biology/cmdock/cmdock-0.1.4-r2.ebuild
index cf79531ec0..46968da14e 100644
--- a/sci-biology/cmdock/cmdock-0.1.4-r1.ebuild
+++ b/sci-biology/cmdock/cmdock-0.1.4-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} )
BOINC_APP_OPTIONAL="true"
@@ -11,27 +11,32 @@ DOCS_BUILDER="sphinx"
DOCS_AUTODOC=0
DOCS_DIR="docs"
-inherit python-any-r1 boinc-app docs flag-o-matic meson
+inherit python-single-r1 boinc-app docs flag-o-matic meson optfeature
DESCRIPTION="Program for docking ligands to proteins and nucleic acids"
HOMEPAGE="https://gitlab.com/Jukic/cmdock"
SRC_URI="https://gitlab.com/Jukic/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
S="${WORKDIR}/${PN}-v${PV}"
+INSTALL_PREFIX="${EPREFIX}/opt/${P}"
LICENSE="LGPL-3 ZLIB"
SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE="apidoc boinc cpu_flags_x86_sse2"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
- dev-lang/perl
+ ${PYTHON_DEPS}
+ dev-lang/perl:*
boinc? ( sci-misc/boinc-wrapper )
"
-BDEPEND="
+DEPEND="
dev-cpp/eigen:3
dev-cpp/indicators
>=dev-cpp/pcg-cpp-0.98.1_p20210406-r1
dev-libs/cxxopts
+"
+BDEPEND="
doc? ( app-doc/doxygen )
"
@@ -46,8 +51,12 @@ BOINC_APP_HELPTEXT=\
is to attach it to SiDock@home BOINC project."
foreach_wrapper_job() {
- sed -i "$1" \
- -e "s:@PREFIX@:${EPREFIX}/opt/${P}:g" || die
+ sed -e "s:@PREFIX@:${INSTALL_PREFIX}:g" -i "${1}" || die
+}
+
+src_prepare() {
+ default
+ python_fix_shebang "${S}"/bin
}
src_configure() {
@@ -75,19 +84,22 @@ src_compile() {
src_install() {
meson_src_install
+ python_optimize "${ED}"/opt/${P}/
if use boinc; then
doappinfo "${FILESDIR}"/app_info_${PV}.xml
dowrapper ${PN}-boinc-zcp
# install a blank file
+ touch "${T}"/docking_out || die
insinto $(get_project_root)
- insopts --owner boinc --group boinc
- : newins - docking_out.sd
+ insopts -m 0644 --owner root --group boinc
+ doins "${T}"/docking_out
fi
}
pkg_postinst() {
+ optfeature "sdtether.py and sdrmsd.py scripts" "dev-python/numpy sci-chemistry/openbabel[python]"
use boinc && boinc-app_pkg_postinst
}
diff --git a/sci-biology/cmdock/files/app_info_0.1.4.xml b/sci-biology/cmdock/files/app_info_0.1.4.xml
index 85dcdb16a7..923a7b9ac1 100644
--- a/sci-biology/cmdock/files/app_info_0.1.4.xml
+++ b/sci-biology/cmdock/files/app_info_0.1.4.xml
@@ -5,32 +5,35 @@
- cmdock-boinc-zcp_wrapper_0.1.4
+ cmdock-boinc-zcp_wrapper_@PV@
+
- cmdock-boinc-zcp_job_0.1.4.xml
+ cmdock-boinc-zcp_job_@PV@.xml
+
docking_out.sd
+
cmdock-boinc-zcp
200
- cmdock-boinc-zcp_wrapper_0.1.4
+ cmdock-boinc-zcp_wrapper_@PV@
- cmdock-boinc-zcp_job_0.1.4.xml
+ cmdock-boinc-zcp_job_@PV@.xml
job.xml
- docking_out.sd
- docking_out.sd
+ docking_out
+ docking_out
diff --git a/sci-biology/geneathome/files/app_info.xml b/sci-biology/geneathome/files/app_info.xml
index 43b80156bf..731faf57d2 100644
--- a/sci-biology/geneathome/files/app_info.xml
+++ b/sci-biology/geneathome/files/app_info.xml
@@ -5,7 +5,8 @@
- gene_pcim_v1.10
+ gene_pcim_v@PV@
+
@@ -13,7 +14,7 @@
gene_pcim
110
- gene_pcim_v1.10
+ gene_pcim_v@PV@
diff --git a/sci-biology/geneathome/geneathome-1.10-r3.ebuild b/sci-biology/geneathome/geneathome-1.10-r3.ebuild
index 383549d5d1..c25cf87550 100644
--- a/sci-biology/geneathome/geneathome-1.10-r3.ebuild
+++ b/sci-biology/geneathome/geneathome-1.10-r3.ebuild
@@ -55,6 +55,6 @@ src_install() {
doappinfo "${FILESDIR}"/app_info.xml
exeinto $(get_project_root)
- exeopts -m 0755 --owner boinc --group boinc
+ exeopts -m 0755 --owner root --group boinc
newexe bin/pc "gene_pcim_v${PV}"
}
diff --git a/sci-libs/ButterflyPACK/ButterflyPACK-2.1.1.ebuild b/sci-libs/ButterflyPACK/ButterflyPACK-2.1.1-r1.ebuild
similarity index 95%
rename from sci-libs/ButterflyPACK/ButterflyPACK-2.1.1.ebuild
rename to sci-libs/ButterflyPACK/ButterflyPACK-2.1.1-r1.ebuild
index fc3c26b5f2..a56e663f35 100644
--- a/sci-libs/ButterflyPACK/ButterflyPACK-2.1.1.ebuild
+++ b/sci-libs/ButterflyPACK/ButterflyPACK-2.1.1-r1.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
virtual/lapack
virtual/mpi
- arpack? ( sci-libs/arpack )
+ arpack? ( sci-libs/arpack[mpi] )
magma? ( sci-libs/magma )
"
DEPEND="${RDEPEND}"
@@ -33,7 +33,7 @@ src_configure() {
local mycmakeargs=(
-DBUILD_SHARED_LIBS=ON
)
- use arpack && mycmakeargs+=( "-DTPL_ARPACK_LIBRARIES=$(${pkgc} --libs arpack)" )
+ use arpack && mycmakeargs+=( "-DTPL_ARPACK_LIBRARIES=$(${pkgc} --libs parpack)" )
use magma && mycmakeargs+=( "-DTPL_MAGMA_LIBRARIES=$(${pkgc} --libs magma)" )
cmake_src_configure
}
diff --git a/sci-libs/CombBLAS/CombBLAS-1.16.0_p20220331-r1.ebuild b/sci-libs/CombBLAS/CombBLAS-1.16.0_p20220331-r2.ebuild
similarity index 95%
rename from sci-libs/CombBLAS/CombBLAS-1.16.0_p20220331-r1.ebuild
rename to sci-libs/CombBLAS/CombBLAS-1.16.0_p20220331-r2.ebuild
index a27963ccc9..e542ba1022 100644
--- a/sci-libs/CombBLAS/CombBLAS-1.16.0_p20220331-r1.ebuild
+++ b/sci-libs/CombBLAS/CombBLAS-1.16.0_p20220331-r2.ebuild
@@ -44,7 +44,7 @@ src_prepare() {
src_install() {
cmake_src_install
dodoc README.md FAQ.md CombBLASbinaryIO.docx
- insinto "/usr/include/CombBLAS"
+ insinto "/usr/include/CombBLAS/BipartiteMatchings"
doins Applications/BipartiteMatchings/*.h
insinto "/usr/share/octave/site/m/${PN}"
doins -r Matlab/*
diff --git a/sci-libs/CombBLAS/Manifest b/sci-libs/CombBLAS/Manifest
index bb7f1cc0f7..a6ddcef4bb 100644
--- a/sci-libs/CombBLAS/Manifest
+++ b/sci-libs/CombBLAS/Manifest
@@ -1 +1 @@
-DIST CombBLAS-1.16.0_p20220331-r1.tar.gz 43783582 BLAKE2B b80e871a21832b2210642bacddeef0c5447cee1e46be3aab2accaaddd393bc0fc05c6d7505a154d303dc3449ec5772d789300b6a78dd97e8119739495aba642f SHA512 5cb6156ab0d8a3fa9c13b9599d2e2bd3f6d3a1fd81f101cf2cadbe72d4b3bcd35013687835549f98fef3ea8e371e562ac55d2f4aa91720a0ef1bdf6da3a97640
+DIST CombBLAS-1.16.0_p20220331-r2.tar.gz 43783582 BLAKE2B b80e871a21832b2210642bacddeef0c5447cee1e46be3aab2accaaddd393bc0fc05c6d7505a154d303dc3449ec5772d789300b6a78dd97e8119739495aba642f SHA512 5cb6156ab0d8a3fa9c13b9599d2e2bd3f6d3a1fd81f101cf2cadbe72d4b3bcd35013687835549f98fef3ea8e371e562ac55d2f4aa91720a0ef1bdf6da3a97640
diff --git a/sci-libs/STRUMPACK/STRUMPACK-6.3.1.ebuild b/sci-libs/STRUMPACK/STRUMPACK-6.3.1-r1.ebuild
similarity index 58%
rename from sci-libs/STRUMPACK/STRUMPACK-6.3.1.ebuild
rename to sci-libs/STRUMPACK/STRUMPACK-6.3.1-r1.ebuild
index 4039698f39..742f7fc410 100644
--- a/sci-libs/STRUMPACK/STRUMPACK-6.3.1.ebuild
+++ b/sci-libs/STRUMPACK/STRUMPACK-6.3.1-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit cmake fortran-2
+inherit cmake flag-o-matic fortran-2
DESCRIPTION="Structured Matrix Package (LBNL)"
HOMEPAGE="https://github.com/pghysels/STRUMPACK"
@@ -12,19 +12,24 @@ SRC_URI="https://github.com/pghysels/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${
KEYWORDS="~amd64"
LICENSE="BSD"
SLOT="0"
-IUSE="+butterflypack combblas count-flops +hip message-counters metis +mpi +openmp +scotch papi task-timers +zfp" # +cuda +slate +ptscotch +magma matlab
+IUSE="+butterflypack combblas count-flops +hip message-counter metis +mpi +openmp +scotch papi task-timers +zfp" # +cuda +slate +ptscotch +magma matlab
RDEPEND="
- butterflypack? ( sci-libs/ButterflyPACK )
+ butterflypack? ( sci-libs/ButterflyPACK )
+ combblas? ( sci-libs/CombBLAS )
hip? (
- sci-libs/hipBLAS
- sci-libs/rocBLAS
- sci-libs/rocSOLVER
+ dev-util/hip:=
+ sci-libs/hipBLAS:=
+ sci-libs/rocBLAS:=
+ sci-libs/rocSOLVER:=
)
metis? ( sci-libs/parmetis )
- mpi? ( virtual/mpi )
+ mpi? (
+ sci-libs/scalapack
+ virtual/mpi
+ )
papi? ( dev-libs/papi )
- scotch? ( sci-libs/scotch )
+ scotch? ( sci-libs/scotch:= )
zfp? ( dev-libs/zfp )
sci-libs/metis
@@ -45,14 +50,24 @@ REQUIRED_USE="
# magma? ( cuda )
DOCS=( README.md CHANGELOG SUPPORT )
+src_prepare() {
+ sed \
+ -e "s|LIBRARY DESTINATION lib|LIBRARY DESTINATION $(get_libdir)|g" \
+ -e "s|lib/cmake|$(get_libdir)/cmake|g" \
+ -i CMakeLists.txt \
+ || die
+ cmake_src_prepare
+}
+
src_configure() {
+ use combblas && append-cppflags '-I/usr/include/CombBLAS'
local mycmakeargs=(
-DTPL_ENABLE_MAGMA=NO
-DTPL_ENABLE_PTSCOTCH=NO
-DTPL_ENABLE_SLATE=NO
-DSTRUMPACK_COUNT_FLOPS=$(usex count-flops)
- -DSTRUMPACK_MESSAGE_COUNTERS=$(usex message-counters)
+ -DSTRUMPACK_MESSAGE_COUNTER=$(usex message-counter)
-DSTRUMPACK_TASK_TIMERS=$(usex task-timers)
-DSTRUMPACK_USE_HIP=$(usex hip)
-DSTRUMPACK_USE_MPI=$(usex mpi)
@@ -64,5 +79,10 @@ src_configure() {
-DTPL_ENABLE_SCOTCH=$(usex scotch)
-DTPL_ENABLE_ZFP=$(usex zfp)
)
+ if use hip; then
+ addpredict /dev/kfd
+ mycmakeargs+=( "-DHIP_ROOT_DIR=${EPREFIX}/usr" )
+ fi
+ use scotch && mycmakeargs+=( "-DSCOTCH_INCLUDE_DIR=${EPREFIX}/usr/include/scotch" )
cmake_src_configure
}
diff --git a/sci-libs/STRUMPACK/metadata.xml b/sci-libs/STRUMPACK/metadata.xml
index 48656f88c3..6db77609c4 100644
--- a/sci-libs/STRUMPACK/metadata.xml
+++ b/sci-libs/STRUMPACK/metadata.xml
@@ -19,7 +19,7 @@ The HODLR and Butterfly functionality in STRUMPACK is implemented through interf
Use CombBLAS for weighted matching
Build with flop counters
Use HIP for AMD or NVIDIA GPU acceleration
- Build with counter for MPI messages
+ Build with counter for MPI messages
Build with support for ParMetis
Build with support for PAPI monitoring
Build with support for Scotch
diff --git a/sys-cluster/scorep/scorep-7.1.ebuild b/sys-cluster/scorep/scorep-7.1.ebuild
index 06d0411e2b..6ac68d9607 100644
--- a/sys-cluster/scorep/scorep-7.1.ebuild
+++ b/sys-cluster/scorep/scorep-7.1.ebuild
@@ -7,7 +7,7 @@ FORTRAN_NEED_OPENMP=1
FORTRAN_STANDARD=90
LLVM_MAX_SLOT=14
-inherit autotools llvm fortran-2 toolchain-funcs
+inherit llvm fortran-2 toolchain-funcs
DESCRIPTION="Scalable Performance Measurement Infrastructure for Parallel Codes"
HOMEPAGE="https://www.vi-hps.org/projects/score-p"
@@ -57,6 +57,8 @@ pkg_setup() {
src_prepare() {
tc-export CC CXX FC F77 CPP AR
+ # eautoreconf will need custom autotools
+ sed -e "s|CC=gcc|CC=${CC}|g" -i build-score/configure || die
rm build-config/common/platforms/platform-* || die
cat > build-config/common/platforms/platform-backend-user-provided <<-EOF || die
@@ -113,7 +115,6 @@ src_prepare() {
rm -r vendor || die
default
- eautoreconf
}
src_configure() {
diff --git a/sys-devel/qbe/qbe-1.0.ebuild b/sys-devel/qbe/qbe-1.0-r1.ebuild
similarity index 75%
rename from sys-devel/qbe/qbe-1.0.ebuild
rename to sys-devel/qbe/qbe-1.0-r1.ebuild
index 3013cbf73f..28dcf87653 100644
--- a/sys-devel/qbe/qbe-1.0.ebuild
+++ b/sys-devel/qbe/qbe-1.0-r1.ebuild
@@ -17,6 +17,13 @@ HOMEPAGE="https://c9x.me/compile/"
LICENSE="MIT"
SLOT="0"
-src_install() {
- PREFIX=/usr default
+DOCS=( README doc )
+
+src_compile() {
+ emake CFLAGS="-std=c99 ${CPPFLAGS} ${CFLAGS}"
+}
+
+src_install() {
+ einstalldocs
+ emake install DESTDIR="${ED}" PREFIX=/usr
}
diff --git a/sys-devel/qbe/qbe-9999.ebuild b/sys-devel/qbe/qbe-9999.ebuild
index 3013cbf73f..28dcf87653 100644
--- a/sys-devel/qbe/qbe-9999.ebuild
+++ b/sys-devel/qbe/qbe-9999.ebuild
@@ -17,6 +17,13 @@ HOMEPAGE="https://c9x.me/compile/"
LICENSE="MIT"
SLOT="0"
-src_install() {
- PREFIX=/usr default
+DOCS=( README doc )
+
+src_compile() {
+ emake CFLAGS="-std=c99 ${CPPFLAGS} ${CFLAGS}"
+}
+
+src_install() {
+ einstalldocs
+ emake install DESTDIR="${ED}" PREFIX=/usr
}
diff --git a/sys-power/geopmd/geopmd-2.0.0_rc1.ebuild b/sys-power/geopmd/geopmd-2.0.0_rc1.ebuild
index 40be58d30a..a367100ef6 100644
--- a/sys-power/geopmd/geopmd-2.0.0_rc1.ebuild
+++ b/sys-power/geopmd/geopmd-2.0.0_rc1.ebuild
@@ -38,6 +38,7 @@ BDEPEND="
doc? (
dev-python/sphinx
dev-python/sphinx_rtd_theme
+ dev-python/sphinxemoji
)
"
diff --git a/x11-terms/mlterm-canna/Manifest b/x11-terms/mlterm-canna/Manifest
new file mode 100644
index 0000000000..73fcc9de77
--- /dev/null
+++ b/x11-terms/mlterm-canna/Manifest
@@ -0,0 +1 @@
+DIST mlterm-3.9.2.tar.gz 4259208 BLAKE2B 161d496326abd58e8dabedd4c49e0e17ade77956fd0be6f450d5adf2953fe04a2c62a40d3694296d12cdea1274410e17a64cc62f88b953d894cce216425b29f3 SHA512 3076dafbc98a01738d88acf0e0f52e15d33862b3e9b7a851a4496f1be07ee9e51103daf7842954bcae1f1ba62bd6645b0bd60af7f66ee98721bdf3786b9fcbaf
diff --git a/x11-terms/mlterm-canna/metadata.xml b/x11-terms/mlterm-canna/metadata.xml
new file mode 100644
index 0000000000..a489205566
--- /dev/null
+++ b/x11-terms/mlterm-canna/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ co-maintainers welcome
+ Alessandro Barbieri
+ lssndrbarbieri@gmail.com
+
+
+ mlterm
+
+
diff --git a/x11-terms/mlterm-canna/mlterm-canna-3.9.2.ebuild b/x11-terms/mlterm-canna/mlterm-canna-3.9.2.ebuild
new file mode 100644
index 0000000000..8f05bab497
--- /dev/null
+++ b/x11-terms/mlterm-canna/mlterm-canna-3.9.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MYPN="mlterm"
+MYP="${MYPN}-${PV}"
+
+DESCRIPTION="canna plugin for mlterm"
+HOMEPAGE="http://mlterm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${MYPN}/${MYP}.tar.gz"
+S="${WORKDIR}/${MYP}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="app-i18n/canna"
+RDEPEND="
+ ${DEPEND}
+ ~x11-terms/mlterm-${PV}
+"
+
+src_configure() {
+ local myconf=(
+ --disable-brlapi
+ --disable-debug
+ --disable-fcitx
+ --disable-fribidi
+ --disable-ibus
+ --disable-m17nlib
+ --disable-nls
+ --disable-optimize-redrawing
+ --disable-otl
+ --disable-scim
+ --disable-skk
+ --disable-ssh2
+ --disable-static
+ --disable-uim
+ --disable-vt52
+ --disable-wnn
+ --enable-canna
+ --with-gui=console
+ --without-gtk
+ --without-type-engines
+ --without-utmp
+ --without-x
+ )
+
+ addpredict /dev/ptmx
+ econf "${myconf[@]}"
+}
+
+src_compile() {
+ pushd baselib/src || die
+ emake collect-headers libpobl.la
+ popd || die
+ pushd encodefilter/src || die
+ emake collect-headers
+ popd || die
+ pushd inputmethod/canna || die
+ emake
+}
+
+src_test() {
+ :
+}
+
+src_install() {
+ pushd inputmethod/canna || die
+ DESTDIR="${D}" emake install
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/x11-themes/phinger-xcursors/Manifest b/x11-themes/phinger-xcursors/Manifest
new file mode 100644
index 0000000000..e7a7193dac
--- /dev/null
+++ b/x11-themes/phinger-xcursors/Manifest
@@ -0,0 +1 @@
+DIST phinger-xcursors-1.1.tar.bz2 943817 BLAKE2B d56b88e65aaa7f689a94f0d2cfdb644db89694dc483720047973106a6f76e7e49dab17fa895646d78eaafda55ed01fba129bd7016f4ae0e0414c861270289296 SHA512 437d67a77f0abfda65e974b3a63f6452078f3ae86f3fe63d0069ad456922e6244cb6ec57f5cdcddf7c03e96e43349c3774c157c35efd6c7a2e16a84a7dbc6480
diff --git a/x11-themes/phinger-xcursors/metadata.xml b/x11-themes/phinger-xcursors/metadata.xml
new file mode 100644
index 0000000000..312ec52626
--- /dev/null
+++ b/x11-themes/phinger-xcursors/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ alexey@zapparov.com
+ Alexey Zapparov
+
+
+ https://github.com/phisch/phinger-cursors/issues
+ phisch/phinger-cursors
+
+
diff --git a/x11-themes/phinger-xcursors/phinger-xcursors-1.1.ebuild b/x11-themes/phinger-xcursors/phinger-xcursors-1.1.ebuild
new file mode 100644
index 0000000000..d6faf09b3b
--- /dev/null
+++ b/x11-themes/phinger-xcursors/phinger-xcursors-1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Most likely the most over engineered cursor theme"
+HOMEPAGE="https://github.com/phisch/phinger-cursors"
+SRC_URI="https://github.com/phisch/phinger-cursors/releases/download/v${PV}/phinger-cursors-variants.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="x11-libs/libXcursor"
+
+S="${WORKDIR}"
+
+src_install() {
+ insinto /usr/share/cursors/xorg-x11/Phinger
+ doins -r phinger-cursors/*
+
+ insinto /usr/share/cursors/xorg-x11/Phinger-Light
+ doins -r phinger-cursors-light/*
+}