From 9dcd722a0e105decf0639836209b12553d3ad245 Mon Sep 17 00:00:00 2001 From: Andreas Hüttel Date: Thu, 5 Nov 2009 21:12:17 +0000 Subject: sci-visualization/spyview: Version bump. svn path=/sunrise/; revision=9466 --- sci-visualization/spyview/ChangeLog | 5 +++ sci-visualization/spyview/Manifest | 8 ++-- .../spyview/files/spyview-20091008-datadir.patch | 23 ---------- .../spyview/files/spyview-20091104-datadir.patch | 23 ++++++++++ sci-visualization/spyview/spyview-20091008.ebuild | 49 ---------------------- sci-visualization/spyview/spyview-20091104.ebuild | 49 ++++++++++++++++++++++ 6 files changed, 81 insertions(+), 76 deletions(-) delete mode 100644 sci-visualization/spyview/files/spyview-20091008-datadir.patch create mode 100644 sci-visualization/spyview/files/spyview-20091104-datadir.patch delete mode 100644 sci-visualization/spyview/spyview-20091008.ebuild create mode 100644 sci-visualization/spyview/spyview-20091104.ebuild diff --git a/sci-visualization/spyview/ChangeLog b/sci-visualization/spyview/ChangeLog index b6fac5ff5..486a9ce71 100644 --- a/sci-visualization/spyview/ChangeLog +++ b/sci-visualization/spyview/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 05 Nov 2009; Andreas K. Huettel (dilfridge) + -spyview-20091008.ebuild, -files/spyview-20091008-datadir.patch, + +spyview-20091104.ebuild, +files/spyview-20091104-datadir.patch: + Version bump. + 08 Oct 2009; Andreas K. Huettel (dilfridge) -spyview-20090910.ebuild, -files/spyview-20090910-assert.patch, -files/spyview-20090910-cmaps.patch, diff --git a/sci-visualization/spyview/Manifest b/sci-visualization/spyview/Manifest index 2d070d7cf..8d6e6fa99 100644 --- a/sci-visualization/spyview/Manifest +++ b/sci-visualization/spyview/Manifest @@ -1,5 +1,5 @@ -AUX spyview-20091008-datadir.patch 930 RMD160 ff32d4b3626aced7df6d12128fa8f26574156eaa SHA1 1bebbc70b3e49380c7ef8c7d361b28dc337d0070 SHA256 1e60a72f52149097df2f3de781933d61356116ebf14a414607de0a4ccd6b9c40 -DIST spyview-20091008.tar.gz 4364366 RMD160 28903f0b2600f38dd6b080b4bf103c817c6f150c SHA1 96e554d0fbd03901578398a7b15ef885597b09f9 SHA256 8348a23b3bfa12faef77ec7f3405a758039d5f664799548da67f6585353121f6 -EBUILD spyview-20091008.ebuild 1057 RMD160 c841a5ae8f0d493d36c9e71fe35a43ee13ef6fe8 SHA1 a640c446348037253cf9257e1a7aeaad99c426c0 SHA256 3c403ff6b0eb7a208e3db4f3878ca531e33324c1bfb9a3c322f044a5309883fb -MISC ChangeLog 1692 RMD160 5f9a22d50d1ed85896b46219351535b8a0d7d2e7 SHA1 c622de535fde154ff4ac70e4e237dd981087121b SHA256 e87e8be0ec325bd90c7405dd65954251a6080baef6f9576c294e2214aa9d3fba +AUX spyview-20091104-datadir.patch 930 RMD160 ff32d4b3626aced7df6d12128fa8f26574156eaa SHA1 1bebbc70b3e49380c7ef8c7d361b28dc337d0070 SHA256 1e60a72f52149097df2f3de781933d61356116ebf14a414607de0a4ccd6b9c40 +DIST spyview-20091104.tar.gz 4377285 RMD160 f5c57f2045168600aee023487c80335f842b4f93 SHA1 e62bcfa9102677d35fd188a1c173b77441829130 SHA256 57901e9e7a3e4e68149bd2305b4e27e1aff5d4d4a99ddd3e9f00a69cbdb94f9f +EBUILD spyview-20091104.ebuild 1057 RMD160 b15cbe3016e424e410469a0926e65bbfd87a7748 SHA1 1c8b474e047d9b99368d8aef22ad03ca3d3bf9f1 SHA256 5806b650780946a2f13794c2e1e830e0e8a54d46df536e656d79d30dae5ae302 +MISC ChangeLog 1909 RMD160 8c12132334ef4d4cb51126080cec8568445f84a2 SHA1 0ba21f37e1078aa6b9233e886b60aa1abe2937e1 SHA256 7430676f104e2aea4b5b266825fee6be0ad1fb502e51b64b05ce610573c02481 MISC metadata.xml 171 RMD160 ed284df01c230fc7990a6b5888b39166d23f29ba SHA1 f3d64a69044b710e23fb874b3ee4cd338858c8b4 SHA256 a7b30fbacd0e4c312c07a3efac112a3794c81d134442d8104325734d03425adf diff --git a/sci-visualization/spyview/files/spyview-20091008-datadir.patch b/sci-visualization/spyview/files/spyview-20091008-datadir.patch deleted file mode 100644 index 42d1cda28..000000000 --- a/sci-visualization/spyview/files/spyview-20091008-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-20091104-datadir.patch b/sci-visualization/spyview/files/spyview-20091104-datadir.patch new file mode 100644 index 000000000..42d1cda28 --- /dev/null +++ b/sci-visualization/spyview/files/spyview-20091104-datadir.patch @@ -0,0 +1,23 @@ +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/spyview-20091008.ebuild b/sci-visualization/spyview/spyview-20091008.ebuild deleted file mode 100644 index a90720dc8..000000000 --- a/sci-visualization/spyview/spyview-20091008.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header $ - -EAPI=2 - -inherit base flag-o-matic eutils autotools multilib - -DESCRIPTION="Interactive plotting program" -HOMEPAGE="http://kavli.nano.tudelft.nl/~gsteele/spyview/" -SRC_URI="http://kavli.nano.tudelft.nl/~gsteele/${PN}/versions/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -COMMON_DEPEND=">=dev-libs/boost-1.35 - media-libs/netpbm - >=x11-libs/fltk-1.1.9:1.1 - virtual/ghostscript" - -DEPEND="${COMMON_DEPEND} - sys-apps/groff" - -RDEPEND="${COMMON_DEPEND} - sci-visualization/gnuplot" - -S=${WORKDIR}/spyview-2009-10-08-16_58 - -PATCHES=( "${FILESDIR}"/${P}-datadir.patch ) - -src_prepare() { - base_src_prepare - - append-cflags $(fltk-config --cflags) - append-cxxflags $(fltk-config --cxxflags) -I/usr/include/netpbm - - # append-ldflags $(fltk-config --ldflags) - # this one leads to an insane amount of warnings - - append-ldflags -L/usr/$(get_libdir)/fltk-1.1 - - eautoreconf -} - -src_configure() { - econf --datadir=/usr/share/spyview -} diff --git a/sci-visualization/spyview/spyview-20091104.ebuild b/sci-visualization/spyview/spyview-20091104.ebuild new file mode 100644 index 000000000..19065980b --- /dev/null +++ b/sci-visualization/spyview/spyview-20091104.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header $ + +EAPI=2 + +inherit base flag-o-matic eutils autotools multilib + +DESCRIPTION="Interactive plotting program" +HOMEPAGE="http://kavli.nano.tudelft.nl/~gsteele/spyview/" +SRC_URI="http://kavli.nano.tudelft.nl/~gsteele/${PN}/versions/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +COMMON_DEPEND=">=dev-libs/boost-1.35 + media-libs/netpbm + >=x11-libs/fltk-1.1.9:1.1 + virtual/ghostscript" + +DEPEND="${COMMON_DEPEND} + sys-apps/groff" + +RDEPEND="${COMMON_DEPEND} + sci-visualization/gnuplot" + +S=${WORKDIR}/spyview-2009-11-04-12_40 + +PATCHES=( "${FILESDIR}"/${P}-datadir.patch ) + +src_prepare() { + base_src_prepare + + append-cflags $(fltk-config --cflags) + append-cxxflags $(fltk-config --cxxflags) -I/usr/include/netpbm + + # append-ldflags $(fltk-config --ldflags) + # this one leads to an insane amount of warnings + + append-ldflags -L/usr/$(get_libdir)/fltk-1.1 + + eautoreconf +} + +src_configure() { + econf --datadir=/usr/share/spyview +} -- cgit v1.2.3-65-gdbad