From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 601021395E2 for ; Sun, 13 Nov 2016 00:16:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6D996E0B7C; Sun, 13 Nov 2016 00:15:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 402A4E0B7C for ; Sun, 13 Nov 2016 00:15:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7EA4A341238 for ; Sun, 13 Nov 2016 00:15:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4B26824B0 for ; Sun, 13 Nov 2016 00:15:55 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <1478996148.fe6e536c6a5c4ac3c49ca11f475eb065aa1be2f2.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/libreoffice-5.2.3.3.ebuild app-office/libreoffice/libreoffice-5.2.9999.ebuild app-office/libreoffice/libreoffice-9999.ebuild X-VCS-Directories: app-office/libreoffice/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: fe6e536c6a5c4ac3c49ca11f475eb065aa1be2f2 X-VCS-Branch: master Date: Sun, 13 Nov 2016 00:15:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9bfbe1cb-1ce3-4408-85cc-d5deb6bee345 X-Archives-Hash: 5b190e4081ca298ce184a659b72168f4 commit: fe6e536c6a5c4ac3c49ca11f475eb065aa1be2f2 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sun Nov 13 00:15:31 2016 +0000 Commit: Andreas Hüttel gentoo org> CommitDate: Sun Nov 13 00:15:48 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe6e536c app-office/libreoffice: Force Qt4 moc and qmake, bug 599076 Package-Manager: portage-2.3.2 app-office/libreoffice/libreoffice-5.2.3.3.ebuild | 8 +++++++- app-office/libreoffice/libreoffice-5.2.9999.ebuild | 8 +++++++- app-office/libreoffice/libreoffice-9999.ebuild | 8 +++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/app-office/libreoffice/libreoffice-5.2.3.3.ebuild b/app-office/libreoffice/libreoffice-5.2.3.3.ebuild index 49e4081..96fefc7 100644 --- 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 49e4081..96fefc7 100644 --- 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 13dd853..87acbbc 100644 --- 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