From: Johannes Huber Date: Wed, 28 Jan 2015 00:58:34 +0000 (+0000) Subject: Version bump, bug #528620. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3959d82e6436f475c9c33d0305fef3b54d052617;p=gentoo.git Version bump, bug #528620. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xF3CFD2BD --- diff --git a/app-crypt/qca/ChangeLog b/app-crypt/qca/ChangeLog index 7f337166d0ab..3bd67b00ce48 100644 --- a/app-crypt/qca/ChangeLog +++ b/app-crypt/qca/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-crypt/qca -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.96 2013/03/02 19:16:04 hwoarang Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.97 2015/01/28 00:58:27 johu Exp $ + +*qca-2.1.0.3 (28 Jan 2015) + + 28 Jan 2015; Johannes Huber + +files/qca-disable-pgp-test.patch, +qca-2.1.0.3.ebuild, metadata.xml: + Version bump, bug #528620. 02 Mar 2013; Markos Chandras qca-2.0.3.ebuild: Move Qt dependencies to the new category diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest index 5f613d4133f2..89e2205c886d 100644 --- a/app-crypt/qca/Manifest +++ b/app-crypt/qca/Manifest @@ -3,26 +3,27 @@ Hash: SHA256 AUX qca-2.0.2-pcfilespath.patch 409 SHA256 d4d276c13f08bc538b79779aba49126b310df5c97f95b2c7010de050c880d695 SHA512 f686922f377aa066139d5c7f27ff9e913fb42f509c41d176d722b09532a135a541737985ccbe9aac6b06c68bcf73ba561bb154926fcc00af5f02e45be2fbd57c WHIRLPOOL 0d559c88b57b5b3ff3778308bbfd052650658ab7777493d5a04a1abdebbf8195e12978cbcf9724cfcaf9649981be79c638257470b06a78403cf38cbaba13d3d9 AUX qca-2.0.3+gcc-4.7.patch 2536 SHA256 b4e43ee16ee246129c415266d59d916f8268024730c7a6b758d0ff37b7d4786d SHA512 9d9ed0eb644a3689f545cf35238953ebf16e319a6f29ab8b1529949da943cef03843080b68781cf2baf1758edfa851926e7a691f139eb1250ae9524c5d1de36f WHIRLPOOL 6aa495a8d1f59ab806d6c42f4de387dda79a79eb1b0fcfc109397889d171ea57c450f2cf892e461efb6181a5db3c90934949df7e327b13d64b6066d98d3f754b +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.ebuild 2053 SHA256 45839c961ffaeda7bb716ec124bdec10240a7f53adda075b9f79372757ac9f59 SHA512 f7662749dac170f4f76d8ae52cff0a951fbfcd98a0c6a9dacbee809d75246c036f66bfc349b3ec27c00879c8a5ab33fdb1da772bbd19c97fd5456ec60b2f7553 WHIRLPOOL 1bd7f58787fadbb48d98952cc08f7e8bc55a9a8f48b2e8a62063cdcaa2718852fba5bcd7fd06f631d3abf9290ae3b84d83b4e125e4960dcff8efa11b05965a9c -MISC ChangeLog 11754 SHA256 061a6ce29ae035c51cb2defaefe789cd2b4c4ce1a4dbb82ef856d034d6ffa09b SHA512 5d28cf36e98688eb980b6c3a90e1761f54fc903d1298ed7e4eaff09783ee020a0ef8359da4d6f285fecb6ac3ee97aad95addda5cb57f6f74280db293ac914ec2 WHIRLPOOL 7195c437c50ff8b1df1c15da0c26371ac7bba9d9545ad804deddc3137bfa2c28f6b31c9af7a5d395d181e898a2a299dea850701a1585b6bfe776ca2204d141b5 -MISC metadata.xml 192 SHA256 e585d77a075b30463ad28cc89374f9ef2876636bca95a23321b824e0122aa6fd SHA512 40c549f971dc994633e08c70f0214c7ab7dcb181a2af132571c5c5d5daab9a90fe230c967e0a2bd39c1c87c2951d31c48d5d1418926678f1d9da1264310e5e84 WHIRLPOOL 748211d6401f44eee549e12aa810f83b66fd44e4777fbc4beb0a3b97acd6cd77be3046c22329137a4aa322144bfaf3b1ffb0d67884aa1bec0bbad4cc0349a7f4 +EBUILD qca-2.1.0.3.ebuild 3014 SHA256 1bfa1dc3c232552e1c6ccd375cd5f2160a5c003d7c758ee430292e3b4c8af8ff SHA512 0143e8d6362e0d600839e9e468bd5707be0c4a7a401c40e20c41463acabb7031c119e902558380d0031e77f9032192785055c4cd511d8b4705d44d8b632a112a WHIRLPOOL 802ee0d7622e84722f9bbebc8fe5eb07c4d9ca511df9cd43f8a5d276094763eb82e248b4b842d4982a55e5e46ec8ca62f4b75de24b73e89a6ae1936a870bdbf4 +MISC ChangeLog 11928 SHA256 09ed25189ff4080c01090ce590d180c63593f9fe3f1d4db448fbd62187884057 SHA512 f0bb659f6f5255a8eed876346142bd9b8b28cb2bd8a9d1dd5a7246fd36aba7191e1289429db2c78a11e5a5529d5912e3f935c3ecc978ef29c7ab6b7f07eb869c WHIRLPOOL 602bd16b35005ba676e4c240badea9552d8c89260a1321b8c0cc81da7aa676e002659cde23a798b8d255cd4ca39c1e88ecb3c2db801a310a688a298a0490fee2 +MISC metadata.xml 639 SHA256 ce2fb072cf1d4044630cdaa3188d4aa235641929703ff86118dba4f14329c0f8 SHA512 52a12890c1807960c995f804c3aeb5a9520fa30af6a85b016d6dc256447de9252391a431c41bf098177d6a5dcccfc88659b2d8fac87df3554cefed808333ce89 WHIRLPOOL 95abc9459185683666c04a6f6480d68beaba923d0c062a6ae20614296a003719cbb87a03a31f125afefcb1b48ed92d4c8999ea744359190ba328d9056c212e67 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2 -iQJ8BAEBCABmBQJRMk/zXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw -OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88scAQAJ+h1i1+wU8/Z0KWHX6xKe3g -Bxyma5B3yKiUE91wSbjioXfnJ8RdQQy3w2cOeYNwHDX9mcWmga6dWQxU5I+SRcWh -QmtNwsZdgnyD9ZIoLPsy10qxCiNbIFHMaP0FprmuQ2qNrFfpQAw/Q6jPm2y9YYC7 -wpCtQIhnkW/BUc8mQJFJTIkOYvZMq67YeOFk/E8ce+tILJSGrpiwTtpHGLOUGRHR -pCRUUL77DkFZjvq9+NIi2O+7ZtrSZZUtObOeGXFEIjnTQ1otw2uytgfpT50P3SjX -HcDNgKpD3JLBL/mnWHtC/s2lzDrtS3qzWW4gfJsxwOWgghkS+i7cMPqOqH86Aih7 -IBKSDLafGlW3WM7FUcauBtE5Qmhk7Pra/jOec+mp8OYOR0KjD8Aejye3xUXuxPDM -u7iP68lTkMG6QZXDqrPTaYCBQHy/eHAXPLPBjPwIGw0kLL2C79cPjGND97Xrffyq -jJ+f/187Q3amdp+BKtg9t6hqXfmeC3hGc3zMjTyhH+zZIfj364ImZ3j3R+1ABF2O -RcJYAp9Zk0IBgk+AMqEEznKz5zdyE5C1M8KgvAfs4PQGUVy36ORr7X9csYmVmJ0/ -lR6Bx6liZIdeGIXaIeLb8yjkYD/N5wJBdyAdpRyKfs2L/cUzcXrxb2+0NUbTF63W -0Ic7C6SxrMjzpVIii2p0 -=SeYW +iQIcBAEBCAAGBQJUyDQ3AAoJEGVpnaTzz9K9VQ4P/29DURlNw9pEz8LpwAIr+QP2 +uNtp8n9+CeR0MnKRMhf/vcs/ebc97LkexczwiEA9yfNRLbjQQWamzXUTVZYG8uPR +YVBbSUpXho81s1h9hcQCasJF1lUibYDqdu9D0/jCdkmWr/8RLnzAeJJEa7WeNHBp +OgO24Td2NpWr3H36vDasvmo7gvGsKGj0yuDGHrrYsHiuBuj8r329uLY+w7mHLvUN +/7JV3Dl2i5+K657P8knaK2hG0YMvcJ21Dv9ACqowSGpV0HPERCeWfqLoquc0FnBJ +DVWNI+fFQ7sELME/yBx1qZaB8kWKKer+bXuFjSKCGyphM55ONWism9d9NNkmOhw6 +qDtHQu0HytJdoSx2JvT1XzwyVGzMBX0E3o9lXD3ylLrGCgFBJtoww1xk+JaLvQH4 +7pc76QBBa7wY9Ab3+H5BwIS9zVs/sOwSQXVY1e/Ny44Lkt7gwElfQC8bSizao2Lz +dCRFn+Sf9bQm7MhuDj97NrAMmTl9sEWg0E9c++ccmvOvNQc8Q7QcnDpfKlofzJl1 +9yihkI/HdZUr1Zqs9oHloi4NjZ3VpJEt1tPRPPflvpN8gx+FeBVHspuXnlcz11Ai +uBTJnyCFrk9vz+rdmWXGFgRiojtYC7IciB+JnUE/GS4hSwIu3hO8nGoB0mM2wn6T +BCqZV1frWXlC8dgdIE6Q +=YgoU -----END PGP SIGNATURE----- diff --git a/app-crypt/qca/files/qca-disable-pgp-test.patch b/app-crypt/qca/files/qca-disable-pgp-test.patch new file mode 100644 index 000000000000..7944e3c358ea --- /dev/null +++ b/app-crypt/qca/files/qca-disable-pgp-test.patch @@ -0,0 +1,13 @@ +diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt +index f4d9eb9..67ef281 100644 +--- a/unittest/CMakeLists.txt ++++ b/unittest/CMakeLists.txt +@@ -23,7 +23,7 @@ add_subdirectory(keylengthunittest) + add_subdirectory(keystore) + add_subdirectory(macunittest) + add_subdirectory(metatype) +-add_subdirectory(pgpunittest) ++# add_subdirectory(pgpunittest) + add_subdirectory(pipeunittest) + add_subdirectory(pkits) + add_subdirectory(rsaunittest) diff --git a/app-crypt/qca/metadata.xml b/app-crypt/qca/metadata.xml index 74f2454987cd..71e64852ee63 100644 --- a/app-crypt/qca/metadata.xml +++ b/app-crypt/qca/metadata.xml @@ -4,4 +4,15 @@ crypto qt kde + + Enable botan plugin + Enable gcrypt plugin + Enable GnuPG plugin + Enable logger plugin + Enable NSS plugin + Enable OpenSSL plugin + Enable PKCS#11 plugin + Enable SASL plugin + Enable softstore plugin + diff --git a/app-crypt/qca/qca-2.1.0.3.ebuild b/app-crypt/qca/qca-2.1.0.3.ebuild new file mode 100644 index 000000000000..fd5eeb3ecf41 --- /dev/null +++ b/app-crypt/qca/qca-2.1.0.3.ebuild @@ -0,0 +1,133 @@ +# 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.1 2015/01/28 00:58:27 johu Exp $ + +EAPI=5 + +MY_PN="${PN}-qt5" +inherit multilib cmake-utils multibuild + +DESCRIPTION="Qt Cryptographic Architecture (QCA)" +HOMEPAGE="http://delta.affinix.com/qca/" +SRC_URI="mirror://kde/stable/${MY_PN}/${PV}/src/${MY_PN}-${PV}.tar.xz" + +LICENSE="LGPL-2.1" +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="botan debug doc examples gcrypt gpg logger nss openssl pkcs11 +qt4 qt5 sasl softstore test" +REQUIRED_USE="|| ( qt4 qt5 )" + +RDEPEND=" + !app-crypt/qca-cyrus-sasl + !app-crypt/qca-gnupg + !app-crypt/qca-logger + !app-crypt/qca-ossl + !app-crypt/qca-pkcs11 + botan? ( dev-libs/botan ) + gcrypt? ( dev-libs/libgcrypt:= ) + gpg? ( app-crypt/gnupg ) + nss? ( dev-libs/nss ) + openssl? ( dev-libs/openssl:0 ) + pkcs11? ( + dev-libs/openssl:0 + dev-libs/pkcs11-helper + ) + qt4? ( dev-qt/qtcore:4 ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtconcurrent:5 + dev-qt/qtnetwork:5 + ) + sasl? ( dev-libs/cyrus-sasl:2 ) +" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen ) + test? ( + qt4? ( dev-qt/qttest:4 ) + qt5? ( dev-qt/qttest:5 ) + ) +" + +DOCS=( README TODO ) + +S=${WORKDIR}/${MY_PN}-${PV} + +PATCHES=( "${FILESDIR}/${PN}-disable-pgp-test.patch" ) + +qca_plugin_use() { + echo "-DWITH_${2:-$1}_PLUGIN=$(use $1 && echo yes || echo no)" +} + +pkg_setup() { + MULTIBUILD_VARIANTS=() + if use qt4; then + MULTIBUILD_VARIANTS+=(qt4) + fi + + if use qt5; then + MULTIBUILD_VARIANTS+=(qt5) + fi +} + +src_configure() { + myconfigure() { + local mycmakeargs=( + $(qca_plugin_use botan) + $(qca_plugin_use gcrypt) + $(qca_plugin_use gpg gnupg) + $(qca_plugin_use logger) + $(qca_plugin_use nss) + $(qca_plugin_use openssl ossl) + $(qca_plugin_use pkcs11) + $(qca_plugin_use sasl cyrus-sasl) + $(qca_plugin_use softstore) + $(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" + ) + fi + + cmake-utils_src_configure + } + + multibuild_foreach_variant myconfigure +} + +src_compile() { + multibuild_foreach_variant cmake-utils_src_compile +} + +src_install() { + multibuild_foreach_variant cmake-utils_src_install + + if use doc; then + pushd "${BUILD_DIR}" >/dev/null + doxygen Doxyfile.in || die + dohtml apidocs/html/* + popd >/dev/null + 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 +}