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 A96C1138350 for ; Thu, 23 Apr 2020 21:24:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 96892E0C32; Thu, 23 Apr 2020 21:24:34 +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 7E0DEE0C32 for ; Thu, 23 Apr 2020 21:24:34 +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 8F6EA34F242 for ; Thu, 23 Apr 2020 21:24:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8A2FD1F3 for ; Thu, 23 Apr 2020 21:24:30 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1587677053.d09e23d78db4632f8d5e72382eca67be5d4e91d1.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/fs-uae-launcher/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.3.ebuild X-VCS-Directories: app-emulation/fs-uae-launcher/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: d09e23d78db4632f8d5e72382eca67be5d4e91d1 X-VCS-Branch: master Date: Thu, 23 Apr 2020 21:24:30 +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: 44cda3fc-5ff0-48b7-b624-a9b19b75d8b1 X-Archives-Hash: b8d7f4a4eed03e87db28af5ff2fa5825 commit: d09e23d78db4632f8d5e72382eca67be5d4e91d1 Author: James Le Cuirot gentoo org> AuthorDate: Thu Apr 23 21:23:17 2020 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Thu Apr 23 21:24:13 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d09e23d7 app-emulation/fs-uae-launcher: Fix following eclass changes, add Py3.8 Closes: https://bugs.gentoo.org/718372 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: James Le Cuirot gentoo.org> .../fs-uae-launcher/fs-uae-launcher-3.0.3.ebuild | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.3.ebuild b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.3.ebuild index 53aa235293c..14013d591da 100644 --- a/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.3.ebuild +++ b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.3.ebuild @@ -3,10 +3,11 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7,8} ) DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_SETUPTOOLS=no -inherit distutils-r1 xdg-utils +inherit distutils-r1 xdg DESCRIPTION="PyQt5-based launcher for FS-UAE" HOMEPAGE="https://fs-uae.net/" @@ -26,7 +27,7 @@ RDEPEND=" ') " -DEPEND=" +BDEPEND=" sys-devel/gettext " @@ -39,19 +40,21 @@ src_prepare() { # Unbundle OpenGL library. Keep oyoyo IRC library because upstream # is long dead and it's not worth packaging separately. - rm -r OpenGL || die + rm -r OpenGL/ || die sed -i -r "/OpenGL/d" setup.py || die } -src_compile() { +python_compile_all() { emake } -src_install() { +python_install() { local dir=${EPREFIX}/usr/share/${PN} distutils-r1_python_install --install-lib="${dir}" --install-scripts="${dir}" - dosym ../share/${PN}/${PN} /usr/bin/${PN} +} +python_install_all() { + dosym ../share/${PN}/${PN} /usr/bin/${PN} emake install-data DESTDIR="${D}" prefix="${EPREFIX}"/usr mv "${ED}"/usr/share/doc/{${PN},${PF}} || die } @@ -73,6 +76,3 @@ pkg_postinst() { elog " Alternatively, you can start FS-UAE and/or FS-UAE Launcher with" elog " --base-dir=/path/to/desired/dir" } - -pkg_postinst() { xdg_icon_cache_update; } -pkg_postrm() { xdg_icon_cache_update; }