gentoo auto-resync : 23:07:2022 - 02:48:51

10 files changed, 3 insertions, 556 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 131fdc6d6dfa..9512bf6c2ac3 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/lcd4linux/Manifest b/app-misc/lcd4linux/Manifest
index d3fc9202402d..0ff4ed13651c 100644
--- a/app-misc/lcd4linux/Manifest
+++ b/app-misc/lcd4linux/Manifest
@@ -2,6 +2,5 @@ AUX lcd4linux-0.11.0_pre20170527-libtool.patch 1137 BLAKE2B 4247f176b8146ddedea3
 AUX lcd4linux-0.11.0_pre20170527-python3.patch 1437 BLAKE2B b6b3e3267761d4b8df64687137451bba8cb564e9de2c5e1891061d0adf7927aeb1834ef40d46594569f3fa04141083ef43957efa54dbbac7a83a1ffa742e1f76 SHA512 ea4ddb89702d37200e0118df019d3971dd85f977ffeb1f50b3b54d48536efa91e9f0747bd235a68b0b0a33f7a7a3be76b4a29e852431a17887b370200e2cfe62
 AUX lcd4linux-r2.initd 746 BLAKE2B a4e7ce0f6780fab205777c13c1e0dbe6d7d6a8b40c45995d248fd1553f4e967b59fba9e6a4c56a777e013693b743c7939b382dbe9bb1c3d856ca9ec23e1661be SHA512 8cc10e236dcf045f6da955fcbdfd1ecedf24cbe8a31dbb39c7b8830007de790e38b6af31549fa552cb35e63ed4ef75738b4b40f672ce05c72d28ec95c2580142
 DIST lcd4linux-0.11.0_pre20170527.tar.bz2 478823 BLAKE2B 7b332e7262781dd0dc954a0576890dda78ecbeab9dc003d1d5b84a643ad522d57e32a04a2aa6fbe13b18e4699d07d88412e19c81739fafdf98ba327b151061a9 SHA512 c131b9cb04bb0ff4dc46c1e3ab8f5dcda309bbef89bcb670508f9afe7c515d6ccfe79a03782be4f4b2ba4aaf977cd13c0059805e5b7230216e39ee3421b0f143
-EBUILD lcd4linux-0.11.0_pre20170527-r6.ebuild 6032 BLAKE2B 038142850695f63640a61f875d2745c14081c007c1e2f6fd95d81ceba229e4dc2d364981b0499535b1a471bb0e99f331cf8854613307e0838f60081f29b371f7 SHA512 503c71a9baafe2cc1188abe54f1763620493d954a220c1a1f109ca6a6b18e4a6a0703fabc77ff9a6e8bdce97c8d173a7346889b390dcfda10f084ec499d74693
-EBUILD lcd4linux-0.11.0_pre20170527-r7.ebuild 6082 BLAKE2B a9f318dcdd93e095cab96f478eb9e755ddd8bed765dea0c6d9547616b7391d4a864eae3f72ef253c9d42af5141d173da71b6366b32bd1afb97ac40a816afe5fd SHA512 824e03411340c5bfa36d28aa22297de962f09940d630b58ebad169469c564220d17511a1b8c26eaa29a31046d26ba18ff193c6acee1abccdf7f3d3b472ba8d09
+EBUILD lcd4linux-0.11.0_pre20170527-r7.ebuild 6080 BLAKE2B 0e59032166ead8bce9befc34c01d5e4f3165c3bffe91b529209336b9612bf77a0a9989a29d2127e4fb57aadf745de39ad59c80f8df72efbcb8978ed8dcf149c1 SHA512 329a4864644d40839d2f2a815509b067a7d893a92a9f576af924d4f08b7b53111a9d168c1382eac66606bc9f2ea46c489c591609924a384b2928431d00a1af06
 MISC metadata.xml 3521 BLAKE2B 9298d38f09f03e569eebc1166d344ac0af5f21a8bafa0023a17075f3c98901cf3c31f6de78e0376008a0dd1560da9d54421a87c66ac44a46f41596a4d66742c1 SHA512 bc96d20515ef44346ad270964b23e58ed3e8d7102ea7a5d194dbcf3b67c6e8a1e2ad5a7cc76804fd15131ce7b0e4a2e95c3d546a33a9bddf7d7b3b433f60cc01
