commit:     90366d88eb3e518b17d4e9b96fb11c82cafdcf98
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 21:10:06 2017 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 21:53:51 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90366d88

net-wireless/gqrx: bump to 2.6 and cmake, yay

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-wireless/gqrx/Manifest                             |  1 +
 .../gqrx/{gqrx-9999.ebuild => gqrx-2.6.ebuild}         | 18 ++++++++++--------
 net-wireless/gqrx/gqrx-9999.ebuild                     | 18 ++++++++++--------
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/net-wireless/gqrx/Manifest b/net-wireless/gqrx/Manifest
index dcacbf1..c88e5f7 100644
--- a/net-wireless/gqrx/Manifest
+++ b/net-wireless/gqrx/Manifest
@@ -3,3 +3,4 @@ DIST gqrx-2.3.2.tar.gz 1080995 SHA256 
2748ee14491dbfb5821efba32300124b5a2b0aabc8
 DIST gqrx-2.4.tar.gz 1154716 SHA256 
4c561083b3da9423c017ea4fbe7e12fedb0ba7c2065c17b8ac8a0f5403a5da9b SHA512 
9d3619bf1488a0fd1b37892a4d38518c67739771b46402efd6e8d91a590f328faf67e620bba7370371cf9856c90c3f6208d8632d2cc9571ba7e8987835ec8917
 WHIRLPOOL 
00192b64007274026be0eeeda7a45972ef81cd91b93efdb2123a6b2e1221b2257458b5e84d7944267329ff1c94967aed2be52d9218cc140d911e15dcd5de4c56
 DIST gqrx-2.5.3.tar.gz 1175584 SHA256 
a6aa5419af7c8d59a39e749f9f9fd1bff44e84f246000e0d113b1e4a93e3f05c SHA512 
5cdb117f5f496d56d4cf8f67b0e05e10253d47ba707bc684c6aec30f9be922a6ea9ad9e858b184d57fdf44d3ce3eca041728f66a0dfb6e06cc839855088980ed
 WHIRLPOOL 
2343e0244a174a3eabf1ca1d9e35e5daaed9525eceb52fb0f8fa53a94525fc806a41e0366cfd73a0b4162d6e84cf2a88bb4dcaf8cd18a78dce8ce17633b51736
 DIST gqrx-2.5.tar.gz 1159489 SHA256 
5134e5cf66e5133c12801547decad4b90dd7070a0283dd7b04f3ac0c69dd3b4e SHA512 
7c135d0b3e7a75178ab5e5c1126a44de40a7b22dcc16b474ad55e3ad87ef23c0bca889827217a858ca63ee48e416798143205789933db6723a74f13b069ccadb
 WHIRLPOOL 
3a887713afa9be09439f32c92720d25159a62f98fa164e081011eef0b442a51024bf79149fbd5b9356a7089cfdbf50b56230229974d0c56bd39ddcbf4d492bfc
+DIST gqrx-2.6.tar.gz 1195638 SHA256 
53d25db8d987a41ccccaf6fd85262bd7770cdfab5539b5901c4558756483c9db SHA512 
c45c0a0fc264f140acd892c08e5d187ecbafcd337dc90e4df21b072f11d6834474ddf1e62723361fd237091a1e8633d92fcb73d86a6cd665b48016b4b7d5332b
 WHIRLPOOL 
7cc67ae130a19d426b12ac38c7ce899c222eaec9cb10d1d32844b1a4bb0555a277bf27b05d2098e7515e9908e33b622053e4ffb67a3f854c8fa082055b6f82da

diff --git a/net-wireless/gqrx/gqrx-9999.ebuild 
b/net-wireless/gqrx/gqrx-2.6.ebuild
similarity index 79%
copy from net-wireless/gqrx/gqrx-9999.ebuild
copy to net-wireless/gqrx/gqrx-2.6.ebuild
index 7327af4..eae2f9f 100644
--- a/net-wireless/gqrx/gqrx-9999.ebuild
+++ b/net-wireless/gqrx/gqrx-2.6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit qt4-r2
+inherit cmake-utils
 
 DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt"
 HOMEPAGE="http://gqrx.dk/";
@@ -25,19 +25,21 @@ IUSE="pulseaudio"
 DEPEND=">=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter]
        >=net-wireless/gr-osmosdr-0.1.0:=
        dev-libs/boost:=
-       dev-qt/qtcore:4
-       dev-qt/qtgui:4
+       dev-qt/qtcore:5
+       dev-qt/qtgui:5
+       dev-qt/qtnetwork:5
+       dev-qt/qtwidgets:5
        pulseaudio? ( media-sound/pulseaudio:= )"
 RDEPEND="${DEPEND}
-       dev-qt/qtsvg:4"
+       dev-qt/qtsvg:5"
 
 src_prepare() {
        if use !pulseaudio; then
                sed -i 's/AUDIO_BACKEND = pulse/#AUDIO_BACKEND = pulse/' 
gqrx.pro || die
        fi
-       qt4-r2_src_prepare
+       eapply_user
 }
 
 src_install() {
-       dobin gqrx
+       dobin "${BUILD_DIR}"/src/gqrx
 }

diff --git a/net-wireless/gqrx/gqrx-9999.ebuild 
b/net-wireless/gqrx/gqrx-9999.ebuild
index 7327af4..eae2f9f 100644
--- a/net-wireless/gqrx/gqrx-9999.ebuild
+++ b/net-wireless/gqrx/gqrx-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit qt4-r2
+inherit cmake-utils
 
 DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt"
 HOMEPAGE="http://gqrx.dk/";
@@ -25,19 +25,21 @@ IUSE="pulseaudio"
 DEPEND=">=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter]
        >=net-wireless/gr-osmosdr-0.1.0:=
        dev-libs/boost:=
-       dev-qt/qtcore:4
-       dev-qt/qtgui:4
+       dev-qt/qtcore:5
+       dev-qt/qtgui:5
+       dev-qt/qtnetwork:5
+       dev-qt/qtwidgets:5
        pulseaudio? ( media-sound/pulseaudio:= )"
 RDEPEND="${DEPEND}
-       dev-qt/qtsvg:4"
+       dev-qt/qtsvg:5"
 
 src_prepare() {
        if use !pulseaudio; then
                sed -i 's/AUDIO_BACKEND = pulse/#AUDIO_BACKEND = pulse/' 
gqrx.pro || die
        fi
-       qt4-r2_src_prepare
+       eapply_user
 }
 
 src_install() {
-       dobin gqrx
+       dobin "${BUILD_DIR}"/src/gqrx
 }

Reply via email to