From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Sun, 7 Jan 2007 20:01:56 +0000 (+0000)
Subject: Version bump to 1.4.03 and closing bug #157433.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0218a858fe556d623c1e675f483af61e102f6072;p=gentoo.git

Version bump to 1.4.03 and closing bug #157433.
Package-Manager: portage-2.1.2_rc2-r1
---

diff --git a/games-strategy/x2/ChangeLog b/games-strategy/x2/ChangeLog
index cb66dd90d29e..e8e9143fa992 100644
--- a/games-strategy/x2/ChangeLog
+++ b/games-strategy/x2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-strategy/x2
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/x2/ChangeLog,v 1.1 2006/10/23 18:16:38 wolf31o2 Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/x2/ChangeLog,v 1.2 2007/01/07 20:01:56 wolf31o2 Exp $
+
+*x2-1.4.03 (07 Jan 2007)
+
+  07 Jan 2007; Chris Gianelloni <wolf31o2@gentoo.org> +x2-1.4.03.ebuild:
+  Version bump to 1.4.03 and closing bug #157433.
 
 *x2-1.4.01 (23 Oct 2006)
 
diff --git a/games-strategy/x2/Manifest b/games-strategy/x2/Manifest
index ec2350f8e6da..6667a1552b11 100644
--- a/games-strategy/x2/Manifest
+++ b/games-strategy/x2/Manifest
@@ -2,14 +2,20 @@
 Hash: SHA1
 
 DIST x2-1.4-1.4.01-x86.run 1030707 RMD160 e11975ec3703b780aa9a5a83e6832129b7ab3868 SHA1 9820235fff55d2ea0babd587535853eee181706e SHA256 0700dee701a2c630615dac16960672a7ceb97ebf147848566383e6caefbd52cd
+DIST x2-1.4.01-1.4.02-x86.run 1219653 RMD160 154550af595008c8849e75014d02e34d150b5f6c SHA1 9c89661e4b9e4d9196468f6c1c0d2366cefd9c38 SHA256 65a087b67248f05ad0fa0b513b1c5c6d2dc77d915914315758ac7549b55dd926
+DIST x2-1.4.02-1.4.03-x86.run 534472 RMD160 6f921d3e8b8b4260333e385f7339f184127bfaf8 SHA1 91ca433fd7aec0c6a311392e1cb8e3dd410dc466 SHA256 04eded4d3aa5ed04d736a15f0f836fe0bfd4186bb27e2d44f11b2d73851cb316
 EBUILD x2-1.4.01.ebuild 2456 RMD160 02b6f233bc86ccfe0e1328d0e89e07ce9c2a088a SHA1 bc3caf36f7c40a5bc07893a05c080d93d6be43cc SHA256 d3742d49a1d87be327789078abccf8fe8ebfc16cb6482633cb26a7a3daefa798
 MD5 8a0769e7e69564662bf1888f93684a00 x2-1.4.01.ebuild 2456
 RMD160 02b6f233bc86ccfe0e1328d0e89e07ce9c2a088a x2-1.4.01.ebuild 2456
 SHA256 d3742d49a1d87be327789078abccf8fe8ebfc16cb6482633cb26a7a3daefa798 x2-1.4.01.ebuild 2456
