gentoo auto-resync : 10:08:2023 - 03:31:29

3 files changed, 190 insertions, 0 deletions

diff --git a/app-misc/rmlint/Manifest b/app-misc/rmlint/Manifest
index f55dac7f9cf2..95a14e6c1c24 100644
--- a/app-misc/rmlint/Manifest
+++ b/app-misc/rmlint/Manifest
@@ -5,6 +5,9 @@ AUX rmlint-2.10.1-fix-tests.patch 4833 BLAKE2B 75b1e0a732c833f5684a0d6b3870d9f65
 AUX rmlint-2.10.1-scons.patch 3626 BLAKE2B cc9187d2b8926eb36071462d02a60f3a4b06de99ad97adf5b9dbb4bca3f9a42ccb8fd863ec9f78500acabdfe692d18c7141fb165c6c13661463b704117c308c6 SHA512 bf585930651101e3057547442527ad571c193a9e7bcff976544f16fd9bac75e0cc074bbf60bf31c1dd50538aa961a0143b46cd3feac6deec014b8689da048c85
 AUX rmlint-2.10.1-skip-tests.patch 1216 BLAKE2B 8fa9727f5146a26fbd91e8e6c4f8b903e432c386ca8f97b4591bd9244940bf94aa476dfb0390c332fe8fa7e777e31890046423cd88e47181f3a8f30e3fead4be SHA512 c66812da8860a714d1ae368039f95dd86d59b3ba6164fc9141f0c1c0ab6ab7c7245dcef9785a179dc437615cd5d9e8af1a1ee60354e99c02fd3c345fd2e91608
 AUX rmlint-2.10.1-x86-fix-size.patch 1092 BLAKE2B 2cd3e7e68d5252c89b84d1d78a17520e6c5f7b61f5d9bfc05bd25ea96b9057bb195c7afc6e61a8bac121ae749b5f84d28dc032be2d92bd6f5a2ab04f5b3cae9d SHA512 78a41f52aa1af9f9d63227b9a2100cf87806a442f07d153e83ccedf7110a14e4c7fec8c9a4fdf21284301927895a62eedaf666cbfe90092eb4ac41e68bf34c6e
+AUX rmlint-2.10.2-fix-sorting-tests.patch 1912 BLAKE2B f76a3076b747445387a035185efe7d60d597e88453b55beaba54a1e0d35f36943100bffa9cc7419ed70af359112d159c338d943915e99487df58b527bb061b1d SHA512 74a342c866cc09a74d149c410623b067f15eed607aecc0f828bcaea765d11254699820fce4d8d368e5b312ca5dfca2055689a43d0224726a61e914d256de9a77
 DIST rmlint-2.10.1.tar.gz 2494474 BLAKE2B 40219ff64d54f0e2fc66a958c6ca51520152f77f9038e9756ab601da5180502528be7b2d750c85b5991c31db96c3eb7415841084b6c90db103dc212947864034 SHA512 a1281359798816dadaf3a1e706e671dc63edf8f7d176c114a924a1e03fc9ad6fa54d10de701b09b5e364a9a815e0d11bdbef3d16fb7fec74eb85af20a106db1a
+DIST rmlint-2.10.2.tar.gz 2499695 BLAKE2B 07c887f660685b5ec86c8a448d482c96cc40b129fc906d0c31c01e07617bf0167055145050c21b565cb1551ccc1ce6329593d92473c371125b2c91d31d9d601c SHA512 8f8d58892785e9012cb15f3e89480d9d04772fa3f923064520bf17afcc8948b1a24d6f8399176a1a26bd5036553c605958f3720e40cf6cba135a4f3381131180
 EBUILD rmlint-2.10.1-r2.ebuild 3405 BLAKE2B 1bb99670dbd83e5053b83c562eff6bc6623825edad15e6e208beda309c634914f22ab2022ff5f299ce0650a8a68390bd2001093af8f8f578dfa8bea544112d62 SHA512 2eccca7653895fe9e3c9dfe0a26bdfd6aa6b6586a409d3b72a627c4a08e783aca6819a08dfd5424980e726c8530c5d5c708a346d8b271a011644fe543b8691bf
