Use qmake-utils helper functions to simplify src_configure. Remove double call to cmake-utils_src_install. Add missing die.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xDADED6B2671CB57D!

3 files changed, 39 insertions, 35 deletions

diff --git a/app-crypt/qca/ChangeLog b/app-crypt/qca/ChangeLog
index b444fce9974a..603ddf5e2434 100644
--- a/app-crypt/qca/ChangeLog
+++ b/app-crypt/qca/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/qca
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.109 2015/06/28 09:56:14 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.110 2015/06/29 00:55:26 pesa Exp $
+
+  29 Jun 2015; Davide Pesavento <pesa@gentoo.org> qca-2.1.0.3.ebuild:
+  Use qmake-utils helper functions to simplify src_configure. Remove double call
+  to cmake-utils_src_install. Add missing die.
 
   28 Jun 2015; Mikle Kolyada <zlogene@gentoo.org> qca-2.1.0.3.ebuild:
   x86 stable wrt bug #552554
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 34d57d5f1b17..05d88bb54ae1 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -8,15 +8,25 @@ AUX qca-disable-pgp-test.patch 446 SHA256 e8714b0f12a39bbc17c706b098e4d33a5cbfb6
 DIST qca-2.0.3.tar.bz2 4530731 SHA256 8da20c89f390954fdcfcd3c4deef379213ddb5ae9d6b5e0c917d23f5e474895f SHA512 c1120ffb373e294fbcc76e21dc2f503ebd3398b26d0ffa7ab7ee3a3e1a4228159358b59c2673ac4a1c2363771e61da54a5080b201c65d586ceda2e3b2facc1bb WHIRLPOOL 2efba46098490ab5a75dcdf95eeb7d81a5509a962403a44602caa126927ebe9e69cb043586dbaebf0b111b79e614b607ae851242d12af9fa17d2dd191e559b0e
 DIST qca-qt5-2.1.0.3.tar.xz 685652 SHA256 ab0170696a8ff87588d38a72d36d0b4b42db9080c991d1a40ceb3f8311d289f9 SHA512 2f50c92d3ff927c83353b65ae56ff49a5c1ea439fcef94cea0092b718f04abcc18f455abd91337ac786fddedae980ff55c9d090b5743a96890174dc7eee4f3f1 WHIRLPOOL 9db2770b031dbf5c9c117d4150e0b395c94d8a0af1bda9fac5e1ee862a8a40f1c03fb0c4901e3aaba0b12e8c0b4e71cb55a872bbc54eea8331aff3fbe1fd853c
 EBUILD qca-2.0.3-r1.ebuild 2266 SHA256 99d8b93170cc50e5ac50040f054ed7d21126585c447cb882d5033e4439af501b SHA512 0146c144daac1a74ca8bbea7b999ef604717a8d8237e50fc4c99321e93ab32ce23e9183541ba8a7d7d1dbdf858425c310655a2daa0d9336d0f0e20fb43bdc7ef WHIRLPOOL ff5151eb9639ae227164117a604ab31ef2a2ee09359b83a9036f5e7d329e7fe975fb95697c41bc488d94bb17d8b0fdba9eecb23ea7053326169d5ac597a9bd96
