Added a patch from Paul Bredbury <brebs@sent.com> to make sure we don't conflict with games-fps/quake1-data. Closing bug #137402.

Package-Manager: portage-2.1.1_pre1-r2

3 files changed, 38 insertions, 14 deletions

diff --git a/games-fps/quake1-demodata/ChangeLog b/games-fps/quake1-demodata/ChangeLog
index 9bbeb77ba454..e91ba0cbe82a 100644
--- a/games-fps/quake1-demodata/ChangeLog
+++ b/games-fps/quake1-demodata/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/quake1-demodata
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1-demodata/ChangeLog,v 1.2 2006/06/19 20:46:07 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1-demodata/ChangeLog,v 1.3 2006/06/27 20:02:06 wolf31o2 Exp $
+
+  27 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  quake1-demodata-1.06.ebuild:
+  Added a patch from Paul Bredbury <brebs@sent.com> to make sure we don't
+  conflict with games-fps/quake1-data. Closing bug #137402.
 
   19 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   quake1-demodata-1.06.ebuild:
diff --git a/games-fps/quake1-demodata/Manifest b/games-fps/quake1-demodata/Manifest
index c1b733b5e605..9aa613689a97 100644
--- a/games-fps/quake1-demodata/Manifest
+++ b/games-fps/quake1-demodata/Manifest
@@ -2,25 +2,29 @@
 Hash: SHA1
 
 DIST quake106.zip 9094045 RMD160 93770833400903ee17f05835fbc2004c5aed52d1 SHA1 f8a1a509b094ccdbed3c54b96f7d9b351c0898f5 SHA256 ec6c9d34b1ae0252ac0066045b6611a7919c2a0d78a3a66d9387a8f597553239
-EBUILD quake1-demodata-1.06.ebuild 1347 RMD160 136c8c0214774bca92eab87d2db2b09bb79d708d SHA1 999c18e741e670d83cdc23e58405ffba0577d8b9 SHA256 a86c8814ae7a9c66acd2152c2688ec7d4bbd09342d4af669346acfe0a7a8879b
-MD5 d1e613f7956d6d51d6d95a8f72285c2c quake1-demodata-1.06.ebuild 1347
-RMD160 136c8c0214774bca92eab87d2db2b09bb79d708d quake1-demodata-1.06.ebuild 1347
-SHA256 a86c8814ae7a9c66acd2152c2688ec7d4bbd09342d4af669346acfe0a7a8879b quake1-demodata-1.06.ebuild 1347
-MISC ChangeLog 580 RMD160 52fade70470456f097057ae7138791c5846484c0 SHA1 77908b77e43da3a60a8eed4a64e97d1505106d8e SHA256 8dd5405fb221157bc698098b4e03de3bd4339b63f51346236cbcde3631200cf1
-MD5 c14388236ac0e81c32bc091325697879 ChangeLog 580
-RMD160 52fade70470456f097057ae7138791c5846484c0 ChangeLog 580
-SHA256 8dd5405fb221157bc698098b4e03de3bd4339b63f51346236cbcde3631200cf1 ChangeLog 580
+EBUILD quake1-demodata-1.06.ebuild 1721 RMD160 fbdadca418f6051e1338b44e215601c2b8df9ecd SHA1 670d1c25575aca6d4e915e7cbb0dc6fc5cc0ca92 SHA256 2d8ddbd94b2e8e61371d6943ba1c327918680eff6f02e7c5f60bd51eff810fd3
+MD5 dd4ff16f008e7ceeb6583105b670e9e7 quake1-demodata-1.06.ebuild 1721
+RMD160 fbdadca418f6051e1338b44e215601c2b8df9ecd quake1-demodata-1.06.ebuild 1721
+SHA256 2d8ddbd94b2e8e61371d6943ba1c327918680eff6f02e7c5f60bd51eff810fd3 quake1-demodata-1.06.ebuild 1721
+MISC ChangeLog 800 RMD160 d75df684f5e2bc9af63121a2b2fc74ece1a1020b SHA1 420103406266e1ded1b39c85030c272fea1f0989 SHA256 5f3994fe10a95d072e4878de2b795c222027464bdb4455c2480a35e0c97257ca
+MD5 88695d1694e37e91e6d26d3877240377 ChangeLog 800
+RMD160 d75df684f5e2bc9af63121a2b2fc74ece1a1020b ChangeLog 800
+SHA256 5f3994fe10a95d072e4878de2b795c222027464bdb4455c2480a35e0c97257ca ChangeLog 800
 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
+MISC quake1-demodata-1.06.ebuild.rej 1458 RMD160 b30581ae044477b853a5d1774fb28202644ea97c SHA1 96b4c64cbf30a24b2ab24e9c8e0ba28a3a8c5e20 SHA256 ee2938fd6bf8b0d8e9aa59d60b85c791ee5679ef0e1300f097021b519d6b384e
+MD5 700c15e1ff0b6963731b22be478d9e9a quake1-demodata-1.06.ebuild.rej 1458
+RMD160 b30581ae044477b853a5d1774fb28202644ea97c quake1-demodata-1.06.ebuild.rej 1458
+SHA256 ee2938fd6bf8b0d8e9aa59d60b85c791ee5679ef0e1300f097021b519d6b384e quake1-demodata-1.06.ebuild.rej 1458
 MD5 0f6daba6c6ec3da4b025ff332705d921 files/digest-quake1-demodata-1.06 220
 RMD160 8ecad09c212cc9a7a80e7b1f6742313f6ecd77fa files/digest-quake1-demodata-1.06 220
 SHA256 7afbd8726ef1e55f02f57bd10d6d0c6c20704990d134ef97735b8d30b805d231 files/digest-quake1-demodata-1.06 220
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFElw0UkT4lNIS36YERAtd3AKCjvwV+6tlLuhQvdYERLCcbu6iURACeI4S+
-5WJ557UlCDuf6Yli7IPPWig=
-=JD6F
+iD8DBQFEoY7DkT4lNIS36YERAhdiAJ98HzXj+9Sqe8RLwBc7iQ+wcHNLMACfdawx
+tAMa9K9UdklXFvg3dD47sMM=
+=19YY
 -----END PGP SIGNATURE-----
diff --git a/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild b/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild
index a6aee140c429..8ec7ae7d7011 100644
--- a/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild
+++ b/games-fps/quake1-demodata/quake1-demodata-1.06.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-demodata/quake1-demodata-1.06.ebuild,v 1.2 2006/06/19 20:46:07 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild,v 1.3 2006/06/27 20:02:06 wolf31o2 Exp $
 
 inherit eutils versionator games
 
@@ -16,13 +16,28 @@ LICENSE="quake1-demodata"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="symlink"
-RESTRICT=""
 
 DEPEND="app-arch/lha"
 
 S=${WORKDIR}
 dir=${GAMES_DATADIR}/${MY_PN}1
 
+pkg_setup() {
+	games_pkg_setup
+
+	if has_version "games-fps/quake1-data" ; then
+		ewarn "games-fps/quake1-data already includes the demo data,"
+		ewarn "so this installation is not very useful."
+		echo
+		if use symlink ; then
+			eerror "The symlink for the demo data conflicts with the cdinstall data"
+			die "Remove the 'symlink' USE flag for this package"
+		fi
+		ebeep
+		epause
+	fi
+}
+
 src_unpack() {
 	unpack ${A}