some nice fixes courtesy of bug #189921

(Portage version: 2.1.3.6)

5 files changed, 124 insertions, 1 deletions

diff --git a/x11-libs/qwt/ChangeLog b/x11-libs/qwt/ChangeLog
index 79a842e8d901..3501b9a11bce 100644
--- a/x11-libs/qwt/ChangeLog
+++ b/x11-libs/qwt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/qwt
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.44 2007/06/19 18:36:54 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.45 2007/08/23 13:01:00 caleb Exp $
+
+*qwt-5.0.2-r1 (23 Aug 2007)
+*qwt-4.2.0-r2 (23 Aug 2007)
+
+  23 Aug 2007; Caleb Tennis <caleb@gentoo.org> +qwt-4.2.0-r2.ebuild,
+  +qwt-5.0.2-r1.ebuild:
+  some nice fixes courtesy of bug #189921
 
 *qwt-5.0.2 (19 Jun 2007)
 
diff --git a/x11-libs/qwt/files/digest-qwt-4.2.0-r2 b/x11-libs/qwt/files/digest-qwt-4.2.0-r2
new file mode 100644
index 000000000000..5fc0162890ef
--- /dev/null
+++ b/x11-libs/qwt/files/digest-qwt-4.2.0-r2
@@ -0,0 +1,3 @@
+MD5 9c828c9a39a83df5d7fa9630ddf812a4 qwt-4.2.0.tar.bz2 973643
+RMD160 3d0f9ff5201008f3c5f3dc28d5801a3f2b0f30b4 qwt-4.2.0.tar.bz2 973643
+SHA256 726d91ae6bc70049590f9e8e16d5f77f9dc1a7dde18950796703f9c0be9a5a6d qwt-4.2.0.tar.bz2 973643
diff --git a/x11-libs/qwt/files/digest-qwt-5.0.2-r1 b/x11-libs/qwt/files/digest-qwt-5.0.2-r1
new file mode 100644
index 000000000000..69d00e719e93
--- /dev/null
+++ b/x11-libs/qwt/files/digest-qwt-5.0.2-r1
@@ -0,0 +1,3 @@
+MD5 53adbb313c478dd4aae4f1c864a2037e qwt-5.0.2.tar.bz2 1666468
+RMD160 1a80bb31eaa0d1488594507acb022ca268dcc2ce qwt-5.0.2.tar.bz2 1666468
+SHA256 1e09af748c42f70771334db7bad04c3e39cf0f80fe4da993345c366575b2408d qwt-5.0.2.tar.bz2 1666468
diff --git a/x11-libs/qwt/qwt-4.2.0-r2.ebuild b/x11-libs/qwt/qwt-4.2.0-r2.ebuild
new file mode 100644
index 000000000000..57abfdb2ad07
--- /dev/null
+++ b/x11-libs/qwt/qwt-4.2.0-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-4.2.0-r2.ebuild,v 1.1 2007/08/23 13:01:00 caleb Exp $
+
+inherit multilib qt3
+
+SRC_URI="mirror://sourceforge/qwt/${P}.tar.bz2"
+HOMEPAGE="http://qwt.sourceforge.net/"
+DESCRIPTION="2D plotting library for Qt"
+LICENSE="qwt"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+IUSE="doc examples"
+
+DEPEND="$(qt_min_version 3)"
+
+src_compile () {
+	# Remove hardcoded -fno-exceptions from CXXFLAGS
+	find . -type f -name "*.pro" | while read file; do
+		sed -i -e 's/-fno-exceptions//g' ${file} \
+			|| die "sed failed"
+	done
+
+	# Set include path for bundled examples
+	find examples -type f -name "*.pro" | while read file; do
+		echo >> ${file} "INCLUDEPATH += /usr/include/qwt"
+	done
+
+	eqmake3
+	emake || die "emake failed"
+
+	cd designer
+	eqmake3 qwtplugin.pro
+	emake || die "emake designer failed"
+}
+
+src_install () {
+	local QWTVER="${PV}"
+
+	# Library and symlinks
+	dolib.so lib/libqwt.so.${QWTVER} \
+		|| die "dolib libqwt.so.${QWTVER} failed"
+	dosym libqwt.so.${QWTVER} /usr/$(get_libdir)/libqwt.so
+	dosym libqwt.so.${QWTVER} /usr/$(get_libdir)/libqwt.so.${QWTVER%%.*}
+	dosym libqwt.so.${QWTVER} /usr/$(get_libdir)/libqwt.so.${QWTVER%.*}
+
+	# Header files
+	dodir /usr/include/qwt
+	insinto /usr/include/qwt
+	doins include/* || die "headers installation failed"
+
+	# Designer plugin
+	insinto "${QTDIR}"/plugins/designer
+	insopts -m0755
+	doins designer/plugins/designer/libqwtplugin.so \
+		|| die "designer plugin installation failed"
+
+	dodoc CHANGES README
+
+	if use doc; then
+		doman doc/man/man3/* || die "doman failed"
+		dohtml doc/html/* || die "dohtml failed"
+	fi
+
+	if use examples; then
+		cp -pPR examples "${D}"/usr/share/doc/${PF}/
+	fi
+}
diff --git a/x11-libs/qwt/qwt-5.0.2-r1.ebuild b/x11-libs/qwt/qwt-5.0.2-r1.ebuild
new file mode 100644
index 000000000000..4c5d69e5d597
--- /dev/null
+++ b/x11-libs/qwt/qwt-5.0.2-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.0.2-r1.ebuild,v 1.1 2007/08/23 13:01:00 caleb Exp $
+
+inherit multilib qt4
+
+SRC_URI="mirror://sourceforge/qwt/${P}.tar.bz2"
+HOMEPAGE="http://qwt.sourceforge.net/"
+DESCRIPTION="2D plotting library for Qt4"
+LICENSE="qwt"
+KEYWORDS="~amd64 ~x86"
+SLOT="5"
+IUSE="doc svg"
+
+DEPEND="$(qt4_min_version 4)"
+
+src_compile () {
+	# Configuration file
+	qwtconfig="${S}"/qwtconfig.pri
+
+	echo > ${qwtconfig} ""
+	echo >> ${qwtconfig} "target.path = /usr/$(get_libdir)"
+	echo >> ${qwtconfig} "headers.path = /usr/include/qwt5"
+	echo >> ${qwtconfig} "doc.path = /usr/share/doc/${PF}"
+	echo >> ${qwtconfig}
+	echo >> ${qwtconfig} "CONFIG += qt warn_on thread"
+	echo >> ${qwtconfig} "CONFIG += QwtDll QwtPlot QwtWidgets QwtDesigner"
+
+	use svg && echo >> ${qwtconfig} "CONFIG += QwtSVGItem"
+	use doc || echo >> src/src.pro "INSTALLS -= doc"
+
+	# Generates top-level Makefile
+	eqmake4
+
+	# -j1 due to parallel build failures ( bug # 170625 )
+	emake -j1 || die "emake failed"
+}
+
+src_install () {
+	emake INSTALL_ROOT="${D}" install || die "emake install failed"
+	dodoc CHANGES README
+}