sci-visualization/spyview: Version bump, allows dropping the datadir patch and eautoreconf.

svn path=/sunrise/; revision=9870

5 files changed, 13 insertions, 33 deletions

diff --git a/sci-visualization/spyview/ChangeLog b/sci-visualization/spyview/ChangeLog
index 7998a1c4e..8cd9f7fc5 100644
--- a/sci-visualization/spyview/ChangeLog
+++ b/sci-visualization/spyview/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Jan 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
+  -spyview-20091214.ebuild, -files/spyview-20091214-datadir.patch,
+  -files/spyview-20091214-includes.patch, +spyview-20100109.ebuild,
+  +files/spyview-20100109-includes.patch:
+  Version bump, allows dropping the datadir patch and eautoreconf.
+
   05 Jan 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
   spyview-20091214.ebuild, +files/spyview-20091214-includes.patch:
   Added patch for compilation with gcc-4.4
diff --git a/sci-visualization/spyview/Manifest b/sci-visualization/spyview/Manifest
index 0d510bdac..0b11ed645 100644
--- a/sci-visualization/spyview/Manifest
+++ b/sci-visualization/spyview/Manifest
@@ -1,6 +1,5 @@
-AUX spyview-20091214-datadir.patch 930 RMD160 ff32d4b3626aced7df6d12128fa8f26574156eaa SHA1 1bebbc70b3e49380c7ef8c7d361b28dc337d0070 SHA256 1e60a72f52149097df2f3de781933d61356116ebf14a414607de0a4ccd6b9c40
-AUX spyview-20091214-includes.patch 1289 RMD160 5633b65c311d1a88ce43e664215f7d21e323ba0f SHA1 e536774a25ea17303200cb60e5a65561e76c92f8 SHA256 41f6f26e9d89af2920cf78d3db7cfb9ec3c2fc778d1e8f74012bf037e1cb4a63
-DIST spyview-20091214.tar.gz 4439280 RMD160 f0a2c0bd187d2737e0d3ead7570efe4675a7f37b SHA1 c17420bfcec358b64d21945339cdfc18786bb3ec SHA256 7fe7f305541945f8b21385297ddc6a6d258ef06ef1d03a5112fdd89c11da5a83
-EBUILD spyview-20091214.ebuild 1050 RMD160 59b43b06a536ed6b55838057afc64ee3ba1c9740 SHA1 7f1920c2b35789ac50a80d6c94fa0ef7783dbcd0 SHA256 626226f202ba482669c9c9d5c201cf8ac934c2a0c955b5e0c881798b88c1c44c
-MISC ChangeLog 2920 RMD160 d6613edc912e3fd6a78b8dc0c8c70c6e36f6f544 SHA1 44e11207fd27f5fe19ee6efdf1b5d367634cf669 SHA256 b957eced7b6d8dcc266166b8d9dc53931911906e05a3c3cfcc799fcc580800a7
+AUX spyview-20100109-includes.patch 1289 RMD160 5633b65c311d1a88ce43e664215f7d21e323ba0f SHA1 e536774a25ea17303200cb60e5a65561e76c92f8 SHA256 41f6f26e9d89af2920cf78d3db7cfb9ec3c2fc778d1e8f74012bf037e1cb4a63
+DIST spyview-20100109.tar.gz 3476742 RMD160 d0ad770c9171b682b7f2ff2c3f172832fe683909 SHA1 6d0a6b50aec9a4f0d14047bc25284e48ec9dcb24 SHA256 ceaa5c6464e9fbda8cbdd15ef4f246f4c05a4ce4c5fa76adada3365324347711
+EBUILD spyview-20100109.ebuild 1016 RMD160 7bcf9df105f5cfe163e524d3cdfd72532e286ee8 SHA1 98e3f01ce7165ae302a05b3275fba08393201c91 SHA256 90ae33b37832b9bfb53156655db6396eee130be8d1fb8ef550a01959f44849d8
+MISC ChangeLog 3231 RMD160 ae75c50c4cb12becacac450b767fc514924cbdf2 SHA1 fce4307cb1c99dab413d2f2abb96d16cd773fda7 SHA256 a44c63959e693cf512e4949de06ae488261e3b88fe241a72a5c0cfd4ccf1701b
 MISC metadata.xml 171 RMD160 ed284df01c230fc7990a6b5888b39166d23f29ba SHA1 f3d64a69044b710e23fb874b3ee4cd338858c8b4 SHA256 a7b30fbacd0e4c312c07a3efac112a3794c81d134442d8104325734d03425adf
