Finally squashing bug #68230

6 files changed, 13 insertions, 59 deletions

diff --git a/x11-libs/qwt/ChangeLog b/x11-libs/qwt/ChangeLog
index a2100ebea211..f7fb8647256d 100644
--- a/x11-libs/qwt/ChangeLog
+++ b/x11-libs/qwt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qwt
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.16 2004/10/21 06:41:49 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.17 2004/10/25 08:29:24 phosphan Exp $
+
+*qwt-4.2.0_rc2-r3 (25 Oct 2004)
+
+  25 Oct 2004; Patrick Kursawe <phosphan@gentoo.org> -qwt-4.2.0_rc2-r1.ebuild,
+  -qwt-4.2.0_rc2-r2.ebuild, +qwt-4.2.0_rc2-r3.ebuild:
+  Correcting the qwt header files to #include "qwt/file.h" instead of "file.h".
 
 *qwt-4.2.0_rc2-r2 (21 Oct 2004)
 
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index 3428e076746a..e58040b4478a 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -3,7 +3,9 @@ MD5 fb28512484244c24f3b8957fbf35018b qwt-4.2.0_rc2-r2.ebuild 1516
 MD5 105f73385c48441b5000aa3e70d4cab2 qwt-4.2.0_rc2-r1.ebuild 1453
 MD5 2e4bd624d9a0eb08269aa6f7400359a5 ChangeLog 2626
 MD5 c000c0728c9136f1b54cbc3a5fc07644 metadata.xml 220
+MD5 dfaceece577ba08cafac9477ab67ff62 qwt-4.2.0_rc2-r3.ebuild 1633
 MD5 3ea50eb9442866602e232a81463fd832 files/4.2.0_rc2-plugin.patch 1972
 MD5 6647fba0e68e22e0d87760f7c421c1f9 files/digest-qwt-4.2.0_rc1-r1 61
 MD5 c4ad377ac25dbcecd026f3b0727110ad files/digest-qwt-4.2.0_rc2-r1 65
 MD5 c4ad377ac25dbcecd026f3b0727110ad files/digest-qwt-4.2.0_rc2-r2 65
+MD5 c4ad377ac25dbcecd026f3b0727110ad files/digest-qwt-4.2.0_rc2-r3 65
diff --git a/x11-libs/qwt/files/digest-qwt-4.2.0_rc2-r2 b/x11-libs/qwt/files/digest-qwt-4.2.0_rc2-r2
deleted file mode 100644
index 29438082c71f..000000000000
--- a/x11-libs/qwt/files/digest-qwt-4.2.0_rc2-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d5a96e1c6d3bb9eb8fd3589e9126a645 qwt-4.2.0rc2.tar.bz2 963009
diff --git a/x11-libs/qwt/files/digest-qwt-4.2.0_rc2-r1 b/x11-libs/qwt/files/digest-qwt-4.2.0_rc2-r3
index 29438082c71f..29438082c71f 100644
--- a/x11-libs/qwt/files/digest-qwt-4.2.0_rc2-r1
+++ b/x11-libs/qwt/files/digest-qwt-4.2.0_rc2-r3
diff --git a/x11-libs/qwt/qwt-4.2.0_rc2-r1.ebuild b/x11-libs/qwt/qwt-4.2.0_rc2-r1.ebuild
deleted file mode 100644
index fca38660e54e..000000000000
--- a/x11-libs/qwt/qwt-4.2.0_rc2-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2004 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_rc2-r1.ebuild,v 1.1 2004/10/20 06:21:18 phosphan Exp $
-
-inherit eutils
-
-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 ~amd64 ~ppc"
-SLOT="0"
-IUSE="doc"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-QWTVER="4.2.0"
-
-DEPEND=">=x11-libs/qt-3.0.0
-	>=sys-apps/sed-4"
-
-
-src_unpack () {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-plugin.patch
-	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
-}
-
-src_compile () {
-	addwrite ${QTDIR}/etc/settings
-	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
-	dosym libqwt.so.${QWTVER} /usr/lib/libqwt.so.${QWTVER/.\*/}
-	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
-}
diff --git a/x11-libs/qwt/qwt-4.2.0_rc2-r2.ebuild b/x11-libs/qwt/qwt-4.2.0_rc2-r3.ebuild
index 7cc179701f5a..5e16b00e6787 100644
--- a/x11-libs/qwt/qwt-4.2.0_rc2-r2.ebuild
+++ b/x11-libs/qwt/qwt-4.2.0_rc2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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_rc2-r2.ebuild,v 1.1 2004/10/21 06:41:49 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-4.2.0_rc2-r3.ebuild,v 1.1 2004/10/25 08:29:24 phosphan Exp $
 
 inherit eutils
 
@@ -52,6 +52,9 @@ src_install () {
 				cp -a examples ${D}/usr/share/doc/${PF}/
 				dohtml doc/html/*)
 	mkdir -p ${D}/usr/include/qwt/
+	find include -type f -name "*.h" | while read file; do
+		sed -e 's:include "qwt:include "qwt/qwt:' -i ${file}
+	done
 	install include/* ${D}/usr/include/qwt/
 	insinto ${QTDIR}/plugins/designer
 	doins designer/plugins/designer/libqwtplugin.so