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 D7691158086 for ; Sat, 9 Oct 2021 06:54:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0A558E07A5; Sat, 9 Oct 2021 06:54:22 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D8DE6E07A5 for ; Sat, 9 Oct 2021 06:54:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E41C6343079 for ; Sat, 9 Oct 2021 06:54:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3A1159B for ; Sat, 9 Oct 2021 06:54:19 +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: <1633762448.771f8de19325888189058789205c48d008a87d84.hattya@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/libkkc/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild app-i18n/libkkc/libkkc-9999.ebuild X-VCS-Directories: app-i18n/libkkc/ X-VCS-Committer: hattya X-VCS-Committer-Name: Akinori Hattori X-VCS-Revision: 771f8de19325888189058789205c48d008a87d84 X-VCS-Branch: master Date: Sat, 9 Oct 2021 06:54:19 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 84989f5d-9609-4a5e-a52f-93429f3d97de X-Archives-Hash: 9767f0b84b6e9d6b50d62b0744382876 commit: 771f8de19325888189058789205c48d008a87d84 Author: Akinori Hattori gentoo org> AuthorDate: Sat Oct 9 06:40:49 2021 +0000 Commit: Akinori Hattori gentoo org> CommitDate: Sat Oct 9 06:54:08 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=771f8de1 app-i18n/libkkc: tidy Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Akinori Hattori gentoo.org> .../libkkc/libkkc-0.3.6_pre20190809104047.ebuild | 26 ++++++++++------------ app-i18n/libkkc/libkkc-9999.ebuild | 26 ++++++++++------------ 2 files changed, 24 insertions(+), 28 deletions(-) diff --git a/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild b/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild index d563af26c2c..16e4031c08f 100644 --- a/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild +++ b/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild @@ -1,8 +1,8 @@ -# Copyright 2013-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=(python{3_7,3_8,3_9}) +PYTHON_COMPAT=( python3_{7..9} ) inherit autotools python-any-r1 vala @@ -11,7 +11,9 @@ if [[ "${PV}" == "9999" ]]; then EGIT_REPO_URI="https://github.com/ueno/libkkc" elif [[ "${PV}" == *_pre* ]]; then - LIBKKC_GIT_REVISION="b2e5a152980ee627c39ca8a49082e6df7694b8fc" + inherit vcs-snapshot + + EGIT_COMMIT="b2e5a152980ee627c39ca8a49082e6df7694b8fc" fi DESCRIPTION="Japanese Kana Kanji conversion input method library" @@ -19,7 +21,7 @@ HOMEPAGE="https://github.com/ueno/libkkc" if [[ "${PV}" == "9999" ]]; then SRC_URI="" elif [[ "${PV}" == *_pre* ]]; then - SRC_URI="https://github.com/ueno/${PN}/archive/${LIBKKC_GIT_REVISION}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/ueno/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" else SRC_URI="https://github.com/ueno/${PN}/releases/download/v${PV}/${P}.tar.gz" fi @@ -29,21 +31,17 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="nls static-libs" +RDEPEND="dev-libs/glib:2 + dev-libs/json-glib + dev-libs/libgee:0.8 + dev-libs/marisa + nls? ( virtual/libintl )" +DEPEND="${RDEPEND}" BDEPEND="$(python_gen_any_dep 'dev-libs/marisa[python,${PYTHON_USEDEP}]') $(vala_depend) dev-libs/gobject-introspection virtual/pkgconfig nls? ( sys-devel/gettext )" -DEPEND="dev-libs/glib:2 - dev-libs/json-glib - dev-libs/libgee:0.8 - dev-libs/marisa - nls? ( virtual/libintl )" -RDEPEND="${DEPEND}" - -if [[ "${PV}" == *_pre* ]]; then - S="${WORKDIR}/libkkc-${LIBKKC_GIT_REVISION}" -fi python_check_deps() { has_version -b "dev-libs/marisa[python,${PYTHON_USEDEP}]" diff --git a/app-i18n/libkkc/libkkc-9999.ebuild b/app-i18n/libkkc/libkkc-9999.ebuild index 1743990197e..cd65127fb1e 100644 --- a/app-i18n/libkkc/libkkc-9999.ebuild +++ b/app-i18n/libkkc/libkkc-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 2013-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=(python{3_7,3_8,3_9}) +PYTHON_COMPAT=( python3_{7..9} ) inherit autotools python-any-r1 vala @@ -11,7 +11,9 @@ if [[ "${PV}" == "9999" ]]; then EGIT_REPO_URI="https://github.com/ueno/libkkc" elif [[ "${PV}" == *_pre* ]]; then - LIBKKC_GIT_REVISION="" + inherit vcs-snapshot + + EGIT_COMMIT="" fi DESCRIPTION="Japanese Kana Kanji conversion input method library" @@ -19,7 +21,7 @@ HOMEPAGE="https://github.com/ueno/libkkc" if [[ "${PV}" == "9999" ]]; then SRC_URI="" elif [[ "${PV}" == *_pre* ]]; then - SRC_URI="https://github.com/ueno/${PN}/archive/${LIBKKC_GIT_REVISION}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/ueno/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" else SRC_URI="https://github.com/ueno/${PN}/releases/download/v${PV}/${P}.tar.gz" fi @@ -29,21 +31,17 @@ SLOT="0" KEYWORDS="" IUSE="nls static-libs" +RDEPEND="dev-libs/glib:2 + dev-libs/json-glib + dev-libs/libgee:0.8 + dev-libs/marisa + nls? ( virtual/libintl )" +DEPEND="${RDEPEND}" BDEPEND="$(python_gen_any_dep 'dev-libs/marisa[python,${PYTHON_USEDEP}]') $(vala_depend) dev-libs/gobject-introspection virtual/pkgconfig nls? ( sys-devel/gettext )" -DEPEND="dev-libs/glib:2 - dev-libs/json-glib - dev-libs/libgee:0.8 - dev-libs/marisa - nls? ( virtual/libintl )" -RDEPEND="${DEPEND}" - -if [[ "${PV}" == *_pre* ]]; then - S="${WORKDIR}/libkkc-${LIBKKC_GIT_REVISION}" -fi python_check_deps() { has_version -b "dev-libs/marisa[python,${PYTHON_USEDEP}]"