4 files changed, 2 insertions, 95 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index d48bba885a95..f35573b6753a 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/system-config-printer/Manifest b/app-admin/system-config-printer/Manifest
index 942f0e92dcf4..e71b3684ec46 100644
--- a/app-admin/system-config-printer/Manifest
+++ b/app-admin/system-config-printer/Manifest
@@ -1,5 +1,4 @@
 AUX system-config-printer-1.5.18-fix-debugprint-exception.patch 866 BLAKE2B 00e4c099d6b4a713d925962bcf7f3a2fece0ed86bab860d4726364cb2605035f35e49f057493b539d282bd0cfed0d81b7ea63ea9e06c9613eb5bcc9150d7940b SHA512 3d050231a42776a1f1d802cf03d873e7e2efb265e508395ed4f54359090845095cd232e045a0f1bb95e26856455c019468263b23f3214857aa085cb2f5b2cd2d
 DIST system-config-printer-1.5.18.tar.xz 1396808 BLAKE2B 910e853829ee876edc597a3103b5ab857b3b8c1cb87096f25213b1088e35d9f4d320dad61f55b530283a7650b07abe028a53b4e144b33b1b66c733cb2caa8011 SHA512 33dc9c52d92f4234e055fb10a99cadd58424dcdb62554797b44bdd5319f1c3662bd2fa33417ac3a3f5ec51216d64e81e1897f3e671eb49f6be34057d7c38f3f4
-EBUILD system-config-printer-1.5.18-r1.ebuild 2155 BLAKE2B c7bea686d21f69d7bf4237a7bd55e74f1add00cc5faa566e8b63afdf601f61920f0073967a310ec49d02b183e4b4600aac664c62d3edea67ffa084851617083d SHA512 1a23e2639ab1670f42c422f7fbf745a66347feacc0dba48ace614a098adfe77074438e5c6d0abbbf33721c37b46f2baf78d2dbd65c235b0458d3cadd88408a05
-EBUILD system-config-printer-1.5.18-r2.ebuild 2106 BLAKE2B 57ce5a94146462409898a0c8e0e2274473b5591c8f1a59f75aaa35d40a6b4ab0ebb8b6068109dbceda5bf387c85ae5730597a2a0351a7dcbab65f112d704cab8 SHA512 3c08217914e892634dd31743fe3a578a3de0d3675c169b74a80dd3a5b65ecd28fe18f38731b006234c0961736310adae3f725f8ae4cad22ead77141e8258713c
+EBUILD system-config-printer-1.5.18-r2.ebuild 2105 BLAKE2B 4b10b4fc648daa15918588aa16080bc23b8c440f3b89456149c9949632258b197c92f5feadaba088e0b3e7b5ba5551919985498ae28c6b51275974734315bb30 SHA512 2e35adf25118b43d8242bca5e4ba0a02819201917c7a3eb47941a5aa7bd02b62bf37c91886883cd6fe5d22c40d257f8e1c2f84eabf19246881a8bd146869327f
 MISC metadata.xml 597 BLAKE2B 4691f7f385a864b26ed00b5d05310d45aa52d1cbcfb118ec4b1323df470a761162bb7c037cc8eec253f1dd5302d0036379044e83257ba6be43d878b28ebf11e6 SHA512 e4b52d3a4070116472e4fb617796a7cdaef0b3cfc825ccdc39392b5ba63afdedad4232a9eacf89c209a3202d95c2c0cadf17ae8d3698d2e2258310cebfa89744
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.18-r1.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.18-r1.ebuild
deleted file mode 100644
index 0c83ac608bfc..000000000000
--- a/app-admin/system-config-printer/system-config-printer-1.5.18-r1.ebuild
+++ /dev/null
@@ -1,92 +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} )
-PYTHON_REQ_USE="xml(+)"
-inherit python-single-r1 systemd udev xdg
-
-DESCRIPTION="Graphical user interface for CUPS administration"
-HOMEPAGE="https://github.com/OpenPrinting/system-config-printer"
-SRC_URI="https://github.com/OpenPrinting/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
-IUSE="keyring policykit"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Needs cups running, bug 284005
-RESTRICT="test"
-
-# Additional unhandled dependencies
-# gnome-extra/gnome-packagekit[${PYTHON_USEDEP}] with pygobject:2 ?
-# python samba client: smbc
-# selinux: needed for troubleshooting
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/glib:2
-	net-print/cups[dbus]
-	virtual/libusb:1
-	>=virtual/udev-172
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libnotify[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=app-text/xmlto-0.0.22
-	dev-perl/XML-Parser
-	dev-util/desktop-file-utils
-	>=sys-devel/gettext-0.20
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pycups[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	')
-	keyring? ( app-crypt/libsecret[introspection] )
-	policykit? ( net-print/cups-pk-helper )
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-debugprint-exception.patch" ) # git master (1.5.19)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-xmlto
-		--enable-nls
-		--with-desktop-vendor=Gentoo
-		--with-udev-rules
-		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-	python_optimize cupshelpers
-}
-
-src_install() {
-	default
-	python_fix_shebang "${ED}"
-	python_optimize
-	python_domodule cupshelpers
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.18-r2.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.18-r2.ebuild
index d92a99161dcf..eac1dbdb254b 100644
--- a/app-admin/system-config-printer/system-config-printer-1.5.18-r2.ebuild
+++ b/app-admin/system-config-printer/system-config-printer-1.5.18-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="keyring policykit"
 # Needs cups running, bug 284005
 RESTRICT="test"