gentoo resync : 24.07.2021

3 files changed, 34 insertions, 31 deletions

diff --git a/app-i18n/dbskkd-cdb/Manifest b/app-i18n/dbskkd-cdb/Manifest
index d7554b35406d..226afd331083 100644
--- a/app-i18n/dbskkd-cdb/Manifest
+++ b/app-i18n/dbskkd-cdb/Manifest
@@ -2,6 +2,6 @@ AUX dbskkd-cdb-gentoo.patch 505 BLAKE2B c97ca86f77514ee8a887a2091449a44aa20180c4
 AUX dbskkd-cdb.xinetd 239 BLAKE2B 46b6b7bafff05f00ea2d1e6420cf443e490e2692ec96065b25c14e41ca7adfbec80d3d9a2dbbe5c848c81a6da7da0a19a2815ef4af5320e2a4a91539abbe1e39 SHA512 a7efd15b7676b857b2adcc23df023f5af8d29a7357b77ab3fcb494fe6cbd401b28caf51f4f3ded5432bed0a3f1d29b0cc65148f3a8e083ebce70a0aca0437915
 DIST dbskkd-cdb-2.00.tar.gz 9296 BLAKE2B d863e2a05cdcf9c8c030c2e3cc2a46a22f5bb01d844ee5120d686a672952ff2609f994fe8a4915daa5b293357f3da87cc9f702f7307dc162a20ffd0a7d47f804 SHA512 3582728d2a1917c00437b273208fa150a5a32dcd462752c6751ddbd574ca7f1476b2aca0d2613471a800bd17f80e2c4b60846f9056ae621996f8f5a5592fa22a
 DIST dbskkd-cdb-3.00.tar.gz 9380 BLAKE2B 81b167485a0ac287c01a5cab2fc638d4303bb8e1529dfc14b89ba8242915de38165acba5d0df00714bf8b1c5b190b3cf655e654e96bae5081bd3fba1f71e7a6a SHA512 a3fe5a0f2e96828d22a75e4daf36eecaa8d903efe8c8a5f6972178f52dc01cac5df5f3e1d8a2cf684d6b78a9c10c207b655a296ceb456dec9f0e502142de094b
-EBUILD dbskkd-cdb-2.00.ebuild 1225 BLAKE2B a4d0f6a2475aea89ab4db9ab852592e18ee4aab70f171e04cd2431ce46d018fd4e5ae5d271908b0b69c68f4957da27ff7a6b48f6dbc58ce12ea65652d57a1780 SHA512 89a38d92e9573336aca31c3e0f2cca6398d864c1790703aa5691ac8c10cc9260603dcb192863c9fbeaeacc1618ff0163c1ea8c037f3e82155553025956a7d6ed
-EBUILD dbskkd-cdb-3.00.ebuild 1179 BLAKE2B 71aa41006a1b373cc292a17352dd40ef23f440af34ec3471086e97331de0c98b520b4beab2f62b0198f56641ca0178bd29500fab882cb714dd8d0cc063f4e819 SHA512 84b38add6d9befc6280e1cdb6265a54902b505b939e4c9c39d41bbfa131934a9d7c30edac39c7a65faaf5fdb2ee0a150a419647c36d2aa6277f5480eef4dba2d
+EBUILD dbskkd-cdb-2.00-r1.ebuild 1205 BLAKE2B e36202358b631f98731dc6283e54312f2c4e35929ac09c26c6082f338520f13c4415130fc0e6e03e536774add50ed009b1296db98279e314af6a4462b61099c4 SHA512 3d04cd19f93f57c2bb00de464a3efcde1ef5df7837591d0ebbcb37f623c911d2757b0fa659e472e00be3d7be7ac8aca44b11f593f14b84fecd92e7a267144511
+EBUILD dbskkd-cdb-3.00-r1.ebuild 1184 BLAKE2B 392a88be4e1b91813ccd5f1d0ca58cab1f4aa6bbbb5729be89f67e21ad66024dee07c9c6ad8363018ac3ac1a2ad93aa02561f553660edaca9c40d27f31115a38 SHA512 d4ab6e7d5a12e65ecd005717542bf163bdf23424d7eb46e08efc8abf160efec4bbbe47eb075f42eacc113df30f66a6f0940bf83468e36a3b97d8c17925939c9c
 MISC metadata.xml 326 BLAKE2B 5471d3951565efeb1d626e1189d835e9c70ec80fe1a877698380019aae8ba8ed9e48ae9d1eb4f70ae9386162dd3fd5f402a764291c22ec6f6ae9893ed5f15c80 SHA512 56d019cc1f6e39d358e431b910f36dced992bb1f202bf7ef405979633383301751e853e19eaaaa84408a71699bcf63480575a081a5981a49022a0fc0d32cda2f
