Fix compilation isse (bug #133581), fixed DEPEND for modular X.

Package-Manager: portage-2.1_rc1-r2

6 files changed, 68 insertions, 6 deletions

diff --git a/x11-misc/xplore/ChangeLog b/x11-misc/xplore/ChangeLog
index 4ecfcc72bf12..9eba9b8f17b5 100644
--- a/x11-misc/xplore/ChangeLog
+++ b/x11-misc/xplore/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/xplore
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xplore/ChangeLog,v 1.8 2006/01/21 18:23:28 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xplore/ChangeLog,v 1.9 2006/05/17 18:16:27 nelchael Exp $
+
+  17 May 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/xplore-1.2a-label.patch, +files/xplore-1.2a-malloc.patch,
+  xplore-1.2a.ebuild:
+  Fix compilation isse (bug #133581), fixed DEPEND for modular X.
 
   21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> -xplore-1.1e.ebuild,
   xplore-1.2a.ebuild:
diff --git a/x11-misc/xplore/Manifest b/x11-misc/xplore/Manifest
index 0e65022ca189..ee71d3fb6133 100644
--- a/x11-misc/xplore/Manifest
+++ b/x11-misc/xplore/Manifest
@@ -1,5 +1,28 @@
-MD5 e7f8785c65d47824d50be2f816c97aac ChangeLog 2131
-MD5 8e9d553f8c4cf7c2f33d108428abd8e7 files/digest-xplore-1.2a 64
+AUX xplore-1.2a-label.patch 396 RMD160 b9b64312ae1b8b21db604cf98e455bafa4b67d03 SHA1 0ee93408a6e35869d31537cfa23a96985a35a233 SHA256 653fb0f258247365798fdecf03562c1696d4403943d58de3de4751f4981e1c0a size 396
+MD5 05d7581684186521e789068fcf57a65a files/xplore-1.2a-label.patch 396
+RMD160 b9b64312ae1b8b21db604cf98e455bafa4b67d03 files/xplore-1.2a-label.patch 396
+SHA256 653fb0f258247365798fdecf03562c1696d4403943d58de3de4751f4981e1c0a files/xplore-1.2a-label.patch 396
+AUX xplore-1.2a-malloc.patch 369 RMD160 64942c30af81374fdb15689a05523b0c677820ec SHA1 8f1a069cd459d98c54d8822bbcbc785f6b7eeafb SHA256 4a98b7b01b30ae71a7fd118605f1d908d5db83eca7e0b6c7ffab27a672115af8 size 369
+MD5 f8ea66ed3c81b84876c58cf5f0c8b394 files/xplore-1.2a-malloc.patch 369
+RMD160 64942c30af81374fdb15689a05523b0c677820ec files/xplore-1.2a-malloc.patch 369
+SHA256 4a98b7b01b30ae71a7fd118605f1d908d5db83eca7e0b6c7ffab27a672115af8 files/xplore-1.2a-malloc.patch 369
+AUX xplore-1.2a-strerror.patch 643 RMD160 2f0088262bc2c490eb6e39d75846a98f50458446 SHA1 50d04157a74b26b4cabf552b6aed9658005f8800 SHA256 886909e8eea9aad0311c3882f3b7c4cd46212b195c385f7bce2e2ca4ad38e910 size 643
 MD5 bb06198110311b73c51873cb2c72632d files/xplore-1.2a-strerror.patch 643
+RMD160 2f0088262bc2c490eb6e39d75846a98f50458446 files/xplore-1.2a-strerror.patch 643
+SHA256 886909e8eea9aad0311c3882f3b7c4cd46212b195c385f7bce2e2ca4ad38e910 files/xplore-1.2a-strerror.patch 643
+DIST xplore-1.2a.tar.bz2 570144 RMD160 db451cdc456ba59deb15f9bbb191710415d43800 SHA256 ff5ca8fff9fe147cb5146222cb43757e9959d62785eded40331cdb5655a6d514 size 570144
+EBUILD xplore-1.2a.ebuild 1363 RMD160 9eef84ef01b63b1ae1c642bc0bc2d81cc5204f24 SHA1 78b6062430dee6d4a76ce7a64dcdfaec8399c876 SHA256 3f9d96f9533fea715d8e69df89bcc5d998665395822ef2a79f5d083dad4a6eb2 size 1363
+MD5 15da2cbbdc03c98b779935fc74dacf15 xplore-1.2a.ebuild 1363
+RMD160 9eef84ef01b63b1ae1c642bc0bc2d81cc5204f24 xplore-1.2a.ebuild 1363
+SHA256 3f9d96f9533fea715d8e69df89bcc5d998665395822ef2a79f5d083dad4a6eb2 xplore-1.2a.ebuild 1363
+MISC ChangeLog 2340 RMD160 304e1986fa9cd31b07ae4b19f1cf8d68f743e61d SHA1 dba74d6cff810f7170d7174815d05655da3c0628 SHA256 c9dce6543dcbb5684442eb9a47c5397e8848e85fc6b546360d187e7de1524fc2 size 2340
+MD5 3697c8c752194f4685b478b26f9be079 ChangeLog 2340
+RMD160 304e1986fa9cd31b07ae4b19f1cf8d68f743e61d ChangeLog 2340
+SHA256 c9dce6543dcbb5684442eb9a47c5397e8848e85fc6b546360d187e7de1524fc2 ChangeLog 2340
+MISC metadata.xml 173 RMD160 f74c5ca8d8aa0d0897c7c107f6eb4424d4f4343e SHA1 ca2ea648208cc74669b8a084f1b74e5cd4415777 SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f size 173
 MD5 fe402b096905cae8dcb4a503d3a838ac metadata.xml 173
-MD5 fd1eb9cf246af085310cdb3219dda2a6 xplore-1.2a.ebuild 1208
+RMD160 f74c5ca8d8aa0d0897c7c107f6eb4424d4f4343e metadata.xml 173
+SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f metadata.xml 173
+MD5 f5dd6c45c35737bcdc4c436dc73afb5b files/digest-xplore-1.2a 238
+RMD160 fec32d8d17e9d79149ab12a10ea38cdd696d0c91 files/digest-xplore-1.2a 238
+SHA256 9821b61b5dba8a276e12c1a1ff7b5c35ebf05d17b9dae17b674ea5f833476494 files/digest-xplore-1.2a 238
diff --git a/x11-misc/xplore/files/digest-xplore-1.2a b/x11-misc/xplore/files/digest-xplore-1.2a
index 76f1d85376b7..e7e0da4c42fc 100644
--- a/x11-misc/xplore/files/digest-xplore-1.2a
+++ b/x11-misc/xplore/files/digest-xplore-1.2a
@@ -1 +1,3 @@
 MD5 129e90bec30a6197bc315eb75e130b1f xplore-1.2a.tar.bz2 570144
+RMD160 db451cdc456ba59deb15f9bbb191710415d43800 xplore-1.2a.tar.bz2 570144
+SHA256 ff5ca8fff9fe147cb5146222cb43757e9959d62785eded40331cdb5655a6d514 xplore-1.2a.tar.bz2 570144
diff --git a/x11-misc/xplore/files/xplore-1.2a-label.patch b/x11-misc/xplore/files/xplore-1.2a-label.patch
new file mode 100644
index 000000000000..83a93a6e6e7f
--- /dev/null
+++ b/x11-misc/xplore/files/xplore-1.2a-label.patch
@@ -0,0 +1,14 @@
+diff -Nru xplore-1.2a.vanilla/ftype.c xplore-1.2a/ftype.c
+--- xplore-1.2a.vanilla/ftype.c	2006-05-17 20:02:40.000000000 +0200
++++ xplore-1.2a/ftype.c	2006-05-17 20:05:05.000000000 +0200
+@@ -297,9 +297,8 @@
+ 		    types[ntypes-1].magic[j]) ||
+ 	    nstrcmp(types[i].pattern[j],
+ 		    types[ntypes-1].pattern[j]))
+-	  goto err;
++	  continue;
+       return i;
+-    err:
+     }
+   }
+   return NONE;
diff --git a/x11-misc/xplore/files/xplore-1.2a-malloc.patch b/x11-misc/xplore/files/xplore-1.2a-malloc.patch
new file mode 100644
index 000000000000..15b928e9d34f
--- /dev/null
+++ b/x11-misc/xplore/files/xplore-1.2a-malloc.patch
@@ -0,0 +1,11 @@
+diff -Nru xplore-1.2a.vanilla/regexp/regexp.c xplore-1.2a/regexp/regexp.c
+--- xplore-1.2a.vanilla/regexp/regexp.c	2006-05-17 20:02:40.000000000 +0200
++++ xplore-1.2a/regexp/regexp.c	2006-05-17 20:03:00.000000000 +0200
+@@ -195,7 +195,6 @@
+ 	register char *longest;
+ 	register int len;
+ 	int flags;
+-	extern char *malloc();
+ 
+ 	if (exp == NULL)
+ 		FAIL("NULL argument");
diff --git a/x11-misc/xplore/xplore-1.2a.ebuild b/x11-misc/xplore/xplore-1.2a.ebuild
index 0b5640e7c63f..91bea7c96963 100644
--- a/x11-misc/xplore/xplore-1.2a.ebuild
+++ b/x11-misc/xplore/xplore-1.2a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xplore/xplore-1.2a.ebuild,v 1.8 2006/01/21 18:23:28 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xplore/xplore-1.2a.ebuild,v 1.9 2006/05/17 18:16:27 nelchael Exp $
 
 inherit eutils
 
@@ -15,11 +15,18 @@ LICENSE="GPL-2"
 KEYWORDS="x86"
 
 # its webpage states the lesstif does not fully work with xplore
-DEPEND="x11-libs/openmotif"
+DEPEND="x11-libs/openmotif
+	|| ( (
+		x11-misc/gccmakedep
+		app-text/rman
+		x11-misc/imake )
+	virtual/x11 )"
 
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${P}-strerror.patch
+	epatch ${FILESDIR}/${P}-malloc.patch
+	epatch ${FILESDIR}/${P}-label.patch
 }
 
 src_compile() {