net-p2p/qbittorrent: improve Werror handling

Closes: https://bugs.gentoo.org/641010
Package-Manager: Portage-2.3.14, Repoman-2.3.6

diff --git a/net-p2p/qbittorrent/qbittorrent-3.3.16.ebuild b/net-p2p/qbittorrent/qbittorrent-3.3.16.ebuild
index ddac9c49ab695be1be728548e7427400727d42b6..6511503962b777790a7cebe85167a7fd26374840 100644 (file)
--- a/net-p2p/qbittorrent/qbittorrent-3.3.16.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-3.3.16.ebuild
@@ -45,6 +45,13 @@ DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO )
 
 PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
 
+src_prepare() {
+       cmake-utils_src_prepare
+
+       # bug 641010
+       sed -i -e "s/-Werror //" cmake/Modules/MacroQbtCompilerSettings.cmake || die
+}
+
 src_configure() {
        local mycmakeargs=(
                -DSYSTEM_QTSINGLEAPPLICATION=ON

diff --git a/net-p2p/qbittorrent/qbittorrent-4.0.3.ebuild b/net-p2p/qbittorrent/qbittorrent-4.0.3.ebuild
index 7316bdc017811461abe02966284beaed9ae6df8d..9ebc91b0bdb1834feedbb4be846621839d987416 100644 (file)
--- a/net-p2p/qbittorrent/qbittorrent-4.0.3.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-4.0.3.ebuild
@@ -44,10 +44,10 @@ DEPEND="${RDEPEND}
 DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO )
 
 src_prepare() {
-       default
+       cmake-utils_src_prepare
 
        # bug 641382
-       sed -i -e "s/-Werror //" cmake/Modules/MacroQbtCompilerSettings.cmake || die
+       sed -i -e "s/-Werror  //" cmake/Modules/MacroQbtCompilerSettings.cmake || die
 }
 
 src_configure() {

diff --git a/net-p2p/qbittorrent/qbittorrent-9999.ebuild b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
index 26971a131175daceb500275df662ccd97dbd36aa..9ebc91b0bdb1834feedbb4be846621839d987416 100644 (file)
--- a/net-p2p/qbittorrent/qbittorrent-9999.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND}
 DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO )
 
 src_prepare() {
-       default
+       cmake-utils_src_prepare
 
        # bug 641382
        sed -i -e "s/-Werror  //" cmake/Modules/MacroQbtCompilerSettings.cmake || die