Stop using virtual/x11.

Package-Manager: portage-2.1.2.2

diff --git a/x11-misc/xrmap/ChangeLog b/x11-misc/xrmap/ChangeLog
index 3a822a0ba204da984de220a2301c8891ea0e772f..a26cc82165598de8efb4511dc12fedd2cfcd486b 100644 (file)
--- a/x11-misc/xrmap/ChangeLog
+++ b/x11-misc/xrmap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xrmap
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/ChangeLog,v 1.14 2007/02/22 00:08:56 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/ChangeLog,v 1.15 2007/03/09 07:57:25 drac Exp $
+
+  09 Mar 2007; Samuli Suominen <drac@gentoo.org> xrmap-2.29.ebuild,
+  xrmap-2.32.ebuild:
+  Stop using virtual/x11.
 
   22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2

diff --git a/x11-misc/xrmap/Manifest b/x11-misc/xrmap/Manifest
index 2a07832d0dbc50c75b45dc18089dbeb5f2ba73b5..43abf061d5dbb48a1e88c6f3b28c44708bf1ab1d 100644 (file)
--- a/x11-misc/xrmap/Manifest
+++ b/x11-misc/xrmap/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX xrmap-2.32-Makefile.kit.patch 750 RMD160 520dd023635430506d8c4c4c01a5fa366cf134aa SHA1 4200764cd4db2ae821997fda913c855c2a767064 SHA256 139784b2180e404e9265352fecad131ae535288dddb91b6fe7487095e6d41328
 MD5 68f544c43102455686aedc82bd5a2727 files/xrmap-2.32-Makefile.kit.patch 750
 RMD160 520dd023635430506d8c4c4c01a5fa366cf134aa files/xrmap-2.32-Makefile.kit.patch 750
@@ -9,18 +6,18 @@ DIST CIA_WDB2.jpd.gz 7391060 RMD160 80fe751ba61405d7b7b7ecdfaf3a9d8e7b9e06b8 SHA
 DIST xrmap-2.10.tgz 3944521 RMD160 dd398b2e4b24c23b1fbf9edfa37ddf7d1f4eaf65 SHA1 234a3272e5433865ce7e41c0ed663e17c0fa0f6d SHA256 dcc7383064ca03f4bbc097863cc0e54572c7b0c586461f222cfa7a14848acd6c
 DIST xrmap-2.29.tar.bz2 1072241 RMD160 f8cacc343643a66c8236743c76c80d3c33c44c5c SHA1 af2efc47b7ef76840a72a96e67174b0fd5dd8973 SHA256 2c790904c5077940b8e4b23d848b0e6a02757cde18a3256c47f34da7d7ae31d0
 DIST xrmap-2.32.tar.bz2 1133345 RMD160 5f981cd7e05046d97833bdbf48cf983d3a87d0fe SHA1 30838b29801f8dbf018cf02831e29fd4054ef109 SHA256 842364b5fbe73a4c4573a828a5bc6f492bb9809694ad1dcc16cb29fb8dc2c184
