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 DD63D1382C5 for ; Sat, 19 Dec 2020 19:52:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3495BE08CE; Sat, 19 Dec 2020 19:52:48 +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 1B409E08CE for ; Sat, 19 Dec 2020 19:52:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 DBC5734122F for ; Sat, 19 Dec 2020 19:52:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 64BFCD0 for ; Sat, 19 Dec 2020 19:52:45 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1608404372.b54356ae1bac6317d873c3d14a352e80f1d11ea1.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: app-text/komikku/ X-VCS-Repository: repo/proj/guru X-VCS-Files: app-text/komikku/komikku-0.24.0.ebuild X-VCS-Directories: app-text/komikku/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: b54356ae1bac6317d873c3d14a352e80f1d11ea1 X-VCS-Branch: master Date: Sat, 19 Dec 2020 19:52:45 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 576ad8dc-e8c3-49a1-8895-0bbd49d5a57d X-Archives-Hash: 441751723cd504667ffae0f56f4096f6 commit: b54356ae1bac6317d873c3d14a352e80f1d11ea1 Author: Maciej Barć protonmail com> AuthorDate: Sat Dec 19 18:59:32 2020 +0000 Commit: Andrew Ammerlaan riseup net> CommitDate: Sat Dec 19 18:59:32 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b54356ae app-text/komikku: fix; use python-single-r1 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Maciej Barć protonmail.com> app-text/komikku/komikku-0.24.0.ebuild | 39 +++++++++++++++++----------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/app-text/komikku/komikku-0.24.0.ebuild b/app-text/komikku/komikku-0.24.0.ebuild index e8316d26..8332e74b 100644 --- a/app-text/komikku/komikku-0.24.0.ebuild +++ b/app-text/komikku/komikku-0.24.0.ebuild @@ -7,33 +7,32 @@ MY_PN="Komikku" MY_P="${MY_PN}-${PV}" PYTHON_COMPAT=( python3_{7,8} ) -DISTUTILS_USE_SETUPTOOLS=no -inherit distutils-r1 meson gnome2-utils xdg +inherit python-single-r1 meson gnome2-utils xdg DESCRIPTION="An online/offline manga reader for GNOME" HOMEPAGE="https://gitlab.com/valos/Komikku" SRC_URI="https://gitlab.com/valos/${MY_PN}/-/archive/v${PV}/${MY_PN}-v${PV}.tar.gz -> ${P}.tar.gz" +RESTRICT="test" KEYWORDS="~amd64" LICENSE="GPL-3" SLOT="0" -# Requires network connection to test -RESTRICT="test" - DEPEND=" >=gui-libs/libhandy-1.0.2 >=x11-libs/gtk+-3.24.10 - dev-python/beautifulsoup:4[${PYTHON_USEDEP}] - dev-python/cloudscraper[${PYTHON_USEDEP}] - dev-python/dateparser[${PYTHON_USEDEP}] - dev-python/keyring[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] - dev-python/pure-protobuf[${PYTHON_USEDEP}] - dev-python/python-magic[${PYTHON_USEDEP}] - dev-python/unidecode[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/beautifulsoup:4[${PYTHON_USEDEP}] + dev-python/cloudscraper[${PYTHON_USEDEP}] + dev-python/dateparser[${PYTHON_USEDEP}] + dev-python/keyring[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/pure-protobuf[${PYTHON_USEDEP}] + dev-python/python-magic[${PYTHON_USEDEP}] + dev-python/unidecode[${PYTHON_USEDEP}] + ') " RDEPEND=" ${DEPEND} @@ -41,15 +40,17 @@ RDEPEND=" S="${WORKDIR}/${MY_PN}-v${PV}" -distutils_enable_tests pytest +pkg_setup() { + python-single-r1_pkg_setup +} src_install() { meson_src_install - python_foreach_impl python_optimize -} + python_optimize -src_test() { - PYTHONPATH="${S}:${PYTHONPATH}" python_foreach_impl python_test + # Dirty hack (python_doscript doesn't work) + echo "#!/usr/bin/${EPYTHON} + $(cat ${D}/usr/bin/${PN})" > "${D}/usr/bin/${PN}" } pkg_preinst() {