Use pg-data as recommended by upstream. Patch from Derek Dolney via bug #56302

4 files changed, 33 insertions, 15 deletions

diff --git a/games-strategy/lgeneral/ChangeLog b/games-strategy/lgeneral/ChangeLog
index 259df63d9643..0f4e98b4878e 100644
--- a/games-strategy/lgeneral/ChangeLog
+++ b/games-strategy/lgeneral/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/lgeneral
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.6 2004/06/24 23:28:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.7 2004/07/24 02:45:25 mr_bones_ Exp $
+
+  23 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  lgeneral-1.2_beta2.ebuild:
+  Use pg-data as recommended by upstream.  Patch from Derek Dolney via bug #56302
 
 *lgeneral-1.2_beta2 (29 May 2004)
 
diff --git a/games-strategy/lgeneral/Manifest b/games-strategy/lgeneral/Manifest
index ab57be249055..e6a50bca46b0 100644
--- a/games-strategy/lgeneral/Manifest
+++ b/games-strategy/lgeneral/Manifest
@@ -1,7 +1,7 @@
+MD5 aa0e492906639ef9df0e8109cb454094 ChangeLog 2160
 MD5 a8819c828f17d7f1859e5008843bca63 lgeneral-1.1.1-r1.ebuild 1116
-MD5 c2282ea04f78e51c75a9da02c36cc0f0 lgeneral-1.2_beta2.ebuild 1109
-MD5 87b97e0fb359ad7cd1706fff9ad24033 ChangeLog 1992
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 953c77c072716b242cf1ed6f94c74f50 files/digest-lgeneral-1.2_beta2 142
+MD5 52ca629af2c75ed618fd71cd7f0953df lgeneral-1.2_beta2.ebuild 1481
 MD5 9bd18133cff27a13ac0c62fe2ebeba33 files/digest-lgeneral-1.1.1-r1 138
+MD5 a439ff98a9b35e8e232647449c5de2a0 files/digest-lgeneral-1.2_beta2 129
 MD5 77fda12a372abfd55040151b84dd2d7b files/1.1.1-netbsd-audio.patch 813
diff --git a/games-strategy/lgeneral/files/digest-lgeneral-1.2_beta2 b/games-strategy/lgeneral/files/digest-lgeneral-1.2_beta2
index 47ff8d7d5040..ba55a08fbe47 100644
--- a/games-strategy/lgeneral/files/digest-lgeneral-1.2_beta2
+++ b/games-strategy/lgeneral/files/digest-lgeneral-1.2_beta2
@@ -1,2 +1,2 @@
 MD5 093964e5918e530bed4e404b8e53dea0 lgeneral-1.2beta-2.tar.gz 878853
-MD5 786feb83f163834a22e3e85e1970145f lgeneral-data-1.1.3.tar.gz 1073781
+MD5 17b15c7cdd31547d061522d1e35da6e9 pg-data.tar.gz 410454
diff --git a/games-strategy/lgeneral/lgeneral-1.2_beta2.ebuild b/games-strategy/lgeneral/lgeneral-1.2_beta2.ebuild
index 4989f800b1d6..459844964168 100644
--- a/games-strategy/lgeneral/lgeneral-1.2_beta2.ebuild
+++ b/games-strategy/lgeneral/lgeneral-1.2_beta2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2_beta2.ebuild,v 1.2 2004/06/24 23:28:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2_beta2.ebuild,v 1.3 2004/07/24 02:45:25 mr_bones_ Exp $
 
 inherit eutils games
 
-DATA=lgeneral-data-1.1.3
+DATA=pg-data
 MY_P="${P/_/}"
 MY_P="${MY_P/beta/beta-}"
 DESCRIPTION="A Panzer General clone written in SDL"
@@ -22,19 +22,33 @@ DEPEND=">=media-libs/libsdl-1.2.4
 
 S="${WORKDIR}/${MY_P}"
 
+src_unpack() {
+	unpack ${A}
+	# Build a temporary lgc-pg that knows about /var/tmp/portage in work/lgc-pg:
+	cp -a "${S}" "${WORKDIR}/lgc-pg" || die "cp failed."
+}
+
 src_compile() {
-	egamesconf --datadir="${GAMES_DATADIR}/../"
+	egamesconf --datadir="${GAMES_DATADIR}/../" || die
 	emake || die "emake failed"
 
-	cd "${WORKDIR}/${DATA}"
-	egamesconf --datadir="${GAMES_DATADIR}/../"
-	emake || die "emake failed (data)"
+	# Build the temporary lgc-pg:
+	cd "${WORKDIR}/lgc-pg"
+	egamesconf --datadir="${D}/${GAMES_DATADIR_BASE}" || die
+	cd lgc-pg
+	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog INSTALL README TODO
-	cd "${WORKDIR}/${DATA}"
-	make DESTDIR="${D}" install || die "make install failed (data)"
+	make DESTDIR="${D}" install || die "make install failed."
+	keepdir "${GAMES_DATADIR}/${PN}/"{ai_modules,music}
+
+	# Generate scenario data:
+	"${WORKDIR}/lgc-pg/lgc-pg/lgc-pg" \
+		-s "${WORKDIR}/${DATA}" \
+		-d "${D}/${GAMES_DATADIR}/lgeneral" \
+		|| die "Failed to generate scenario data."
+
+	dodoc AUTHORS ChangeLog INSTALL README.lgeneral README.lgc-pg TODO
 	prepgamesdirs
 }