-EBUILD xrmap-2.29.ebuild 2170 RMD160 f8859d7f1cf1e9b63b12653ed49e12bf0297ca4f SHA1 9da28059ade15e840e90b71cb31a6cd018ea2212 SHA256 f858808adb3efe361ce06045ca94de10be9fb9641aca20d9f5d89bb723e5b6d1
-MD5 0509f660591cf11d06aa5f4ad4ecfac2 xrmap-2.29.ebuild 2170
-RMD160 f8859d7f1cf1e9b63b12653ed49e12bf0297ca4f xrmap-2.29.ebuild 2170
-SHA256 f858808adb3efe361ce06045ca94de10be9fb9641aca20d9f5d89bb723e5b6d1 xrmap-2.29.ebuild 2170
-EBUILD xrmap-2.32.ebuild 2233 RMD160 f05ec2bf7ccc61965ee5efd703ac5dc5ca35a153 SHA1 9c07307820389f8588b9724d4936c6b17fe2a7d1 SHA256 73e5ed34d289cff44bf2b80d7fba5d5e1fd6103e56ffcaba0f0d4111ef3419c9
-MD5 8f9785537a84fcfb609eeec47580ed6c xrmap-2.32.ebuild 2233
-RMD160 f05ec2bf7ccc61965ee5efd703ac5dc5ca35a153 xrmap-2.32.ebuild 2233
-SHA256 73e5ed34d289cff44bf2b80d7fba5d5e1fd6103e56ffcaba0f0d4111ef3419c9 xrmap-2.32.ebuild 2233
-MISC ChangeLog 1797 RMD160 7c30ba2aeae585b2f816d48e27b6cd7b377642c7 SHA1 4771f77e963e56edc93ff04ac29c3357d40f5f6b SHA256 b4de039547ddd9b1d48ec5b126e1d50ca916a7ef3c523e64d2d71ceceb124900
-MD5 3116208303b04b441c50792bf147cff5 ChangeLog 1797
-RMD160 7c30ba2aeae585b2f816d48e27b6cd7b377642c7 ChangeLog 1797
-SHA256 b4de039547ddd9b1d48ec5b126e1d50ca916a7ef3c523e64d2d71ceceb124900 ChangeLog 1797
+EBUILD xrmap-2.29.ebuild 2109 RMD160 371a41248af9e58833977cb5f9b0f8dd81cd4307 SHA1 66921b77eee9551fb1e22c393d2ecedc5271af26 SHA256 5f4d46c27e85d28b2ccf949123542d2ddc8e65ccf12bbeafce09c72d668baea0
+MD5 1947a0495b00c6ab2270e0aa60f37c82 xrmap-2.29.ebuild 2109
+RMD160 371a41248af9e58833977cb5f9b0f8dd81cd4307 xrmap-2.29.ebuild 2109
+SHA256 5f4d46c27e85d28b2ccf949123542d2ddc8e65ccf12bbeafce09c72d668baea0 xrmap-2.29.ebuild 2109
+EBUILD xrmap-2.32.ebuild 2172 RMD160 205e29ffa197a93fbbdfda672f705eab6d757581 SHA1 36f56ab35716cd365081f51a3c55560f6f9f8fb6 SHA256 4a7d5c03f094bd751cc6434bb502e55225a02fe304d84bd555e767581e31380b
+MD5 245c72ca19bda14bece20fc3f20e3b64 xrmap-2.32.ebuild 2172
+RMD160 205e29ffa197a93fbbdfda672f705eab6d757581 xrmap-2.32.ebuild 2172
+SHA256 4a7d5c03f094bd751cc6434bb502e55225a02fe304d84bd555e767581e31380b xrmap-2.32.ebuild 2172
+MISC ChangeLog 1912 RMD160 8e8f489337449887c80d22deb4566c84ac675a3e SHA1 b430433cea5f768b838291c92d0720e946f74fa9 SHA256 3300e25e0955808f1aa9fc291fb4268c5bd37d68847a105c7e37b89b7df7bc65
+MD5 a1f1b038794b5b3ec830ba03b971f903 ChangeLog 1912
+RMD160 8e8f489337449887c80d22deb4566c84ac675a3e ChangeLog 1912
+SHA256 3300e25e0955808f1aa9fc291fb4268c5bd37d68847a105c7e37b89b7df7bc65 ChangeLog 1912
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166
@@ -31,10 +28,3 @@ SHA256 2e4d712d982937928aef29c4b2a4da871d9f518223d96a8fece2a43dbf581e26 files/di
 MD5 013cbd362e6a5cdadb3c2f8f925c86d1 files/digest-xrmap-2.32 693
 RMD160 b1c34e7e1097d4bc231a859c3aec57ce0c81de32 files/digest-xrmap-2.32 693
 SHA256 a7ad5c9ef6ab14f1014a6e80ffd114d8c60ae6b7d73f0fdcf38eea49d19b49cb files/digest-xrmap-2.32 693
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFF3N6rz974XjDVpbkRAisYAJ9WPc4BPYENpU1ZLjg76cKxqiMVBACfRtv3
-1Rx+ETe42heingpdDXJLuN8=
-=znw6
------END PGP SIGNATURE-----

diff --git a/x11-misc/xrmap/xrmap-2.29.ebuild b/x11-misc/xrmap/xrmap-2.29.ebuild
index 34823787e31b3bef4969bf5c10fe7f0d5fa093f6..514173ca827474f7ac7df817630f2dc4eb75567b 100644 (file)
--- a/x11-misc/xrmap/xrmap-2.29.ebuild
+++ b/x11-misc/xrmap/xrmap-2.29.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/xrmap-2.29.ebuild,v 1.8 2006/10/11 11:38:04 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/xrmap-2.29.ebuild,v 1.9 2007/03/09 07:57:25 drac Exp $
 
 DESCRIPTION="The Xrmap program is a X client for generating images of the Earth and manipulating the CIA World data bank"
 HOMEPAGE="http://frmas.free.fr/li_1.htm#_Xrmap_"
@@ -14,15 +14,11 @@ SLOT="0"
 KEYWORDS="x86 ~amd64 ~ppc"
 IUSE="zlib"
 
-RDEPEND="|| ( (
-               x11-libs/libX11
-               x11-libs/libXpm )
-       virtual/x11 )"
+RDEPEND="x11-libs/libX11
+       x11-libs/libXpm"
 DEPEND="${RDEPEND}
-       || ( (
-                       x11-misc/imake
-                       x11-proto/xproto )
-               virtual/x11 )
+       x11-misc/imake
+       x11-proto/xproto
        media-gfx/imagemagick
        app-text/gv
        sys-apps/less

diff --git a/x11-misc/xrmap/xrmap-2.32.ebuild b/x11-misc/xrmap/xrmap-2.32.ebuild
index b2970aedeb2fae5eea05050c7d361a46f3cddd93..f407a9d29a2d1509197652c5081a113763df4456 100644 (file)
--- a/x11-misc/xrmap/xrmap-2.32.ebuild
+++ b/x11-misc/xrmap/xrmap-2.32.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/xrmap-2.32.ebuild,v 1.3 2006/10/11 11:38:04 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/xrmap-2.32.ebuild,v 1.4 2007/03/09 07:57:25 drac Exp $
 
 inherit eutils
 
@@ -16,15 +16,11 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE="zlib"
 
-RDEPEND="|| ( (
-               x11-libs/libX11
-               x11-libs/libXpm )
-       virtual/x11 )"
+RDEPEND="x11-libs/libX11
+       x11-libs/libXpm"
 DEPEND="${RDEPEND}
-       || ( (
-                       x11-misc/imake
-                       x11-proto/xproto )
-               virtual/x11 )
+       x11-misc/imake
+       x11-proto/xproto
        media-gfx/imagemagick
        app-text/gv
        sys-apps/less