Gentoo Archives: gentoo-commits

From: Louis Sautier <sbraz@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/rmlint/files/, app-misc/rmlint/
Date: Sun, 26 Feb 2023 20:31:44
Message-Id: 1677443487.1996c841ed565836c1633515175c7ecb40ec370c.sbraz@gentoo
1 commit: 1996c841ed565836c1633515175c7ecb40ec370c
2 Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 26 20:27:27 2023 +0000
4 Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 26 20:31:27 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1996c841
7
8 app-misc/rmlint: add Python 3.11, fix GUI installation
9
10 Also:
11 * remove redundant eclass inherit.
12 * switch to EAPI 8.
13
14 Closes: https://bugs.gentoo.org/896596
15 Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
16
17 app-misc/rmlint/files/rmlint-2.10.1-fix-gui-install.patch | 11 +++++++++++
18 .../rmlint/{rmlint-2.10.1.ebuild => rmlint-2.10.1-r1.ebuild} | 8 +++++---
19 2 files changed, 16 insertions(+), 3 deletions(-)
20
21 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
22 new file mode 100644
23 index 000000000000..2ae13cd4abb0
24 --- /dev/null
25 +++ b/app-misc/rmlint/files/rmlint-2.10.1-fix-gui-install.patch
26 @@ -0,0 +1,11 @@
27 +--- a/gui/setup.py
28 ++++ b/gui/setup.py
29 +@@ -19,7 +19,7 @@ def read_version():
30 + with open('../.version', 'r') as handle:
31 + version_string = handle.read()
32 +
33 +- return version_string.strip()
34 ++ return version_string.split()[0]
35 +
36 + class install_glib_resources(install):
37 + user_options = install.user_options + [
38
39 diff --git a/app-misc/rmlint/rmlint-2.10.1.ebuild b/app-misc/rmlint/rmlint-2.10.1-r1.ebuild
40 similarity index 94%
41 rename from app-misc/rmlint/rmlint-2.10.1.ebuild
42 rename to app-misc/rmlint/rmlint-2.10.1-r1.ebuild
43 index 838041b4fc6e..0bb48648fcc8 100644
44 --- a/app-misc/rmlint/rmlint-2.10.1.ebuild
45 +++ b/app-misc/rmlint/rmlint-2.10.1-r1.ebuild
46 @@ -1,11 +1,11 @@
47 # Copyright 1999-2023 Gentoo Authors
48 # Distributed under the terms of the GNU General Public License v2
49
50 -EAPI=7
51 +EAPI=8
52
53 -PYTHON_COMPAT=( python3_{9..10} )
54 +PYTHON_COMPAT=( python3_{9..11} )
55
56 -inherit gnome2-utils python-single-r1 scons-utils toolchain-funcs xdg-utils
57 +inherit gnome2-utils python-single-r1 scons-utils toolchain-funcs
58
59 DESCRIPTION="Extremely fast tool to remove duplicates and other lint from your filesystem"
60 HOMEPAGE="https://rmlint.readthedocs.io/"
61 @@ -70,6 +70,8 @@ PATCHES=(
62 "${FILESDIR}/${PN}-2.10.1-x86-fix-size.patch"
63 # https://github.com/sahib/rmlint/pull/526
64 "${FILESDIR}/${PN}-2.10.1-fix-cc.patch"
65 + # https://github.com/sahib/rmlint/issues/608#issuecomment-1406811107
66 + "${FILESDIR}/${PN}-2.10.1-fix-gui-install.patch"
67 )
68
69 src_prepare() {