Add USE flags for plugins that were integrated in the newer qca version. The USE flags pull the plugins implicitly making it easier to create useful deps on qca with plugins. Patch prepared by Roman Kuzmitsky (damex).

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 105 insertions, 5 deletions

diff --git a/app-crypt/qca/ChangeLog b/app-crypt/qca/ChangeLog
index c1845a9acd84..0e1db9932a68 100644
--- a/app-crypt/qca/ChangeLog
+++ b/app-crypt/qca/ChangeLog
@@ -1,6 +1,13 @@
 # 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.101 2015/02/02 16:39:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.102 2015/02/21 11:37:31 mgorny Exp $
+
+*qca-2.0.3-r1 (21 Feb 2015)
+
+  21 Feb 2015; Michał Górny <mgorny@gentoo.org> +qca-2.0.3-r1.ebuild:
+  Add USE flags for plugins that were integrated in the newer qca version. The
+  USE flags pull the plugins implicitly making it easier to create useful deps
+  on qca with plugins. Patch prepared by Roman Kuzmitsky (damex).
 
   02 Feb 2015; Jeroen Roovers <jer@gentoo.org> qca-2.1.0.3.ebuild:
   Marked ~hppa (bug #538550).
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 71cb9684b098..8b9f76efd434 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -6,14 +6,27 @@ AUX qca-2.0.3+gcc-4.7.patch 2536 SHA256 b4e43ee16ee246129c415266d59d916f82680247
 AUX qca-disable-pgp-test.patch 446 SHA256 e8714b0f12a39bbc17c706b098e4d33a5cbfb6a84b9c25d7dc8bf7ac7cfdff92 SHA512 30bb6d31b9392166d6bbae39da2eeb1788ac9cccffb801b074468a3606a6e1a56d6a41ee276d3b8b8d39112bf6aea7025f07f4810bb835102bd00521ee9eb104 WHIRLPOOL 5c31bbfe3f7e680be7314edc7c9d153d27fd2bbbaa0ddc97c9206a9c49e0d5b0738e78a4d8dc424c3910ce1b02e4657aa08643fc1a56836b33e9b475b85f3501
 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 2268 SHA256 4ec2c720099a59cf0958760006daf4d96e1792877fe7f95b0310be9293b5c63f SHA512 78ef0e4bf6b3159c62fbb843f613634ddd41a00d0bcfa73b3a1e270d94a9c27d447c416d9b7bc2a4da8cb44b1d97e2218429ae3dc4fed4d0e0b647bcbff5a0c4 WHIRLPOOL 39059cb5baac8a758066af8da77b67fae99afb38c7da2583dfe9f8dedf58815585e4a3413962757bc8f5875dc8a895bfff8d27bdef25757d4ad790e966cb0eab
 EBUILD qca-2.0.3.ebuild 2053 SHA256 45839c961ffaeda7bb716ec124bdec10240a7f53adda075b9f79372757ac9f59 SHA512 f7662749dac170f4f76d8ae52cff0a951fbfcd98a0c6a9dacbee809d75246c036f66bfc349b3ec27c00879c8a5ab33fdb1da772bbd19c97fd5456ec60b2f7553 WHIRLPOOL 1bd7f58787fadbb48d98952cc08f7e8bc55a9a8f48b2e8a62063cdcaa2718852fba5bcd7fd06f631d3abf9290ae3b84d83b4e125e4960dcff8efa11b05965a9c
 EBUILD qca-2.1.0.3.ebuild 2936 SHA256 a14a27dba16d823bde5d9d7c7ab37fe30c499282dd4e986a1617437016ee29a7 SHA512 8410192ada7ab8da1b456fe25d9896c5a08baa5736b3e8bdce7923563a3152f8077c1642557bb1f07246c747f044a48c936432d76cc2ce609a5114d39308b4e6 WHIRLPOOL 262af0eb8d4d39a686196065a5a19403cfddfaf72c2bd4f87417d632e65cef682bea7a99f51acf7985b8e15d0b340806ee1e99cbb2c27f34288ec7baf2e31385
-MISC ChangeLog 12388 SHA256 40c085ebcaa2979b55f18aee83e3a70148714bb3b22cade3f9677612881f428c SHA512 2c891c085ee37591e376317ccf6b942c62dd602ad856040befc35bbf5d60b7b788ff499b777846386e3fba2e5dda80b8efa67b4661f8556b67bf1e5012fd6220 WHIRLPOOL 2f2967bd4425214217dcb42c9e4227656b7b646e012bfc80b5a8462bd1c073390b8e910d54fba7faf49dbe77e278e3362f3ae2d56abab5ce17492b5c30906b2d
+MISC ChangeLog 12717 SHA256 a8d6a5e6b2aee768038eaead454f57357ad6f3d85c2e896bd4cb9e12d475ff0f SHA512 7bbb353a41e9988fd485bc8016f222dd4b8bc88d68bed8ebdb91e872ebd0c325e719c5ff64eb102ae430dd44067e8ff238b3c8e09a9b7f54fa939939145e05c7 WHIRLPOOL dad4c9463138d8cf6448e4760666e5cf07015411d696a6bc49394681765c4b779229c623bbc3751419f2a9de20e8a38fb0802aa3b2363e2f1e05f97d9c64d258
 MISC metadata.xml 639 SHA256 ce2fb072cf1d4044630cdaa3188d4aa235641929703ff86118dba4f14329c0f8 SHA512 52a12890c1807960c995f804c3aeb5a9520fa30af6a85b016d6dc256447de9252391a431c41bf098177d6a5dcccfc88659b2d8fac87df3554cefed808333ce89 WHIRLPOOL 95abc9459185683666c04a6f6480d68beaba923d0c062a6ae20614296a003719cbb87a03a31f125afefcb1b48ed92d4c8999ea744359190ba328d9056c212e67
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTPqEEACgkQVWmRsqeSphMIBACeILkOqEZ8B7+pzRYm9QCaPXyi
-E+YAn2kbawlDc1Kl+IPPE1auErCH65vG
-=Awcr
+iQJ8BAEBCABmBQJU6G3+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOVEwQAN2xdNtJzSq0n6rxDvULRRiQ
+tTX5f79a4k/YhoSyEdtsiEO6It9hVdyEnycOKhKDztnmiVeY9kZCbjFJu3NRWzjh
+JPzh48MFKnk9immqsbebjBiiOGJxHCq1ln5z1yJV2JPmQqG30qN9gGxVDwBUGQ6J
+SgEZeYzI0fq5FR51a4Qz+wWTt24bl8Uf8yl4pQxa/bqlrp2b2Bg3CowQq/XmRnuu
+jt+i+ZpaFOLRdx3wO9wQM+vbCxiQhWYRyrke5XOA/QoVcG7EeoRariMUG3QPfzOl
+cslo6jQWJKNCNc5ZkSc6LmPDlsOn+zWC3dF2SYDNWrNCivHsIqbH0xfXVcTPz2dv
+K1mDF19XCaoNjq50KxWEXWqu5EhFXsXl7LqHhv6mI/w6jtGRS+0KpQKAKTybrVCF
+mVJd79CrZLh3h9NYiwXVLc0v/ST+jaDw1FhDnnKvC4mGRoxfBvGnkW9BXH52TlRS
+GwK1JMceZtL1XoTP84oqeR+/Wcl8S35IyUR03lRP16yg19mtOgEg/LWIBESasxYH
+jXq0f9bY1i0wWiQsDeSMip7DZcIK6Pjpl0XMIT7OHMv3SgDRu1exwMZXQWMgTcKl
+fYIL1JCJNmHWvR1V15ghSYj+VJ5qc+80ugBCaZ5pYFGBU1oY8GTIwxFN/ym24MEi
+z0bVEU9arHXrfoF6GJGT
+=yWXs
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/qca/qca-2.0.3-r1.ebuild b/app-crypt/qca/qca-2.0.3-r1.ebuild
new file mode 100644
index 000000000000..4753875eb88a
--- /dev/null
+++ b/app-crypt/qca/qca-2.0.3-r1.ebuild
@@ -0,0 +1,80 @@
+# 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.0.3-r1.ebuild,v 1.1 2015/02/21 11:37:31 mgorny Exp $
+
+EAPI="3"
+
+inherit eutils multilib qt4-r2
+
+DESCRIPTION="Qt Cryptographic Architecture (QCA)"
+HOMEPAGE="http://delta.affinix.com/qca/"
+SRC_URI="http://delta.affinix.com/download/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="aqua debug doc examples gpg logger openssl pkcs11 sasl"
+RESTRICT="test"
+
+DEPEND="dev-qt/qtcore:4[debug?]"
+RDEPEND="${DEPEND}
+	!<app-crypt/qca-1.0-r3:0"
+
+PDEPEND="gpg? ( app-crypt/qca-gnupg )
+	logger? ( app-crypt/qca-logger )
+	openssl? ( app-crypt/qca-ossl )
+	pkcs11? ( app-crypt/qca-pkcs11 )
+	sasl? ( app-crypt/qca-cyrus-sasl )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.0.2-pcfilespath.patch \
+		"${FILESDIR}"/${P}+gcc-4.7.patch
+
+	if use aqua; then
+		sed -i -e "s|QMAKE_LFLAGS_SONAME =.*|QMAKE_LFLAGS_SONAME = -Wl,-install_name,|g" \
+			src/src.pro || die
+	fi
+}
+
+src_configure() {
+	# Ensure proper rpath
+	export EXTRA_QMAKE_RPATH="${EPREFIX}/usr/$(get_libdir)/qca2"
+
+	ABI= ./configure \
+		--prefix="${EPREFIX}"/usr \
+		--qtdir="${EPREFIX}"/usr \
+		--includedir="${EPREFIX}"/usr/include/qca2 \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/qca2 \
+		--certstore-path="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
+		--no-separate-debug-info \
+		--disable-tests \
+		--$(use debug && echo debug || echo release) \
+		--no-framework \
+		|| die "configure failed"
+
+	eqmake4
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die
+	dodoc README TODO || die
+
+	cat <<-EOF > "${WORKDIR}"/44qca2
+	LDPATH="${EPREFIX}/usr/$(get_libdir)/qca2"
+	EOF
+	doenvd "${WORKDIR}"/44qca2 || die
+
+	if use doc; then
+		dohtml "${S}"/apidocs/html/* || die
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/
+		doins -r "${S}"/examples || die
+	fi
+
+	# add the proper rpath for packages that do CONFIG += crypto
+	echo "QMAKE_RPATHDIR += \"${EPREFIX}/usr/$(get_libdir)/qca2\"" >> \
+		"${D%/}${EPREFIX}/usr/share/qt4/mkspecs/features/crypto.prf" \
+		|| die "failed to add rpath to crypto.prf"
+}