jlec 14/12/21 15:35:49 Modified: ChangeLog qwt-6.1.1.ebuild Added: qwt-6.1.2.ebuild Log: x11-libs/qwt: Version BUmp; fix location of pc files, #523490 (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path 1.134 x11-libs/qwt/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/ChangeLog?rev=1.134&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/ChangeLog?rev=1.134&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/ChangeLog?r1=1.133&r2=1.134 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v retrieving revision 1.133 retrieving revision 1.134 diff -u -r1.133 -r1.134 --- ChangeLog 17 Dec 2014 18:00:19 -0000 1.133 +++ ChangeLog 21 Dec 2014 15:35:49 -0000 1.134 @@ -1,6 +1,12 @@ # 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.133 2014/12/17 18:00:19 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.134 2014/12/21 15:35:49 jlec Exp $ + +*qwt-6.1.2 (21 Dec 2014) + + 21 Dec 2014; Justin Lecher <[email protected]> qwt-6.1.1.ebuild, + +qwt-6.1.2.ebuild, +files/qwt-6.1.1-pc-destdir.patch: + Version BUmp; fix location of pc files, #523490 17 Dec 2014; Michael Palimaka <[email protected]> qwt-6.1.0.ebuild, qwt-6.1.1.ebuild: 1.5 x11-libs/qwt/qwt-6.1.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-6.1.1.ebuild?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-6.1.1.ebuild?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-6.1.1.ebuild?r1=1.4&r2=1.5 Index: qwt-6.1.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.1.1.ebuild,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- qwt-6.1.1.ebuild 17 Dec 2014 18:00:19 -0000 1.4 +++ qwt-6.1.1.ebuild 21 Dec 2014 15:35:49 -0000 1.5 @@ -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.1.ebuild,v 1.4 2014/12/17 18:00:19 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.1.1.ebuild,v 1.5 2014/12/21 15:35:49 jlec Exp $ EAPI=5 @@ -30,7 +30,10 @@ DOCS="README" -PATCHES=( "${FILESDIR}"/${PN}-6.0.2-invalid-read.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-6.0.2-invalid-read.patch + "${FILESDIR}"/${P}-pc-destdir.patch + ) src_prepare() { cat > qwtconfig.pri <<-EOF 1.1 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.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-6.1.2.ebuild?rev=1.1&content-type=text/plain Index: qwt-6.1.2.ebuild =================================================================== # 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 $ EAPI=5 inherit eutils multibuild 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 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" DEPEND=" !<x11-libs/qwt-5.2.3 dev-qt/designer:4 dev-qt/qtcore:4 dev-qt/qtgui:4 doc? ( !<media-libs/coin-3.1.3[doc] ) svg? ( dev-qt/qtsvg:4 )" RDEPEND="${DEPEND}" S="${WORKDIR}"/${MY_P} DOCS="README" PATCHES=( "${FILESDIR}"/${PN}-6.0.2-invalid-read.patch "${FILESDIR}"/${PN}-6.1.1-pc-destdir.patch ) src_prepare() { cat > 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 += QwtPlot QwtWidgets QwtDesigner QwtPkgConfig VERSION = ${PV/_*} QWT_VERSION = ${PV/_*} QWT_INSTALL_PLUGINS = "${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer" QWT_INSTALL_FEATURES = "${EPREFIX}/usr/share/qt4/mkspecs/features" EOF use mathml && echo "QWT_CONFIG += QwtMathML" >> qwtconfig.pri use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri cat > qwtbuild.pri <<-EOF QWT_CONFIG += qt warn_on thread release no_keywords EOF sed \ -e 's/target doc/target/' \ -e "/^TARGET/s:(qwt):(qwt6):g" \ -i src/src.pro || die sed \ -e '/qwtAddLibrary/s:qwt):qwt6):g' \ -i qwt.prf designer/designer.pro examples/examples.pri \ textengines/mathml/qwtmathml.prf textengines/textengines.pri \ designer/designer.pro || die MULTIBUILD_VARIANTS=( ) use static-libs && MULTIBUILD_VARIANTS+=( static ) MULTIBUILD_VARIANTS+=( shared ) qt4-r2_src_prepare multibuild_copy_sources preparation() { [[ ${MULTIBUILD_VARIANT} == shared ]] && \ echo "QWT_CONFIG += QwtDll" >> "${BUILD_DIR}"/qwtconfig.pri } multibuild_foreach_variant preparation } src_configure() { multibuild_parallel_foreach_variant run_in_build_dir qt4-r2_src_configure } src_compile() { multibuild_foreach_variant run_in_build_dir qt4-r2_src_compile } src_test() { testing() { cd examples || die eqmake4 examples.pro emake } multibuild_foreach_variant run_in_build_dir testing } src_install () { rm -f doc/man/*/{_,deprecated}* || die multibuild_foreach_variant run_in_build_dir qt4-r2_src_install use doc && dohtml -r doc/html/* if use examples; then # 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 += -lqwt6 EOF sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die cp *.pri examples/ || die insinto /usr/share/${PN}6 doins -r examples fi }
