Remove monolithic X from dependencies and other minor changes.

Package-Manager: portage-2.1.2_pre3-r6

4 files changed, 43 insertions, 35 deletions

diff --git a/x11-misc/xrestop/ChangeLog b/x11-misc/xrestop/ChangeLog
index cb075a26a19d..ef441b438c79 100644
--- a/x11-misc/xrestop/ChangeLog
+++ b/x11-misc/xrestop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xrestop
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrestop/ChangeLog,v 1.20 2006/10/18 03:51:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrestop/ChangeLog,v 1.21 2006/10/21 22:52:51 omp Exp $
+
+  21 Oct 2006; David Shakaryan <omp@gentoo.org> xrestop-0.3.ebuild,
+  xrestop-0.4.ebuild:
+  Remove monolithic X from dependencies and other minor changes.
 
   18 Oct 2006; Jeroen Roovers <jer@gentoo.org> xrestop-0.3.ebuild,
   xrestop-0.4.ebuild:
diff --git a/x11-misc/xrestop/Manifest b/x11-misc/xrestop/Manifest
index 12d7c74bf2ee..126f4f5512eb 100644
--- a/x11-misc/xrestop/Manifest
+++ b/x11-misc/xrestop/Manifest
@@ -1,17 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST xrestop-0.3.tar.gz 89268 RMD160 6d7bdffbcab05afc69168f43927b3d1b849179d7 SHA1 b92390f370d3b86c0c82c60c4423fa3d564d8c9e SHA256 bc5e0a786f6cf7485223eb32b2fad8762b9fc8bf27289e5523eddb17b46a4d3e
 DIST xrestop-0.4.tar.gz 92308 RMD160 13113e1de0d2206106a274917fd9a0decd301837 SHA1 040b0ac561f4de0a04e9db42a2cfab918801c452 SHA256 67c2fc94a7ecedbaae0d1837e82e93d1d98f4a6d759828860e552119af3ce257
-EBUILD xrestop-0.3.ebuild 737 RMD160 7c860be1f234c9e7ffe38f070b2c8f8a12b107d8 SHA1 07c5fa89891e0bb6e693dba6dc8eb5d1a5e7c088 SHA256 c78614644539a13697a257b50f43894b8e4d18fc37dac77c07b5175859bc06e5
-MD5 87d61532bcbb287792f6008bd679033d xrestop-0.3.ebuild 737
-RMD160 7c860be1f234c9e7ffe38f070b2c8f8a12b107d8 xrestop-0.3.ebuild 737
-SHA256 c78614644539a13697a257b50f43894b8e4d18fc37dac77c07b5175859bc06e5 xrestop-0.3.ebuild 737
-EBUILD xrestop-0.4.ebuild 739 RMD160 75793b2d817ec66f349c6fcbfebfea107011463a SHA1 a21baf9da81ffae7acf7303552d31eec8dc4c411 SHA256 21fd3d3de7be30cff540ba40130734ccc86f6b6ba8abc2405dcfa971d30bb07b
-MD5 4cedd8daeda1796cf8d8860697eb0fac xrestop-0.4.ebuild 739
-RMD160 75793b2d817ec66f349c6fcbfebfea107011463a xrestop-0.4.ebuild 739
-SHA256 21fd3d3de7be30cff540ba40130734ccc86f6b6ba8abc2405dcfa971d30bb07b xrestop-0.4.ebuild 739
-MISC ChangeLog 2343 RMD160 83fded089f32ea86af3ec99ddf7bb391094347ff SHA1 7c6912a910ef5c6475a0a3c78b1c55d03b65bcd5 SHA256 503f9ea1438c6e313b697fac02f35f6c6bf1df62edea3deb4996f4d92c735b2f
-MD5 24dc69ba4ccb91ebcf9aa894e1805fc6 ChangeLog 2343
-RMD160 83fded089f32ea86af3ec99ddf7bb391094347ff ChangeLog 2343
-SHA256 503f9ea1438c6e313b697fac02f35f6c6bf1df62edea3deb4996f4d92c735b2f ChangeLog 2343
+EBUILD xrestop-0.3.ebuild 709 RMD160 d055104cd33c5e5ef9c25a5048ad4b07c1d3dffb SHA1 f0de415c3f94f4fe1209ed82489b7fb2dd49b35e SHA256 9465e29623d560ff1b553218dcdc642eb4fe2d5f72fce65f305f6988fee98b9a
+MD5 6b42eec127195befe235902b4b7a1c27 xrestop-0.3.ebuild 709
+RMD160 d055104cd33c5e5ef9c25a5048ad4b07c1d3dffb xrestop-0.3.ebuild 709
+SHA256 9465e29623d560ff1b553218dcdc642eb4fe2d5f72fce65f305f6988fee98b9a xrestop-0.3.ebuild 709
+EBUILD xrestop-0.4.ebuild 713 RMD160 8439914cb25303ed1005fb72d97313e70594a941 SHA1 5771d23fbd1d1ea1a4afe0e5fa4718118ca65d96 SHA256 77cb57f0af5172ace6f62a42584450566f75a3b8d79d0e5fe8ea1b96f228f177
+MD5 5e1ebf40265b0fa42b2501dae9f62b83 xrestop-0.4.ebuild 713
+RMD160 8439914cb25303ed1005fb72d97313e70594a941 xrestop-0.4.ebuild 713
+SHA256 77cb57f0af5172ace6f62a42584450566f75a3b8d79d0e5fe8ea1b96f228f177 xrestop-0.4.ebuild 713
+MISC ChangeLog 2499 RMD160 a1d85a6bce1653c6429e2a5f97cc175bdc243745 SHA1 aa30dcaca4b7557f19c313f0202725f48234d395 SHA256 7c4ebe10a3e885c4b2b322ab208423c37164719ed3401528a6b50363c3d47da4
+MD5 b4c60662ae9f2e3c96f7acf9eaf85c10 ChangeLog 2499
+RMD160 a1d85a6bce1653c6429e2a5f97cc175bdc243745 ChangeLog 2499
+SHA256 7c4ebe10a3e885c4b2b322ab208423c37164719ed3401528a6b50363c3d47da4 ChangeLog 2499
 MISC metadata.xml 173 RMD160 f74c5ca8d8aa0d0897c7c107f6eb4424d4f4343e SHA1 ca2ea648208cc74669b8a084f1b74e5cd4415777 SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f
 MD5 fe402b096905cae8dcb4a503d3a838ac metadata.xml 173
 RMD160 f74c5ca8d8aa0d0897c7c107f6eb4424d4f4343e metadata.xml 173
