diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-17 14:32:10 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-17 14:32:10 +0100 |
commit | 51c50bd4c895ebf56d81fecae8e45ec3b5fc3efa (patch) | |
tree | 753b6b08624c34d1ed8414bbe22c45409f7741b9 /dev-qt/qtbluetooth | |
parent | be9d77d3ac6af8f4ead98d89706f356b65578c93 (diff) | |
parent | deba8115d2c2af26df42966b91ef04ff4dd79cde (diff) |
Merge branch 'edge' into next
Diffstat (limited to 'dev-qt/qtbluetooth')
-rw-r--r-- | dev-qt/qtbluetooth/Manifest | 4 | ||||
-rw-r--r-- | dev-qt/qtbluetooth/qtbluetooth-5.13.2.ebuild | 33 | ||||
-rw-r--r-- | dev-qt/qtbluetooth/qtbluetooth-5.14.2.ebuild | 2 |
3 files changed, 2 insertions, 37 deletions
diff --git a/dev-qt/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest index 784ab71ca9f0..c2caa96390f3 100644 --- a/dev-qt/qtbluetooth/Manifest +++ b/dev-qt/qtbluetooth/Manifest @@ -1,8 +1,6 @@ AUX qtbluetooth-5.14.1-errno.patch 812 BLAKE2B 0246a5859242e328116dd12dbd5eb8968e04cf7bac3c7496eabe6e52a4320b06ac995d918abb30ae9b8c86624b329f6e466dc913e3be384d58cdfb9454221ec4 SHA512 a8549108761466100a7db26ccfc4748603533bf1ffaa2e1af9ae21dbd345a727d8ea9f62f345f706e53bdcda39e5464f7b3629ad53260ee11e72bd8fe1d3c979 -DIST qtconnectivity-everywhere-src-5.13.2.tar.xz 2777504 BLAKE2B 96fa60f6685907a2f6a97548bea70551dfd5fb2a1a3d4ffe5b68fe6629f90a52cacb29432f6f64caf8a7426238a37222eaedd515502ec3ade85260e5689b17ca SHA512 ec5269430ce548911f9af44f028bb8032163827d588da6914e9a721ad833277d88bfad43b1cfb4f844443c7a2af6cdbcf2951a339a127c22274612a4e3b90f38 DIST qtconnectivity-everywhere-src-5.14.1.tar.xz 2803040 BLAKE2B 0a13fd0def6d65c0dde5a13a4c53c3ea4b8aa05da05c35093658a6de8ba30e28a6ead9a72c7918251ca3613ac7d7c498434051bde540b8a6780305c1895ee3e1 SHA512 bebffcda3949d798289fcbf8df99afe8fecb6bf410de3fca278f4290f561b75f667ac1f929e62ec423a56c3d80db06ce53d8992f360201e05ed6953af07ceb1a DIST qtconnectivity-everywhere-src-5.14.2.tar.xz 2804940 BLAKE2B d72e1159877049865d45c5aea8281fce87d797bb41cd82aac534463f48752f8144d018a9a1a23d153adc41b64559c0aa160c00ad1c30ce7790abb11f4ee1d87f SHA512 948050b915f6f2e1fffcb2c8b55d9061f25a82314d02e7a39faa9b88e065bb924ce5f8a7c26ed1f07b29b986d47acd5678f57bb96668d1c1ecd93ad3a7e40c7a -EBUILD qtbluetooth-5.13.2.ebuild 618 BLAKE2B a176013b15b535452bbe4017dbef879a36541e7bda9262cd676663e5da7fe6a750d7c526e5da63e5a75738230359c5a241f34c4e117fd2a87f0a83694209db7b SHA512 973aa63e3e0794a5b87768d4f4c9edb7820d7f107f387ecbc182f9159804f2c88eba76f1dbe6d6d50c84fe6ff3f7f5ba2cd25baf25565e6080c226ebf709b8e5 EBUILD qtbluetooth-5.14.1.ebuild 679 BLAKE2B 664a6893b8c9cc070e4a31576edb49ab7f30f94e8f61302cfb0363de11cc9fec753b698ae5b68a4f20fe9353389ddffc33bb2fed8d3747f943711122405c390e SHA512 69659cdb43e363275814ff0a1565d10b550bbbe2499f54c6c0b73cda95e672a03be3efa656b71a95d04ec4f2f1e2ed6755e7b9ff2d7db7822b8d36b71ed2a17b -EBUILD qtbluetooth-5.14.2.ebuild 638 BLAKE2B eb466960d85f88d33193b5df81afa005536657725bf9ecb4210325f8767bdb638dc0c65ac14975f4ad5eb518853e10a1a06953207f1122a8266c0da78ecbd27a SHA512 ab17fefe047787d4b024d894846e2d8c42030d45008d8b0a4b6ea533c554a98596ef3d5dd13861250c319f461c77ec4878ec7b8767c4b97c6fd094db1d1bef12 +EBUILD qtbluetooth-5.14.2.ebuild 637 BLAKE2B a61f299e67b2b690926c97f6f593959bca15d4a9669c5b629351c8341655b358d23038bb13e2570a9cd1bc504bb9858575370c1c991ba954a0df993407fde5db SHA512 e4753e98c948b900a013f1e596f289ca1f8c4ad257da88a4b29fe5805158912858b551922dbb1cb483286ab87fd11b7edb5e6be50c928b8daa7461c8a3242744 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.13.2.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.13.2.ebuild deleted file mode 100644 index 1160a5f5d385..000000000000 --- a/dev-qt/qtbluetooth/qtbluetooth-5.13.2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -QT5_MODULE="qtconnectivity" -inherit qt5-build - -DESCRIPTION="Bluetooth support library for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="arm" -fi - -IUSE="qml" - -RDEPEND=" - ~dev-qt/qtconcurrent-${PV} - ~dev-qt/qtcore-${PV} - ~dev-qt/qtdbus-${PV} - >=net-wireless/bluez-5:= - qml? ( ~dev-qt/qtdeclarative-${PV} ) -" -DEPEND="${RDEPEND} - ~dev-qt/qtnetwork-${PV} -" - -src_prepare() { - sed -i -e 's/nfc//' src/src.pro || die - - qt_use_disable_mod qml quick src/src.pro - - qt5-build_src_prepare -} diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.14.2.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.14.2.ebuild index 7ded615ebf54..4ba2d115d967 100644 --- a/dev-qt/qtbluetooth/qtbluetooth-5.14.2.ebuild +++ b/dev-qt/qtbluetooth/qtbluetooth-5.14.2.ebuild @@ -8,7 +8,7 @@ inherit qt5-build DESCRIPTION="Bluetooth support library for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="~amd64 arm ~arm64 ~x86" fi IUSE="qml" |