Remove monolithic X from dependencies, fix quotes and other minor cleanup.

Package-Manager: portage-2.1.2_pre3-r6

3 files changed, 38 insertions, 28 deletions

diff --git a/x11-misc/xplore/ChangeLog b/x11-misc/xplore/ChangeLog
index 9eba9b8f17b5..daef36060239 100644
--- a/x11-misc/xplore/ChangeLog
+++ b/x11-misc/xplore/ChangeLog
@@ -1,6 +1,9 @@
 # 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.9 2006/05/17 18:16:27 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xplore/ChangeLog,v 1.10 2006/10/21 21:35:00 omp Exp $
+
+  21 Oct 2006; David Shakaryan <omp@gentoo.org> xplore-1.2a.ebuild:
+  Remove monolithic X from dependencies, fix quotes and other minor cleanup.
 
   17 May 2006; Krzysiek Pawlik <nelchael@gentoo.org>
   +files/xplore-1.2a-label.patch, +files/xplore-1.2a-malloc.patch,
diff --git a/x11-misc/xplore/Manifest b/x11-misc/xplore/Manifest
index ee71d3fb6133..8527b06bae20 100644
--- a/x11-misc/xplore/Manifest
+++ b/x11-misc/xplore/Manifest
@@ -1,28 +1,38 @@
-AUX xplore-1.2a-label.patch 396 RMD160 b9b64312ae1b8b21db604cf98e455bafa4b67d03 SHA1 0ee93408a6e35869d31537cfa23a96985a35a233 SHA256 653fb0f258247365798fdecf03562c1696d4403943d58de3de4751f4981e1c0a size 396
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX xplore-1.2a-label.patch 396 RMD160 b9b64312ae1b8b21db604cf98e455bafa4b67d03 SHA1 0ee93408a6e35869d31537cfa23a96985a35a233 SHA256 653fb0f258247365798fdecf03562c1696d4403943d58de3de4751f4981e1c0a
 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
+AUX xplore-1.2a-malloc.patch 369 RMD160 64942c30af81374fdb15689a05523b0c677820ec SHA1 8f1a069cd459d98c54d8822bbcbc785f6b7eeafb SHA256 4a98b7b01b30ae71a7fd118605f1d908d5db83eca7e0b6c7ffab27a672115af8
 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
+AUX xplore-1.2a-strerror.patch 643 RMD160 2f0088262bc2c490eb6e39d75846a98f50458446 SHA1 50d04157a74b26b4cabf552b6aed9658005f8800 SHA256 886909e8eea9aad0311c3882f3b7c4cd46212b195c385f7bce2e2ca4ad38e910
 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
+DIST xplore-1.2a.tar.bz2 570144 RMD160 db451cdc456ba59deb15f9bbb191710415d43800 SHA256 ff5ca8fff9fe147cb5146222cb43757e9959d62785eded40331cdb5655a6d514
+EBUILD xplore-1.2a.ebuild 1337 RMD160 4519c799a6d5f5615137353a926f24085a0b6509 SHA1 94cad1c1ecb7ca207616aff6f41f68ae84262933 SHA256 f7112605b5f15adc744eef25fa1aa7845f1e7e4b7e57695e84c7e79cddfdf1d0
+MD5 4870fc479cbb3cfdc1a9ac45ea5b1653 xplore-1.2a.ebuild 1337
+RMD160 4519c799a6d5f5615137353a926f24085a0b6509 xplore-1.2a.ebuild 1337
+SHA256 f7112605b5f15adc744eef25fa1aa7845f1e7e4b7e57695e84c7e79cddfdf1d0 xplore-1.2a.ebuild 1337
+MISC ChangeLog 2482 RMD160 a60d08b13122ce2968210383d9c5bdb520dae228 SHA1 0a6400680c3968871dd25485d2e4a60a740e99af SHA256 554212838a9cbc84a056a2bd8cc3b681f2a7f070669a6e98dfcc67277f60318a
+MD5 a3cb9c1ccf07f78b2b66dce104e49e79 ChangeLog 2482
+RMD160 a60d08b13122ce2968210383d9c5bdb520dae228 ChangeLog 2482
+SHA256 554212838a9cbc84a056a2bd8cc3b681f2a7f070669a6e98dfcc67277f60318a ChangeLog 2482
+MISC metadata.xml 173 RMD160 f74c5ca8d8aa0d0897c7c107f6eb4424d4f4343e SHA1 ca2ea648208cc74669b8a084f1b74e5cd4415777 SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f
 MD5 fe402b096905cae8dcb4a503d3a838ac metadata.xml 173
 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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFOpKjvSApE0uP4UsRApxsAJ9+9k9jycK85TUC7nE6eOxSH0ZttQCffV29
+lrOrDcyq71QtSeu/oHeTYBU=
+=wRX5
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/xplore/xplore-1.2a.ebuild b/x11-misc/xplore/xplore-1.2a.ebuild
index 91bea7c96963..8736535c9951 100644
--- a/x11-misc/xplore/xplore-1.2a.ebuild
+++ b/x11-misc/xplore/xplore-1.2a.ebuild
@@ -1,32 +1,29 @@
 # 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.9 2006/05/17 18:16:27 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xplore/xplore-1.2a.ebuild,v 1.10 2006/10/21 21:35:00 omp Exp $
 
 inherit eutils
 
-IUSE=""
-
 DESCRIPTION="motif file manager for X."
-SRC_URI="http://www.musikwissenschaft.uni-mainz.de/~ag/xplore/${P}.tar.bz2"
 HOMEPAGE="http://www.musikwissenschaft.uni-mainz.de/~ag/xplore/"
+SRC_URI="http://www.musikwissenschaft.uni-mainz.de/~ag/${PN}/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
+IUSE=""
 
 # its webpage states the lesstif does not fully work with xplore
 DEPEND="x11-libs/openmotif
-	|| ( (
-		x11-misc/gccmakedep
-		app-text/rman
-		x11-misc/imake )
-	virtual/x11 )"
+	x11-misc/gccmakedep
+	app-text/rman
+	x11-misc/imake"
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/${P}-strerror.patch
-	epatch ${FILESDIR}/${P}-malloc.patch
-	epatch ${FILESDIR}/${P}-label.patch
+	epatch "${FILESDIR}/${P}-strerror.patch"
+	epatch "${FILESDIR}/${P}-malloc.patch"
+	epatch "${FILESDIR}/${P}-label.patch"
 }
 
 src_compile() {
@@ -44,6 +41,6 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "Installation failed"
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc ChangeLog README TODO
 }