Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 430348 - net-wireless/gnuradio-3.6.1-r1 USE="doc" - some documentation is installed outside /usr/share/doc/${PF}
Summary: net-wireless/gnuradio-3.6.1-r1 USE="doc" - some documentation is installed ou...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: New packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Radio Herd
URL:
Whiteboard:
Keywords: PATCH
Depends on:
Blocks:
 
Reported: 2012-08-07 19:50 UTC by Chris Mayo
Modified: 2016-01-05 03:01 UTC (History)
4 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
Patch to ebuild (gnuradio-3.6.1-r1.ebuild-doc.patch,1.16 KB, patch)
2012-08-07 19:50 UTC, Chris Mayo
Details | Diff
Allow GR_PKG_DOC_DIR to be defined by cmake (gnuradio-3.7.7.1-docdir.patch,586 bytes, patch)
2015-07-20 18:19 UTC, Chris Mayo
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Chris Mayo 2012-08-07 19:50:40 UTC
Created attachment 320646 [details, diff]
Patch to ebuild

As noted in the gnuradio-3.6.1-r1 ebuild.

Attached patch fixes this for me and:
- doesn't compress examples
- doesn't install xml version of docs (which also got compressed)


Tested with USE="doc examples".
Comment 1 Chí-Thanh Christopher Nguyễn gentoo-dev 2012-08-07 21:33:16 UTC
I'd prefer something that could be upstreamed eventually. Which would probably mean to set the documentation via cmake parameter.
Comment 2 Chris Reffett gentoo-dev Security 2012-08-13 23:02:49 UTC
Would passing -DGR_PKG_DOC_DIR=${GR_DOC_DIR}/${CMAKE_PROJECT_NAME}-${PVF} work? Or maybe not quite that, the intent is to have portage expand PVF but leave the other two variables alone.
Comment 3 Rick Farina (Zero_Chaos) gentoo-dev 2015-07-10 19:32:24 UTC
kinda pathetic that it took me this long to get to testing this, but meh, doc location bug.

turns out proper quoting is our friend

-DGR_PKG_DOC_DIR='${GR_DOC_DIR}/${CMAKE_PROJECT_NAME}'-"${PVF}"

thanks Chris
Comment 4 Chris Mayo 2015-07-20 18:19:18 UTC
Created attachment 407286 [details, diff]
Allow GR_PKG_DOC_DIR to be defined by cmake

Doesn't seem to work for me, testing with USE="-doc examples":

$ ls /usr/share/doc/gnuradio-3.7.7*
/usr/share/doc/gnuradio-3.7.7:
README.analog.bz2  README.blocks.bz2  README.digital.bz2  README.filter.bz2   README.qtgui.bz2
README.audio.bz2   README.bz2         README.fft.bz2      README.hacking.bz2

/usr/share/doc/gnuradio-3.7.7.1:
examples  README.building-boost.bz2  README.bz2  README.hacking.bz2


GR_PKG_DOC_DIR is set by ./CMakeLists.txt, overwriting any value defined by cmake. Attached patch changes that (easy to use thanks to epatch_user).


But with the patch:
$ qlist gnuradio | grep README
/usr/-/README
/usr/-/README.hacking
/usr/-/README.blocks
/usr/-/README.fft
/usr/-/README.filter
/usr/-/README.analog
/usr/-/README.digital
/usr/-/README.audio
/usr/-/README.qtgui
/usr/share/gnuradio/modtool/gr-newmod/examples/README
/usr/share/gnuradio/modtool/gr-newmod/docs/README.howto
/usr/share/doc/gnuradio-3.7.7.1/examples/mp-sched/README
/usr/share/doc/gnuradio-3.7.7.1/examples/volk_benchmark/README.bz2
/usr/share/doc/gnuradio-3.7.7.1/README.hacking.bz2
/usr/share/doc/gnuradio-3.7.7.1/README.building-boost.bz2
/usr/share/doc/gnuradio-3.7.7.1/README.bz2

${GR_DOC_DIR}/${CMAKE_PROJECT_NAME} doesn't get expanded, and ${PVF} doesn't exist?

-DGR_PKG_DOC_DIR="${EPREFIX}"/usr/share/doc/"${PF}" does work for me.

It appears the patch will be unnecessary with 3.7.8 (August 8):
http://gnuradio.org/redmine/projects/gnuradio/repository/revisions/cb191889f691d27c0e3cf4a04ecc1c2ad3ea1c27/
Comment 5 Rick Farina (Zero_Chaos) gentoo-dev 2016-01-04 20:44:45 UTC
pretty confident that it's the opposite of better:

zero@gato ~ % qlist gnuradio | grep README
/usr/share/doc/gnuradio-3.7.9/README.building-boost.bz2
/usr/share/doc/gnuradio-3.7.9/README.bz2
/usr/share/doc/gnuradio-3.7.9/README.hacking.bz2
/usr/share/gnuradio/modtool/gr-newmod/docs/README.howto
/usr/share/gnuradio/modtool/gr-newmod/examples/README
/var/tmp/portage/net-wireless/gnuradio-3.7.9/work/gnuradio-3.7.9_build/-/README
/var/tmp/portage/net-wireless/gnuradio-3.7.9/work/gnuradio-3.7.9_build/-/README.analog
/var/tmp/portage/net-wireless/gnuradio-3.7.9/work/gnuradio-3.7.9_build/-/README.audio
/var/tmp/portage/net-wireless/gnuradio-3.7.9/work/gnuradio-3.7.9_build/-/README.blocks
/var/tmp/portage/net-wireless/gnuradio-3.7.9/work/gnuradio-3.7.9_build/-/README.channels
/var/tmp/portage/net-wireless/gnuradio-3.7.9/work/gnuradio-3.7.9_build/-/README.digital
/var/tmp/portage/net-wireless/gnuradio-3.7.9/work/gnuradio-3.7.9_build/-/README.dtv
/var/tmp/portage/net-wireless/gnuradio-3.7.9/work/gnuradio-3.7.9_build/-/README.fcd
/var/tmp/portage/net-wireless/gnuradio-3.7.9/work/gnuradio-3.7.9_build/-/README.fec
/var/tmp/portage/net-wireless/gnuradio-3.7.9/work/gnuradio-3.7.9_build/-/README.fft
/var/tmp/portage/net-wireless/gnuradio-3.7.9/work/gnuradio-3.7.9_build/-/README.filter
/var/tmp/portage/net-wireless/gnuradio-3.7.9/work/gnuradio-3.7.9_build/-/README.hacking
/var/tmp/portage/net-wireless/gnuradio-3.7.9/work/gnuradio-3.7.9_build/-/README.qtgui
/var/tmp/portage/net-wireless/gnuradio-3.7.9/work/gnuradio-3.7.9_build/-/README.uhd
Comment 6 Rick Farina (Zero_Chaos) gentoo-dev 2016-01-05 03:01:20 UTC
+	sed -i "s:\${DOCVER}:${PVR}:" CMakeLists.txt || die

Not really sure that this line is needed so I'm not using it.  Please let me know if I'm entirely mistaken.