From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Wed, 6 Dec 2006 20:15:39 +0000 (+0000)
Subject: Remove old virtual/x11 dependency.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=766ccda830b68dba722e51b7e99caf3a812762e7;p=gentoo.git

Remove old virtual/x11 dependency.
Package-Manager: portage-2.1.2_rc2-r2
---

diff --git a/games-server/crossfire-server/ChangeLog b/games-server/crossfire-server/ChangeLog
index 71ab739f705a..7da23c276244 100644
--- a/games-server/crossfire-server/ChangeLog
+++ b/games-server/crossfire-server/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-server/crossfire-server
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/crossfire-server/ChangeLog,v 1.10 2006/09/16 23:05:37 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-server/crossfire-server/ChangeLog,v 1.11 2006/12/06 20:15:39 wolf31o2 Exp $
+
+  06 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  crossfire-server-1.9.0.ebuild:
+  Remove old virtual/x11 dependency.
 
 *crossfire-server-1.9.1 (16 Sep 2006)
 
diff --git a/games-server/crossfire-server/Manifest b/games-server/crossfire-server/Manifest
index 737f035ff0db..671f76aeea8e 100644
--- a/games-server/crossfire-server/Manifest
+++ b/games-server/crossfire-server/Manifest
@@ -1,19 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST crossfire-1.9.0.maps.tar.gz 4682531 RMD160 5f49bcbe357c98131d31bb278240c212a134aca7 SHA1 a0ce915d72cf0ff5ace45717e5f82207cfeee6eb SHA256 815a8106777e36cb9e7c5a4ed6b64072b3e6cfc8b90930d40715c79c3fd61c26
 DIST crossfire-1.9.0.tar.gz 5317109 RMD160 6069e1d566a738c73756096240694d8f62ab8ce4 SHA1 7f8ef84f4d465736fc854b4be4e32f39ed415eaf SHA256 c88887bbc3437032e79d4bc0304195418aa0837d24f22966ecd01857622299b7
 DIST crossfire-1.9.1.maps.tar.gz 22073437 RMD160 0d19525aa4977dd67a2b09ee31007a7c8b4e78b3 SHA1 f977748d0682f7a71a548a2c6069aa9ecfa841a6 SHA256 e9eca13268b3e651b84f29dfe8aeb98f645e454ec53d726cb3a7428ab782b720
 DIST crossfire-1.9.1.tar.gz 5584686 RMD160 8fe7b7b767229046a69656436fe4ba63f1379aa8 SHA1 a6fe61408897c90ded154df00aeec63aaa60950d SHA256 95981b7d34798fec21e5d672debfb9a7dd003554a727c73942a6723b0a22f079
-EBUILD crossfire-server-1.9.0.ebuild 1234 RMD160 921d3248da27b73942d333a4e29c54e9e1c0b3ba SHA1 eaec2de36f215b0f384311790fd82df95757a5ed SHA256 fc5c8498fabab43b6d1e937579438b29905cf73d70df33d86165481ca71b686c
-MD5 ad0fc39b71d308e1e694a4184539805c crossfire-server-1.9.0.ebuild 1234
-RMD160 921d3248da27b73942d333a4e29c54e9e1c0b3ba crossfire-server-1.9.0.ebuild 1234
-SHA256 fc5c8498fabab43b6d1e937579438b29905cf73d70df33d86165481ca71b686c crossfire-server-1.9.0.ebuild 1234
+EBUILD crossfire-server-1.9.0.ebuild 1178 RMD160 4e4bdfa0ce0f6721ca74cf1d6cf3e5ff550b5512 SHA1 b630e88e5a458078c02a280a86baf0760b25d063 SHA256 d62a77fb730b5d8dc029a935360cb4b15b075ede7e11a5c59b355fa6a169f919
+MD5 2f5c0674e06e24ceed2d5c37b0222332 crossfire-server-1.9.0.ebuild 1178
+RMD160 4e4bdfa0ce0f6721ca74cf1d6cf3e5ff550b5512 crossfire-server-1.9.0.ebuild 1178
+SHA256 d62a77fb730b5d8dc029a935360cb4b15b075ede7e11a5c59b355fa6a169f919 crossfire-server-1.9.0.ebuild 1178
 EBUILD crossfire-server-1.9.1.ebuild 1064 RMD160 d5de0e3d8caf1815d12113affd97e94696343c38 SHA1 663844ee60cb4f74ec557d9f11971d67e2d67566 SHA256 47906d0b3103ec7eaebde4f6bfbd71f25ce2e0d533f427fb856c4402e544dfcb
 MD5 16678963272c5d8b84c8f27bea915bb4 crossfire-server-1.9.1.ebuild 1064
 RMD160 d5de0e3d8caf1815d12113affd97e94696343c38 crossfire-server-1.9.1.ebuild 1064
 SHA256 47906d0b3103ec7eaebde4f6bfbd71f25ce2e0d533f427fb856c4402e544dfcb crossfire-server-1.9.1.ebuild 1064
