app-i18n/skk-jisyo: fix build with dev-db/cdb

Gentoo-Bug: 591376

Package-Manager: portage-2.2.28

diff --git a/app-i18n/skk-jisyo/skk-jisyo-201605.ebuild b/app-i18n/skk-jisyo/skk-jisyo-201605.ebuild
index 119fba78fa31f118691513b82a1bbc1e53e2dc61..943b3a5c1c67857ce44dcc59b452e6b64ec0a667 100644 (file)
--- a/app-i18n/skk-jisyo/skk-jisyo-201605.ebuild
+++ b/app-i18n/skk-jisyo/skk-jisyo-201605.ebuild
@@ -33,11 +33,19 @@ src_prepare() {
        eapply_user
 }
 
+cdb_make() {
+       cdbmake "${1}" "${1}.tmp"
+}
+
+tinycdb_make() {
+       cdb -c "${1}"
+}
+
 src_compile() {
        if use cdb; then
-               local cdbmake="cdbmake" f
+               local cdbmake=cdb_make f
                if has_version dev-db/tinycdb; then
-                       cdbmake="cdb -c"
+                       cdbmake=tinycdb_make
                fi
                for f in {,zipcode/}${MY_PN}.*; do
                        LC_ALL=C awk '

diff --git a/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild b/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild
index ddbeb94e7eb8b3d708f62316624743da56e258d4..e7bc3532e9de60d4d8d53d053067e188b453e081 100644 (file)
--- a/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild
+++ b/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild
@@ -43,6 +43,14 @@ src_prepare() {
        eapply_user
 }
 
+cdb_make() {
+       cdbmake "${1}" "${1}.tmp"
+}
+
+tinycdb_make() {
+       cdb -c "${1}"
+}
+
 src_compile() {
        local ctdic="${MY_PN}.china_taiwan" ruby
        mv ${ctdic}{.header,}
@@ -54,9 +62,9 @@ src_compile() {
        done
 
        if use cdb; then
-               local cdbmake="cdbmake" f
+               local cdbmake=cdb_make f
                if has_version dev-db/tinycdb; then
-                       cdbmake="cdb -c"
+                       cdbmake=tinycdb_make
                fi
                for f in {,zipcode/}${MY_PN}.*; do
                        LC_ALL=C awk '