1 |
commit: 33fde56460066967775cd4f48187564d79ba17ad |
2 |
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
3 |
AuthorDate: Thu Sep 9 11:20:26 2021 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 9 11:24:42 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33fde564 |
7 |
|
8 |
net-nntp/tin: add 2.6.0 |
9 |
|
10 |
* set correct LICENSE (main code is licensed under 3-clause BSD, only |
11 |
metamutt script is GPL) |
12 |
|
13 |
* remove "doc" USE flag as unnecessary |
14 |
|
15 |
* remove "etiquette" USE flag (can be toggled in tinrc) |
16 |
|
17 |
* remove "ipv6" USE flag (no external deps) |
18 |
|
19 |
* remove "unicode" USE flag (tin 2.6 builds with ncursesw only) |
20 |
|
21 |
* remove "mime" and "spell" USE flags (optional runtime functionality) |
22 |
|
23 |
* depend unconditionally on dev-libs/icu |
24 |
|
25 |
* depend on virtual/libintl instead of gettext (tarball already has .gmo |
26 |
files) |
27 |
|
28 |
* add yacc build dependency |
29 |
|
30 |
* unbundle libcanlock |
31 |
|
32 |
* gmane.org -> gmane.io |
33 |
|
34 |
* install localized manpages |
35 |
|
36 |
* do not remove mbox.5 and mmdf.5 manpages (e-file reports no |
37 |
collisions) |
38 |
|
39 |
Couldn't reproduce bug #725226 |
40 |
|
41 |
Bug: https://bugs.gentoo.org/725226 |
42 |
Closes: https://bugs.gentoo.org/550620 |
43 |
Signed-off-by: Anna Vyalkova <cyber+gentoo <AT> sysrq.in> |
44 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
45 |
|
46 |
net-nntp/tin/Manifest | 1 + |
47 |
net-nntp/tin/metadata.xml | 6 +-- |
48 |
net-nntp/tin/tin-2.4.5-r1.ebuild | 2 +- |
49 |
net-nntp/tin/tin-2.6.0.ebuild | 87 ++++++++++++++++++++++++++++++++++++++ |
50 |
profiles/arch/arm/package.use.mask | 4 ++ |
51 |
5 files changed, 96 insertions(+), 4 deletions(-) |
52 |
|
53 |
diff --git a/net-nntp/tin/Manifest b/net-nntp/tin/Manifest |
54 |
index 339871627b9..001b34ab27e 100644 |
55 |
--- a/net-nntp/tin/Manifest |
56 |
+++ b/net-nntp/tin/Manifest |
57 |
@@ -1 +1,2 @@ |
58 |
DIST tin-2.4.5.tar.xz 1559164 BLAKE2B 4efea88c7f76aef91a848c9ed5d82efac640360e41c515015d406e84ed5ce639bbcd17eff29939312ebf83adb8bb84bc7a4f04833cd7cc0781f92b377a0cb31f SHA512 4ec1c4990ce8d9a46204c0064f19c5c2b99848201c37562f8df76de5be84fdd2bcd35cbc3e9f20233f636522e086ac031a5a9cb65bd22a53eda619dcce86adbc |
59 |
+DIST tin-2.6.0.tar.xz 1575564 BLAKE2B 2f42261457b359c63461953335f25de21fd3e54b3730b5db39daf0f25929e8c39a4c89be4d558bed9ce81801d2e3cad3d163c1827d2f3064144d8b2bf34ae645 SHA512 d843bd313fd144fbb5f4c40e3f0f776cab3a974494adc7004ee265235ab538dde520bc72c956d5a8517225fdb50e754b444f25bd3b661ddf51ff9e4135904862 |
60 |
|
61 |
diff --git a/net-nntp/tin/metadata.xml b/net-nntp/tin/metadata.xml |
62 |
index 54d0b1a0158..bd47f200bdb 100644 |
63 |
--- a/net-nntp/tin/metadata.xml |
64 |
+++ b/net-nntp/tin/metadata.xml |
65 |
@@ -3,9 +3,9 @@ |
66 |
<pkgmetadata> |
67 |
<!-- maintainer-needed --> |
68 |
<use> |
69 |
-<flag name="cancel-locks">Enable Cancel-Lock header functionality (also enables USE=evil)</flag> |
70 |
+<flag name="cancel-locks">Enable Cancel-Lock header functionality</flag> |
71 |
<flag name="gpg">Enable <pkg>app-crypt/gnupg</pkg> support</flag> |
72 |
-<flag name="etiquette">Enable the display off posting etiquettes</flag> |
73 |
-<flag name="mime">Add MIME support</flag> |
74 |
+<flag name="etiquette" restrict="<net-nntp/tin-2.6.0">Enable the display off posting etiquettes</flag> |
75 |
+<flag name="mime" restrict="<net-nntp/tin-2.6.0">Add MIME support</flag> |
76 |
</use> |
77 |
</pkgmetadata> |
78 |
|
79 |
diff --git a/net-nntp/tin/tin-2.4.5-r1.ebuild b/net-nntp/tin/tin-2.4.5-r1.ebuild |
80 |
index d9022f05e51..a5435105bbf 100644 |
81 |
--- a/net-nntp/tin/tin-2.4.5-r1.ebuild |
82 |
+++ b/net-nntp/tin/tin-2.4.5-r1.ebuild |
83 |
@@ -9,7 +9,7 @@ DESCRIPTION="A threaded NNTP and spool based UseNet newsreader" |
84 |
HOMEPAGE="http://www.tin.org/" |
85 |
SRC_URI="ftp://ftp.tin.org/pub/news/clients/tin/stable/${P}.tar.xz" |
86 |
|
87 |
-LICENSE="GPL-2" |
88 |
+LICENSE="BSD GPL-2+" |
89 |
SLOT="0" |
90 |
KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" |
91 |
IUSE="cancel-locks debug doc +etiquette gpg idn ipv6 mime nls sasl socks5 spell unicode" |
92 |
|
93 |
diff --git a/net-nntp/tin/tin-2.6.0.ebuild b/net-nntp/tin/tin-2.6.0.ebuild |
94 |
new file mode 100644 |
95 |
index 00000000000..2f0923bd8d9 |
96 |
--- /dev/null |
97 |
+++ b/net-nntp/tin/tin-2.6.0.ebuild |
98 |
@@ -0,0 +1,87 @@ |
99 |
+# Copyright 1999-2021 Gentoo Authors |
100 |
+# Distributed under the terms of the GNU General Public License v2 |
101 |
+ |
102 |
+EAPI=8 |
103 |
+ |
104 |
+inherit optfeature toolchain-funcs |
105 |
+ |
106 |
+DESCRIPTION="A threaded NNTP and spool based UseNet newsreader" |
107 |
+HOMEPAGE="http://www.tin.org/" |
108 |
+SRC_URI="ftp://ftp.tin.org/pub/news/clients/tin/stable/${P}.tar.xz" |
109 |
+ |
110 |
+LICENSE="BSD GPL-2+" |
111 |
+SLOT="0" |
112 |
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" |
113 |
+IUSE="cancel-locks debug gpg nls sasl socks5" |
114 |
+ |
115 |
+RDEPEND=" |
116 |
+ dev-libs/icu:= |
117 |
+ dev-libs/libpcre:3 |
118 |
+ dev-libs/uulib |
119 |
+ sys-libs/ncurses:=[unicode(+)] |
120 |
+ cancel-locks? ( >=net-libs/canlock-3.0:= ) |
121 |
+ gpg? ( app-crypt/gnupg ) |
122 |
+ nls? ( virtual/libintl ) |
123 |
+ sasl? ( virtual/gsasl ) |
124 |
+ socks5? ( net-proxy/dante ) |
125 |
+" |
126 |
+DEPEND="${RDEPEND}" |
127 |
+BDEPEND=" |
128 |
+ virtual/pkgconfig |
129 |
+ virtual/yacc |
130 |
+" |
131 |
+ |
132 |
+DOCS=( |
133 |
+ README{,.MAC,.WIN} |
134 |
+ doc/{CHANGES{,.old},CREDITS,TODO,WHATSNEW,filtering} |
135 |
+) |
136 |
+ |
137 |
+src_configure() { |
138 |
+ tc-export AR CC RANLIB |
139 |
+ |
140 |
+ econf_args=( |
141 |
+ $(use_enable cancel-locks) $(use_with cancel-locks canlock) |
142 |
+ $(use_enable debug) |
143 |
+ $(use_enable gpg pgp-gpg) |
144 |
+ $(use_enable nls) |
145 |
+ $(use_with socks5 socks) $(use_with socks5) |
146 |
+ --disable-mime-strict-charset |
147 |
+ --enable-nntp-only |
148 |
+ --enable-prototypes |
149 |
+ --with-coffee |
150 |
+ --with-nntp-default-server="${TIN_DEFAULT_SERVER:-${NNTPSERVER:-news.gmane.io}}" |
151 |
+ --with-pcre=/usr |
152 |
+ --with-screen=ncursesw |
153 |
+ ) |
154 |
+ |
155 |
+ # set default paths for utilities |
156 |
+ econf_args+=( |
157 |
+ --with-editor="${EPREFIX}"/usr/libexec/editor |
158 |
+ --with-gpg="${EPREFIX}"/usr/bin/gpg |
159 |
+ --with-ispell="${EPREFIX}"/usr/bin/aspell |
160 |
+ --with-mailer="${EPREFIX}"/bin/mail |
161 |
+ --with-metamail="${EPREFIX}"/usr/bin/metamail |
162 |
+ --with-sum="${EPREFIX}"/usr/bin/sum |
163 |
+ ) |
164 |
+ |
165 |
+ econf "${econf_args[@]}" |
166 |
+} |
167 |
+ |
168 |
+src_compile() { |
169 |
+ # To build from the root dir you have to call `make build`, not just |
170 |
+ # `make`. |
171 |
+ emake build |
172 |
+} |
173 |
+ |
174 |
+src_install() { |
175 |
+ default |
176 |
+ emake DESTDIR="${D}" install_sysdefs |
177 |
+ emake -C src DESTDIR="${D}" install_nls_man |
178 |
+ |
179 |
+ dodoc doc/{*.sample,*.txt} |
180 |
+} |
181 |
+ |
182 |
+pkg_postinst() { |
183 |
+ optfeature "view MIME articles" net-mail/metamail |
184 |
+ optfeature "spell checker support" app-text/aspell |
185 |
+} |
186 |
|
187 |
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask |
188 |
index de57f5b8cf0..0b0f7f6b812 100644 |
189 |
--- a/profiles/arch/arm/package.use.mask |
190 |
+++ b/profiles/arch/arm/package.use.mask |
191 |
@@ -1,6 +1,10 @@ |
192 |
# Copyright 1999-2021 Gentoo Authors |
193 |
# Distributed under the terms of the GNU General Public License v2 |
194 |
|
195 |
+# Anna Vyalkova <cyber@gentoo@×××××.in> (2021-09-04) |
196 |
+# net-libs/canlock not keyworded |
197 |
+>=net-nntp/tin-2.6.0 cancel-locks |
198 |
+ |
199 |
# Sam James <sam@g.o> (2021-08-14) |
200 |
# Needs Raspberry Pi specific applications |
201 |
media-video/mjpg-streamer -input-raspicam |