-EBUILD qca-2.1.0.3.ebuild 2977 SHA256 96fdc8e7220f52dfdcefc996e6ddc876b4d034016f1f43382198ee44eca99f41 SHA512 3347acc4a11e54568d9ba0d945e900be0729522da2d794338d9626857fd232edd593cdebe6aac78d84034e9a456caaff6ebe3f298d4df809640fbf908520b3a5 WHIRLPOOL f43958a397bfc3369e5d3935d48ec810fe0e89345af15f0b87eec4a3f9e337421830c9921ef2c8131276842da45a8d7ba4caa1fe2f4547825328b2457b928119
-MISC ChangeLog 13554 SHA256 07c402d4e49e85c5a94f0410b7d19963615bc4f2af118f1822b367ccce0e8036 SHA512 64ed28d3f5eacaf89766b73717239b3abb55e5bdd3e910691f0e4aba15ed06a5923528c1b889b11bd2ae530d6cc9e84452c43d44e8ee6f26d429dbc2b623a75c WHIRLPOOL 649ad943640963be52ffcbee5ed380c0fa3177ccb8f5d7f48e1002836ecc02ed3e38a4b4aa862e6a39e243ca76e43c48b22218a58ab22f94ee003acf7f6ec3f3
+EBUILD qca-2.1.0.3.ebuild 2731 SHA256 84199b39947831c3a1b8b3d569120f403797fa5f04e2f648769ed1d2a86773fa SHA512 0e4c51a58daa871e873a2fe2a2166532612bce5496792feddc654c2282aa799939f8fc12c39d948bf4dd5429a7e193af917e74a9ab5ab12fbbc549c359830b5c WHIRLPOOL b41023cd1347d2b0624621e6d2bdda971694a29315b61a5311cb498ec398ffa203246eeb5324a37d43a7bbdff7aa306bb5e591db29a819c0e3ca10025573aa2e
+MISC ChangeLog 13750 SHA256 b995824f897521b86a7b36ab0255f8adee62f3e94f86eb6085fec73a3e245add SHA512 bb5aa84f6826fbe019cebfc0868b8116a59fffbdae91bd1c028c239b82739aeaf95410791940cdaab432e2f4760c95dd338ff66b634e3beb78923db759df1d16 WHIRLPOOL bc081cc69a434cd6f84956dbd568bdf909be7d342a9d5b9642ecbcfd75930df36f9737adffc70f0c9c8b2eb6849c00c4d87af7c0c7a1bf88098f50afe0d89ce6
 MISC metadata.xml 639 SHA256 ce2fb072cf1d4044630cdaa3188d4aa235641929703ff86118dba4f14329c0f8 SHA512 52a12890c1807960c995f804c3aeb5a9520fa30af6a85b016d6dc256447de9252391a431c41bf098177d6a5dcccfc88659b2d8fac87df3554cefed808333ce89 WHIRLPOOL 95abc9459185683666c04a6f6480d68beaba923d0c062a6ae20614296a003719cbb87a03a31f125afefcb1b48ed92d4c8999ea744359190ba328d9056c212e67
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iJwEAQEIAAYFAlWPxDsACgkQG9wOWsQutdaktQP/al4MnPNv10CMPlw2M9/pSkuz
-Tly0ILffoIEjjxNZN3QMuEtNfoiIQoV+Yrvrr+r1kvlm5HC1SOkc77NP3upZDqHy
-0mIs1SLdrfYZPF7pVdWt/yhCTck3zs8wuTOT2BPVY9sM/qz5wwB758f90mlRqsu7
-kLtv42EkCow/fijm75A=
-=QX7Q
+iQJ8BAEBCABmBQJVkJd/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9XPcP/R3P57MnLOFT17MJ7Xo/vT19
+rKz3xd+XUw217yC0Wo7WSitHw08s4VdI9fnZocYqS5lw81z7Iru3nPM2MBZ01d3F
+V7ST4JA9ghDglhpqcUeZlb0a+5uJ8YZ2iAmP5h3KM3aV5Ou/ZTwa4/nK/pO/Jyd0
+vtpmx7RqCt+caCvuDhXjgQ5CwybuSKUnxeT1hrIq5ks9cKg/oHTfk5ArmZjzB6iM
+TuoCi6yH1TOUJc/9NGim19c9X31uA0s2w7hYI3I25/uowGePlbptbaVnokat5HsH
+A809xwrpyes/emRELOD+GsvMWGVgRZDFjKTi42edJFG5EzBUHGicvUNxYTpKaVic
+Mgk2M+k+uh7SAIp+JBzXsGj+3oEYN9uVXIzMq5FhbIDVPXIgkSz0CB7TEUZccaKV
+Yc5CM1z9zG50NTijEoXoCoGhcT47Bd7mP9KNT5tLixAMkRsSS0jcmXI/xX8ZV6rA
+IxnI8o35NB48RsF2j2aTjeKrqFS/iAyQNkpv2XzbumgQ604GLkVaxTAWgF+3mOPd
+uBBZ8PrlVuIsqqps+8plceVg9WBHb5QNUlbWK+j67Y5EwenSxYEojnPyQDE+29G8
+HWyxubKdwDfU+tz//DvLQ6EpWUz14C6acCbtglB4kAkmdfm17mfPZlTvh8vSH4OY
+DJ/1TCxmdeIi4LR/MUb6
+=h29A
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/qca/qca-2.1.0.3.ebuild b/app-crypt/qca/qca-2.1.0.3.ebuild
index d9e5541131d9..a9bac0501e98 100644
--- a/app-crypt/qca/qca-2.1.0.3.ebuild
+++ b/app-crypt/qca/qca-2.1.0.3.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
 
 EAPI=5
 
