diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2006-06-27 19:40:35 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2006-06-27 19:40:35 +0000 |
| commit | a3d0ec70ad536677e8d70c71bacdc7dcebb20a93 (patch) | |
| tree | eac3c3bf07c3198b7ef7737b28c8597b2d7522ef /games-fps/quake2-data | |
| parent | Stable on sparc wrt security #138125 (diff) | |
| download | historical-a3d0ec70ad536677e8d70c71bacdc7dcebb20a93.tar.gz historical-a3d0ec70ad536677e8d70c71bacdc7dcebb20a93.tar.bz2 historical-a3d0ec70ad536677e8d70c71bacdc7dcebb20a93.zip | |
Added check for quake2-demodata to make sure we don't have a file collision. Closing bug #137521.
Package-Manager: portage-2.1.1_pre1-r2
Diffstat (limited to 'games-fps/quake2-data')
| -rw-r--r-- | games-fps/quake2-data/ChangeLog | 7 | ||||
| -rw-r--r-- | games-fps/quake2-data/Manifest | 32 | ||||
| -rw-r--r-- | games-fps/quake2-data/quake2-data-3.20.ebuild | 8 |
3 files changed, 36 insertions, 11 deletions
diff --git a/games-fps/quake2-data/ChangeLog b/games-fps/quake2-data/ChangeLog index e19567c4e1de..93d036aff972 100644 --- a/games-fps/quake2-data/ChangeLog +++ b/games-fps/quake2-data/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-fps/quake2-data # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-data/ChangeLog,v 1.9 2006/04/13 21:06:48 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-data/ChangeLog,v 1.10 2006/06/27 19:40:35 wolf31o2 Exp $ + + 27 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> + quake2-data-3.20.ebuild: + Added check for quake2-demodata to make sure we don't have a file collision. + Closing bug #137521. 13 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> quake2-data-3.20.ebuild: diff --git a/games-fps/quake2-data/Manifest b/games-fps/quake2-data/Manifest index 95accff495eb..6d55a49fd3e9 100644 --- a/games-fps/quake2-data/Manifest +++ b/games-fps/quake2-data/Manifest @@ -1,12 +1,26 @@ -MD5 1fa3f42f027cbc8ec83d95c87c3f0c4d ChangeLog 1226 -RMD160 63d2df7f802f16e253f93367c84f3a6be8a6de95 ChangeLog 1226 -SHA256 56bb72cd8cb396c95d9d2dfd95a7f7da83473a9a9957918d5e66e11a22ac8b00 ChangeLog 1226 -MD5 ac38ac21c5b1dd48241c3d7da6065bd7 files/digest-quake2-data-3.20 71 -RMD160 318a8400c468530dd861a1533caf5622b53827e7 files/digest-quake2-data-3.20 71 -SHA256 317081bff5bb705f32ae69f4c7e920bb1102f08324e074c7c0c06ecc1fadac98 files/digest-quake2-data-3.20 71 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +DIST q2-3.20-x86-full-ctf.exe 19267584 +EBUILD quake2-data-3.20.ebuild 2835 RMD160 805f0365e1dd8a9cc4a00a502571faa50c025cbe SHA1 fd630e7581e610120e953308b1d21305ec32e7b2 SHA256 ff9b1bc1e3913f475d68c7d7bff8059a19534e6bd0a911b6764940aecf83133d +MD5 6d164ede81bd15f7e87440596b5e8942 quake2-data-3.20.ebuild 2835 +RMD160 805f0365e1dd8a9cc4a00a502571faa50c025cbe quake2-data-3.20.ebuild 2835 +SHA256 ff9b1bc1e3913f475d68c7d7bff8059a19534e6bd0a911b6764940aecf83133d quake2-data-3.20.ebuild 2835 +MISC ChangeLog 1411 RMD160 6180d1356d3cb762afaa6ba84730df4e39cbb4aa SHA1 e719932db3df39c06412520cf04158469af8c458 SHA256 3028a8bf857728108a88b7e6d9f37655b12d704cb5a5daac8b1295dba3a4b7c0 +MD5 17e027891899f065c18d92495d41afad ChangeLog 1411 +RMD160 6180d1356d3cb762afaa6ba84730df4e39cbb4aa ChangeLog 1411 +SHA256 3028a8bf857728108a88b7e6d9f37655b12d704cb5a5daac8b1295dba3a4b7c0 ChangeLog 1411 +MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158 -MD5 4b7e9ed57998f08a9b866e50971a0e54 quake2-data-3.20.ebuild 2627 -RMD160 98ad545c8ac389469db67d20a20bbd5ebbc8b438 quake2-data-3.20.ebuild 2627 -SHA256 70666e3334510af97ac2a695c6798c5ecde29a355659264d55d62361e1bf4608 quake2-data-3.20.ebuild 2627 +MD5 ac38ac21c5b1dd48241c3d7da6065bd7 files/digest-quake2-data-3.20 71 +RMD160 318a8400c468530dd861a1533caf5622b53827e7 files/digest-quake2-data-3.20 71 +SHA256 317081bff5bb705f32ae69f4c7e920bb1102f08324e074c7c0c06ecc1fadac98 files/digest-quake2-data-3.20 71 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.3 (GNU/Linux) + +iD8DBQFEoYm4kT4lNIS36YERAkndAKCYCkR3TW/qKLEvEEXeiNuTLBr2WACePDYq +1SalwyNWqg1jaWedKHaIYeQ= +=kg14 +-----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 91195437ed3c..4876f993d5a8 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.18 2006/04/13 21:06:48 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-data/quake2-data-3.20.ebuild,v 1.19 2006/06/27 19:40:35 wolf31o2 Exp $ inherit eutils games @@ -20,6 +20,12 @@ S=${WORKDIR} pkg_setup() { games_pkg_setup + + if 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 + export CDROM_SET_NAMES=("Existing Install" "Ultimate Quake Edition" "Quake2 CD" "Quake4 Bonus DVD") cdrom_get_cds baseq2:Install/patch:Install:Movies } |