diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-08-11 02:32:10 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-08-11 02:32:10 +0000 |
| commit | cdd128c9f3f06bcc8bb1f1148c3a5f3b2ec69c64 (patch) | |
| tree | ec8a931f5b09fd456952dc6026729c5806bc0d07 /games-fps | |
| parent | only pull in non-english ones based on LINGUAS #129715 by NoCTuRNaL. (diff) | |
| download | historical-cdd128c9f3f06bcc8bb1f1148c3a5f3b2ec69c64.tar.gz historical-cdd128c9f3f06bcc8bb1f1148c3a5f3b2ec69c64.tar.bz2 historical-cdd128c9f3f06bcc8bb1f1148c3a5f3b2ec69c64.zip | |
make sure quake1-demodata is installed first
Package-Manager: portage-2.1.1_pre4
Diffstat (limited to 'games-fps')
| -rw-r--r-- | games-fps/quake1-data/Manifest | 14 | ||||
| -rw-r--r-- | games-fps/quake1-data/quake1-data-2.40.ebuild | 5 |
2 files changed, 10 insertions, 9 deletions
diff --git a/games-fps/quake1-data/Manifest b/games-fps/quake1-data/Manifest index 727a5e006eec..3674e3aedeec 100644 --- a/games-fps/quake1-data/Manifest +++ b/games-fps/quake1-data/Manifest @@ -1,10 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -EBUILD quake1-data-2.40.ebuild 1621 RMD160 403eea0876084b12a8a55695437b505c698914d2 SHA1 311d5681964fe92339450516fb1374be7c2634a5 SHA256 9bca8f7bd8722c03109df8c9a9e4dec70b8876f73c9b3c3f9f53a7ce8d53f66a -MD5 bbda26f0b6744603be2faec077eb6502 quake1-data-2.40.ebuild 1621 -RMD160 403eea0876084b12a8a55695437b505c698914d2 quake1-data-2.40.ebuild 1621 -SHA256 9bca8f7bd8722c03109df8c9a9e4dec70b8876f73c9b3c3f9f53a7ce8d53f66a quake1-data-2.40.ebuild 1621 +EBUILD quake1-data-2.40.ebuild 1669 RMD160 70268821687939f9b55b5c9e97b690859d60bc15 SHA1 e7ce410fcfc12f8127de9d59655dd7a963eec9e8 SHA256 1b776562e9f108795fb1e9ab20fdb6648d5f15558a882ea8e2393a8288846275 +MD5 b848dfb62a2fb646933a1488a6ee50c1 quake1-data-2.40.ebuild 1669 +RMD160 70268821687939f9b55b5c9e97b690859d60bc15 quake1-data-2.40.ebuild 1669 +SHA256 1b776562e9f108795fb1e9ab20fdb6648d5f15558a882ea8e2393a8288846275 quake1-data-2.40.ebuild 1669 MISC ChangeLog 1027 RMD160 d41c51fe16b63c76cf6f8044239a8ee809ba0db8 SHA1 b10bbe55f24a1282d3f567df43b85171cacc934c SHA256 fd047bf2d556298aa639f67530c710a46793e4fb3e742532172b0f503be52e39 MD5 2cc9b68d34b782847f3f15cfaf7efbbe ChangeLog 1027 RMD160 d41c51fe16b63c76cf6f8044239a8ee809ba0db8 ChangeLog 1027 @@ -19,7 +19,7 @@ SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.4 (GNU/Linux) -iD8DBQFEqxNhamhnQswr0vIRAhlmAKCbaCUv3Bvd1R6nQCF1yVtEuuLjZgCbBPa0 -+hTtB6VPR9G4Izevb9Nazfw= -=Utt0 +iD8DBQFE2+xIamhnQswr0vIRAg6qAKCtTYgi/nFe2thasRTKwatQKDU/LgCfck7b +vkDl2I10xT636/1Z0G24Ik8= +=lJU4 -----END PGP SIGNATURE----- diff --git a/games-fps/quake1-data/quake1-data-2.40.ebuild b/games-fps/quake1-data/quake1-data-2.40.ebuild index 47b91a06e671..929d8bcd67a6 100644 --- a/games-fps/quake1-data/quake1-data-2.40.ebuild +++ b/games-fps/quake1-data/quake1-data-2.40.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/quake1-data/quake1-data-2.40.ebuild,v 1.9 2006/07/05 01:18:10 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1-data/quake1-data-2.40.ebuild,v 1.10 2006/08/11 02:32:10 vapier Exp $ inherit eutils games @@ -21,7 +21,8 @@ S=${WORKDIR} pkg_setup() { games_pkg_setup - if built_with_use "games-fps/quake1-demodata" symlink ; then + if has_version games-fps/quake1-demodata && \ + built_with_use "games-fps/quake1-demodata" symlink ; then eerror "The symlink for the demo data conflicts with the cdinstall data" die "Unmerge games-fps/quake1-demodata to remove the conflict" fi |