gentoo Easter resync : 12.04.2020

3 files changed, 2 insertions, 98 deletions

diff --git a/app-admin/system-config-printer/Manifest b/app-admin/system-config-printer/Manifest
index 3da0dca09177..8930deb4fb93 100644
--- a/app-admin/system-config-printer/Manifest
+++ b/app-admin/system-config-printer/Manifest
@@ -1,8 +1,5 @@
 AUX system-config-printer-1.5.12-check-for-null.patch 2048 BLAKE2B e6a87f6ae92cd29f3fa4900be4df2bcfb54892a87346a24baabe8fa4ea779d69a259bab7f25f7121d90b7599c15721044fe530b80654160501631857b332d705 SHA512 4a640793f89b637620c12d99ddc53b7ed87ba5cfc19bf90a3c8f7c2938bb17deba540bfe4312556fe253be52f087340d6b2a794c305c78443515a4f6c1eceace
 AUX system-config-printer-1.5.12-fix-abrt-in-udev-configure-printer.patch 2206 BLAKE2B 82195b83923cf84bd33ea141f0e7443d16b3540845fe867251f77e53324b255a076ad7d14f4e29690ef139fd1a53f832968927d03e8885648d377ab466305667 SHA512 d093a81ec6d92f242b18d5f5bc1fb96d36797fe85dfd2a7c7edf99138a3bf392543a350fde4e051e97d7640cb14323a7754029d4a082adde3d7f2d89f1262a1f
-DIST system-config-printer-1.5.11-patchset-01.tar.xz 6948 BLAKE2B effe29c51cbe74fc72566df65f10ab845c9dc1f40ca2966c40be87e19f98046f34311c24b7bc77f471b840e35b0c8eb7754a7c5464d50335c8ab2e2ed0e79afd SHA512 2501bda0e75ea51cc8e14df6b3746a0ea51618919ef35ace849efeded0cddc49e6e3793142d1cd128ce3ce62c21661d5fdb85b19718df07b87a20f5fc641885b
-DIST system-config-printer-1.5.11.tar.xz 949816 BLAKE2B 96b41d64e0aa3494b7fc7ed15ac926d833a046ba2880b36b6f5dd4e7508e2bc1fac4cb52c9940c13cec6e34cb8972fbc11fcd5a7df510296444ca08a23f4cb2b SHA512 cc0a6faec0022092e64de3d7ab28669039c93853c6931d26c264f0035486e09ad0af784833e88ee8e3dc1b6f5be9dcf84144a2a6464dfa9711172966fa6a22b4
 DIST system-config-printer-1.5.12.tar.xz 955756 BLAKE2B 766cc7307382a7b0ab65387650f1568fd5108dae2693dfc93684c6593e28837d513e4c823bf4e07c3ba2123eea8aba0649135020318f06f38633b9837683d7f7 SHA512 c8b0702dcdf99c4e8a19274dd4a3f82d9263bd5f51d0c19edf7d71fb13095f57a35e643ddbe161ffb5805e72bf7da0cb6a3de44a554854390ac05d8e56644c32
-EBUILD system-config-printer-1.5.11-r2.ebuild 2455 BLAKE2B 581e2e10955dcc70e337e7de496452b40db11999b4fb81e142458926ef6456131ed10011298bb9c3f1e5ec3ea7fb2a7ce7c8220cd0288c4b4d20b8492790709f SHA512 553f1f889f830b495df630cc4c632a3467f4e281cff3da3d49c018805217c7b06124049f761faed418ad69a12531e551d9b0c3bf31c051e79eea86ae8f9b9cb9
-EBUILD system-config-printer-1.5.12-r1.ebuild 2184 BLAKE2B 7f18432f105d4cfc915ed72fe17628ab6aef5928810845b1a4a3b496552c46c405ca0a3e09a3823bce63989dc6c42bc47dbd89334eecea0cd3fbf2f147425be4 SHA512 56fad76dfdd91301064bddd663cdf4e72b98e6c1bcea22f891b70d8529f6f9c79b62a083160a5e206d9455dbebddc829ecd9c3546d31aa3a5864cedfe270ec64
+EBUILD system-config-printer-1.5.12-r1.ebuild 2180 BLAKE2B 3fafabafe401a988164a3e386906a736bd89a727bd11c316d2a00868a5719b9881ab4f9be148f75cf5f5cf6ec852334d9a8414ac107b0a4e5bc3dac35540d12e SHA512 8e2be252af1df50886390e1b81bbde3cfac6cd71afd24c7228ebb9022f2b38642d221bc9d8a5ed0136cf583189421d033fd683cab3126801d971597962640ea8
 MISC metadata.xml 463 BLAKE2B 8cc3de37cb766555e89dca64b9be719c3b2885144f08e5a126084e5f8125ff085e9c51705216cd51fb3c66daa29016a790dd606de2b443a7e65f6677f4c46fa4 SHA512 8521e871b99b17ea2bb754dc9bf1b1a49bd32673acce3fe561ec087c5c4bacfbefbf904af1cf5a6ada369e936a0e06a7116074ef622f882e434da7afdee12533
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.11-r2.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.11-r2.ebuild
deleted file mode 100644
index d2f73378485c..000000000000
--- a/app-admin/system-config-printer/system-config-printer-1.5.11-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="xml"
-inherit gnome2 python-single-r1 systemd
-
-DESCRIPTION="Graphical user interface for CUPS administration"
-HOMEPAGE="https://github.com/zdohnal/system-config-printer"
-SRC_URI="https://github.com/zdohnal/${PN}/releases/download/${PV}/${P}.tar.xz
-	https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-01.tar.xz"
-
-LICENSE="GPL-2+"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sh ~sparc x86"
-SLOT="0"
-
-IUSE="doc gnome-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-util/desktop-file-utils
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( dev-python/epydoc )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycups[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		dev-python/urllib3[${PYTHON_MULTI_USEDEP}]
-	')
-	gnome-keyring? ( app-crypt/libsecret[introspection] )
-	policykit? ( net-print/cups-pk-helper )
-"
-
-PATCHES=(
-	"${WORKDIR}"/${P}-auth-dialog.patch
-	"${WORKDIR}"/${P}-libsecret-optional-{1,2}.patch
-	"${WORKDIR}"/${P}-scp-dbus-service-{1,2}.patch
-	"${WORKDIR}"/${P}-typo.patch
-	"${WORKDIR}"/${P}-appdata.patch
-	"${WORKDIR}"/${P}-empty-LC_MESSAGES.patch
-	"${WORKDIR}"/${P}-fdopen-utf8.patch
-	"${WORKDIR}"/${P}-typeerror.patch
-	"${WORKDIR}"/${P}-debugprint-typo.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-nls \
-		--with-desktop-vendor=Gentoo \
-		--with-udev-rules \
-		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-}
-
-src_compile() {
-	gnome2_src_compile
-	use doc && emake html
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( html/. )
-	gnome2_src_install
-	python_fix_shebang "${ED}"
-}
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.12-r1.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.12-r1.ebuild
index a62572dca403..6f0b21fb6e22 100644
--- a/app-admin/system-config-printer/system-config-printer-1.5.12-r1.ebuild
+++ b/app-admin/system-config-printer/system-config-printer-1.5.12-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/OpenPrinting/system-config-printer"
 SRC_URI="https://github.com/OpenPrinting/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 SLOT="0"
 IUSE="doc gnome-keyring policykit"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"