From fcc5224904648a8e6eb528d7603154160a20022f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 2 Feb 2022 01:39:05 +0000 Subject: gentoo resync : 02.02.2022 --- dev-qt/qtbluetooth/Manifest | 5 +-- .../files/qtbluetooth-5.15.2-gcc11.patch | 19 ------------ dev-qt/qtbluetooth/qtbluetooth-5.15.2-r1.ebuild | 36 ---------------------- dev-qt/qtbluetooth/qtbluetooth-5.15.2-r10.ebuild | 4 +-- 4 files changed, 3 insertions(+), 61 deletions(-) delete mode 100644 dev-qt/qtbluetooth/files/qtbluetooth-5.15.2-gcc11.patch delete mode 100644 dev-qt/qtbluetooth/qtbluetooth-5.15.2-r1.ebuild (limited to 'dev-qt/qtbluetooth') diff --git a/dev-qt/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest index 2256f2accea6..1b8333c9ee1e 100644 --- a/dev-qt/qtbluetooth/Manifest +++ b/dev-qt/qtbluetooth/Manifest @@ -1,6 +1,3 @@ -AUX qtbluetooth-5.15.2-gcc11.patch 596 BLAKE2B 0b8b8e493ff32e34a53e1fd22358f556bb7844fea8eeb3e8384f82aeb1ca63c760d234c2f4cfdf25ae5bfb9a7b86c7c95c8bc421d1f812ec84f87a904c300e74 SHA512 f598c403fadb7c88e972f2c4dd91f0c6ebd85a7c1812c632a3aa9826780d26dcecdbe0f2f7e8c4ed0e412b6ef4cee4aeb194cf393e418418686233fda9fe41bc DIST qtconnectivity-5.15.2-5e9ca5d3.tar.gz 3412877 BLAKE2B 07d201a934b72aab5ec90bbe667578d7150a3e93379278a44ff63ff67568bc6dfeff075d763e544e209dd0b6d9f53ca8214f483a3ff38794252b39c8ad5e80f5 SHA512 6be16baa0f63d6b36836adac50df4b9db79ca65b3bb4c92be13f748cec9384c42e57833bc1d06a8f50575f13623965cf40d1497e5fa51f44cb51b15760fb198f -DIST qtconnectivity-everywhere-src-5.15.2.tar.xz 2815492 BLAKE2B 0702601266d46669e0a39740b6df539b1d3f6dcb62d06b14f5ba89782e9bd38faa391892841434feccd9599eef09c7c7238efb82e11a0633e73f58dd721d3324 SHA512 a934dcdd28645ba23dd429215643694d9a14449a4c3e1a6154a9a19cb3210f3d80978b46aefff2b110db533fa1816450f2f73a27d80df5330a92799e4cca1b9c -EBUILD qtbluetooth-5.15.2-r1.ebuild 734 BLAKE2B ba2d32b3c80171665c2ee6b578884a08e6c79908740becc9e336e2948c1e345d8b1ccc541cb02eaf781b4e47c50deebd2c70d6a2729cf97b07c0a983b3fabd28 SHA512 23c55f55b436fc4b4e633934aa0f40f1aac743a832504e4b12212d5c33a529bcfa868f845188932fee8c37d82d844dd722179ca3f833d1c0eef423a6c24f0f71 -EBUILD qtbluetooth-5.15.2-r10.ebuild 737 BLAKE2B f16d85fae8e8e7d9aa79202a71906f81018ec42513d49a0b56e00e44fcf9ca7de95ecebc6b304ad42d4010aa1acde698632cd6fc44463da251db3abd31849e79 SHA512 08329e4bfbd4ffdfc28ce61123347411b4b96fbde515dc070fbd56712b0f5d0c14d7404e4b0820007438b4db44bd5cf9d84d33ff47433939fab2e62e8e1c4a76 +EBUILD qtbluetooth-5.15.2-r10.ebuild 733 BLAKE2B 49ec79aac68cb016e98bb639fa31b5cddcd6f906038df4593742f84fa56e5cb54351c00fb76ae60b5d9cd9db8c29e61270e3d197e06ab44c99ddaf934828b6a5 SHA512 ef023d5ba8ca9faabd904703a44e550de2b7cd8c04a986241011ca8c7a757809677d7a0a0022bfd2af0c256d6bb04aa63a59567fd17ef260c6e68fc1d1fb0d80 MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30 diff --git a/dev-qt/qtbluetooth/files/qtbluetooth-5.15.2-gcc11.patch b/dev-qt/qtbluetooth/files/qtbluetooth-5.15.2-gcc11.patch deleted file mode 100644 index 7c27730574b6..000000000000 --- a/dev-qt/qtbluetooth/files/qtbluetooth-5.15.2-gcc11.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 0ae88b90f857bfcc2d0ea33d16753d8eed5db9e1 Mon Sep 17 00:00:00 2001 -From: Jeff Law -Date: Oct 16 2020 20:08:46 +0000 -Subject: Add missing #include for gcc-11 - - -diff --git a/src/bluetooth/lecmaccalculator.cpp b/src/bluetooth/lecmaccalculator.cpp -index b150466..507603c 100644 ---- a/src/bluetooth/lecmaccalculator.cpp -+++ b/src/bluetooth/lecmaccalculator.cpp -@@ -38,6 +38,8 @@ - ****************************************************************************/ - #include "lecmaccalculator_p.h" - -+#include -+ - #include "bluez/bluez_data_p.h" - - #include diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.15.2-r1.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.15.2-r1.ebuild deleted file mode 100644 index 1a88564f814e..000000000000 --- a/dev-qt/qtbluetooth/qtbluetooth-5.15.2-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -QT5_MODULE="qtconnectivity" -inherit qt5-build - -DESCRIPTION="Bluetooth support library for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86" -fi - -IUSE="qml" - -RDEPEND=" - =dev-qt/qtconcurrent-${QT5_PV}* - =dev-qt/qtcore-${QT5_PV}*:5= - =dev-qt/qtdbus-${QT5_PV}* - >=net-wireless/bluez-5:= - qml? ( =dev-qt/qtdeclarative-${QT5_PV}* ) -" -DEPEND="${RDEPEND} - =dev-qt/qtnetwork-${QT5_PV}* -" - -PATCHES=( "${FILESDIR}/${P}-gcc11.patch" ) # bug 752012 - -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.15.2-r10.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.15.2-r10.ebuild index 5d96509f047b..e8a25918c451 100644 --- a/dev-qt/qtbluetooth/qtbluetooth-5.15.2-r10.ebuild +++ b/dev-qt/qtbluetooth/qtbluetooth-5.15.2-r10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,7 +10,7 @@ inherit qt5-build DESCRIPTION="Bluetooth support library for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86" fi IUSE="qml" -- cgit v1.2.3