8 files changed, 51 insertions, 64 deletions
diff --git a/x11-libs/qwt/ChangeLog b/x11-libs/qwt/ChangeLog
index 0a63898162b6..9f18cb0229ef 100644
--- a/x11-libs/qwt/ChangeLog
+++ b/x11-libs/qwt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/qwt
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.5 2003/09/09 15:16:22 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.6 2003/10/29 07:43:37 phosphan Exp $
+
+*qwt-4.2.0_rc0 (29 Oct 2003)
+
+  29 Oct 2003; Patrick Kursawe <phosphan@gentoo.org> qwt-0.4.1-r1.ebuild,
+  qwt-0.4.1.ebuild, qwt-4.2.0_rc0.ebuild:
+  New version numbers, release candidate. Examples should be installed correctly
+  now. Cleanup.
 
   09 Sep 2003; Caleb Tennis <caleb@gentoo.org> qwt-0.4.2_pre2030129.ebuild:
   Marking x86 stable
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index 4804c500e5dc..7c8076463488 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -1,10 +1,6 @@
-MD5 2532abb88fdae61b4b9659f258ba087a qwt-0.4.1-r1.ebuild 807
-MD5 f00d435f049b66fe4ef4e027ee3f3349 qwt-0.4.1.ebuild 704
 MD5 c7ebf232fc6db9fe5050d3a23c380201 qwt-0.4.2_pre20030129.ebuild 996
-MD5 0c1e49e8100a1d471a381c8f9c47bbb8 ChangeLog 995
-MD5 e5b6b5eebd531b8d913527ed77562d30 qwt-4.2.0_rc0.ebuild 1025
+MD5 7b922b7eca8b89402119785173ff326b ChangeLog 1242
+MD5 184de1fa74c02f4337e44b71dd3ed4f9 qwt-4.2.0_rc0.ebuild 1025
 MD5 c000c0728c9136f1b54cbc3a5fc07644 metadata.xml 220
-MD5 1eaef91ebe0a70d31a2689150c1726cc files/digest-qwt-0.4.1 62
 MD5 f585c87ff7f062059cd26b2398df10e2 files/digest-qwt-4.2.0_rc0 65
 MD5 0c125676eb2978999016a8edf2663502 files/digest-qwt-0.4.2_pre20030129 61
-MD5 1eaef91ebe0a70d31a2689150c1726cc files/digest-qwt-0.4.1-r1 62
diff --git a/x11-libs/qwt/files/digest-qwt-0.4.1 b/x11-libs/qwt/files/digest-qwt-0.4.1
deleted file mode 100644
index dbb1dc79f965..000000000000
--- a/x11-libs/qwt/files/digest-qwt-0.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 45c64b0382c8963cfde026a6d2324f6d qwt-0.4.1.tar.bz2 314036
diff --git a/x11-libs/qwt/files/digest-qwt-0.4.1-r1 b/x11-libs/qwt/files/digest-qwt-0.4.1-r1
deleted file mode 100644
index dbb1dc79f965..000000000000
--- a/x11-libs/qwt/files/digest-qwt-0.4.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 45c64b0382c8963cfde026a6d2324f6d qwt-0.4.1.tar.bz2 314036
diff --git a/x11-libs/qwt/files/digest-qwt-4.2.0_rc0 b/x11-libs/qwt/files/digest-qwt-4.2.0_rc0
new file mode 100644
index 000000000000..640a0b439da0
--- /dev/null
+++ b/x11-libs/qwt/files/digest-qwt-4.2.0_rc0
@@ -0,0 +1 @@
+MD5 91aed5b6a6e1f085c5d2056cce9cb609 qwt-4.2.0rc0.tar.bz2 521594
diff --git a/x11-libs/qwt/qwt-0.4.1-r1.ebuild b/x11-libs/qwt/qwt-0.4.1-r1.ebuild
deleted file mode 100644
index f69552572e79..000000000000
--- a/x11-libs/qwt/qwt-0.4.1-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-0.4.1-r1.ebuild,v 1.3 2003/09/07 00:23:28 msterret Exp $
-
-SRC_URI="mirror://sourceforge/qwt/qwt-${PV}.tar.bz2"
-HOMEPAGE="http://qwt.sourceforge.net/"
-DESCRIPTION="2D plotting library for Qt"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86"
-SLOT="0"
-IUSE="doc"
-
-DEPEND=">=x11-libs/qt-3.0.0"
-
-src_compile () {
-	qmake qwt.pro
-	emake || die
-}
-
-src_install () {
-	dolib lib/libqwt.so.${PV}
-	dosym libqwt.so.${PV} /usr/lib/libqwt.so
-	use doc && (dohtml doc/html/*; cp -a examples ${D}/usr/share/doc/${PF}/;\
-				find ${D}/usr/share/doc/ -type f -exec gzip {} \; )
-	doman doc/man/man*/*
-	mkdir -p ${D}/usr/include/qwt/
-	install include/* ${D}/usr/include/qwt/
-}
diff --git a/x11-libs/qwt/qwt-0.4.1.ebuild b/x11-libs/qwt/qwt-0.4.1.ebuild
deleted file mode 100644
index 6267d695b2a3..000000000000
--- a/x11-libs/qwt/qwt-0.4.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-0.4.1.ebuild,v 1.2 2003/09/07 00:23:28 msterret Exp $
-
-SRC_URI="mirror://sourceforge/qwt/qwt-${PV}.tar.bz2"
-HOMEPAGE="http://qwt.sourceforge.net/"
-DESCRIPTION="2D plotting library for Qt"
-LICENSE="LGPL-2.1"
-KEYWORDS="~x86"
-SLOT="0"
-IUSE="doc"
-
-DEPEND=">=x11-libs/qt-3.0.0"
-
-src_compile () {
-	qmake qwt.pro
-	emake || die
-}
-
-src_install () {
-	dolib lib/libqwt.so.${PV}
-	dosym libqwt.so.${PV} /usr/lib/libqwt.so
-	use doc && dohtml doc/html/*
-	doman doc/man/man*/*
-	mkdir -p ${D}/usr/include/qwt/
-	install include/* ${D}/usr/include/qwt/
-}
diff --git a/x11-libs/qwt/qwt-4.2.0_rc0.ebuild b/x11-libs/qwt/qwt-4.2.0_rc0.ebuild
new file mode 100644
index 000000000000..86f6e14979fd
--- /dev/null
+++ b/x11-libs/qwt/qwt-4.2.0_rc0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-4.2.0_rc0.ebuild,v 1.1 2003/10/29 07:43:37 phosphan 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="~x86"
+SLOT="0"
+IUSE="doc"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+QWTVER="4.2.0"
+
+DEPEND=">=x11-libs/qt-3.0.0"
+
+src_compile () {
+	qmake qwt.pro
+	emake || die
+	cd designer
+	qmake qwtplugin.pro
+	emake || die
+}
+
+src_install () {
+	dolib lib/libqwt.so.${QWTVER}
+	dosym libqwt.so.${QWTVER} /usr/lib/libqwt.so
+
+	use doc && (dodir /usr/share/doc/${PF}
+				cp -a examples ${D}/usr/share/doc/${PF}/
+				find ${D}/usr/share/doc/ -type f -exec gzip {} \;
+				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
+}