Gentoo Archives: gentoo-commits

From: Richard Farina <zerochaos@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/gqrx/
Date: Tue, 24 Jan 2017 21:55:04
Message-Id: 1485294831.90366d88eb3e518b17d4e9b96fb11c82cafdcf98.zerochaos@gentoo
1 commit: 90366d88eb3e518b17d4e9b96fb11c82cafdcf98
2 Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 24 21:10:06 2017 +0000
4 Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 24 21:53:51 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90366d88
7
8 net-wireless/gqrx: bump to 2.6 and cmake, yay
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 net-wireless/gqrx/Manifest | 1 +
13 .../gqrx/{gqrx-9999.ebuild => gqrx-2.6.ebuild} | 18 ++++++++++--------
14 net-wireless/gqrx/gqrx-9999.ebuild | 18 ++++++++++--------
15 3 files changed, 21 insertions(+), 16 deletions(-)
16
17 diff --git a/net-wireless/gqrx/Manifest b/net-wireless/gqrx/Manifest
18 index dcacbf1..c88e5f7 100644
19 --- a/net-wireless/gqrx/Manifest
20 +++ b/net-wireless/gqrx/Manifest
21 @@ -3,3 +3,4 @@ DIST gqrx-2.3.2.tar.gz 1080995 SHA256 2748ee14491dbfb5821efba32300124b5a2b0aabc8
22 DIST gqrx-2.4.tar.gz 1154716 SHA256 4c561083b3da9423c017ea4fbe7e12fedb0ba7c2065c17b8ac8a0f5403a5da9b SHA512 9d3619bf1488a0fd1b37892a4d38518c67739771b46402efd6e8d91a590f328faf67e620bba7370371cf9856c90c3f6208d8632d2cc9571ba7e8987835ec8917 WHIRLPOOL 00192b64007274026be0eeeda7a45972ef81cd91b93efdb2123a6b2e1221b2257458b5e84d7944267329ff1c94967aed2be52d9218cc140d911e15dcd5de4c56
23 DIST gqrx-2.5.3.tar.gz 1175584 SHA256 a6aa5419af7c8d59a39e749f9f9fd1bff44e84f246000e0d113b1e4a93e3f05c SHA512 5cdb117f5f496d56d4cf8f67b0e05e10253d47ba707bc684c6aec30f9be922a6ea9ad9e858b184d57fdf44d3ce3eca041728f66a0dfb6e06cc839855088980ed WHIRLPOOL 2343e0244a174a3eabf1ca1d9e35e5daaed9525eceb52fb0f8fa53a94525fc806a41e0366cfd73a0b4162d6e84cf2a88bb4dcaf8cd18a78dce8ce17633b51736
24 DIST gqrx-2.5.tar.gz 1159489 SHA256 5134e5cf66e5133c12801547decad4b90dd7070a0283dd7b04f3ac0c69dd3b4e SHA512 7c135d0b3e7a75178ab5e5c1126a44de40a7b22dcc16b474ad55e3ad87ef23c0bca889827217a858ca63ee48e416798143205789933db6723a74f13b069ccadb WHIRLPOOL 3a887713afa9be09439f32c92720d25159a62f98fa164e081011eef0b442a51024bf79149fbd5b9356a7089cfdbf50b56230229974d0c56bd39ddcbf4d492bfc
25 +DIST gqrx-2.6.tar.gz 1195638 SHA256 53d25db8d987a41ccccaf6fd85262bd7770cdfab5539b5901c4558756483c9db SHA512 c45c0a0fc264f140acd892c08e5d187ecbafcd337dc90e4df21b072f11d6834474ddf1e62723361fd237091a1e8633d92fcb73d86a6cd665b48016b4b7d5332b WHIRLPOOL 7cc67ae130a19d426b12ac38c7ce899c222eaec9cb10d1d32844b1a4bb0555a277bf27b05d2098e7515e9908e33b622053e4ffb67a3f854c8fa082055b6f82da
26
27 diff --git a/net-wireless/gqrx/gqrx-9999.ebuild b/net-wireless/gqrx/gqrx-2.6.ebuild
28 similarity index 79%
29 copy from net-wireless/gqrx/gqrx-9999.ebuild
30 copy to net-wireless/gqrx/gqrx-2.6.ebuild
31 index 7327af4..eae2f9f 100644
32 --- a/net-wireless/gqrx/gqrx-9999.ebuild
33 +++ b/net-wireless/gqrx/gqrx-2.6.ebuild
34 @@ -1,10 +1,10 @@
35 -# Copyright 1999-2016 Gentoo Foundation
36 +# Copyright 1999-2017 Gentoo Foundation
37 # Distributed under the terms of the GNU General Public License v2
38 # $Id$
39
40 -EAPI=5
41 +EAPI=6
42
43 -inherit qt4-r2
44 +inherit cmake-utils
45
46 DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt"
47 HOMEPAGE="http://gqrx.dk/"
48 @@ -25,19 +25,21 @@ IUSE="pulseaudio"
49 DEPEND=">=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter]
50 >=net-wireless/gr-osmosdr-0.1.0:=
51 dev-libs/boost:=
52 - dev-qt/qtcore:4
53 - dev-qt/qtgui:4
54 + dev-qt/qtcore:5
55 + dev-qt/qtgui:5
56 + dev-qt/qtnetwork:5
57 + dev-qt/qtwidgets:5
58 pulseaudio? ( media-sound/pulseaudio:= )"
59 RDEPEND="${DEPEND}
60 - dev-qt/qtsvg:4"
61 + dev-qt/qtsvg:5"
62
63 src_prepare() {
64 if use !pulseaudio; then
65 sed -i 's/AUDIO_BACKEND = pulse/#AUDIO_BACKEND = pulse/' gqrx.pro || die
66 fi
67 - qt4-r2_src_prepare
68 + eapply_user
69 }
70
71 src_install() {
72 - dobin gqrx
73 + dobin "${BUILD_DIR}"/src/gqrx
74 }
75
76 diff --git a/net-wireless/gqrx/gqrx-9999.ebuild b/net-wireless/gqrx/gqrx-9999.ebuild
77 index 7327af4..eae2f9f 100644
78 --- a/net-wireless/gqrx/gqrx-9999.ebuild
79 +++ b/net-wireless/gqrx/gqrx-9999.ebuild
80 @@ -1,10 +1,10 @@
81 -# Copyright 1999-2016 Gentoo Foundation
82 +# Copyright 1999-2017 Gentoo Foundation
83 # Distributed under the terms of the GNU General Public License v2
84 # $Id$
85
86 -EAPI=5
87 +EAPI=6
88
89 -inherit qt4-r2
90 +inherit cmake-utils
91
92 DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt"
93 HOMEPAGE="http://gqrx.dk/"
94 @@ -25,19 +25,21 @@ IUSE="pulseaudio"
95 DEPEND=">=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter]
96 >=net-wireless/gr-osmosdr-0.1.0:=
97 dev-libs/boost:=
98 - dev-qt/qtcore:4
99 - dev-qt/qtgui:4
100 + dev-qt/qtcore:5
101 + dev-qt/qtgui:5
102 + dev-qt/qtnetwork:5
103 + dev-qt/qtwidgets:5
104 pulseaudio? ( media-sound/pulseaudio:= )"
105 RDEPEND="${DEPEND}
106 - dev-qt/qtsvg:4"
107 + dev-qt/qtsvg:5"
108
109 src_prepare() {
110 if use !pulseaudio; then
111 sed -i 's/AUDIO_BACKEND = pulse/#AUDIO_BACKEND = pulse/' gqrx.pro || die
112 fi
113 - qt4-r2_src_prepare
114 + eapply_user
115 }
116
117 src_install() {
118 - dobin gqrx
119 + dobin "${BUILD_DIR}"/src/gqrx
120 }