app-office/libreoffice: Allow alternatives to kioclient:4

Package-Manager: Portage-2.3.6, Repoman-2.3.1

diff --git a/app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch b/app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch
new file mode 100644 (file)
index 0000000..a6e732f
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch
@@ -0,0 +1,11 @@
+--- a/shell/source/unix/misc/senddoc.sh        2017-06-15 15:44:22.000000000 +0200
++++ b/shell/source/unix/misc/senddoc.sh        2017-06-25 01:00:08.525435930 +0200
+@@ -389,6 +389,8 @@
+         elif [ -n "$DESKTOP_LAUNCH" ]; then
+             # http://lists.freedesktop.org/pipermail/xdg/2004-August/002873.html
+             MAILER=${DESKTOP_LAUNCH}
++        elif [ -n "$KDE_FULL_SESSION" -a -x /usr/bin/kde-open5 ] ; then
++            MAILER=/usr/bin/kde-open5
+         elif [ -n "$KDE_FULL_SESSION" -a -x /usr/bin/kde-open ] ; then
+             MAILER=/usr/bin/kde-open
+         elif [ -x /usr/bin/xdg-open ] ; then

diff --git a/app-office/libreoffice/libreoffice-5.3.9999.ebuild b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
index 5f6ac8e8e0d8ba4a93849ede367b3fe2d2cbdfd3..186bd71a3a39c90bbbb248dd44e955e5dd957488 100644 (file)
--- a/app-office/libreoffice/libreoffice-5.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
@@ -181,8 +181,8 @@ RDEPEND="${COMMON_DEPEND}
        media-fonts/liberation-fonts
        media-fonts/libertine
        media-fonts/urw-fonts
+       || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools $(add_kdeapps_dep kioclient) )
        java? ( >=virtual/jre-1.6 )
-       kde? ( $(add_kdeapps_dep kioclient) )
        vlc? ( media-video/vlc )
 "
 
@@ -243,6 +243,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 PATCHES=(
        # not upstreamable stuff
        "${FILESDIR}/${PN}-5.3-system-pyuno.patch"
+       "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
 
        # TODO: upstream
        "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"

diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index ccb30f204f76eb1124fbdf08c8fdd931fa5ede32..ca3407b6f0102037c3252cb8e05f8ef9fa4622bd 100644 (file)
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -184,8 +184,8 @@ RDEPEND="${COMMON_DEPEND}
        media-fonts/liberation-fonts
        media-fonts/libertine
        media-fonts/urw-fonts
+       || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools $(add_kdeapps_dep kioclient) )
        java? ( >=virtual/jre-1.6 )
-       kde? ( $(add_kdeapps_dep kioclient) )
        vlc? ( media-video/vlc )
 "
 
@@ -246,6 +246,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 PATCHES=(
        # not upstreamable stuff
        "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+       "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
 
        # TODO: upstream
        "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"