app-office/libreoffice: Force Qt4 moc and qmake, bug 599076

Package-Manager: portage-2.3.2

diff --git a/app-office/libreoffice/libreoffice-5.2.3.3.ebuild b/app-office/libreoffice/libreoffice-5.2.3.3.ebuild
index 49e408104b589fb26f97ca4e6adcdfd6ecb630e9..96fefc749ea178780ca0d810080442e52e874ecc 100644 (file)
--- a/app-office/libreoffice/libreoffice-5.2.3.3.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.3.3.ebuild
@@ -25,7 +25,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
 # PATCHSET="${P}-patchset-01.tar.xz"
 
 [[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils ${SCM_ECLASS}
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
 unset SCM_ECLASS
 
 DESCRIPTION="A full office productivity suite"
@@ -394,6 +394,12 @@ src_configure() {
                        java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
        fi
 
+       if use kde; then
+               # bug 544108, bug 599076
+               export QMAKEQT4="$(qt4_get_bindir)/qmake"
+               export MOCQT4="$(qt4_get_bindir)/moc"
+       fi
+
        # system headers/libs/...: enforce using system packages
        # --enable-cairo: ensure that cairo is always required
        # --enable-graphite: disabling causes build breakages

diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
index 49e408104b589fb26f97ca4e6adcdfd6ecb630e9..96fefc749ea178780ca0d810080442e52e874ecc 100644 (file)
--- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
@@ -25,7 +25,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
 # PATCHSET="${P}-patchset-01.tar.xz"
 
 [[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils ${SCM_ECLASS}
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
 unset SCM_ECLASS
 
 DESCRIPTION="A full office productivity suite"
@@ -394,6 +394,12 @@ src_configure() {
                        java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
        fi
 
+       if use kde; then
+               # bug 544108, bug 599076
+               export QMAKEQT4="$(qt4_get_bindir)/qmake"
+               export MOCQT4="$(qt4_get_bindir)/moc"
+       fi
+
        # system headers/libs/...: enforce using system packages
        # --enable-cairo: ensure that cairo is always required
        # --enable-graphite: disabling causes build breakages

diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 13dd853c424e6d98a018b5bd8d1519bb19e72dc5..87acbbcd61e0421ab58899b9c8279e8da1cbdb8e 100644 (file)
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -25,7 +25,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
 # PATCHSET="${P}-patchset-01.tar.xz"
 
 [[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils ${SCM_ECLASS}
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
 unset SCM_ECLASS
 
 DESCRIPTION="A full office productivity suite"
@@ -393,6 +393,12 @@ src_configure() {
                        java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
        fi
 
+       if use kde; then
+               # bug 544108, bug 599076
+               export QMAKEQT4="$(qt4_get_bindir)/qmake"
+               export MOCQT4="$(qt4_get_bindir)/moc"
+       fi
+
        # system headers/libs/...: enforce using system packages
        # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
        # --enable-cairo: ensure that cairo is always required