gentoo resync : 16.04.2022

4 files changed, 7 insertions, 66 deletions

diff --git a/x11-misc/grub2-theme-preview/Manifest b/x11-misc/grub2-theme-preview/Manifest
index 5d10ac0a0fe1..f54849752a13 100644
--- a/x11-misc/grub2-theme-preview/Manifest
+++ b/x11-misc/grub2-theme-preview/Manifest
@@ -1,8 +1,5 @@
-DIST grub2-theme-preview-2.3.0.tar.gz 198904 BLAKE2B d6dfb1f98bfcc472de9c2f61ea58e18c72f37346cbaca0b68db0a07febba9d972d8760b38867f3a8b39e13b6884dc1868ef1c8667259f761c35c4dbad415e33b SHA512 fc170cc7f72773d4c8ecb809b95c2ead33e292ed1e854a08a7c3c9b20a0d2b3a85658795f92eb72ecb4a68dd9e4442e3d779a62a605a14d826c2560855e9ea06
-DIST grub2-theme-preview-2.4.2.tar.gz 199167 BLAKE2B 004a35d9b88663c5c3be6f200f3983f37843ed2fb9159df91eab4ed850bad014a7a763800285aba2345614604a858fd9f12958e296a8c5a9d4aa8104833708df SHA512 35d3202cf35f5648ce7ab592a95e3466a905dc892e451d3a3ff71d62c5d09fac6ab258b510b3a4d583c87c02371438cef6554ee3021c8ec47fc437655ad5c18b
 DIST grub2-theme-preview-2.5.0.tar.gz 202863 BLAKE2B 62d83cec805f7b65f6469ba22849c4b5cb0e4b845f9bfaea7aed6b05a997fc8d15b8804b2fe0bb75b0ad40f39ed215e8bd711cc4f7bda6f5decf66f38e4f0213 SHA512 83780bc581b3194cda6a47460e16ccf6cf520c8c9f52c19f8bd2779b5ba7e834c83821da47439d8d110770b573424a69ab0801a680983325e8fd6652d7a0652c
-EBUILD grub2-theme-preview-2.3.0-r1.ebuild 673 BLAKE2B fa328d3ce00631db243e78d32cd5aa0a34014970a08c4dcd624b3d3dc56318c99fcd7e42dd65c2c2d5ba93338f1044f99fd562ccbcd44f6e0347856720eaa5b4 SHA512 6ba9d6c6517939e9ab98a0d17f45890a4ac2d4a007cb26d82d129333530a389eeb2a11c82b7c4fb3bb389d295fb2d830833cc54b0abb4b693e50ceca160661c4
-EBUILD grub2-theme-preview-2.3.0.ebuild 705 BLAKE2B 369162c73cc9d8be942b6860494ec87d209538483796abf20e2447420a61aca850565aac96e53f70949ba64379335daffe6e8e4c778714386f7455e8fbcbfa24 SHA512 2308425c0fac80e8abf90138f0bb8c9a0d29817a504383b95e2ef1f406948575ba1c02dfe52b9383db7f1738d38417e97508d1497256fec350ac002d0d07889e
-EBUILD grub2-theme-preview-2.4.2.ebuild 673 BLAKE2B fa328d3ce00631db243e78d32cd5aa0a34014970a08c4dcd624b3d3dc56318c99fcd7e42dd65c2c2d5ba93338f1044f99fd562ccbcd44f6e0347856720eaa5b4 SHA512 6ba9d6c6517939e9ab98a0d17f45890a4ac2d4a007cb26d82d129333530a389eeb2a11c82b7c4fb3bb389d295fb2d830833cc54b0abb4b693e50ceca160661c4
+DIST grub2-theme-preview-2.6.0.tar.gz 202962 BLAKE2B 61349270e339a4e82efa57c5ff67bc23e07eb94744a0539e544ce21ec6db26525938403e053af2d07e00f7bb2c75e801f6c688c149858456bf0d794030a72287 SHA512 9a2fc6a9270a10d00c6a7a711a28264f188cd15ca4bc1a84a80cf9e9255af824f65cac457db9a4f78bd0d8c954f7e1a8a4ed51b43e8b6949fabb267dcc2d0f16
 EBUILD grub2-theme-preview-2.5.0.ebuild 766 BLAKE2B 5303fa5ae50dce7cefc3e3dca8fccad290589e2106ac71fc55ddff8dbf77c5d389d243b397c5454a917473a87c2ec368c720f937b0dc03cb47320c498fbb1413 SHA512 5a4d9efe7dc4296666c3659104baed5acae8a827f1918a59ac682b3c2cff13076ef7b9ae3e744aa0e5e69c6d0e0e00213173ac2352b1acf872abc4f6537c6c9d
+EBUILD grub2-theme-preview-2.6.0.ebuild 766 BLAKE2B 5af9f46589bf40cbb78120b75171cc78fbec0a66322b3b3f6f552d8fd9583b63dfbd3d41e787917086354f1a492fbfab56d6cc6dce83188c62d367d95ff1dae5 SHA512 9e430ed85c41fcd1b81086d0e652a4255a7eb9a8876ff97b249435c2f813650f3e46c15db1de315cd8a80909ef2f5ac0c5d973795f4a63ccad7549d97ae836a6
 MISC metadata.xml 343 BLAKE2B 182b8001e5b2011d194d3e7780503bbbcae133841e50bfa3baefb3849c8eabec23075ce12417022f72bf446ea2917283f4ab307aa4acfdb6a9f4f1069e8b5848 SHA512 98c787f18776b403641b87ebba496bf87e607640bc78cece91702f723e21ce3cbd45ea80b13d56876748890c822be47a804534664501d34c9e03418feacce898
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.3.0.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.3.0.ebuild
deleted file mode 100644
index 6ff7801b0bf5..000000000000
--- a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Preview a GRUB 2.x theme using KVM/QEMU"
-HOMEPAGE="https://github.com/hartwork/grub2-theme-preview"
-SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="grub_platforms_efi-64"
-
-RDEPEND="app-emulation/qemu
-	dev-libs/libisoburn
-	sys-fs/mtools
-	grub_platforms_efi-64? (
-		sys-boot/grub:2[grub_platforms_efi-64]
-		sys-firmware/edk2-ovmf
-	)
-	!grub_platforms_efi-64? (
-		sys-boot/grub:2[grub_platforms_pc]
-	)
-"
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.4.2.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.4.2.ebuild
deleted file mode 100644
index b4a6ce2f5cbc..000000000000
--- a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.4.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Preview a GRUB 2.x theme using KVM/QEMU"
-HOMEPAGE="https://github.com/hartwork/grub2-theme-preview"
-SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="grub_platforms_efi-64"
-
-RDEPEND="app-emulation/qemu
-	dev-libs/libisoburn
-	sys-fs/mtools
-	grub_platforms_efi-64? (
-		sys-boot/grub:2[grub_platforms_efi-64]
-		sys-firmware/edk2-ovmf
-	)
-	!grub_platforms_efi-64? (
-		sys-boot/grub:2[grub_platforms_pc]
-	)
-"
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.3.0-r1.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.6.0.ebuild
index b4a6ce2f5cbc..f11369c1652b 100644
--- a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.3.0-r1.ebuild
+++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -27,3 +27,6 @@ RDEPEND="app-emulation/qemu
 		sys-boot/grub:2[grub_platforms_pc]
 	)
 "
+DEPEND="test? ( dev-python/parameterized[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest