Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/johu:master commit in: dev-libs/qtkeychain/files/, dev-libs/qtkeychain/
Date: Wed, 29 May 2013 23:19:45
Message-Id: 1369869562.49362564b6b9d14d85a2b0972508c0d220f7ba7e.johu@gentoo
1 commit: 49362564b6b9d14d85a2b0972508c0d220f7ba7e
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Wed May 29 23:19:22 2013 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Wed May 29 23:19:22 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=49362564
7
8 [dev-libs/qtkeychain] New package. Ebuild by me.
9
10 Package-Manager: portage-2.2.0_alpha177
11
12 ---
13 .../qtkeychain/files/qtkeychain-0.1.0-qt5.patch | 35 ++++++++++++++++++++++
14 dev-libs/qtkeychain/metadata.xml | 8 +++++
15 dev-libs/qtkeychain/qtkeychain-9999.ebuild | 30 +++++++++++++++++++
16 3 files changed, 73 insertions(+)
17
18 diff --git a/dev-libs/qtkeychain/files/qtkeychain-0.1.0-qt5.patch b/dev-libs/qtkeychain/files/qtkeychain-0.1.0-qt5.patch
19 new file mode 100644
20 index 0000000..2ec9861
21 --- /dev/null
22 +++ b/dev-libs/qtkeychain/files/qtkeychain-0.1.0-qt5.patch
23 @@ -0,0 +1,35 @@
24 +From 69638a5ddb725c4f8000f86546d5d41f2917fe40 Mon Sep 17 00:00:00 2001
25 +From: Johannes Huber <johu@g.o>
26 +Date: Thu, 30 May 2013 00:03:45 +0200
27 +Subject: [PATCH] Add Qt5 build option.
28 +
29 +* removes automagic build when Qt4 + Qt5 is installed on system
30 +---
31 + CMakeLists.txt | 10 +++++++++-
32 + 1 file changed, 9 insertions(+), 1 deletion(-)
33 +
34 +diff --git a/CMakeLists.txt b/CMakeLists.txt
35 +index aba9032..f601a11 100644
36 +--- a/CMakeLists.txt
37 ++++ b/CMakeLists.txt
38 +@@ -11,8 +11,16 @@ set(QTKEYCHAIN_SOVERSION 0)
39 + set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Modules")
40 + include(GNUInstallDirs)
41 +
42 ++option(QT5_BUILD "Build qtkeychain using the Qt5 framework" TRUE)
43 ++
44 ++if(QT5_BUILD)
45 ++ find_package(Qt5Core QUIET)
46 ++else()
47 ++ find_package(Qt4 REQUIRED)
48 ++ include(${QT_USE_FILE})
49 ++endif()
50 ++
51 + # try Qt5 first, and prefer that if found
52 +-find_package(Qt5Core QUIET)
53 + if (Qt5Core_FOUND)
54 + if(UNIX AND NOT APPLE)
55 + find_package(Qt5DBus REQUIRED)
56 +--
57 +1.8.2.1
58 +
59
60 diff --git a/dev-libs/qtkeychain/metadata.xml b/dev-libs/qtkeychain/metadata.xml
61 new file mode 100644
62 index 0000000..4a53d48
63 --- /dev/null
64 +++ b/dev-libs/qtkeychain/metadata.xml
65 @@ -0,0 +1,8 @@
66 +<?xml version="1.0" encoding="UTF-8"?>
67 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
68 +<pkgmetadata>
69 + <maintainer>
70 + <email>johu@g.o</email>
71 + <name>Johannes Huber</name>
72 + </maintainer>
73 +</pkgmetadata>
74
75 diff --git a/dev-libs/qtkeychain/qtkeychain-9999.ebuild b/dev-libs/qtkeychain/qtkeychain-9999.ebuild
76 new file mode 100644
77 index 0000000..92b6509
78 --- /dev/null
79 +++ b/dev-libs/qtkeychain/qtkeychain-9999.ebuild
80 @@ -0,0 +1,30 @@
81 +# Copyright 1999-2013 Gentoo Foundation
82 +# Distributed under the terms of the GNU General Public License v2
83 +# $Header: $
84 +
85 +EAPI=5
86 +
87 +inherit cmake-utils git-2
88 +
89 +DESCRIPTION="Qt API for storing passwords securely"
90 +HOMEPAGE="https://github.com/frankosterfeld/qtkeychain"
91 +EGIT_REPO_URI="git://github.com/frankosterfeld/${PN}"
92 +
93 +LICENSE="BSD"
94 +SLOT="0"
95 +KEYWORDS=""
96 +IUSE=""
97 +
98 +DEPEND="
99 + dev-qt/qtcore:4
100 + dev-qt/qtdbus:4
101 +"
102 +RDEPEND="${DEPEND}"
103 +
104 +PATCHES=( "${FILESDIR}/${PN}-0.1.0-qt5.patch" )
105 +
106 +src_configure() {
107 + local mycmakeargs=( -DQT5_BUILD=OFF )
108 +
109 + cmake-utils_src_configure
110 +}