diff --git a/sci-visualization/spyview/files/spyview-20091214-datadir.patch b/sci-visualization/spyview/files/spyview-20091214-datadir.patch
deleted file mode 100644
index 42d1cda28..000000000
--- a/sci-visualization/spyview/files/spyview-20091214-datadir.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -r -U 8 spyview-2009-09-10-00_02.orig/spyview/Makefile.am spyview-2009-09-10-00_02/spyview/Makefile.am
---- spyview-2009-09-10-00_02.orig/spyview/Makefile.am	2009-09-09 23:58:08.000000000 +0200
-+++ spyview-2009-09-10-00_02/spyview/Makefile.am	2009-09-10 17:52:17.000000000 +0200
-@@ -89,12 +89,14 @@
- %.C: %.fl
- 	@FLUID@ -c -o $(basename $<).C -h $(basename $<).h $<
- 
- %.h: %.fl
- 	@FLUID@ -c -o $(basename $<).C -h $(basename $<).h $<
- 
- #Manual rules to install colormap files
- install-data-local:
--	$(INSTALL) -d $(datadir)
--	$(INSTALL_DATA) help.txt $(datadir)
--	$(INSTALL) -d $(datadir)/html
--	$(INSTALL_DATA) html/*.html $(datadir)/html
-\ Kein Zeilenumbruch am Dateiende.
-+	$(INSTALL) -d $(DESTDIR)$(datadir)
-+	$(INSTALL_DATA) help.txt $(DESTDIR)$(datadir)
-+	$(INSTALL) -d $(DESTDIR)$(datadir)/html
-+# not sure what exactly you are trying to install here... ah
-+#	$(INSTALL_DATA) html/*.html $(DESTDIR)$(datadir)/html
-+#
diff --git a/sci-visualization/spyview/files/spyview-20091214-includes.patch b/sci-visualization/spyview/files/spyview-20100109-includes.patch
index fa76d1b85..fa76d1b85 100644
--- a/sci-visualization/spyview/files/spyview-20091214-includes.patch
+++ b/sci-visualization/spyview/files/spyview-20100109-includes.patch
diff --git a/sci-visualization/spyview/spyview-20091214.ebuild b/sci-visualization/spyview/spyview-20100109.ebuild
index b81daf2d0..c6785b450 100644
--- a/sci-visualization/spyview/spyview-20091214.ebuild
+++ b/sci-visualization/spyview/spyview-20100109.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=2
 
-inherit base flag-o-matic eutils autotools multilib
+inherit base flag-o-matic eutils multilib
 
 DESCRIPTION="Interactive plotting program"
 HOMEPAGE="http://kavli.nano.tudelft.nl/~gsteele/spyview/"
@@ -26,10 +26,10 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	sci-visualization/gnuplot"
 
-S=${WORKDIR}/spyview-2009-12-14-09_17
+S=${WORKDIR}/spyview-2010-01-09-17_39
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-{datadir,includes}.patch
+	epatch "${FILESDIR}"/${P}-includes.patch
 
 	append-cflags $(fltk-config --cflags)
 	append-cxxflags $(fltk-config --cxxflags) -I/usr/include/netpbm
@@ -38,8 +38,6 @@ src_prepare() {
 	# this one leads to an insane amount of warnings
 
 	append-ldflags -L/usr/$(get_libdir)/fltk-1.1
-
-	eautoreconf
 }
 
 src_configure() {