From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 69D891382C5 for ; Tue, 30 Jan 2018 23:21:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C2EDCE0AF2; Tue, 30 Jan 2018 23:21:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A38E0E0AF2 for ; Tue, 30 Jan 2018 23:21:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D8F91335C64 for ; Tue, 30 Jan 2018 23:21:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5432E1CF for ; Tue, 30 Jan 2018 23:21:29 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1517354464.83a236efa0f92cd887c47c27fb17cd73ab04f090.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/linkchecker/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild X-VCS-Directories: net-analyzer/linkchecker/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 83a236efa0f92cd887c47c27fb17cd73ab04f090 X-VCS-Branch: master Date: Tue, 30 Jan 2018 23:21:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6323a5ba-6ee0-43be-82d2-630051f4332b X-Archives-Hash: 2c5d0bc8a40787e70914af3d6c072bfb commit: 83a236efa0f92cd887c47c27fb17cd73ab04f090 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jan 30 23:13:22 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jan 30 23:21:04 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83a236ef net-analyzer/linkchecker: Drop USE=X Bug: https://bugs.gentoo.org/634972 Package-Manager: Portage-2.3.21, Repoman-2.3.6 .../linkchecker/linkchecker-9.3.1-r1.ebuild | 32 ++++++++-------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild b/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild index 109499f785b..2587e19ebf2 100644 --- a/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild +++ b/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild @@ -15,21 +15,14 @@ SRC_URI="https://github.com/linkcheck/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-solaris" -IUSE="gnome sqlite X" +IUSE="gnome sqlite" RDEPEND=" virtual/python-dnspython[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] ) - X? ( - dev-python/PyQt4[X,help,${PYTHON_USEDEP}] - dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}] - )" -DEPEND=" - X? ( - dev-qt/qthelp:4 - dev-python/markdown2[${PYTHON_USEDEP}] - )" +" +DEPEND="" RESTRICT="test" @@ -37,7 +30,6 @@ python_prepare_all() { local PATCHES=( "${FILESDIR}/${PN}-9.2-unbundle.patch" "${FILESDIR}/${PN}-9.3-bash-completion.patch" - "${FILESDIR}/${PN}-9.3-desktop.patch" "${FILESDIR}/${PN}-9.3.1-build-fix.patch" "${FILESDIR}/${PN}-9.3.1-requests.patch" ) @@ -46,6 +38,12 @@ python_prepare_all() { } python_install_all() { + delete_gui() { + rm -rf \ + "${ED}"/usr/bin/linkchecker-gui* \ + "${ED}"/$(python_get_sitedir)/linkcheck/gui* || die + } + DOCS=( doc/upgrading.txt doc/python3.txt @@ -53,17 +51,9 @@ python_install_all() { doc/development.txt ) distutils-r1_python_install_all - if ! use X; then - delete_gui() { - rm -rf \ - "${ED}"/usr/bin/linkchecker-gui* \ - "${ED}"/$(python_get_sitedir)/linkcheck/gui* || die - } - python_foreach_impl delete_gui - rm -f "${ED}"/usr/share/applications/linkchecker*.desktop || die - fi - rm -f "${ED}"/usr/share/applications/linkchecker.desktop || die + python_foreach_impl delete_gui + rm -f "${ED}"/usr/share/applications/linkchecker*.desktop || die newicon doc/html/logo64x64.png ${PN}.png