gentoo resync : 28.04.2018

4 files changed, 56 insertions, 49 deletions

diff --git a/games-arcade/triplexinvaders/Manifest b/games-arcade/triplexinvaders/Manifest
index 949e5090e395..98cc47b913ab 100644
--- a/games-arcade/triplexinvaders/Manifest
+++ b/games-arcade/triplexinvaders/Manifest
@@ -1,4 +1,4 @@
-AUX triplexinvaders-1.08-gentoo.patch 2297 BLAKE2B 73b3617fe61be4dd3ec5e79d864eaf276038f271870ad0e1e81040641d4169abfe85258ee1b60924fe54c8b3393ced2d85ba8567ffda0e31fdaf776822a57e67 SHA512 21913469c9128df2fca3376b04da66e9f2be28eee1ddf1b3d4b2d4ebc90457984c18b0ec270d4115150877530ef4ea6dd2ddb1a86699986239e3e93a66f92a75
+AUX triplexinvaders-1.08-gentoo.patch 2313 BLAKE2B 0e5880be3bf8e1bbb79d5fade576cffe7a6a3137eb92e67888883d93446d305750baa9eb33f626f535de4f86ebc2f2040b2c26a0662e320f5b54480f04a7746d SHA512 912c1879cc2fe177decbe166c616c231c5496f240ecb4492a34952931f45ec549de700ed836aeb56c9b871074eac5adfd48a92d1ca21f07c4037b2ac2dceb429
 DIST triplexinvaders-1.08.zip 354188 BLAKE2B 5bce384ab55edd1dc0e3ed385002447c6cc81da95091b38e654fcb28c4df8f3c39907dfb23afadceaacd51491c53d4a8c937e09079905df2dd63ebe10a403164 SHA512 c763cf650046612152c9305a2067f52feedfeac5f16dd292031a184563f40efc9d95553bc01d59c5c6382394fd2a2d3fe971471cf775fe64c3b1f3c4842a0780
-EBUILD triplexinvaders-1.08.ebuild 902 BLAKE2B 2dc7a158dbf23081ba1914bb893ce28d0315d7e1fd28a5346daa62aa1085d32d1f3e21e5a1dbfaa8e77c54d923b16ad08b2178db1a01181c44a6f48118009355 SHA512 3f8248ac1713f3f393b22e3069d4417de93eb5a32ad8117b6d6ad860a1d9ad602688b8e1ca4ae2e7529d7c27342b0236df27dac3dfa67f6fd6286f5e297fcf11
+EBUILD triplexinvaders-1.08-r1.ebuild 1023 BLAKE2B 70dcb43aab815ebb92640c33ecb175645955cc0727f8de1ef4923b7244e1de9731c2c20c8707c32a6e7b889558e124a508a4f0cacfde91a438f7489d17c19e0d SHA512 0b08c9efe793853cf442b63ba1a68f510c990c53d2bd0cf3221a1c284940d6d8ae300dadf884da28f99ab759fc3ea5d3a6429ed9caa63ba2e1e4fd3a28c71918
 MISC metadata.xml 454 BLAKE2B 677d6dbcf7b8dbe4126aadce45c160731d1e159c53ecc0f0159c2f4e709603b23d8cce9b658d15f11778cc8d6ccf0725b8470118f2940eb0251ea43eee00f22f SHA512 bfd1ac0a3820beb15f021ab53527d316be512ed123f8eb7253c03efe82a569298b3474c7618e999cb134ea90aebb9d508909e5e938657e751fd9ac18552e6276
diff --git a/games-arcade/triplexinvaders/files/triplexinvaders-1.08-gentoo.patch b/games-arcade/triplexinvaders/files/triplexinvaders-1.08-gentoo.patch
index 56f9c1a1596a..85c88afcfe8a 100644
--- a/games-arcade/triplexinvaders/files/triplexinvaders-1.08-gentoo.patch
+++ b/games-arcade/triplexinvaders/files/triplexinvaders-1.08-gentoo.patch
@@ -1,5 +1,5 @@
---- sound.py.old	2007-04-14 21:52:02.000000000 +0200
-+++ sound.py	2007-04-14 21:52:27.000000000 +0200
+--- a/sound.py.old	2007-04-14 21:52:02.000000000 +0200
++++ b/sound.py	2007-04-14 21:52:27.000000000 +0200
 @@ -16,7 +16,7 @@
  
  