diff --git a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r6.ebuild b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r6.ebuild
deleted file mode 100644
index bf2ce0cb9728..000000000000
--- a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r6.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit autotools flag-o-matic python-single-r1
-
-DESCRIPTION="A small program that grabs information and displays it on an external LCD"
-HOMEPAGE="https://github.com/jmccrohan/lcd4linux/"
-SRC_URI="https://dev.gentoo.org/~conikost/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dmalloc outb"
-REQUIRED_USE="
-	?? ( lcd_devices_hd44780 lcd_devices_hd44780-i2c )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-# Define the list of valid lcd devices.
-# Some drivers were removed from this list:
-# - lcdlinux: It's an ancient driver, which needs app-misc/lcd-linux, that made it never to the portage tree.
-# - lcdlinux: Besides, app-misc/lcd-linux won't compile on a modern linux kernel.
-# - st2205: It's needs dev-libs/libst2205, which made it never to the portage tree and is quite outdated.
-IUSE_LCD_DEVICES=(
-	ASTUSB BeckmannEgle BWCT CrystalFontz Curses Cwlinux D4D DPF EA232graphic EFN FutabaVFD
-	FW8888 G15 GLCD2USB HD44780 HD44780-I2C IRLCD LCD2USB LCDTerm LEDMatrix LPH7508 LUIse LW_ABP M50530
-	MatrixOrbital MatrixOrbitalGX MilfordInstruments MDM166A Newhaven Noritake NULL Pertelian PHAnderson
-	PICGraphic picoLCD picoLCDGraphic PNG PPM RouterBoard Sample SamsungSPF serdisplib ShuttleVFD
-	SimpleLCD T6963 TeakLCM Trefon ULA200 USBHUB USBLCD VNC WincorNixdorf X11
-)
-
-# Define the list of valid lcd4linux plugins.
-# Some plugins were removed from this list:
-# - imon: Uses telmond, which is only available on a fli4l router or an eisfair server.
-# - ppp: It has been replaced by the netdev plugin.
-# - seti: SETI@home software was replaced by sci-misc/boinc, which is not compatible.
-# - xmms: XMMS software was replaced by media-sound/xmms2, which is not compatible.
-IUSE_LCD4LINUX_PLUGINS=(
-	apm asterisk button-exec cpuinfo dbus diskstats dvb exec event
-	fifo file gps hddtemp huawei i2c-sensors iconv isdn kvv
-	loadavg meminfo mpd mpris-dbus mysql netdev netinfo pop3
-	proc-stat python qnaplog raspi sample statfs uname uptime
-	w1retap wireless
-)
-
-# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE'
-REQUIRED_USE+=" || ( "
-for LCD_DEVICE in "${IUSE_LCD_DEVICES[@]}"; do
-	LCD_DEVICE=${LCD_DEVICE,,}
-	IUSE+=" lcd_devices_${LCD_DEVICE} "
-	REQUIRED_USE+=" lcd_devices_${LCD_DEVICE} "
-done
-REQUIRED_USE+=" ) "
-unset LCD_DEVICE
-
-# Add supported plugins from 'IUSE_LCD4LINUX_PLUGINS' to 'IUSE' and 'REQUIRED_USE'
-IUSE+=" ${IUSE_LCD4LINUX_PLUGINS[*]} "
-REQUIRED_USE+=" || ( ${IUSE_LCD4LINUX_PLUGINS[*]} ) "
-
-# Define dependencies for all drivers in 'IUSE_LCD_DEVICES'
-DEPEND_LCD_DEVICES="
-	lcd_devices_astusb? ( virtual/libusb:0= )
-	lcd_devices_bwct? ( virtual/libusb:0= )
-	lcd_devices_curses? ( sys-libs/ncurses:0= )
-	lcd_devices_dpf? ( virtual/libusb:0= )
-	lcd_devices_g15? ( virtual/libusb:0= )
-	lcd_devices_glcd2usb? ( virtual/libusb:0= )
-	lcd_devices_irlcd? ( virtual/libusb:0= )
-	lcd_devices_lcd2usb? ( virtual/libusb:0= )
-	lcd_devices_ledmatrix? ( virtual/libusb:0= )
-	lcd_devices_luise? (
-		dev-libs/luise
-		virtual/libusb:0=
-	)
-	lcd_devices_matrixorbitalgx? ( virtual/libusb:0= )
-	lcd_devices_mdm166a? ( virtual/libusb:0= )
-	lcd_devices_picolcd? ( virtual/libusb:0= )
-	lcd_devices_picolcdgraphic? ( virtual/libusb:0= )
-	lcd_devices_png? (
-		media-libs/gd[png]
-		media-libs/libpng:0=
-	)
-	lcd_devices_ppm? ( media-libs/gd )
-	lcd_devices_samsungspf? ( virtual/libusb:0= )
-	lcd_devices_serdisplib? ( dev-libs/serdisplib )
-	lcd_devices_shuttlevfd? ( virtual/libusb:0= )
-	lcd_devices_trefon? ( virtual/libusb:0= )
-	lcd_devices_ula200? (
-		dev-embedded/libftdi:1=
-		virtual/libusb:0=
-	)
-	lcd_devices_usbhub? ( virtual/libusb:0= )
-	lcd_devices_usblcd? ( virtual/libusb:0= )
-	lcd_devices_vnc? ( net-libs/libvncserver )
-	lcd_devices_x11? ( x11-libs/libX11 )
-"
-
-# Define dependencies for all plugins in 'IUSE_LCD4LINUX_PLUGINS'
-DEPEND_LCD4LINUX_PLUGINS="
-	asterisk? ( net-misc/asterisk )
-	dbus? ( sys-apps/dbus )
-	gps? ( dev-libs/nmeap )
-	hddtemp? ( app-admin/hddtemp )
-	iconv? ( virtual/libiconv )
-	mpd? ( media-libs/libmpd )
-	mpris-dbus? ( sys-apps/dbus )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	python? ( ${PYTHON_DEPS} )
-	wireless? (
-		|| (
-			net-wireless/iw
-			net-wireless/wireless-tools
-		)
-	)
-"
-
-RDEPEND="
-	dmalloc? ( dev-libs/dmalloc )
-	${DEPEND_LCD_DEVICES}
-	${DEPEND_LCD4LINUX_PLUGINS}
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="sys-devel/autoconf-archive"
-
-PATCHES="${FILESDIR}/${P}-python3.patch"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if use python; then
-		# Shipped one is outdated and doesn't know python3, use system's instead.
-		rm ax_python_devel.m4
-
-		# Use correct python version.
-		# (See: bug #793869)
-		append-libs $(python_get_LIBS)
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	# Enable all users enabled lcd devices
-	local myeconfargs_lcd_devices
-	for lcd_device in "${IUSE_LCD_DEVICES[@]}"; do
-		if use "lcd_devices_${lcd_device,,}"; then
-			myeconfargs_lcd_devices+=",${lcd_device}"
-		fi
-	done
-
-	# Enable all users enabled lcd4linux plugins
-	local myeconfargs_lcd4linux_plugins
-	for lcd4linux_plugin in "${IUSE_LCD4LINUX_PLUGINS[@]}"; do
-		if use "${lcd4linux_plugin}"; then
-			myeconfargs_lcd4linux_plugins+=",${lcd4linux_plugin/-/_}"
-		fi
-	done
-
-	local myeconfargs=(
-		--disable-rpath
-		$(use_with dmalloc)
-		$(use_with outb)
-		$(use_with python)
-		$(use_with lcd_devices_x11 x)
-		--with-drivers="${myeconfargs_lcd_devices#,}"
-		--with-plugins="${myeconfargs_lcd4linux_plugins#,}"
-		--x-include="/usr/include"
-		--x-libraries="/usr/$(get_libdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# Install sample config, and must have 600, as lcd4linux checks this.
-	insinto	/etc/lcd4linux
-	insopts -m 0600
-	doins lcd4linux.conf.sample
-
-	newinitd "${FILESDIR}/lcd4linux-r2.initd" lcd4linux
-}
-
-pkg_postinst() {
-	if [[ ! -z ${REPLACING_VERSIONS} ]]; then
-		use python && einfo "Starting with this version, the python plugins now uses python3 instead of python2!"
-	fi
-}
diff --git a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r7.ebuild b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r7.ebuild
index 2f2874567136..6cb9a929bae8 100644
--- a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r7.ebuild
+++ b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit autotools flag-o-matic python-single-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~conikost/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dmalloc outb"
 REQUIRED_USE="
 	?? ( lcd_devices_hd44780 lcd_devices_hd44780-i2c )
