Gentoo Archives: gentoo-commits

From: "Cédric Krier" <cedk@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-news/newsboat/
Date: Sat, 23 May 2020 16:44:49
Message-Id: 1590252273.b25ff28f405d002d80aacb5836660fc59f0b9429.cedk@gentoo
1 commit: b25ff28f405d002d80aacb5836660fc59f0b9429
2 Author: Cédric Krier <cedk <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 23 16:44:33 2020 +0000
4 Commit: Cédric Krier <cedk <AT> gentoo <DOT> org>
5 CommitDate: Sat May 23 16:44:33 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b25ff28f
7
8 net-news/newsboat: restrict openssl and libressl versions
9
10 And clean old version
11
12 Closes: https://bugs.gentoo.org/724620
13 Package-Manager: Portage-2.3.99, Repoman-2.3.22
14 Signed-off-by: Cédric Krier <cedk <AT> gentoo.org>
15
16 net-news/newsboat/Manifest | 3 -
17 net-news/newsboat/newsboat-2.18.ebuild | 167 ------------------------------
18 net-news/newsboat/newsboat-2.19-r1.ebuild | 4 +-
19 3 files changed, 2 insertions(+), 172 deletions(-)
20
21 diff --git a/net-news/newsboat/Manifest b/net-news/newsboat/Manifest
22 index 9790c9b5413..93c46d06d6d 100644
23 --- a/net-news/newsboat/Manifest
24 +++ b/net-news/newsboat/Manifest
25 @@ -26,7 +26,6 @@ DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc3799485
26 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
27 DIST lazy_static-0.2.11.crate 12361 BLAKE2B 3fe6a480c30a792448a3a2b378e05634ec59603f07baa03c0881fe5af85ecde5a172bb0733e7043fb6c43eabc261635b23410658d48add09eef6d807a750d22f SHA512 c85ac434d1b7d41d638e76a142a43d925b96bdddda112b1abeca1bae160d828262a85cd333d72499fe1dc7ae9574d3db226106acb433328c056028eb8c42bfe6
28 DIST lazy_static-1.2.0.crate 10840 BLAKE2B ab0adcf0421131ddd35e95a31a0053e2ffccb03dfc0f46ca4bbb6341f40bdd56d01aed0987489e5e73aa5f7289f3c323d1de0db353a30bb0a75acf53ce8436f8 SHA512 0d80334da99292d68fb2ea9879540676fd45788547b7170b6df1b0a606c1645a07188837f9414196eb44ac63010a3c84fe5c4319478f6fc2cef837295a255edc
29 -DIST libc-0.2.48.crate 353045 BLAKE2B 707f0311abe07e9a5bb9a1d2597d5a25f837dff783dff827f0c9e224b9ef0c915bc1f7f76a4a0afce5faa5bfe7896bbf1d22e645aed0cdd0e1197dcb45e495df SHA512 3ca3482cbdf8a031c6dfbc063537cee95b1735f8224baaad562f29279554ffd17999bb02c5ca54b25c845f63e70868b76d5d4123dcfa65d86d6e466527f4ce99
30 DIST libc-0.2.66.crate 457815 BLAKE2B 5da379ea738b75189e106d4be821c999394043303b8bb6a9caecdb1b53e449f11a58edc4589193611b76e7baf00e155ba1077bcca4d0cfae30826e946a0075f0 SHA512 5bf5645a7cbe626108cd71e1d189286ed161fcd3ea12cd34f4e392be4cf93bf78feb6128b1101bedc41a71091398f26771f3efd3880f779ee0be00f706914975
31 DIST libz-sys-1.0.18.crate 632715 BLAKE2B 3c88d321f22d8c49a17d2af04361792247f7590e4b21163033e5de7b726b75f91ee15d4e9a8824f4ae894ab8a1856c637982e5f1c70de8dbd543b75de2d1af94 SHA512 fcc9e5bd9ffd5eb4f302d3c271f86370f04fe9fcb3b818ac8d605241a701e9d0c40cfe729ad8fcbe7bbb07df66539503415a00360c56831a511142ff225d0d8c
32 DIST locale_config-0.2.2.crate 20975 BLAKE2B e675c792f5092670cc9f3a3ffecc9c3c35b2bd81f9557f1303a22a817b16d2d42c2289dc9c811b77d7ba76c5a62251550cb683555f05260004ce88d0c964f114 SHA512 969565323cbd9d6e3713052afe08aea606d4b4a336015eb1cc5e73f9ce3415df5eb54e4254c8df09a3a79fcfa3de0ca8c8194bd596f373868ee2ed659ac90a41
33 @@ -35,7 +34,6 @@ DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04
34 DIST memchr-2.1.3.crate 20069 BLAKE2B 6afd95538abae42fdb22b82964b64657555734f2505e12c650f844b91d60a3f6f61277065e15289b6e6b7ef8ae5345674ce7465ce2320822e13734949ddcd49c SHA512 95fca57233f023191da0c0abf4835c63ca38404b05c2021e1fcb910068c29321e0b89660088e1be432ed8aea2c4d53f14587e08dba0b258892f2e608606b3b57
35 DIST natord-1.0.9.crate 3866 BLAKE2B 8e8f576af50121e7571a1d919557ddc14a3c1511c12154a9cb74fa34cb5c2279406e1ae7ffb120242689e34d4f237d9548631f5a35f4f5d4369bafd8a728fcc6 SHA512 bf58eda54c759fecca1fd310bece370f26555bde1096081adc5bb1e9446a538f1652fb3049a52f898f4f62a2608805b72cb72dd52ff3fc9b88fe0a7c9071025a
36 DIST newsboat-2.13.tar.xz 460076 BLAKE2B e86fd3e3da8336527f3fd53e663f547a6066bfd1659bf83354a01139a9f6481afda893046faa1729cdfe03b19080032c70575cdcfd13b15aad40f2af808e2f6e SHA512 f7ce9717540e1c38809a44d531d28b26d5f9759479d311c127adec1ed6f3f6e8ad68799559ed31e9ecde7a988a683b0c9f58ff10e8dd4b2de60d75b7f8efe3da
37 -DIST newsboat-2.18.tar.xz 577632 BLAKE2B 290f115a2c17b05f9d32f44beab791a65df4e39c944ba88898c2fd1ad387199bbfe02885911a0d824aea7086d1d749aeaf40f9e585c3ea64d22fd8aaad879376 SHA512 63fc7ae45b26d6d5df85c9f2cec826a218aa54de26a9c99cb1d0dd239c885599e8c74bb5c8954d58176abf9c4bf4eb407cab830d2e24f9517e021a2b6b765485
38 DIST newsboat-2.19.tar.xz 591616 BLAKE2B 15c9502b607cd6d4f34b0d054c7ae54731d8de9df0bec4e12588e8bc89b92cdd46ce0bbf83a9a1ef160746e5768be63336f6a16b1f4100863d15329f9a0e18d1 SHA512 83e41b8ea96d6a53dad832898192f30dc30c74f32327466dff44ffd4b8bf1a966f55a55b8bde5b7e987f4df80ea83e5ad5211becd7fedc6836533f11f4a91b21
39 DIST nodrop-0.1.13.crate 7508 BLAKE2B 6918c8ea7f2b84d1a30e8159ac6cf9d061270bf8cf60fb2ee7c96f9d8a5566f1922a3222f80c769fceedd65637d6ee76a4d45b533d5b02aa0decb8114f6cb11a SHA512 2648c0aec970c99f001dbd8169939731610ccff6433acba8c71c669bea5078613b2a785d3ac5ce5a839fcec714b5bc55f2cc83522ab4cc09560c846f4cf8023e
40 DIST nom-4.2.3.crate 115343 BLAKE2B 03c0d1cf97a0d34adab29d6e21add3da7d8eb78ee6b7987ed11b136db7fc6afeca6a8eb91e00aadc1f6047eb7bff55bc288faa8c481e6a4677e0c43512a68f72 SHA512 663567dcc6310ecd6446bab1eb700f4ebe834a3b25bc2a0054edf14bcf205a95128de5f5dfaab04adb95e1a2241d487d59c0e23c957934a0d656e4c51932bd54
41 @@ -90,7 +88,6 @@ DIST time-0.1.42.crate 30005 BLAKE2B 6d85ae2e56612b5c6955921b671ac62ad10c174fa9f
42 DIST ucd-util-0.1.3.crate 25897 BLAKE2B d67d250603625d7fe55b1bd17a8bff03ddf2e48b531e8f754f51dcd49370a2b66d0915842fb2fce85a69df2c38f9c086ac3c36115d40c5a8138e5451f71a1cfe SHA512 50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e
43 DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
44 DIST unicode-normalization-0.1.8.crate 71158 BLAKE2B c548a2bc537abc6d86bffb0828a366ff82b143dcb0ee01e2c21b3b7134fd5f818f3775db391d358f4ebcb906ff256e3d2228ab042066a3de9a6747be05b8effa SHA512 4e3245689d6162a21cedb42e07b179e3aad03728a37b005c2e6bff644a6efd06b6bd26a20a255861a01441a9d15c4318575db3016248b96a03436212aa414547
45 -DIST unicode-segmentation-1.2.1.crate 68223 BLAKE2B 935c15d99571fc7fd597c2af9cee9333ccb1f19153fe7c8a835dce4f8cf13bd69e424d9e42b0a056b7035a9122bb5169cfbb96239aa2b3839e317aa495559e70 SHA512 431da71eb9056902c51a5ab53d239c8cf6448dc2f87be727628cb40a4808f5700f427936a9da4ef41935156896d9e0234b9de80aaae342b839e95c9a80d053b3
46 DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
47 DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
48 DIST url-1.7.2.crate 68597 BLAKE2B d8d7a4b05e956a956c745dbb536ff94abbe81af22e53af3d7baccf01ed7e556cc4f1f8e0a0d97c258c1f1a23209e1ae494079948de9f0d402901c0b6cdafc373 SHA512 c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04
49
50 diff --git a/net-news/newsboat/newsboat-2.18.ebuild b/net-news/newsboat/newsboat-2.18.ebuild
51 deleted file mode 100644
52 index f3bada46ab2..00000000000
53 --- a/net-news/newsboat/newsboat-2.18.ebuild
54 +++ /dev/null
55 @@ -1,167 +0,0 @@
56 -# Copyright 1999-2019 Gentoo Authors
57 -# Distributed under the terms of the GNU General Public License v2
58 -
59 -EAPI=7
60 -
61 -CRATES="
62 -aho-corasick-0.6.9
63 -argon2rs-0.2.5
64 -arrayvec-0.4.10
65 -autocfg-0.1.2
66 -backtrace-0.3.13
67 -backtrace-sys-0.1.28
68 -bitflags-1.0.4
69 -bit-set-0.5.1
70 -bit-vec-0.5.1
71 -blake2-rfc-0.2.18
72 -cc-1.0.29
73 -cfg-if-0.1.6
74 -chrono-0.4.6
75 -clap-2.33.0
76 -cloudabi-0.0.3
77 -constant_time_eq-0.1.3
78 -curl-sys-0.4.12
79 -dirs-1.0.4
80 -failure-0.1.5
81 -failure_derive-0.1.5
82 -fnv-1.0.6
83 -fuchsia-cprng-0.1.1
84 -gettext-rs-0.4.1
85 -gettext-sys-0.19.8
86 -idna-0.1.5
87 -kernel32-sys-0.2.2
88 -lazy_static-0.2.11
89 -lazy_static-1.2.0
90 -libc-0.2.48
91 -libz-sys-1.0.18
92 -locale_config-0.2.2
93 -lock_api-0.1.5
94 -matches-0.1.8
95 -memchr-2.1.3
96 -natord-1.0.9
97 -nodrop-0.1.13
98 -nom-4.2.3
99 -num-integer-0.1.39
100 -num-traits-0.2.6
101 -once_cell-0.1.8
102 -openssl-sys-0.9.53
103 -parking_lot-0.7.1
104 -parking_lot_core-0.4.0
105 -percent-encoding-1.0.1
106 -pkg-config-0.3.14
107 -proc-macro2-0.4.27
108 -proptest-0.7.2
109 -quick-error-1.2.2
110 -quote-0.6.11
111 -rand-0.4.6
112 -rand-0.5.6
113 -rand-0.6.5
114 -rand_chacha-0.1.1
115 -rand_core-0.3.1
116 -rand_core-0.4.0
117 -rand_hc-0.1.0
118 -rand_isaac-0.1.1
119 -rand_jitter-0.1.3
120 -rand_os-0.1.2
121 -rand_pcg-0.1.1
122 -rand_xorshift-0.1.1
123 -rdrand-0.4.0
124 -redox_syscall-0.1.51
125 -redox_users-0.2.0
126 -regex-0.2.11
127 -regex-1.1.0
128 -regex-syntax-0.4.2
129 -regex-syntax-0.5.6
130 -regex-syntax-0.6.5
131 -remove_dir_all-0.5.1
132 -rustc-demangle-0.1.13
133 -rustc_version-0.2.3
134 -rusty-fork-0.2.1
135 -scoped_threadpool-0.1.9
136 -scopeguard-0.3.3
137 -section_testing-0.0.4
138 -semver-0.9.0
139 -semver-parser-0.7.0
140 -smallvec-0.6.10
141 -syn-0.15.26
142 -synstructure-0.10.1
143 -tempfile-3.0.6
144 -textwrap-0.11.0
145 -thread_local-0.3.6
146 -time-0.1.42
147 -ucd-util-0.1.3
148 -unicode-bidi-0.3.4
149 -unicode-normalization-0.1.8
150 -unicode-segmentation-1.2.1
151 -unicode-width-0.1.5
152 -unicode-xid-0.1.0
153 -url-1.7.2
154 -utf8-ranges-1.0.2
155 -vcpkg-0.2.6
156 -version_check-0.1.5
157 -wait-timeout-0.1.5
158 -winapi-0.2.8
159 -winapi-0.3.6
160 -winapi-build-0.1.1
161 -winapi-i686-pc-windows-gnu-0.4.0
162 -winapi-x86_64-pc-windows-gnu-0.4.0
163 -xdg-2.2.0
164 -"
165 -
166 -inherit toolchain-funcs cargo
167 -
168 -DESCRIPTION="An RSS/Atom feed reader for text terminals"
169 -HOMEPAGE="https://newsboat.org/ https://github.com/newsboat/newsboat"
170 -SRC_URI="
171 - https://newsboat.org/releases/${PV}/${P}.tar.xz
172 - $(cargo_crate_uris ${CRATES})
173 -"
174 -
175 -LICENSE="Apache-2.0 BSD-2 CC0-1.0 ISC MIT Unlicense"
176 -SLOT="0"
177 -KEYWORDS="~amd64 ~ppc64 ~x86"
178 -IUSE="libressl"
179 -
180 -RDEPEND="
181 - >=dev-db/sqlite-3.5:3
182 - >=dev-libs/stfl-0.21
183 - >=net-misc/curl-7.18.0
184 - >=dev-libs/json-c-0.11:=
185 - dev-libs/libxml2
186 - sys-libs/ncurses:0=[unicode]
187 -"
188 -DEPEND="${RDEPEND}
189 - app-text/asciidoc
190 - virtual/pkgconfig
191 - sys-devel/gettext
192 - sys-libs/zlib
193 - !libressl? ( dev-libs/openssl:0= )
194 - libressl? ( dev-libs/libressl:0= )
195 -"
196 -
197 -PATCHES=(
198 - "${FILESDIR}"/${PN}-2.11-flags.patch
199 - "${FILESDIR}"/${PN}-2.17.1-libressl.patch
200 -)
201 -
202 -src_configure() {
203 - ./config.sh || die
204 -}
205 -
206 -src_compile() {
207 - export CARGO_HOME="${ECARGO_HOME}"
208 - emake prefix="/usr" CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
209 -}
210 -
211 -src_test() {
212 - # tests require UTF-8 locale
213 - emake CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" test
214 - # Tests fail if in ${S} rather than in ${S}/test
215 - cd "${S}"/test || die
216 - ./test || die
217 -}
218 -
219 -src_install() {
220 - emake DESTDIR="${D}" prefix="/usr" docdir="/usr/share/doc/${PF}" install
221 - einstalldocs
222 -}
223
224 diff --git a/net-news/newsboat/newsboat-2.19-r1.ebuild b/net-news/newsboat/newsboat-2.19-r1.ebuild
225 index 2729ac49920..b2899009efd 100644
226 --- a/net-news/newsboat/newsboat-2.19-r1.ebuild
227 +++ b/net-news/newsboat/newsboat-2.19-r1.ebuild
228 @@ -136,8 +136,8 @@ DEPEND="${RDEPEND}
229 virtual/pkgconfig
230 sys-devel/gettext
231 sys-libs/zlib
232 - !libressl? ( dev-libs/openssl:0= )
233 - libressl? ( dev-libs/libressl:0= )
234 + !libressl? ( <dev-libs/openssl-1.1.2:0= )
235 + libressl? ( <dev-libs/libressl-3.1:0= )
236 "
237
238 PATCHES=(