integrate patch from Thomas Juerges for ppc support (bug #249427)

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.28.1 i686

3 files changed, 36 insertions, 32 deletions

diff --git a/games-strategy/smac/ChangeLog b/games-strategy/smac/ChangeLog
index 1e6cb2278266..3c73272a6192 100644
--- a/games-strategy/smac/ChangeLog
+++ b/games-strategy/smac/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/smac
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/smac/ChangeLog,v 1.15 2008/09/13 06:24:30 maekke Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/smac/ChangeLog,v 1.16 2009/01/23 07:34:17 mr_bones_ Exp $
+
+  23 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org> smac-6.0a.ebuild:
+  integrate patch from Thomas Juerges for ppc support (bug #249427)
 
   13 Sep 2008; Markus Meier <maekke@gentoo.org> smac-6.0a.ebuild:
   add ~amd64, bug #188602
diff --git a/games-strategy/smac/Manifest b/games-strategy/smac/Manifest
index 0d3c2dca473a..77abada7f87f 100644
--- a/games-strategy/smac/Manifest
+++ b/games-strategy/smac/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST smac-6.0a-x86.run 6801730 RMD160 323e1958a9a48b7ce6c76ce07da9718fc1b796d9 SHA1 2cc8a3112c28c72548b9fa485cd28fa7ba6126a3 SHA256 69b845728f55caef038c6392f148beae47156933f5bff0ce7d9c49162f1d0ee7
-EBUILD smac-6.0a.ebuild 2866 RMD160 f0fbc22b9a23ada777c92911a7a39a524f986201 SHA1 e5c95d6e670e0f50049dcaedb034c0a64eaf09d2 SHA256 e06f17c4218506661766cca67ba4ead2d7f0f8eaaca09e251c1ef47e0b051285
-MISC ChangeLog 2145 RMD160 bb8fa32c46522a8288a42336703247c77e97abff SHA1 a60537383461c08ea7989c5305e6492c22bfb6e3 SHA256 95774bcaca18957f88873f56ab15291266255fb2d99c9644add754c6b5c50c52
+DIST smac-install-ppc.run 18528928 RMD160 3b4a9edbf55499c998283ca84e9d95cb80e1b4e9 SHA1 d876d9854a446c34a8da9b4044a64d0ca44dd9b2 SHA256 ad90f6fa4fa3bfe39f5474016ea6a0c738687fc038995bcd7675294c0438477c
+EBUILD smac-6.0a.ebuild 3195 RMD160 13a40cefea8d03c05bfb65394741b8b8280bccac SHA1 00a607a5d796cd22c754c51891da8becea0370f4 SHA256 d3a401164b0d0b87087b211449d7132828a9ccfde2e4c913af6bc6342084c3b3
+MISC ChangeLog 2290 RMD160 80307922f2feb3270c51265d19f0d566f224d213 SHA1 5f6956a3867003a91bc42b084fd3add01df93847 SHA256 127e68e2d815b9a536d1762d01b84bdc832e6692e2e20879dbae7f7343212f95
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjLXPMACgkQkKaRLQcq0GKzogCdHYH3imGtkN+UfpDmNAaoYd82
-TOsAnjgJn/4SuGWBv6L8TECQ7W29/Ssm
-=1iWX
------END PGP SIGNATURE-----
diff --git a/games-strategy/smac/smac-6.0a.ebuild b/games-strategy/smac/smac-6.0a.ebuild
index 3082dd2062c4..187354c7d950 100644
--- a/games-strategy/smac/smac-6.0a.ebuild
+++ b/games-strategy/smac/smac-6.0a.ebuild
@@ -1,17 +1,20 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/smac/smac-6.0a.ebuild,v 1.17 2008/09/13 06:24:30 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/smac/smac-6.0a.ebuild,v 1.18 2009/01/23 07:34:17 mr_bones_ Exp $
 
+EAPI=2
 inherit eutils games
 
 DESCRIPTION="Linux port of the popular strategy game from Firaxis"
 HOMEPAGE="http://www.lokigames.com/products/smac/"
-SRC_URI="mirror://lokigames/${PN}/${P}-x86.run"
+SRC_URI="x86? ( mirror://lokigames/${PN}/${P}-x86.run )
+    amd64? ( mirror://lokigames/${PN}/${P}-x86.run )
+	ppc? ( http://mirrors.dotsrc.org/lokigames/installers/${PN}/${PN}-install-ppc.run )"
 
 LICENSE="LOKI-EULA"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="videos"
+KEYWORDS="~ppc ~amd64 ~x86"
+IUSE="+videos"
 RESTRICT="strip"
 
 DEPEND="games-util/loki_patch"
@@ -20,7 +23,7 @@ RDEPEND="sys-libs/glibc
 	x11-libs/libXext
 	x11-libs/libXau
 	x11-libs/libXdmcp
-	sys-libs/lib-compat-loki
+	!ppc? ( sys-libs/lib-compat-loki )
 	media-libs/libsdl
 	media-libs/sdl-ttf
 	media-libs/sdl-mixer
@@ -35,13 +38,14 @@ src_unpack() {
 	cdrom_get_cds Alien_Crossfire_Manual.pdf
 	mkdir -p "${S}"/a
 	cd "${S}"/a
-	unpack_makeself ${P}-x86.run
+	use x86 || use amd64 && unpack_makeself ${P}-x86.run
+	use ppc && unpack_makeself ${PN}-install-ppc.run
 }
 
 src_install() {
 	einfo "Copying files... this may take a while..."
 	exeinto "${dir}"
-	doexe "${CDROM_ROOT}"/bin/x86/{smac,smacx,smacpack}
+	doexe "${CDROM_ROOT}"/bin/x86/{smac,smacx,smacpack} || die "doexe failed"
 
 	insinto "${dir}"
 	doins ${CDROM_ROOT}/{{Alien_Crossfire,Alpha_Centauri}_Manual.pdf,QuickStart.txt,README,icon.{bmp,xpm}}
@@ -50,41 +54,47 @@ src_install() {
 	tar xzf "${CDROM_ROOT}"/data.tar.gz || die "unpack"
 	insinto "${dir}"/data
 	doins "${CDROM_ROOT}"/data/*.{pcx,cvr,flc,gif} || die "copying data"
-	doins -r "${CDROM_ROOT}"/data/facs || die "copying fac-data"
-	doins -r "${CDROM_ROOT}"/data/fx || die "copying fx-data"
-	doins -r "${CDROM_ROOT}"/data/projs || die "copying projects-data"
-	doins -r "${CDROM_ROOT}"/data/techs || die "copying tech-data"
-	doins -r "${CDROM_ROOT}"/data/voices || die "copying voices"
+	doins -r "${CDROM_ROOT}"/data/{facs,fx,projs,techs,voices} \
+		|| die "doins failed"
 
 	if use videos ; then
 		doins -r "${CDROM_ROOT}"/data/movies || die "copying movies"
 	fi
 
 	cd "${S}"/a
+	if use ppc ; then
+		cd ${P}-ppc
+	fi
 	loki_patch --verify patch.dat
 	loki_patch patch.dat "${Ddir}" >& /dev/null || die "patching"
 
 	# now, since these files are coming off a cd, the times/sizes/md5sums wont
 	# be different ... that means portage will try to unmerge some files (!)
 	# we run touch on ${D} so as to make sure portage doesnt do any such thing
-	find "${Ddir}" -exec touch '{}' \;
+	find "${Ddir}" -exec touch '{}' +
 
 	newicon "${CDROM_ROOT}"/icon.xpm smac.xpm
 
+	games_make_wrapper ${PN}pack ./${PN}pack "${dir}" "${dir}"
 	games_make_wrapper ${PN} ./${PN} "${dir}" "${dir}"
 	games_make_wrapper ${PN}x ./${PN}x "${dir}" "${dir}"
+	make_desktop_entry smacpack "Sid Meier's SMAC Planetary Pack" smacpack
 	make_desktop_entry smac "Sid Meier's Alpha Centauri" smac
 	make_desktop_entry smacx "Sid Meier's Alpha Centauri - Alien Crossfire" smac
 	prepgamesdirs
 
-	einfo "Linking libs provided by 'sys-libs/lib-compat-loki' to '${dir}'."
-	dosym /lib/loki_ld-linux.so.2 "${dir}"/ld-linux.so.2 && \
-	dosym /usr/lib/loki_libc.so.6 "${dir}"/libc.so.6 && \
-	dosym /usr/lib/loki_libnss_files.so.2 "${dir}"/libnss_files.so.2 || die "dosym failed"
+	if use x86 || use amd64 ; then 
+	    einfo "Linking libs provided by 'sys-libs/lib-compat-loki' to '${dir}'."
+	    dosym /lib/loki_ld-linux.so.2 "${dir}"/ld-linux.so.2 && \
+	    dosym /usr/lib/loki_libc.so.6 "${dir}"/libc.so.6 && \
+	    dosym /usr/lib/loki_libnss_files.so.2 "${dir}"/libnss_files.so.2 || die "dosym failed"
+	fi
 }
 
 pkg_postinst() {
 	games_pkg_postinst
+	elog "To start Sid Meyer's SMAC Planetary Pack run:"
+	elog " smac"
 	elog "To play Sid Meyer's Alpha Centauri run:"
 	elog " smac"
 	elog "To play Alien Crossfire run:"