gentoo resync : 24.12.2018

3 files changed, 3 insertions, 47 deletions

diff --git a/net-print/cups-pk-helper/Manifest b/net-print/cups-pk-helper/Manifest
index dabaceb4c827..f643e370881c 100644
--- a/net-print/cups-pk-helper/Manifest
+++ b/net-print/cups-pk-helper/Manifest
@@ -1,5 +1,3 @@
-DIST cups-pk-helper-0.2.5.tar.xz 152620 BLAKE2B 341d3e6d961cbdf949105a55bc5734c81fe29c3cd855026ab4846bdb9f4bb191bbe2fe9720e3b8050d1350eea32809cb0395d3805ce2971e150c0f041a983097 SHA512 9fc0af517755482dc3787ce87df389adee41b826c4ccca25df69474812523fa265c3dcf31fbc1a75c1b680b9b6490a9c358ac30aed7570fa98f5287f02a2be40
 DIST cups-pk-helper-0.2.6.tar.xz 162368 BLAKE2B 3dec9a32f577c35a426ec4bbf2f96b2e18e0cd7bbb8a43fd93a6104d8fbb01de15cc7a168ae67fe5f2dca34823c70ac5f61acc01d876130d6ae9f5b789491d23 SHA512 33f1b6f58f4772148bd1cfb8163dacaffd3cc62f2d03731710c98b765ebb8b87541cb9cf43e886880134c32db91a43c7142b1556a0abdf1449068031b0d5fbd3
-EBUILD cups-pk-helper-0.2.5.ebuild 1003 BLAKE2B 2b9c96bcd50c5d78edff22d93ed15f52163ef7676f3566762985e770feef4ee8252187f344d15043937c3a344f6269f30c07d8d048f4df1b11a5295dce770750 SHA512 ea16c7bc6c2759c4d63fc5842506dbcee879e796d5b3b488234ae8546531850ba9c5d23fbfa57ab28a531bca29a8cee5a57004f75a07bde5576fa9966d6fc4e4
-EBUILD cups-pk-helper-0.2.6.ebuild 1010 BLAKE2B c5a7acb8f2d74ed545d788816d073805867c6d32bac41084966e8978fb8c653b48b1a99f1f377cd524ad2f88c79fd6e22676a0ae4f4d3ae283c4658cdaa5d04d SHA512 ffaae80df552d328a648328ab8df57627e477d511d5368aab44a5f03cdbf10d1761acf8b1307c0a8b97db1c44e49671132f28a1eac5e3da88a62729c656633ba
+EBUILD cups-pk-helper-0.2.6.ebuild 1005 BLAKE2B 34ec8168d585d81d07725183aa5e7156c5c50e21c6c7053fd11b49378151dae59f4514dedb7daee57043cf912bf2efb3d1e4ad25ed0417f5e562ac464836852e SHA512 583a938f83f850a78a485f08fc39837c17b0389acda75f5e3deee49f29a51c801392b7c7c1d43478c163e545f53741b61df41355ce88cb6fac5b6aa62530b6ec
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-print/cups-pk-helper/cups-pk-helper-0.2.5.ebuild b/net-print/cups-pk-helper/cups-pk-helper-0.2.5.ebuild
deleted file mode 100644
index 9122aabc2190..000000000000
--- a/net-print/cups-pk-helper/cups-pk-helper-0.2.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="PolicyKit helper to configure cups with fine-grained privileges"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/cups-pk-helper"
-SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-# Require {glib,gdbus-codegen}-2.30.0 due to GDBus changes between 2.29.92
-# and 2.30.0
-COMMON_DEPEND="
-	>=dev-libs/glib-2.30.0:2
-	net-print/cups
-	>=sys-auth/polkit-0.97
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/dbus
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/gdbus-codegen-2.30.0
-	>=dev-util/intltool-0.40.6
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-src_prepare() {
-	DOCS="AUTHORS HACKING NEWS README"
-
-	# Regenerate dbus-codegen files to fix build with glib-2.30.x; bug #410773
-	rm -v src/cph-iface-mechanism.{c,h} || die
-
-	gnome2_src_prepare
-}
diff --git a/net-print/cups-pk-helper/cups-pk-helper-0.2.6.ebuild b/net-print/cups-pk-helper/cups-pk-helper-0.2.6.ebuild
index 7cb5d901f866..8d89524396c7 100644
--- a/net-print/cups-pk-helper/cups-pk-helper-0.2.6.ebuild
+++ b/net-print/cups-pk-helper/cups-pk-helper-0.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 # Require {glib,gdbus-codegen}-2.30.0 due to GDBus changes between 2.29.92