1 |
commit: 591e3361d6f28687c51958e4d0bfe9b634406da3 |
2 |
Author: Naohiro Aota <naota <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Apr 21 05:24:04 2019 +0000 |
4 |
Commit: Naohiro Aota <naota <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 21 05:31:02 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=591e3361 |
7 |
|
8 |
net-misc/mikutter: version bump to 3.8.6 |
9 |
|
10 |
bump to 3.8.6; dropped old ruby versions. |
11 |
|
12 |
Package-Manager: Portage-2.3.63, Repoman-2.3.12 |
13 |
Signed-off-by: Naohiro Aota <naota <AT> gentoo.org> |
14 |
|
15 |
net-misc/mikutter/Manifest | 2 + |
16 |
net-misc/mikutter/mikutter-3.8.6.ebuild | 121 ++++++++++++++++++++++++++++++++ |
17 |
net-misc/mikutter/mikutter-9999.ebuild | 87 +++++++++++++++++------ |
18 |
3 files changed, 187 insertions(+), 23 deletions(-) |
19 |
|
20 |
diff --git a/net-misc/mikutter/Manifest b/net-misc/mikutter/Manifest |
21 |
index 95c5b6fe4e2..a19eb82d465 100644 |
22 |
--- a/net-misc/mikutter/Manifest |
23 |
+++ b/net-misc/mikutter/Manifest |
24 |
@@ -1 +1,3 @@ |
25 |
DIST mikutter.3.5.4.tar.gz 3743674 BLAKE2B af166219af2a36e84c4e13209830d12be6e085e6c76fa101c265c40bc85d465f50f56311783b647f10ec0021450fd45ca411643e7612e8225df6c9e75ac83be1 SHA512 adb7a1902026ee01737840d0b7f9004ab363e874e01f7c497bd9252fccb3cc16f86f1959bb2eff3d309cb7ba1fa93376d9a1e46d5226859a1279069de7f2ba8e |
26 |
+DIST mikutter.3.8.6.tar.gz 3174454 BLAKE2B 3fc3802ae840fc310f1b9abd51c560fb804b57aad6bf78bd1e3b8046a42dc785c8a454de722a5e57d499bda15884a255da50d3919a1c5bbcd9e5753948d45f46 SHA512 102c25263df804fd005928ac8605ca4d115040c0e3bd13a09e73bac5b1a4ddedff92b45ac38c54692bf388b5ac8ea422a0b5c42851bb3616c74991943f1cd98f |
27 |
+DIST twitter_api_keys.rb 336 BLAKE2B 9b134fb9169f96c99582d1ceffe39cfa1675b6e747a8a46f6123cbff73b7e255e59aba3f6cf247decc9824244947d260658011b5aa72a915d50565e797e31703 SHA512 39efeed878f763101329c781fb501c5b5df848e4ae3c1f6bcdf3e6b151c5d647c68127f906eccf7861466d2ff88e7f1bdc27065205ed91a80e9cdc89fa5152e4 |
28 |
|
29 |
diff --git a/net-misc/mikutter/mikutter-3.8.6.ebuild b/net-misc/mikutter/mikutter-3.8.6.ebuild |
30 |
new file mode 100644 |
31 |
index 00000000000..06d5346485a |
32 |
--- /dev/null |
33 |
+++ b/net-misc/mikutter/mikutter-3.8.6.ebuild |
34 |
@@ -0,0 +1,121 @@ |
35 |
+# Copyright 1999-2019 Gentoo Authors |
36 |
+# Distributed under the terms of the GNU General Public License v2 |
37 |
+ |
38 |
+EAPI=6 |
39 |
+ |
40 |
+USE_RUBY="ruby24 ruby25" |
41 |
+ |
42 |
+inherit eutils ruby-ng |
43 |
+ |
44 |
+PLUGIN_HASH="30071c3008e4616e723cf4e734fc79254019af09" |
45 |
+ |
46 |
+if [ "${PV}" = "9999" ]; then |
47 |
+ EGIT_REPO_URI="git://toshia.dip.jp/mikutter.git |
48 |
+ https://github.com/toshia/twitter_api_keys.git" |
49 |
+ inherit git-r3 |
50 |
+ SRC_URI="https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb" |
51 |
+ KEYWORDS="" |
52 |
+ EGIT_CHECKOUT_DIR="${WORKDIR}/all" |
53 |
+else |
54 |
+ MY_P="${PN}.${PV}" |
55 |
+ SRC_URI="http://mikutter.hachune.net/bin/${MY_P}.tar.gz |
56 |
+ https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb" |
57 |
+ KEYWORDS="~amd64" |
58 |
+ RUBY_S="${PN}" |
59 |
+fi |
60 |
+ |
61 |
+DESCRIPTION="Simple, powerful and moeful twitter client" |
62 |
+HOMEPAGE="http://mikutter.hachune.net/" |
63 |
+ |
64 |
+LICENSE="GPL-3" |
65 |
+SLOT="0" |
66 |
+IUSE="+libnotify" |
67 |
+ |
68 |
+DEPEND="" |
69 |
+RDEPEND=" |
70 |
+ libnotify? ( x11-libs/libnotify ) |
71 |
+ media-sound/alsa-utils" |
72 |
+ |
73 |
+ruby_add_rdepend "<dev-ruby/addressable-2.6 |
74 |
+ dev-ruby/delayer |
75 |
+ >=dev-ruby/delayer-deferred-2.0 |
76 |
+ >=dev-ruby/diva-0.3.2 |
77 |
+ dev-ruby/httpclient |
78 |
+ dev-ruby/json:0 |
79 |
+ dev-ruby/instance_storage |
80 |
+ dev-ruby/memoist |
81 |
+ dev-ruby/moneta |
82 |
+ dev-ruby/nokogiri |
83 |
+ >=dev-ruby/oauth-0.5.1 |
84 |
+ >=dev-ruby/pluggaloid-1.1.1 |
85 |
+ dev-ruby/rcairo |
86 |
+ >=dev-ruby/ruby-gettext-3.2.9 |
87 |
+ >=dev-ruby/ruby-gtk2-3.3.0 |
88 |
+ >dev-ruby/ruby-hmac-0.4 |
89 |
+ dev-ruby/totoridipjp |
90 |
+ dev-ruby/twitter-text:= |
91 |
+ >dev-ruby/typed-array-0.1 |
92 |
+ virtual/ruby-ssl" |
93 |
+ |
94 |
+all_ruby_unpack() { |
95 |
+ if [ "${PV}" = "9999" ];then |
96 |
+ git-3_src_unpack |
97 |
+ else |
98 |
+ default |
99 |
+ fi |
100 |
+} |
101 |
+ |
102 |
+all_ruby_install() { |
103 |
+ local rubyversion |
104 |
+ |
105 |
+ if use ruby_targets_ruby25; then |
106 |
+ rubyversion=ruby25 |
107 |
+ elif use ruby_targets_ruby24; then |
108 |
+ rubyversion=ruby24 |
109 |
+ fi |
110 |
+ |
111 |
+ exeinto /usr/share/mikutter |
112 |
+ doexe mikutter.rb |
113 |
+ insinto /usr/share/mikutter |
114 |
+ doins -r core plugin |
115 |
+ sed -e "s/ruby19/${rubyversion}/" "${FILESDIR}"/mikutter \ |
116 |
+ | newbin - mikutter |
117 |
+ dodoc README |
118 |
+ make_desktop_entry mikutter Mikutter \ |
119 |
+ /usr/share/mikutter/core/skin/data/icon.png |
120 |
+ |
121 |
+ insinto /usr/share/mikutter/plugin/twitter_api_keys |
122 |
+ newins "${DISTDIR}"/twitter_api_keys.rb twitter_api_keys.rb.in |
123 |
+} |
124 |
+ |
125 |
+pkg_postinst() { |
126 |
+ echo |
127 |
+ elog "To use Twitter, you need to setup your Consumer Key/Consumer Secret by running" |
128 |
+ elog " emerge --config =${PF}" |
129 |
+} |
130 |
+ |
131 |
+pkg_config() { |
132 |
+ local PLUGIN_DIR="${EROOT}"/usr/share/mikutter/plugin |
133 |
+ local CK CS |
134 |
+ |
135 |
+ echo |
136 |
+ einfon "Please input your Consumer Key for Twitter: " |
137 |
+ read -r CK |
138 |
+ |
139 |
+ echo |
140 |
+ einfon "Please input your Consumer Secret for Twitter: " |
141 |
+ read -r CS |
142 |
+ |
143 |
+ if [ -z "${CK}" -o -z "${CS}" ]; then |
144 |
+ eerror "Consumer Key or Consumer Secret is missing." |
145 |
+ return |
146 |
+ fi |
147 |
+ |
148 |
+ sed -e "/consumer_key = /s!''!'${CK}'!" \ |
149 |
+ -e "/consumer_secret = /s!''!'${CS}'!" \ |
150 |
+ ${PLUGIN_DIR}/twitter_api_keys/twitter_api_keys.rb.in > \ |
151 |
+ ${PLUGIN_DIR}/twitter_api_keys/twitter_api_keys.rb |
152 |
+ |
153 |
+ echo |
154 |
+ einfo "Consuker Key/Consumer secret is set." |
155 |
+} |
156 |
|
157 |
diff --git a/net-misc/mikutter/mikutter-9999.ebuild b/net-misc/mikutter/mikutter-9999.ebuild |
158 |
index 04d1acc69b1..06d5346485a 100644 |
159 |
--- a/net-misc/mikutter/mikutter-9999.ebuild |
160 |
+++ b/net-misc/mikutter/mikutter-9999.ebuild |
161 |
@@ -1,20 +1,25 @@ |
162 |
-# Copyright 1999-2018 Gentoo Foundation |
163 |
+# Copyright 1999-2019 Gentoo Authors |
164 |
# Distributed under the terms of the GNU General Public License v2 |
165 |
|
166 |
-EAPI=5 |
167 |
+EAPI=6 |
168 |
|
169 |
-USE_RUBY="ruby22 ruby23" |
170 |
+USE_RUBY="ruby24 ruby25" |
171 |
|
172 |
inherit eutils ruby-ng |
173 |
|
174 |
+PLUGIN_HASH="30071c3008e4616e723cf4e734fc79254019af09" |
175 |
+ |
176 |
if [ "${PV}" = "9999" ]; then |
177 |
- EGIT_REPO_URI="git://toshia.dip.jp/mikutter.git" |
178 |
- inherit git-2 |
179 |
+ EGIT_REPO_URI="git://toshia.dip.jp/mikutter.git |
180 |
+ https://github.com/toshia/twitter_api_keys.git" |
181 |
+ inherit git-r3 |
182 |
+ SRC_URI="https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb" |
183 |
KEYWORDS="" |
184 |
- EGIT_SOURCEDIR="${WORKDIR}/all" |
185 |
+ EGIT_CHECKOUT_DIR="${WORKDIR}/all" |
186 |
else |
187 |
MY_P="${PN}.${PV}" |
188 |
- SRC_URI="http://mikutter.hachune.net/bin/${MY_P}.tar.gz" |
189 |
+ SRC_URI="http://mikutter.hachune.net/bin/${MY_P}.tar.gz |
190 |
+ https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb" |
191 |
KEYWORDS="~amd64" |
192 |
RUBY_S="${PN}" |
193 |
fi |
194 |
@@ -31,41 +36,42 @@ RDEPEND=" |
195 |
libnotify? ( x11-libs/libnotify ) |
196 |
media-sound/alsa-utils" |
197 |
|
198 |
-ruby_add_rdepend "dev-ruby/addressable |
199 |
+ruby_add_rdepend "<dev-ruby/addressable-2.6 |
200 |
dev-ruby/delayer |
201 |
- dev-ruby/delayer-deferred |
202 |
+ >=dev-ruby/delayer-deferred-2.0 |
203 |
+ >=dev-ruby/diva-0.3.2 |
204 |
dev-ruby/httpclient |
205 |
dev-ruby/json:0 |
206 |
dev-ruby/instance_storage |
207 |
dev-ruby/memoist |
208 |
- >=dev-ruby/moneta-0.7 |
209 |
+ dev-ruby/moneta |
210 |
dev-ruby/nokogiri |
211 |
- >=dev-ruby/oauth-0.4.7 |
212 |
- dev-ruby/pluggaloid |
213 |
+ >=dev-ruby/oauth-0.5.1 |
214 |
+ >=dev-ruby/pluggaloid-1.1.1 |
215 |
dev-ruby/rcairo |
216 |
- >=dev-ruby/ruby-gettext-3.0.1 |
217 |
- >=dev-ruby/ruby-gtk2-2.2.0 |
218 |
- dev-ruby/ruby-hmac |
219 |
+ >=dev-ruby/ruby-gettext-3.2.9 |
220 |
+ >=dev-ruby/ruby-gtk2-3.3.0 |
221 |
+ >dev-ruby/ruby-hmac-0.4 |
222 |
dev-ruby/totoridipjp |
223 |
- dev-ruby/twitter-text |
224 |
- dev-ruby/typed-array |
225 |
+ dev-ruby/twitter-text:= |
226 |
+ >dev-ruby/typed-array-0.1 |
227 |
virtual/ruby-ssl" |
228 |
|
229 |
all_ruby_unpack() { |
230 |
if [ "${PV}" = "9999" ];then |
231 |
- git-2_src_unpack |
232 |
+ git-3_src_unpack |
233 |
else |
234 |
default |
235 |
fi |
236 |
} |
237 |
|
238 |
-each_ruby_install() { |
239 |
+all_ruby_install() { |
240 |
local rubyversion |
241 |
|
242 |
- if use ruby_targets_ruby23; then |
243 |
- rubyversion=ruby23 |
244 |
- elif use ruby_targets_ruby22; then |
245 |
- rubyversion=ruby22 |
246 |
+ if use ruby_targets_ruby25; then |
247 |
+ rubyversion=ruby25 |
248 |
+ elif use ruby_targets_ruby24; then |
249 |
+ rubyversion=ruby24 |
250 |
fi |
251 |
|
252 |
exeinto /usr/share/mikutter |
253 |
@@ -77,4 +83,39 @@ each_ruby_install() { |
254 |
dodoc README |
255 |
make_desktop_entry mikutter Mikutter \ |
256 |
/usr/share/mikutter/core/skin/data/icon.png |
257 |
+ |
258 |
+ insinto /usr/share/mikutter/plugin/twitter_api_keys |
259 |
+ newins "${DISTDIR}"/twitter_api_keys.rb twitter_api_keys.rb.in |
260 |
+} |
261 |
+ |
262 |
+pkg_postinst() { |
263 |
+ echo |
264 |
+ elog "To use Twitter, you need to setup your Consumer Key/Consumer Secret by running" |
265 |
+ elog " emerge --config =${PF}" |
266 |
+} |
267 |
+ |
268 |
+pkg_config() { |
269 |
+ local PLUGIN_DIR="${EROOT}"/usr/share/mikutter/plugin |
270 |
+ local CK CS |
271 |
+ |
272 |
+ echo |
273 |
+ einfon "Please input your Consumer Key for Twitter: " |
274 |
+ read -r CK |
275 |
+ |
276 |
+ echo |
277 |
+ einfon "Please input your Consumer Secret for Twitter: " |
278 |
+ read -r CS |
279 |
+ |
280 |
+ if [ -z "${CK}" -o -z "${CS}" ]; then |
281 |
+ eerror "Consumer Key or Consumer Secret is missing." |
282 |
+ return |
283 |
+ fi |
284 |
+ |
285 |
+ sed -e "/consumer_key = /s!''!'${CK}'!" \ |
286 |
+ -e "/consumer_secret = /s!''!'${CS}'!" \ |
287 |
+ ${PLUGIN_DIR}/twitter_api_keys/twitter_api_keys.rb.in > \ |
288 |
+ ${PLUGIN_DIR}/twitter_api_keys/twitter_api_keys.rb |
289 |
+ |
290 |
+ echo |
291 |
+ einfo "Consuker Key/Consumer secret is set." |
292 |
} |