diff --git a/app-misc/trash-cli/Manifest b/app-misc/trash-cli/Manifest
index 38a78efc8cfd..60765fc59127 100644
--- a/app-misc/trash-cli/Manifest
+++ b/app-misc/trash-cli/Manifest
@@ -1,9 +1,3 @@
-AUX trash-cli-0.21.10.24-fix-lint-in-tests.patch 3269 BLAKE2B 8262d9d56efdd0f2bb634f436f3577c22e4a749cca8bc104c23cba6a09430921ad0bdc99711ef7e00ee92a24c1686c94f65ccc6a36a8e077e3a63d9000e2f563 SHA512 82225acbc45b6e26006a52e8fad20f94f6031a135d993facc537afa4fe9089cee49cbacf9fc002f57adfae5da2210ea19dfbd58eb395235af493a23014d6b5d6
-AUX trash-cli-0.21.10.24-fix-lint-in-trash-cli.patch 864 BLAKE2B 4acf3d0cbf03d464d326b1748ad8172bc05feb1cf35dfa24386f3e1e1bda3d2769859e66d366b63f16be64c5daa238a12e77d980b7be68da1b030da63f193e91 SHA512 8948f517460e9ff0a4f3faa26fcfb3ff3d106d1d19880d6e40648f8ccec0241b987ea64a64d9dcc038e184bc73ade77c5f465cf6a9223e75c848368a024ecc41
-AUX trash-cli-0.21.10.24-fix-unit-test-test_trash_empty_will_skip_unreadable.patch 2305 BLAKE2B 435aa364c75bb1173408b830a74fdb9f0b8115e89623e5c223df07574c1279c31e4307a68da5932bd5dc7bd31b34a33bb1ae86aeb25340670f4f13a35fb18163 SHA512 9d782064d0ccd35ece3b4eec9101654befd6f870f9668ca8e80c6b0dec3c78adeec1866dad2832d0d25870466affe02fdd8eac53cc518f7bec596a10a976654f
-AUX trash-cli-0.21.10.24-fix-unit-tests-not-deleting-temp-directories.patch 4668 BLAKE2B 8f742be79360b6a01637d15bc8fe4e7f5d447e52279f16fa59d06435fd7c332e4ff4c7ac1ae35ff993cfc19f677adc256f11bcf488a11b7e5d8a469a3b1f6daf SHA512 6e02b79f67a2c76e6feebc8632dfb59e110561b777a687d0e1cda66ba60653717485f09800cd894e76c79fa1b8fb89a786bfdb7d4c77ec4552401bf23a1cf4da
-DIST trash-cli-0.21.10.24.tar.gz 78085 BLAKE2B 6d8f82695a94e45efd4316eb9f1a8c8f5d348774fc10cd4e5323d8dad15897f827acf343e2c1a15e1cef4eecb2ed76ab456345e359319c82bfde9b95f68f7b77 SHA512 1bf258cea7658a3968beec939d09ae088eac8898a9812e8a3aca587df7f2ad20c66f766995f8c893e4d84d0ea7db94ebb4ca7eb24982af81fa4179cc9e239fd1
 DIST trash-cli-0.22.4.16.tar.gz 78221 BLAKE2B 9eabecf5b4e787e1a413f4b05fb6c5592b4a5ec55e4a399c02c738e2ad62acaabc234217954262a79c85ad855535a2ca0d6f981b0ac86139f6c631519aeea936 SHA512 961e87ec361c405a45d02e6a4b7bf43493bca86cf3540a7235df459abd450762bcea4760acdfed0e5f276933ff0eb5b9f426ae0eecfde3e5830a8699fa99a19f
