gentoo resync : 18.08.2019

3 files changed, 3 insertions, 53 deletions

diff --git a/sys-apps/xdg-desktop-portal/Manifest b/sys-apps/xdg-desktop-portal/Manifest
index c18ce145477a..ef8902da90e2 100644
--- a/sys-apps/xdg-desktop-portal/Manifest
+++ b/sys-apps/xdg-desktop-portal/Manifest
@@ -1,5 +1,3 @@
-DIST xdg-desktop-portal-1.2.0.tar.xz 405856 BLAKE2B 8d198c7c18b829f531e34d6526b52776a1acffcb874a2ea93953314710aa18bcb1988ffe190bb7b7f7c0d1c4eb1bc3d39fd2f7da626754730bf64f349ae75d39 SHA512 7c7dff8f1f44b4f564f195a8f9ad2985f6085d16638d18941459cd14d76d8ae7cafaf72f461f2c0c1414a8bace9f3ab4a5416de06edb71df677fd7bdca47f61a
 DIST xdg-desktop-portal-1.4.2.tar.xz 421660 BLAKE2B 5395218fa182947c589ff51cd43b838591e47442b23c4fe0719f0970bff3602e81c4f79ad93890bde97a529ca34a733032e85a1f21f41e9aa230d5c2d40e1136 SHA512 9a19dc8f6899a24f8827ce36447316ce74f293abed469be24adfaa16d18deac0b7c5d77f744eed9b540b54cd23145281dacb6811dc52b34180b21d6dc02efc5a
-EBUILD xdg-desktop-portal-1.2.0.ebuild 1045 BLAKE2B 2061bb59d99bb21ed71e5ace6a25f4f5246cb082f4f0d047e30b7ac057848e5e25b4beed6009f56aa60bc4d52b9666826fd791f0716a8777338aaa4c23fce254 SHA512 25119b9438894da1b1bd9500087b6146054eb8d188d3114017bbbaf749d86bb521a9c359980f00007567d8d3a42573f04aa8be5020e046d6bf3435ca1fc615fa
-EBUILD xdg-desktop-portal-1.4.2.ebuild 978 BLAKE2B ba6d4125cf86e04474286e193dc2183561de4b9322aea49033229a72cc3df5424715a2d47d2da200c4300eaf55e4cf8937811441db16a81fbe4e867254fc925a SHA512 00ae36995b73f502250c002b84e805547f933622f3c5fc53bdfda6044f504efc0feda8a2321df02740307efe862fde3667bd65e2c3f1440dcceab10e88105670
+EBUILD xdg-desktop-portal-1.4.2.ebuild 977 BLAKE2B 97a7170c7d4b625dd13a089180fe74780f0e3f967ebce3d912ff2a64055e47b17063557dd8bc3ac518ba0c7136c7e7ccb8f65ca558cc24c017d1c635e5c00d74 SHA512 1348d465bd5d3438d16cd9aaef2cf373c67fefbba35504b98131072777fe587785d29abfbf0613a0f6e8d19c8e4a3c645c048f41cc4dcc8727b4bfd29b0a27ac
 MISC metadata.xml 360 BLAKE2B 1e3fae0173fab20df0be6a2bd8432477d2c0ab2b9c4272e72a9d8a9eee3255c56311364ea079d288f87032fbc2ec8cad69f32a6bc41b152d19e307ee84493b49 SHA512 4e7232bd03fad6442491ce16c155b0d447050dfc383bb2c16b51297c8c2dcc2793b6d9ce6703451e9516d5a3017fb9e20e85ed7208c94c0faa4489bcbd897e22
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.2.0.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.2.0.ebuild
deleted file mode 100644
index 65b6451ec6f4..000000000000
--- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.2.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-DESCRIPTION="Desktop integration portal"
-HOMEPAGE="https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal"
-SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="doc" # geolocation
-
-BDEPEND="
-	dev-util/gdbus-codegen
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? (
-		app-text/xmlto
-		app-text/docbook-xml-dtd:4.3
-	)
-"
-DEPEND="
-	dev-libs/glib:2[dbus]
-	sys-fs/fuse:0
-"
-# 	geolocation? ( >=app-misc/geoclue-2.5.2:2.0 ) # bug 678802
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -e "/^PKG_CHECK_MODULES(FLATPAK/s/^/# DONT /" -i configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-pipewire
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-		$(use_enable doc docbook-docs)
-		--disable-geoclue
-	)
-# 		$(use_enable geolocation geoclue)
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.4.2.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.4.2.ebuild
index e8fef5501652..c93537059712 100644
--- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.4.2.ebuild
+++ b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="doc geolocation screencast"
 
 BDEPEND="
@@ -28,7 +28,7 @@ DEPEND="
 	dev-libs/json-glib
 	sys-fs/fuse:0
 	geolocation? ( >=app-misc/geoclue-2.5.3:2.0 )
-	screencast? ( media-video/pipewire )
+	screencast? ( media-video/pipewire:= )
 "
 RDEPEND="${DEPEND}"