diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-06-09 09:27:03 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-06-09 09:27:03 +0100 |
commit | cb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa (patch) | |
tree | 047fc92023c520d07f13ec5ac96e094d1b312a7a /app-crypt/qca | |
parent | 7b9f15840068dfaeea5684f8a1af1fe460dfa14c (diff) |
gentoo resync : 09.06.2018
Diffstat (limited to 'app-crypt/qca')
-rw-r--r-- | app-crypt/qca/Manifest | 3 | ||||
-rw-r--r-- | app-crypt/qca/files/qca-2.1.3-deps.patch | 38 | ||||
-rw-r--r-- | app-crypt/qca/qca-2.1.3-r2.ebuild | 7 |
3 files changed, 45 insertions, 3 deletions
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest index 534da53660ad..be83e6fa0f12 100644 --- a/app-crypt/qca/Manifest +++ b/app-crypt/qca/Manifest @@ -1,5 +1,6 @@ AUX qca-2.1.3-c++11.patch 3555 BLAKE2B 68b9e4a9e13543b2f98c564f19deef32090be25bb425d83bebf78bc0141411bd447223562c920aea80765811084360fbc964afb7841291081f80cc94060070b2 SHA512 605a602d184c86426d6d875954ad2cb3bee19252ce56e6581df7574a3e324f97ccfcb919fef32f6ff8a393683b8375d97586ed886ae01d87fbe015f2f83f0e3b +AUX qca-2.1.3-deps.patch 1040 BLAKE2B 4bf0179bf2383328dd97f365c433ee40a87e465b8c0b5396d4cfde07f27a4aedfa2d229900e630606fc43e5a5a35042ffce999f59401c34439e656b0b6f1bf0e SHA512 e20a3a06fef8415287d8837ea5fa2acf3ef60f8a1da6aec7c994987f63336e52ac2460fa76694b82b59f30aa1d59cd22decac246423adbef8ae1658a7f7db78f AUX qca-disable-pgp-test.patch 446 BLAKE2B a98d5951d7b89c65787d7d586a5504949c51271ebe09c5e19b90a2e24f24fb6d03d6c1f76d7ad4234354bc2507cf7031c716b3b2bf8243b8c1d85065079dded4 SHA512 30bb6d31b9392166d6bbae39da2eeb1788ac9cccffb801b074468a3606a6e1a56d6a41ee276d3b8b8d39112bf6aea7025f07f4810bb835102bd00521ee9eb104 DIST qca-2.1.3.tar.xz 686340 BLAKE2B 60ebf9add907632ed17426ee53c6c35a9aed279a4492012f1c174608cbe9579d366feb7ff7bff551d2e9e4ef2f271e8f340fcb4c9e1f67f209657d388567d44f SHA512 0aec277e0695da2e45298f0a9006213829fe4c449a79969e472947db54f45000ba6e22361b782465bdc03f269b7301d318c843f5a83db459a118e58a03f3116a -EBUILD qca-2.1.3-r2.ebuild 2145 BLAKE2B 2e9e467c1028b5eb4ea9b60e48491adbf28c62beee2f22a7af4fbc47672fe17395b4cb659dd2cf7223826880eab0c6b2b6b1829ebb60e84dbd9c30bbd30ce465 SHA512 20cf442c8a8ed86177c940be5e284c29444f4db8ac960b68f4cf2c32b579c8454cab1b5d1b6c9bdcb1c282bd737461853556b5de0c0cf2e4e11fbca07b3b0cea +EBUILD qca-2.1.3-r2.ebuild 2180 BLAKE2B a74a2d7378bad48e8ad20c30ae91416b79e6f79393566e499a7821cf6fc904f6966c36751b285da4320da5a541fefadaf35df6df192ec4338dfc363323e20469 SHA512 ebca007f517945d9f26ca4fba9536418371013764c95f668774da8f23c1dce722ae1954e2e5505ea5b87446576ac757e2248f829ca515db7249c97d28e0d83b1 MISC metadata.xml 842 BLAKE2B 1732f7a0efeba7de6c54bfb817a69f9be88eab8bb37a75f5ee685ba7893ad9be13a10ea8b2a404954846e1ea73dc617d0a89ac3b1f69a83928275b9e8d5fc7ab SHA512 900de0e8b914d1970b3e4fcfbdbeea48c1e56ab596e6c959e4dce29a0fd0cb0b6969ab6899784a80b6c233a656f3a4501513d8af6b4acc8519a5ecf1c9a1a622 diff --git a/app-crypt/qca/files/qca-2.1.3-deps.patch b/app-crypt/qca/files/qca-2.1.3-deps.patch new file mode 100644 index 000000000000..e1ef2e5c0e7e --- /dev/null +++ b/app-crypt/qca/files/qca-2.1.3-deps.patch @@ -0,0 +1,38 @@ +From e854f357f4037e2c8c781ebd04ec5164a882b9b3 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Thu, 12 Apr 2018 00:45:50 +0200 +Subject: [PATCH] Make Qt5Network conditional on BUILD_TESTS + +Summary: I did not find it in use somewhere else. + +Reviewers: iromanov, sitter, rjvbb + +Reviewed By: rjvbb + +Subscribers: fvogt + +Differential Revision: https://phabricator.kde.org/D12129 +--- + CMakeLists.txt | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 28b0169..65b95f8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -59,7 +59,11 @@ if (Qt5Core_FOUND) + message(STATUS "Building with Qt5 support") + # Got from ECM + # Distros have no ECM. So I just copied required cmake modules. +- find_package(Qt5Transitional REQUIRED Core Network) ++ if(BUILD_TESTS) ++ find_package(Qt5Transitional REQUIRED Core Network) ++ else() ++ find_package(Qt5Transitional REQUIRED Core) ++ endif() + include(ECMQt4To5Porting) + + include(GNUInstallDirs) +-- +2.17.1 + diff --git a/app-crypt/qca/qca-2.1.3-r2.ebuild b/app-crypt/qca/qca-2.1.3-r2.ebuild index fc3445a32dde..a1d5bbb0df5f 100644 --- a/app-crypt/qca/qca-2.1.3-r2.ebuild +++ b/app-crypt/qca/qca-2.1.3-r2.ebuild @@ -33,9 +33,11 @@ COMMON_DEPEND=" ) " DEPEND="${COMMON_DEPEND} - dev-qt/qtnetwork:5 doc? ( app-doc/doxygen ) - test? ( dev-qt/qttest:5 ) + test? ( + dev-qt/qtnetwork:5 + dev-qt/qttest:5 + ) " RDEPEND="${COMMON_DEPEND} !app-crypt/qca-cyrus-sasl @@ -48,6 +50,7 @@ RDEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}/${PN}-disable-pgp-test.patch" "${FILESDIR}/${P}-c++11.patch" + "${FILESDIR}/${P}-deps.patch" ) qca_plugin_use() { |