gentoo resync : 04.05.2018

3 files changed, 20 insertions, 28 deletions

diff --git a/games-strategy/outerspace/Manifest b/games-strategy/outerspace/Manifest
index 6f031eeaf188..389e740096bc 100644
--- a/games-strategy/outerspace/Manifest
+++ b/games-strategy/outerspace/Manifest
@@ -1,6 +1,6 @@
 AUX outerspace 169 BLAKE2B 432402aa2fa9b80c2a5d22f22e5858dd6d618145d37abe54736d7a23fbfcc20dbe6e8c8e2427a4e561960b338def2bd0c28f37f5fdcfcbfc1983b740f3f2a1f3 SHA512 fd20d9de084fef162eec391d68dc973df566b62fd2254fe8ad92c91b073341ca17f96844e0cae28592a7a4d05cc6e3744d66cd37dce9b70319678b91db8d8a1b
-AUX outerspace-0.5.68-setup.patch 1644 BLAKE2B 5b7d11b5ff9b12cbdb2564aed706ffece0c9065f8532caa3110a0f0ebba88ebc33db75564239e5c6cdd2f1c1da1594428e1e9ec7052d97b55d42de8fdb0e4d92 SHA512 3b583e3fbb0a2a26ee18edd6734d2adac07401376c5a96213f6fddaac18a0df6128007dc9947a77a0c9e12fafea368acff8cb5eef13d55206530bf55b28640c2
+AUX outerspace-0.5.68-setup.patch 1652 BLAKE2B 60d940c6c6c8c95452288abc13873aceff6d8cd6dd1216a61ca02de5bd1e834365fd2bbc0d6dd38500b1e2b764ccd1d629831871b40d2d45c708460939d23120 SHA512 b3d7f604724e6990436808dc62214a55325278cc04006fbe8438a213e772615a46b2969f88b03364332154af3cf996c7bdce05cc40dd5d24938bf6b537f9884b
 DIST outerspace-0.5.68.tar.gz 2249703 BLAKE2B 16b8c2d6c4e0516867d9a07a2762112da39f9a1074dffad9a9a3c343dd75662cba74d50f2a028b530013f320ffd7481317d061a3ebb449e9acf2f41bf56312a3 SHA512 dc2cbebf16fefabcc3356efb496766b90a5eabbf218f085fdc83cf956ca9503e99ef3154e0905c2432a3bf7caabd1f2af585a43397ba368581cd66546fcddc6b
 DIST outerspace_0.5.68-0ubuntu1_all.deb 2634188 BLAKE2B fd1667ae130e9a0ed603c369e9751d0b83414f20dd06c2f7e9941e2c465bdad0ff050ca41a928906bc5cc755eb05c0a5dfa18a8c35c868650c3fec6cf2e4f1f8 SHA512 9520cf1207a59497d6253b42bc34d580f9b805cf4ae55a5c921082e965892aa67921c4624ea94a5145c911dc2b24a1cca2806c06770ef8d1ded10855fb42666c
-EBUILD outerspace-0.5.68.ebuild 1718 BLAKE2B f0c9501b49495b8c7e73a9f53b04524c468d910211b2516234c004fdb39d53dbaa8c3161b3c567756c8ae64cfb34478568df08f7b8d731da50c9f16ef64dfd56 SHA512 25f544b374fe0e71c119d40e59cbad84f67f2b5de77ed4c50af63c7fac2f5996a608b7ae20a52ac6228a9309f44f4fba61fd0788c5c2bb91f62a719740bd82c8
+EBUILD outerspace-0.5.68-r1.ebuild 1565 BLAKE2B 54cfa44e8dbd0288c3d047f5ff5b13e5801f52c51f204c24e38141c29f15f3250de1e6702167e7410c2679a864e8dec892b4f7b459038659dcd221dc8df9946a SHA512 dbddbb02721b8bccc6486b178ede4c08e72d92bba22bb3606167b19d64f423f57f311f9c7af45a50509bbc2bd2bd6087e047197aa0c573b649614ee760d67143
 MISC metadata.xml 831 BLAKE2B 2eb39d75eca89288ab8dcb4ff274891d62e4c9a9540ceb2a2f887e2743c28c4d04b8692a093e24c0226b88d2dbe938b268ef17de4974e5c127422ed387bac6a7 SHA512 d607343f2cc56162b694e28523cf256339a306b03bcca9c0148c59700491249a9acc6cfc193467cbdd04d8ea9bb564816747276143b3e4e1bf3dc7deab480d1e
diff --git a/games-strategy/outerspace/files/outerspace-0.5.68-setup.patch b/games-strategy/outerspace/files/outerspace-0.5.68-setup.patch
index 202c53bc7ee1..c95852dca3dc 100644
--- a/games-strategy/outerspace/files/outerspace-0.5.68-setup.patch
+++ b/games-strategy/outerspace/files/outerspace-0.5.68-setup.patch
@@ -1,5 +1,5 @@
---- setup.py
-+++ setup.py
+--- a/setup.py
++++ b/setup.py
 @@ -42,12 +42,7 @@
  
  # collect data files
@@ -42,8 +42,8 @@
 -        os.remove(path)
 -
 -shutil.rmtree("libsrvr", onerror = onerror)
---- osc.py
-+++ osc.py
+--- a/osc.py
++++ b/osc.py
 @@ -23,12 +23,36 @@
  # tweak PYTHONPATH
  import sys
diff --git a/games-strategy/outerspace/outerspace-0.5.68.ebuild b/games-strategy/outerspace/outerspace-0.5.68-r1.ebuild
index 1fcc38fc07a5..7ac6c532fd49 100644
--- a/games-strategy/outerspace/outerspace-0.5.68.ebuild
+++ b/games-strategy/outerspace/outerspace-0.5.68-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils gnome2-utils distutils-r1 games
+inherit desktop gnome2-utils distutils-r1
 
-MY_PN=${PN/outerspace/Outer Space}
-DESCRIPTION="on-line strategy game taking place in the dangerous universe"
+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"
@@ -18,8 +18,9 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-python/pygame-1.7"
+DEPEND=""
 
-S=${WORKDIR}/${MY_PN}-${PV}
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_unpack() {
 	default
@@ -28,8 +29,8 @@ src_unpack() {
 
 python_install() {
 	distutils-r1_python_install \
-		--install-scripts="${GAMES_BINDIR}" \
-		--install-data="${GAMES_DATADIR}/${PN}" \
+		--install-scripts="/usr/bin" \
+		--install-data="/usr/share/${PN}" \
 		--install-lib="$(python_get_sitedir)"
 
 	# source tarball is missing files
@@ -39,40 +40,31 @@ python_install() {
 }
 
 src_prepare() {
+	default
+
 	# fix setup script
 	# rework python start script to avoid shell-wrapper script
-	epatch "${FILESDIR}"/${P}-setup.patch
+	eapply "${FILESDIR}"/${P}-setup.patch
 
 	sed -i\
-		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
+		-e "s:@GENTOO_DATADIR@:/usr/share/${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
+	newicon res/logo-login.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() {