jlec 14/12/24 09:46:26 Modified: ChangeLog qwt-6.1.2.ebuild Log: x11-libs/qwt: Add opengl support; fix wrong lib location in pc file, #523490 (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path 1.135 x11-libs/qwt/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/ChangeLog?rev=1.135&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/ChangeLog?rev=1.135&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/ChangeLog?r1=1.134&r2=1.135 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v retrieving revision 1.134 retrieving revision 1.135 diff -u -r1.134 -r1.135 --- ChangeLog 21 Dec 2014 15:35:49 -0000 1.134 +++ ChangeLog 24 Dec 2014 09:46:26 -0000 1.135 @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qwt # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.134 2014/12/21 15:35:49 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.135 2014/12/24 09:46:26 jlec Exp $ + + 24 Dec 2014; Justin Lecher <[email protected]> qwt-6.1.2.ebuild, + files/qwt-6.1.1-pc-destdir.patch: + Add opengl support; fix wrong lib location in pc file, #523490 *qwt-6.1.2 (21 Dec 2014) 1.2 x11-libs/qwt/qwt-6.1.2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-6.1.2.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-6.1.2.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-6.1.2.ebuild?r1=1.1&r2=1.2 Index: qwt-6.1.2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.1.2.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qwt-6.1.2.ebuild 21 Dec 2014 15:35:49 -0000 1.1 +++ qwt-6.1.2.ebuild 24 Dec 2014 09:46:26 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.1.2.ebuild,v 1.1 2014/12/21 15:35:49 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.1.2.ebuild,v 1.2 2014/12/24 09:46:26 jlec Exp $ EAPI=5 @@ -15,7 +15,7 @@ LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" SLOT="6" -IUSE="doc examples mathml static-libs svg" +IUSE="doc examples mathml opengl static-libs svg" DEPEND=" !<x11-libs/qwt-5.2.3 @@ -23,6 +23,7 @@ dev-qt/qtcore:4 dev-qt/qtgui:4 doc? ( !<media-libs/coin-3.1.3[doc] ) + opengl? ( virtual/opengl ) svg? ( dev-qt/qtsvg:4 )" RDEPEND="${DEPEND}" @@ -48,6 +49,7 @@ EOF use mathml && echo "QWT_CONFIG += QwtMathML" >> qwtconfig.pri + use opengl && echo "QWT_CONFIG += QwtOpenGL" >> qwtconfig.pri use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri cat > qwtbuild.pri <<-EOF @@ -101,6 +103,10 @@ rm -f doc/man/*/{_,deprecated}* || die multibuild_foreach_variant run_in_build_dir qt4-r2_src_install + sed \ + -e "s: -L${WORKDIR}.* -lqwt6: -lqwt6:g" \ + -i "${ED}"/usr/$(get_libdir)/pkgconfig/qwtmathml.pc || die + use doc && dohtml -r doc/html/* if use examples; then
