1 |
pesa 15/06/29 00:55:26 |
2 |
|
3 |
Modified: qca-2.1.0.3.ebuild ChangeLog |
4 |
Log: |
5 |
Use qmake-utils helper functions to simplify src_configure. Remove double call to cmake-utils_src_install. Add missing die. |
6 |
|
7 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!) |
8 |
|
9 |
Revision Changes Path |
10 |
1.10 app-crypt/qca/qca-2.1.0.3.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/qca/qca-2.1.0.3.ebuild?rev=1.10&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/qca/qca-2.1.0.3.ebuild?rev=1.10&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/qca/qca-2.1.0.3.ebuild?r1=1.9&r2=1.10 |
15 |
|
16 |
Index: qca-2.1.0.3.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-2.1.0.3.ebuild,v |
19 |
retrieving revision 1.9 |
20 |
retrieving revision 1.10 |
21 |
diff -u -r1.9 -r1.10 |
22 |
--- qca-2.1.0.3.ebuild 28 Jun 2015 09:56:14 -0000 1.9 |
23 |
+++ qca-2.1.0.3.ebuild 29 Jun 2015 00:55:26 -0000 1.10 |
24 |
@@ -1,11 +1,12 @@ |
25 |
# Copyright 1999-2015 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-2.1.0.3.ebuild,v 1.9 2015/06/28 09:56:14 zlogene Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-2.1.0.3.ebuild,v 1.10 2015/06/29 00:55:26 pesa Exp $ |
29 |
|
30 |
EAPI=5 |
31 |
|
32 |
+inherit cmake-utils multibuild qmake-utils |
33 |
+ |
34 |
MY_PN="${PN}-qt5" |
35 |
-inherit multilib cmake-utils multibuild |
36 |
|
37 |
DESCRIPTION="Qt Cryptographic Architecture (QCA)" |
38 |
HOMEPAGE="http://delta.affinix.com/qca/" |
39 |
@@ -49,17 +50,17 @@ |
40 |
) |
41 |
" |
42 |
|
43 |
-DOCS=( README TODO ) |
44 |
- |
45 |
S=${WORKDIR}/${MY_PN}-${PV} |
46 |
|
47 |
+DOCS=( README TODO ) |
48 |
+ |
49 |
PATCHES=( |
50 |
"${FILESDIR}/${PN}-disable-pgp-test.patch" |
51 |
"${FILESDIR}/${P}-qt55.patch" |
52 |
) |
53 |
|
54 |
qca_plugin_use() { |
55 |
- echo "-DWITH_${2:-$1}_PLUGIN=$(use $1 && echo yes || echo no)" |
56 |
+ echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1") |
57 |
} |
58 |
|
59 |
pkg_setup() { |
60 |
@@ -69,6 +70,8 @@ |
61 |
src_configure() { |
62 |
myconfigure() { |
63 |
local mycmakeargs=( |
64 |
+ -DQCA_FEATURE_INSTALL_DIR="${EPREFIX}$(${MULTIBUILD_VARIANT}_get_mkspecsdir)/features" |
65 |
+ -DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}$(${MULTIBUILD_VARIANT}_get_plugindir)" |
66 |
$(qca_plugin_use botan) |
67 |
$(qca_plugin_use gcrypt) |
68 |
$(qca_plugin_use gpg gnupg) |
69 |
@@ -81,19 +84,8 @@ |
70 |
$(cmake-utils_use_build test TESTS) |
71 |
) |
72 |
|
73 |
- if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then |
74 |
- mycmakeargs+=( |
75 |
- -DQT4_BUILD=ON |
76 |
- -DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/qt4/plugins" |
77 |
- -DQCA_FEATURE_INSTALL_DIR="${EPREFIX}/usr/share/qt4/mkspecs/features" |
78 |
- ) |
79 |
- fi |
80 |
- |
81 |
- if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then |
82 |
- mycmakeargs+=( |
83 |
- -DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/qt5/plugins" |
84 |
- -DQCA_FEATURE_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/qt5/mkspecs/features" |
85 |
- ) |
86 |
+ if [[ ${MULTIBUILD_VARIANT} == qt4 ]]; then |
87 |
+ mycmakeargs+=(-DQT4_BUILD=ON) |
88 |
fi |
89 |
|
90 |
cmake-utils_src_configure |
91 |
@@ -106,24 +98,22 @@ |
92 |
multibuild_foreach_variant cmake-utils_src_compile |
93 |
} |
94 |
|
95 |
+src_test() { |
96 |
+ multibuild_foreach_variant cmake-utils_src_test |
97 |
+} |
98 |
+ |
99 |
src_install() { |
100 |
multibuild_foreach_variant cmake-utils_src_install |
101 |
|
102 |
if use doc; then |
103 |
- pushd "${BUILD_DIR}" >/dev/null |
104 |
+ pushd "${BUILD_DIR}" >/dev/null || die |
105 |
doxygen Doxyfile.in || die |
106 |
dohtml apidocs/html/* |
107 |
- popd >/dev/null |
108 |
+ popd >/dev/null || die |
109 |
fi |
110 |
|
111 |
if use examples; then |
112 |
insinto /usr/share/doc/${PF} |
113 |
doins -r "${S}"/examples |
114 |
fi |
115 |
- |
116 |
- cmake-utils_src_install |
117 |
-} |
118 |
- |
119 |
-src_test() { |
120 |
- multibuild_foreach_variant cmake-utils_src_test |
121 |
} |
122 |
|
123 |
|
124 |
|
125 |
1.110 app-crypt/qca/ChangeLog |
126 |
|
127 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/qca/ChangeLog?rev=1.110&view=markup |
128 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/qca/ChangeLog?rev=1.110&content-type=text/plain |
129 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/qca/ChangeLog?r1=1.109&r2=1.110 |
130 |
|
131 |
Index: ChangeLog |
132 |
=================================================================== |
133 |
RCS file: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v |
134 |
retrieving revision 1.109 |
135 |
retrieving revision 1.110 |
136 |
diff -u -r1.109 -r1.110 |
137 |
--- ChangeLog 28 Jun 2015 09:56:14 -0000 1.109 |
138 |
+++ ChangeLog 29 Jun 2015 00:55:26 -0000 1.110 |
139 |
@@ -1,6 +1,10 @@ |
140 |
# ChangeLog for app-crypt/qca |
141 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
142 |
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.109 2015/06/28 09:56:14 zlogene Exp $ |
143 |
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.110 2015/06/29 00:55:26 pesa Exp $ |
144 |
+ |
145 |
+ 29 Jun 2015; Davide Pesavento <pesa@g.o> qca-2.1.0.3.ebuild: |
146 |
+ Use qmake-utils helper functions to simplify src_configure. Remove double call |
147 |
+ to cmake-utils_src_install. Add missing die. |
148 |
|
149 |
28 Jun 2015; Mikle Kolyada <zlogene@g.o> qca-2.1.0.3.ebuild: |
150 |
x86 stable wrt bug #552554 |