-EBUILD trash-cli-0.21.10.24.ebuild 889 BLAKE2B 03f2203d4ff8654b792ff0a14007d365234f0611b18d716e510286884645e6b036cd04b8fa18f9a38ef471490594090cbb36c0fe5b2e778a5b4a64366cdc6844 SHA512 a41901b018a00c9fe4495c72ac919519848b9abb3e0357b2cc3331f670f4339d63e5a34132dd8b0eb096b9a5b710303337fb5a22ddc41a247cb756b0829b2cda
 EBUILD trash-cli-0.22.4.16.ebuild 633 BLAKE2B 47e979d294ad6fcb42702f55b438c612c206171f9da4a58c7e0bbd5e01498cb4b37708305a4c6cd6c5c90e8f1d4afb6341411c82d836907f674dd1c2a6700080 SHA512 af7ddad70a78498b6fc9b1b312169806ad8f77e96fe88e4014e84a50b6de1fef009f03f2754dc91e7a07bb79a83212be96b5b5ea508e19ff1d5dce908165fd1c
 MISC metadata.xml 1095 BLAKE2B 47ecff4dfa92c0750b4743988d715e828ce8a8d07140df5eec50ad41f0f1aae22efcdf7c7f743c5f6a58c572da9faa8fae4017fde65909e1f8e2ea3b4750b40e SHA512 b935e7c812982d7aabc6cbbcf39ae62404f04f2c8e6055adfdb710bf9502da907b61806425d270b87c14206e7e4caf3e3baea6ab8f86f0b16b9cf3171954b652
