Gentoo Archives: gentoo-commits

From: Rick Farina <zerochaos@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/gr-osmosdr/
Date: Fri, 04 Sep 2020 16:22:30
Message-Id: 1599236545.6257bd2dc42efa54fb359281a84314917f6527a1.zerochaos@gentoo
1 commit: 6257bd2dc42efa54fb359281a84314917f6527a1
2 Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 4 16:20:24 2020 +0000
4 Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 4 16:22:25 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6257bd2d
7
8 net-wireless/gr-osmosdr: bug #727330
9
10 accepting fixes from Chris Mayo, thanks!
11
12 Package-Manager: Portage-3.0.5, Repoman-3.0.1
13 Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
14
15 net-wireless/gr-osmosdr/gr-osmosdr-0.2.2.ebuild | 9 ++++++++-
16 1 file changed, 8 insertions(+), 1 deletion(-)
17
18 diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.2.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.2.ebuild
19 index 9c632a04463..af9ebaa516a 100644
20 --- a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.2.ebuild
21 +++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.2.ebuild
22 @@ -38,6 +38,11 @@ DEPEND="${RDEPEND}"
23
24 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
25
26 +src_prepare() {
27 + cmake_src_prepare
28 + sed -i "s:\${GR_DOC_DIR}/\${CMAKE_PROJECT_NAME}:\${GR_DOC_DIR}/${PF}:" CMakeLists.txt || die
29 +}
30 +
31 src_configure() {
32 local mycmakeargs=(
33 -DENABLE_DEFAULT=OFF
34 @@ -63,8 +68,10 @@ src_configure() {
35 src_install() {
36 cmake_src_install
37 if use python; then
38 + # Remove incorrectly byte-compiled Python files and replace
39 + # https://github.com/gnuradio/gnuradio/issues/2944
40 + find "${ED}"/usr/lib* -name "*.py[co]" -exec rm {} \; || die
41 python_fix_shebang "${ED}"/usr/bin
42 python_optimize
43 fi
44 - mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}"
45 }