Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/linkchecker/
Date: Tue, 30 Jan 2018 23:21:34
Message-Id: 1517354464.83a236efa0f92cd887c47c27fb17cd73ab04f090.asturm@gentoo
1 commit: 83a236efa0f92cd887c47c27fb17cd73ab04f090
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 30 23:13:22 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 30 23:21:04 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83a236ef
7
8 net-analyzer/linkchecker: Drop USE=X
9
10 Bug: https://bugs.gentoo.org/634972
11 Package-Manager: Portage-2.3.21, Repoman-2.3.6
12
13 .../linkchecker/linkchecker-9.3.1-r1.ebuild | 32 ++++++++--------------
14 1 file changed, 11 insertions(+), 21 deletions(-)
15
16 diff --git a/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild b/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
17 index 109499f785b..2587e19ebf2 100644
18 --- a/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
19 +++ b/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
20 @@ -15,21 +15,14 @@ SRC_URI="https://github.com/linkcheck/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
21 LICENSE="GPL-2"
22 SLOT="0"
23 KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-solaris"
24 -IUSE="gnome sqlite X"
25 +IUSE="gnome sqlite"
26
27 RDEPEND="
28 virtual/python-dnspython[${PYTHON_USEDEP}]
29 dev-python/requests[${PYTHON_USEDEP}]
30 gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
31 - X? (
32 - dev-python/PyQt4[X,help,${PYTHON_USEDEP}]
33 - dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
34 - )"
35 -DEPEND="
36 - X? (
37 - dev-qt/qthelp:4
38 - dev-python/markdown2[${PYTHON_USEDEP}]
39 - )"
40 +"
41 +DEPEND=""
42
43 RESTRICT="test"
44
45 @@ -37,7 +30,6 @@ python_prepare_all() {
46 local PATCHES=(
47 "${FILESDIR}/${PN}-9.2-unbundle.patch"
48 "${FILESDIR}/${PN}-9.3-bash-completion.patch"
49 - "${FILESDIR}/${PN}-9.3-desktop.patch"
50 "${FILESDIR}/${PN}-9.3.1-build-fix.patch"
51 "${FILESDIR}/${PN}-9.3.1-requests.patch"
52 )
53 @@ -46,6 +38,12 @@ python_prepare_all() {
54 }
55
56 python_install_all() {
57 + delete_gui() {
58 + rm -rf \
59 + "${ED}"/usr/bin/linkchecker-gui* \
60 + "${ED}"/$(python_get_sitedir)/linkcheck/gui* || die
61 + }
62 +
63 DOCS=(
64 doc/upgrading.txt
65 doc/python3.txt
66 @@ -53,17 +51,9 @@ python_install_all() {
67 doc/development.txt
68 )
69 distutils-r1_python_install_all
70 - if ! use X; then
71 - delete_gui() {
72 - rm -rf \
73 - "${ED}"/usr/bin/linkchecker-gui* \
74 - "${ED}"/$(python_get_sitedir)/linkcheck/gui* || die
75 - }
76 - python_foreach_impl delete_gui
77 - rm -f "${ED}"/usr/share/applications/linkchecker*.desktop || die
78 - fi
79
80 - rm -f "${ED}"/usr/share/applications/linkchecker.desktop || die
81 + python_foreach_impl delete_gui
82 + rm -f "${ED}"/usr/share/applications/linkchecker*.desktop || die
83
84 newicon doc/html/logo64x64.png ${PN}.png