diff --git a/app-misc/trash-cli/files/trash-cli-0.21.10.24-fix-lint-in-tests.patch b/app-misc/trash-cli/files/trash-cli-0.21.10.24-fix-lint-in-tests.patch
deleted file mode 100644
index 8f7cfe3babf1..000000000000
--- a/app-misc/trash-cli/files/trash-cli-0.21.10.24-fix-lint-in-tests.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From e467ae01869e853f83ebad4ef5514c5831283866 Mon Sep 17 00:00:00 2001
-From: Zoltan Puskas <zoltan@sinustrom.info>
-Date: Sat, 4 Dec 2021 13:16:48 -0800
-Subject: [PATCH 1/2] Fix lint in tests
-
-Running pyflakes on the code has shown several lint errors. This diff
-fixes them for the unit test files.
-
-Additionally myStringIO.py has been removed in favour of using six's
-StringIO for consistency with other tests.
----
- tests/empty/test_empty_end_to_end_interactive.py | 2 +-
- tests/myStringIO.py                              | 4 ----
- tests/put/test_file_trasher.py                   | 2 +-
- tests/put/test_home_fallback.py                  | 2 +-
- tests/test_restore_cmd.py                        | 2 +-
- tests/test_trash_rm.py                           | 4 +---
- 6 files changed, 5 insertions(+), 11 deletions(-)
- delete mode 100644 tests/myStringIO.py
-
-diff --git a/tests/empty/test_empty_end_to_end_interactive.py b/tests/empty/test_empty_end_to_end_interactive.py
-index 80b8f81..64f20d6 100644
---- a/tests/empty/test_empty_end_to_end_interactive.py
-+++ b/tests/empty/test_empty_end_to_end_interactive.py
-@@ -4,7 +4,7 @@ import unittest
- import pytest
- 
- from ..fake_trash_dir import FakeTrashDir
--from ..support import MyPath, list_trash_dir
-+from ..support import MyPath
- from .. import run_command
- 
- 
-diff --git a/tests/myStringIO.py b/tests/myStringIO.py
-deleted file mode 100644
-index 40a6c72..0000000
---- a/tests/myStringIO.py
-+++ /dev/null
-@@ -1,4 +0,0 @@
--try:
--    from StringIO import StringIO
--except ImportError:
--    from io import StringIO
-diff --git a/tests/put/test_file_trasher.py b/tests/put/test_file_trasher.py
-index 32e8019..37fb9db 100644
---- a/tests/put/test_file_trasher.py
-+++ b/tests/put/test_file_trasher.py
-@@ -3,7 +3,7 @@ import unittest
- from mock import Mock
- from datetime import datetime
- 
--from trashcli.put import TrashResult, Trasher, FileTrasher
-+from trashcli.put import TrashResult, FileTrasher
- import os
- 
- 
-diff --git a/tests/put/test_home_fallback.py b/tests/put/test_home_fallback.py
-index 07d40a2..38b7fb4 100644
---- a/tests/put/test_home_fallback.py
-+++ b/tests/put/test_home_fallback.py
-@@ -3,7 +3,7 @@ import unittest
- from mock import Mock, call, ANY
- 
- from trashcli.fstab import create_fake_volume_of
--from trashcli.put import TrashResult, Trasher, TrashDirectoriesFinder, FileTrasher
-+from trashcli.put import TrashResult, TrashDirectoriesFinder, FileTrasher
- from datetime import datetime
- import os
- 
-diff --git a/tests/test_restore_cmd.py b/tests/test_restore_cmd.py
-index b1cda13..63c017d 100644
---- a/tests/test_restore_cmd.py
-+++ b/tests/test_restore_cmd.py
-@@ -3,7 +3,7 @@ import unittest
- from trashcli.list_mount_points import os_mount_points
- from trashcli.restore import RestoreCmd, make_trash_directories, \
-     TrashDirectory, TrashedFiles, Command
--from .myStringIO import StringIO
-+from six import StringIO
- from mock import call
- from trashcli import restore
- import datetime
-diff --git a/tests/test_trash_rm.py b/tests/test_trash_rm.py
-index e11935e..ec7e7e6 100644
---- a/tests/test_trash_rm.py
-+++ b/tests/test_trash_rm.py
-@@ -1,8 +1,6 @@
- import unittest
- 
--import six
--
--from mock import Mock, call
-+from mock import Mock
- 
- from trashcli.rm import Filter
- from six import StringIO
--- 
-2.33.1
-
diff --git a/app-misc/trash-cli/files/trash-cli-0.21.10.24-fix-lint-in-trash-cli.patch b/app-misc/trash-cli/files/trash-cli-0.21.10.24-fix-lint-in-trash-cli.patch
deleted file mode 100644
index b69e6deb84c1..000000000000
--- a/app-misc/trash-cli/files/trash-cli-0.21.10.24-fix-lint-in-trash-cli.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 00d10cff555c79a0ac11f7a298a892176830c353 Mon Sep 17 00:00:00 2001
-From: Zoltan Puskas <zoltan@sinustrom.info>
-Date: Sat, 4 Dec 2021 13:27:23 -0800
-Subject: [PATCH 2/2] Fix lint in trash-cli
-
-Fix the import redefinition issue in list.py detected by pyflakes
----
- trashcli/list.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/trashcli/list.py b/trashcli/list.py
-index 09f30de..725b5ce 100644
---- a/trashcli/list.py
-+++ b/trashcli/list.py
-@@ -4,7 +4,7 @@ import os
- 
- from . import fstab
- from .fs import FileSystemReader, file_size
--from .fstab import volume_of, VolumesListing
-+from .fstab import VolumesListing
- from .trash import (version, TrashDirReader, path_of_backup_copy, print_version,
-                     maybe_parse_deletion_date, trash_dir_found,
-                     trash_dir_skipped_because_parent_is_symlink,
--- 
-2.33.1
-
diff --git a/app-misc/trash-cli/files/trash-cli-0.21.10.24-fix-unit-test-test_trash_empty_will_skip_unreadable.patch b/app-misc/trash-cli/files/trash-cli-0.21.10.24-fix-unit-test-test_trash_empty_will_skip_unreadable.patch
deleted file mode 100644
index 75bd478f670d..000000000000
--- a/app-misc/trash-cli/files/trash-cli-0.21.10.24-fix-unit-test-test_trash_empty_will_skip_unreadable.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 566dbd8bdde01514c5cf0802d03a9dca918b6e82 Mon Sep 17 00:00:00 2001
-From: Zoltan Puskas <zoltan@sinustrom.info>
-Date: Sat, 4 Dec 2021 12:59:37 -0800
-Subject: [PATCH] Fix unit test test_trash_empty_will_skip_unreadable_dir
-
-This patch fixes two issues with the current test:
-- it prevents the test from breaking out of the test environment and
-  does not try to clean trash directories for all mount points
-- it does actually test the "unreadable" directory
-
-Bug: GH-217
----
- tests/test_trash_empty.py | 25 +++++++++++++++++--------
- 1 file changed, 17 insertions(+), 8 deletions(-)
-
-diff --git a/tests/test_trash_empty.py b/tests/test_trash_empty.py
-index c7a987d..a2f87e6 100644
---- a/tests/test_trash_empty.py
-+++ b/tests/test_trash_empty.py
-@@ -15,26 +15,35 @@ from .support import MyPath
- from trashcli.fs import FileSystemReader
- from trashcli.fs import FileRemover
- 
--from trashcli.empty import main as empty
--
- 
- @pytest.mark.slow
- class TestTrashEmptyCmd(unittest.TestCase):
-     def setUp(self):
-         self.tmp_dir = MyPath.make_temp_dir()
-         self.unreadable_dir = self.tmp_dir / 'data/Trash/files/unreadable'
-+        self.volumes_listing = Mock(spec=VolumesListing)
-+        self.volumes_listing.list_volumes.return_value = [self.unreadable_dir]
-+        self.err=StringIO()
-+        self.empty = EmptyCmd(
-+            out=StringIO(),
-+            err=self.err,
-+            environ={'XDG_DATA_HOME':self.tmp_dir / 'data'},
-+            volumes_listing=self.volumes_listing,
-+            now=None,
-+            file_reader=FileSystemReader(),
-+            getuid=lambda: 123,
-+            file_remover=FileRemover(),
-+            version=None,
-+            volume_of=lambda x: "volume_of %s" % x
-+        )
- 
-     def test_trash_empty_will_skip_unreadable_dir(self):
--        out = StringIO()
--        err = StringIO()
--
-         make_unreadable_dir(self.unreadable_dir)
- 
--        empty(['trash-empty'], stdout = out, stderr = err,
--                environ={'XDG_DATA_HOME':self.tmp_dir / 'data'})
-+        self.empty.run('trash-empty')
- 
-         assert ("trash-empty: cannot remove %s\n"  % self.unreadable_dir ==
--                     err.getvalue())
-+                     self.err.getvalue())
- 
-     def tearDown(self):
-         make_readable(self.unreadable_dir)
--- 
-2.33.1
-
diff --git a/app-misc/trash-cli/files/trash-cli-0.21.10.24-fix-unit-tests-not-deleting-temp-directories.patch b/app-misc/trash-cli/files/trash-cli-0.21.10.24-fix-unit-tests-not-deleting-temp-directories.patch
deleted file mode 100644
index 917f34d50e60..000000000000
--- a/app-misc/trash-cli/files/trash-cli-0.21.10.24-fix-unit-tests-not-deleting-temp-directories.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 196144f90aaeb9d062019db4937dc4a1ec5991aa Mon Sep 17 00:00:00 2001
-From: Zoltan Puskas <zoltan@sinustrom.info>
-Date: Sat, 4 Dec 2021 11:12:16 -0800
-Subject: [PATCH] Fix unit tests not deleting temp directories
-
-Some tests were not deleting temporary directories polluting /tmp. This
-patch fixes all locations in the code where this was forgotten.
-
-Additionally we apply a suffix on top of the randomly generated name for
-the temp directories (new name example: tmpwl2fvrn9_trash_cli_test)
-becasue:
-- it has no cost to us or the users
-- helps identify temporary directories as belonging to trash-cli tests
-- will make similar issues obvious in the future
-
-Bug: GH-218
----
- tests/empty/test_empty_end_to_end_interactive.py   | 3 +++
- tests/empty/test_empty_end_to_end_with_argument.py | 3 +++
- tests/put/test_end_to_end_put.py                   | 3 +++
- tests/restore/test_trash_directory.py              | 3 ++-
- tests/support.py                                   | 2 +-
- tests/test_files.py                                | 1 +
- tests/test_filesystem.py                           | 2 ++
- tests/test_trash_put_slow.py                       | 3 +++
- 8 files changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/tests/empty/test_empty_end_to_end_interactive.py b/tests/empty/test_empty_end_to_end_interactive.py
-index 80b8f81..14b2867 100644
---- a/tests/empty/test_empty_end_to_end_interactive.py
-+++ b/tests/empty/test_empty_end_to_end_interactive.py
-@@ -40,3 +40,6 @@ class TestEmptyEndToEndInteractive(unittest.TestCase):
-             'Would empty the following trash directories:\n'
-             '    - %s\n'
-             'Proceed? (y/n) ' % self.trash_dir, '', 0]
-+
-+    def tearDown(self):
-+        self.tmp_dir.clean_up()
-diff --git a/tests/empty/test_empty_end_to_end_with_argument.py b/tests/empty/test_empty_end_to_end_with_argument.py
-index bfa660b..aad10de 100644
---- a/tests/empty/test_empty_end_to_end_with_argument.py
-+++ b/tests/empty/test_empty_end_to_end_with_argument.py
-@@ -54,3 +54,6 @@ class TestEmptyEndToEndWithArgument(unittest.TestCase):
-         self.user_run_trash_empty(['2'])
- 
-         assert list_trash_dir(self.trash_dir) == ['info/foo.trashinfo']
-+
-+    def tearDown(self):
-+        self.tmp_dir.clean_up()
-diff --git a/tests/put/test_end_to_end_put.py b/tests/put/test_end_to_end_put.py
-index 5b95b57..8af89b8 100644
---- a/tests/put/test_end_to_end_put.py
-+++ b/tests/put/test_end_to_end_put.py
-@@ -89,3 +89,6 @@ class TestEndToEndPut(unittest.TestCase):
-                                          ['-f', 'this_file_does_not_exist', 'nor_does_this_file'])
- 
-         assert [result.stdout, result.stderr, result.exit_code] == ['', '', 0]
-+
-+    def tearDown(self):
-+        self.tmp_dir.clean_up()
-diff --git a/tests/restore/test_trash_directory.py b/tests/restore/test_trash_directory.py
-index d961f45..5328f98 100644
---- a/tests/restore/test_trash_directory.py
-+++ b/tests/restore/test_trash_directory.py
-@@ -53,4 +53,5 @@ class TestTrashDirectory(unittest.TestCase):
-     def list_trashinfos(self):
-         return list(self.trash_dir.all_info_files(self.temp_dir / 'trash-dir'))
- 
--
-+    def tearDown(self):
-+        self.temp_dir.clean_up()
-diff --git a/tests/support.py b/tests/support.py
-index afbb402..d5966d3 100644
---- a/tests/support.py
-+++ b/tests/support.py
-@@ -34,4 +34,4 @@ class MyPath(str):
- 
-     @classmethod
-     def make_temp_dir(cls):
--        return cls(os.path.realpath(tempfile.mkdtemp()))
-+        return cls(os.path.realpath(tempfile.mkdtemp(suffix="_trash_cli_test")))
-diff --git a/tests/test_files.py b/tests/test_files.py
-index abe4ae0..487ffd3 100644
---- a/tests/test_files.py
-+++ b/tests/test_files.py
-@@ -45,3 +45,4 @@ class Test_make_unreadable_dir(unittest.TestCase):
-     def tearDown(self):
-         make_readable(self.unreadable_dir)
-         shutil.rmtree(self.unreadable_dir)
-+        self.tmp_dir.clean_up()
-diff --git a/tests/test_filesystem.py b/tests/test_filesystem.py
-index 2df08b1..b1e9aa6 100644
---- a/tests/test_filesystem.py
-+++ b/tests/test_filesystem.py
-@@ -64,3 +64,5 @@ class Test_is_sticky_dir(unittest.TestCase):
- 
-         assert not is_sticky_dir(self.temp_dir / 'dir')
- 
-+    def tearDown(self):
-+        self.temp_dir.clean_up()
-diff --git a/tests/test_trash_put_slow.py b/tests/test_trash_put_slow.py
-index e85f699..078c371 100644
---- a/tests/test_trash_put_slow.py
-+++ b/tests/test_trash_put_slow.py
-@@ -29,6 +29,9 @@ class TrashPutFixture:
-         self.stderr = result.stderr
-         self.exit_code = result.exit_code
- 
-+    def __del__(self):
-+        self.temp_dir.clean_up()
-+
- 
- @pytest.mark.slow
- class TestDeletingExistingFile(unittest.TestCase):
--- 
-2.33.1
-
diff --git a/app-misc/trash-cli/trash-cli-0.21.10.24.ebuild b/app-misc/trash-cli/trash-cli-0.21.10.24.ebuild
deleted file mode 100644
index 20244db3583e..000000000000
--- a/app-misc/trash-cli/trash-cli-0.21.10.24.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python scripts to manipulate trash cans via the command line"
-HOMEPAGE="https://github.com/andreafrancia/trash-cli"
-SRC_URI="https://github.com/andreafrancia/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	dev-python/psutil[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-lint-in-tests.patch"
-	"${FILESDIR}/${P}-fix-lint-in-trash-cli.patch"
-	"${FILESDIR}/${P}-fix-unit-tests-not-deleting-temp-directories.patch"
-	"${FILESDIR}/${P}-fix-unit-test-test_trash_empty_will_skip_unreadable.patch"
-)
-
-distutils_enable_tests pytest
-
-src_test() {
-	local -x COLUMNS=80
-	distutils-r1_src_test
-}