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 5116E139694 for ; Sat, 25 Feb 2017 10:40:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8A646E0C5A; Sat, 25 Feb 2017 10:40:45 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 5BE4EE0C5A for ; Sat, 25 Feb 2017 10:40:45 +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 D109A340F53 for ; Sat, 25 Feb 2017 10:40:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1A27B53ED for ; Sat, 25 Feb 2017 10:40:42 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1488019232.0339b82dc658d36fe2a50dde050e11d530a075bd.kensington@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtdbus/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtdbus/qtdbus-5.8.0.ebuild dev-qt/qtdbus/qtdbus-5.8.9999.ebuild dev-qt/qtdbus/qtdbus-5.9999.ebuild X-VCS-Directories: dev-qt/qtdbus/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 0339b82dc658d36fe2a50dde050e11d530a075bd X-VCS-Branch: master Date: Sat, 25 Feb 2017 10:40:42 +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: cdf0c30b-6b55-4498-92df-b848ce626cc2 X-Archives-Hash: dafc5c450e7e09c9421088534f44444d commit: 0339b82dc658d36fe2a50dde050e11d530a075bd Author: Michael Palimaka gentoo org> AuthorDate: Sat Feb 25 10:40:24 2017 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Sat Feb 25 10:40:32 2017 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=0339b82d dev-qt/qtdbus: add awful hack to make it build Gentoo-bug: 599636 Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-qt/qtdbus/qtdbus-5.8.0.ebuild | 30 ++++++++++++++++++++++++++++++ dev-qt/qtdbus/qtdbus-5.8.9999.ebuild | 32 +++++++++++++++++++++++++++++++- dev-qt/qtdbus/qtdbus-5.9999.ebuild | 32 +++++++++++++++++++++++++++++++- 3 files changed, 92 insertions(+), 2 deletions(-) diff --git a/dev-qt/qtdbus/qtdbus-5.8.0.ebuild b/dev-qt/qtdbus/qtdbus-5.8.0.ebuild index 278c7799..d6b48c91 100644 --- a/dev-qt/qtdbus/qtdbus-5.8.0.ebuild +++ b/dev-qt/qtdbus/qtdbus-5.8.0.ebuild @@ -21,6 +21,7 @@ DEPEND=" RDEPEND="${DEPEND}" QT5_TARGET_SUBDIRS=( + src/corelib src/dbus src/tools/qdbusxml2cpp src/tools/qdbuscpp2xml @@ -31,9 +32,38 @@ QT5_GENTOO_CONFIG=( :dbus-linked: ) +src_prepare() { + qt5-build_src_prepare + + cat > "${S}/src/corelib/corelib.pro" <<-_EOF_ || die + QT = + TARGET = QtCore + load(qt_module) + _EOF_ +} + src_configure() { local myconf=( -dbus-linked ) qt5-build_src_configure } + +src_install() { + QT5_TARGET_SUBDIRS=( + src/dbus + src/tools/qdbusxml2cpp + src/tools/qdbuscpp2xml + ) + qt5-build_src_install +} + +src_compile() { + hack() { + emake + if [[ ${subdir} = "src/corelib" ]]; then + rm "${S}"/lib/libQt5Core* || die + fi + } + qt5_foreach_target_subdir hack +} diff --git a/dev-qt/qtdbus/qtdbus-5.8.9999.ebuild b/dev-qt/qtdbus/qtdbus-5.8.9999.ebuild index 8ebd7871..d6b48c91 100644 --- a/dev-qt/qtdbus/qtdbus-5.8.9999.ebuild +++ b/dev-qt/qtdbus/qtdbus-5.8.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -21,6 +21,7 @@ DEPEND=" RDEPEND="${DEPEND}" QT5_TARGET_SUBDIRS=( + src/corelib src/dbus src/tools/qdbusxml2cpp src/tools/qdbuscpp2xml @@ -31,9 +32,38 @@ QT5_GENTOO_CONFIG=( :dbus-linked: ) +src_prepare() { + qt5-build_src_prepare + + cat > "${S}/src/corelib/corelib.pro" <<-_EOF_ || die + QT = + TARGET = QtCore + load(qt_module) + _EOF_ +} + src_configure() { local myconf=( -dbus-linked ) qt5-build_src_configure } + +src_install() { + QT5_TARGET_SUBDIRS=( + src/dbus + src/tools/qdbusxml2cpp + src/tools/qdbuscpp2xml + ) + qt5-build_src_install +} + +src_compile() { + hack() { + emake + if [[ ${subdir} = "src/corelib" ]]; then + rm "${S}"/lib/libQt5Core* || die + fi + } + qt5_foreach_target_subdir hack +} diff --git a/dev-qt/qtdbus/qtdbus-5.9999.ebuild b/dev-qt/qtdbus/qtdbus-5.9999.ebuild index 8ebd7871..d6b48c91 100644 --- a/dev-qt/qtdbus/qtdbus-5.9999.ebuild +++ b/dev-qt/qtdbus/qtdbus-5.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -21,6 +21,7 @@ DEPEND=" RDEPEND="${DEPEND}" QT5_TARGET_SUBDIRS=( + src/corelib src/dbus src/tools/qdbusxml2cpp src/tools/qdbuscpp2xml @@ -31,9 +32,38 @@ QT5_GENTOO_CONFIG=( :dbus-linked: ) +src_prepare() { + qt5-build_src_prepare + + cat > "${S}/src/corelib/corelib.pro" <<-_EOF_ || die + QT = + TARGET = QtCore + load(qt_module) + _EOF_ +} + src_configure() { local myconf=( -dbus-linked ) qt5-build_src_configure } + +src_install() { + QT5_TARGET_SUBDIRS=( + src/dbus + src/tools/qdbusxml2cpp + src/tools/qdbuscpp2xml + ) + qt5-build_src_install +} + +src_compile() { + hack() { + emake + if [[ ${subdir} = "src/corelib" ]]; then + rm "${S}"/lib/libQt5Core* || die + fi + } + qt5_foreach_target_subdir hack +}