Fix prefix #197968 and remove cruft.

Package-Manager: portage-2.1.3.9

8 files changed, 23 insertions, 67 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/Manifest b/x11-misc/vym/Manifest
index dceb062eca57..a9b3e92227cb 100644
--- a/x11-misc/vym/Manifest
+++ b/x11-misc/vym/Manifest
@@ -1,40 +1,24 @@
-AUX 01_all_linkablemapobj-math.patch 257 RMD160 9e3e58b14089708a7fd19746d1564c78a5ea6057 SHA1 240c4bfd9a1e868eb4b839abfe5674f1c5cecd05 SHA256 22ecb278804b2db2af7877f85a67062bb65dd2cdb875b77a6810d038c9226e76
-MD5 804c86f8b5889577f645afed31c91bae files/01_all_linkablemapobj-math.patch 257
-RMD160 9e3e58b14089708a7fd19746d1564c78a5ea6057 files/01_all_linkablemapobj-math.patch 257
-SHA256 22ecb278804b2db2af7877f85a67062bb65dd2cdb875b77a6810d038c9226e76 files/01_all_linkablemapobj-math.patch 257
-AUX 02_all_misc-math.patch 203 RMD160 3e435b44afd99e89c934f9daafca28b8bf854a87 SHA1 7c50b049edebcd80e4d27a3ddc0319e0f23d4dcd SHA256 47ef2a05a50b6b95f3e16c4f229df318119b12b9c184e4f641747415f5d4d71b
-MD5 948f4acff0959a29eecd5b98ca3c024c files/02_all_misc-math.patch 203
-RMD160 3e435b44afd99e89c934f9daafca28b8bf854a87 files/02_all_misc-math.patch 203
-SHA256 47ef2a05a50b6b95f3e16c4f229df318119b12b9c184e4f641747415f5d4d71b files/02_all_misc-math.patch 203
-AUX 03_gcc41.patch 474 RMD160 e1d5811ef6aba38bd90206fc154a16993b2be56e SHA1 ffbdd62eb3a2cf05eadfad30f9f20b4a6fcf3fc0 SHA256 9273c7fa7e846d3667a68bf2d579b3410b7697f6bcfb14a75f9c732f31da9282
-MD5 f62a9d5224be69fd84313332cae4cd64 files/03_gcc41.patch 474
-RMD160 e1d5811ef6aba38bd90206fc154a16993b2be56e files/03_gcc41.patch 474
-SHA256 9273c7fa7e846d3667a68bf2d579b3410b7697f6bcfb14a75f9c732f31da9282 files/03_gcc41.patch 474
-AUX 50_Makefile-1.8.0.patch 441 RMD160 ad0c7fc827e15bc5ecd25dc815da98e295b4618b SHA1 a0b9a3c61b1fc04425f153cf9b54c761b3e41b64 SHA256 5754f35c8b62c815d8808b8e60b31785b1ba6c6507fccc05171da0047be9f655
-MD5 ec6d9786ebff331baca3a3ab297c6952 files/50_Makefile-1.8.0.patch 441
-RMD160 ad0c7fc827e15bc5ecd25dc815da98e295b4618b files/50_Makefile-1.8.0.patch 441
-SHA256 5754f35c8b62c815d8808b8e60b31785b1ba6c6507fccc05171da0047be9f655 files/50_Makefile-1.8.0.patch 441
 DIST vym-1.10.0.tar.bz2 2801600 RMD160 2e912cd2542bafe98dc7f0ae33a740f57aa3c1a4 SHA1 19bfdb73ba1bc26335fc5f096bd372d8e4ab6d7f SHA256 e8fe5ab9b2a7a52cfe69ce53f5fc8b711ee485688f61287e332db925a937e70f
 DIST vym-1.8.1.tar.gz 1377030 RMD160 63ee9a31625b44ef3d28a143174f98bbf961b531 SHA1 39e565203bee2a55b97c19b67dc39dc3a8085d71 SHA256 2a5a2d27a4f9345f4feba4d6a2b3a5a9d27be71969c541e19c20376b79ac0279
