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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 102AA158030 for ; Sun, 26 Feb 2023 20:31:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 35A85E0809; Sun, 26 Feb 2023 20:31:43 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 15449E0809 for ; Sun, 26 Feb 2023 20:31:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E8DBC340E2A for ; Sun, 26 Feb 2023 20:31:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 652CF807 for ; Sun, 26 Feb 2023 20:31:40 +0000 (UTC) From: "Louis Sautier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Louis Sautier" Message-ID: <1677443487.1996c841ed565836c1633515175c7ecb40ec370c.sbraz@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/rmlint/files/, app-misc/rmlint/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/rmlint/files/rmlint-2.10.1-fix-gui-install.patch app-misc/rmlint/rmlint-2.10.1-r1.ebuild app-misc/rmlint/rmlint-2.10.1.ebuild X-VCS-Directories: app-misc/rmlint/files/ app-misc/rmlint/ X-VCS-Committer: sbraz X-VCS-Committer-Name: Louis Sautier X-VCS-Revision: 1996c841ed565836c1633515175c7ecb40ec370c X-VCS-Branch: master Date: Sun, 26 Feb 2023 20:31:40 +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: 26f08729-1fdd-4628-aaf0-4a81bc14fa6f X-Archives-Hash: b179d4aa3f75b965a6e8d9a65b657edf commit: 1996c841ed565836c1633515175c7ecb40ec370c Author: Louis Sautier gentoo org> AuthorDate: Sun Feb 26 20:27:27 2023 +0000 Commit: Louis Sautier gentoo org> CommitDate: Sun Feb 26 20:31:27 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1996c841 app-misc/rmlint: add Python 3.11, fix GUI installation Also: * remove redundant eclass inherit. * switch to EAPI 8. Closes: https://bugs.gentoo.org/896596 Signed-off-by: Louis Sautier gentoo.org> app-misc/rmlint/files/rmlint-2.10.1-fix-gui-install.patch | 11 +++++++++++ .../rmlint/{rmlint-2.10.1.ebuild => rmlint-2.10.1-r1.ebuild} | 8 +++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/app-misc/rmlint/files/rmlint-2.10.1-fix-gui-install.patch b/app-misc/rmlint/files/rmlint-2.10.1-fix-gui-install.patch new file mode 100644 index 000000000000..2ae13cd4abb0 --- /dev/null +++ b/app-misc/rmlint/files/rmlint-2.10.1-fix-gui-install.patch @@ -0,0 +1,11 @@ +--- a/gui/setup.py ++++ b/gui/setup.py +@@ -19,7 +19,7 @@ def read_version(): + with open('../.version', 'r') as handle: + version_string = handle.read() + +- return version_string.strip() ++ return version_string.split()[0] + + class install_glib_resources(install): + user_options = install.user_options + [ diff --git a/app-misc/rmlint/rmlint-2.10.1.ebuild b/app-misc/rmlint/rmlint-2.10.1-r1.ebuild similarity index 94% rename from app-misc/rmlint/rmlint-2.10.1.ebuild rename to app-misc/rmlint/rmlint-2.10.1-r1.ebuild index 838041b4fc6e..0bb48648fcc8 100644 --- a/app-misc/rmlint/rmlint-2.10.1.ebuild +++ b/app-misc/rmlint/rmlint-2.10.1-r1.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) -inherit gnome2-utils python-single-r1 scons-utils toolchain-funcs xdg-utils +inherit gnome2-utils python-single-r1 scons-utils toolchain-funcs DESCRIPTION="Extremely fast tool to remove duplicates and other lint from your filesystem" HOMEPAGE="https://rmlint.readthedocs.io/" @@ -70,6 +70,8 @@ PATCHES=( "${FILESDIR}/${PN}-2.10.1-x86-fix-size.patch" # https://github.com/sahib/rmlint/pull/526 "${FILESDIR}/${PN}-2.10.1-fix-cc.patch" + # https://github.com/sahib/rmlint/issues/608#issuecomment-1406811107 + "${FILESDIR}/${PN}-2.10.1-fix-gui-install.patch" ) src_prepare() {