@@ -18,8 +18,8 @@
        sound.set_volume(volume)
        LoadedSounds[name] = sound
     return LoadedSounds[name]
---- util.py.old	2007-04-14 21:56:30.000000000 +0200
-+++ util.py	2007-04-14 21:56:48.000000000 +0200
+--- a/util.py.old	2007-04-14 21:56:30.000000000 +0200
++++ b/util.py	2007-04-14 21:56:48.000000000 +0200
 @@ -30,7 +30,7 @@
  LoadedTextures = weakref.WeakValueDictionary()
  
@@ -38,8 +38,8 @@
        LoadedModels[name] = model
     return LoadedModels[name]
  
---- hiscore.py.old	2007-04-14 22:04:04.000000000 +0200
-+++ hiscore.py	2007-04-14 22:04:25.000000000 +0200
+--- a/hiscore.py.old	2007-04-14 22:04:04.000000000 +0200
++++ b/hiscore.py	2007-04-14 22:04:25.000000000 +0200
 @@ -5,7 +5,7 @@
  # copy the highscores to the user's homedir
  highscorefile = os.path.join(configdir, 'hiscores')
@@ -49,8 +49,8 @@
      shutil.copy(oldpath, highscorefile)
  
  def write(score, name):
---- options.py.old	2007-04-14 22:05:23.000000000 +0200
-+++ options.py	2007-04-14 22:05:42.000000000 +0200
+--- a/options.py.old	2007-04-14 22:05:23.000000000 +0200
++++ b/options.py	2007-04-14 22:05:42.000000000 +0200
 @@ -5,7 +5,7 @@
  # copy the options to the user's homedir
  optionfile = os.path.join(configdir, 'options.conf')
diff --git a/games-arcade/triplexinvaders/triplexinvaders-1.08-r1.ebuild b/games-arcade/triplexinvaders/triplexinvaders-1.08-r1.ebuild
new file mode 100644
index 000000000000..b3774eb8c6f9
--- /dev/null
+++ b/games-arcade/triplexinvaders/triplexinvaders-1.08-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1
+
+DESCRIPTION="An Alien Invaders style game with 3d graphics"
+HOMEPAGE="http://triplexinvaders.infogami.com"
+SRC_URI="http://acm.jhu.edu/~arthur/invaders/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/pygame[${PYTHON_USEDEP}]
+	dev-python/pyopengl[${PYTHON_USEDEP}]
+"
+DEPEND="app-arch/unzip"
+
+src_prepare() {
+	default
+	eapply "${FILESDIR}/${P}"-gentoo.patch
+	sed -i -e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
+		sound.py \
+		util.py \
+		hiscore.py \
+		options.py || die "sed failed"
+}
+
+src_install() {
+	local libdir=/usr/$(get_libdir)
+
+	insinto "${libdir}/${PN}"
+	doins -r *.py
+	insinto "/usr/share/${PN}"
+	doins -r models sound options.conf hiscores
+	make_wrapper ${PN} "python2 ./invaders.py" "${libdir}/${PN}"
+	einstalldocs
+	make_desktop_entry ${PN}
+}
diff --git a/games-arcade/triplexinvaders/triplexinvaders-1.08.ebuild b/games-arcade/triplexinvaders/triplexinvaders-1.08.ebuild
deleted file mode 100644
index d6b539da1fa2..000000000000
--- a/games-arcade/triplexinvaders/triplexinvaders-1.08.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="An Alien Invaders style game with 3d graphics"
-HOMEPAGE="http://triplexinvaders.infogami.com"
-SRC_URI="http://acm.jhu.edu/~arthur/invaders/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND="dev-python/pygame
-	dev-python/pyopengl"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}"-gentoo.patch
-	sed -i -e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
-		sound.py \
-		util.py \
-		hiscore.py \
-		options.py || die "sed failed"
-}
-
-src_install() {
-	local libdir=$(games_get_libdir)
-
-	insinto "${libdir}/${PN}"
-	doins -r *.py
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r models sound options.conf hiscores
-	games_make_wrapper ${PN} "python ./invaders.py" "${libdir}/${PN}"
-	dodoc README.txt TODO.txt
-	prepgamesdirs
-}