gentoo resync : 03.11.2019

4 files changed, 3 insertions, 120 deletions

diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index 53978f46cc28..a6e35aa5f65e 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -1,7 +1,4 @@
-AUX xdg-utils-1.1.1-ktraderclient5.patch 1542 BLAKE2B 4b6adf3d181f1a7869c14d475cf156ed5952d2995243086f276aa3dace6382ba55a47cc83bf4b06da60d1363ef5fa4b815adf159b682629cb87dc4030211fae2 SHA512 a9c1def45928026cbc460527862c73e78074e924fdf088c20afeda74c64103c42f9c551123bee3e627f0d41be632c4f4d250722719a33de20c88085d1d712b4d
 AUX xdg-utils-1.1.3-xdg-open-pcmanfm.patch 702 BLAKE2B 1adcb274c1a5fcca4a99178bfe38d70e5b1d1f792c20ea4de166096137d0c393a38b4958e1044aa2a6afd4437b9e4eb40d1223ea6b7dd905e93e0499a88478a3 SHA512 fd30975e48a3a7607a812bcc87d5a9595875695693609d477acbe9826a52c53b14c66a4118888eb6d8fcb63630c5f614250f4c8640d1ea99710b26714920c019
-DIST xdg-utils-1.1.1.tar.gz 295213 BLAKE2B c52bf6bb4d5e2cd2848b17dc4f478debe1d9d399a02f014d0507ed26330ce47ac77c047919fabffff06c3cc773fab6bd4744bcdd9338e0726aca8e690bb76c0a SHA512 6641b17daea7eecfee0d395e621dc42481582e505bff90a6df5eb0299ed2dca7a76520f000d9545a8424f06d41590382156a2e50f3d68d5c1ab825c268e90edb
 DIST xdg-utils-1.1.3.tar.gz 297170 BLAKE2B bd281df73d8c966d11b502dd7ec88d96dbc9683503f54b043ae4842f146b6847bd3dd6902cf993771848d9fcb55d26d67f032af2b8aa0795a6d9855535e57d5b SHA512 d1f819a211eb4104a90dfdc6fedcb640fd46b15ccfc8762266f8f538c49d74cb00027b8c1af991fb2a200acb4379986ae375700e06a2aa08fb41a38f883acb3e
