x11-libs/qwt: Fix installation location for designer and plugin stuff, #460256; add static-libs support, #260324

(Portage version: 2.2.0_alpha165/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

4 files changed, 245 insertions, 1 deletions

diff --git a/x11-libs/qwt/ChangeLog b/x11-libs/qwt/ChangeLog
index 3164b9339a60..75f605d50bf0 100644
--- a/x11-libs/qwt/ChangeLog
+++ b/x11-libs/qwt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/qwt
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.106 2013/03/04 18:30:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.107 2013/03/05 12:56:06 jlec Exp $
+
+*qwt-6.0.2-r1 (05 Mar 2013)
+*qwt-5.2.3-r1 (05 Mar 2013)
+
+  05 Mar 2013; Justin Lecher <jlec@gentoo.org> +qwt-5.2.3-r1.ebuild,
+  +files/qwt-5.2.3-install_qt.patch, +qwt-6.0.2-r1.ebuild:
+  Fix installation location for designer and plugin stuff, #460256; add
+  static-libs support, #260324
 
 *qwt-5.2.3 (04 Mar 2013)
 
diff --git a/x11-libs/qwt/files/qwt-5.2.3-install_qt.patch b/x11-libs/qwt/files/qwt-5.2.3-install_qt.patch
new file mode 100644
index 000000000000..48e9385811f8
--- /dev/null
+++ b/x11-libs/qwt/files/qwt-5.2.3-install_qt.patch
@@ -0,0 +1,28 @@
+diff -up qwt-5.2.2/designer/designer.pro.install_qt qwt-5.2.2/designer/designer.pro
+--- qwt-5.2.2/designer/designer.pro.install_qt	2011-08-01 04:28:22.000000000 -0500
++++ qwt-5.2.2/designer/designer.pro	2012-08-14 11:11:22.569229749 -0500
+@@ -36,6 +37,7 @@ contains(CONFIG, QwtDesigner) {
+         else {
+             SUFFIX_STR = $${RELEASE_SUFFIX}
+         }
++        LIBNAME         = qwt$${SUFFIX_STR}
+     }
+ 
+     TEMPLATE        = lib
+@@ -45,7 +47,6 @@ contains(CONFIG, QwtDesigner) {
+     INCLUDEPATH    += $${QWT_ROOT}/src 
+     DEPENDPATH     += $${QWT_ROOT}/src 
+ 
+-    LIBNAME         = qwt$${SUFFIX_STR}
+     contains(CONFIG, QwtDll) {
+         win32 {
+             DEFINES += QT_DLL QWT_DLL
+@@ -103,7 +104,7 @@ contains(CONFIG, QwtDesigner) {
+ 
+         # Qt 4
+ 
+-        TARGET    = qwt_designer_plugin$${SUFFIX_STR}
++        TARGET    = qwt5_designer_plugin$${SUFFIX_STR}
+         CONFIG    += qt designer plugin 
+ 
+         RCC_DIR   = resources
diff --git a/x11-libs/qwt/qwt-5.2.3-r1.ebuild b/x11-libs/qwt/qwt-5.2.3-r1.ebuild
new file mode 100644
index 000000000000..32ece9b5695b
--- /dev/null
+++ b/x11-libs/qwt/qwt-5.2.3-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.2.3-r1.ebuild,v 1.1 2013/03/05 12:56:06 jlec Exp $
+
+EAPI=5
+
+inherit eutils qt4-r2
+
+DESCRIPTION="2D plotting library for Qt4"
+HOMEPAGE="http://qwt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="qwt"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos"
+SLOT="5"
+IUSE="doc examples static-libs svg"
+
+DEPEND="
+	dev-qt/qtgui:4
+	doc? ( !<media-libs/coin-3.1.3[doc] )
+	svg? ( dev-qt/qtsvg:4 )"
+RDEPEND="${DEPEND}"
+
+DOCS="CHANGES README"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-install_qt.patch
+	sed -e "/QwtVersion/s:5.2.2.:${PV}:g" -i ${PN}.prf || die
+
+	cat > qwtconfig.pri <<-EOF
+		target.path = "${EPREFIX}/usr/$(get_libdir)"
+		headers.path = "${EPREFIX}/usr/include/qwt5"
+		doc.path = "${EPREFIX}/usr/share/doc/${PF}"
+		CONFIG += qt warn_on thread release
+		CONFIG += QwtDll
+		CONFIG += QwtPlot QwtWidgets QwtDesigner
+		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
+	sed -i -e 's/headers doc/headers/' src/src.pro || die
+	use svg && echo >> qwtconfig.pri "CONFIG += QwtSVGItem"
+}
+
+src_compile() {
+	building() {
+		# split compilation to allow parallel building
+		emake sub-src
+		emake
+	}
+	building
+
+	if use static-libs; then
+		sed "/QwtDll/d" -i qwtconfig.pri || die
+		eqmake4
+		building
+		echo "CONFIG += QwtDll" >> qwtconfig.pri || die
+	fi
+}
+
+src_test() {
+	cd examples || die
+	eqmake4 examples.pro
+	emake
+}
+
+src_install () {
+	qt4-r2_src_install
+
+	use static-libs && dolib.a lib/libqwt.a
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		rm doc/man/*/*license*
+		doman doc/man/*/*
+		doins -r doc/html
+	fi
+	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/qwt5"
+			DEPENDPATH  += "${EPREFIX}/usr/include/qwt5"
+			LIBS        += -lqwt
+		EOF
+		sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
+		cp *.pri examples/ || die
+		doins -r examples
+	fi
+}
diff --git a/x11-libs/qwt/qwt-6.0.2-r1.ebuild b/x11-libs/qwt/qwt-6.0.2-r1.ebuild
new file mode 100644
index 000000000000..6e5ecb0089ba
--- /dev/null
+++ b/x11-libs/qwt/qwt-6.0.2-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.2-r1.ebuild,v 1.1 2013/03/05 12:56:06 jlec Exp $
+
+EAPI=5
+
+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 mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+SLOT="6"
+IUSE="doc examples mathml static-libs svg"
+
+DEPEND="
+	dev-qt/qtgui:4
+	doc? ( !<media-libs/coin-3.1.3[doc] )
+	svg? ( dev-qt/qtsvg:4 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+DOCS="CHANGES README"
+
+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 += QwtDll QwtPlot QwtWidgets QwtDesigner
+		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
+	if use mathml; then
+		cat >> qwtconfig.pri <<-EOF
+			QWT_CONFIG += QwtMathML
+		EOF
+	fi
+	cat > qwtbuild.pri <<-EOF
+		QWT_CONFIG += qt warn_on thread release no_keywords
+	EOF
+
+	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 '/qwtAddLibrary/s:(qwt):(qwt6):g' \
+		-i qwt.prf designer/designer.pro examples/examples.pri \
+		textengines/mathml/qwtmathml.prf textengines/textengines.pri || die
+	sed \
+		-e 's:libqwt:libqwt6:g' \
+		-i qwtbuild.pri || die
+
+	use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
+
+	epatch "${FILESDIR}/${PN}-6.0.2-invalid-read.patch"
+}
+
+src_compile() {
+	building() {
+		# split compilation to allow parallel building
+		emake sub-src
+		emake
+	}
+	building
+
+	if use static-libs; then
+		sed "/QwtDll/d" -i qwtconfig.pri || die
+		eqmake4
+		building
+		echo "CONFIG += QwtDll" >> qwtconfig.pri || die
+	fi
+}
+
+src_test() {
+	cd examples || die
+	eqmake4 examples.pro
+	emake
+}
+
+src_install () {
+	qt4-r2_src_install
+
+	use static-libs && dolib.a lib/libqwt.a
+
+	if use doc; then
+		dohtml -r doc/html/*
+	fi
+	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
+		doins -r examples
+	fi
+}