* [gentoo-commits] dev/johu:master commit in: dev-libs/qtkeychain/files/, dev-libs/qtkeychain/
@ 2013-05-29 23:19 Johannes Huber
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Huber @ 2013-05-29 23:19 UTC (permalink / raw
To: gentoo-commits
commit: 49362564b6b9d14d85a2b0972508c0d220f7ba7e
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed May 29 23:19:22 2013 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> 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 <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/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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>johu@gentoo.org</email>
+ <name>Johannes Huber</name>
+ </maintainer>
+</pkgmetadata>
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
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] dev/johu:master commit in: dev-libs/qtkeychain/files/, dev-libs/qtkeychain/
@ 2013-10-19 13:51 Johannes Huber
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Huber @ 2013-10-19 13:51 UTC (permalink / raw
To: gentoo-commits
commit: cedf04c70943e5172bf4112e0252de61cba6737f
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 19 13:51:11 2013 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Oct 19 13:51:11 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=cedf04c7
[dev-libs/qtkeychain] Add qt5 build option.
Does not build with qt5 enabled, because needed package is not packaged yet.
Package-Manager: portage-2.2.7
---
.../qtkeychain/files/qtkeychain-0.1.0-qt5.patch | 35 ----------------------
dev-libs/qtkeychain/qtkeychain-9999.ebuild | 20 ++++++++-----
2 files changed, 13 insertions(+), 42 deletions(-)
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 2ec9861..0000000
--- 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-9999.ebuild b/dev-libs/qtkeychain/qtkeychain-9999.ebuild
index 92b6509..9db6bed 100644
--- a/dev-libs/qtkeychain/qtkeychain-9999.ebuild
+++ b/dev-libs/qtkeychain/qtkeychain-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit cmake-utils git-2
+inherit cmake-utils git-r3
DESCRIPTION="Qt API for storing passwords securely"
HOMEPAGE="https://github.com/frankosterfeld/qtkeychain"
@@ -13,18 +13,24 @@ EGIT_REPO_URI="git://github.com/frankosterfeld/${PN}"
LICENSE="BSD"
SLOT="0"
KEYWORDS=""
-IUSE=""
+IUSE="qt5"
DEPEND="
- dev-qt/qtcore:4
- dev-qt/qtdbus:4
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ )
+ !qt5? (
+ 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 )
+ local mycmakeargs=(
+ $(cmake-utils_use_build !qt5 WITH_QT4)
+ )
cmake-utils_src_configure
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-10-19 13:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-29 23:19 [gentoo-commits] dev/johu:master commit in: dev-libs/qtkeychain/files/, dev-libs/qtkeychain/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2013-10-19 13:51 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox