version bump wrt #448434

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

3 files changed, 118 insertions, 5 deletions

diff --git a/games-strategy/defcon-demo/ChangeLog b/games-strategy/defcon-demo/ChangeLog
index 29c922c1c055..56145a4440ba 100644
--- a/games-strategy/defcon-demo/ChangeLog
+++ b/games-strategy/defcon-demo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-strategy/defcon-demo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/defcon-demo/ChangeLog,v 1.6 2012/12/20 07:25:37 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/defcon-demo/ChangeLog,v 1.7 2012/12/31 14:10:21 hasufell Exp $
+
+*defcon-demo-1.60 (31 Dec 2012)
+
+  31 Dec 2012; Julian Ospald <hasufell@gentoo.org> +defcon-demo-1.60.ebuild:
+  version bump wrt #448434
 
   20 Dec 2012; Tupone Alfredo <tupone@gentoo.org> defcon-demo-1.42.ebuild:
   Migrate to EAPI=5.
diff --git a/games-strategy/defcon-demo/Manifest b/games-strategy/defcon-demo/Manifest
index f4cf002e068d..ba1884795720 100644
--- a/games-strategy/defcon-demo/Manifest
+++ b/games-strategy/defcon-demo/Manifest
@@ -3,13 +3,20 @@ Hash: SHA256
 
 AUX defcon 400 SHA256 132840e1a669b6e5fc31eb3ad67bc2e95f0b34970a25e1b9fae13578cdf933d1 SHA512 d417fcf9560a3b3a7232e3c86b4315f0de6ed86ce8263348520910ff6bc1d14e649f31d500f52c70c2be655836261219ca9dce4f8df9a32d5ca2b00421667058 WHIRLPOOL e6cc0a31324cfc965cc9279a8bd7d43d5ddd52393786aeb9c244ec9bcfec14c375b436cca14abbd47342a96f73248a57e596cc7e185ed4b534433feff8828dea
 DIST defcon-v1.42.tar.gz 63093946 SHA256 5973c32ef55d245b9adfbce33bb7c503d3f0ad7bf5deb55eba8754f9850cdf40 SHA512 1072a2c7fb9c7694b4fab9e7475222f9eb3f6f41fa4cac18f6fc9d1bee23678c236eb6ec5dafaeeba87ddc4b07c51fca51d49d8489a6c3268b9f8c87765a2635 WHIRLPOOL c6cfaaba5f19f0b11b02094c9730a9fa1d491700332cc69017cee2fa4407db502a5027c4a823a5679a4a3114aceeffa36574c923adc518adbdd924732b043369
+DIST defcon_1.6-1_amd64.deb 62377900 SHA256 52142cf3684f054f2449bb0dae96a3b9e0a9d5bb003ea479b25f8a55daffcb26 SHA512 b71aacc3cd94eec8f1ea19ee03d8098fcdd96191c12d614f55076826ef0bb44c8ada66dfd3df7d94d042b33bdd8fa5f0f58e69fc980d6213c320ab4ce2d682a9 WHIRLPOOL 8c9813764b412f4b2d2f1d75530e60800e49b98668bce11e931d898404ec10d45bc42e3c5478154b696c41b9dff93bcb0c72817ece38aedb50cc11bbc53265f1
+DIST defcon_1.6-1_i386.deb 62311684 SHA256 e61f1ebe93eaf821b6313b37e080a76a9444c2c46afc8e2386a0f2b644b8d1d3 SHA512 0e60e8fbca2f3046228b656990e3adb471de4f64a99d435c96b1e5a8cc49b1250c48ceeb19a4bcb58354e750398de2559256d26a38b20286dec3c0ce7f97ebb8 WHIRLPOOL 0d5fed7be50abaa2dd29434aae986bb63851a208f394b950a55c89d02cc36faf571209730641842a7af1cde0f33501cd6cb0dcb33c8287ef591d5675c67d3cbe
 EBUILD defcon-demo-1.42.ebuild 1899 SHA256 b33e1b0e5406b7acd7093fa414954c5aa38317e83c348872befeaf3978dfb0c1 SHA512 a66ec86fa875bd00c88298d073e7fc3a0a27fbd454272bbeda2c9c7914d9da9bc0628c3bd638a4845aa69055f73f992a0b70b90cf4742f609870b2f694308b9b WHIRLPOOL 0601baa83f9e154eb498381bb9d5b278899a7ee9f081d39a8e9047e6fc3f1a76c2d32920c248645ae30612a5a733a275f3380a0295f0c50605932451c42b8ebf
