From 737eaddf9832ba69e38e4633e5002412ee08cba7 Mon Sep 17 00:00:00 2001 From: Andreas Hüttel Date: Thu, 8 Oct 2009 16:57:14 +0000 Subject: sci-visualization/spyview: Version bump. Most patches are integrated now. svn path=/sunrise/; revision=9341 --- sci-visualization/spyview/ChangeLog | 8 ++++ sci-visualization/spyview/Manifest | 11 ++--- .../spyview/files/spyview-20090910-assert.patch | 24 ----------- .../spyview/files/spyview-20090910-cmaps.patch | 22 ---------- .../spyview/files/spyview-20090910-datadir.patch | 23 ---------- .../spyview/files/spyview-20090910-fltkjpeg.patch | 22 ---------- .../spyview/files/spyview-20091008-datadir.patch | 23 ++++++++++ sci-visualization/spyview/spyview-20090910.ebuild | 49 ---------------------- sci-visualization/spyview/spyview-20091008.ebuild | 49 ++++++++++++++++++++++ 9 files changed, 84 insertions(+), 147 deletions(-) delete mode 100644 sci-visualization/spyview/files/spyview-20090910-assert.patch delete mode 100644 sci-visualization/spyview/files/spyview-20090910-cmaps.patch delete mode 100644 sci-visualization/spyview/files/spyview-20090910-datadir.patch delete mode 100644 sci-visualization/spyview/files/spyview-20090910-fltkjpeg.patch create mode 100644 sci-visualization/spyview/files/spyview-20091008-datadir.patch delete mode 100644 sci-visualization/spyview/spyview-20090910.ebuild create mode 100644 sci-visualization/spyview/spyview-20091008.ebuild diff --git a/sci-visualization/spyview/ChangeLog b/sci-visualization/spyview/ChangeLog index a444edf78..b6fac5ff5 100644 --- a/sci-visualization/spyview/ChangeLog +++ b/sci-visualization/spyview/ChangeLog @@ -2,6 +2,14 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 08 Oct 2009; Andreas K. Huettel (dilfridge) + -spyview-20090910.ebuild, -files/spyview-20090910-assert.patch, + -files/spyview-20090910-cmaps.patch, + -files/spyview-20090910-datadir.patch, + -files/spyview-20090910-fltkjpeg.patch, +spyview-20091008.ebuild, + +files/spyview-20091008-datadir.patch: + Version bump. Most patches are integrated now. + 20 Sep 2009; Andreas K. Huettel (dilfridge) -spyview-20090828-r1.ebuild, -files/spyview-20090828-cmaps.patch: Removed old version diff --git a/sci-visualization/spyview/Manifest b/sci-visualization/spyview/Manifest index e933f8358..2d070d7cf 100644 --- a/sci-visualization/spyview/Manifest +++ b/sci-visualization/spyview/Manifest @@ -1,8 +1,5 @@ -AUX spyview-20090910-assert.patch 857 RMD160 9b81aac4663125728a6adb8ce201c81cc215990e SHA1 d154b4ae10ae0d7db6697f5daa203cd00ed3f949 SHA256 7f7ada265467dbb4c401831f4c2f9b9d24ba349075dc8d1856786abeec91b0ee -AUX spyview-20090910-cmaps.patch 821 RMD160 9e0048a961ef5737a4bd4945a64db882df50c4ce SHA1 8a605b814f4cd616343e39ecc9ffbfcf1d98e982 SHA256 2561156996de678e2cc20fc99429438323d405d66b4578d9f228ff8ba4314da9 -AUX spyview-20090910-datadir.patch 930 RMD160 ff32d4b3626aced7df6d12128fa8f26574156eaa SHA1 1bebbc70b3e49380c7ef8c7d361b28dc337d0070 SHA256 1e60a72f52149097df2f3de781933d61356116ebf14a414607de0a4ccd6b9c40 -AUX spyview-20090910-fltkjpeg.patch 1435 RMD160 9cebd85eed2e9635c57a3b2964edff352c3111db SHA1 e93da5ba86f947499c26a81c99fb7abc49922d1f SHA256 476be54e3f38f37f33914ab143469639bc56684bfeed783a2d5150e9004f5ccb -DIST spyview-20090910.tar.gz 3432322 RMD160 e929aa3c00f6a1919006d5e5754c5f7cdb9f2ba6 SHA1 0170214dbb6ed8dae500e77fc287b14261049307 SHA256 21348817269fb58cdf9d054f8cd2a7bc6b8e1f16dcfda433489970fbac42fc00 -EBUILD spyview-20090910.ebuild 1081 RMD160 ca2c66962218e8a928a2b1a62674df51fd12d54c SHA1 1c3a1c472bfd12dec1edb07b22f6bf8638927464 SHA256 d8d677cdda03a266b31d03e0f252254ceb9965a62cd308704d0ac62d389f0256 -MISC ChangeLog 1321 RMD160 ede79c324d9552b6ca398a2b7d4d76f234deb847 SHA1 2a426b2501885833b3ba9f51b1005d06fb0ad807 SHA256 bde5420a035150bdbcb0695913c294d639aa56939708be3ab03893260f0fc5ad +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 MISC metadata.xml 171 RMD160 ed284df01c230fc7990a6b5888b39166d23f29ba SHA1 f3d64a69044b710e23fb874b3ee4cd338858c8b4 SHA256 a7b30fbacd0e4c312c07a3efac112a3794c81d134442d8104325734d03425adf diff --git a/sci-visualization/spyview/files/spyview-20090910-assert.patch b/sci-visualization/spyview/files/spyview-20090910-assert.patch deleted file mode 100644 index e4381bf04..000000000 --- a/sci-visualization/spyview/files/spyview-20090910-assert.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -U 9 -r spyview-2009-09-10-00_02.orig/spyview/spyview.C spyview-2009-09-10-00_02/spyview/spyview.C ---- spyview-2009-09-10-00_02.orig/spyview/spyview.C 2009-09-09 13:20:18.000000000 +0200 -+++ spyview-2009-09-10-00_02/spyview/spyview.C 2009-09-11 23:47:14.000000000 +0200 -@@ -843,19 +843,19 @@ - { - spypal->win->show(); - colormap_callback = spypal_cb; - spypal_cb(); - return; - } - else - colormap_callback = NULL; - -- assert(index > 0); -+ assert(index >= 0); //lets see what this does - assert(index < cmapfiles.size()); - - //info("userdata for %s is %d\n", cmapch->value(), index); - const char *filename = cmapfiles[index].c_str(); - //info("loading file _%s_ from index %d, text _%s_\n", cmapfiles[index].c_str(), index, cmapch->text(cmapch->value())); - pixel **image; - pixval maxval; - int rows, cols; - diff --git a/sci-visualization/spyview/files/spyview-20090910-cmaps.patch b/sci-visualization/spyview/files/spyview-20090910-cmaps.patch deleted file mode 100644 index 73132762b..000000000 --- a/sci-visualization/spyview/files/spyview-20090910-cmaps.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -r -U 8 spyview-2009-09-10-00_02.orig/spyview/spyview.C spyview-2009-09-10-00_02/spyview/spyview.C ---- spyview-2009-09-10-00_02.orig/spyview/spyview.C 2009-09-09 13:20:18.000000000 +0200 -+++ spyview-2009-09-10-00_02/spyview/spyview.C 2009-09-10 16:54:32.000000000 +0200 -@@ -124,17 +124,17 @@ - } - else if (fl_filename_isdir((path+namelist[i]->d_name).c_str())) - subdirs.push_back(namelist[i]->d_name); - if ((count != 0) && (count%30 == 0)) - pretty_path += "More/"; - } - for(subdirs_t::iterator i = subdirs.begin(); i != subdirs.end(); i++) - { -- if(*i == "./" || *i == "../") -+ if(*i == "./" || *i == "../" || *i == "") - continue; - find_cmaps(path+*i,pretty_path+*i); - } - } - - int add_file(const char *name) - { - // We store the actual filenames in a STL vector of strings diff --git a/sci-visualization/spyview/files/spyview-20090910-datadir.patch b/sci-visualization/spyview/files/spyview-20090910-datadir.patch deleted file mode 100644 index 42d1cda28..000000000 --- a/sci-visualization/spyview/files/spyview-20090910-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-20090910-fltkjpeg.patch b/sci-visualization/spyview/files/spyview-20090910-fltkjpeg.patch deleted file mode 100644 index 191a42c4f..000000000 --- a/sci-visualization/spyview/files/spyview-20090910-fltkjpeg.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -r -U 8 spyview-2009-09-10-00_02.orig/configure.ac spyview-2009-09-10-00_02/configure.ac ---- spyview-2009-09-10-00_02.orig/configure.ac 2009-09-09 13:20:18.000000000 +0200 -+++ spyview-2009-09-10-00_02/configure.ac 2009-09-10 17:03:43.000000000 +0200 -@@ -56,17 +56,17 @@ - AC_CHECK_LIB(wsock32,main,[],AC_MSG_ERROR([cannot find libwsock32])) - AC_CHECK_LIB(uuid,main,[],AC_MSG_ERROR([cannot find libuuid])) - fi - - AC_LANG_PUSH([C++]) - AC_CHECK_LIB([z], [main], , AC_MSG_ERROR([libz not found])) - AC_CHECK_LIB([png], [main], , AC_MSG_ERROR([libpng not found])) - AC_CHECK_LIB([fltk], [main], , AC_MSG_ERROR([libfltk not found])) --AC_CHECK_LIB([fltk_jpeg], [main], , AC_MSG_ERROR([libz not found])) -+AC_CHECK_LIB([fltk_jpeg], [main], , AC_MSG_WARN([libfltk_jpeg not found - assuming you use system jpeg and continuing anyway])) - AC_CHECK_LIB([fltk_images], [main], , AC_MSG_ERROR([libfltk_images not found])) - AC_CHECK_LIB([fltk_gl], [main], ,AC_MSG_ERROR([libfltk_gl not found])) - AC_CHECK_LIB([boost_serialization],[main],,AC_CHECK_LIB([boost_serialization-mt],[main],,AC_MSG_ERROR([libboost-serialization-dev library not found.]))) - AC_CHECK_LIB([boost_regex],[main],,AC_CHECK_LIB([boost_regex-mt],[main],,AC_MSG_ERROR([libboost-regex-dev library not found.]))) - AC_LANG_POP - - #AC_CHECK_LIB([gnuplot_i], [gnuplot_init], , AC_MSG_ERROR([libgnuplot_i not found])) - #AC_CHECK_LIB([pgm], [main], , AC_MSG_ERROR([libpgm not found])) diff --git a/sci-visualization/spyview/files/spyview-20091008-datadir.patch b/sci-visualization/spyview/files/spyview-20091008-datadir.patch new file mode 100644 index 000000000..42d1cda28 --- /dev/null +++ b/sci-visualization/spyview/files/spyview-20091008-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-20090910.ebuild b/sci-visualization/spyview/spyview-20090910.ebuild deleted file mode 100644 index c04d3f902..000000000 --- a/sci-visualization/spyview/spyview-20090910.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.36 - 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-09-10-00_02 - -PATCHES=( "${FILESDIR}"/${P}-{cmaps,fltkjpeg,datadir,assert}.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-20091008.ebuild b/sci-visualization/spyview/spyview-20091008.ebuild new file mode 100644 index 000000000..a90720dc8 --- /dev/null +++ b/sci-visualization/spyview/spyview-20091008.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-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 +} -- cgit v1.2.3-65-gdbad