New revision compiles with gcc-4.3 and libsigc++-2.2 (see bug #220493).

(Portage version: 2.1.5_rc6)

6 files changed, 450 insertions, 17 deletions

diff --git a/sci-visualization/quickplot/ChangeLog b/sci-visualization/quickplot/ChangeLog
index bd7d7c78bc95..d099f2fb634d 100644
--- a/sci-visualization/quickplot/ChangeLog
+++ b/sci-visualization/quickplot/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-visualization/quickplot
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/quickplot/ChangeLog,v 1.5 2008/02/29 20:41:36 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/quickplot/ChangeLog,v 1.6 2008/05/06 14:17:17 markusle Exp $
+
+*quickplot-0.8.13-r1 (06 May 2008)
+
+  06 May 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/quickplot-0.8.13-gcc43.patch,
+  +files/quickplot-0.8.13-libsigc++-2.2.patch, quickplot-0.8.5.ebuild,
+  quickplot-0.8.13.ebuild, +quickplot-0.8.13-r1.ebuild:
+  New revision compiles with gcc-4.3 and libsigc++-2.2 (see bug #220493).
+  Thanks much to Peter Alfredsen <peter.alfredsen@gmail.com> for his
+  patches.
 
   29 Feb 2008; Carsten Lohrke <carlo@gentoo.org> quickplot-0.8.5.ebuild,
   quickplot-0.8.13.ebuild:
diff --git a/sci-visualization/quickplot/files/quickplot-0.8.13-gcc43.patch b/sci-visualization/quickplot/files/quickplot-0.8.13-gcc43.patch
new file mode 100644
index 000000000000..14bdc39dc7f0
--- /dev/null
+++ b/sci-visualization/quickplot/files/quickplot-0.8.13-gcc43.patch
@@ -0,0 +1,48 @@
+diff -Naur quickplot-0.8.13/App.h quickplot-0.8.13.new/App.h
+--- quickplot-0.8.13/App.h	2006-08-04 11:33:36.000000000 -0400
++++ quickplot-0.8.13.new/App.h	2008-05-06 09:59:36.000000000 -0400
+@@ -41,7 +41,7 @@
+   
+  public:
+ 
+-  App(int *argv, char ***argv);
++  App(int *argc, char ***argv);
+   virtual ~App(void);
+ 
+ 
+diff -Naur quickplot-0.8.13/Graph.cpp quickplot-0.8.13.new/Graph.cpp
+--- quickplot-0.8.13/Graph.cpp	2006-08-05 11:45:34.000000000 -0400
++++ quickplot-0.8.13.new/Graph.cpp	2008-05-06 09:59:36.000000000 -0400
+@@ -42,6 +42,8 @@
+ #define ZRO        ((value_t) 0.0)
+ #define ABSVAL(x)  (((x) > 0)? (x) : (-(x)))
+ 
++#include <cstring>
++
+ 
+ 
+ Graph::Graph(MainWindow *mainWindow_in):
+diff -Naur quickplot-0.8.13/MainWindow.cpp quickplot-0.8.13.new/MainWindow.cpp
+--- quickplot-0.8.13/MainWindow.cpp	2006-08-07 14:12:11.000000000 -0400
++++ quickplot-0.8.13.new/MainWindow.cpp	2008-05-06 09:59:36.000000000 -0400
+@@ -40,6 +40,8 @@
+ 
+ #include "quickplot_icon.xpm"
+ 
++#include <cstring>
++
+ 
+ // from file: help_html.cpp which was generated from help.html.in
+ extern const char *help_html;
+diff -Naur quickplot-0.8.13/Plot.cpp quickplot-0.8.13.new/Plot.cpp
+--- quickplot-0.8.13/Plot.cpp	2006-08-03 16:56:56.000000000 -0400
++++ quickplot-0.8.13.new/Plot.cpp	2008-05-06 09:59:36.000000000 -0400
+@@ -31,6 +31,8 @@
+ #include "Graph.h"
+ #include "Globel.h"
+ 
++#include <cstring>
++
+ 
+ // SPACE is the fraction of blank space on graphing area for the first
+ // auto zoom level.  The blank space is split evenly between the top
diff --git a/sci-visualization/quickplot/files/quickplot-0.8.13-libsigc++-2.2.patch b/sci-visualization/quickplot/files/quickplot-0.8.13-libsigc++-2.2.patch
new file mode 100644
index 000000000000..8240505f06dd
--- /dev/null
+++ b/sci-visualization/quickplot/files/quickplot-0.8.13-libsigc++-2.2.patch
@@ -0,0 +1,320 @@
+diff -Naur quickplot-0.8.13/Graph.cpp quickplot-0.8.13.new/Graph.cpp
+--- quickplot-0.8.13/Graph.cpp	2006-08-05 11:45:34.000000000 -0400
++++ quickplot-0.8.13.new/Graph.cpp	2008-05-06 09:58:18.000000000 -0400
+@@ -1180,31 +1180,31 @@
+ 
+ 
+ 
+-SigC::Signal1<void, Graph *> Graph::signal_addedPlot(void)
++sigc::signal1<void, Graph *> Graph::signal_addedPlot(void)
+ {
+   return m_signal_addedPlot;
+ }
+ 
+-SigC::Signal2<void, Graph *, Plot *> Graph::signal_removedPlot(void)
++sigc::signal2<void, Graph *, Plot *> Graph::signal_removedPlot(void)
+ {
+   return m_signal_removedPlot;
+ }
+ 
+-SigC::Signal1<void, Graph *> Graph::m_signal_addedPlot;
++sigc::signal1<void, Graph *> Graph::m_signal_addedPlot;
+ 
+-SigC::Signal2<void, Graph *, Plot *> Graph::m_signal_removedPlot;
++sigc::signal2<void, Graph *, Plot *> Graph::m_signal_removedPlot;
+ 
+ 
+ 
+-SigC::Signal1<void, Graph *> Graph::signal_changedSameScale(void)
++sigc::signal1<void, Graph *> Graph::signal_changedSameScale(void)
+ {
+   return m_signal_changedSameScale;
+ }
+ 
+-SigC::Signal1<void, Graph *> Graph::m_signal_changedSameScale;
++sigc::signal1<void, Graph *> Graph::m_signal_changedSameScale;
+ 
+ 
+-SigC::Signal0<void> Graph::signal_backgroundColorChanged(void)
++sigc::signal0<void> Graph::signal_backgroundColorChanged(void)
+ {
+   return m_signal_backgroundColorChanged;
+ }
+diff -Naur quickplot-0.8.13/Graph.h quickplot-0.8.13.new/Graph.h
+--- quickplot-0.8.13/Graph.h	2006-08-03 16:56:56.000000000 -0400
++++ quickplot-0.8.13.new/Graph.h	2008-05-06 09:58:18.000000000 -0400
+@@ -68,10 +68,10 @@
+   inline bool isShowingGrid() { return (showAutoGrid && isSameScale); }
+   /************************************************************/
+ 
+-  static SigC::Signal1<void, Graph *> signal_changedSameScale(void);
+-  static SigC::Signal1<void, Graph *> signal_addedPlot(void);
+-  static SigC::Signal2<void, Graph *, Plot *> signal_removedPlot(void);
+-  SigC::Signal0<void> signal_backgroundColorChanged(void);
++  static sigc::signal1<void, Graph *> signal_changedSameScale(void);
++  static sigc::signal1<void, Graph *> signal_addedPlot(void);
++  static sigc::signal2<void, Graph *, Plot *> signal_removedPlot(void);
++  sigc::signal0<void> signal_backgroundColorChanged(void);
+ 
+   
+   Gdk::Color gridColor, backgroundColor;
+@@ -105,12 +105,12 @@
+ 
+   void setStatusXYValues(gdouble x, gdouble y);
+   
+-  static SigC::Signal1<void, Graph *> m_signal_changedSameScale;
++  static sigc::signal1<void, Graph *> m_signal_changedSameScale;
+   
+-  static SigC::Signal1<void, Graph *> m_signal_addedPlot;
+-  static SigC::Signal2<void, Graph *, Plot *> m_signal_removedPlot;
++  static sigc::signal1<void, Graph *> m_signal_addedPlot;
++  static sigc::signal2<void, Graph *, Plot *> m_signal_removedPlot;
+ 
+-  SigC::Signal0<void> m_signal_backgroundColorChanged;
++  sigc::signal0<void> m_signal_backgroundColorChanged;
+ 
+   
+   // used by createPlot(Field *x, Field *y) 
+diff -Naur quickplot-0.8.13/MainWindow.cpp quickplot-0.8.13.new/MainWindow.cpp
+--- quickplot-0.8.13/MainWindow.cpp	2006-08-07 14:12:11.000000000 -0400
++++ quickplot-0.8.13.new/MainWindow.cpp	2008-05-06 09:58:18.000000000 -0400
+@@ -760,7 +760,7 @@
+   gtk_idle_add(copyGraphNotebooks, d);
+ }
+ 
+-SigC::Signal1<void, Graph *> GraphsNotebook::signal_tabLabelChanged(void)
++sigc::signal1<void, Graph *> GraphsNotebook::signal_tabLabelChanged(void)
+ {
+   return m_signal_tabLabelChanged;
+ }
+diff -Naur quickplot-0.8.13/MainWindow.h quickplot-0.8.13.new/MainWindow.h
+--- quickplot-0.8.13/MainWindow.h	2006-08-03 16:56:56.000000000 -0400
++++ quickplot-0.8.13.new/MainWindow.h	2008-05-06 09:58:18.000000000 -0400
+@@ -19,8 +19,8 @@
+   // method???  It's not listed.
+   void set_show_tabs(bool show_tabs = true);
+ 
+-  SigC::Signal1<void, Graph *> signal_tabLabelChanged(void);
+-  SigC::Signal1<void, Graph *> m_signal_tabLabelChanged;
++  sigc::signal1<void, Graph *> signal_tabLabelChanged(void);
++  sigc::signal1<void, Graph *> m_signal_tabLabelChanged;
+   
+ private:
+   MainWindow *mainWindow;
+diff -Naur quickplot-0.8.13/Plot.cpp quickplot-0.8.13.new/Plot.cpp
+--- quickplot-0.8.13/Plot.cpp	2006-08-03 16:56:56.000000000 -0400
++++ quickplot-0.8.13.new/Plot.cpp	2008-05-06 09:58:18.000000000 -0400
+@@ -503,7 +503,7 @@
+ 
+ // Emitted when the lineColor, pointColor, lineWidth or pointSize
+ // changes.
+-SigC::Signal0<void> Plot::signal_changed(void)
++sigc::signal0<void> Plot::signal_changed(void)
+ {
+   return m_signal_changed;
+ }
+@@ -663,7 +663,7 @@
+   m_signal_valueDisplay.emit(xpick, ypick);           
+ }
+ 
+-SigC::Signal2<void, value_t, value_t> Plot::signal_valueDisplay(void)
++sigc::signal2<void, value_t, value_t> Plot::signal_valueDisplay(void)
+ {
+   return m_signal_valueDisplay;
+ }
+diff -Naur quickplot-0.8.13/Plot.h quickplot-0.8.13.new/Plot.h
+--- quickplot-0.8.13/Plot.h	2006-08-03 16:56:56.000000000 -0400
++++ quickplot-0.8.13.new/Plot.h	2008-05-06 09:58:18.000000000 -0400
+@@ -101,14 +101,14 @@
+ 
+   // Emitted when the lineColor, pointColor, lineWidth, pointSize,
+   // showLines and showPoints.
+-  SigC::Signal0<void> signal_changed(void);
++  sigc::signal0<void> signal_changed(void);
+ 
+   
+   int emitDisplayValues(int X);
+   void emitInterpolatedDisplayValues(int X);
+   void emitDisplayValues(int X, int Y);
+ 
+-  SigC::Signal2<void, value_t, value_t> signal_valueDisplay(void);
++  sigc::signal2<void, value_t, value_t> signal_valueDisplay(void);
+   
+   value_t xpick, ypick;
+ 
+@@ -118,9 +118,9 @@
+ 
+   bool showPoints, showLines;
+   
+-  SigC::Signal0<void> m_signal_changed;
++  sigc::signal0<void> m_signal_changed;
+ 
+-  SigC::Signal2<void, value_t, value_t> m_signal_valueDisplay;
++  sigc::signal2<void, value_t, value_t> m_signal_valueDisplay;
+ 
+   Gdk::Color lineColor, pointColor;
+ 
+diff -Naur quickplot-0.8.13/PlotConfig.h quickplot-0.8.13.new/PlotConfig.h
+--- quickplot-0.8.13/PlotConfig.h	2006-08-03 16:56:56.000000000 -0400
++++ quickplot-0.8.13.new/PlotConfig.h	2008-05-06 09:58:18.000000000 -0400
+@@ -52,7 +52,7 @@
+   ValueSlider pointSizeVS;
+   // RadioButton style1, style2 etc ...
+ 
+-  SigC::Connection plotChanged_connection;
++  sigc::connection plotChanged_connection;
+ 
+   void setValues(void);
+   
+diff -Naur quickplot-0.8.13/PlotLister.h quickplot-0.8.13.new/PlotLister.h
+--- quickplot-0.8.13/PlotLister.h	2006-08-03 16:56:56.000000000 -0400
++++ quickplot-0.8.13.new/PlotLister.h	2008-05-06 09:58:18.000000000 -0400
+@@ -24,7 +24,7 @@
+   Glib::RefPtr<Gdk::Window> win;
+   Glib::RefPtr<Gdk::GC> gc;
+ 
+-  SigC::Connection plotChangeConnection, bgConnection;
++  sigc::connection plotChangeConnection, bgConnection;
+ };
+ 
+ 
+@@ -52,14 +52,14 @@
+   Table *table;
+   MainWindow *mainWindow;
+   Plot *plot;
+-  SigC::Connection valueDisplay_connection, makePlotConfig_connection;
++  sigc::connection valueDisplay_connection, makePlotConfig_connection;
+   
+   void add(Widget &w, int col);
+   void makePlotConfig(void);
+   //void setLabelSize(Entry &l);
+   //void afterRealize(void);
+ 
+-  //SigC::Connection afterRealizeConnection;
++  //sigc::connection afterRealizeConnection;
+ };
+ 
+ 
+diff -Naur quickplot-0.8.13/Source.cpp quickplot-0.8.13.new/Source.cpp
+--- quickplot-0.8.13/Source.cpp	2006-08-03 16:56:56.000000000 -0400
++++ quickplot-0.8.13.new/Source.cpp	2008-05-06 09:58:18.000000000 -0400
+@@ -207,18 +207,18 @@
+ }
+ 
+ 
+-SigC::Signal1<void, Source *> Source::signal_addedSource()
++sigc::signal1<void, Source *> Source::signal_addedSource()
+ {
+   return m_signal_addedSource;
+ }
+ 
+-SigC::Signal1<void, Source *> Source::m_signal_addedSource;
++sigc::signal1<void, Source *> Source::m_signal_addedSource;
+ 
+ 
+-SigC::Signal1<void, Source *> Source::signal_removedSource()
++sigc::signal1<void, Source *> Source::signal_removedSource()
+ {
+   return m_signal_removedSource;
+ }
+ 
+-SigC::Signal1<void, Source *> Source::m_signal_removedSource;
++sigc::signal1<void, Source *> Source::m_signal_removedSource;
+ 
+diff -Naur quickplot-0.8.13/Source.h quickplot-0.8.13.new/Source.h
+--- quickplot-0.8.13/Source.h	2006-08-03 16:56:56.000000000 -0400
++++ quickplot-0.8.13.new/Source.h	2008-05-06 09:58:18.000000000 -0400
+@@ -50,8 +50,8 @@
+   inline const enum  TYPE getType(void){ return type; }
+   inline const char *getTypeString(void){ return TYPE_STRING[type]; }
+ 
+-  static SigC::Signal1<void, Source *> signal_addedSource();
+-  static SigC::Signal1<void, Source *> signal_removedSource();
++  static sigc::signal1<void, Source *> signal_addedSource();
++  static sigc::signal1<void, Source *> signal_removedSource();
+ 
+   // Delete this object later.
+   void deleteLater(void);
+@@ -61,8 +61,8 @@
+   
+ protected:
+   
+-  static SigC::Signal1<void, Source *> m_signal_addedSource;
+-  static SigC::Signal1<void, Source *> m_signal_removedSource;
++  static sigc::signal1<void, Source *> m_signal_addedSource;
++  static sigc::signal1<void, Source *> m_signal_removedSource;
+ 
+   inline void setType(enum TYPE t) { type = t; }
+   char *fileName, *baseFileName;
+diff -Naur quickplot-0.8.13/ValueSlider.cpp quickplot-0.8.13.new/ValueSlider.cpp
+--- quickplot-0.8.13/ValueSlider.cpp	2006-08-03 16:56:56.000000000 -0400
++++ quickplot-0.8.13.new/ValueSlider.cpp	2008-05-06 09:58:18.000000000 -0400
+@@ -175,7 +175,7 @@
+   }
+ }
+ 
+-SigC::Signal0<void> ValueSlider::signal_valueChanged()
++sigc::signal0<void> ValueSlider::signal_valueChanged()
+ {
+   return m_signal_valueChanged;
+ }
+@@ -329,7 +329,7 @@
+   }
+ }
+ 
+-SigC::Signal0<void> DoubleValueSlider::signal_valueChanged()
++sigc::signal0<void> DoubleValueSlider::signal_valueChanged()
+ {
+   return m_signal_valueChanged;
+ }
+@@ -479,7 +479,7 @@
+   return (int) pow(10.0, value);
+ }
+ 
+-SigC::Signal0<void> LogValueSlider::signal_valueChanged()
++sigc::signal0<void> LogValueSlider::signal_valueChanged()
+ {
+   return m_signal_valueChanged;
+ }
+diff -Naur quickplot-0.8.13/ValueSlider.h quickplot-0.8.13.new/ValueSlider.h
+--- quickplot-0.8.13/ValueSlider.h	2006-08-03 16:56:56.000000000 -0400
++++ quickplot-0.8.13.new/ValueSlider.h	2008-05-06 09:58:18.000000000 -0400
+@@ -20,10 +20,10 @@
+   double maxmax;
+ 
+ public:
+-  SigC::Signal0<void> signal_valueChanged();
++  sigc::signal0<void> signal_valueChanged();
+ 
+ private:
+-  SigC::Signal0<void> m_signal_valueChanged;
++  sigc::signal0<void> m_signal_valueChanged;
+ 
+   bool setScaleToEntry(void);
+ 
+@@ -53,10 +53,10 @@
+   double value, maxmax;
+ 
+ public:
+-  SigC::Signal0<void> signal_valueChanged();
++  sigc::signal0<void> signal_valueChanged();
+ 
+ private:
+-  SigC::Signal0<void> m_signal_valueChanged;
++  sigc::signal0<void> m_signal_valueChanged;
+ 
+   bool setScaleToEntry(void);
+ 
+@@ -88,10 +88,10 @@
+   double value;
+ 
+ public:
+-  SigC::Signal0<void> signal_valueChanged();
++  sigc::signal0<void> signal_valueChanged();
+ 
+ private:
+-  SigC::Signal0<void> m_signal_valueChanged;
++  sigc::signal0<void> m_signal_valueChanged;
+ 
+   bool setScaleToEntry(void);
+ 
diff --git a/sci-visualization/quickplot/quickplot-0.8.13-r1.ebuild b/sci-visualization/quickplot/quickplot-0.8.13-r1.ebuild
new file mode 100644
index 000000000000..96384e6c2fa5
--- /dev/null
+++ b/sci-visualization/quickplot/quickplot-0.8.13-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/quickplot/quickplot-0.8.13-r1.ebuild,v 1.1 2008/05/06 14:17:17 markusle Exp $
+
+inherit eutils
+
+DESCRIPTION="A fast interactive 2D plotter."
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://quickplot.sourceforge.net/"
+
+IUSE="sndfile"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND=">=dev-cpp/gtkmm-2.4.5
+	sndfile? ( >=media-libs/libsndfile-1.0.5 )
+	>=dev-libs/libsigc++-2"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.15"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-libsigc++-2.2.patch
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+
+	# Some files have been moved around to more appropriate locations
+	sed -i -e 's|quickplot_icon.png|/usr/share/pixmaps/quickplot.png|' \
+		index.html.in
+	sed -i -e 's|href="ChangeLog"|href="../ChangeLog.gz"|' index.html.in
+	sed -i -e 's|href="COPYING"|href="/usr/portage/licenses/GPL-2"|' \
+		about.html.in
+}
+
+src_compile() {
+	econf `use_with sndfile libsndfile` || die "econf step failed."
+	emake htmldir=/usr/share/doc/${PF}/html || die "emake step failed."
+}
+
+src_install () {
+	make install DESTDIR="${D}" htmldir=/usr/share/doc/${PF}/html \
+		|| die "make install step failed."
+	dodoc AUTHORS ChangeLog README README.devel TODO
+	# Remove COPYING as it is specified in LICENCE. Move other stuff.
+	cd "${D}"/usr/share/doc/${PF}/html
+	rm COPYING quickplot_icon.png ChangeLog
+	mv "${D}"/usr/share/pixmaps/quickplot_icon.png \
+		"${D}"/usr/share/pixmaps/quickplot.png
+	make_desktop_entry 'quickplot --no-pipe' Quickplot quickplot Graphics
+	mv "${D}"/usr/share/applications/quickplot\ --no-pipe.desktop \
+		"${D}"/usr/share/applications/quickplot.desktop
+}
diff --git a/sci-visualization/quickplot/quickplot-0.8.13.ebuild b/sci-visualization/quickplot/quickplot-0.8.13.ebuild
index da71d5737a6b..f048852258ad 100644
--- a/sci-visualization/quickplot/quickplot-0.8.13.ebuild
+++ b/sci-visualization/quickplot/quickplot-0.8.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/quickplot/quickplot-0.8.13.ebuild,v 1.3 2008/02/29 20:41:36 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/quickplot/quickplot-0.8.13.ebuild,v 1.4 2008/05/06 14:17:17 markusle Exp $
 
 inherit eutils
 