-EBUILD vym-1.10.0.ebuild 984 RMD160 1b2aaa162d49bb23a6a508077a9b2122fcac20e7 SHA1 1880484f955a0539080d63bed2c744b1bb7f7d42 SHA256 0746affb712d8ba5c05ee5834df418b98d496464056a6228017107ec85756ceb
-MD5 ad00d335fb44932568caae06668cd8b4 vym-1.10.0.ebuild 984
-RMD160 1b2aaa162d49bb23a6a508077a9b2122fcac20e7 vym-1.10.0.ebuild 984
-SHA256 0746affb712d8ba5c05ee5834df418b98d496464056a6228017107ec85756ceb vym-1.10.0.ebuild 984
+EBUILD vym-1.10.0-r1.ebuild 951 RMD160 48fc563972c803eab2518d17d4e3b9076b52403d SHA1 cce21904cfa533f50b2c914c0441368647c5192c SHA256 3a747948e13f5dd6f7dabfe05eed565614e6c513cd683b60f07c31fda49811ab
+MD5 c147e767c2288f83bf7e679dc221f720 vym-1.10.0-r1.ebuild 951
+RMD160 48fc563972c803eab2518d17d4e3b9076b52403d vym-1.10.0-r1.ebuild 951
+SHA256 3a747948e13f5dd6f7dabfe05eed565614e6c513cd683b60f07c31fda49811ab vym-1.10.0-r1.ebuild 951
 EBUILD vym-1.8.1.ebuild 1031 RMD160 dc0741171f9a4c1f97af0a5cf905a9a4df1c3fb4 SHA1 15708e6ae4b3bc76f1c471079967a63fc1cf03cf SHA256 d60b564d8af6d3b818bcf380933791ead6ba61fdc701932f1667a350635b9736
 MD5 fc0f968480c4468d63c55de5b005dfa8 vym-1.8.1.ebuild 1031
 RMD160 dc0741171f9a4c1f97af0a5cf905a9a4df1c3fb4 vym-1.8.1.ebuild 1031
 SHA256 d60b564d8af6d3b818bcf380933791ead6ba61fdc701932f1667a350635b9736 vym-1.8.1.ebuild 1031
-MISC ChangeLog 2324 RMD160 6cb2520da1afcc5ff364a5187e98c64e2c40f762 SHA1 425aed545c24e396854e8883ea2fe709354ada08 SHA256 b045ab64d6fea62e36879cc86c665e2cb90134160f1955fb955c1d5da856fa63
-MD5 39ed64684b2a40f44e32c534c0a78a1c ChangeLog 2324
-RMD160 6cb2520da1afcc5ff364a5187e98c64e2c40f762 ChangeLog 2324
-SHA256 b045ab64d6fea62e36879cc86c665e2cb90134160f1955fb955c1d5da856fa63 ChangeLog 2324
+MISC ChangeLog 2624 RMD160 97692df1560627133b399c0fa9e6eed74dc81bc4 SHA1 8d86d28df127d2565f9c40525f4fa9573b4056df SHA256 d431f960430321ea7df26d7637e785df6ee4d5543ca476d26960e11bd8ccf8ed
+MD5 fb80885bf1dbbd51bfffcdffca4045df ChangeLog 2624
+RMD160 97692df1560627133b399c0fa9e6eed74dc81bc4 ChangeLog 2624
+SHA256 d431f960430321ea7df26d7637e785df6ee4d5543ca476d26960e11bd8ccf8ed ChangeLog 2624
 MISC metadata.xml 165 RMD160 4ebc1c537fcebcb28586a47c958a7d0237f3bbcc SHA1 87fed26b774e4dd2226bea04c4bcc8ba39fcc4c3 SHA256 d7da9ed29b7afb87ac00580d48a49d248f89c92269e9a7791782dc72f4490aec
 MD5 9ba3ceca3ae81ec759fbb9a277c0e45c metadata.xml 165
 RMD160 4ebc1c537fcebcb28586a47c958a7d0237f3bbcc metadata.xml 165
 SHA256 d7da9ed29b7afb87ac00580d48a49d248f89c92269e9a7791782dc72f4490aec metadata.xml 165
-MD5 75497b76ad97e6c461135a981dd80863 files/digest-vym-1.10.0 238
-RMD160 ecac49e941560ecd62c3259a424b95aa9cdc36a0 files/digest-vym-1.10.0 238
-SHA256 9ee0ea9f3e302df24dd200918fe25b7b9288df27f68061af450f78b1b975fc8f files/digest-vym-1.10.0 238
+MD5 75497b76ad97e6c461135a981dd80863 files/digest-vym-1.10.0-r1 238
+RMD160 ecac49e941560ecd62c3259a424b95aa9cdc36a0 files/digest-vym-1.10.0-r1 238
+SHA256 9ee0ea9f3e302df24dd200918fe25b7b9288df27f68061af450f78b1b975fc8f files/digest-vym-1.10.0-r1 238
 MD5 34544c6aaf90bf3e44257af47924c767 files/digest-vym-1.8.1 232
 RMD160 73bae0bd1026d4deb26974f34217d57d9ba6f0af files/digest-vym-1.8.1 232
 SHA256 5dc0833df554ac65833b62833ea62c724b9ec144ae4e672f36a596bcfd3f2721 files/digest-vym-1.8.1 232
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