Change the FILESDIR checks to be DISTDIR, so nobody needs to keep a copy fo this in an overlay to use that functionality.

Package-Manager: portage-2.1.2.1

3 files changed, 25 insertions, 20 deletions

diff --git a/games-action/descent2-data/ChangeLog b/games-action/descent2-data/ChangeLog
index 3d868c763a93..521eae117f84 100644
--- a/games-action/descent2-data/ChangeLog
+++ b/games-action/descent2-data/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-action/descent2-data
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/descent2-data/ChangeLog,v 1.2 2007/03/07 15:49:57 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/descent2-data/ChangeLog,v 1.3 2007/03/07 21:40:39 wolf31o2 Exp $
+
+  07 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  descent2-data-1.0.ebuild:
+  Change the FILESDIR checks to be DISTDIR, so nobody needs to keep a copy fo
+  this in an overlay to use that functionality.
 
   07 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   descent2-data-1.0.ebuild:
diff --git a/games-action/descent2-data/Manifest b/games-action/descent2-data/Manifest
index e26873b9aa5f..b57e9ac2a20a 100644
--- a/games-action/descent2-data/Manifest
+++ b/games-action/descent2-data/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-EBUILD descent2-data-1.0.ebuild 2295 RMD160 4f4e0118ebec96859b99d088b0dbfcae7799cbc6 SHA1 c5e240baefea4a8c8e5843756c400f21f4855c1d SHA256 6c1cafcc094dc3f2e07ea7070b35a753ef1ca082dfdeb0f5ade28526444d7291
-MD5 c641a60c188278fb9e7f46cb4090ee31 descent2-data-1.0.ebuild 2295
-RMD160 4f4e0118ebec96859b99d088b0dbfcae7799cbc6 descent2-data-1.0.ebuild 2295
-SHA256 6c1cafcc094dc3f2e07ea7070b35a753ef1ca082dfdeb0f5ade28526444d7291 descent2-data-1.0.ebuild 2295
-MISC ChangeLog 697 RMD160 ba6d875f8913268ba57bd77478278b7afebaab91 SHA1 e6a924e1dd67b9e67517bcd1da46f651f30d7859 SHA256 ea973f2a776dff22452fe5d1219ede1f7fddb6ad3e42a7af877118c2aa557e89
-MD5 f27bbf537c8699c76fcbae110ddd7c9c ChangeLog 697
-RMD160 ba6d875f8913268ba57bd77478278b7afebaab91 ChangeLog 697
-SHA256 ea973f2a776dff22452fe5d1219ede1f7fddb6ad3e42a7af877118c2aa557e89 ChangeLog 697
+EBUILD descent2-data-1.0.ebuild 2268 RMD160 47b8581c815534360a6e0160cb0a019a6773c9e5 SHA1 366365d5be50f200f747317c7eab7bf032025aab SHA256 2e56e5beac00155ef60f0e5d30b095d2937338b8b02a18561eb4083455c84fb1
+MD5 a9a8153a7c83c422abbc3e032ec7cf90 descent2-data-1.0.ebuild 2268
+RMD160 47b8581c815534360a6e0160cb0a019a6773c9e5 descent2-data-1.0.ebuild 2268
+SHA256 2e56e5beac00155ef60f0e5d30b095d2937338b8b02a18561eb4083455c84fb1 descent2-data-1.0.ebuild 2268
+MISC ChangeLog 906 RMD160 0b4e7f5d162f673ec79a191e1d782464f76b9a88 SHA1 fa59bc08e8b34fb12aaae742564c7efe942e3a64 SHA256 5a39f0ba15e4bbd15cac6ffd91872e606f057a7654c2ae5335582898ffb95bef
+MD5 9c2af80b048bf55c4a22217c94ff56c3 ChangeLog 906
+RMD160 0b4e7f5d162f673ec79a191e1d782464f76b9a88 ChangeLog 906
+SHA256 5a39f0ba15e4bbd15cac6ffd91872e606f057a7654c2ae5335582898ffb95bef ChangeLog 906
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -19,7 +19,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF7t8rkT4lNIS36YERAlMwAJ9vPEKp2cLUzeINrDgY8nbq1b80dACeIzhY
-XvMFKdZq0GEd5BxVbzGKdBA=
-=BBx8
+iD8DBQFF7zFdkT4lNIS36YERApGHAJ48k8FtJNFlFdILJUsz08y4svpo4wCcD940
+PDpvFT/6MehYlzoQTBhjBWY=
+=uBTb
 -----END PGP SIGNATURE-----
diff --git a/games-action/descent2-data/descent2-data-1.0.ebuild b/games-action/descent2-data/descent2-data-1.0.ebuild
index 1a917f6b9eeb..f694df8962e1 100644
--- a/games-action/descent2-data/descent2-data-1.0.ebuild
+++ b/games-action/descent2-data/descent2-data-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/descent2-data/descent2-data-1.0.ebuild,v 1.3 2007/03/07 15:49:57 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/descent2-data/descent2-data-1.0.ebuild,v 1.4 2007/03/07 21:40:39 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -37,13 +37,13 @@ pkg_setup() {
 
 	local m f need_cd="n"
 
-	# Could have the ${SOW} file in ${FILESDIR}, in a local overlay
-	if [[ -e "${FILESDIR}/${SOW}" ]] ; then
-		einfo "Using ${SOW} from ${FILESDIR}"
-		# Check that the movies are available in ${FILESDIR} if needed
+	# Could have the ${SOW} file in ${DISTDIR}
+	if [[ -e "${DISTDIR}/${SOW}" ]] ; then
+		einfo "Using ${SOW} from ${DISTDIR}"
+		# Check that the movies are available in ${DISTDIR} if needed
 		if use videos ; then
 			for m in {intro,other,robots}-{h,l}.mvl ; do
-				[[ -e "${FILESDIR}/${m}" ]] || need_cd="y"
+				[[ -e "${DISTDIR}/${m}" ]] || need_cd="y"
 			done
 		fi
 	else
@@ -57,7 +57,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	local m f="${FILESDIR}/${SOW}"
+	local m f="${DISTDIR}/${SOW}"
 
 	[[ -e "${f}" ]] || f="${CDROM_ROOT}/d2data/${SOW}"
 	# Extract level data
@@ -66,7 +66,7 @@ src_unpack() {
 	if use videos ; then
 		# Include both high and low resolution movie files
 		for m in {intro,other,robots}-{h,l}.mvl ; do
-			f="${FILESDIR}/${m}"
+			f="${DISTDIR}/${m}"
 			[[ -e "${f}" ]] || f="${CDROM_ROOT}/d2data/${m}"
 			einfo "Copying ${m}"
 			cp -f "${f}" . || die "cp ${f} failed"