+inherit cmake-utils multibuild qmake-utils
+
 MY_PN="${PN}-qt5"
-inherit multilib cmake-utils multibuild
 
 DESCRIPTION="Qt Cryptographic Architecture (QCA)"
 HOMEPAGE="http://delta.affinix.com/qca/"
@@ -49,17 +50,17 @@ DEPEND="${RDEPEND}
 	)
 "
 
-DOCS=( README TODO )
-
 S=${WORKDIR}/${MY_PN}-${PV}
 
+DOCS=( README TODO )
+
 PATCHES=(
 	"${FILESDIR}/${PN}-disable-pgp-test.patch"
 	"${FILESDIR}/${P}-qt55.patch"
 )
 
 qca_plugin_use() {
-	echo "-DWITH_${2:-$1}_PLUGIN=$(use $1 && echo yes || echo no)"
+	echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
 }
 
 pkg_setup() {
@@ -69,6 +70,8 @@ pkg_setup() {
 src_configure() {
 	myconfigure() {
 		local mycmakeargs=(
+			-DQCA_FEATURE_INSTALL_DIR="${EPREFIX}$(${MULTIBUILD_VARIANT}_get_mkspecsdir)/features"
+			-DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}$(${MULTIBUILD_VARIANT}_get_plugindir)"
 			$(qca_plugin_use botan)
 			$(qca_plugin_use gcrypt)
 			$(qca_plugin_use gpg gnupg)
@@ -81,19 +84,8 @@ src_configure() {
 			$(cmake-utils_use_build test TESTS)
 		)
 
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-			mycmakeargs+=(
-				-DQT4_BUILD=ON
-				-DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/qt4/plugins"
-				-DQCA_FEATURE_INSTALL_DIR="${EPREFIX}/usr/share/qt4/mkspecs/features"
-			)
-		fi
-
-		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-			mycmakeargs+=(
-				-DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/qt5/plugins"
-				-DQCA_FEATURE_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/qt5/mkspecs/features"
-			)
+		if [[ ${MULTIBUILD_VARIANT} == qt4 ]]; then
+			mycmakeargs+=(-DQT4_BUILD=ON)
 		fi
 
 		cmake-utils_src_configure
@@ -106,24 +98,22 @@ src_compile() {
 	multibuild_foreach_variant cmake-utils_src_compile
 }
 
+src_test() {
+	multibuild_foreach_variant cmake-utils_src_test
+}
+
 src_install() {
 	multibuild_foreach_variant cmake-utils_src_install
 
 	if use doc; then
-		pushd "${BUILD_DIR}" >/dev/null
+		pushd "${BUILD_DIR}" >/dev/null || die
 		doxygen Doxyfile.in || die
 		dohtml apidocs/html/*
-		popd >/dev/null
+		popd >/dev/null || die
 	fi
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}
 		doins -r "${S}"/examples
 	fi
-
-	cmake-utils_src_install
-}
-
-src_test() {
-	multibuild_foreach_variant cmake-utils_src_test
 }