@@ -21,7 +21,7 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	# Some files have been moved around to more appropriate locations
 	sed -i -e 's|quickplot_icon.png|/usr/share/pixmaps/quickplot.png|' \
 		index.html.in
@@ -36,15 +36,15 @@ src_compile() {
 }
 
 src_install () {
-	make install DESTDIR=${D} htmldir=/usr/share/doc/${PF}/html \
+	make install DESTDIR="${D}" htmldir=/usr/share/doc/${PF}/html \
 		|| die "make install step failed."
 	dodoc AUTHORS ChangeLog README README.devel TODO
 	# Remove COPYING as it is specified in LICENCE. Move other stuff.
-	cd ${D}/usr/share/doc/${PF}/html
+	cd "${D}"/usr/share/doc/${PF}/html
 	rm COPYING quickplot_icon.png ChangeLog
-	mv ${D}/usr/share/pixmaps/quickplot_icon.png \
-		${D}/usr/share/pixmaps/quickplot.png
+	mv "${D}"/usr/share/pixmaps/quickplot_icon.png \
+		"${D}"/usr/share/pixmaps/quickplot.png
 	make_desktop_entry 'quickplot --no-pipe' Quickplot quickplot Graphics
-	mv ${D}/usr/share/applications/quickplot\ --no-pipe.desktop \
-		${D}/usr/share/applications/quickplot.desktop
+	mv "${D}"/usr/share/applications/quickplot\ --no-pipe.desktop \
+		"${D}"/usr/share/applications/quickplot.desktop
 }
