version bump wrt #380487, convert to distutils-r1

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

4 files changed, 195 insertions, 7 deletions

diff --git a/games-strategy/outerspace/ChangeLog b/games-strategy/outerspace/ChangeLog
index 6f5337d5d7aa..18153c1ba28a 100644
--- a/games-strategy/outerspace/ChangeLog
+++ b/games-strategy/outerspace/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/outerspace
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/outerspace/ChangeLog,v 1.18 2011/01/30 18:14:46 phajdan.jr Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/outerspace/ChangeLog,v 1.19 2013/01/27 15:17:57 hasufell Exp $
+
+*outerspace-0.5.68 (27 Jan 2013)
+
+  27 Jan 2013; Julian Ospald <hasufell@gentoo.org> +outerspace-0.5.68.ebuild,
+  +files/outerspace-0.5.68-setup.patch:
+  version bump wrt #380487, convert to distutils-r1
 
   30 Jan 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   outerspace-0.5.67-r1.ebuild:
diff --git a/games-strategy/outerspace/Manifest b/games-strategy/outerspace/Manifest
index 8a7b5f5eef59..7d944c768cdb 100644
--- a/games-strategy/outerspace/Manifest
+++ b/games-strategy/outerspace/Manifest
@@ -1,5 +1,23 @@
-AUX outerspace 169 RMD160 b89fc3abffe85f63cb8469b0ac2abe0fd3b60dc1 SHA1 e9e864259d66cdb08f7a55e3df3f6f39a26b45fc SHA256 e6b6bad8a9ea3e85c13a282e8eb9ed1c71649d79a3309c5f7a053a2727028a7b
-DIST outerspace-0.5.67.tar.gz 2791914 RMD160 fb8cc0b96570e27657f8c1ea4254ded3349e3906 SHA1 d432d98f608b5b3376fa4ae52d53d58dd36ffbe9 SHA256 9a71d502ef060a00aabb3112db6a81c729b63848f217d7a7b9d680c11f47fa2d
-EBUILD outerspace-0.5.67-r1.ebuild 1245 RMD160 233d5dbbcd667bcfa288186b8fcbfeafcc5cb418 SHA1 aec39c2d15523466a887d5e0c0d567dbebd9dbf1 SHA256 2cb26c28d71a7a6d4bd46cffbf121a3e25c0792fbb428a84dfa141b8019c3b97
-MISC ChangeLog 2537 RMD160 5a9678e2f1d749fe8d4616fd32906793ba51c8a6 SHA1 63c5363effb0a4d567311e4cfa3968388ed84456 SHA256 83f7975584672e8992c1c11bb37706748b9ade74622f8653d80715ee1f86f54f
-MISC metadata.xml 660 RMD160 1cf6d0f621b9bb41f53fda213029e1929b71fd03 SHA1 bffccb782cf851d2df01e04a4b32116c35699c5b SHA256 067a17465806395c1f5ef75903a920601e06bf3726736bcbdfb3f448907b2d39
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX outerspace 169 SHA256 e6b6bad8a9ea3e85c13a282e8eb9ed1c71649d79a3309c5f7a053a2727028a7b SHA512 fd20d9de084fef162eec391d68dc973df566b62fd2254fe8ad92c91b073341ca17f96844e0cae28592a7a4d05cc6e3744d66cd37dce9b70319678b91db8d8a1b WHIRLPOOL 70e466dc0ea3f8cf75dbed11a6848f86b3ad0abd57cd9077f0b9b0e3cf00a1a1087bc5536036b877a5442460f3cd25e4198c6ec1b11ef6235f08aee204ccd1d0
+AUX outerspace-0.5.68-setup.patch 1644 SHA256 77ca068e9f9c658c9ede7ccfec008933c589e4be8026a071f4ddb51b7caacccc SHA512 3b583e3fbb0a2a26ee18edd6734d2adac07401376c5a96213f6fddaac18a0df6128007dc9947a77a0c9e12fafea368acff8cb5eef13d55206530bf55b28640c2 WHIRLPOOL 3a653464f2f273832aa36114a77e01e8cd2a116eec6d9447b5e883e3a4d4d6a88e4b96f3da8de55d47f7ab1985dd28a17b2774e792fdebc84476c2eb3612eebf
+DIST outerspace-0.5.67.tar.gz 2791914 SHA256 9a71d502ef060a00aabb3112db6a81c729b63848f217d7a7b9d680c11f47fa2d SHA512 777a391b9a1bddf690fb3e1263eae0d1a3afde4d7c2d59a41164c1c7646f715414083f1928c6f3ab2ef4806941537b46e55b00e7487b03831624e09003ac94a8 WHIRLPOOL a3f79dbe1f7594d8efa551f47a1c29640c8153714625d4c99765f94f6fddf946c0db8174460ef57032d55e09b27739e6287b38f96f0fe7d75a9512b22ebc7517
+DIST outerspace-0.5.68.tar.gz 2249703 SHA256 6ca1ab9f9954821631d150ada07143f84f01eb9eb7773d1656121f657870be01 SHA512 dc2cbebf16fefabcc3356efb496766b90a5eabbf218f085fdc83cf956ca9503e99ef3154e0905c2432a3bf7caabd1f2af585a43397ba368581cd66546fcddc6b WHIRLPOOL cd72366bed75a5eb0a74dfaa8003b47cfa6b5f743b41c427135e965b44f9552bb88aa48203c987fe355824698019d0fe994983c2cfa751679315391fd90aa8f6
+DIST outerspace_0.5.68-0ubuntu1_all.deb 2634188 SHA256 c750f5ab5b124477f59e419f5146548231a48ee3a695a0b7a923628b836e1661 SHA512 9520cf1207a59497d6253b42bc34d580f9b805cf4ae55a5c921082e965892aa67921c4624ea94a5145c911dc2b24a1cca2806c06770ef8d1ded10855fb42666c WHIRLPOOL 137d44d414c3572a7dbbdf16556c499a7132739407407f3f71ee32af2f3671a9c7ec6ae853122cabc466d8963df090fe8b3bfb9881bd643bb498c992304e0e3b
+EBUILD outerspace-0.5.67-r1.ebuild 1245 SHA256 2cb26c28d71a7a6d4bd46cffbf121a3e25c0792fbb428a84dfa141b8019c3b97 SHA512 a6d2a04f0e33ec35155e486bb83ee91efe91ab9b679ad841910f6308cfdded78f6f6f6764e29208b41193a5a23ecd0a6cc087efbcc39ce7af53fa9d00da8c0b9 WHIRLPOOL ac097478006dbda64d33bb275c0456c5ba8e502d4cdee0f6eaac16346007c49032815742e92521310ab0ef05402837006d034ff965e95a59dc52adc0a7ed82ca
+EBUILD outerspace-0.5.68.ebuild 1855 SHA256 50b12f8f65693ddcc643cdad1884b2112f9819450b8564a1d883112f13eceba2 SHA512 e2b3f86ff4ef4577d322cba5b92863bd8b1faae1de137aa7e6472a1b0fa032c131d27091c1a383d02b3865795d51773f86701bcc17a76326929dfa882850c117 WHIRLPOOL c79b3f86c2899c8e7b1ced663109ba7644e09eded8150aa1db3d88f951d7db7c866e646a06fec81e1c704a5882d6d30833a7fbeb27ba66e6c7645f5c9f2e8f39
+MISC ChangeLog 2740 SHA256 ec702953953f5c164a9633152633f08f71fb6aa772f2aa5db2418ddde22ba33f SHA512 add5dc419e82c6e8b2c553a9b45868ae8aba112d49b96631079e4af1fb268aed5aa6b406b421777585366b2fd9c4d72cd9f30a79351c20debc2047a14bbeea59 WHIRLPOOL 36b333a5a5980049023fd964104be13fa8b340b8f4b0ed53220a101061bb841bf5296d9cf3e7fefd40653d75cc978cf65668523466a5eed444484114ca3a1526
+MISC metadata.xml 660 SHA256 067a17465806395c1f5ef75903a920601e06bf3726736bcbdfb3f448907b2d39 SHA512 9a8bc91af9396638e05634840666e6f938b9e1290eecd9c7f8ea4669dcc77deec45ae0c06e7ad1f2db08e665e6d0c8c31f929e548ccf7549317874c501f212b5 WHIRLPOOL 2315771873772bcc294cd86c1a14c1653cb41d88d7cd02ac33aaa44a99c4a2ee337fb1e9e9467a60434850dd26391218f0fbd51bb36586510259010ecb6e5665
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRBUUpAAoJEFpvPKfnPDWz/t0H/2xnmSbhTn7KliGUvwMPahPq
+iF82pld6eBLgxGZmiUEFtrvUZ3sEOVygd0q/euSsxFYKOOEHyk/C0u7gQ0QljjVL
+yVRJRnyERyCUOSlgoQmfS9+Bl8uXvJtw0Aqz+ud45aMK1j9HZqdNPtr5vadC7xo3
+ujBvuN0I1w9EOPe+ubcIDALFle9r9zqfLa3BAPp4AeoYUF9Tw86B5zHfELKKtVeW
+Awe6n0cLClrbXD3Q68OlLAYvtP+v7VVB4GK4+srahTEezG2wHWNAhbi+Dc75CZii
+m/A414oh0dyErYaNc6SE6/L3IjAr5iTXNjRJBP4dSETgrtq2leTOO5Wdh77rm3w=
+=k5ob
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/outerspace/files/outerspace-0.5.68-setup.patch b/games-strategy/outerspace/files/outerspace-0.5.68-setup.patch
new file mode 100644
index 000000000000..202c53bc7ee1
--- /dev/null
+++ b/games-strategy/outerspace/files/outerspace-0.5.68-setup.patch
@@ -0,0 +1,83 @@
+--- setup.py
++++ setup.py
+@@ -42,12 +42,7 @@
+ 
+ # collect data files
+ data_files = []
+-data_files.append(
+-    (
+-        ".",
+-        ["../ChangeLog.txt", "../COPYING", "../README", "../README_CZ"]
+-    )
+-)
++
+ 
+ # resources
+ for root, dirs, files in os.walk('res'):
+@@ -57,16 +52,6 @@
+         pass
+     if files:
+         data_files.append((root, [os.path.join(root, file) for file in files]))
+-
+-data_files.append(
+-    (
+-        "res/techspec",
+-        [
+-            "../server/lib/ige/ospace/Rules/techs.spf",
+-            "../server/lib/ige/ospace/Rules/Tech.spf",
+-        ]
+-    )
+-)
+ 
+ if havePy2Exe:
+     data_files.append((".", ["../updater/update.exe"]))
+@@ -114,10 +99,3 @@
+     **extraArgs
+ )
+ 
+-# cleanup
+-def onerror(func, path, err):
+-    if func is os.remove:
+-        os.chmod(path, stat.S_IWRITE)
+-        os.remove(path)
+-
+-shutil.rmtree("libsrvr", onerror = onerror)
+--- osc.py
++++ osc.py
+@@ -23,12 +23,36 @@
+ # tweak PYTHONPATH
+ import sys
+ import os
++import errno
+ sys.path.insert(0, "lib")
+ 
+ for item in ("libsrvr", "../server/lib"):
+     if os.path.exists(item):
+         sys.path.insert(0, item)
+         break
++
++userdir=os.path.expanduser("~/.outerspace")
++resdir=os.path.join(userdir, "res")
++rootresdir="@GENTOO_DATADIR@/res"
++
++if not (os.path.isdir(userdir)):
++	try:
++		os.makedirs(userdir)
++	except:
++		sys.exit("unable to create %s" % userdir)
++
++try:
++	os.symlink(rootresdir, resdir)
++except OSError, e:
++	if e.errno == errno.EEXIST:
++		os.remove(resdir)
++		os.symlink(rootresdir, resdir)
++
++try:
++	os.chdir(userdir)
++except:
++	sys.exit("unable to cd into %s" % userdir)
++
+ 
+ #configure gc
+ #import gc
diff --git a/games-strategy/outerspace/outerspace-0.5.68.ebuild b/games-strategy/outerspace/outerspace-0.5.68.ebuild
new file mode 100644
index 000000000000..a1f41389f5d3
--- /dev/null
+++ b/games-strategy/outerspace/outerspace-0.5.68.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/outerspace/outerspace-0.5.68.ebuild,v 1.1 2013/01/27 15:17:57 hasufell Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_6 python2_7 )
+
+inherit eutils gnome2-utils distutils-r1 games
+
+MY_PN=${PN/outerspace/Outer Space}
+DESCRIPTION="on-line strategy game taking place in the dangerous universe"
+HOMEPAGE="http://www.ospace.net/"
+SRC_URI="mirror://sourceforge/ospace/Client/${PV}/Outer%20Space-${PV}.tar.gz -> ${P}.tar.gz
+	mirror://sourceforge/ospace/Client/${PV}/outerspace_${PV}-0ubuntu1_all.deb"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/pygame-1.7"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+src_unpack() {
+	default
+	unpack ./data.tar.gz
+}
+
+python_install() {
+	distutils-r1_python_install \
+		--install-scripts="${GAMES_BINDIR}" \
+		--install-data="${GAMES_DATADIR}/${PN}" \
+		--install-lib="$(python_get_sitedir)"
+
+	# source tarball is missing files
+	# get them from ubuntu.deb
+	insinto "$(python_get_sitedir)"/ige/ospace/Rules
+	doins "${WORKDIR}"/usr/share/games/outerspace/libsrvr/ige/ospace/Rules/{Tech,techs}.spf
+}
+
+src_prepare() {
+	# fix setup script
+	# rework python start script to avoid shell-wrapper script
+	epatch "${FILESDIR}"/${P}-setup.patch
+
+	sed -i\
+		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
+		osc.py || die "sed failed"
+
+	distutils-r1_src_prepare
+}
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+src_install() {
+	distutils-r1_src_install
+	newicon -s 48 res/icon48.png ${PN}.png
+	make_desktop_entry "osc.py" "${MY_PN}"
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+
+	einfo
+	einfo "start the game via 'osc.py'"
+	einfo
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}