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!)

4 files changed, 148 insertions, 3 deletions

diff --git a/x11-libs/qwt/ChangeLog b/x11-libs/qwt/ChangeLog
index 7b860c9503ec..6fc59d01f716 100644
--- a/x11-libs/qwt/ChangeLog
+++ b/x11-libs/qwt/ChangeLog
@@ -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 <jlec@gentoo.org> 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 <kensington@gentoo.org> qwt-6.1.0.ebuild,
   qwt-6.1.1.ebuild:
diff --git a/x11-libs/qwt/files/qwt-6.1.1-pc-destdir.patch b/x11-libs/qwt/files/qwt-6.1.1-pc-destdir.patch
new file mode 100644
index 000000000000..7b3dcef99299
--- /dev/null
+++ b/x11-libs/qwt/files/qwt-6.1.1-pc-destdir.patch
@@ -0,0 +1,15 @@
+ qwt-6.1.2/textengines/mathml/mathml.pro | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/qwt-6.1.2/textengines/mathml/mathml.pro b/qwt-6.1.2/textengines/mathml/mathml.pro
+index 7032366..b1372f7 100644
+--- a/qwt-6.1.2/textengines/mathml/mathml.pro
++++ b/qwt-6.1.2/textengines/mathml/mathml.pro
+@@ -63,6 +63,7 @@ contains(QWT_CONFIG, QwtPkgConfig) {
+ 
+     # QMAKE_PKGCONFIG_DESTDIR is buggy, in combination
+     # with including pri files: better don't use it
++    QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+ 
+     greaterThan(QT_MAJOR_VERSION, 4) {
+ 
diff --git a/x11-libs/qwt/qwt-6.1.1.ebuild b/x11-libs/qwt/qwt-6.1.1.ebuild
index 2b75df6af5cf..f4cf786a79eb 100644
--- a/x11-libs/qwt/qwt-6.1.1.ebuild
+++ b/x11-libs/qwt/qwt-6.1.1.ebuild
@@ -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 @@ S="${WORKDIR}"/${MY_P}
 
 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
diff --git a/x11-libs/qwt/qwt-6.1.2.ebuild b/x11-libs/qwt/qwt-6.1.2.ebuild
new file mode 100644
index 000000000000..31fd9ec907dc
--- /dev/null
+++ b/x11-libs/qwt/qwt-6.1.2.ebuild
@@ -0,0 +1,121 @@
+# 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
+}