-MISC ChangeLog 1016 SHA256 6e734baac81db3f107093021c7c9725764ede1a02a33f61a20f5938e48c3230f SHA512 6f5037dd9c89cae03cb501f2145ac2a0d5022a231f41c631c2fbff4a4172090946ca58f1d38d1e018d3f9e3c040a21f10d4c00ba8befc79176ec32ad266462b5 WHIRLPOOL 6e051a5688cd514f9b90c2f3aa011cc56058d3e71e4d4fb240f9ce56a621609b88f7953a0996ef81d8566df582be67e37b48e06599e4e70bc09640efb26895ff
+EBUILD defcon-demo-1.60.ebuild 2426 SHA256 80689e485fc3e47b81abe44a59e06c08adf978ba42ebca25f1b96131118c9403 SHA512 4586c12b2f16d9a9cc83b242eae8963bb7cdaad10a160a061312c97a8ad55492915ac9c2a6562486e4c3f1b93803d4ce6456b1c23bf66e764bd049711c2ad9de WHIRLPOOL 41ef5ffdec27ab882427a1641356a1d97057c9a799eb146082d36586f30f62df329ee3de81abc972a4cedf7ece50aeab42b8407a7e364ba30f41439774b189a6
+MISC ChangeLog 1156 SHA256 2736b044588c34255768e9957536c8c2bc43f56d9f5a29621bcf3a4b43193be2 SHA512 a50b0df7ec2bb968389549a36f177d55eef64527260b1edfd7b5683313dba6925818f936a791b3f8fa4dfc83a7faee3488586079ec3b7e6f88f5f14d7cc29c81 WHIRLPOOL 255d916a083127d5cce96477b21fc2b4a1d8ee7fabf9cf6a9483c72472bc7f73edad815ab3f3b51a1932d831c060610a81e1886b63fa3c2f5e77401a5cc351fc
 MISC metadata.xml 291 SHA256 84b3534a5e435f20efd3845269de9e1f51c68bab6ca580d70314259e17b937bd SHA512 633084f8ad90457b753a5cf80ed500e16045f42df905e2346504957ca8efcc72256b93cc24f04ff2c52f97f16cc62b7ec3ff8eacb603fe8c79937fb3563b8c58 WHIRLPOOL 237a86aed76b75d230a7826563d355457c63b4759434f2e5bcc3245b8c2d7d66d5f6eed907b8e7202d427a612d6ea6493f9511303815d4da1fb6a6686b9a10fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDSvXcACgkQIY77eQFFFC3K2QCfRbXy8DkgjeOOgnL6pxlPjXSA