-EBUILD xdg-utils-1.1.1-r1.ebuild 2171 BLAKE2B 7cfc35a2ac8a295244175603d699ae43ba2639adc26b875d9c733b2dec92588343ad5dbbc27fa7c034c363adbaf493827d304522155ee7ee5b117286e8fb6f9d SHA512 11a948c25c986dba7be2c46a2a6e55cd7bd1cc0a80d20e5340604d00426b10943f927f486d4b6c4f5f0148a565736498c5cac2607b265b87b6857da0f78da2fa
-EBUILD xdg-utils-1.1.3-r1.ebuild 2137 BLAKE2B 5bb2f64c50ddc0e142741b13fb5946b47da89c2812ce2cdc1840d1f7880fcf63140b8495b0fab1a77e5edbb174226c31bbaa1d0a090ae25558ee695746eac87a SHA512 27b4905740c6b3fde87355f1f75e79c2c5ae033df88c312f2609af672a0f9cd1e255f65af15d04d8329874821bfcaa48f68c6a61f8f87f2a42d3e2a26eae3548
+EBUILD xdg-utils-1.1.3-r1.ebuild 2157 BLAKE2B fe36df854985cc47bcf5c637bef41c4233edbe3345892ee77fea4638f3dc29dc88a590cd53b0ae668d9dea2cb5a48d3231f448ba55cc6119a533c1c383ec3b82 SHA512 32f9d27d6c6cbfcd34afe52bbe782c4dc2338b2643ff1dfa11f5b772340511191947f748993eb22692787407c2b92326e0e07f61ce35483e5dda271a5b46d912
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/xdg-utils/files/xdg-utils-1.1.1-ktraderclient5.patch b/x11-misc/xdg-utils/files/xdg-utils-1.1.1-ktraderclient5.patch
deleted file mode 100644
index eee4684c17c4..000000000000
--- a/x11-misc/xdg-utils/files/xdg-utils-1.1.1-ktraderclient5.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 31db8136bdf61e7f9cb866f9d47c99c63343558d Mon Sep 17 00:00:00 2001
-From: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
-Date: Fri, 15 Apr 2016 11:17:37 +0200
-Subject: xdg-mime: support for KDE Frameworks 5.6
-
-
-diff --git a/scripts/xdg-mime.in b/scripts/xdg-mime.in
-index 129850f..63b8a82 100644
---- a/scripts/xdg-mime.in
-+++ b/scripts/xdg-mime.in
-@@ -428,13 +428,9 @@ defapp_kde()
-       case "${KDE_SESSION_VERSION}" in
-         4)
-           KTRADER=`which ktraderclient 2> /dev/null`
--          MIMETYPE="--mimetype"
--          SERVICETYPE="--servicetype"
-         ;;
-         5)
-           KTRADER=`which ktraderclient${KDE_SESSION_VERSION} 2> /dev/null`
--          MIMETYPE="--mimetype"
--          SERVICETYPE="--servicetype"
-         ;;
-       esac
-     else
-@@ -442,8 +438,8 @@ defapp_kde()
-     fi
-     if [ -n "$KTRADER" ] ; then
-         DEBUG 1 "Running KDE trader query \"$MIME\" mimetype and \"Application\" servicetype"
--        trader_result=`$KTRADER $MIMETYPE "$MIME" $SERVICETYPE Application 2>/dev/null \
--            | grep DesktopEntryPath | head -n 1 | cut -d ':' -f 2 | cut -d \' -f 2`
-+        trader_result=`$KTRADER --mimetype "$MIME" --servicetype Application 2>/dev/null \
-+            | grep -E "^DesktopEntryPath : |\.desktop$" | head -n1 | sed "s/^DesktopEntryPath : '\(.*\.desktop\)'\$/\1/"`
-         if [ -n "$trader_result" ] ; then
-             basename "$trader_result"
-             exit_success
-@@ -954,4 +950,3 @@ esac
- update_mime_database $xdg_base_dir
- 
- exit_success
--
--- 
-cgit v0.10.2
-
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild
deleted file mode 100644
index ddf9215344fc..000000000000
--- a/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-#SRC_URI="https://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
-#SRC_URI="https://people.freedesktop.org/~rdieter/${PN}/${MY_P}.tar.gz
-#	https://dev.gentoo.org/~ssuominen/${P}-patchset-1.tar.xz"
-SRC_URI="https://portland.freedesktop.org/download/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc +perl"
-
-RDEPEND="dev-util/desktop-file-utils
-	x11-misc/shared-mime-info
-	x11-apps/xprop
-	x11-apps/xset
-	perl? ( dev-perl/File-MimeInfo )"
-DEPEND=">=app-text/xmlto-0.0.26-r1[text(+)]"
-
-DOCS=( README RELEASE_NOTES TODO ) # ChangeLog is bogus, see git instead
-
-PATCHES=( "${FILESDIR}/${P}-ktraderclient5.patch" )
-
-RESTRICT="test" # Disabled because of sandbox violation(s)
-
-#S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-	# If you choose to do git snapshot instead of patchset, you need to remember
-	# to run `autoconf` in ./ and `make scripts-clean` in ./scripts/ to refresh
-	# all the files
-	if [[ -d ${WORKDIR}/patch ]]; then
-		EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch
-	fi
-	eautoreconf
-	pushd scripts && make scripts-clean && popd
-}
-
-src_configure() {
-	export ac_cv_path_XMLTO="$(type -P xmlto) --skip-validation" #502166
-	default
-}
-
-src_install() {
-	default
-
-	newdoc scripts/xsl/README README.xsl
-	use doc && dodoc -r scripts/html
-
-	# Install default XDG_DATA_DIRS, bug #264647
-	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/local/share\" > 30xdg-data-local
-	echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local
-	doenvd 30xdg-data-local
-
-	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/share\" > 90xdg-data-base
-	echo XDG_CONFIG_DIRS=\"${EPREFIX}/etc/xdg\" >> 90xdg-data-base
-	doenvd 90xdg-data-base
-}
-
-pkg_postinst() {
-	[[ -x $(type -P gtk-update-icon-cache) ]] || elog "Install dev-util/gtk-update-icon-cache for the gtk-update-icon-cache command."
-}
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
index b4745c6017ae..9dc2cd3e4b6c 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://portland.freedesktop.org/download/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris"
 IUSE="doc"
 
 RDEPEND="
@@ -30,7 +30,7 @@ RDEPEND="
 "
 DEPEND=">=app-text/xmlto-0.0.26-r1[text(+)]"
 
-DOCS=( README RELEASE_NOTES TODO ) # ChangeLog is bogus, see git instead
+DOCS=( ChangeLog README RELEASE_NOTES TODO )
 
 RESTRICT="test" # Disabled because of sandbox violation(s)