[gentoo-dev] Re: [gentoo-commits] gentoo-x86 commit in x11-libs/qt-opengl: qt-opengl-4.4.0_rc1.ebuild metadata.xml ChangeLog Manifest

[Donnie Berkholz]

On 16:33 Thu 20 Dec     , Caleb Tennis (caleb) wrote:
> Revision  Changes    Path
> 1.1                  x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild
>
> file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild?rev=1.1&view=markup
> plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild?rev=1.1&content-type=text/plain

> RDEPEND="=x11-libs/qt-4.4.0_rc1
> 	( virtual/opengl virtual/glu )"

Did you autogenerate these ebuilds? It looks like the deps were pulled 
out of a conditional in the original qt.

> pkg_setup() {
> 	QTBASEDIR=/usr/$(get_libdir)/qt4
> 	QTPREFIXDIR=/usr
> 	QTBINDIR=/usr/bin
> 	QTLIBDIR=/usr/$(get_libdir)/qt4
> 	QTPCDIR=/usr/$(get_libdir)/pkgconfig
> 	QTDATADIR=/usr/share/qt4
> 	QTDOCDIR=/usr/share/doc/${PF}
> 	QTHEADERDIR=/usr/include/qt4
> 	QTPLUGINDIR=${QTLIBDIR}/plugins
> 	QTSYSCONFDIR=/etc/qt4
> 	QTTRANSDIR=${QTDATADIR}/translations
> 	QTEXAMPLESDIR=${QTDATADIR}/examples
> 	QTDEMOSDIR=${QTDATADIR}/demos
> }

I've seen this in all of the split qt ebuilds. Should it go in the eclass?

> src_compile() {
> 	export PATH="${S}/bin:${PATH}"
> 	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
>
> 	[ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"
>
> 	# Disable visibility explicitly if gcc version isn't 4
> 	if [[ "$(gcc-major-version)" != "4" ]]; then

To future-proof, might want to check for -ge 4 instead.

> src_install() {
> 	export PATH="${S}/bin:${PATH}"
> 	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"

Why do you need to do this again? It should've been saved from the last 
phase.

> pkg_postinst()
> {
> 	# Need to add opengl to QT_CONFIG line
> 	sed -i -e "s:opengl ::g" ${QTDATADIR}/mkspecs/qconfig.pri
> 	sed -i -e "s:QT_CONFIG += :QT_CONFIG += opengl :g" ${QTDATADIR}/mkspecs/qconfig.pri
> }
>
> pkg_postrm()
> {
> 	# Need to add opengl to QT_CONFIG line
> 	sed -i -e "s:opengl ::g" ${QTDATADIR}/mkspecs/qconfig.pri
> }

The postrm comment doesn't match the action.

Thanks,
Donnie
-- 
gentoo-dev@g.o mailing list