app-office/libreoffice: Fix USE="gtk3 -gtk", restore keywords

Package-Manager: portage-2.2.27

diff --git a/app-office/libreoffice/files/libreoffice-5.1.1.3-gtk3.patch b/app-office/libreoffice/files/libreoffice-5.1.1.3-gtk3.patch
new file mode 100644 (file)
index 0000000..539ef7e
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-5.1.1.3-gtk3.patch
@@ -0,0 +1,30 @@
+From e451b03e8c21ad23cb1abfd6dd68b6d1e8188121 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Mon, 7 Mar 2016 13:19:55 +0000
+Subject: gtktiledviewer needs gtk3 not gtk2
+
+Change-Id: Iede2008139cb570ff65202762e92f6694548a065
+
+diff --git a/Repository.mk b/Repository.mk
+index e9cd89a..423d58b 100644
+--- a/Repository.mk
++++ b/Repository.mk
+@@ -68,13 +68,13 @@ $(eval $(call gb_Helper_register_executables,NONE, \
+         svptest \
+         svpclient \
+         pixelctl ) \
+-      $(if $(and $(ENABLE_GTK), $(filter LINUX %BSD SOLARIS,$(OS))), tilebench) \
++      $(if $(and $(ENABLE_GTK3), $(filter LINUX %BSD SOLARIS,$(OS))), tilebench) \
+       $(if $(filter LINUX MACOSX SOLARIS WNT %BSD,$(OS)),icontest \
+           outdevgrind) \
+       vcldemo \
+       tiledrendering \
+     mtfdemo \
+-      $(if $(and $(ENABLE_GTK), $(filter LINUX %BSD SOLARIS,$(OS))), gtktiledviewer) \
++      $(if $(and $(ENABLE_GTK3), $(filter LINUX %BSD SOLARIS,$(OS))), gtktiledviewer) \
+ ))
+ 
+ $(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \
+-- 
+cgit v0.10.2
+

diff --git a/app-office/libreoffice/libreoffice-5.1.1.3.ebuild b/app-office/libreoffice/libreoffice-5.1.1.3.ebuild
index 903ff349d6fb90fc3ae03112300731e4076b5d2c..56ec41944e48d2076c77534159c5e3952be98921 100644 (file)
--- a/app-office/libreoffice/libreoffice-5.1.1.3.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.1.3.ebuild
@@ -96,8 +96,7 @@ unset lo_xt
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 [[ ${PV} == *9999* ]] || \
-KEYWORDS=""
-# KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
        ${PYTHON_DEPS}
@@ -259,6 +258,9 @@ PATCHES=(
        # submitted upstream
        "${FILESDIR}/${PN}-5.1.0.3-isnan.patch"
 
+       # taken from 5.1 branch
+       "${FILESDIR}/${PN}-5.1.1.3-gtk3.patch" # Gentoo bug 575732
+
        # not upstreamable stuff
        "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
 )