some nice fixes courtesy of bug #189921

Package-Manager: portage-2.1.3.6

6 files changed, 142 insertions, 5 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/Manifest b/x11-libs/qwt/Manifest
index a6cbc56cb577..6aba9586b8bf 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -6,6 +6,10 @@ EBUILD qwt-4.2.0-r1.ebuild 1588 RMD160 7e05ee66ddc374130ed184189de005c94b94b615
 MD5 98bf5eeb0e4622241aa5b9aaed1dea80 qwt-4.2.0-r1.ebuild 1588
 RMD160 7e05ee66ddc374130ed184189de005c94b94b615 qwt-4.2.0-r1.ebuild 1588
 SHA256 6e2d7e10e37fd38c30a1aba5a528e01a8d9a135d79c7301fb517b16636a16bb1 qwt-4.2.0-r1.ebuild 1588
+EBUILD qwt-4.2.0-r2.ebuild 1790 RMD160 2045edf907d088ab3391f202d99d4cdc59291416 SHA1 75a00652d557e8fbb1fe8596dae0c8dd3b3500d4 SHA256 ef9a3df4f0a09872e3b5f38423506cdf3144b8e96f5bf9ec616d8e00ca5f3b89
+MD5 875ee7a622f22af2f29487328084d7fd qwt-4.2.0-r2.ebuild 1790
+RMD160 2045edf907d088ab3391f202d99d4cdc59291416 qwt-4.2.0-r2.ebuild 1790
+SHA256 ef9a3df4f0a09872e3b5f38423506cdf3144b8e96f5bf9ec616d8e00ca5f3b89 qwt-4.2.0-r2.ebuild 1790
 EBUILD qwt-4.2.0.ebuild 1536 RMD160 52906808b4a5f849109e87a77bf75aed27a051cc SHA1 d732be95b231b0c9796b4b251b6e31c7502bb513 SHA256 2fb40ba1f1d3ecb8444e0366c298531fa2bc6bab63786f764b20ff7514b29360
 MD5 334a5ab200ac3b4363ab8333b75edb6e qwt-4.2.0.ebuild 1536
 RMD160 52906808b4a5f849109e87a77bf75aed27a051cc qwt-4.2.0.ebuild 1536
@@ -18,14 +22,18 @@ EBUILD qwt-5.0.1.ebuild 1547 RMD160 6982804923a6467feb0267da147bf4bfed2738e1 SHA
 MD5 428cdffbb2893973bd1540ff0b837058 qwt-5.0.1.ebuild 1547
 RMD160 6982804923a6467feb0267da147bf4bfed2738e1 qwt-5.0.1.ebuild 1547
 SHA256 529497942c050434d6ede8b089fbac82b30e9758718605318d9eb5c73eeb052b qwt-5.0.1.ebuild 1547
+EBUILD qwt-5.0.2-r1.ebuild 1217 RMD160 77989587df4672d53727e095b20b5d16701b5bc1 SHA1 f878cd0387bcacc29e4ef6db7ad34e9e7dbbf459 SHA256 9a6668cdc51a93cec95a76e9c7e8806378c24cd7969a643cd8f753528e900ec1
+MD5 382647371ade0ef8ec9e46650592fa69 qwt-5.0.2-r1.ebuild 1217
+RMD160 77989587df4672d53727e095b20b5d16701b5bc1 qwt-5.0.2-r1.ebuild 1217
+SHA256 9a6668cdc51a93cec95a76e9c7e8806378c24cd7969a643cd8f753528e900ec1 qwt-5.0.2-r1.ebuild 1217
 EBUILD qwt-5.0.2.ebuild 1466 RMD160 b669bed6fa199181a188d0a011f3a3a0c429e22c SHA1 f45c116d8bb1b9959b4a799b379124d29ae80b56 SHA256 f80f9ce4c6c233c512b7aaeeb94a8cd79398db3d3e715d7717fe2bf65e395a27
 MD5 052b50d56d6980d776c5790638ac85f9 qwt-5.0.2.ebuild 1466
 RMD160 b669bed6fa199181a188d0a011f3a3a0c429e22c qwt-5.0.2.ebuild 1466
 SHA256 f80f9ce4c6c233c512b7aaeeb94a8cd79398db3d3e715d7717fe2bf65e395a27 qwt-5.0.2.ebuild 1466
