Version bump, obsolete version removed.

6 files changed, 16 insertions, 75 deletions

diff --git a/media-gfx/quickplot/ChangeLog b/media-gfx/quickplot/ChangeLog
index d07b871ef4d5..270c8147e38d 100644
--- a/media-gfx/quickplot/ChangeLog
+++ b/media-gfx/quickplot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/quickplot
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/quickplot/ChangeLog,v 1.1 2005/01/05 01:12:43 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/quickplot/ChangeLog,v 1.2 2005/01/06 07:42:35 cryos Exp $
+
+*quickplot-0.8.5 (06 Jan 2005)
+
+  06 Jan 2005; Marcus Hanwell <cryos@gentoo.org>
+  -files/quickplot-0.8.2-gcc-3.4.patch, -quickplot-0.8.2.ebuild,
+  +quickplot-0.8.5.ebuild:
+  Version bump, patch integrated upstream. Removed obsolete version.
 
 *quickplot-0.8.2 (05 Jan 2005)
 
diff --git a/media-gfx/quickplot/Manifest b/media-gfx/quickplot/Manifest
index 39efcc1c286a..c3fe6bf99776 100644
--- a/media-gfx/quickplot/Manifest
+++ b/media-gfx/quickplot/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 28f939d4556a77a8f586a48a36748845 quickplot-0.8.2.ebuild 768
 MD5 f7ccf447ef7110a72f7c987c517942bd metadata.xml 689
 MD5 283264b874f705e44937a17a41d17027 ChangeLog 593
+MD5 351ca2cd17dfed1f1898817e1b87b423 quickplot-0.8.5.ebuild 763
 MD5 506e890d1309788f93e3f7b6135c8ce7 files/digest-quickplot-0.8.2 68
+MD5 161b412e414642dbef003cb31c9584b0 files/digest-quickplot-0.8.5 68
 MD5 a23d8d86d650cc012f6e3c272f23dd90 files/quickplot-0.8.2-gcc-3.4.patch 1458
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB20A4ntT9W3vfTuoRAoQRAKCWCikvdeK3KTAbiWn5S9CbOKIS5ACdGd5i
-l2jTDTLc4UBdw3TgH4BrL4s=
-=VfB0
------END PGP SIGNATURE-----
diff --git a/media-gfx/quickplot/files/digest-quickplot-0.8.2 b/media-gfx/quickplot/files/digest-quickplot-0.8.2
deleted file mode 100644
index ec17a8812e13..000000000000
--- a/media-gfx/quickplot/files/digest-quickplot-0.8.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 43d856d271b23e92db8ebf3c4e238c66 quickplot-0.8.2.tar.bz2 393305
diff --git a/media-gfx/quickplot/files/digest-quickplot-0.8.5 b/media-gfx/quickplot/files/digest-quickplot-0.8.5
new file mode 100644
index 000000000000..226cb64c5a6d
--- /dev/null
+++ b/media-gfx/quickplot/files/digest-quickplot-0.8.5
@@ -0,0 +1 @@
+MD5 55b90fd8e26b89574f2f9de98e85f10f quickplot-0.8.5.tar.bz2 394128
diff --git a/media-gfx/quickplot/files/quickplot-0.8.2-gcc-3.4.patch b/media-gfx/quickplot/files/quickplot-0.8.2-gcc-3.4.patch
deleted file mode 100644
index 28183ce4c81c..000000000000
--- a/media-gfx/quickplot/files/quickplot-0.8.2-gcc-3.4.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -ruN quickplot-0.8.2/File.h quickplot-0.8.2-cryos/File.h
---- quickplot-0.8.2/File.h	2004-08-27 00:05:52.000000000 +0100
-+++ quickplot-0.8.2-cryos/File.h	2005-01-04 04:44:58.000000000 +0000
-@@ -1,8 +1,9 @@
- /* Copyright (c) 1998, 1999, 2003, 2004  Lance Arsenault, (GNU GPL (v2+))
-  */
-+#ifdef USE_LIBSNDFILE
-+#include <sndfile.h>
-+#endif
- 
--
--struct ::SNDFILE;
- class Source;
- class FileReader;
- class FileList;
-@@ -22,7 +23,7 @@
-   void init(const FileList *fileList);
-   
- #ifdef USE_LIBSNDFILE
--
-+  
-   // This will not work with stdin.
-   bool readSndFile(const FileList *fileList, int fd=-1);
- 
-diff -ruN quickplot-0.8.2/File_readASCIIFile.cpp quickplot-0.8.2-cryos/File_readASCIIFile.cpp
---- quickplot-0.8.2/File_readASCIIFile.cpp	2004-08-27 00:05:52.000000000 +0100
-+++ quickplot-0.8.2-cryos/File_readASCIIFile.cpp	2005-01-04 09:17:29.058633216 +0000
-@@ -11,7 +11,7 @@
- 
- #include <list>
- #include <iomanip>
--
-+#include <errno.h>
- #include <gtkmm.h>
- 
- 
-@@ -40,7 +40,6 @@
- #include "MainWindow.h"
- #include "App.h"
- 
--
- #include "errorStr.h"
- #include "FileReader.h"
- 
-diff -ruN quickplot-0.8.2/ValueSlider.cpp quickplot-0.8.2-cryos/ValueSlider.cpp
---- quickplot-0.8.2/ValueSlider.cpp	2004-08-27 00:05:52.000000000 +0100
-+++ quickplot-0.8.2-cryos/ValueSlider.cpp	2005-01-04 09:17:18.083301720 +0000
-@@ -6,6 +6,7 @@
- #include <string.h>
- #include <stdio.h>
- #include <math.h>
-+#include <errno.h>
- 
- #include <gtkmm.h>
- #include <glibmm/ustring.h>
diff --git a/media-gfx/quickplot/quickplot-0.8.2.ebuild b/media-gfx/quickplot/quickplot-0.8.5.ebuild
index e4214539eee7..02937506d22b 100644
--- a/media-gfx/quickplot/quickplot-0.8.2.ebuild
+++ b/media-gfx/quickplot/quickplot-0.8.5.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/quickplot/quickplot-0.8.2.ebuild,v 1.1 2005/01/05 01:12:43 cryos Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/quickplot/quickplot-0.8.5.ebuild,v 1.1 2005/01/06 07:42:35 cryos Exp $
 
 DESCRIPTION="A fast interactive 2D plotter."
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
@@ -17,11 +15,6 @@ DEPEND=">=dev-util/pkgconfig-0.15
 	>=dev-cpp/gtkmm-2.4.5
 	>=media-libs/libsndfile-1.0.5"
 
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-gcc-3.4.patch
-}
-
 src_compile() {
 	econf || die "econf step failed."
 	emake || die "emake step failed."
@@ -29,4 +22,8 @@ src_compile() {
 
 src_install () {
 	make install DESTDIR=${D} || die "make install step failed."
+	# Remove the licence as it is specified in LICENCE
+	rm ${D}/usr/share/doc/${PN}/COPYING
+	# Move the docs to the correct location
+	mv ${D}/usr/share/doc/${PN} ${D}/usr/share/doc/${PF}
 }