Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/linkchecker/, net-analyzer/linkchecker/files/
Date: Mon, 18 Feb 2019 21:24:07
Message-Id: 1550525025.08bb86fb332c5a90aa41e52d0a609a2fb4ca57da.pacho@gentoo
1 commit: 08bb86fb332c5a90aa41e52d0a609a2fb4ca57da
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 18 21:17:59 2019 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 18 21:23:45 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08bb86fb
7
8 net-analyzer/linkchecker: Drop old
9
10 Package-Manager: Portage-2.3.61, Repoman-2.3.12
11 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
12
13 net-analyzer/linkchecker/Manifest | 1 -
14 .../files/linkchecker-9.2-unbundle.patch | 30 ----------
15 .../files/linkchecker-9.3.1-build-fix.patch | 14 -----
16 .../files/linkchecker-9.3.1-requests.patch | 46 ---------------
17 .../linkchecker/linkchecker-9.3.1-r1.ebuild | 69 ----------------------
18 5 files changed, 160 deletions(-)
19
20 diff --git a/net-analyzer/linkchecker/Manifest b/net-analyzer/linkchecker/Manifest
21 index 667d05c1cc1..b02b528ba45 100644
22 --- a/net-analyzer/linkchecker/Manifest
23 +++ b/net-analyzer/linkchecker/Manifest
24 @@ -1,2 +1 @@
25 -DIST linkchecker-9.3.1.tar.gz 779286 BLAKE2B eec374a3455b5348533b29b03ab14558dd19a20e1058947eed9d8027a8b1705b63525e6b8fcf2c4feb59a782ca0e0ad8567e321ca4679320e9d6f256e14df990 SHA512 355c9d262502e123732807b5aaabc17060d267de44a6dc1fee9dd6655c56320ded0c1ff638d985c2dbec366d15803cfb78fae4c1a9943de11c5b4292f5a99305
26 DIST linkchecker-9.4.0.tar.gz 489909 BLAKE2B 1c9d9af96778f9d2b542a078ba9da8751d6f7bc170809d5eefef6e8e2d5587e969f1cba3d6ae116b6de981949dd638b0d78fc416ce5055b3156da308b5a95d67 SHA512 3423f710a46d921c4387ffcfe1a8632cb889bcfdb4d56cbabcae87ca41547221e854546efd6e440e798ea85531c34a35f3ab779cd6bc2b6e63095015ad0537ba
27
28 diff --git a/net-analyzer/linkchecker/files/linkchecker-9.2-unbundle.patch b/net-analyzer/linkchecker/files/linkchecker-9.2-unbundle.patch
29 deleted file mode 100644
30 index 598f856b000..00000000000
31 --- a/net-analyzer/linkchecker/files/linkchecker-9.2-unbundle.patch
32 +++ /dev/null
33 @@ -1,30 +0,0 @@
34 - setup.py | 7 -------
35 - 1 file changed, 7 deletions(-)
36 -
37 -diff --git a/setup.py b/setup.py
38 -old mode 100755
39 -new mode 100644
40 -index dc30a7d..d62622b
41 ---- a/setup.py
42 -+++ b/setup.py
43 -@@ -900,9 +900,6 @@ o a command line, GUI and web interface
44 - 'py2exe': MyPy2exe,
45 - 'py2app': MyPy2app,
46 - },
47 -- package_dir = {
48 -- 'linkcheck_dns.dns': 'third_party/dnspython/dns',
49 -- },
50 - packages = [
51 - 'linkcheck',
52 - 'linkcheck.bookmarks',
53 -@@ -917,10 +914,6 @@ o a command line, GUI and web interface
54 - 'linkcheck.network',
55 - 'linkcheck.parser',
56 - 'linkcheck.plugins',
57 -- 'linkcheck_dns.dns',
58 -- 'linkcheck_dns.dns.rdtypes',
59 -- 'linkcheck_dns.dns.rdtypes.ANY',
60 -- 'linkcheck_dns.dns.rdtypes.IN',
61 - ],
62 - ext_modules = [
63 - Extension('linkcheck.HtmlParser.htmlsax',
64
65 diff --git a/net-analyzer/linkchecker/files/linkchecker-9.3.1-build-fix.patch b/net-analyzer/linkchecker/files/linkchecker-9.3.1-build-fix.patch
66 deleted file mode 100644
67 index bcfd2cc800e..00000000000
68 --- a/net-analyzer/linkchecker/files/linkchecker-9.3.1-build-fix.patch
69 +++ /dev/null
70 @@ -1,14 +0,0 @@
71 -diff --git a/setup.py b/setup.py
72 -index b42ed8c..ec206e6 100755
73 ---- a/setup.py
74 -+++ b/setup.py
75 -@@ -654,8 +654,7 @@ myemail = "bastian.kleineidam@×××.de"
76 -
77 - data_files = [
78 - ('share/linkchecker',
79 -- ['config/linkcheckerrc',
80 -- 'doc/html/lccollection.qhc', 'doc/html/lcdoc.qch']),
81 -+ ['config/linkcheckerrc']),
82 - ('share/linkchecker/examples',
83 - ['cgi-bin/lconline/leer.html.en',
84 - 'cgi-bin/lconline/leer.html.de',
85
86 diff --git a/net-analyzer/linkchecker/files/linkchecker-9.3.1-requests.patch b/net-analyzer/linkchecker/files/linkchecker-9.3.1-requests.patch
87 deleted file mode 100644
88 index 56c57fa3799..00000000000
89 --- a/net-analyzer/linkchecker/files/linkchecker-9.3.1-requests.patch
90 +++ /dev/null
91 @@ -1,46 +0,0 @@
92 -From 9b12b5d66fa9b832f4d9e19a0b9dcb92607ee3e5 Mon Sep 17 00:00:00 2001
93 -From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@××××××.org>
94 -Date: Mon, 2 Oct 2017 20:18:54 -0400
95 -Subject: [PATCH] workaround new limitation in requests
96 -
97 -newer requests do not expose the internal SSL socket object so we
98 -cannot verify certificates. there was work to allow custom
99 -verification routines which we could use, but this never finished:
100 -
101 -https://github.com/shazow/urllib3/pull/257
102 -
103 -so right now, just treat missing socket information as if the cert was
104 -missing.
105 -
106 -Closes: #76
107 ----
108 - linkcheck/checker/httpurl.py | 9 ++++++++-
109 - 1 file changed, 8 insertions(+), 1 deletion(-)
110 -
111 -diff --git a/linkcheck/checker/httpurl.py b/linkcheck/checker/httpurl.py
112 -index 161619c5..bde77c70 100644
113 ---- a/linkcheck/checker/httpurl.py
114 -+++ b/linkcheck/checker/httpurl.py
115 -@@ -194,6 +194,10 @@ def _get_ssl_sock(self):
116 - """Get raw SSL socket."""
117 - assert self.scheme == u"https", self
118 - raw_connection = self.url_connection.raw._connection
119 -+ if not raw_connection:
120 -+ # this happens with newer requests versions:
121 -+ # https://github.com/linkcheck/linkchecker/issues/76
122 -+ return None
123 - if raw_connection.sock is None:
124 - # sometimes the socket is not yet connected
125 - # see https://github.com/kennethreitz/requests/issues/1966
126 -@@ -204,7 +208,10 @@ def _add_ssl_info(self):
127 - """Add SSL cipher info."""
128 - if self.scheme == u'https':
129 - sock = self._get_ssl_sock()
130 -- if hasattr(sock, 'cipher'):
131 -+ if not sock:
132 -+ log.debug(LOG_CHECK, "cannot extract SSL certificate from connection")
133 -+ self.ssl_cert = None
134 -+ elif hasattr(sock, 'cipher'):
135 - self.ssl_cert = sock.getpeercert()
136 - else:
137 - # using pyopenssl
138
139 diff --git a/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild b/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
140 deleted file mode 100644
141 index dd72dc62cfd..00000000000
142 --- a/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
143 +++ /dev/null
144 @@ -1,69 +0,0 @@
145 -# Copyright 1999-2018 Gentoo Foundation
146 -# Distributed under the terms of the GNU General Public License v2
147 -
148 -EAPI=6
149 -
150 -PYTHON_COMPAT=( python2_7 )
151 -PYTHON_REQ_USE="sqlite?"
152 -
153 -inherit bash-completion-r1 distutils-r1 eutils
154 -
155 -DESCRIPTION="Check websites for broken links"
156 -HOMEPAGE="https://github.com/linkcheck/linkchecker"
157 -SRC_URI="https://github.com/linkcheck/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
158 -
159 -LICENSE="GPL-2"
160 -SLOT="0"
161 -KEYWORDS="amd64 x86 ~ppc-macos ~x64-solaris"
162 -IUSE="gnome sqlite"
163 -
164 -RDEPEND="
165 - dev-python/requests[${PYTHON_USEDEP}]
166 - virtual/python-dnspython[${PYTHON_USEDEP}]
167 - gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
168 -"
169 -DEPEND=""
170 -
171 -RESTRICT="test"
172 -
173 -python_prepare_all() {
174 - local PATCHES=(
175 - "${FILESDIR}/${PN}-9.2-unbundle.patch"
176 - "${FILESDIR}/${PN}-9.3-bash-completion.patch"
177 - "${FILESDIR}/${PN}-9.3.1-build-fix.patch"
178 - "${FILESDIR}/${PN}-9.3.1-requests.patch"
179 - )
180 -
181 - distutils-r1_python_prepare_all
182 -}
183 -
184 -python_install_all() {
185 - delete_gui() {
186 - rm -rf \
187 - "${ED}"/usr/bin/linkchecker-gui* \
188 - "${ED}"/$(python_get_sitedir)/linkcheck/gui* || die
189 - }
190 -
191 - DOCS=(
192 - doc/upgrading.txt
193 - doc/python3.txt
194 - doc/changelog.txt
195 - doc/development.txt
196 - )
197 - distutils-r1_python_install_all
198 -
199 - python_foreach_impl delete_gui
200 - rm -f "${ED}"/usr/share/applications/linkchecker*.desktop || die
201 -
202 - newicon doc/html/logo64x64.png ${PN}.png
203 -
204 - docinto html
205 - dodoc doc/html/*
206 - newbashcomp config/linkchecker-completion ${PN}
207 -}
208 -
209 -pkg_postinst() {
210 - optfeature "bash-completion support" dev-python/argcomplete[${PYTHON_USEDEP}]
211 - optfeature "Virus scanning" app-antivirus/clamav
212 - optfeature "Geo IP support" dev-python/geoip-python[${PYTHON_USEDEP}]
213 -}