johu 14/04/17 20:07:33 Modified: qtkeychain-0.3.0.ebuild ChangeLog Removed: qtkeychain-0.1.0.ebuild Log: Qt multibuild by Uwe L. Korn <uw...@xhochy.com>. Remove old. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
Revision Changes Path 1.2 dev-libs/qtkeychain/qtkeychain-0.3.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/qtkeychain/qtkeychain-0.3.0.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/qtkeychain/qtkeychain-0.3.0.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/qtkeychain/qtkeychain-0.3.0.ebuild?r1=1.1&r2=1.2 Index: qtkeychain-0.3.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/qtkeychain/qtkeychain-0.3.0.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qtkeychain-0.3.0.ebuild 13 Mar 2014 14:22:22 -0000 1.1 +++ qtkeychain-0.3.0.ebuild 17 Apr 2014 20:07:32 -0000 1.2 @@ -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 @@ 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 } 1.3 dev-libs/qtkeychain/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/qtkeychain/ChangeLog?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/qtkeychain/ChangeLog?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/qtkeychain/ChangeLog?r1=1.2&r2=1.3 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/qtkeychain/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ChangeLog 13 Mar 2014 14:22:22 -0000 1.2 +++ ChangeLog 17 Apr 2014 20:07:32 -0000 1.3 @@ -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 <j...@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 <uw...@xhochy.com>. Remove old. *qtkeychain-0.3.0 (13 Mar 2014)
