From 6279ffa84201e2de29ef8420f609b258462bf2b9 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 6 Dec 2006 20:24:46 +0000 Subject: [PATCH] Remove old virtual/x11 dependency. Package-Manager: portage-2.1.2_rc2-r2 --- games-simulation/searchandrescue/ChangeLog | 6 ++++- games-simulation/searchandrescue/Manifest | 22 ++++++++--------- .../searchandrescue-0.8.2.ebuild | 24 ++++++------------- 3 files changed, 23 insertions(+), 29 deletions(-) diff --git a/games-simulation/searchandrescue/ChangeLog b/games-simulation/searchandrescue/ChangeLog index 9d38ccfe2548..f02eaf6b1045 100644 --- a/games-simulation/searchandrescue/ChangeLog +++ b/games-simulation/searchandrescue/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-simulation/searchandrescue # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-simulation/searchandrescue/ChangeLog,v 1.11 2006/10/25 19:15:03 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-simulation/searchandrescue/ChangeLog,v 1.12 2006/12/06 20:24:46 wolf31o2 Exp $ + + 06 Dec 2006; Chris Gianelloni + searchandrescue-0.8.2.ebuild: + Remove old virtual/x11 dependency. 25 Oct 2006; searchandrescue-0.8.2.ebuild: Added ~amd64 keyword. Bug #139731 by Will Briggs diff --git a/games-simulation/searchandrescue/Manifest b/games-simulation/searchandrescue/Manifest index 439bde1d5b84..9f5d01f02f31 100644 --- a/games-simulation/searchandrescue/Manifest +++ b/games-simulation/searchandrescue/Manifest @@ -11,14 +11,14 @@ RMD160 5e5e67441982ebc0a4647301dabb73be974f2bd3 files/searchandrescue-0.8.2-gcc4 SHA256 f641198e8e3408c43511253130269a99fed596e1629891850bf5c78c70099620 files/searchandrescue-0.8.2-gcc41.patch 18686 DIST SearchAndRescue-0.8.2.tar.bz2 613500 RMD160 dda13ebcc1a7c7085322b0ed664e6bc9f5d4a2df SHA1 24ff91f4033e5f001948439158426cc2c06f212e SHA256 6f0ca44497b5a8d7b0f563bf27f5669166d0338512f6246994e84165d153efb3 DIST SearchAndRescue-data-0.8.2.tar.bz2 7232214 RMD160 d4c0b04850b754f896601ac09ad6eb895f081fc5 SHA1 acbda2377d3a8377bfd8209b9dcecfd180ef5f95 SHA256 808bbc351b76a2d1f4ed2ae0270426a966819b8278a200501071e2067467a873 -EBUILD searchandrescue-0.8.2.ebuild 1900 RMD160 b652440f94023a2b8e37db5ab7c65f7e1f87c09b SHA1 29d46682dd2158f702bb06813959d406d886b549 SHA256 f12afea6b2cc3b782ea31b3872350dcaa097c89948ff2f7d73e458d18573d59f -MD5 1def3144a340447d48db8c04c6802190 searchandrescue-0.8.2.ebuild 1900 -RMD160 b652440f94023a2b8e37db5ab7c65f7e1f87c09b searchandrescue-0.8.2.ebuild 1900 -SHA256 f12afea6b2cc3b782ea31b3872350dcaa097c89948ff2f7d73e458d18573d59f searchandrescue-0.8.2.ebuild 1900 -MISC ChangeLog 1432 RMD160 92c4160637797d301f76920d138c83ad2e1dec90 SHA1 b0b6dde8a3c5264a5b2c0b48598fc7dfa28d866e SHA256 2ffbb65f7df9a3ea06c2815968e83a7d9cda3f2d21e62eac16731f946da06113 -MD5 56964c1b8e16f4461f58153c8114fa48 ChangeLog 1432 -RMD160 92c4160637797d301f76920d138c83ad2e1dec90 ChangeLog 1432 -SHA256 2ffbb65f7df9a3ea06c2815968e83a7d9cda3f2d21e62eac16731f946da06113 ChangeLog 1432 +EBUILD searchandrescue-0.8.2.ebuild 1828 RMD160 25824da4f65958acd55ea4e64db0a3d2721e98d7 SHA1 1d75a42971eba017e9f9916946b9601ec1de048c SHA256 ab7d3cd764fc240e77c12381dc449812d3f937e939ccd5f31272e833f07c3de8 +MD5 557e86256e97b63d16eaa262d4745ff9 searchandrescue-0.8.2.ebuild 1828 +RMD160 25824da4f65958acd55ea4e64db0a3d2721e98d7 searchandrescue-0.8.2.ebuild 1828 +SHA256 ab7d3cd764fc240e77c12381dc449812d3f937e939ccd5f31272e833f07c3de8 searchandrescue-0.8.2.ebuild 1828 +MISC ChangeLog 1558 RMD160 480fdd8edc918dbb20e9c0938ce14c3d24d58edb SHA1 89150bf623143c5fb16aa729e3e4d2a45f9043cb SHA256 b50fcd0c989b0aa312cccf9c180221e6b5a6a1799e7605b4aac8682403cd6466 +MD5 51d6a44a525ef68dc40eec10acfb8597 ChangeLog 1558 +RMD160 480fdd8edc918dbb20e9c0938ce14c3d24d58edb ChangeLog 1558 +SHA256 b50fcd0c989b0aa312cccf9c180221e6b5a6a1799e7605b4aac8682403cd6466 ChangeLog 1558 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 @@ -29,7 +29,7 @@ SHA256 4a6f51def5fdfee9a0ff9776c6c5df3c3e0290154a77961382b8cc6bef10e8ff files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFP7fEbfN2jvlVAhwRAgLjAKCYsLmD1feBU3BUqxXSXdxBEyEAJwCaAjbi -pG4nvUlcRhfjF+VAeJgnf/Y= -=KaBE +iD8DBQFFdycVkT4lNIS36YERAh/AAKCD8ISM1oHrf510JO44yCt/w9UNOgCgmP7Z +/zk81rjt0uYFReStH8VUnU0= +=4KnI -----END PGP SIGNATURE----- diff --git a/games-simulation/searchandrescue/searchandrescue-0.8.2.ebuild b/games-simulation/searchandrescue/searchandrescue-0.8.2.ebuild index 96c5cac31d95..cd044282041f 100644 --- a/games-simulation/searchandrescue/searchandrescue-0.8.2.ebuild +++ b/games-simulation/searchandrescue/searchandrescue-0.8.2.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-simulation/searchandrescue/searchandrescue-0.8.2.ebuild,v 1.5 2006/10/25 19:15:03 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-simulation/searchandrescue/searchandrescue-0.8.2.ebuild,v 1.6 2006/12/06 20:24:46 wolf31o2 Exp $ inherit eutils games @@ -15,27 +15,17 @@ SLOT="0" KEYWORDS="~amd64 ppc x86" IUSE="joystick" -RDEPEND="|| ( - ( - x11-libs/libXxf86vm - x11-libs/libXmu - x11-libs/libXi - x11-libs/libXpm - ) - virtual/x11 - ) +RDEPEND="x11-libs/libXxf86vm + x11-libs/libXmu + x11-libs/libXi + x11-libs/libXpm virtual/opengl virtual/glu media-libs/yiff joystick? ( media-libs/libjsw )" DEPEND="${RDEPEND} - || ( - ( - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) - virtual/x11 - )" + x11-proto/xextproto + x11-proto/xf86vidmodeproto" S=${WORKDIR}/${MY_PN}-${PV} -- 2.26.2