summaryrefslogtreecommitdiff
path: root/app-misc
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-03-29 19:13:18 +0000
committerV3n3RiX <venerix@koprulu.sector>2024-03-29 19:13:18 +0000
commit62090949b4fde34bbcbb4bd770a9635c6ac0c55e (patch)
tree2af5001a82f05c858f1e80e2231929c173a8bb55 /app-misc
parent04a447f4f2679e9687093f49d8a9ea911fac9a9b (diff)
gentoo auto-resync : 29:03:2024 - 19:13:18
Diffstat (limited to 'app-misc')
-rw-r--r--app-misc/Manifest.gzbin50784 -> 50618 bytes
-rw-r--r--app-misc/rmlint/Manifest13
-rw-r--r--app-misc/rmlint/files/rmlint-2.10.1-cflags.patch18
-rw-r--r--app-misc/rmlint/files/rmlint-2.10.1-fix-cc.patch40
-rw-r--r--app-misc/rmlint/files/rmlint-2.10.1-fix-gui-install.patch11
-rw-r--r--app-misc/rmlint/files/rmlint-2.10.1-fix-tests.patch135
-rw-r--r--app-misc/rmlint/files/rmlint-2.10.1-scons.patch93
-rw-r--r--app-misc/rmlint/files/rmlint-2.10.1-skip-tests.patch35
-rw-r--r--app-misc/rmlint/files/rmlint-2.10.1-x86-fix-size.patch30
-rw-r--r--app-misc/rmlint/files/rmlint-2.10.2-fix-sorting-tests.patch51
-rw-r--r--app-misc/rmlint/metadata.xml12
-rw-r--r--app-misc/rmlint/rmlint-2.10.1-r2.ebuild147
-rw-r--r--app-misc/rmlint/rmlint-2.10.2.ebuild136
13 files changed, 0 insertions, 721 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index e102bfbf04ff..7d44f0387110 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
Binary files differ
diff --git a/app-misc/rmlint/Manifest b/app-misc/rmlint/Manifest
deleted file mode 100644
index 95a14e6c1c24..000000000000
--- a/app-misc/rmlint/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-AUX rmlint-2.10.1-cflags.patch 626 BLAKE2B e34590b6cb83399444f6a29379f0c84f3d442ead5dfdcc542822d34da50f00eebcc6b2eb26bf627710b2b8ded428471f22d3bcfa9b2ac367362fcafe208b92e6 SHA512 644ae7ea5dfaefd78942f89d93937598c9ed6c8edc1ee1a342ff35f040e75d7e38e285ad5436ee33597604c6cb456f51624a6f8225c25a62ed727797633139d6
-AUX rmlint-2.10.1-fix-cc.patch 1619 BLAKE2B d0b7267d33e1fd906c6d914c1030e143e42b92d9f814c02b6476e1ccd23af20c810b02a2ddfe2d4b5e2f6e7b5a8a8fbc3225aeca56cb78bb84450e9dca07c925 SHA512 e83a90650e434cee31b889f238bee7c0905abd787931fb7752c82c17e927f840de83790e7258526836e14289c2aaa3dcfc94b2097c19e3ac3ab5ac41a6380951
-AUX rmlint-2.10.1-fix-gui-install.patch 322 BLAKE2B 314a8912b2173f207ff642f1147be501969eb5aeeec96e1a77ecab2c0689dac20cf0dd4571d77f764a4224e99aed6f547bca609dd1721ee7d0d2e207934028c6 SHA512 8209959e8f4087871da09070c635a5d116209b32aaa06043ee52bbaa7683b6fee1a302547202250c5a547ca2ab71534ca67541042b3a717a4c7268400329f245
-AUX rmlint-2.10.1-fix-tests.patch 4833 BLAKE2B 75b1e0a732c833f5684a0d6b3870d9f65d4eb62018728353f24e956be1b3fb12cd98f1cc385c398a8b7ad524b50059f04e9200fd1b07519ce5e4a8d042556dec SHA512 8ad1ac7c0812b0414935b49391152507ef043143a2d13d89d9be590b5eee9e42654869282d989c6ff26a5dc178e76e2b3157b1b3fae57ab6d64a3ff91c7f8b60
-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.1-cflags.patch b/app-misc/rmlint/files/rmlint-2.10.1-cflags.patch
deleted file mode 100644
index 6ddfd98d956a..000000000000
--- a/app-misc/rmlint/files/rmlint-2.10.1-cflags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -724,7 +724,6 @@ if ARGUMENTS.get('DEBUG') == "1":
- O_value = ARGUMENTS.get('O', O_DEBUG)
- else:
- conf.env.Append(CCFLAGS=['-DG_DISABLE_ASSERT', '-DNDEBUG'])
-- conf.env.Append(LINKFLAGS=['-s'])
- O_value = ARGUMENTS.get('O', O_RELEASE)
-
- if O_value == 'debug':
-@@ -735,7 +734,6 @@ elif O_value == 'release':
- cc_O_option = '-O' + O_value
-
- print("Using compiler optimisation {} (to change, run scons with O=[0|1|2|3|s|fast])".format(cc_O_option))
--conf.env.Append(CCFLAGS=[cc_O_option])
-
- if ARGUMENTS.get('SYMBOLS') == '1':
- print("Compiling with debugging symbols")
diff --git a/app-misc/rmlint/files/rmlint-2.10.1-fix-cc.patch b/app-misc/rmlint/files/rmlint-2.10.1-fix-cc.patch
deleted file mode 100644
index 78aac09ce2a7..000000000000
--- a/app-misc/rmlint/files/rmlint-2.10.1-fix-cc.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-commit 41056d132ae772b3c050020d68b7daa585e4143c
-Author: Louis Sautier <sautier.louis@gmail.com>
-Date: Thu Sep 9 13:29:37 2021 +0200
-
- Never hardcode compiler, select it based on CC environment variable
-
-diff --git a/SConstruct b/SConstruct
-index 7e12d413..20b080da 100755
---- a/SConstruct
-+++ b/SConstruct
-@@ -37,8 +37,9 @@ Export('VERSION_MAJOR VERSION_MINOR VERSION_PATCH VERSION_NAME')
- def check_gcc_version(context):
- context.Message('Checking for GCC version... ')
-
-+ gcc = os.environ.get("CC", "gcc")
- try:
-- v = subprocess.check_output("printf '%s\n' __GNUC__ | gcc -E -P -", shell=True)
-+ v = subprocess.check_output("printf '%s\n' __GNUC__ | {} -E -P -".format(gcc), shell=True)
- try:
- v = int(v)
- context.Result(str(v))
-diff --git a/tests/test_types/test_nonstripped.py b/tests/test_types/test_nonstripped.py
-index a18648c9..d3190d1b 100644
---- a/tests/test_types/test_nonstripped.py
-+++ b/tests/test_types/test_nonstripped.py
-@@ -21,8 +21,12 @@ def create_binary(path, stripped=False):
- path = path + '.stripped' if stripped else path + '.nonstripped'
- full_path = os.path.join(TESTDIR_NAME, path)
-
-- command = 'echo \'{src}\' | cc -o {path} {option} -std=c99 -xc -'.format(
-- src=SOURCE, path=full_path, option=('-s' if stripped else '-ggdb3')
-+ cc = os.environ.get("CC", "cc")
-+ command = 'echo \'{src}\' | {cc} -o {path} {option} -std=c99 -xc -'.format(
-+ cc=cc,
-+ src=SOURCE,
-+ path=full_path,
-+ option=('-s' if stripped else '-ggdb3')
- )
- subprocess.call(command, shell=True)
-
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
deleted file mode 100644
index 2ae13cd4abb0..000000000000
--- a/app-misc/rmlint/files/rmlint-2.10.1-fix-gui-install.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/files/rmlint-2.10.1-fix-tests.patch b/app-misc/rmlint/files/rmlint-2.10.1-fix-tests.patch
deleted file mode 100644
index db43e366b389..000000000000
--- a/app-misc/rmlint/files/rmlint-2.10.1-fix-tests.patch
+++ /dev/null
@@ -1,135 +0,0 @@
---- a/tests/test_options/test_replay.py
-+++ b/tests/test_options/test_replay.py
-@@ -69,7 +69,7 @@ def test_replay_match_basename():
- create_file('xxx', 'test1/b')
- create_file('xxx', 'test2/a')
-
-- replay_path = '/tmp/replay.json'
-+ replay_path = os.path.join(TESTDIR_NAME, 'replay.json')
-
- head, *data, footer = run_rmlint('-o json:{p}'.format(
- p=replay_path
-@@ -104,7 +104,7 @@ def test_replay_hidden():
- create_file('xxx', 'test/.a')
- create_file('xxx', 'test/.b')
-
-- replay_path = '/tmp/replay.json'
-+ replay_path = os.path.join(TESTDIR_NAME, 'replay.json')
-
- head, *data, footer = run_rmlint('--hidden -o json:{p}'.format(
- p=replay_path
-@@ -130,7 +130,7 @@ def test_replay_must_match_tagged():
- create_file('xxx', 'test_a/a')
- create_file('xxx', 'test_b/a')
-
-- replay_path = '/tmp/replay.json'
-+ replay_path = os.path.join(TESTDIR_NAME, 'replay.json')
-
- head, *data, footer = run_rmlint('-o json:{p}'.format(
- p=replay_path
-@@ -182,7 +182,7 @@ def test_sorting():
- (''.join(p) for p in permutations(all_opts, n_terms))
- )
-
-- replay_path = '/tmp/replay.json'
-+ replay_path = os.path.join(TESTDIR_NAME, 'replay.json')
-
- for combo in combos:
- combo_str = '-y ' + combo
-@@ -218,7 +218,7 @@ def test_replay_no_dir():
-
- try:
- os.chdir(TESTDIR_NAME)
-- replay_path = '/tmp/replay.json'
-+ replay_path = os.path.join(TESTDIR_NAME, 'replay.json')
- head, *data, footer = run_rmlint(
- '-o json:{p}'.format(p=replay_path),
- use_default_dir=False,
-@@ -242,7 +242,7 @@ def test_replay_unicode_fuckup():
- create_file('xxx', names[1])
- create_file('xxx', names[2])
-
-- replay_path = '/tmp/replay.json'
-+ replay_path = os.path.join(TESTDIR_NAME, 'replay.json')
-
- head, *data, footer = run_rmlint('-o json:{p}'.format(p=replay_path))
- assert len(data) == 3
-@@ -260,8 +260,8 @@ def test_replay_tagged_order():
- create_file('xxx', 'b/1')
- create_file('xxx', 'b/2')
-
-- replay_path_a = '/tmp/replay-a.json'
-- replay_path_b = '/tmp/replay-b.json'
-+ replay_path_a = os.path.join(TESTDIR_NAME, 'replay-a.json')
-+ replay_path_b = os.path.join(TESTDIR_NAME, 'replay-b.json')
-
- # Create replay-a.json
- head, *data, footer = run_rmlint(
-@@ -326,7 +326,7 @@ def test_replay_duplicate_directory_size():
- create_file('xxx', 'a/xxx')
- create_file('xxx', 'b/xxx')
-
-- replay_path = '/tmp/replay.json'
-+ replay_path = os.path.join(TESTDIR_NAME, 'replay.json')
- head, *data, footer = run_rmlint('-o json:{p} -S a'.format(p=replay_path))
- assert len(data) == 2
-
-@@ -427,7 +427,7 @@ def test_replay_pack_directories():
- create_pack_and_unpack_scenario()
-
- # Do a run without -D and pack it later during --replay.
-- replay_path = '/tmp/replay.json'
-+ replay_path = os.path.join(TESTDIR_NAME, 'replay.json')
-
- head, *data, footer = run_rmlint('-o json:{p} -S ahD'.format(p=replay_path))
- assert len(data) == 13
-@@ -449,7 +449,7 @@ def test_replay_unpack_directories():
- create_pack_and_unpack_scenario()
-
- # Do a run with -D and pack it later during --replay.
-- replay_path = '/tmp/replay.json'
-+ replay_path = os.path.join(TESTDIR_NAME, 'replay.json')
- head, *data, footer = run_rmlint('-o json:{p} -S ahD -D'.format(p=replay_path))
-
- assert len(data) == 21
---- a/tests/test_options/test_size.py
-+++ b/tests/test_options/test_size.py
-@@ -90,7 +90,7 @@ def test_replay_size():
- create_file('yyy', 'b/yyy')
- create_testdir('empty_dir')
-
-- replay_path = '/tmp/replay.json'
-+ replay_path = os.path.join(TESTDIR_NAME, 'replay.json')
- head, *data, footer = run_rmlint('-o json:{p}'.format(
- p=replay_path
- ))
---- a/tests/test_options/test_stdin.py
-+++ b/tests/test_options/test_stdin.py
-@@ -69,7 +69,6 @@ def test_path_starting_with_dash():
- os.chdir(TESTDIR_NAME)
- data = check_output(
- [cwd + '/rmlint', '-o', 'json', '-S', 'a', '--', subdir],
-- stderr=STDOUT
- )
- finally:
- os.chdir(cwd)
---- a/tests/utils.py
-+++ b/tests/utils.py
-@@ -133,7 +133,7 @@ def run_rmlint_once(*args,
-
- cmd += shlex.split(' '.join(args))
- if with_json:
-- cmd += ['-o', 'json:/tmp/out.json', '-c', 'json:oneline']
-+ cmd += ['-o', 'json:' + os.path.join(TESTDIR_NAME, 'out.json'), '-c', 'json:oneline']
-
- for idx, output in enumerate(outputs or []):
- cmd.append('-o')
-@@ -168,7 +168,7 @@ def run_rmlint_once(*args,
- return output
-
- if with_json:
-- with open('/tmp/out.json', 'r') as f:
-+ with open(os.path.join(TESTDIR_NAME, 'out.json'), 'r') as f:
- json_data = json.loads(f.read())
- else:
- json_data = []
diff --git a/app-misc/rmlint/files/rmlint-2.10.1-scons.patch b/app-misc/rmlint/files/rmlint-2.10.1-scons.patch
deleted file mode 100644
index a60aafe1fa67..000000000000
--- a/app-misc/rmlint/files/rmlint-2.10.1-scons.patch
+++ /dev/null
@@ -1,93 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -515,7 +515,7 @@ AddOption(
- action='store', metavar='DIR', help='libdir name (lib or lib64)'
- )
-
--for suffix in ['libelf', 'gettext', 'fiemap', 'blkid', 'json-glib', 'gui']:
-+for suffix in ['libelf', 'gettext', 'fiemap', 'blkid', 'json-glib', 'gui', 'docs']:
- AddOption(
- '--without-' + suffix, action='store_const', default=False, const=False,
- dest='with_' + suffix
-@@ -804,7 +804,8 @@ env.Default(library)
-
- SConscript('tests/SConscript', exports='programs')
- SConscript('po/SConscript')
--SConscript('docs/SConscript')
-+if GetOption("with_docs"):
-+ SConscript('docs/SConscript')
- SConscript('gui/SConscript')
-
-
-@@ -883,7 +884,6 @@ if 'config' in COMMAND_LINE_TARGETS:
- Find non-stripped binaries (needs libelf) : {libelf}
- Optimize using ioctl(FS_IOC_FIEMAP) (needs linux) : {fiemap}
- Support for SHA512 (needs glib >= 2.31) : {sha512}
-- Build manpage from docs/rmlint.1.rst : {sphinx}
- Support for caching checksums in file's xattr : {xattr}
- Support for reading json caches (needs json-glib) : {json_glib}
- Checking for proper support of big files >= 4GB : {bigfiles}
-@@ -898,6 +898,9 @@ if 'config' in COMMAND_LINE_TARGETS:
- (needs <locale.h> for compile side support) : {locale}
- (needs msgfmt to compile .po files) : {msgfmt}
-
-+ Enable GUI : {gui}
-+ Build docs : {docs}
-+
- {grey}The following constants will be used during the build:{end}
-
- Version information : {version}
-@@ -925,6 +928,8 @@ Type 'scons' to actually compile rmlint now. Good luck.
- bigfiles=yesno(env['HAVE_BIGFILES']),
- bigofft=yesno(env['HAVE_BIG_OFF_T']),
- bigstat=yesno(env['HAVE_BIG_STAT']),
-+ gui=yesno(GetOption("with_gui")),
-+ docs=yesno(GetOption("with_docs")),
- sphinx=COLORS['green'] + 'yes, using ' + COLORS['end'] + sphinx_bin if sphinx_bin else yesno(sphinx_bin),
- compiler=env['CC'],
- prefix=GetOption('prefix'),
---- a/gui/setup.py
-+++ b/gui/setup.py
-@@ -37,7 +37,7 @@ def get_prefix():
- PREFIX = get_prefix()
-
-
--class PrePlusPostInstall(install):
-+class PreInstall(install):
- def run(self):
- # Compile the resource bundle freshly
- print('==> Compiling resource bundle')
-@@ -59,24 +59,6 @@ class PrePlusPostInstall(install):
- # Run the usual distutils install routine:
- install.run(self)
-
-- # Make sure the schema file is updated.
-- # Otherwise the gui will trace trap.
-- print('==> Compiling GLib Schema files')
--
-- try:
-- subprocess.call([
-- 'glib-compile-schemas',
-- os.path.join(PREFIX, 'share/glib-2.0/schemas')
-- ])
-- except subprocess.CalledProcessError as err:
-- print('==> Could not update schemas: ', err)
-- print('==> Please run the following manually:\n')
-- print(' sudo glib-compile-schemas {prefix}'.format(
-- prefix=os.path.join(PREFIX, 'share/glib-2.0/schemas')
-- ))
-- else:
-- print('==> OK!')
--
-
- setup(
- name='Shredder',
-@@ -88,7 +70,7 @@ setup(
- url='https://rmlint.rtfd.org',
- license='GPLv3',
- platforms='any',
-- cmdclass={'install': PrePlusPostInstall},
-+ cmdclass={'install': PreInstall},
- packages=['shredder', 'shredder.views'],
- package_data={'': [
- 'resources/*.gresource'
diff --git a/app-misc/rmlint/files/rmlint-2.10.1-skip-tests.patch b/app-misc/rmlint/files/rmlint-2.10.1-skip-tests.patch
deleted file mode 100644
index f5f81fd6d0a0..000000000000
--- a/app-misc/rmlint/files/rmlint-2.10.1-skip-tests.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit 566198730352f2353fd8332794409d7c9edf80e2
-Author: Louis Sautier <sautier.louis@gmail.com>
-Date: Wed Sep 8 00:53:28 2021 +0200
-
- tests: skip man and python2
-
- Those tests fail respectively when the documentation isn't built and when
- python2 isn't available (probably specific to Gentoo).
-
-diff --git a/tests/test_formatters/test_py.py b/tests/test_formatters/test_py.py
-index 92b17604..28d2dd42 100644
---- a/tests/test_formatters/test_py.py
-+++ b/tests/test_formatters/test_py.py
-@@ -16,7 +16,7 @@ def _check_interpreter(interpreter):
- return False
-
-
--@parameterized(["python2", "python3"])
-+@parameterized(["python3"])
- @with_setup(usual_setup_func, usual_teardown_func)
- def test_paranoia(interpreter):
- if not _check_interpreter(interpreter):
-diff --git a/tests/test_options/test_help.py b/tests/test_options/test_help.py
-index d934724a..60bc40a0 100644
---- a/tests/test_options/test_help.py
-+++ b/tests/test_options/test_help.py
-@@ -17,7 +17,7 @@ def test_help():
-
-
- @with_setup(usual_setup_func, usual_teardown_func)
--def test_man():
-+def _test_man():
- yelp = subprocess.check_output(
- ['./rmlint', '--show-man'], stderr=subprocess.STDOUT
- ).decode('utf-8')
diff --git a/app-misc/rmlint/files/rmlint-2.10.1-x86-fix-size.patch b/app-misc/rmlint/files/rmlint-2.10.1-x86-fix-size.patch
deleted file mode 100644
index b67c13f527ee..000000000000
--- a/app-misc/rmlint/files/rmlint-2.10.1-x86-fix-size.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 87c53a5cb0ec37412cf9fe748dc90dddc6812733
-Author: Louis Sautier <sautier.louis@gmail.com>
-Date: Wed Sep 8 19:39:07 2021 +0200
-
- Fix max sizes on x86, closes #522
-
- strtoull returns ULLONG_MAX, not ULONG_MAX.
-
-diff --git a/lib/cmdline.c b/lib/cmdline.c
-index 56141d94..36f48c1b 100644
---- a/lib/cmdline.c
-+++ b/lib/cmdline.c
-@@ -351,7 +351,7 @@ static RmOff rm_cmd_size_string_to_bytes(const char *size_spec, GError **error)
- return 0;
- }
-
-- if(fraction_num == ULONG_MAX && errno == ERANGE) {
-+ if(fraction_num == ULLONG_MAX && errno == ERANGE) {
- g_set_error(error, RM_ERROR_QUARK, 0, _("Fraction is too big for uint64"));
- return 0;
- }
-@@ -371,7 +371,7 @@ static RmOff rm_cmd_size_string_to_bytes(const char *size_spec, GError **error)
- return 0;
- }
-
-- if(base_size == ULONG_MAX && errno == ERANGE) {
-+ if(base_size == ULLONG_MAX && errno == ERANGE) {
- g_set_error(error, RM_ERROR_QUARK, 0, _("Size is too big for uint64"));
- return 0;
- }
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
deleted file mode 100644
index 77f47b18c853..000000000000
--- a/app-misc/rmlint/files/rmlint-2.10.2-fix-sorting-tests.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-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/metadata.xml b/app-misc/rmlint/metadata.xml
deleted file mode 100644
index 9a07ca2b4a52..000000000000
--- a/app-misc/rmlint/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>sbraz@gentoo.org</email>
- <name>Louis Sautier</name>
- </maintainer>
- <upstream>
- <remote-id type="github">sahib/rmlint</remote-id>
- <bugs-to>https://github.com/sahib/rmlint/issues</bugs-to>
- </upstream>
-</pkgmetadata>
diff --git a/app-misc/rmlint/rmlint-2.10.1-r2.ebuild b/app-misc/rmlint/rmlint-2.10.1-r2.ebuild
deleted file mode 100644
index 4d755cc14da3..000000000000
--- a/app-misc/rmlint/rmlint-2.10.1-r2.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..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]
- sys-auth/polkit[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"
- # https://github.com/sahib/rmlint/pull/521
- "${FILESDIR}/${PN}-2.10.1-fix-tests.patch"
- # Skip problematic tests
- "${FILESDIR}/${PN}-2.10.1-skip-tests.patch"
- # https://github.com/sahib/rmlint/pull/523
- "${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() {
- default
- # Force the GUI to run with the correct PYTHON_SINGLE_TARGET
- sed -i "/const char \*commands/s/python3/${EPYTHON}/" \
- lib/cmdline.c || die
- if use test && use x86; then
- # Skip part of a test until this is fixed:
- # https://github.com/sahib/rmlint/issues/522
- sed -i '/--size 0-18446744073709551615\.1/d' \
- tests/test_options/test_size.py || die
- fi
-}
-
-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
-}
diff --git a/app-misc/rmlint/rmlint-2.10.2.ebuild b/app-misc/rmlint/rmlint-2.10.2.ebuild
deleted file mode 100644
index 93b2c479581f..000000000000
--- a/app-misc/rmlint/rmlint-2.10.2.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# 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
-}