From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- media-sound/qastools/Manifest | 6 +- .../files/qastools-0.22.0-nomancompress.patch | 169 --------------------- .../qastools/files/qastools-0.22.0-qt-5.15.patch | 64 -------- media-sound/qastools/qastools-0.22.0.ebuild | 44 ------ media-sound/qastools/qastools-0.23.0.ebuild | 2 +- 5 files changed, 2 insertions(+), 283 deletions(-) delete mode 100644 media-sound/qastools/files/qastools-0.22.0-nomancompress.patch delete mode 100644 media-sound/qastools/files/qastools-0.22.0-qt-5.15.patch delete mode 100644 media-sound/qastools/qastools-0.22.0.ebuild (limited to 'media-sound/qastools') diff --git a/media-sound/qastools/Manifest b/media-sound/qastools/Manifest index 6730ce95c065..e137d3a1007c 100644 --- a/media-sound/qastools/Manifest +++ b/media-sound/qastools/Manifest @@ -1,8 +1,4 @@ -AUX qastools-0.22.0-nomancompress.patch 4667 BLAKE2B e9d11e1aeae8eba81ca60dbfb37da0c5e8efcc30d62899806b9415898a2484ed833caa42dfab2f5532f551486f3ce592e260c9b8396289d27eb488be00a06344 SHA512 ee10a90d8c92eeb124bef8ae6edc023cf452585679380c4e7cb406ed41cd4d04db3b8075f89c2925d2d020fc9a0d035d8e3762e2af92085418e5eb94064c604c -AUX qastools-0.22.0-qt-5.15.patch 2047 BLAKE2B 01a473dce7c070b47e611ea7f05d1a16b07a6c7c692f8a98bde7dd12b286cdea04fe79fdf62ab99e1b5cd5c678181fb4f266ec35627291674475918505a59dbf SHA512 9fdd644cbb100df9ef2d593a4ba24f9fa4cda242e41e4f909e57f3e23adde566763b50b82c7e756b40623038c3df88df49d59da3efec9509c6fc0b1101bfae5d AUX qastools-0.23.0-nomancompress.patch 4753 BLAKE2B 62755c3381455e89afc2c9de5fdb1668a93936c5f238b938cbddd608a3b4e7421982f5bcf4cae027e005db1db9c19e870f28aaffc098d421cb245a080b4c70ab SHA512 a3b54f0313e1c0019d6a25009befecb2e48b022fddf78ce38e1c52194ef8711160e9d72bc637bf3c55223a043e091550cfdb8582c1cfd1044bb5a96bbaa76dce -DIST qastools-v0.22.0.tar.gz 289261 BLAKE2B 25ff23753cbc1b4d758ff2f42b9022785391c61d9211e0024b55cc08841f41cdf0468c485af9e459dc8b65dac526b8238947419c36003d556e8e1fa13a4896e8 SHA512 9656960095520a1bee58efa3985dda30fae1b6be666dfd65b50cb582be21a40d273a1c06b69e870bc2b467f5d644b22ea30c2fd73eee9057b50de5e85864d712 DIST qastools-v0.23.0.tar.gz 292875 BLAKE2B c0ba54462e702411bee7a15a913617870488b1c9c2676e3c6f69d0648cff79cc1989e0f367953ba6f27b94c014c9b2fa7ef74ae4800d03b99bb8336ce4535d4a SHA512 79042a41a0ad37097d297175b899af73052953b7ae14058a1878e3145769db839b8bd4350bd36646d8436a3e8b37b64da7b3004bee3c7c7780d46a942af1d3b9 -EBUILD qastools-0.22.0.ebuild 827 BLAKE2B 313456cebd163c4ecb5d9a73f41a2c7d246d37597a61d8904074b8d9fe4b13465bdde4cab980e9ac80fa8803ef5d324789ba73f0bc8845ef84ab55ec6433f340 SHA512 ddc5f654b3f99831537df6f76a40852f0d098729aad24e4131bb310463ea37281801409693ed55009936325d80831469032f697d58f2719ba15bf37d7d0d637e -EBUILD qastools-0.23.0.ebuild 794 BLAKE2B 8d5d7e15b2d3c806294ba7d48bc3b76ae5c1ab97ace908d5658f7e4d615ef4fd3256a6842b47511beb852e78aed9e88311bd8b759d87060e14006ce1799e99e4 SHA512 618ab55bf38feb98e234e508d3c32f70b2a60aa3b93f71fb766fce21bb0a89c81096a7faafb1fbe9de4f5432bf1f739849f6dc1c2bf2f395fcf49774349a9c7a +EBUILD qastools-0.23.0.ebuild 792 BLAKE2B 4e369718024cfb3cb4c564b8fc1630168f38fa73a5ff89683d7b43dd92283d2e9bb045ba729cb64b412fd9f547bdf3412ec1348b54423923efbc7ca520b08175 SHA512 0708e92db81091cef8de8a579eb70ccf441a9069ad122f39c50e7f98e2abac1607c795f7b791b610f5ec715fe3a02e03fea051de34dc9ac4e59f243799120ea0 MISC metadata.xml 325 BLAKE2B 1568315a082d0a94f0dc43ae932dce5ca93e9cbced0c7cf7f518900b594281f012809f729e62501271606bfd0f31ec04870f3849e47730fb196689f16088b73c SHA512 311b842ee0ea6099f1beea4753e44e6af6ba70ded6c54f6321b244c5366b47071ac80a0c7012b1473e0d5afc47b44f23665630adc36b96fe1f55bfad753b2276 diff --git a/media-sound/qastools/files/qastools-0.22.0-nomancompress.patch b/media-sound/qastools/files/qastools-0.22.0-nomancompress.patch deleted file mode 100644 index 49756a91b4c0..000000000000 --- a/media-sound/qastools/files/qastools-0.22.0-nomancompress.patch +++ /dev/null @@ -1,169 +0,0 @@ -From 58649d44b4f1362c8fe5f88828be97e10b4fc00b Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Mon, 8 Jun 2020 11:45:09 +0200 -Subject: [PATCH] Compress manpages optionally - ---- - qasconfig/share/man/CMakeLists.txt | 24 ++++++++++++------------ - qashctl/share/man/CMakeLists.txt | 26 +++++++++++++------------- - qasmixer/share/man/CMakeLists.txt | 24 ++++++++++++------------ - 3 files changed, 37 insertions(+), 37 deletions(-) - -diff --git a/qasconfig/share/man/CMakeLists.txt b/qasconfig/share/man/CMakeLists.txt -index 083ca91..628be1b 100644 ---- a/qasconfig/share/man/CMakeLists.txt -+++ b/qasconfig/share/man/CMakeLists.txt -@@ -1,27 +1,27 @@ - # Find gzip --FIND_PACKAGE ( UnixCommands REQUIRED ) -- --IF ( NOT GZIP ) -- MESSAGE ( FATAL_ERROR "Unable to find 'gzip' program" ) --ENDIF ( NOT GZIP ) -- -+FIND_PACKAGE ( UnixCommands ) - - # Configure manpages - - SET ( man_src ${CMAKE_CURRENT_SOURCE_DIR}/manpage.1.cmake ) - SET ( man_plain ${CMAKE_CURRENT_BINARY_DIR}/manpage.1 ) --SET ( man_gz ${CMAKE_CURRENT_BINARY_DIR}/manpage.1.gz ) -+SET ( man_gz .gz ) - - CONFIGURE_FILE ( ${man_src} ${man_plain} ) - - - # Compress manpages - -+IF ( NOT GZIP ) -+ MESSAGE ( STATUS "Unable to find 'gzip' program, not compressing manpage" ) -+ SET ( man_gz "" ) -+ELSE() - ADD_CUSTOM_COMMAND ( -- OUTPUT ${man_gz} -- COMMAND ${GZIP} -c -9 ${man_plain} > ${man_gz} -+ OUTPUT ${man_plain}${man_gz} -+ COMMAND ${GZIP} -c -9 ${man_plain} > ${man_plain}${man_gz} - DEPENDS ${man_plain} -- COMMENT "Building ${man_gz}" ) -+ COMMENT "Building ${man_plain}${man_gz}" ) -+ENDIF() - - ADD_CUSTOM_TARGET ( - qasconfig_manpage ALL -@@ -30,6 +30,6 @@ ADD_CUSTOM_TARGET ( - - # Installation of the manpage - --INSTALL ( FILES ${man_gz} -+INSTALL ( FILES ${man_plain}${man_gz} - DESTINATION ${INSTALL_DIR_MAN} -- RENAME ${PROGRAM_NAME}.1.gz ) -+ RENAME ${PROGRAM_NAME}.1${man_gz} ) -diff --git a/qashctl/share/man/CMakeLists.txt b/qashctl/share/man/CMakeLists.txt -index 911ea43..5f6ba15 100644 ---- a/qashctl/share/man/CMakeLists.txt -+++ b/qashctl/share/man/CMakeLists.txt -@@ -1,35 +1,35 @@ - # Find gzip --FIND_PACKAGE ( UnixCommands REQUIRED ) -- --IF ( NOT GZIP ) -- MESSAGE ( FATAL_ERROR "Unable to find 'gzip' program" ) --ENDIF ( NOT GZIP ) -- -+FIND_PACKAGE ( UnixCommands ) - - # Configure manpages - - SET ( man_src ${CMAKE_CURRENT_SOURCE_DIR}/manpage.1.cmake ) - SET ( man_plain ${CMAKE_CURRENT_BINARY_DIR}/manpage.1 ) --SET ( man_gz ${CMAKE_CURRENT_BINARY_DIR}/manpage.1.gz ) -+SET ( man_gz .gz ) - - CONFIGURE_FILE ( ${man_src} ${man_plain} ) - - - # Compress manpages - -+IF ( NOT GZIP ) -+ MESSAGE ( STATUS "Unable to find 'gzip' program, not compressing manpage" ) -+ SET ( man_gz "" ) -+ELSE() - ADD_CUSTOM_COMMAND ( -- OUTPUT ${man_gz} -- COMMAND ${GZIP} -c -9 ${man_plain} > ${man_gz} -+ OUTPUT ${man_plain}${man_gz} -+ COMMAND ${GZIP} -c -9 ${man_plain} > ${man_plain}${man_gz} - DEPENDS ${man_plain} -- COMMENT "Building ${man_gz}" ) -+ COMMENT "Building ${man_plain}${man_gz}" ) -+ENDIF() - - ADD_CUSTOM_TARGET ( - qashctl_manpage ALL -- DEPENDS ${man_gz} ) -+ DEPENDS ${man_plain}${man_gz} ) - - - # Installation of the manpage - --INSTALL ( FILES ${man_gz} -+INSTALL ( FILES ${man_plain}${man_gz} - DESTINATION ${INSTALL_DIR_MAN} -- RENAME ${PROGRAM_NAME}.1.gz ) -+ RENAME ${PROGRAM_NAME}.1${man_gz} ) -diff --git a/qasmixer/share/man/CMakeLists.txt b/qasmixer/share/man/CMakeLists.txt -index 5aea9af..c2bd872 100644 ---- a/qasmixer/share/man/CMakeLists.txt -+++ b/qasmixer/share/man/CMakeLists.txt -@@ -1,27 +1,27 @@ - # Find gzip --FIND_PACKAGE ( UnixCommands REQUIRED ) -- --IF ( NOT GZIP ) -- MESSAGE ( FATAL_ERROR "Unable to find 'gzip' program" ) --ENDIF ( NOT GZIP ) -- -+FIND_PACKAGE ( UnixCommands ) - - # Configure manpages - - SET ( man_src ${CMAKE_CURRENT_SOURCE_DIR}/manpage.1.cmake ) - SET ( man_plain ${CMAKE_CURRENT_BINARY_DIR}/manpage.1 ) --SET ( man_gz ${CMAKE_CURRENT_BINARY_DIR}/manpage.1.gz ) -+SET ( man_gz .gz ) - - CONFIGURE_FILE ( ${man_src} ${man_plain} ) - - - # Compress manpages - -+IF ( NOT GZIP ) -+ MESSAGE ( STATUS "Unable to find 'gzip' program, not compressing manpage" ) -+ SET ( man_gz "" ) -+ELSE() - ADD_CUSTOM_COMMAND ( -- OUTPUT ${man_gz} -- COMMAND ${GZIP} -c -9 ${man_plain} > ${man_gz} -+ OUTPUT ${man_plain}${man_gz} -+ COMMAND ${GZIP} -c -9 ${man_plain} > ${man_plain}${man_gz} - DEPENDS ${man_plain} -- COMMENT "Building ${man_gz}" ) -+ COMMENT "Building ${man_plain}${man_gz}" ) -+ENDIF() - - ADD_CUSTOM_TARGET ( - qasmixer_manpage ALL -@@ -30,6 +30,6 @@ ADD_CUSTOM_TARGET ( - - # Installation of the manpage - --INSTALL ( FILES ${man_gz} -+INSTALL ( FILES ${man_plain}${man_gz} - DESTINATION ${INSTALL_DIR_MAN} -- RENAME ${PROGRAM_NAME}.1.gz ) -+ RENAME ${PROGRAM_NAME}.1${man_gz} ) --- -2.27.0 - diff --git a/media-sound/qastools/files/qastools-0.22.0-qt-5.15.patch b/media-sound/qastools/files/qastools-0.22.0-qt-5.15.patch deleted file mode 100644 index 606630d7eebb..000000000000 --- a/media-sound/qastools/files/qastools-0.22.0-qt-5.15.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 9975fe653c8159504807ca6288bd974b4f6057b7 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Mon, 8 Jun 2020 11:01:33 +0200 -Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath includes) - -Fixes https://gitlab.com/sebholt/qastools/-/issues/1 ---- - shared/src/wdg/ds_slider_painter_bevelled.cpp | 1 + - shared/src/wdg/ds_switch_painter_circle.cpp | 1 + - shared/src/wdg/ds_switch_painter_close.cpp | 1 + - shared/src/wdg/sliders_pad_style.hpp | 1 + - 4 files changed, 4 insertions(+) - -diff --git a/shared/src/wdg/ds_slider_painter_bevelled.cpp b/shared/src/wdg/ds_slider_painter_bevelled.cpp -index 3c90143..1748c6e 100644 ---- a/shared/src/wdg/ds_slider_painter_bevelled.cpp -+++ b/shared/src/wdg/ds_slider_painter_bevelled.cpp -@@ -15,6 +15,7 @@ - - #include - #include -+#include - #include - #include - #include -diff --git a/shared/src/wdg/ds_switch_painter_circle.cpp b/shared/src/wdg/ds_switch_painter_circle.cpp -index 32fa8f1..36933af 100644 ---- a/shared/src/wdg/ds_switch_painter_circle.cpp -+++ b/shared/src/wdg/ds_switch_painter_circle.cpp -@@ -13,6 +13,7 @@ - - #include - #include -+#include - #include - #include - -diff --git a/shared/src/wdg/ds_switch_painter_close.cpp b/shared/src/wdg/ds_switch_painter_close.cpp -index ef058a3..76932cc 100644 ---- a/shared/src/wdg/ds_switch_painter_close.cpp -+++ b/shared/src/wdg/ds_switch_painter_close.cpp -@@ -13,6 +13,7 @@ - - #include - #include -+#include - #include - #include - -diff --git a/shared/src/wdg/sliders_pad_style.hpp b/shared/src/wdg/sliders_pad_style.hpp -index 3108f92..81a9075 100644 ---- a/shared/src/wdg/sliders_pad_style.hpp -+++ b/shared/src/wdg/sliders_pad_style.hpp -@@ -5,6 +5,7 @@ - #define __INC_sliders_pad_style_hpp__ - - #include -+#include - #include - #include - --- -2.27.0 - diff --git a/media-sound/qastools/qastools-0.22.0.ebuild b/media-sound/qastools/qastools-0.22.0.ebuild deleted file mode 100644 index 579642b937f1..000000000000 --- a/media-sound/qastools/qastools-0.22.0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Qt5 GUI ALSA tools: mixer, configuration browser" -HOMEPAGE="https://gitlab.com/sebholt/qastools" -SRC_URI="https://gitlab.com/sebholt/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -BDEPEND=" - dev-qt/linguist-tools:5 -" -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - media-libs/alsa-lib - virtual/libudev:= -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-qt-5.15.patch" - "${FILESDIR}/${P}-nomancompress.patch" -) - -S="${WORKDIR}"/${PN}-v${PV} - -src_configure() { - local mycmakeargs=( - -DSKIP_LICENSE_INSTALL=ON - -DCMAKE_DISABLE_FIND_PACKAGE_UnixCommands=ON - ) - cmake_src_configure -} diff --git a/media-sound/qastools/qastools-0.23.0.ebuild b/media-sound/qastools/qastools-0.23.0.ebuild index 9f055f434b6b..739a04e7b390 100644 --- a/media-sound/qastools/qastools-0.23.0.ebuild +++ b/media-sound/qastools/qastools-0.23.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/sebholt/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" BDEPEND=" -- cgit v1.2.3