diff --git a/app-i18n/dbskkd-cdb/dbskkd-cdb-2.00.ebuild b/app-i18n/dbskkd-cdb/dbskkd-cdb-2.00-r1.ebuild
index a1acbae2b9ab..f63e8826adc0 100644
--- a/app-i18n/dbskkd-cdb/dbskkd-cdb-2.00.ebuild
+++ b/app-i18n/dbskkd-cdb/dbskkd-cdb-2.00-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit flag-o-matic toolchain-funcs user
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="SKK dictionary server based on cdb"
 HOMEPAGE="https://github.com/jj1bdx/dbskkd-cdb"
@@ -12,21 +12,21 @@ SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.go
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
 DEPEND="|| (
 		dev-db/tinycdb
 		dev-db/cdb
-	)"
-RDEPEND="app-i18n/skk-jisyo[cdb]
-	sys-apps/xinetd"
+	)
+"
 
-PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
-DOCS="CHANGES README* *.txt"
+RDEPEND="
+	acct-group/dbskkd
+	acct-user/dbskkd
+	app-i18n/skk-jisyo[cdb]
+	sys-apps/xinetd
+"
 
-pkg_setup() {
-	enewuser dbskkd -1 -1 -1
-}
+PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
 
 src_prepare() {
 	default
@@ -53,9 +53,10 @@ src_compile() {
 
 src_install() {
 	exeinto /usr/libexec
-	doexe ${PN}
+	doexe dbskkd-cdb
+	dodoc *.txt
 	einstalldocs
 
 	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/${PN}.xinetd ${PN}
+	newins "${FILESDIR}"/dbskkd-cdb.xinetd dbskkd-cdb
 }
diff --git a/app-i18n/dbskkd-cdb/dbskkd-cdb-3.00.ebuild b/app-i18n/dbskkd-cdb/dbskkd-cdb-3.00-r1.ebuild
index d8cb4b874391..6280316c12af 100644
--- a/app-i18n/dbskkd-cdb/dbskkd-cdb-3.00.ebuild
+++ b/app-i18n/dbskkd-cdb/dbskkd-cdb-3.00-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit flag-o-matic toolchain-funcs user
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="SKK dictionary server based on cdb"
 HOMEPAGE="https://github.com/jj1bdx/dbskkd-cdb"
@@ -12,21 +12,22 @@ SRC_URI="https://github.com/jj1bdx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
-DEPEND="|| (
+DEPEND="
+	|| (
 		dev-db/tinycdb
 		dev-db/cdb
-	)"
-RDEPEND="app-i18n/skk-jisyo[cdb]
-	sys-apps/xinetd"
+	)
+"
 
-PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
-DOCS="*.md"
+RDEPEND="
+	acct-group/dbskkd
+	acct-user/dbskkd
+	app-i18n/skk-jisyo[cdb]
+	sys-apps/xinetd
+"
 
-pkg_setup() {
-	enewuser dbskkd -1 -1 -1
-}
+PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
 
 src_prepare() {
 	default
@@ -53,9 +54,10 @@ src_compile() {
 
 src_install() {
 	exeinto /usr/libexec
-	doexe ${PN}
+	doexe dbskkd-cdb
+	dodoc examples.md
 	einstalldocs
 
 	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/${PN}.xinetd ${PN}
+	newins "${FILESDIR}"/dbskkd-cdb.xinetd dbskkd-cdb
 }