diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2011-03-08 06:04:44 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2011-03-08 06:04:44 +0000 |
| commit | 12e42832df64f187386c39f7edafc87339c4bb65 (patch) | |
| tree | f1f3f75241008d35c1c9727bbe959408d8438fd2 /x11-libs/qwt | |
| parent | Version bump (bug #357807 by Matt McAdoo and Lars Wendler). Update to EAPI 2 ... (diff) | |
| download | gentoo-2-12e42832df64f187386c39f7edafc87339c4bb65.tar.gz gentoo-2-12e42832df64f187386c39f7edafc87339c4bb65.tar.bz2 gentoo-2-12e42832df64f187386c39f7edafc87339c4bb65.zip | |
Link against lqwt6 instead of lqwt, do not try to install the man pages, which aren't available, #357603
(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs/qwt')
| -rw-r--r-- | x11-libs/qwt/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-libs/qwt/qwt-6.0.0_rc5-r2.ebuild (renamed from x11-libs/qwt/qwt-6.0.0_rc5-r1.ebuild) | 18 |
2 files changed, 22 insertions, 5 deletions
diff --git a/x11-libs/qwt/ChangeLog b/x11-libs/qwt/ChangeLog index 5fbd2144db8a..e13c59ac53b3 100644 --- a/x11-libs/qwt/ChangeLog +++ b/x11-libs/qwt/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-libs/qwt # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.83 2011/03/06 09:10:55 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.84 2011/03/08 06:04:44 jlec Exp $ + +*qwt-6.0.0_rc5-r2 (08 Mar 2011) + + 08 Mar 2011; Justin Lecher <jlec@gentoo.org> -qwt-6.0.0_rc5-r1.ebuild, + +qwt-6.0.0_rc5-r2.ebuild: + Link against lqwt6 instead of lqwt, do not try to install the man pages, + which aren't available, #357603 *qwt-6.0.0_rc5-r1 (06 Mar 2011) diff --git a/x11-libs/qwt/qwt-6.0.0_rc5-r1.ebuild b/x11-libs/qwt/qwt-6.0.0_rc5-r2.ebuild index 03899ba1e533..c638278c3e88 100644 --- a/x11-libs/qwt/qwt-6.0.0_rc5-r1.ebuild +++ b/x11-libs/qwt/qwt-6.0.0_rc5-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.0_rc5-r1.ebuild,v 1.1 2011/03/06 09:10:55 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.0_rc5-r2.ebuild,v 1.1 2011/03/08 06:04:44 jlec Exp $ EAPI="3" @@ -54,8 +54,19 @@ src_prepare() { sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die sed \ -e 's/target doc/target/' \ + -i src/src.pro || die + + # Renaming lib to libqwt6.so to enable slotting + sed \ -e "/^TARGET/s:qwt:qwt6:g" \ -i src/src.pro || die + sed \ + -e '/qtAddLibrary/s:qwt:qwt6:g' \ + -i qwt.prf designer/designer.pro || die + sed \ + -e 's:libqwt:libqwt6:g' \ + -i qwtbuild.pri || die + use svg && echo >> qwtconfig.pri "CONFIG += QwtSvg" cp *.pri examples/ || die } @@ -68,12 +79,11 @@ src_compile() { src_install () { qt4-r2_src_install - insinto /usr/share/doc/${PF} if use doc; then - doman doc/man/*/* || die - doins -r doc/html || die + dohtml -r doc/html/* || die fi if use examples; then + insinto /usr/share/doc/${PF} doins -r examples || die fi } |