-ZrsAn0mPV0u+D9H4pwxsaNoKADPcIB7V
-=wIW/
+iQEcBAEBCAAGBQJQ4ZzPAAoJEFpvPKfnPDWz0ikIAJBuKYUqEZVr5pfQKsLGOCZ0
+shmLR35Kf8TSZLkxn1y75TNr9k24wWEeARKR7hjcI6QOqqcdpjLbc0kfocC1a5OC
+2XDIkGtMzj3ek10vaRafu63FZZpY5B8RG3Zq9WoEhKJ9vWOn2oPZj2mubHv5eS4Q
+56pUhd+VZeryQPibKMiaumP9lcxJWtc62FT3QaqwDLSwfdS8KyEjg3v21aBh55rM
+UGQw56rKadPPb3QNEulVIqSzzML8Fi21746l1s1elSRyRUA4wbdPqMe25aT0ufZH
+K/tFXHh1N6DEQ7cA4Q75geNcmyiCfLRnXnUCbdGhtaCC0Yqu5D8Zi0TEYjyLsjk=
+=ZrGl
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/defcon-demo/defcon-demo-1.60.ebuild b/games-strategy/defcon-demo/defcon-demo-1.60.ebuild
new file mode 100644
index 000000000000..924e8dfc6840
--- /dev/null
+++ b/games-strategy/defcon-demo/defcon-demo-1.60.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/defcon-demo/defcon-demo-1.60.ebuild,v 1.1 2012/12/31 14:10:21 hasufell Exp $
+
+EAPI=5
+inherit eutils toolchain-funcs gnome2-utils games
+
+MY_PN=defcon
+MY_PV=${PV:0:3}
+MY_PVR=1
+MY_P=defcon_${MY_PV}-${MY_PVR}
+
+DESCRIPTION="Global thermonuclear war simulation with multiplayer support"
+HOMEPAGE="http://www.introversion.co.uk/defcon/"
+SRC_URI="x86? ( http://www.introversion.co.uk/defcon/downloads/${MY_P}_i386.deb )
+	amd64? ( http://www.introversion.co.uk/defcon/downloads/${MY_P}_amd64.deb )"
+
+LICENSE="Introversion"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+system-libs"
+RESTRICT="mirror strip"
+
+# glibc discussion:
+# http://forums.introversion.co.uk/defcon/viewtopic.php?t=4016
+RDEPEND="
+	media-libs/libogg
+	media-libs/libvorbis
+	>=sys-libs/glibc-2.3
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXext
+	x11-libs/libXdmcp
+	system-libs? ( media-libs/libsdl )"
+DEPEND=""
+
+QA_PREBUILT="${GAMES_PREFIX_OPT:1}/${PN}/lib/${MY_PN}.bin.x86"
+
+S=${WORKDIR}/usr/local/games/${MY_PN}
+
+src_unpack() {
+	default
+	unpack ./data.tar.gz
+
+	cd "${S}" || die
+	# maintain compatibility with old installation/script
+	[[ -e lib64 ]] && { mv lib64 lib || die ;}
+	[[ -e ${MY_PN}.bin.x86_64 ]] && { mv ${MY_PN}.bin.x86_64 ${MY_PN}.bin.x86 || die ;}
+}
+
+src_prepare() {
+	# FindPath scripts are ugly and unnecessary
+	if use system-libs ; then
+		rm -f lib/lib*
+	fi
+	sed \
+		-e "s:GAMEDIR:${GAMES_PREFIX_OPT}/${PN}:g" \
+		"${FILESDIR}"/${MY_PN} > "${T}"/${MY_PN} \
+		|| die "sed failed"
+	echo "int chdir(const char *d) { return 0; }" > chdir.c \
+		|| die "echo failed"
+}
+
+src_compile() {
+	echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS} -fPIC -shared -o lib/chdir.so chdir.c"
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -fPIC -shared -o lib/chdir.so chdir.c || die
+}
+
+src_install() {
+	local dir=${GAMES_PREFIX_OPT}/${PN}
+
+	insinto "${dir}/lib"
+	doins *.dat
+
+	exeinto "${dir}"/lib
+	doexe lib/*.so
+	doexe ${MY_PN}.bin.x86
+
+	doicon -s 128 ${MY_PN}.png
+
+	# Can be upgraded to full version, so is not installed as "demo"
+	dogamesbin "${T}"/${MY_PN}
+	make_desktop_entry ${MY_PN} "Defcon"
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+	elog "Screenshots will appear in ~/.${MY_PN}/lib"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}