Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/linkchecker/, net-analyzer/linkchecker/files/
Date: Sun, 15 Oct 2017 21:11:35
Message-Id: 1508101876.3daf4a7b1c4e485e0679b4abdd7cead0ee3f9a45.monsieurp@gentoo
1 commit: 3daf4a7b1c4e485e0679b4abdd7cead0ee3f9a45
2 Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
3 AuthorDate: Wed Oct 11 09:53:58 2017 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 15 21:11:16 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3daf4a7b
7
8 net-analyzer/linkchecker: version bump to 9.3.1.
9
10 Package-Manager: Portage-2.3.10, Repoman-2.3.3
11 Closes: https://github.com/gentoo/gentoo/pull/5916
12
13 net-analyzer/linkchecker/Manifest | 1 +
14 .../files/linkchecker-9.3.1-build-fix.patch | 14 +++++++++++
15 net-analyzer/linkchecker/linkchecker-9.3-r2.ebuild | 2 +-
16 ...cker-9.3-r2.ebuild => linkchecker-9.3.1.ebuild} | 27 ++++++++--------------
17 4 files changed, 26 insertions(+), 18 deletions(-)
18
19 diff --git a/net-analyzer/linkchecker/Manifest b/net-analyzer/linkchecker/Manifest
20 index 05bbc69fa0d..773d88e95e5 100644
21 --- a/net-analyzer/linkchecker/Manifest
22 +++ b/net-analyzer/linkchecker/Manifest
23 @@ -1 +1,2 @@
24 DIST LinkChecker-9.3.tar.gz 719896 SHA256 ee0aa60de440fdcf8587ddebf1f691bc777a32d8d4f119beed63f405dc56176d SHA512 26686e5373aaa942b631b5184f8bda8fbe1410c8875bf8499a2b61dc18b7bdfa29a3c18edf98c28dc189a493a3f5794a0020a0211b7d5d3814b33994603dcc59 WHIRLPOOL 6b0b41d3edacafba6ae5df5b0f4ccf1fb5877c938acdd2d66c443bf10c43fcc9213f08cfff212a1a259d9f767138cd04fc1c481db1594d426784b0ce5702ee5f
25 +DIST linkchecker-9.3.1.tar.gz 779286 SHA256 612728431204e1cab808d633b6f3751be67f9f5ac0cf582be248352bc1a8408c SHA512 355c9d262502e123732807b5aaabc17060d267de44a6dc1fee9dd6655c56320ded0c1ff638d985c2dbec366d15803cfb78fae4c1a9943de11c5b4292f5a99305 WHIRLPOOL 90310eaf43d7e5c2b6af530333a46c6d834cc845a4856ad51c26000be2c42c865dfbf45fd2a2629dff253c4584724a43bfb6a85b23a8aa1e6c594136556957e5
26
27 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
28 new file mode 100644
29 index 00000000000..bcfd2cc800e
30 --- /dev/null
31 +++ b/net-analyzer/linkchecker/files/linkchecker-9.3.1-build-fix.patch
32 @@ -0,0 +1,14 @@
33 +diff --git a/setup.py b/setup.py
34 +index b42ed8c..ec206e6 100755
35 +--- a/setup.py
36 ++++ b/setup.py
37 +@@ -654,8 +654,7 @@ myemail = "bastian.kleineidam@×××.de"
38 +
39 + data_files = [
40 + ('share/linkchecker',
41 +- ['config/linkcheckerrc',
42 +- 'doc/html/lccollection.qhc', 'doc/html/lcdoc.qch']),
43 ++ ['config/linkcheckerrc']),
44 + ('share/linkchecker/examples',
45 + ['cgi-bin/lconline/leer.html.en',
46 + 'cgi-bin/lconline/leer.html.de',
47
48 diff --git a/net-analyzer/linkchecker/linkchecker-9.3-r2.ebuild b/net-analyzer/linkchecker/linkchecker-9.3-r2.ebuild
49 index e0b3d0f0fb5..dd9526e518a 100644
50 --- a/net-analyzer/linkchecker/linkchecker-9.3-r2.ebuild
51 +++ b/net-analyzer/linkchecker/linkchecker-9.3-r2.ebuild
52 @@ -22,7 +22,7 @@ IUSE="gnome sqlite X"
53
54 RDEPEND="
55 virtual/python-dnspython[${PYTHON_USEDEP}]
56 - >=dev-python/requests-2.2.1[${PYTHON_USEDEP}]
57 + <dev-python/requests-2.15[${PYTHON_USEDEP}]
58 gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
59 X? (
60 dev-python/PyQt4[X,help,${PYTHON_USEDEP}]
61
62 diff --git a/net-analyzer/linkchecker/linkchecker-9.3-r2.ebuild b/net-analyzer/linkchecker/linkchecker-9.3.1.ebuild
63 similarity index 74%
64 copy from net-analyzer/linkchecker/linkchecker-9.3-r2.ebuild
65 copy to net-analyzer/linkchecker/linkchecker-9.3.1.ebuild
66 index e0b3d0f0fb5..512db84e331 100644
67 --- a/net-analyzer/linkchecker/linkchecker-9.3-r2.ebuild
68 +++ b/net-analyzer/linkchecker/linkchecker-9.3.1.ebuild
69 @@ -1,28 +1,25 @@
70 # Copyright 1999-2017 Gentoo Foundation
71 # Distributed under the terms of the GNU General Public License v2
72
73 -EAPI=5
74 +EAPI=6
75
76 PYTHON_COMPAT=( python2_7 )
77 PYTHON_REQ_USE="sqlite?"
78
79 inherit bash-completion-r1 distutils-r1 eutils multilib
80
81 -MY_PN="${PN/linkchecker/LinkChecker}"
82 -MY_P="${MY_PN}-${PV}"
83 -
84 DESCRIPTION="Check websites for broken links"
85 -HOMEPAGE="https://wummel.github.com/linkchecker/ https://pypi.python.org/pypi/linkchecker/"
86 -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
87 +HOMEPAGE="https://github.com/linkcheck/linkchecker"
88 +SRC_URI="https://github.com/linkcheck/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
89
90 LICENSE="GPL-2"
91 SLOT="0"
92 -KEYWORDS="amd64 x86 ~ppc-macos ~x64-solaris"
93 +KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-solaris"
94 IUSE="gnome sqlite X"
95
96 RDEPEND="
97 virtual/python-dnspython[${PYTHON_USEDEP}]
98 - >=dev-python/requests-2.2.1[${PYTHON_USEDEP}]
99 + <dev-python/requests-2.15.0[${PYTHON_USEDEP}]
100 gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
101 X? (
102 dev-python/PyQt4[X,help,${PYTHON_USEDEP}]
103 @@ -36,17 +33,13 @@ DEPEND="
104
105 RESTRICT="test"
106
107 -S="${WORKDIR}/${MY_P}"
108 -
109 python_prepare_all() {
110 local PATCHES=(
111 - "${FILESDIR}"/${PN}-9.2-unbundle.patch
112 - "${FILESDIR}"/${P}-bash-completion.patch
113 - "${FILESDIR}"/${P}-desktop.patch
114 - "${FILESDIR}"/${P}-requests-check.patch
115 - )
116 -
117 - emake -C doc/html
118 + "${FILESDIR}/${PN}-9.2-unbundle.patch"
119 + "${FILESDIR}/${PN}-9.3-bash-completion.patch"
120 + "${FILESDIR}/${PN}-9.3-desktop.patch"
121 + "${FILESDIR}/${PN}-9.3.1-build-fix.patch"
122 + )
123
124 distutils-r1_python_prepare_all
125 }