-MISC ChangeLog 6314 RMD160 6aa347863ea5d5a8ec98ee19bf32d04aefaca3aa SHA1 661e5ff08191c0dc12faa57102cf0e6b609ef8f5 SHA256 8b7dfd53fa8de5b0248602a5648af4d165f8a200d2c333222a8e1b6892e5913b
-MD5 e5beed1be157fe22348f6f9500d39f51 ChangeLog 6314
-RMD160 6aa347863ea5d5a8ec98ee19bf32d04aefaca3aa ChangeLog 6314
-SHA256 8b7dfd53fa8de5b0248602a5648af4d165f8a200d2c333222a8e1b6892e5913b ChangeLog 6314
+MISC ChangeLog 6507 RMD160 0c1a22e041d4314a3437f90447879b103f339b74 SHA1 82e18985363848b956c7a60b3130623c58f1bcd2 SHA256 6eb483e2d5b53c022c4f5a7b69b36f91dc16e76f85404fc8787886cb8c8ec249
+MD5 001f7afc8f70824f68cfa5bd655ae57e ChangeLog 6507
+RMD160 0c1a22e041d4314a3437f90447879b103f339b74 ChangeLog 6507
+SHA256 6eb483e2d5b53c022c4f5a7b69b36f91dc16e76f85404fc8787886cb8c8ec249 ChangeLog 6507
 MISC metadata.xml 217 RMD160 e6d054499f7788f954fa7941c8083d3cb12be55a SHA1 97a424e615a1e5536b7666dbc716040de4208a0a SHA256 87a4f33db3485f493febd11c563b8f811b2eaeac8183a3e50183df6387eff4b9
 MD5 dcf56124acba6c6052ae83ecba3d43ef metadata.xml 217
 RMD160 e6d054499f7788f954fa7941c8083d3cb12be55a metadata.xml 217
@@ -36,6 +44,9 @@ SHA256 19248aa14aec7b22e1e940016dcfdcb6a3d2aac7e25ba201679ec4579d689506 files/di
 MD5 e7331ed08459262654af39ed0d99e166 files/digest-qwt-4.2.0-r1 232
 RMD160 87a08d807ef8ce393a35d70872c521534ce7f4b0 files/digest-qwt-4.2.0-r1 232
 SHA256 19248aa14aec7b22e1e940016dcfdcb6a3d2aac7e25ba201679ec4579d689506 files/digest-qwt-4.2.0-r1 232
+MD5 e7331ed08459262654af39ed0d99e166 files/digest-qwt-4.2.0-r2 232
+RMD160 87a08d807ef8ce393a35d70872c521534ce7f4b0 files/digest-qwt-4.2.0-r2 232
+SHA256 19248aa14aec7b22e1e940016dcfdcb6a3d2aac7e25ba201679ec4579d689506 files/digest-qwt-4.2.0-r2 232
 MD5 3d6ec1bca26ac3db2af7bad9d7dd4acb files/digest-qwt-5.0.0_rc1 244
 RMD160 0b0d45746ae8abfbba5619527adc778381cbce6b files/digest-qwt-5.0.0_rc1 244
 SHA256 66117f3fbd184bac476d85750d0d3d2d455b9b7bb0dab9e15717e07c48eab9f4 files/digest-qwt-5.0.0_rc1 244
@@ -45,3 +56,6 @@ SHA256 8743992beef7da94e8ba0eee70e14fb4166d006efebf5fa876ed040b27c73d03 files/di
 MD5 e2daf8cf3e1a1bf1f0af057838762ffc files/digest-qwt-5.0.2 235
 RMD160 88cc0dccbed1be6d933be9c70e3855b920227014 files/digest-qwt-5.0.2 235
 SHA256 7874cd392a342a91b124f62aa7fa67cb31cd23dd3ec40c388dd69570f0518810 files/digest-qwt-5.0.2 235
+MD5 e2daf8cf3e1a1bf1f0af057838762ffc files/digest-qwt-5.0.2-r1 235
+RMD160 88cc0dccbed1be6d933be9c70e3855b920227014 files/digest-qwt-5.0.2-r1 235
+SHA256 7874cd392a342a91b124f62aa7fa67cb31cd23dd3ec40c388dd69570f0518810 files/digest-qwt-5.0.2-r1 235
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
+}