+EBUILD rmlint-2.10.2.ebuild 2984 BLAKE2B cb0a2d0b0b4db1ed58f52a11b9a82233d22cf17462f4fa277676e9b9eac1373ede620e4b1e05a73c63e71013619b8bcd4ef71ad9f16c6f77dad12a91a4c45558 SHA512 cc1ca4af76405dcb6f2878ecc64ada5c7f93093a4554000e114ad2f4ad3899a8054fb35366b51f1c2c8948d6fd17986613d86b400f5e534c616618b8ebfa224a
 MISC metadata.xml 383 BLAKE2B 5ac0b3d0708812cfcd5f432f43556ea55a2e7686447e06d876ae686befb854831415f1e5713cab07f3ba9f87c7cd982e17342423630eae4ea9656cbce29ed957 SHA512 d42c9219374f548e8105f7463156895e584c0b5863788fb9214633c9dc5c46dc8f2f4c53a00c411dd32aa1f3b83d9b9e9bd24508a2f18f69e7032aaf4c1de218
diff --git a/app-misc/rmlint/files/rmlint-2.10.2-fix-sorting-tests.patch b/app-misc/rmlint/files/rmlint-2.10.2-fix-sorting-tests.patch
new file mode 100644
index 000000000000..77f47b18c853
--- /dev/null
+++ b/app-misc/rmlint/files/rmlint-2.10.2-fix-sorting-tests.patch
@@ -0,0 +1,51 @@
+From 69d9dcb60c9e88084aba37545c77fd02fdc7df33 Mon Sep 17 00:00:00 2001
+From: Cebtenzzre <cebtenzzre@gmail.com>
+Date: Wed, 9 Aug 2023 18:42:00 -0400
+Subject: [PATCH] tests: fix failures caused by certain directory names
+
+Fixes #630
+--- a/tests/test_options/test_sorting.py
++++ b/tests/test_options/test_sorting.py
+@@ -158,15 +158,15 @@ def test_sort_by_regex():
+     create_file('xxx', 'aaab')
+     create_file('xxx', 'b')
+     create_file('xxx', 'c')
+-    create_file('xxx', '1/c')
+-    create_file('xxx', 'd')
++    create_file('xxx', 'd/e')
++    create_file('xxx', 'f')
+ 
+-    head, *data, footer = run_rmlint("-S 'r<1/c>x<d$>a'")
++    head, *data, footer = run_rmlint("-S 'r<d/e>x<f$>a'")
+ 
+     paths = [p['path'] for p in data]
+ 
+-    assert paths[0].endswith('1/c')
+-    assert paths[1].endswith('d')
++    assert paths[0].endswith('d/e')
++    assert paths[1].endswith('f')
+     assert paths[2].endswith('aaaa')
+     assert paths[3].endswith('aaab')
+     assert paths[4].endswith('b')
+@@ -206,16 +206,16 @@ def test_sort_by_regex_bad_input():
+ # regression test for GitHub issue #484
+ @with_setup(usual_setup_func, usual_teardown_func)
+ def test_regex_multiple_matches():
+-    paths = [
+-        '1/a', '1/a2', '1/b',
+-        '2/a', '2/a2', '2/b',
+-    ]
++    paths = [os.path.join(dname, bname)
++             for dname in ['unique_1', 'unique_2']
++             for bname in ['a', 'a2', 'b']]
++
+     for path in reversed(paths):
+         create_file('xxx', path)
+ 
+     # when multiple paths matched a regex, rmlint would not try the next criterion
+     # check multiple times because sort order was inconsistent before the fix
+     for _ in range(3):
+-        head, *data, foot = run_rmlint("-S 'r<1>x<a>l'")
++        head, *data, foot = run_rmlint("-S 'r<unique_1>x<a>l'")
+         assert len(data) == len(paths)
+         assert [e['path'] for e in data] == [os.path.join(TESTDIR_NAME, p) for p in paths]
diff --git a/app-misc/rmlint/rmlint-2.10.2.ebuild b/app-misc/rmlint/rmlint-2.10.2.ebuild
new file mode 100644
index 000000000000..93b2c479581f
--- /dev/null
+++ b/app-misc/rmlint/rmlint-2.10.2.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+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/"
+SRC_URI="https://github.com/sahib/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gui nls test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	virtual/libelf:0=
+"
+RDEPEND="
+	${DEPEND}
+	gui? (
+		${PYTHON_DEPS}
+		gnome-base/librsvg:2[introspection]
+		x11-libs/gdk-pixbuf[introspection]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/gtksourceview:3.0[introspection]
+		x11-libs/pango[introspection]
+		$(python_gen_cond_dep '
+			dev-python/colorlog[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+		')
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}]
+		')
+	)
+	nls? ( sys-devel/gettext )
+	test? (
+		${PYTHON_DEPS}
+		app-shells/dash
+		$(python_gen_cond_dep '
+			dev-python/nose[${PYTHON_USEDEP}]
+			dev-python/parameterized[${PYTHON_USEDEP}]
+			dev-python/psutil[${PYTHON_USEDEP}]
+			dev-python/pyxattr[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+DOCS=(CHANGELOG.md README.rst)
+PATCHES=(
+	# The build system tries to override several CFLAGS
+	"${FILESDIR}/${PN}-2.10.1-cflags.patch"
+	# https://github.com/sahib/rmlint/pull/520
+	"${FILESDIR}/${PN}-2.10.1-scons.patch"
+	# Skip problematic tests
+	"${FILESDIR}/${PN}-2.10.1-skip-tests.patch"
+	# https://github.com/sahib/rmlint/pull/526
+	"${FILESDIR}/${PN}-2.10.1-fix-cc.patch"
+	# https://github.com/sahib/rmlint/commit/69d9dcb60c9e88084aba37545c77fd02fdc7df33
+	"${FILESDIR}/${P}-fix-sorting-tests.patch"
+)
+
+src_prepare() {
+	default
+	# Force the GUI to run with the correct PYTHON_SINGLE_TARGET
+	sed -i "/const char \*commands/s/python3/${EPYTHON}/" \
+		lib/cmdline.c || die
+}
+
+src_configure() {
+	# Needed for USE=-native-symlinks
+	tc-export AR CC
+	scons_opts=(
+		VERBOSE=1
+		$(use_with doc docs)
+		$(use_with gui)
+		$(use_with nls gettext)
+	)
+	escons "${scons_opts[@]}" config
+}
+
+src_compile() {
+	escons "${scons_opts[@]}"
+}
+
+src_test() {
+	RM_TS_DIR="${T}/tests" nosetests -s -v -a '!slow' || \
+		die "Tests failed"
+}
+
+src_install() {
+	escons "${scons_opts[@]}" --prefix="${ED}/usr" --actual-prefix="${EPREFIX}/usr" install
+
+	# https://github.com/sahib/rmlint/pull/525
+	if use doc; then
+		gzip -d "${ED}/usr/share/man/man1/rmlint.1.gz" || die
+	fi
+	if use gui; then
+		python_optimize
+	fi
+	einstalldocs
+}
+
+pkg_preinst() {
+	if use gui; then
+		gnome2_schemas_savelist
+	fi
+}
+
+pkg_postinst() {
+	if use gui; then
+		gnome2_schemas_update
+		xdg_icon_cache_update
+	fi
+}
+
+pkg_postrm() {
+	if use gui; then
+		gnome2_schemas_update
+		xdg_icon_cache_update
+	fi
+}