Merge updates from master

7 files changed, 1 insertions, 233 deletions

diff --git a/app-admin/system-config-printer/system-config-printer-1.5.11-r1.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.11-r1.ebuild
deleted file mode 100644
index c1bd77fd2c90..000000000000
--- a/app-admin/system-config-printer/system-config-printer-1.5.11-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-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}
-	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}]
-	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.11-r2.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.11-r2.ebuild
index 3138fdc7de8c..506b95217fad 100644
--- 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
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sh ~sparc x86"
 SLOT="0"
 
 IUSE="doc gnome-keyring policykit"
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 71d7b72b2da7..d63b49af5774 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -1,6 +1,3 @@
-DIST intel-gmmlib-18.3.0.tar.gz 620491 BLAKE2B 555a733b42b8e4c40170db9ecabc25bb04779c3aba38b9141f021df1dbe83d74e385a3437d4a87577d9e5ff4df21ce618393909cd98fce4a59ec19aeff4eb44d SHA512 358598873556822be6748a282cd1447ca3e0bcaeb11c2bb8862414bac2ab8e57deee9581fa14bfe22d33d712e567db936332b7fe715dae9816b31121af934dec
-DIST intel-gmmlib-18.4.1.tar.gz 621793 BLAKE2B 41d6f93ec68cf29b8bc2d01c103c69dd4f732ce1aaf72cc959f993af73df9b355f0c4c7c97af4102cc1996e7732597dac4fe0abaf359806e2accbee1bf852d90 SHA512 8dcb5892cfc98822e8173d0a71dfb4883e1ef838de8c936a9b36fb05d61137b7c7d7edf941d3ebd532a1126d8d8b978b95843afb3514ba8cbf3eec54f05c8b8b
-DIST intel-gmmlib-19.1.2.tar.gz 632661 BLAKE2B 4a9995a9e4c8b5c8e081d757193212180fbae3a88040da24be4225149c4c0924b56d5969e125a0c21a5af7b2b3d249277d7e27cb3ce13135c69bb977a976879d SHA512 fcc0beedfc3716b6204627f7daa5e0a5aec720b2a29ab2f8262b613a11d31bfe14dc8476513515d8470cf7d66f58d109ed4d5cf203e041228f53a64cb4a6c243
 DIST intel-gmmlib-19.2.1.tar.gz 633194 BLAKE2B fe6105bd76d18f3c4e0d42550fa91a1cfa75413b7289d4cfd89c6edbd9c2104f11dbb9c549f3331259d3629eba5f3698f8289da5f551f55f9a76cb704680e9fb SHA512 686b47d9de54f96ff1b4b75e595175a08e5a619d1b3f3e71388d851263dcb12315be7834721c88c698d4dbf6f68845d7850ce7a238f4e639ca0896de724c408d
 DIST intel-gmmlib-19.2.3.tar.gz 633252 BLAKE2B 81fcb541cc1a5fe3bd8ebbb2d98b5d4d7d6af409f1b837327c4cc322da7cc77c80992cc22ef6920cfe3704d6cd030bbf5e36936cb7f205e38f65807297a58dcb SHA512 d82973a18804474708e252cd1f0d5205e72dea0b7b14401ff7bad351f94ad7a53ada7def16f62da0810bfa6a747135fb2c7649e4a1fa6fbc4e8f5a38cf948d6b
 DIST intel-gmmlib-19.2.4.tar.gz 633227 BLAKE2B e7ce9143ced27c8be87b807eeb6fa66dec7f0931dda83d7f1ee597682e593798fda6edf665471723df23bb0ca8b730ff88070211728b83478340d80ad982b089 SHA512 7921b11abc2c0658b614decf5bad92a63155aadd35439eb1885e0314ece1b9a983d44ed28b48ae2259f949cb913272583a0c4f064cfacd698dd5c7013d6bff52
diff --git a/media-libs/gmmlib/files/gmmlib-19.1.2_so_patch_version.patch b/media-libs/gmmlib/files/gmmlib-19.1.2_so_patch_version.patch
deleted file mode 100644
index 1fd45de157f2..000000000000
--- a/media-libs/gmmlib/files/gmmlib-19.1.2_so_patch_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Source/GmmLib/CMakeLists.txt
-+++ b/Source/GmmLib/CMakeLists.txt
-@@ -40,7 +40,7 @@
- endif()
- 
- if(NOT DEFINED GMMLIB_API_PATCH_VERSION)
--    set(GMMLIB_API_PATCH_VERSION PATCH_VERSION)
-+    set(GMMLIB_API_PATCH_VERSION "${PATCH_VERSION}")
- endif()
- 
- message(STATUS "API version: ${GMMLIB_API_MAJOR_VERSION}.${GMMLIB_API_MINOR_VERSION}.${GMMLIB_API_PATCH_VERSION}")
diff --git a/media-libs/gmmlib/gmmlib-18.3.0.ebuild b/media-libs/gmmlib/gmmlib-18.3.0.ebuild
deleted file mode 100644
index f0dd8d2cd690..000000000000
--- a/media-libs/gmmlib/gmmlib-18.3.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Intel Graphics Memory Management Library"
-HOMEPAGE="https://github.com/intel/gmmlib"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
-	S="${WORKDIR}/${PN}-intel-${P}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_configure() {
-# once upstream makes this optional
-#	local mycmakeargs=(
-#		-DMEDIA_RUN_TEST_SUITE=OFF
-#	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/gmmlib/gmmlib-18.4.1.ebuild b/media-libs/gmmlib/gmmlib-18.4.1.ebuild
deleted file mode 100644
index 93070e071d29..000000000000
--- a/media-libs/gmmlib/gmmlib-18.4.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Intel Graphics Memory Management Library"
-HOMEPAGE="https://github.com/intel/gmmlib"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
-	S="${WORKDIR}/${PN}-intel-${P}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_configure() {
-# once upstream makes this optional
-#	local mycmakeargs=(
-#		-DMEDIA_RUN_TEST_SUITE=OFF
-#	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/gmmlib/gmmlib-19.1.2.ebuild b/media-libs/gmmlib/gmmlib-19.1.2.ebuild
deleted file mode 100644
index dd16c51e2ef0..000000000000
--- a/media-libs/gmmlib/gmmlib-19.1.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Intel Graphics Memory Management Library"
-HOMEPAGE="https://github.com/intel/gmmlib"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
-	S="${WORKDIR}/${PN}-intel-${P}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-19.1.2_so_patch_version.patch
-)
-
-multilib_src_configure() {
-# once upstream makes this optional
-#	local mycmakeargs=(
-#		-DMEDIA_RUN_TEST_SUITE=OFF
-#	)
-
-	cmake-utils_src_configure
-}