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 90D85139335 for ; Mon, 28 Jun 2021 21:32:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AC722E0863; Mon, 28 Jun 2021 21:32:07 +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 010EAE0863 for ; Mon, 28 Jun 2021 21:32:06 +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 9E794335D76 for ; Mon, 28 Jun 2021 21:32:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 35234581 for ; Mon, 28 Jun 2021 21:32:04 +0000 (UTC) From: "Maciej Barć" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Maciej Barć" Message-ID: <1624915918.3aced0ee737e149de1b0b5ff93e92cb92f90684e.xgqt@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-text/komikku/ X-VCS-Repository: repo/proj/guru X-VCS-Files: app-text/komikku/komikku-0.29.2.ebuild X-VCS-Directories: app-text/komikku/ X-VCS-Committer: xgqt X-VCS-Committer-Name: Maciej Barć X-VCS-Revision: 3aced0ee737e149de1b0b5ff93e92cb92f90684e X-VCS-Branch: dev Date: Mon, 28 Jun 2021 21:32:04 +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: 7d872bfd-29ea-4c13-a4ca-e6c14811ccaf X-Archives-Hash: a4572807c8c11ba06fb4b74f868826fa commit: 3aced0ee737e149de1b0b5ff93e92cb92f90684e Author: Maciej Barć riseup net> AuthorDate: Mon Jun 28 21:31:04 2021 +0000 Commit: Maciej Barć riseup net> CommitDate: Mon Jun 28 21:31:58 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3aced0ee app-text/komikku: fix variables; GTK slot 3 also, change src_install to use sed to fix EPYTHON Package-Manager: Portage-3.0.20, Repoman-3.0.2 Signed-off-by: Maciej Barć riseup.net> app-text/komikku/komikku-0.29.2.ebuild | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/app-text/komikku/komikku-0.29.2.ebuild b/app-text/komikku/komikku-0.29.2.ebuild index f9b769d34..70f88edb6 100644 --- a/app-text/komikku/komikku-0.29.2.ebuild +++ b/app-text/komikku/komikku-0.29.2.ebuild @@ -3,8 +3,8 @@ EAPI=7 -MY_PN="Komikku" -MY_P="${MY_PN}-${PV}" +MY_PN="${PN^}" +MY_P="${MY_PN}-v${PV}" PYTHON_COMPAT=( python3_{8,9} ) @@ -12,7 +12,7 @@ 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" +SRC_URI="https://gitlab.com/valos/${MY_PN}/-/archive/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz" RESTRICT="test" KEYWORDS="~amd64" @@ -23,7 +23,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND=" >=gui-libs/libhandy-1.2.0 - >=x11-libs/gtk+-3.24.10 + >=x11-libs/gtk+-3.24.10:3 $(python_gen_cond_dep ' dev-python/beautifulsoup:4[${PYTHON_USEDEP}] dev-python/cloudscraper[${PYTHON_USEDEP}] @@ -42,7 +42,7 @@ RDEPEND=" ${DEPEND} " -S="${WORKDIR}/${MY_PN}-v${PV}" +S="${WORKDIR}/${MY_P}" pkg_setup() { python-single-r1_pkg_setup @@ -52,9 +52,8 @@ src_install() { meson_src_install python_optimize - # Dirty hack (python_doscript doesn't work) - echo "#!/usr/bin/${EPYTHON} - $(cat ${D}/usr/bin/${PN})" > "${D}/usr/bin/${PN}" + sed -i "s/#!.*/#!${EPYTHON}/" "${D}/usr/bin/${PN}" || + die "Failed to fix ${D}/usr/bin/${PN} interpreter" } pkg_preinst() {