Version bump, cleaning old versions.

(Portage version: 2.2_rc28/cvs/Linux x86_64)

8 files changed, 149 insertions, 231 deletions

diff --git a/x11-libs/qwt/ChangeLog b/x11-libs/qwt/ChangeLog
index ccf3d9983f85..f4d810c009ed 100644
--- a/x11-libs/qwt/ChangeLog
+++ b/x11-libs/qwt/ChangeLog
@@ -1,6 +1,14 @@
 # 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.66 2008/12/23 14:01:12 caleb Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.67 2009/04/07 18:18:00 bicatali Exp $
+
+*qwt-5.2.0 (07 Apr 2009)
+*qwt-5.1.2 (07 Apr 2009)
+
+  07 Apr 2009; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml,
+  -qwt-4.2.0.ebuild, -qwt-4.2.0-r1.ebuild, -qwt-4.2.0-r2.ebuild,
+  -qwt-5.1.0.ebuild, +qwt-5.1.2.ebuild, +qwt-5.2.0.ebuild:
+  Version bump, cleaning old versions.
 
 *qwt-5.1.1 (23 Dec 2008)
 
diff --git a/x11-libs/qwt/metadata.xml b/x11-libs/qwt/metadata.xml
index c0ae12a3d916..2b8d0362f478 100644
--- a/x11-libs/qwt/metadata.xml
+++ b/x11-libs/qwt/metadata.xml
@@ -5,4 +5,11 @@
 <maintainer>
   <email>caleb@gentoo.org</email>
 </maintainer>
+<longdescription lang="en">
+  The Qwt library contains GUI Components and utility classes which are
+  primarily useful for programs with a technical background.
+  Besides a 2D plot widget it provides scales, sliders, dials,
+  compasses, thermometers, wheels and knobs to control or display
+  values, arrays or ranges of type double.  
+</longdescription>
 </pkgmetadata>
