Fix prefix #197968 and remove cruft.

(Portage version: 2.1.3.9)

7 files changed, 12 insertions, 40 deletions

diff --git a/x11-misc/vym/ChangeLog b/x11-misc/vym/ChangeLog
index bbed6d2e3caf..d9c001818e5e 100644
--- a/x11-misc/vym/ChangeLog
+++ b/x11-misc/vym/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/vym
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/vym/ChangeLog,v 1.15 2007/11/03 13:49:31 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/vym/ChangeLog,v 1.16 2007/11/03 16:54:25 coldwind Exp $
+
+*vym-1.10.0-r1 (03 Nov 2007)
+
+  03 Nov 2007; Santiago M. Mola <coldwind@gentoo.org>
+  -files/01_all_linkablemapobj-math.patch, -files/03_gcc41.patch,
+  -files/50_Makefile-1.8.0.patch, -files/02_all_misc-math.patch,
+  -vym-1.10.0.ebuild, +vym-1.10.0-r1.ebuild:
+  Fix prefix #197968 and remove cruft.
 
   03 Nov 2007; Santiago M. Mola <coldwind@gentoo.org> vym-1.10.0.ebuild:
   Check for qt3support, #197952
diff --git a/x11-misc/vym/files/01_all_linkablemapobj-math.patch b/x11-misc/vym/files/01_all_linkablemapobj-math.patch
deleted file mode 100644
index 83663626f24b..000000000000
--- a/x11-misc/vym/files/01_all_linkablemapobj-math.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- vym-1.7.0.orig/linkablemapobj.cpp	2005-07-31 19:52:08.000000000 +0200
-+++ vym-1.7.0/linkablemapobj.cpp	2005-07-31 19:53:13.000000000 +0200
-@@ -1,3 +1,5 @@
-+#include <math.h>
-+
- #include "linkablemapobj.h"
- #include "branchobj.h"
- #include "mapeditor.h"
diff --git a/x11-misc/vym/files/02_all_misc-math.patch b/x11-misc/vym/files/02_all_misc-math.patch
deleted file mode 100644
index 34c5458a0a16..000000000000
--- a/x11-misc/vym/files/02_all_misc-math.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- vym-1.7.0.orig/misc.cpp	2005-07-08 09:24:43.000000000 +0200
-+++ vym-1.7.0/misc.cpp	2005-07-31 19:53:57.000000000 +0200
-@@ -1,3 +1,4 @@
-+#include <math.h>
- #include <qregexp.h>
- #include <qpoint.h>
- 
diff --git a/x11-misc/vym/files/03_gcc41.patch b/x11-misc/vym/files/03_gcc41.patch
deleted file mode 100644
index d0595ef99211..000000000000
--- a/x11-misc/vym/files/03_gcc41.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xml.h.orig	2006-06-04 21:39:54.000000000 +1000
-+++ xml.h	2006-06-04 21:40:14.000000000 +1000
-@@ -16,7 +16,7 @@
- 	~mapBuilderHandler();
- 	QString errorProtocol();
- 	bool startDocument();
--	QString mapBuilderHandler::parseHREF(QString);
-+	QString parseHREF(QString);
- 	bool startElement ( const QString&, const QString&,
-                         const QString& eName, const QXmlAttributes& atts ); 
- 	bool   endElement ( const QString&, const QString&, const QString& ); 
diff --git a/x11-misc/vym/files/50_Makefile-1.8.0.patch b/x11-misc/vym/files/50_Makefile-1.8.0.patch
deleted file mode 100644
index 0cae1a71471c..000000000000
--- a/x11-misc/vym/files/50_Makefile-1.8.0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.orig	2006-07-11 08:01:21.000000000 +0100
-+++ Makefile	2006-07-11 08:01:30.000000000 +0100
-@@ -850,7 +850,6 @@
- install_target: all 
- 	@$(CHK_DIR_EXISTS) "$(INSTALL_ROOT)/usr/bin/" || $(MKDIR) "$(INSTALL_ROOT)/usr/bin/"
- 	-$(INSTALL_FILE) "$(QMAKE_TARGET)" "$(INSTALL_ROOT)/usr/bin/$(QMAKE_TARGET)"
--	-strip "$(INSTALL_ROOT)/usr/bin/$(QMAKE_TARGET)"
- 
- uninstall_target: 
- 	-$(DEL_FILE) "$(INSTALL_ROOT)/usr/bin/$(QMAKE_TARGET)"
diff --git a/x11-misc/vym/files/digest-vym-1.10.0 b/x11-misc/vym/files/digest-vym-1.10.0-r1
index 11d5d1a52eee..11d5d1a52eee 100644
--- a/x11-misc/vym/files/digest-vym-1.10.0
+++ b/x11-misc/vym/files/digest-vym-1.10.0-r1
diff --git a/x11-misc/vym/vym-1.10.0.ebuild b/x11-misc/vym/vym-1.10.0-r1.ebuild
index 86a097ecce62..d9a69dbd0972 100644
--- a/x11-misc/vym/vym-1.10.0.ebuild
+++ b/x11-misc/vym/vym-1.10.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/vym/vym-1.10.0.ebuild,v 1.2 2007/11/03 13:49:31 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/vym/vym-1.10.0-r1.ebuild,v 1.1 2007/11/03 16:54:25 coldwind Exp $
 
 inherit qt4
 
@@ -26,8 +26,8 @@ src_unpack() {
 
 	# Change installation directory and demo path
 	sed -i \
-		-e "s@/usr/local/bin@/usr@g" \
-		-e "s@demo\.path.*@demo.path = \$\${INSTALLDIR}/share/doc/${PF}@" \
+		-e "s@/usr/local@/usr@g" \
+		-e "s@doc/packages/vym@doc/vym@g" \
 		vym.pro || die "sed failed"
 
 	qmake