From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 133E3138330 for ; Thu, 15 Sep 2016 14:17:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BB5F7E0B25; Thu, 15 Sep 2016 14:17:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 73090E0B25 for ; Thu, 15 Sep 2016 14:17:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 72CEA340ADB for ; Thu, 15 Sep 2016 14:17:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6F0E5247E for ; Thu, 15 Sep 2016 14:16:58 +0000 (UTC) From: "Akinori Hattori" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Akinori Hattori" Message-ID: <1473948947.62f9bf9e5956bace267b89f61e9afa76ea28938c.hattya@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/skk-jisyo/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-i18n/skk-jisyo/skk-jisyo-201605.ebuild app-i18n/skk-jisyo/skk-jisyo-999999.ebuild X-VCS-Directories: app-i18n/skk-jisyo/ X-VCS-Committer: hattya X-VCS-Committer-Name: Akinori Hattori X-VCS-Revision: 62f9bf9e5956bace267b89f61e9afa76ea28938c X-VCS-Branch: master Date: Thu, 15 Sep 2016 14:16:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a9c43a69-57ba-45e4-848c-428cbf8c106c X-Archives-Hash: 19c0113553ef4698b4903e04a3f7ecb8 commit: 62f9bf9e5956bace267b89f61e9afa76ea28938c Author: Akinori Hattori gentoo org> AuthorDate: Thu Sep 15 14:15:47 2016 +0000 Commit: Akinori Hattori gentoo org> CommitDate: Thu Sep 15 14:15:47 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62f9bf9e app-i18n/skk-jisyo: fix build with dev-db/cdb Gentoo-Bug: 591376 Package-Manager: portage-2.2.28 app-i18n/skk-jisyo/skk-jisyo-201605.ebuild | 12 ++++++++++-- app-i18n/skk-jisyo/skk-jisyo-999999.ebuild | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/app-i18n/skk-jisyo/skk-jisyo-201605.ebuild b/app-i18n/skk-jisyo/skk-jisyo-201605.ebuild index 119fba7..943b3a5 100644 --- 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 ddbeb94..e7bc353 100644 --- 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 '