diff --git a/x11-libs/qwt/qwt-4.2.0-r1.ebuild b/x11-libs/qwt/qwt-4.2.0-r1.ebuild
deleted file mode 100644
index c93150193ba2..000000000000
--- a/x11-libs/qwt/qwt-4.2.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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.10 2008/05/15 12:53:55 grozin Exp $
-
-inherit multilib
-
-MY_PV="${PV/_r/r}"
-
-SRC_URI="mirror://sourceforge/qwt/${PN}-${MY_PV}.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"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-QWTVER="4.2.0"
-
-DEPEND="=x11-libs/qt-3*
-	>=sys-apps/sed-4"
-
-src_unpack () {
-	unpack ${A}
-	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}"
-		echo >> ${file} "QMAKE_CXXFLAGS_RELEASE += ${CXXFLAGS}"
-	done
-	find examples -type f -name "*.pro" | while read file; do
-		echo >> ${file} "INCLUDEPATH += /usr/include/qwt"
-	done
-}
-
-src_compile () {
-	addwrite ${QTDIR}/etc/settings
-	${QTDIR}/bin/qmake QMAKE=${QTDIR}/bin/qmake qwt.pro
-	emake || die
-	cd designer
-	${QTDIR}/bin/qmake QMAKE=${QTDIR}/bin/qmake qwtplugin.pro
-	emake || die
-}
-
-src_install () {
-	ls -l lib
-	dolib lib/libqwt.so.${QWTVER}
-	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}/
-				dohtml doc/html/*)
-	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-r2.ebuild b/x11-libs/qwt/qwt-4.2.0-r2.ebuild
deleted file mode 100644
index a1eb361ddc51..000000000000
--- a/x11-libs/qwt/qwt-4.2.0-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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-r2.ebuild,v 1.2 2008/07/28 21:48:46 carlo Exp $
-
-EAPI=1
-
-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="x11-libs/qt: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-4.2.0.ebuild b/x11-libs/qwt/qwt-4.2.0.ebuild
deleted file mode 100644
index 9e202b6e0b63..000000000000
--- a/x11-libs/qwt/qwt-4.2.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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.9 2008/05/15 12:53:55 grozin Exp $
-
-MY_PV="${PV/_r/r}"
-
-SRC_URI="mirror://sourceforge/qwt/${PN}-${MY_PV}.tar.bz2"
-HOMEPAGE="http://qwt.sourceforge.net/"
-DESCRIPTION="2D plotting library for Qt"
-LICENSE="qwt"
-KEYWORDS="~amd64 ppc x86"
-SLOT="0"
-IUSE="doc"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-QWTVER="4.2.0"
-
-DEPEND="=x11-libs/qt-3*
-	>=sys-apps/sed-4"
-
-src_unpack () {
-	unpack ${A}
-	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}"
-		echo >> ${file} "QMAKE_CXXFLAGS_RELEASE += ${CXXFLAGS}"
-	done
-	find examples -type f -name "*.pro" | while read file; do
-		echo >> ${file} "INCLUDEPATH += /usr/include/qwt"
-	done
-}
-
-src_compile () {
-	addwrite ${QTDIR}/etc/settings
-	${QTDIR}/bin/qmake QMAKE=${QTDIR}/bin/qmake qwt.pro
-	emake || die
-	cd designer
-	${QTDIR}/bin/qmake QMAKE=${QTDIR}/bin/qmake qwtplugin.pro
-	emake || die
-}
-
-src_install () {
-	ls -l lib
-	dolib lib/libqwt.so.${QWTVER}
-	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}/
-				dohtml doc/html/*)
-	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
deleted file mode 100644
index ff2054ae90f9..000000000000
--- a/x11-libs/qwt/qwt-5.1.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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.3 2008/07/30 15:20:26 jer Exp $
-
-inherit multilib qt4
-
-EAPI=1
-
-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="|| (
-	( x11-libs/qt-gui:4
-	  svg? ( x11-libs/qt-svg:4 ) )
-	=x11-libs/qt-4.3*: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
-}
diff --git a/x11-libs/qwt/qwt-5.1.2.ebuild b/x11-libs/qwt/qwt-5.1.2.ebuild
new file mode 100644
index 000000000000..d2274391bfbe
--- /dev/null
+++ b/x11-libs/qwt/qwt-5.1.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.1.2.ebuild,v 1.1 2009/04/07 18:18:00 bicatali Exp $
+
+EAPI=2
+inherit eutils qt4
+
+DESCRIPTION="2D plotting library for Qt4"
+HOMEPAGE="http://qwt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="qwt"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="5"
+IUSE="doc examples svg"
+
+DEPEND="x11-libs/qt-gui:4
+	svg? ( x11-libs/qt-svg:4 )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cat > qwtconfig.pri <<-EOF
+		target.path = /usr/$(get_libdir)
+		headers.path = /usr/include/qwt5
+		doc.path = /usr/share/doc/${PF}
+		CONFIG += qt warn_on thread release
+		CONFIG += QwtDll QwtPlot QwtWidgets QwtDesigner
+		VERSION = ${PV}
+	EOF
+	# 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 += /usr/include/qwt5
+		DEPENDPATH  += /usr/include/qwt5
+		LIBS        += -lqwt
+	EOF
+	sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
+	sed -i -e 's/headers doc/headers/' src/src.pro || die
+	qt4_src_prepare
+}
+
+src_configure() {
+	use svg && echo >> qwtconfig.pri "CONFIG += QwtSVGItem"
+	cp qwtconfig.pri examples/qwtconfig.pri
+	eqmake4
+}
+src_compile() {
+	# split compilation to allow parallel building
+	emake sub-src || die "emake library failed"
+	emake || die "emake failed"
+}
+
+src_install () {
+	emake INSTALL_ROOT="${D}" install || die "emake install failed"
+	dodoc CHANGES README
+	insinto /usr/share/doc/${PF}
+	if use doc; then
+		doman doc/man/*/* || die
+		doins -r doc/html || die
+	fi
+	if use examples; then
+		doins -r examples || die
+	fi
+}
diff --git a/x11-libs/qwt/qwt-5.2.0.ebuild b/x11-libs/qwt/qwt-5.2.0.ebuild
new file mode 100644
index 000000000000..c0fc22d6a8db
--- /dev/null
+++ b/x11-libs/qwt/qwt-5.2.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.2.0.ebuild,v 1.1 2009/04/07 18:18:00 bicatali Exp $
+
+EAPI=2
+inherit eutils qt4
+
+DESCRIPTION="2D plotting library for Qt4"
+HOMEPAGE="http://qwt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="qwt"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="5"
+IUSE="doc examples svg"
+
+DEPEND="x11-libs/qt-gui:4
+	svg? ( x11-libs/qt-svg:4 )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cat > qwtconfig.pri <<-EOF
+		target.path = /usr/$(get_libdir)
+		headers.path = /usr/include/qwt5
+		doc.path = /usr/share/doc/${PF}
+		CONFIG += qt warn_on thread release
+		CONFIG += QwtDll QwtPlot QwtWidgets QwtDesigner
+		VERSION = ${PV}
+	EOF
+	# 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 += /usr/include/qwt5
+		DEPENDPATH  += /usr/include/qwt5
+		LIBS        += -lqwt
+	EOF
+	sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
+	sed -i -e 's/headers doc/headers/' src/src.pro || die
+	qt4_src_prepare
+}
+
+src_configure() {
+	use svg && echo >> qwtconfig.pri "CONFIG += QwtSVGItem"
+	cp qwtconfig.pri examples/qwtconfig.pri
+	eqmake4
+}
+src_compile() {
+	# split compilation to allow parallel building
+	emake sub-src || die "emake library failed"
+	emake || die "emake failed"
+}
+
+src_install () {
+	emake INSTALL_ROOT="${D}" install || die "emake install failed"
+	dodoc CHANGES README
+	insinto /usr/share/doc/${PF}
+	if use doc; then
+		doman doc/man/*/* || die
+		doins -r doc/html || die
+	fi
+	if use examples; then
+		doins -r examples || die
+	fi
+}