1 |
commit: 771f8de19325888189058789205c48d008a87d84 |
2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 9 06:40:49 2021 +0000 |
4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 9 06:54:08 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=771f8de1 |
7 |
|
8 |
app-i18n/libkkc: tidy |
9 |
|
10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
11 |
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org> |
12 |
|
13 |
.../libkkc/libkkc-0.3.6_pre20190809104047.ebuild | 26 ++++++++++------------ |
14 |
app-i18n/libkkc/libkkc-9999.ebuild | 26 ++++++++++------------ |
15 |
2 files changed, 24 insertions(+), 28 deletions(-) |
16 |
|
17 |
diff --git a/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild b/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild |
18 |
index d563af26c2c..16e4031c08f 100644 |
19 |
--- a/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild |
20 |
+++ b/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild |
21 |
@@ -1,8 +1,8 @@ |
22 |
-# Copyright 2013-2020 Gentoo Authors |
23 |
+# Copyright 1999-2021 Gentoo Authors |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
|
26 |
EAPI="7" |
27 |
-PYTHON_COMPAT=(python{3_7,3_8,3_9}) |
28 |
+PYTHON_COMPAT=( python3_{7..9} ) |
29 |
|
30 |
inherit autotools python-any-r1 vala |
31 |
|
32 |
@@ -11,7 +11,9 @@ if [[ "${PV}" == "9999" ]]; then |
33 |
|
34 |
EGIT_REPO_URI="https://github.com/ueno/libkkc" |
35 |
elif [[ "${PV}" == *_pre* ]]; then |
36 |
- LIBKKC_GIT_REVISION="b2e5a152980ee627c39ca8a49082e6df7694b8fc" |
37 |
+ inherit vcs-snapshot |
38 |
+ |
39 |
+ EGIT_COMMIT="b2e5a152980ee627c39ca8a49082e6df7694b8fc" |
40 |
fi |
41 |
|
42 |
DESCRIPTION="Japanese Kana Kanji conversion input method library" |
43 |
@@ -19,7 +21,7 @@ HOMEPAGE="https://github.com/ueno/libkkc" |
44 |
if [[ "${PV}" == "9999" ]]; then |
45 |
SRC_URI="" |
46 |
elif [[ "${PV}" == *_pre* ]]; then |
47 |
- SRC_URI="https://github.com/ueno/${PN}/archive/${LIBKKC_GIT_REVISION}.tar.gz -> ${P}.tar.gz" |
48 |
+ SRC_URI="https://github.com/ueno/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" |
49 |
else |
50 |
SRC_URI="https://github.com/ueno/${PN}/releases/download/v${PV}/${P}.tar.gz" |
51 |
fi |
52 |
@@ -29,21 +31,17 @@ SLOT="0" |
53 |
KEYWORDS="~amd64 ~x86" |
54 |
IUSE="nls static-libs" |
55 |
|
56 |
+RDEPEND="dev-libs/glib:2 |
57 |
+ dev-libs/json-glib |
58 |
+ dev-libs/libgee:0.8 |
59 |
+ dev-libs/marisa |
60 |
+ nls? ( virtual/libintl )" |
61 |
+DEPEND="${RDEPEND}" |
62 |
BDEPEND="$(python_gen_any_dep 'dev-libs/marisa[python,${PYTHON_USEDEP}]') |
63 |
$(vala_depend) |
64 |
dev-libs/gobject-introspection |
65 |
virtual/pkgconfig |
66 |
nls? ( sys-devel/gettext )" |
67 |
-DEPEND="dev-libs/glib:2 |
68 |
- dev-libs/json-glib |
69 |
- dev-libs/libgee:0.8 |
70 |
- dev-libs/marisa |
71 |
- nls? ( virtual/libintl )" |
72 |
-RDEPEND="${DEPEND}" |
73 |
- |
74 |
-if [[ "${PV}" == *_pre* ]]; then |
75 |
- S="${WORKDIR}/libkkc-${LIBKKC_GIT_REVISION}" |
76 |
-fi |
77 |
|
78 |
python_check_deps() { |
79 |
has_version -b "dev-libs/marisa[python,${PYTHON_USEDEP}]" |
80 |
|
81 |
diff --git a/app-i18n/libkkc/libkkc-9999.ebuild b/app-i18n/libkkc/libkkc-9999.ebuild |
82 |
index 1743990197e..cd65127fb1e 100644 |
83 |
--- a/app-i18n/libkkc/libkkc-9999.ebuild |
84 |
+++ b/app-i18n/libkkc/libkkc-9999.ebuild |
85 |
@@ -1,8 +1,8 @@ |
86 |
-# Copyright 2013-2020 Gentoo Authors |
87 |
+# Copyright 1999-2021 Gentoo Authors |
88 |
# Distributed under the terms of the GNU General Public License v2 |
89 |
|
90 |
EAPI="7" |
91 |
-PYTHON_COMPAT=(python{3_7,3_8,3_9}) |
92 |
+PYTHON_COMPAT=( python3_{7..9} ) |
93 |
|
94 |
inherit autotools python-any-r1 vala |
95 |
|
96 |
@@ -11,7 +11,9 @@ if [[ "${PV}" == "9999" ]]; then |
97 |
|
98 |
EGIT_REPO_URI="https://github.com/ueno/libkkc" |
99 |
elif [[ "${PV}" == *_pre* ]]; then |
100 |
- LIBKKC_GIT_REVISION="" |
101 |
+ inherit vcs-snapshot |
102 |
+ |
103 |
+ EGIT_COMMIT="" |
104 |
fi |
105 |
|
106 |
DESCRIPTION="Japanese Kana Kanji conversion input method library" |
107 |
@@ -19,7 +21,7 @@ HOMEPAGE="https://github.com/ueno/libkkc" |
108 |
if [[ "${PV}" == "9999" ]]; then |
109 |
SRC_URI="" |
110 |
elif [[ "${PV}" == *_pre* ]]; then |
111 |
- SRC_URI="https://github.com/ueno/${PN}/archive/${LIBKKC_GIT_REVISION}.tar.gz -> ${P}.tar.gz" |
112 |
+ SRC_URI="https://github.com/ueno/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" |
113 |
else |
114 |
SRC_URI="https://github.com/ueno/${PN}/releases/download/v${PV}/${P}.tar.gz" |
115 |
fi |
116 |
@@ -29,21 +31,17 @@ SLOT="0" |
117 |
KEYWORDS="" |
118 |
IUSE="nls static-libs" |
119 |
|
120 |
+RDEPEND="dev-libs/glib:2 |
121 |
+ dev-libs/json-glib |
122 |
+ dev-libs/libgee:0.8 |
123 |
+ dev-libs/marisa |
124 |
+ nls? ( virtual/libintl )" |
125 |
+DEPEND="${RDEPEND}" |
126 |
BDEPEND="$(python_gen_any_dep 'dev-libs/marisa[python,${PYTHON_USEDEP}]') |
127 |
$(vala_depend) |
128 |
dev-libs/gobject-introspection |
129 |
virtual/pkgconfig |
130 |
nls? ( sys-devel/gettext )" |
131 |
-DEPEND="dev-libs/glib:2 |
132 |
- dev-libs/json-glib |
133 |
- dev-libs/libgee:0.8 |
134 |
- dev-libs/marisa |
135 |
- nls? ( virtual/libintl )" |
136 |
-RDEPEND="${DEPEND}" |
137 |
- |
138 |
-if [[ "${PV}" == *_pre* ]]; then |
139 |
- S="${WORKDIR}/libkkc-${LIBKKC_GIT_REVISION}" |
140 |
-fi |
141 |
|
142 |
python_check_deps() { |
143 |
has_version -b "dev-libs/marisa[python,${PYTHON_USEDEP}]" |