Qt multibuild by Uwe L. Korn <uwelk@xhochy.com>. Remove old.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

5 files changed, 63 insertions, 94 deletions

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 <johu@gentoo.org>
+  -files/qtkeychain-0.1.0-qt5.patch, -qtkeychain-0.1.0.ebuild,
+  qtkeychain-0.3.0.ebuild:
+  Qt multibuild by Uwe L. Korn <uwelk@xhochy.com>. Remove old.
 
 *qtkeychain-0.3.0 (13 Mar 2014)
 
diff --git a/dev-libs/qtkeychain/Manifest b/dev-libs/qtkeychain/Manifest
index c63e3e64c238..3294005438e9 100644
--- a/dev-libs/qtkeychain/Manifest
+++ b/dev-libs/qtkeychain/Manifest
@@ -1,27 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX qtkeychain-0.1.0-qt5.patch 971 SHA256 386566d1855c31ede47e0a5da3d80cb2bfba30461934c6d1c110e8c0d6a81a7c SHA512 15c28c2f8c5481fbd8546d5e792acd3f78f516e3af1adc4d4b7eac4ace17a731f9504df57b0ad37129c4ae46633cb38a1470b2fd20bfe03f7f97e6148569603c WHIRLPOOL daa7bf8dfa895a91f7f53d0bdf24144dfaa66501e064bbeb25c32582889c0e0fae75546ca0afef82999b9b863d7025bd1c0df15bb43ab282032c2f41c106edff
-DIST qtkeychain-0.1.0.tar.gz 12826 SHA256 1a9a8906792a500586c3119865786664474ee42d0b10295d4d6b505e764ae192 SHA512 47b8a53d24539b195d341ea505e9a2660de0a2e98bbc83f382155049d497aa15373cfefe484c73126c4ca6f3793c54596b61128be5a8ce9b082b61588f919171 WHIRLPOOL 9cb52b2827f632d20167dd9810f4af091e40916376d03e56b5e598ed700d4432d081d5c3cf96c09f2f6bdf2651d5fee7ceab732c84c5d0c9c6c157c272e6df08
 DIST qtkeychain-0.3.0.tar.gz 17659 SHA256 b796495c5c8aeedb1f0fb80f99b29e293c6e999b38f63a9a25fe53ae7281bc07 SHA512 7beb907c1d8eb1963c25c2bf402d859ec4ccd088b7ca68961cbd50877c1705243ecf86b4ac67fcf37ff06b51d8290ad0faf326b7834f6289ab43822c9745de73 WHIRLPOOL 5c147f8087aea1175157440c678ed506f543ba09f95c73a615bc9abb19558429533ecbd862ee753f664c64280f0af2fc47244063f529cbe54675c4032dfbeaad
-EBUILD qtkeychain-0.1.0.ebuild 699 SHA256 39bb9a6175a3f827c5c0e7facb50a90e9cad53fa9e66d2faac5b25082bc9a3b2 SHA512 cdb8e33e081129219baa86a21afee80e7e91854997509b0356a81dc85b1b0af27f27ca4e3ae03d274754b5655131bc0414852bf04b1974ee0503d0d5dc3ed279 WHIRLPOOL af35ddc15143e16fc19bd1a569ee9fe210c5bbe194692a01a829639f592a0b39a22ece24704c971058e07231c19347417b774d8fbc5cc97a95e11775dc2b8fd9
-EBUILD qtkeychain-0.3.0.ebuild 778 SHA256 e7d65995da1b4589977fa30e9c387b9a39a4d467a569b42fac913c70b87fa62d SHA512 2ae1a8f331e9a1395de4b26e9b8b28b31b7b348290aa3d0ec2f9cff0805352fd6f143cb3825d0b92de608d4fd557fbfcf6dbfeaf692d06eba795171e8071ed5c WHIRLPOOL deb32ed91e56251246f470093a84b7ec61f0f097303fa893e35ca29946961e1a8c9b3ad6207ea2d33871fb540baacabadb521759ec98d324641ab99ea1f4e978
-MISC ChangeLog 521 SHA256 e9b3e793265c888f1d064c6a49c384a46e1d98a61c3c103300b3b677b8c62555 SHA512 17f10239ef3a0ea2275225d7779561e1c9d4961318941839b7cf2ea5dfe8f3b551c72415b7a49381200142e83c1d6e2863e88682f8b707f401ecf03cb28eabaa WHIRLPOOL 9d7a1f2f6801de6723753d0b534585efe79c44bd7667acc46f1c6e55db577de5ff9892e184d040285553c192f09eb85b0f320f1798bf57335552a71e397b4d5d
+EBUILD qtkeychain-0.3.0.ebuild 1393 SHA256 1e2a966c11cb6df2d775817e773012d3d292e252bb529a90440f108cc608c3b9 SHA512 aa5a9bdddeda59a3d7e45351d2099f1f49ef82f2271752858465dc15656d5b3d5abc87ff0d8cbb6ef205700379c21c429b796f2404a0852d4166f7746b1f05e1 WHIRLPOOL 5156851cc20400414089938bb1e073dd0bf3dda47d5f514025a2402e5a5b05bd21a68c03811d6974b57ef796f53b388a14892fcc5a32e49b7bba77a55c0460e2
+MISC ChangeLog 723 SHA256 8f02ac7247e823a14d26da2a2ec3773308c6b6c9d50b6533a1ea007b6da1c917 SHA512 914c11169ca262c755f78096e07900e16f9f8eb3d873a70d58bb7d46126140727e2a7d22f70423ff0c19288e875fea3b837f8a76de528cdea7bae701e931b4fc WHIRLPOOL b567287f0df9fbfde9fba5082ca357abd42a02242bb4b739ee8eef4e6b074ddfdb94e9508fe0c68c665e8c5b36ea7e03e03ddf0b5acb256def78cf9c32b51373
 MISC metadata.xml 231 SHA256 d67e9a26606c0a99afa1a19f7624e650f5909651c8c9dfc83f505bc086d2b639 SHA512 83ef26484c36d03fbe4599ba87dea62c8707f297459c1648939288031638d918cc387e5cd1888b637c33e39265e8e8445e3fdda3181e2da4edfa6f856ce40890 WHIRLPOOL 81245aa5fcda3c4070bb716707fbce2323bb75bb2eb5da0ccd13aac138c4a19da7eac1fbb204e09ef2ac0cefa7945099c494ef71bee262d6bd6ab95580963d1d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTIb8iAAoJEGVpnaTzz9K9dGIP/RqX9pNwFnIgp6q0MnNaHZvm
