From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8F5561381F3 for ; Wed, 29 May 2013 23:19:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5FA82E094F; Wed, 29 May 2013 23:19:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E0116E094F for ; Wed, 29 May 2013 23:19:40 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CC9C933E1B6 for ; Wed, 29 May 2013 23:19:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 62BE2E5309 for ; Wed, 29 May 2013 23:19:38 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1369869562.49362564b6b9d14d85a2b0972508c0d220f7ba7e.johu@gentoo> Subject: [gentoo-commits] dev/johu:master commit in: dev-libs/qtkeychain/files/, dev-libs/qtkeychain/ X-VCS-Repository: dev/johu X-VCS-Files: dev-libs/qtkeychain/files/qtkeychain-0.1.0-qt5.patch dev-libs/qtkeychain/metadata.xml dev-libs/qtkeychain/qtkeychain-9999.ebuild X-VCS-Directories: dev-libs/qtkeychain/files/ dev-libs/qtkeychain/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 49362564b6b9d14d85a2b0972508c0d220f7ba7e X-VCS-Branch: master Date: Wed, 29 May 2013 23:19:38 +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: a1bc1863-292b-489c-95be-b3624d7f72bc X-Archives-Hash: ecd17dcf05a3109bba574b6eae371b90 commit: 49362564b6b9d14d85a2b0972508c0d220f7ba7e Author: Johannes Huber gentoo org> AuthorDate: Wed May 29 23:19:22 2013 +0000 Commit: Johannes Huber gentoo org> CommitDate: Wed May 29 23:19:22 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=49362564 [dev-libs/qtkeychain] New package. Ebuild by me. Package-Manager: portage-2.2.0_alpha177 --- .../qtkeychain/files/qtkeychain-0.1.0-qt5.patch | 35 ++++++++++++++++++++++ dev-libs/qtkeychain/metadata.xml | 8 +++++ dev-libs/qtkeychain/qtkeychain-9999.ebuild | 30 +++++++++++++++++++ 3 files changed, 73 insertions(+) diff --git a/dev-libs/qtkeychain/files/qtkeychain-0.1.0-qt5.patch b/dev-libs/qtkeychain/files/qtkeychain-0.1.0-qt5.patch new file mode 100644 index 0000000..2ec9861 --- /dev/null +++ b/dev-libs/qtkeychain/files/qtkeychain-0.1.0-qt5.patch @@ -0,0 +1,35 @@ +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/metadata.xml b/dev-libs/qtkeychain/metadata.xml new file mode 100644 index 0000000..4a53d48 --- /dev/null +++ b/dev-libs/qtkeychain/metadata.xml @@ -0,0 +1,8 @@ + + + + + johu@gentoo.org + Johannes Huber + + diff --git a/dev-libs/qtkeychain/qtkeychain-9999.ebuild b/dev-libs/qtkeychain/qtkeychain-9999.ebuild new file mode 100644 index 0000000..92b6509 --- /dev/null +++ b/dev-libs/qtkeychain/qtkeychain-9999.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit cmake-utils git-2 + +DESCRIPTION="Qt API for storing passwords securely" +HOMEPAGE="https://github.com/frankosterfeld/qtkeychain" +EGIT_REPO_URI="git://github.com/frankosterfeld/${PN}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="" +IUSE="" + +DEPEND=" + dev-qt/qtcore:4 + dev-qt/qtdbus:4 +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${PN}-0.1.0-qt5.patch" ) + +src_configure() { + local mycmakeargs=( -DQT5_BUILD=OFF ) + + cmake-utils_src_configure +}