From 6624a763e13d7a53efcd4757adc59356f7021c9d Mon Sep 17 00:00:00 2001 From: Johannes Huber Date: Thu, 17 Apr 2014 20:07:33 +0000 Subject: Qt multibuild by Uwe L. Korn . Remove old. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD) --- dev-libs/qtkeychain/ChangeLog | 7 ++- .../qtkeychain/files/qtkeychain-0.1.0-qt5.patch | 35 --------------- dev-libs/qtkeychain/qtkeychain-0.1.0.ebuild | 30 ------------- dev-libs/qtkeychain/qtkeychain-0.3.0.ebuild | 52 +++++++++++++++++----- 4 files changed, 48 insertions(+), 76 deletions(-) delete mode 100644 dev-libs/qtkeychain/files/qtkeychain-0.1.0-qt5.patch delete mode 100644 dev-libs/qtkeychain/qtkeychain-0.1.0.ebuild (limited to 'dev-libs/qtkeychain') diff --git a/dev-libs/qtkeychain/ChangeLog b/dev-libs/qtkeychain/ChangeLog index 8f3f925b9988..5e076da93e09 100644 --- a/dev-libs/qtkeychain/ChangeLog +++ b/dev-libs/qtkeychain/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/qtkeychain # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/qtkeychain/ChangeLog,v 1.2 2014/03/13 14:22:22 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/qtkeychain/ChangeLog,v 1.3 2014/04/17 20:07:32 johu Exp $ + + 17 Apr 2014; Johannes Huber + -files/qtkeychain-0.1.0-qt5.patch, -qtkeychain-0.1.0.ebuild, + qtkeychain-0.3.0.ebuild: + Qt multibuild by Uwe L. Korn . Remove old. *qtkeychain-0.3.0 (13 Mar 2014) diff --git a/dev-libs/qtkeychain/files/qtkeychain-0.1.0-qt5.patch b/dev-libs/qtkeychain/files/qtkeychain-0.1.0-qt5.patch deleted file mode 100644 index 2ec9861fba1a..000000000000 --- a/dev-libs/qtkeychain/files/qtkeychain-0.1.0-qt5.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 69638a5ddb725c4f8000f86546d5d41f2917fe40 Mon Sep 17 00:00:00 2001 -From: Johannes Huber -Date: Thu, 30 May 2013 00:03:45 +0200 -Subject: [PATCH] Add Qt5 build option. - -* removes automagic build when Qt4 + Qt5 is installed on system ---- - CMakeLists.txt | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index aba9032..f601a11 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -11,8 +11,16 @@ set(QTKEYCHAIN_SOVERSION 0) - set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Modules") - include(GNUInstallDirs) - -+option(QT5_BUILD "Build qtkeychain using the Qt5 framework" TRUE) -+ -+if(QT5_BUILD) -+ find_package(Qt5Core QUIET) -+else() -+ find_package(Qt4 REQUIRED) -+ include(${QT_USE_FILE}) -+endif() -+ - # try Qt5 first, and prefer that if found --find_package(Qt5Core QUIET) - if (Qt5Core_FOUND) - if(UNIX AND NOT APPLE) - find_package(Qt5DBus REQUIRED) --- -1.8.2.1 - diff --git a/dev-libs/qtkeychain/qtkeychain-0.1.0.ebuild b/dev-libs/qtkeychain/qtkeychain-0.1.0.ebuild deleted file mode 100644 index 11113281d335..000000000000 --- a/dev-libs/qtkeychain/qtkeychain-0.1.0.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/qtkeychain/qtkeychain-0.1.0.ebuild,v 1.1 2013/05/29 23:20:33 johu Exp $ - -EAPI=5 - -inherit cmake-utils - -DESCRIPTION="Qt API for storing passwords securely" -HOMEPAGE="https://github.com/frankosterfeld/qtkeychain" -SRC_URI="https://github.com/frankosterfeld/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=" - dev-qt/qtcore:4 - dev-qt/qtdbus:4 -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${P}-qt5.patch" ) - -src_configure() { - local mycmakeargs=( -DQT5_BUILD=OFF ) - - cmake-utils_src_configure -} diff --git a/dev-libs/qtkeychain/qtkeychain-0.3.0.ebuild b/dev-libs/qtkeychain/qtkeychain-0.3.0.ebuild index 6db124d6e41c..5af1bb894b12 100644 --- a/dev-libs/qtkeychain/qtkeychain-0.3.0.ebuild +++ b/dev-libs/qtkeychain/qtkeychain-0.3.0.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/qtkeychain/qtkeychain-0.3.0.ebuild,v 1.1 2014/03/13 14:22:22 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/qtkeychain/qtkeychain-0.3.0.ebuild,v 1.2 2014/04/17 20:07:32 johu Exp $ EAPI=5 -inherit cmake-utils +inherit cmake-utils multibuild DESCRIPTION="Qt API for storing passwords securely" HOMEPAGE="https://github.com/frankosterfeld/qtkeychain" @@ -13,26 +13,58 @@ SRC_URI="https://github.com/frankosterfeld/${PN}/archive/v${PV}.tar.gz -> ${P}.t LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="qt5" +IUSE="+qt4 qt5" -DEPEND=" +REQUIRED_USE="|| ( qt4 qt5 )" + +RDEPEND=" qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 ) - !qt5? ( + qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 ) " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + qt5? ( dev-qt/linguist-tools:5 ) +" DOCS=( ChangeLog ReadMe.txt ) +pkg_setup() { + MULTIBUILD_VARIANTS=() + if use qt4; then + MULTIBUILD_VARIANTS+=(qt4) + fi + if use qt5; then + MULTIBUILD_VARIANTS+=(qt5) + fi +} + src_configure() { - local mycmakeargs=( - $(cmake-utils_use_build !qt5 WITH_QT4) - ) + myconfigure() { + if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then + local mycmakeargs=(-DBUILD_WITH_QT4=ON) + fi + if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then + local mycmakeargs=(-DBUILD_WITH_QT4=OFF) + fi + cmake-utils_src_configure + } + + multibuild_foreach_variant myconfigure +} + +src_compile() { + multibuild_foreach_variant cmake-utils_src_compile +} + +src_install() { + multibuild_foreach_variant cmake-utils_src_install +} - cmake-utils_src_configure +src_test() { + multibuild_foreach_variant cmake-utils_src_test } -- cgit v1.2.3-65-gdbad