-MISC ChangeLog 426 RMD160 f1638b54bfc561ba23c19713e1813fdbb5c59f23 SHA1 feedf2f3b76071c25355f69b4f894c7ed3d2a274 SHA256 7f1a9d7da7f794faeb7ab97fec8af965db21741ac9aa6c20fad8251135cfa287
-MD5 9e1c62f5db72035db785d9b39e157234 ChangeLog 426
-RMD160 f1638b54bfc561ba23c19713e1813fdbb5c59f23 ChangeLog 426
-SHA256 7f1a9d7da7f794faeb7ab97fec8af965db21741ac9aa6c20fad8251135cfa287 ChangeLog 426
+EBUILD x2-1.4.03.ebuild 2560 RMD160 b2d3281d416b5007f5220d388d1b631ee47dc2a9 SHA1 d32e08fb438f231ef257b1c117fbeb7f011c8ecd SHA256 c67dc30d9aa648ebfa2ec2aa4c0a7a196a9b9e01bd4287b19c24bcc7dd3f8dc3
+MD5 3fc273684ee0b718c95600b5d990046d x2-1.4.03.ebuild 2560
+RMD160 b2d3281d416b5007f5220d388d1b631ee47dc2a9 x2-1.4.03.ebuild 2560
+SHA256 c67dc30d9aa648ebfa2ec2aa4c0a7a196a9b9e01bd4287b19c24bcc7dd3f8dc3 x2-1.4.03.ebuild 2560
+MISC ChangeLog 576 RMD160 66e6ec900f56e0549b4e6a6479e1b90190a2649c SHA1 d83989984841bed565a091eb927528d744934195 SHA256 d58ef37e2563a54edc3ff759196ee35c79dc05a914f6657557fcb55b925541c6
+MD5 c7955b8bacd3b29fb8f47bd3c79ba59b ChangeLog 576
+RMD160 66e6ec900f56e0549b4e6a6479e1b90190a2649c ChangeLog 576
+SHA256 d58ef37e2563a54edc3ff759196ee35c79dc05a914f6657557fcb55b925541c6 ChangeLog 576
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -17,10 +23,13 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 1514e68b5fef32abcebc577f0fbb38b9 files/digest-x2-1.4.01 247
 RMD160 85ef7ed1162edfb51881a13d07945d450f406410 files/digest-x2-1.4.01 247
 SHA256 058cd63cfd40092ec0208baad3ce180948e7a471d8a8afe324448eacd58d4312 files/digest-x2-1.4.01 247
