Version bumped, bug #176945.

(Portage version: 2.1.2.2)

7 files changed, 16 insertions, 122 deletions

diff --git a/media-gfx/surf/ChangeLog b/media-gfx/surf/ChangeLog
index 45c9e1e61331..d69260ebda48 100644
--- a/media-gfx/surf/ChangeLog
+++ b/media-gfx/surf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/surf
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/surf/ChangeLog,v 1.5 2007/02/09 03:38:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/surf/ChangeLog,v 1.6 2007/05/03 23:33:46 matsuu Exp $
+
+*surf-1.0.5 (03 May 2007)
+
+  03 May 2007; MATSUU Takuto <matsuu@gentoo.org> +surf-1.0.5.ebuild:
+  Version bumped, bug #176945.
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/media-gfx/surf/files/digest-surf-1.0.4 b/media-gfx/surf/files/digest-surf-1.0.4
deleted file mode 100644
index d968b86db79f..000000000000
--- a/media-gfx/surf/files/digest-surf-1.0.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4880ecf3d4207ab0a4f2a2f017383b65 surf-1.0.4.tar.gz 460776
-RMD160 2944035b18a877973a6690e9fc97468ad0c7b245 surf-1.0.4.tar.gz 460776
-SHA256 1a3c7f5987037a17f2827a69e507f2c2aad6e44417d9fe0a12587e09345a4bc7 surf-1.0.4.tar.gz 460776
diff --git a/media-gfx/surf/files/digest-surf-1.0.4-r1 b/media-gfx/surf/files/digest-surf-1.0.4-r1
deleted file mode 100644
index d968b86db79f..000000000000
--- a/media-gfx/surf/files/digest-surf-1.0.4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4880ecf3d4207ab0a4f2a2f017383b65 surf-1.0.4.tar.gz 460776
-RMD160 2944035b18a877973a6690e9fc97468ad0c7b245 surf-1.0.4.tar.gz 460776
-SHA256 1a3c7f5987037a17f2827a69e507f2c2aad6e44417d9fe0a12587e09345a4bc7 surf-1.0.4.tar.gz 460776
diff --git a/media-gfx/surf/files/digest-surf-1.0.5 b/media-gfx/surf/files/digest-surf-1.0.5
new file mode 100644
index 000000000000..9c1677e31605
--- /dev/null
+++ b/media-gfx/surf/files/digest-surf-1.0.5
@@ -0,0 +1,3 @@
+MD5 e19fbfdeffd60e8b178be89aeb43f7b1 surf-1.0.5.tar.gz 433369
+RMD160 aa48172bb938831b20c19f16596e37182de44802 surf-1.0.5.tar.gz 433369
+SHA256 54ae9b0298e85ba1ca265c8517a5adecbdf570563dcaedd9c3255e6e6a5e8afd surf-1.0.5.tar.gz 433369
diff --git a/media-gfx/surf/files/surf-1.0.4-gcc33.patch b/media-gfx/surf/files/surf-1.0.4-gcc33.patch
deleted file mode 100644
index 22fb311cd18e..000000000000
--- a/media-gfx/surf/files/surf-1.0.4-gcc33.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -Naur surf-1.0.4.orig/gtkgui/MainWindowController.cc surf-1.0.4/gtkgui/MainWindowController.cc
---- surf-1.0.4.orig/gtkgui/MainWindowController.cc	2000-07-22 06:04:44.000000000 +0900
-+++ surf-1.0.4/gtkgui/MainWindowController.cc	2004-06-30 12:40:35.406192088 +0900
-@@ -28,7 +28,7 @@
- 
- #include <gtk/gtkitemfactory.h>
- 
--#include <strstream.h>
-+#include <strstream>
- 
- // #define DEBUG
- #include "debug.h"
-diff -Naur surf-1.0.4.orig/gtkgui/Requester.cc surf-1.0.4/gtkgui/Requester.cc
---- surf-1.0.4.orig/gtkgui/Requester.cc	2000-03-13 02:02:00.000000000 +0900
-+++ surf-1.0.4/gtkgui/Requester.cc	2004-06-30 12:40:21.682104294 +0900
-@@ -25,7 +25,7 @@
- 
- #include <assert.h>
- #include <iostream.h>
--#include <strstream.h>
-+#include <strstream>
- 
- #include <gtk/gtk.h>
- 
-diff -Naur surf-1.0.4.orig/gtkgui/SaveImageDialog.cc surf-1.0.4/gtkgui/SaveImageDialog.cc
---- surf-1.0.4.orig/gtkgui/SaveImageDialog.cc	2000-03-13 02:02:00.000000000 +0900
-+++ surf-1.0.4/gtkgui/SaveImageDialog.cc	2004-06-30 12:39:59.337217644 +0900
-@@ -23,10 +23,12 @@
-  */
- 
- 
--#include <strstream.h>
-+#include <strstream>
- 
- #include "SaveImageDialog.h"
- 
-+using std::ostrstream;
-+
- void SaveImageDialog::toggled_dither_method (GtkWidget *w, gpointer data)
- {
- 	SaveImageDialog *sid = (SaveImageDialog *)data;
-diff -Naur surf-1.0.4.orig/gtkgui/mycolor.cc surf-1.0.4/gtkgui/mycolor.cc
---- surf-1.0.4.orig/gtkgui/mycolor.cc	2000-06-14 21:32:52.000000000 +0900
-+++ surf-1.0.4/gtkgui/mycolor.cc	2004-06-30 12:39:24.224109990 +0900
-@@ -26,7 +26,7 @@
- #include <assert.h>
- #include <iostream.h>
- #include <stdlib.h>
--#include <strstream.h>
-+#include <strstream>
- 
- #include <gtk/gtk.h>
- #include <gdk/gdk.h>
-diff -Naur surf-1.0.4.orig/misc/Misc.h surf-1.0.4/misc/Misc.h
---- surf-1.0.4.orig/misc/Misc.h	2000-03-13 02:02:00.000000000 +0900
-+++ surf-1.0.4/misc/Misc.h	2004-06-30 12:38:58.375711455 +0900
-@@ -26,7 +26,9 @@
- #ifndef MISC_H
- #define MISC_H
- 
--#include <strstream.h>
-+#include <strstream>
-+
-+using std::ostrstream;
- 
- class Misc
- {
diff --git a/media-gfx/surf/surf-1.0.4.ebuild b/media-gfx/surf/surf-1.0.4.ebuild
deleted file mode 100644
index f47ae425e17d..000000000000
--- a/media-gfx/surf/surf-1.0.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/surf/surf-1.0.4.ebuild,v 1.2 2004/06/24 22:50:30 agriffis Exp $
-
-DESCRIPTION="a tool to visualize algebraic curves and algebraic surfaces"
-HOMEPAGE="http://surf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/surf/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-SLOT="0"
-IUSE="gtk"
-
-RDEPEND="gtk? ( =x11-libs/gtk+-1.2* )
-	>=dev-libs/gmp-2
-	media-libs/tiff
-	media-libs/jpeg"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/flex-2.5"
-
-src_compile(){
-	econf `use_enable gtk gui` || die
-	emake || die
-}
-
-src_install(){
-	make DESTDIR=${D} install install-man || die
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-	for d in examples/*
-	do
-		docinto ${d}
-		dodoc ${d}/*
-	done
-}
diff --git a/media-gfx/surf/surf-1.0.4-r1.ebuild b/media-gfx/surf/surf-1.0.5.ebuild
index c8e49db8ec87..196d59eeebc9 100644
--- a/media-gfx/surf/surf-1.0.4-r1.ebuild
+++ b/media-gfx/surf/surf-1.0.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/surf/surf-1.0.4-r1.ebuild,v 1.3 2004/07/14 18:31:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/surf/surf-1.0.5.ebuild,v 1.1 2007/05/03 23:33:46 matsuu Exp $
 
 inherit eutils
 
@@ -9,33 +9,28 @@ HOMEPAGE="http://surf.sourceforge.net/"
 SRC_URI="mirror://sourceforge/surf/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 SLOT="0"
 IUSE="gtk"
 
 RDEPEND="gtk? ( =x11-libs/gtk+-1.2* )
 	>=dev-libs/gmp-2
+	sys-libs/zlib
 	media-libs/tiff
 	media-libs/jpeg"
 
 DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gcc33.patch
-}
-
 src_compile() {
-	econf `use_enable gtk gui` || die
+	econf $(use_enable gtk gui) || die
 	emake || die
 }
 
 src_install() {
-	make DESTDIR=${D} install install-man || die
+	emake DESTDIR="${D}" install install-man || die
 
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+	dodoc AUTHORS ChangeLog NEWS README TODO
 	for d in examples/*
 	do
 		docinto ${d}