From f321a216324611cb1c0196d74fdc893f4c17287e Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 5 Aug 2006 22:54:25 +0000 Subject: [PATCH] make sure games-fps/quake2-demodata is installed before checking its USE flags #139693 Package-Manager: portage-2.1.1_pre4 --- games-fps/quake2-data/Manifest | 14 +++++++------- games-fps/quake2-data/quake2-data-3.20.ebuild | 5 +++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/games-fps/quake2-data/Manifest b/games-fps/quake2-data/Manifest index c4af38c31384..19fd43b13887 100644 --- a/games-fps/quake2-data/Manifest +++ b/games-fps/quake2-data/Manifest @@ -2,10 +2,10 @@ Hash: SHA1 DIST q2-3.20-x86-full-ctf.exe 19267584 -EBUILD quake2-data-3.20.ebuild 2849 RMD160 2a21bdc7b2b118b47731e797f1d8eb509a311941 SHA1 22a92800757c60c6a8d5b75aaf9cb1385f52b359 SHA256 c97ab1d621d561f038b6f058053ac656fc6a8d9793fd5635bed24cc85a051848 -MD5 06657d2049fd1cc73603055bb12d868c quake2-data-3.20.ebuild 2849 -RMD160 2a21bdc7b2b118b47731e797f1d8eb509a311941 quake2-data-3.20.ebuild 2849 -SHA256 c97ab1d621d561f038b6f058053ac656fc6a8d9793fd5635bed24cc85a051848 quake2-data-3.20.ebuild 2849 +EBUILD quake2-data-3.20.ebuild 2896 RMD160 488bf6e214c735804be9809a481e1e5beebb4f82 SHA1 c54a9b40953cb990d3143b872fb321db8386ad14 SHA256 865cc9091d9e388cff24eb7c1c6bcec3e2ea55b8525f5c51f47735b76593e44b +MD5 2ef51a6719e1517f16cb1be06485c77e quake2-data-3.20.ebuild 2896 +RMD160 488bf6e214c735804be9809a481e1e5beebb4f82 quake2-data-3.20.ebuild 2896 +SHA256 865cc9091d9e388cff24eb7c1c6bcec3e2ea55b8525f5c51f47735b76593e44b quake2-data-3.20.ebuild 2896 MISC ChangeLog 1603 RMD160 c5a0852a5cff6ad77d7322b299ba330598ca4341 SHA1 e469e1a76cbb264b879b8f5942da5e98b86ffc6a SHA256 5b062c82c96449b97277a69d9f145a6a9204407c420d636b2c1dbe11d159b190 MD5 f2b837a9718f10b64f95e5de4a059b88 ChangeLog 1603 RMD160 c5a0852a5cff6ad77d7322b299ba330598ca4341 ChangeLog 1603 @@ -20,7 +20,7 @@ SHA256 317081bff5bb705f32ae69f4c7e920bb1102f08324e074c7c0c06ecc1fadac98 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.4 (GNU/Linux) -iD8DBQFEqxNJamhnQswr0vIRAvoEAKChV3LffLa0tOwS+NZO+3RfbrbHWQCgtsEl -y22XNg9gJEuekxbf7+5KIJ4= -=zebS +iD8DBQFE1SGzamhnQswr0vIRAoiuAKCobjBQmwnUKGsxNdwRrN9eoc+t3QCePPBS +Lwj81Ks6dXbPzNPoc3/FUAw= +=f8hE -----END PGP SIGNATURE----- diff --git a/games-fps/quake2-data/quake2-data-3.20.ebuild b/games-fps/quake2-data/quake2-data-3.20.ebuild index 93065bbeb4bd..49b4b452b833 100644 --- a/games-fps/quake2-data/quake2-data-3.20.ebuild +++ b/games-fps/quake2-data/quake2-data-3.20.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-fps/quake2-data/quake2-data-3.20.ebuild,v 1.21 2006/07/05 01:17:45 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-data/quake2-data-3.20.ebuild,v 1.22 2006/08/05 22:54:25 vapier Exp $ inherit eutils games @@ -21,7 +21,8 @@ S=${WORKDIR} pkg_setup() { games_pkg_setup - if built_with_use "games-fps/quake2-demodata" symlink ; then + if has_version games-fps/quake2-demodata && \ + built_with_use "games-fps/quake2-demodata" symlink ; then eerror "The symlink for the demo data conflicts with the cdinstall data" die "Unmerge games-fps/quake2-demodata to remove the conflict" fi -- 2.26.2