From c58d0a0adfc6f7d1c37c969a382b9d3aa484eca6 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Fri, 31 Aug 2012 06:51:31 +0000 Subject: x11-libs/qwt: Fix svg support, #421559 (Portage version: 2.2.0_alpha123/cvs/Linux x86_64) --- x11-libs/qwt/ChangeLog | 8 +++- x11-libs/qwt/qwt-6.0.0.ebuild | 4 +- x11-libs/qwt/qwt-6.0.1-r1.ebuild | 89 ++++++++++++++++++++++++++++++++++++++++ x11-libs/qwt/qwt-6.0.1.ebuild | 6 +-- 4 files changed, 101 insertions(+), 6 deletions(-) create mode 100644 x11-libs/qwt/qwt-6.0.1-r1.ebuild (limited to 'x11-libs/qwt') diff --git a/x11-libs/qwt/ChangeLog b/x11-libs/qwt/ChangeLog index 320475e2fd41..aeb9484b9108 100644 --- a/x11-libs/qwt/ChangeLog +++ b/x11-libs/qwt/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/qwt # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.101 2012/03/04 07:33:44 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.102 2012/08/31 06:51:31 jlec Exp $ + +*qwt-6.0.1-r1 (31 Aug 2012) + + 31 Aug 2012; Justin Lecher qwt-6.0.0.ebuild, + qwt-6.0.1.ebuild, +qwt-6.0.1-r1.ebuild: + Fix svg support, #421559 04 Mar 2012; Justin Lecher -qwt-5.2.0.ebuild, metadata.xml: Clean old diff --git a/x11-libs/qwt/qwt-6.0.0.ebuild b/x11-libs/qwt/qwt-6.0.0.ebuild index 29589b5d2010..e97e151eab68 100644 --- a/x11-libs/qwt/qwt-6.0.0.ebuild +++ b/x11-libs/qwt/qwt-6.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.ebuild,v 1.8 2012/03/03 15:56:35 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.0.ebuild,v 1.9 2012/08/31 06:51:31 jlec Exp $ EAPI=4 @@ -67,7 +67,7 @@ src_prepare() { -e 's:libqwt:libqwt6:g' \ -i qwtbuild.pri || die - use svg && echo >> qwtconfig.pri "CONFIG += QwtSvg" + use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri cp *.pri examples/ || die } diff --git a/x11-libs/qwt/qwt-6.0.1-r1.ebuild b/x11-libs/qwt/qwt-6.0.1-r1.ebuild new file mode 100644 index 000000000000..b9a4ed550a8b --- /dev/null +++ b/x11-libs/qwt/qwt-6.0.1-r1.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.1-r1.ebuild,v 1.1 2012/08/31 06:51:31 jlec Exp $ + +EAPI=4 + +inherit eutils qt4-r2 + +MY_P="${PN}-${PV/_/-}" + +DESCRIPTION="2D plotting library for Qt4" +HOMEPAGE="http://qwt.sourceforge.net/" +SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${MY_P}.tar.bz2" + +LICENSE="qwt" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos" +SLOT="6" +IUSE="doc examples svg" + +DEPEND=" + x11-libs/qt-gui:4 + doc? ( ! qwtconfig.pri <<-EOF + QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)" + QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6" + QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}" + QWT_CONFIG += QwtDll QwtPlot QwtWidgets QwtDesigner + VERSION = ${PV/_*} + QWT_INSTALL_PLUGINS = "${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer6" + QWT_INSTALL_FEATURES = "${EPREFIX}/usr/$(get_libdir)/qt4/features6" + EOF + + cat > qwtbuild.pri <<-EOF + QWT_CONFIG += qt warn_on thread release no_keywords + EOF + + # don't build examples - fix the qt files to build once installed + cat > examples/examples.pri <<-EOF + include( qwtconfig.pri ) + TEMPLATE = app + MOC_DIR = moc + INCLUDEPATH += "${EPREFIX}/usr/include/qwt6" + DEPENDPATH += "${EPREFIX}/usr/include/qwt6" + LIBS += -lqwt + EOF + 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 "QWT_CONFIG += QwtSvg" >> qwtconfig.pri + cp *.pri examples/ || die +} + +src_compile() { + # split compilation to allow parallel building + emake sub-src + emake +} + +src_install () { + qt4-r2_src_install + if use doc; then + dohtml -r doc/html/* + fi + if use examples; then + insinto /usr/share/doc/${PF} + doins -r examples + fi +} diff --git a/x11-libs/qwt/qwt-6.0.1.ebuild b/x11-libs/qwt/qwt-6.0.1.ebuild index 92567e427c10..80879441072e 100644 --- a/x11-libs/qwt/qwt-6.0.1.ebuild +++ b/x11-libs/qwt/qwt-6.0.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.1.ebuild,v 1.2 2011/12/21 15:45:53 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.1.ebuild,v 1.3 2012/08/31 06:51:31 jlec Exp $ EAPI=4 @@ -67,7 +67,7 @@ src_prepare() { -e 's:libqwt:libqwt6:g' \ -i qwtbuild.pri || die - use svg && echo >> qwtconfig.pri "CONFIG += QwtSvg" + use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri cp *.pri examples/ || die } -- cgit v1.2.3-65-gdbad