-hhusN8gEux/cOWIcgQ6dDBBSebHzmAeIMKGlABfbKTouNVe7eKWMl/ZwtJz7WASq
-8AiS1p7euc/DPd1zj+GfBuH/Ep7/FWMCqSYyaQ4U/ok4+GM6UPgb54rKLItX9byg
-WaU46ns4FBH3UGqs2+yKGht2lBpA/qFyjQfWukPZKE7YwFGhND9tSK/BFbnPRibE
-SDigsgtFQrkNu7qWcivs2NAuBLgS+YGigPIPz/N+e8/7tvK7t3tm75Fd0HT9o1CV
-yvCgOmt6RxHqfo1nhnKed0k/ObM16rAAaXxxYmdwqDV0gyyNlIbF85ZGBIBL+73X
-xKyIhfC8UYn0ZChGgWtOpU2MPuVtTxopLXwQacdDTtPFVU8tDPvfnJinL9gLj9wQ
-VC+4JuEjZ2TwYONiQWfsxzppejGIoLQnmiQ0gXuPV2u6ldY4gfN8VFQSN+9xhzpz
-omZ/fovRHGHZ+FuJHFgnAxowzn2466UDyxiUKGqQNvtexmXynsowLZnO3iUxLldp
-HDXkRDWQbQDQ+/zkaHJ9pbIvxdrxKZkCqULmZKDBNd6W4sO+PwSLzj3HOSrBHar1
-GCSr1FlQ6J89L2n/9vRJb3CwNqpGVruxDuBknhSkRR2+LNCtcmZCig6CneXI0wX2
-Dflp4z3XdwslKHxv3qJH
-=fJaY
+iQIcBAEBCAAGBQJTUBhZAAoJEGVpnaTzz9K9a/sP/RaB73/mUCm8eVSHL3dwtf5t
+UtsCpClAB65TNA2sNRrEFcvuPkcp68FmSXzXenH33RqSpnny+PAhKaf7YX3F8lkZ
+hn8GzzmIX377apNVu9gRj7vuWCIQ0H29C0Zu1qL5g3aZx+DfBx75EqiPFssLn1YA
+fSwDdEbV7m7dgwBWna6MNfDRLd/KWSMjQIaXc+YQOMxA5Uby9po/nQGL182gwhZa
+r87EatzjkKDrJOFa4j5TgJn/RNNQ92d23uaSNeRNq++uRkuLXordurB2nZUdG37X
+3WsLI5IdFMPOZcno+AgE3oTbUPEAZ2ySd8Pd3Po9Zcdhx7Rb3vIajtUgnyE0dRLa
+s3Ue6PMAoKHTLiRTevZSn54EvAZDDBXc5VAEH2F02+CuYyRA6PkmaaoxUly6R2b3
+ZkjZvxT5WlOCrAzF9YxvwCa12OPvGK9HJAWDa7fnfVySGuZMpPJXKfdrNL53djQn
+XTtE04b48kdDJiG7GSB8k6WjgG9WQr0fNZEIZ/1MqH3UobCFssjBmpONXCImdbqf
+PYQAO40HdMau3RjLbIV+GDuzT4qy7abj9QVkSUNqSLjRoM/Ybpngp1cHIHrexY98
+ExS6FsGQKJAuMTlx5GZTuRn5z2vnvQN+oFSMsYHKvlPFVc8YSlsu648KB5L66EfQ
+Y9cBNknaK1oftDeRZh7M
+=lSfY
 -----END PGP SIGNATURE-----
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 <johu@gentoo.org>
-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
 }