diff --git a/sci-visualization/quickplot/quickplot-0.8.5.ebuild b/sci-visualization/quickplot/quickplot-0.8.5.ebuild
index 2d1991769a72..d8e8c9a47056 100644
--- a/sci-visualization/quickplot/quickplot-0.8.5.ebuild
+++ b/sci-visualization/quickplot/quickplot-0.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/quickplot/quickplot-0.8.5.ebuild,v 1.2 2008/02/29 20:41:36 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/quickplot/quickplot-0.8.5.ebuild,v 1.3 2008/05/06 14:17:17 markusle Exp $
 
 inherit eutils
 
@@ -21,7 +21,7 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	# Some files have been moved around to more appropriate locations
 	sed -i -e 's|quickplot_icon.png|/usr/share/pixmaps/quickplot.png|' \
 		index.html.in
@@ -36,15 +36,15 @@ src_compile() {
 }
 
 src_install () {
-	make install DESTDIR=${D} htmldir=/usr/share/doc/${PF}/html \
+	make install DESTDIR="${D}" htmldir=/usr/share/doc/${PF}/html \
 		|| die "make install step failed."
 	dodoc AUTHORS ChangeLog README README.devel TODO
 	# Remove COPYING as it is specified in LICENCE. Move other stuff.
-	cd ${D}/usr/share/doc/${PF}/html
+	cd "${D}"/usr/share/doc/${PF}/html
 	rm COPYING quickplot_icon.png ChangeLog
-	mv ${D}/usr/share/pixmaps/quickplot_icon.png \
-		${D}/usr/share/pixmaps/quickplot.png
+	mv "${D}"/usr/share/pixmaps/quickplot_icon.png \
+		"${D}"/usr/share/pixmaps/quickplot.png
 	make_desktop_entry 'quickplot --no-pipe' Quickplot quickplot Graphics
-	mv ${D}/usr/share/applications/quickplot\ --no-pipe.desktop \
-		${D}/usr/share/applications/quickplot.desktop
+	mv "${D}"/usr/share/applications/quickplot\ --no-pipe.desktop \
+		"${D}"/usr/share/applications/quickplot.desktop
 }