Version bump

(Portage version: 2.1.4.4)

4 files changed, 60 insertions, 13 deletions

diff --git a/x11-libs/qwt/ChangeLog b/x11-libs/qwt/ChangeLog
index 69e91bd404ec..fe19e8eb5735 100644
--- a/x11-libs/qwt/ChangeLog
+++ b/x11-libs/qwt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qwt
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.61 2008/02/05 11:49:04 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.62 2008/05/15 12:53:55 grozin Exp $
+
+*qwt-5.1.0 (15 May 2008)
+
+  15 May 2008; Andrey Grozin <grozin@gentoo.org> +qwt-5.1.0.ebuild:
+  Version bump
 
   05 Feb 2008; Markus Rothe <corsair@gentoo.org> qwt-5.0.2-r1.ebuild:
   Stable on ppc64
diff --git a/x11-libs/qwt/qwt-4.2.0-r1.ebuild b/x11-libs/qwt/qwt-4.2.0-r1.ebuild
index 583a890c1b40..c93150193ba2 100644
--- a/x11-libs/qwt/qwt-4.2.0-r1.ebuild
+++ b/x11-libs/qwt/qwt-4.2.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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-r1.ebuild,v 1.9 2007/07/15 05:53:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-4.2.0-r1.ebuild,v 1.10 2008/05/15 12:53:55 grozin Exp $
 
 inherit multilib
 
@@ -22,7 +22,7 @@ DEPEND="=x11-libs/qt-3*
 
 src_unpack () {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	find . -type f -name "*.pro" | while read file; do
 		sed -e 's/.*no-exceptions.*//g' -i ${file}
 		echo >> ${file} "QMAKE_CFLAGS_RELEASE += ${CFLAGS}"
@@ -48,10 +48,10 @@ src_install () {
 	dosym libqwt.so.${QWTVER} /usr/$(get_libdir)/libqwt.so
 	dosym libqwt.so.${QWTVER} /usr/$(get_libdir)/libqwt.so.${QWTVER/.*/}
 	use doc && (dodir /usr/share/doc/${PF}
-				cp -pPR examples ${D}/usr/share/doc/${PF}/
+				cp -pPR examples "${D}"/usr/share/doc/${PF}/
 				dohtml doc/html/*)
-	mkdir -p ${D}/usr/include/qwt/
-	install include/* ${D}/usr/include/qwt/
+	mkdir -p "${D}"/usr/include/qwt/
+	install include/* "${D}"/usr/include/qwt/
 	insinto ${QTDIR}/plugins/designer
 	doins designer/plugins/designer/libqwtplugin.so
 }
diff --git a/x11-libs/qwt/qwt-4.2.0.ebuild b/x11-libs/qwt/qwt-4.2.0.ebuild
index 2ad7e8297e20..9e202b6e0b63 100644
--- a/x11-libs/qwt/qwt-4.2.0.ebuild
+++ b/x11-libs/qwt/qwt-4.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 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.ebuild,v 1.8 2007/07/15 05:53:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-4.2.0.ebuild,v 1.9 2008/05/15 12:53:55 grozin Exp $
 
 MY_PV="${PV/_r/r}"
 
@@ -20,7 +20,7 @@ DEPEND="=x11-libs/qt-3*
 
 src_unpack () {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	find . -type f -name "*.pro" | while read file; do
 		sed -e 's/.*no-exceptions.*//g' -i ${file}
 		echo >> ${file} "QMAKE_CFLAGS_RELEASE += ${CFLAGS}"
@@ -46,10 +46,10 @@ src_install () {
 	dosym libqwt.so.${QWTVER} /usr/lib/libqwt.so
 	dosym libqwt.so.${QWTVER} /usr/lib/libqwt.so.${QWTVER/.*/}
 	use doc && (dodir /usr/share/doc/${PF}
-				cp -pPR examples ${D}/usr/share/doc/${PF}/
+				cp -pPR examples "${D}"/usr/share/doc/${PF}/
 				dohtml doc/html/*)
-	mkdir -p ${D}/usr/include/qwt/
-	install include/* ${D}/usr/include/qwt/
+	mkdir -p "${D}"/usr/include/qwt/
+	install include/* "${D}"/usr/include/qwt/
 	insinto ${QTDIR}/plugins/designer
 	doins designer/plugins/designer/libqwtplugin.so
 }
diff --git a/x11-libs/qwt/qwt-5.1.0.ebuild b/x11-libs/qwt/qwt-5.1.0.ebuild
new file mode 100644
index 000000000000..754e488223f6
--- /dev/null
+++ b/x11-libs/qwt/qwt-5.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.1.0.ebuild,v 1.1 2008/05/15 12:53:55 grozin 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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="5"
+IUSE="doc svg"
+
+DEPEND="$(qt4_min_version 4.2)"
+
+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
+}