[gentoo-commits] repo/gentoo:master commit in: x11-misc/xdg-utils/files/, x11-misc/xdg-utils/

[Johannes Huber]

commit:     f3b38d66963fc2bc0f0a2c278621d38d275b0082
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 09:17:29 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 09:17:41 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3b38d66

x11-misc/xdg-utils: Add support for ktraderclient5

Revision bump adds upstream patch to support kdetraderclient5 from
kde-plasma/kde-cli-tools. Fixes default mime query, used for example by
google-chrome.

Gentoo-bug: 578848

Package-Manager: portage-2.2.28

 .../files/xdg-utils-1.1.1-ktraderclient5.patch     | 43 +++++++++++++
 x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild       | 72 ++++++++++++++++++++++
 2 files changed, 115 insertions(+)

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
new file mode 100644
index 0000000..eee4684
--- /dev/null
+++ b/x11-misc/xdg-utils/files/xdg-utils-1.1.1-ktraderclient5.patch
@@ -0,0 +1,43 @@
+From 31db8136bdf61e7f9cb866f9d47c99c63343558d Mon Sep 17 00:00:00 2001
+From: Massimiliano Torromeo <massimiliano.torromeo@×××××.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
new file mode 100644
index 0000000..75a0b97
--- /dev/null
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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 x11-libs/gtk+:2 for the gtk-update-icon-cache command."
+}