-MISC ChangeLog 1546 RMD160 9cace13fa76e6e5b345390f5c95481ed0a46ff5a SHA1 78cb3fa0543b2f7ed4904dbd233d424c76546d62 SHA256 1524187ff8d922fec992f2f73da7cd478302075ae9ca51278d71fb348b8585c4
-MD5 e78585da875e757b395b35042292b012 ChangeLog 1546
-RMD160 9cace13fa76e6e5b345390f5c95481ed0a46ff5a ChangeLog 1546
-SHA256 1524187ff8d922fec992f2f73da7cd478302075ae9ca51278d71fb348b8585c4 ChangeLog 1546
+MISC ChangeLog 1673 RMD160 df0353ea62f0f0a60446f65ffe6f0eb4b6172082 SHA1 2703054057ec32d9da36eb44ff22ad67d2d4e098 SHA256 c0abd54a65506135099202565526ee5011fc2e2435488fe09ee567bbbcdc93d2
+MD5 313749ef2f125ceab1efee71839a1141 ChangeLog 1673
+RMD160 df0353ea62f0f0a60446f65ffe6f0eb4b6172082 ChangeLog 1673
+SHA256 c0abd54a65506135099202565526ee5011fc2e2435488fe09ee567bbbcdc93d2 ChangeLog 1673
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -24,3 +27,10 @@ SHA256 a72b2eaa89b08db4c8f4b4c31b5e5be43e6d777164e41a6eb56fdd0b7fa6f0b6 files/di
 MD5 645574abd9c401d84a18dc78ebceb6f2 files/digest-crossfire-server-1.9.1 518
 RMD160 f5518d36ba1656f94531f47aa04df9c9207fe5a2 files/digest-crossfire-server-1.9.1 518
 SHA256 ec95c71d77cfdfaff712cd500d84f26739a8ea82eae384e1c5fe61f32de210b2 files/digest-crossfire-server-1.9.1 518
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFdyT+kT4lNIS36YERAkM2AJ92VLqzdKabJKZlD/C16fu1XTwqTwCgqBhX
+mgsu9f/2mjSETM8wj14xp54=
+=aEag
+-----END PGP SIGNATURE-----
diff --git a/games-server/crossfire-server/crossfire-server-1.9.0.ebuild b/games-server/crossfire-server/crossfire-server-1.9.0.ebuild
index 4ebb1d36cc9a..14f49ec80ccb 100644
--- a/games-server/crossfire-server/crossfire-server-1.9.0.ebuild
+++ b/games-server/crossfire-server/crossfire-server-1.9.0.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/games-server/crossfire-server/crossfire-server-1.9.0.ebuild,v 1.3 2006/04/16 22:55:02 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-server/crossfire-server/crossfire-server-1.9.0.ebuild,v 1.4 2006/12/06 20:15:39 wolf31o2 Exp $
 
 inherit games
 
@@ -15,20 +15,16 @@ SLOT="0"
 KEYWORDS="ppc x86"
 IUSE="X"
 
-DEPEND="
-	X? (
-		|| (
-			(
-				x11-libs/libX11
-				x11-libs/libXext
-				x11-libs/libICE
-				x11-libs/libSM
-				x11-libs/libXt
-				x11-libs/libXmu
-				x11-libs/libXaw
-				x11-libs/libXpm )
-			virtual/x11 )
-		media-libs/libpng )"
+DEPEND="X? (
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXt
+	x11-libs/libXmu
+	x11-libs/libXaw
+	x11-libs/libXpm
+	media-libs/libpng )"
 
 S=${WORKDIR}/${MY_P}