| 1 |
commit: e3bfa7d308912fc916b19c86cd79ebd8cea27155 |
| 2 |
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 23 02:36:24 2018 +0000 |
| 4 |
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 23 02:36:38 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3bfa7d3 |
| 7 |
|
| 8 |
net-wireless/gnuradio: dep cleanup |
| 9 |
|
| 10 |
fix automagic bits, fix missing codec2 deps |
| 11 |
|
| 12 |
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org> |
| 13 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 14 |
|
| 15 |
...dio-3.7.13.4.ebuild => gnuradio-3.7.13.4-r1.ebuild} | 10 ++++++---- |
| 16 |
net-wireless/gnuradio/gnuradio-3.7.9999.ebuild | 16 +++++++++++----- |
| 17 |
net-wireless/gnuradio/gnuradio-3.8.9999.ebuild | 18 +++++++++++++----- |
| 18 |
net-wireless/gnuradio/gnuradio-9999.ebuild | 14 ++++++++++---- |
| 19 |
4 files changed, 40 insertions(+), 18 deletions(-) |
| 20 |
|
| 21 |
diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.4.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.4-r1.ebuild |
| 22 |
similarity index 95% |
| 23 |
rename from net-wireless/gnuradio/gnuradio-3.7.13.4.ebuild |
| 24 |
rename to net-wireless/gnuradio/gnuradio-3.7.13.4-r1.ebuild |
| 25 |
index eb3fe3b2645..401a34b7994 100644 |
| 26 |
--- a/net-wireless/gnuradio/gnuradio-3.7.13.4.ebuild |
| 27 |
+++ b/net-wireless/gnuradio/gnuradio-3.7.13.4-r1.ebuild |
| 28 |
@@ -1,4 +1,4 @@ |
| 29 |
-# Copyright 1999-2018 Gentoo Foundation |
| 30 |
+# Copyright 1999-2018 Gentoo Authors |
| 31 |
# Distributed under the terms of the GNU General Public License v2 |
| 32 |
|
| 33 |
EAPI=6 |
| 34 |
@@ -84,7 +84,7 @@ RDEPEND="${PYTHON_DEPS} |
| 35 |
uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] ) |
| 36 |
utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] ) |
| 37 |
vocoder? ( media-sound/gsm |
| 38 |
- >=media-libs/codec2-0.8.1 ) |
| 39 |
+ >=media-libs/codec2-0.8.1 ) |
| 40 |
wavelet? ( |
| 41 |
>=sci-libs/gsl-1.10 |
| 42 |
) |
| 43 |
@@ -121,6 +121,10 @@ src_prepare() { |
| 44 |
epatch "${WORKDIR}"/qt5-maint-00*.patch |
| 45 |
epatch "${WORKDIR}"/codec2-next-00*.patch |
| 46 |
|
| 47 |
+ use !alsa && sed -i 's#version.h#version-nonexistant.h#' cmake/Modules/FindALSA.cmake |
| 48 |
+ use !jack && sed -i 's#jack.h#jack-nonexistant.h#' cmake/Modules/FindJack.cmake |
| 49 |
+ use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistant.h#' cmake/Modules/FindPortaudio.cmake |
| 50 |
+ |
| 51 |
cmake-utils_src_prepare |
| 52 |
} |
| 53 |
|
| 54 |
@@ -220,7 +224,6 @@ pkg_postinst() |
| 55 |
if use grc ; then |
| 56 |
xdg_desktop_database_update |
| 57 |
xdg_mimeinfo_database_update |
| 58 |
- xdg_mime_database_update |
| 59 |
for size in ${GRC_ICON_SIZES} ; do |
| 60 |
xdg-icon-resource install --noupdate --context mimetypes --size ${size} \ |
| 61 |
"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \ |
| 62 |
@@ -240,7 +243,6 @@ pkg_postrm() |
| 63 |
if use grc ; then |
| 64 |
xdg_desktop_database_update |
| 65 |
xdg_mimeinfo_database_update |
| 66 |
- xdg_mime_database_update |
| 67 |
for size in ${GRC_ICON_SIZES} ; do |
| 68 |
xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \ |
| 69 |
application-gnuradio-grc || ewarn "icon uninstall failed" |
| 70 |
|
| 71 |
diff --git a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild |
| 72 |
index ad674115e29..3b3053625af 100644 |
| 73 |
--- a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild |
| 74 |
+++ b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild |
| 75 |
@@ -1,4 +1,4 @@ |
| 76 |
-# Copyright 1999-2018 Gentoo Foundation |
| 77 |
+# Copyright 1999-2018 Gentoo Authors |
| 78 |
# Distributed under the terms of the GNU General Public License v2 |
| 79 |
|
| 80 |
EAPI=6 |
| 81 |
@@ -21,7 +21,7 @@ else |
| 82 |
KEYWORDS="~amd64 ~arm ~x86" |
| 83 |
fi |
| 84 |
if [[ ${PV} == "3.7.9999" ]]; then |
| 85 |
- EGIT_BRANCH="maint" |
| 86 |
+ EGIT_BRANCH="maint-3.7" |
| 87 |
elif [[ ${PV} == "3.8.9999" ]]; then |
| 88 |
EGIT_BRANCH="next" |
| 89 |
fi |
| 90 |
@@ -72,7 +72,8 @@ RDEPEND="${PYTHON_DEPS} |
| 91 |
sdl? ( >=media-libs/libsdl-1.2.0 ) |
| 92 |
uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] ) |
| 93 |
utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] ) |
| 94 |
- vocoder? ( media-sound/gsm ) |
| 95 |
+ vocoder? ( media-sound/gsm |
| 96 |
+ >=media-libs/codec2-0.8.1 ) |
| 97 |
wavelet? ( |
| 98 |
>=sci-libs/gsl-1.10 |
| 99 |
) |
| 100 |
@@ -109,6 +110,11 @@ src_prepare() { |
| 101 |
fi |
| 102 |
# Useless UI element would require qt3support, bug #365019 |
| 103 |
sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die |
| 104 |
+ |
| 105 |
+ use !alsa && sed -i 's#version.h#version-nonexistant.h#' cmake/Modules/FindALSA.cmake |
| 106 |
+ use !jack && sed -i 's#jack.h#jack-nonexistant.h#' cmake/Modules/FindJack.cmake |
| 107 |
+ use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistant.h#' cmake/Modules/FindPortaudio.cmake |
| 108 |
+ |
| 109 |
cmake-utils_src_prepare |
| 110 |
} |
| 111 |
|
| 112 |
@@ -214,7 +220,7 @@ pkg_postinst() |
| 113 |
|
| 114 |
if use grc ; then |
| 115 |
xdg_desktop_database_update |
| 116 |
- xdg_mime_database_update |
| 117 |
+ xdg_mimeinfo_database_update |
| 118 |
for size in ${GRC_ICON_SIZES} ; do |
| 119 |
xdg-icon-resource install --noupdate --context mimetypes --size ${size} \ |
| 120 |
"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \ |
| 121 |
@@ -233,7 +239,7 @@ pkg_postrm() |
| 122 |
|
| 123 |
if use grc ; then |
| 124 |
xdg_desktop_database_update |
| 125 |
- xdg_mime_database_update |
| 126 |
+ xdg_mimeinfo_database_update |
| 127 |
for size in ${GRC_ICON_SIZES} ; do |
| 128 |
xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \ |
| 129 |
application-gnuradio-grc || ewarn "icon uninstall failed" |
| 130 |
|
| 131 |
diff --git a/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild b/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild |
| 132 |
index 8096356bfba..cdc3acd6eeb 100644 |
| 133 |
--- a/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild |
| 134 |
+++ b/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild |
| 135 |
@@ -1,4 +1,4 @@ |
| 136 |
-# Copyright 1999-2018 Gentoo Foundation |
| 137 |
+# Copyright 1999-2018 Gentoo Authors |
| 138 |
# Distributed under the terms of the GNU General Public License v2 |
| 139 |
|
| 140 |
EAPI=6 |
| 141 |
@@ -75,12 +75,15 @@ RDEPEND="${PYTHON_DEPS} |
| 142 |
dev-python/PyQt5[opengl,${PYTHON_USEDEP}] |
| 143 |
dev-qt/qtcore:5 |
| 144 |
dev-qt/qtgui:5 |
| 145 |
+ dev-qt/qtwidgets:5 |
| 146 |
x11-libs/qwt:6[qt5(+)] |
| 147 |
) |
| 148 |
sdl? ( >=media-libs/libsdl-1.2.0 ) |
| 149 |
- uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] ) |
| 150 |
+ uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] |
| 151 |
+ dev-libs/log4cpp ) |
| 152 |
utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] ) |
| 153 |
- vocoder? ( media-sound/gsm ) |
| 154 |
+ vocoder? ( media-sound/gsm |
| 155 |
+ >=media-libs/codec2-0.8.1 ) |
| 156 |
wavelet? ( |
| 157 |
>=sci-libs/gsl-1.10 |
| 158 |
) |
| 159 |
@@ -111,6 +114,11 @@ src_prepare() { |
| 160 |
fi |
| 161 |
# Useless UI element would require qt3support, bug #365019 |
| 162 |
sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die |
| 163 |
+ |
| 164 |
+ use !alsa && sed -i 's#version.h#version-nonexistant.h#' cmake/Modules/FindALSA.cmake |
| 165 |
+ use !jack && sed -i 's#jack.h#jack-nonexistant.h#' cmake/Modules/FindJack.cmake |
| 166 |
+ use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistant.h#' cmake/Modules/FindPortaudio.cmake |
| 167 |
+ |
| 168 |
cmake-utils_src_prepare |
| 169 |
} |
| 170 |
|
| 171 |
@@ -208,7 +216,7 @@ pkg_postinst() |
| 172 |
|
| 173 |
if use grc ; then |
| 174 |
xdg_desktop_database_update |
| 175 |
- xdg_mime_database_update |
| 176 |
+ xdg_mimeinfo_database_update |
| 177 |
for size in ${GRC_ICON_SIZES} ; do |
| 178 |
xdg-icon-resource install --noupdate --context mimetypes --size ${size} \ |
| 179 |
"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \ |
| 180 |
@@ -227,7 +235,7 @@ pkg_postrm() |
| 181 |
|
| 182 |
if use grc ; then |
| 183 |
xdg_desktop_database_update |
| 184 |
- xdg_mime_database_update |
| 185 |
+ xdg_mimeinfo_database_update |
| 186 |
for size in ${GRC_ICON_SIZES} ; do |
| 187 |
xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \ |
| 188 |
application-gnuradio-grc || ewarn "icon uninstall failed" |
| 189 |
|
| 190 |
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild |
| 191 |
index e2920f5cc5f..6d225009790 100644 |
| 192 |
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild |
| 193 |
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild |
| 194 |
@@ -1,4 +1,4 @@ |
| 195 |
-# Copyright 1999-2018 Gentoo Foundation |
| 196 |
+# Copyright 1999-2018 Gentoo Authors |
| 197 |
# Distributed under the terms of the GNU General Public License v2 |
| 198 |
|
| 199 |
EAPI=6 |
| 200 |
@@ -73,7 +73,8 @@ RDEPEND="${PYTHON_DEPS} |
| 201 |
sdl? ( >=media-libs/libsdl-1.2.0 ) |
| 202 |
uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] ) |
| 203 |
utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] ) |
| 204 |
- vocoder? ( media-sound/gsm ) |
| 205 |
+ vocoder? ( media-sound/gsm |
| 206 |
+ >=media-libs/codec2-0.8.1 ) |
| 207 |
wavelet? ( |
| 208 |
>=sci-libs/gsl-1.10 |
| 209 |
) |
| 210 |
@@ -110,6 +111,11 @@ src_prepare() { |
| 211 |
fi |
| 212 |
# Useless UI element would require qt3support, bug #365019 |
| 213 |
sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die |
| 214 |
+ |
| 215 |
+ use !alsa && sed -i 's#version.h#version-nonexistant.h#' cmake/Modules/FindALSA.cmake |
| 216 |
+ use !jack && sed -i 's#jack.h#jack-nonexistant.h#' cmake/Modules/FindJack.cmake |
| 217 |
+ use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistant.h#' cmake/Modules/FindPortaudio.cmake |
| 218 |
+ |
| 219 |
cmake-utils_src_prepare |
| 220 |
} |
| 221 |
|
| 222 |
@@ -215,7 +221,7 @@ pkg_postinst() |
| 223 |
|
| 224 |
if use grc ; then |
| 225 |
xdg_desktop_database_update |
| 226 |
- xdg_mime_database_update |
| 227 |
+ xdg_mimeinfo_database_update |
| 228 |
for size in ${GRC_ICON_SIZES} ; do |
| 229 |
xdg-icon-resource install --noupdate --context mimetypes --size ${size} \ |
| 230 |
"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \ |
| 231 |
@@ -234,7 +240,7 @@ pkg_postrm() |
| 232 |
|
| 233 |
if use grc ; then |
| 234 |
xdg_desktop_database_update |
| 235 |
- xdg_mime_database_update |
| 236 |
+ xdg_mimeinfo_database_update |
| 237 |
for size in ${GRC_ICON_SIZES} ; do |
| 238 |
xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \ |
| 239 |
application-gnuradio-grc || ewarn "icon uninstall failed" |
Archives