+MD5 b297df10d5adfd61d99bc520fd858bc8 files/digest-x2-1.4.03 756
+RMD160 fec7c40d18d132bd786b94bf4095a2030dd6201a files/digest-x2-1.4.03 756
+SHA256 9974ace9b8bb8d86df2623520a1708f00efd1c13d0104b81e156a4bf6f6357c3 files/digest-x2-1.4.03 756
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFPQcikT4lNIS36YERAsveAJ4r7zq5UI3MEIgBq8nobpNt0k0noACfciEc
-Xdc1Sqk/k2gCo451oGBiP3k=
-=pbqp
+iD8DBQFFoVAokT4lNIS36YERAq6DAKC+1fPvmt6Iwo+9xvDXjEpJ5nurPwCfY/89
+ZK+aJD02N3RhYywgakCR+n0=
+=+D/P
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/x2/files/digest-x2-1.4.03 b/games-strategy/x2/files/digest-x2-1.4.03
new file mode 100644
index 000000000000..cf06b818a2db
--- /dev/null
+++ b/games-strategy/x2/files/digest-x2-1.4.03
@@ -0,0 +1,9 @@
+MD5 f3a4d7746c972eb4b945f2867ca053cf x2-1.4-1.4.01-x86.run 1030707
+RMD160 e11975ec3703b780aa9a5a83e6832129b7ab3868 x2-1.4-1.4.01-x86.run 1030707
+SHA256 0700dee701a2c630615dac16960672a7ceb97ebf147848566383e6caefbd52cd x2-1.4-1.4.01-x86.run 1030707
+MD5 ae20cff75f84d65f116ab8fadab20eb8 x2-1.4.01-1.4.02-x86.run 1219653
+RMD160 154550af595008c8849e75014d02e34d150b5f6c x2-1.4.01-1.4.02-x86.run 1219653
+SHA256 65a087b67248f05ad0fa0b513b1c5c6d2dc77d915914315758ac7549b55dd926 x2-1.4.01-1.4.02-x86.run 1219653
+MD5 c7fd14680a51ea9acae111e790a2408a x2-1.4.02-1.4.03-x86.run 534472
+RMD160 6f921d3e8b8b4260333e385f7339f184127bfaf8 x2-1.4.02-1.4.03-x86.run 534472
+SHA256 04eded4d3aa5ed04d736a15f0f836fe0bfd4186bb27e2d44f11b2d73851cb316 x2-1.4.02-1.4.03-x86.run 534472
diff --git a/games-strategy/x2/x2-1.4.03.ebuild b/games-strategy/x2/x2-1.4.03.ebuild
new file mode 100644
index 000000000000..6b7514eff678
--- /dev/null
+++ b/games-strategy/x2/x2-1.4.03.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/x2/x2-1.4.03.ebuild,v 1.1 2007/01/07 20:01:56 wolf31o2 Exp $
+
+inherit eutils games
+
+MY_PV="1.4.02-${PV}"
+MY_UPD="http://updatefiles.linuxgamepublishing.com/${PN}"
+
+DESCRIPTION="Open-ended space opera with trading, building & fighting"
+HOMEPAGE="http://www.linuxgamepublishing.com/info.php?id=x2"
+SRC_URI="${MY_UPD}/${PN}-1.4-1.4.01-x86.run
+	${MY_UPD}/${PN}-1.4.01-1.4.02-x86.run
+	${MY_UPD}/${PN}-${MY_PV}-x86.run"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bonusscripts dynamic german langpacks modkit"
+RESTRICT="strip"
+
+RDEPEND="media-libs/alsa-lib
+	sys-libs/glibc
+	x86? (
+		media-libs/libsdl
+		media-libs/openal
+		sys-libs/zlib
+		x11-libs/gtk+
+		x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libXext
+		x11-libs/libXi )
+	amd64? (
+		app-emulation/emul-linux-x86-gtklibs
+		app-emulation/emul-linux-x86-sdl )"
+DEPEND=""
+
+S=${WORKDIR}
+
+src_unpack() {
+	cdrom_get_cds bin/Linux/x86/${PN}
+	ln -sfn "${CDROM_ROOT}"/data cd
+	local u
+	for u in data bonusscripts german langpacks modkit ; do
+		if ( [[ "${u}" = "data" ]] || use "${u}" ) ; then
+			unpack "./cd/${u}.tar.gz"
+		fi
+	done
+	rm -f cd
+
+	cp -rf "${CDROM_ROOT}"/bin/Linux/x86/* . || die "cp exes failed"
+	cp -f "${CDROM_ROOT}"/{READ*,icon*} . || die "cp READ* failed"
+
+	# Apply the patches
+	local p
+	for p in 1.4-1.4.01 1.4.01-1.4.02 "${MY_PV}" ; do
+		einfo "Applying patch ${p}"
+		mkdir patch
+		cd patch
+		unpack_makeself "${PN}-${p}-x86.run"
+		bin/Linux/x86/loki_patch patch.dat "${S}" \
+			|| die "loki_patch ${p} failed"
+		cp -f README.txt "${S}/ChangeLog" || die "cp README.txt failed"
+		cd "${S}"
+		rm -rf patch
+	done
+
+	# These files do not get installed
+	[[ -e modkit ]] && rm -f modkit/x2*.debug
+}
+
+src_install() {
+	local dir=${GAMES_PREFIX_OPT}/${PN}
+
+	# Whether to use static (default) or dynamic binaries
+	local dyn
+	use dynamic && dyn=".dynamic"
+
+	insinto "${dir}"
+	doins -r * || die "doins -r failed"
+	keepdir "${dir}"/Database
+
+	exeinto "${dir}"
+	doexe x2{,.dynamic} || die "doexe x2 failed"
+
+	if use modkit ; then
+		exeinto "${dir}"/modkit
+		doexe modkit/x2{build,tool}{,.dynamic} || die "doexe modkit failed"
+		local f
+		for f in build tool ; do
+			games_make_wrapper "x2${f}" "${dir}/modkit/x2${f}${dyn}"
+		done
+	fi
+
+	games_make_wrapper ${PN} "./${PN}${dyn}" "${dir}"
+	newicon "${CDROM_ROOT}"/icon.xpm ${PN}.xpm || die "newicon failed"
+	make_desktop_entry ${PN} "X2 - The Threat" ${PN}.xpm
+
+	prepgamesdirs
+}