@@ -22,3 +25,10 @@ SHA256 d2504dd4ede2d24f4450699983bd5d8b2cfcd200dee458cb6a4fd641d3bb33d7 files/di
 MD5 217894031fca0adbd7e69259764daf70 files/digest-xrestop-0.4 232
 RMD160 6fbb3be74e56d8fe7a27345eeec9e98aa83f97b6 files/digest-xrestop-0.4 232
 SHA256 18eeac6cc3255fb0afa91ce1f268d7db1567b68f0b67bc51c6a6768c96fbcd4c files/digest-xrestop-0.4 232
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFOqTLvSApE0uP4UsRArTtAJ9UiL66JZaCXTt1XlDrexS6Bvno9wCglINf
+y2EkrbJ9vhQqL0kaYS8qGTk=
+=Mpe6
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/xrestop/xrestop-0.3.ebuild b/x11-misc/xrestop/xrestop-0.3.ebuild
index b8b1a9479544..131245327799 100644
--- a/x11-misc/xrestop/xrestop-0.3.ebuild
+++ b/x11-misc/xrestop/xrestop-0.3.ebuild
@@ -1,26 +1,23 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrestop/xrestop-0.3.ebuild,v 1.13 2006/10/18 03:51:43 jer Exp $
-
-IUSE=""
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrestop/xrestop-0.3.ebuild,v 1.14 2006/10/21 22:52:51 omp Exp $
 
 DESCRIPTION="'Top' like statistics of X11 client's server side resource usage"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/xrestop"
 SRC_URI="http://www.freedesktop.org/Software/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software_2fxrestop"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ppc sparc x86"
+IUSE=""
 
-RDEPEND="|| ( (
-		x11-libs/libXres
-		x11-libs/libX11
-		x11-libs/libXt )
-	virtual/x11 )"
+RDEPEND="x11-libs/libXres
+	x11-libs/libX11
+	x11-libs/libXt"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xproto virtual/x11 )"
+	x11-proto/xproto"
 
 src_install () {
-	make DESTDIR="${D}" install || die
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog NEWS README
 }
diff --git a/x11-misc/xrestop/xrestop-0.4.ebuild b/x11-misc/xrestop/xrestop-0.4.ebuild
index 3f976ee7ed94..aff9e636eb59 100644
--- a/x11-misc/xrestop/xrestop-0.4.ebuild
+++ b/x11-misc/xrestop/xrestop-0.4.ebuild
@@ -1,26 +1,23 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrestop/xrestop-0.4.ebuild,v 1.2 2006/10/18 03:51:43 jer Exp $
-
-IUSE=""
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrestop/xrestop-0.4.ebuild,v 1.3 2006/10/21 22:52:51 omp Exp $
 
 DESCRIPTION="'Top' like statistics of X11 client's server side resource usage"
-SRC_URI="http://projects.o-hand.com/sources/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/xrestop"
+SRC_URI="http://projects.o-hand.com/sources/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE=""
 
-RDEPEND="|| ( (
-		x11-libs/libXres
-		x11-libs/libX11
-		x11-libs/libXt )
-	virtual/x11 )"
+RDEPEND="x11-libs/libXres
+	x11-libs/libX11
+	x11-libs/libXt"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xproto virtual/x11 )"
+	x11-proto/xproto"
 
 src_install () {
-	make DESTDIR="${D}" install || die
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog NEWS README
 }