| 1 |
commit: 2201d9297b858a9eacd0bfed524fa9ed89c0488b |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jun 30 21:47:32 2015 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 30 21:47:32 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2201d929 |
| 7 |
|
| 8 |
[app-crypt/qca] Sync. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.20 |
| 11 |
|
| 12 |
app-crypt/qca/qca-9999.ebuild | 37 +++++++++++++++---------------------- |
| 13 |
1 file changed, 15 insertions(+), 22 deletions(-) |
| 14 |
|
| 15 |
diff --git a/app-crypt/qca/qca-9999.ebuild b/app-crypt/qca/qca-9999.ebuild |
| 16 |
index b8498a1..8174e3e 100644 |
| 17 |
--- a/app-crypt/qca/qca-9999.ebuild |
| 18 |
+++ b/app-crypt/qca/qca-9999.ebuild |
| 19 |
@@ -4,14 +4,11 @@ |
| 20 |
|
| 21 |
EAPI=5 |
| 22 |
|
| 23 |
-# for multibuild support, until merged to master |
| 24 |
-EGIT_BRANCH="qt5" |
| 25 |
- |
| 26 |
-inherit multilib cmake-utils multibuild git-r3 |
| 27 |
+inherit cmake-utils multibuild qmake-utils git-r3 |
| 28 |
|
| 29 |
DESCRIPTION="Qt Cryptographic Architecture (QCA)" |
| 30 |
HOMEPAGE="http://delta.affinix.com/qca/" |
| 31 |
-EGIT_REPO_URI="git://anongit.kde.org/${PN}" |
| 32 |
+EGIT_REPO_URI=("git://anongit.kde.org/${PN}.git") |
| 33 |
|
| 34 |
LICENSE="LGPL-2.1" |
| 35 |
SLOT="2" |
| 36 |
@@ -56,7 +53,7 @@ DOCS=( README TODO ) |
| 37 |
PATCHES=( "${FILESDIR}/${PN}-disable-pgp-test.patch" ) |
| 38 |
|
| 39 |
qca_plugin_use() { |
| 40 |
- echo "-DWITH_${2:-$1}_PLUGIN=$(use $1 && echo yes || echo no)" |
| 41 |
+ echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1") |
| 42 |
} |
| 43 |
|
| 44 |
pkg_setup() { |
| 45 |
@@ -66,6 +63,8 @@ pkg_setup() { |
| 46 |
src_configure() { |
| 47 |
myconfigure() { |
| 48 |
local mycmakeargs=( |
| 49 |
+ -DQCA_FEATURE_INSTALL_DIR="${EPREFIX}$(${MULTIBUILD_VARIANT}_get_mkspecsdir)/features" |
| 50 |
+ -DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}$(${MULTIBUILD_VARIANT}_get_plugindir)" |
| 51 |
$(qca_plugin_use botan) |
| 52 |
$(qca_plugin_use gcrypt) |
| 53 |
$(qca_plugin_use gpg gnupg) |
| 54 |
@@ -78,19 +77,8 @@ src_configure() { |
| 55 |
$(cmake-utils_use_build test TESTS) |
| 56 |
) |
| 57 |
|
| 58 |
- if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then |
| 59 |
- mycmakeargs+=( |
| 60 |
- -DQT4_BUILD=ON |
| 61 |
- -DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/qt4/plugins" |
| 62 |
- -DQCA_FEATURE_INSTALL_DIR="${EPREFIX}/usr/share/qt4/mkspecs/features" |
| 63 |
- ) |
| 64 |
- fi |
| 65 |
- |
| 66 |
- if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then |
| 67 |
- mycmakeargs+=( |
| 68 |
- -DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/qt5/plugins" |
| 69 |
- -DQCA_FEATURE_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/qt5/mkspecs/features" |
| 70 |
- ) |
| 71 |
+ if [[ ${MULTIBUILD_VARIANT} == qt4 ]]; then |
| 72 |
+ mycmakeargs+=(-DQT4_BUILD=ON) |
| 73 |
fi |
| 74 |
|
| 75 |
cmake-utils_src_configure |
| 76 |
@@ -104,17 +92,22 @@ src_compile() { |
| 77 |
} |
| 78 |
|
| 79 |
src_test() { |
| 80 |
- multibuild_foreach_variant cmake-utils_src_test |
| 81 |
+ mytest() { |
| 82 |
+ local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca" |
| 83 |
+ cmake-utils_src_test |
| 84 |
+ } |
| 85 |
+ |
| 86 |
+ multibuild_foreach_variant mytest |
| 87 |
} |
| 88 |
|
| 89 |
src_install() { |
| 90 |
multibuild_foreach_variant cmake-utils_src_install |
| 91 |
|
| 92 |
if use doc; then |
| 93 |
- pushd "${BUILD_DIR}" >/dev/null |
| 94 |
+ pushd "${BUILD_DIR}" >/dev/null || die |
| 95 |
doxygen Doxyfile.in || die |
| 96 |
dodoc -r apidocs/html |
| 97 |
- popd >/dev/null |
| 98 |
+ popd >/dev/null || die |
| 99 |
fi |
| 100 |
|
| 101 |
if use examples; then |
Archives