As I'm trying to enable support for Qt5 in various applications, I come across the case of texmaker-4.4 bundling qtsingleapplication. This now depends unconditionally on Qt4, but should be buildable with just Qt5 as well. Please enable qt5-only support for this package.
Need qtlocked file too. I'll attach patches shortly for review.
Created attachment 392962 [details] qtlockedfile-2.4.1_p20130904-r1.ebuild
Created attachment 392964 [details] qtlockedfile-2.4.1_p20130904-r1.ebuild Drop keywords to match qtcore:5.
Created attachment 392968 [details] qtlockedfile-2.4.1_p20130904-r1.ebuild Install .prf into qt5 mkspecs directory.
Or maybe don't drop keywords... we will unmask USE=qt5 progressively on each arch that has keyworded qt5 packages I guess, no? Can qt4 and qt5 variants be co-installed? Use dodoc -r instead of dohtml.
Created attachment 392972 [details] qtlockedfile-2.4.1_p20130904-r1.ebuild Restore keywords and avoid dohtml.
Created attachment 392974 [details] qtlockedfile5.prf I couldn't find any replacement for QMAKE_INCDIR_QT, so use QT_INSTALL_HEADERS directly.
Created attachment 392976 [details] qtsingleapplication-2.6.1_p20130904-r2.ebuild
Created attachment 392978 [details] qtsingleapplication5.prf
(In reply to Davide Pesavento from comment #5) > Or maybe don't drop keywords... we will unmask USE=qt5 progressively on each > arch that has keyworded qt5 packages I guess, no? > > Use dodoc -r instead of dohtml. Done > Can qt4 and qt5 variants be co-installed? Yep, the library name changes: libQtSolutions_LockedFile -> libQt5Solutions_LockedFile
(In reply to Michael Palimaka (kensington) from comment #7) > Created attachment 392974 [details] > qtlockedfile5.prf > > I couldn't find any replacement for QMAKE_INCDIR_QT, so use > QT_INSTALL_HEADERS directly. Perfect, that's the correct variable. Actually it could be used for qt4 too, but since the last line of the file would be different anyway, there's no point in trying to unify. The qtlockedfile changes look good to me, thanks a lot. (nitpick: no need for a trailing slash in the insinto calls, but feel free to ignore me)
+ 02 Jan 2015; Michael Palimaka <kensington@gentoo.org> + +files/qtlockedfile5.prf, +qtlockedfile-2.4.1_p20130904-r1.ebuild: + Add Qt 5 support wrt bug #534304.
Why eqmake is run on buildlib/buildlib.pro ?
(In reply to Davide Pesavento from comment #13) > Why eqmake is run on buildlib/buildlib.pro ? Right, that was leftover from some out-of-portage testing I was doing. I'll remove it.
The rest for qtsingleapplication looks good, I didn't check the deps on the code but they make sense.
Thanks, all done. + 02 Jan 2015; Michael Palimaka <kensington@gentoo.org> + +files/qtsingleapplication5.prf, + +qtsingleapplication-2.6.1_p20130904-r2.ebuild: + Add Qt 5 support wrt bug #534304.