gentoo resync : 04.05.2018

4 files changed, 28 insertions, 22 deletions

diff --git a/games-strategy/netherearth/Manifest b/games-strategy/netherearth/Manifest
index 4af17dacd404..d7ea91b7f4a6 100644
--- a/games-strategy/netherearth/Manifest
+++ b/games-strategy/netherearth/Manifest
@@ -1,10 +1,10 @@
 AUX Makefile 1003 BLAKE2B 53264f4ebfcb11142d6c503263d47825cb9f3370a9e291551043aab616da09fb936e293a01eb5f4916ebd29690e315004b0dfa2303f2853963b3e80e0b260d59 SHA512 72cb6f6cb31beb79d91ac3b60eff1cb4046fcecd83621c42ff34a145eefbf484b8bc87ed3c2792bec7d1587d2578c95b4a4b925f9a032c8eefe9a9208a96fcdb
-AUX netherearth-0.52-freeglut.patch 367 BLAKE2B 688a05a5727592641025ef383bf5d2d369b2b2bdf786882151b1143292ab9f6a9965a6fc26136530c3972a1c47fbd58f0215c4c5a9d90ea701ed480ac44282a1 SHA512 c430a2e409c8b1be98a6d9147d429e98a8333541fdbf7e070c87230b85b43bdde9e6665338281d6a984f20a6af29127b9a165086d0c5a2a33ab392649f762c9d
+AUX netherearth-0.52-freeglut.patch 371 BLAKE2B 3b480c96a2ce423213e870a3310a2d0411717662b1f557268ceaf46a4ca7710044a82f7df0f9d2128006a0e7dcad6322be86b91260d4f4f2a6a2215ec66b4c02 SHA512 125c27de71d4c600f78ca3c6f86e6431a6ae20cfc2b12238f3fdfca99bc77bbe90ffb5f3b98ee58d987d8852b154d63342f1677eae99eeebff07b0b2d810edfa
 AUX netherearth-0.52-gentoo-paths.patch 4356 BLAKE2B 59b2320ab0e5dadd23a6d9559e45da2f9ede1daa78b97ba3ebde6a74db4d8fe3281ed7244f180e7d863022f0350c481d9e7c800d524fcc1d763d5aa33e16d77f SHA512 55fe5ddc2e4d783eb3b930600168c1c106562c84e4532f84dbfe44afb44e9134bb32f0c5cc8dea520cc86d661cf984122d4e82da8d624d03bd6fb42e67ba45ca
 AUX netherearth-0.52-glibc-212.patch 410 BLAKE2B 3aaf59a8ed6c02df5cf5e5037c92d3b51866be06bc28e79980cdddc983c6da5be8f298139a651f625e17011426fed85d86dbff075b1a8980134cf0a3e052ec1e SHA512 fe33f1b9220a8538490316880bfbb671ad65c0a55a896aaa624791a9c094cbded0e5ac182f87750bd58300550a9dbcb10da6453b531c2d58582780a10838ecef
-AUX netherearth-0.52-ldflags.patch 329 BLAKE2B f61fd8d747bb13cd432aa93deee3aa0583478491b3cd188138896e1c6e7623dff8a87959ea7a4bbbb1e67316d598ee21d4564bf7ca09f5e97609a1a539753b7b SHA512 fef30a64dc693973d4e037fc57a47d3a8fb7cfa0f31f98165b1486d48433b4f21361d077e15eda3df26ffceda536c679786103c047be604878ebc92bddfb9209
+AUX netherearth-0.52-ldflags.patch 333 BLAKE2B 557e8519d0dafe902a0713d91c539b4ddf7b11d8a05a3ce22a2c5d4c806f6c54e29a77c371991a8dbc5c2afa88f85cc4792e2e5966c606ad95217e997e80f8dc SHA512 39aab126a7110590d8fa77d7f1e1d695a16af43809ac128a01a06f6f583f7a80435d40e1f341c945b3279a17c51348a5c5744954588740106549e292721743a9
 AUX netherearth-0.52-linux.patch 1255 BLAKE2B 5389c41fa27426a89c904605ca058620636ebccbdf6a2c74988f7b777618e4892a9e352bf54d851da739dceba7721807b3113126da9825d3efe8257fabfe65cd SHA512 fd5e4385798a3027bb6fe89b92939e0e9d7f463420cb1d47d1606bd2fabc12d1f755892cb1523062a07eb5d2138156aabfcb801daaff7b5f1fdbba8d079ef56f
 DIST netherearth052.zip 872397 BLAKE2B 091a5f9e6773450e3796daebf0d40e1796ca97682aa8092dd669deb3dcf4161a9f6f408d5e43bcce847375ad61c7cb43a90acf382898a0ddd36b3da55917cbb1 SHA512 1f2cb3e896ac076c5ed3d346f19d8328b879546c4dc58609251bdbc8fd96b201cbc5dcb400df2a0dd4c717c7be002f83b92acf33f607890fa736b572c72a8cf5
 DIST sources.zip 75918 BLAKE2B 23142db81e0fca94948cfc6d6443daf1f7909c1dc2334b73897c1e07d1eb39c0c05cedb7cb0b1c8681990a0a0b6632e4666e67128379e14da23fbbe90b9ae641 SHA512 8daa9def65f4be8a541df15c69531da84344906e0f3eab2b7e84f8a94e2f3278d2033e37a9edd4b17fc19b1f7fbf3537286a2a2a9877950d19a51a1167487b75
-EBUILD netherearth-0.52.ebuild 1850 BLAKE2B 4e5d31a7aa1285ff8c3050dce511235b06255ae8b5011283e679e9196dcc1ff28ee93d5189cc1c766181119b330d713969ad64c56279e08bd81d0e73acb9210b SHA512 59135e42c52f2c79a74fa84a3d7905bf65054f0440f176a2c0191d6ed42a582d8e7a2ab8f705acb3e0ed01c32712ad7869449665e4638980818125688043e8c3
+EBUILD netherearth-0.52-r1.ebuild 1959 BLAKE2B 062404ba75e3c292cab09260d201244b6d1c8126f8446f0a5d1471a74308138e553455d765c3f8e26d794eb3e06e1ef3a4c8cf9b510218aba61ea31fbb6b5f59 SHA512 4f92ffd97841c6759002571031eb01b1f9c7732cd0888962faf28d0d470e97fd315eeaf07fedf80d81ce31816ae8dbba9d9cc6d6ac95937a6b258d8948f22b6a
 MISC metadata.xml 530 BLAKE2B a306a4d5741d0e7e1bfca697f04e8aed8337c7658cf910c213eee9541510484019ded391b4d884bda58cbd30a47a913a5eb1ac8b298cb4dfd4ba733fda64818a SHA512 4ec339e99b397a71a0f5b6ffccf7f9cefafdee1ce0627c9c5e5f8b00c0158fd7e73e7d0d9612c8f653ea30113905ad6b4efbec694fcd4c05b3ab59439d558868
diff --git a/games-strategy/netherearth/files/netherearth-0.52-freeglut.patch b/games-strategy/netherearth/files/netherearth-0.52-freeglut.patch
index 0fc147f0b7aa..b61e1f139b04 100644
--- a/games-strategy/netherearth/files/netherearth-0.52-freeglut.patch
+++ b/games-strategy/netherearth/files/netherearth-0.52-freeglut.patch
@@ -1,5 +1,5 @@
---- main.cpp
-+++ main.cpp
+--- a/main.cpp
++++ b/main.cpp
 @@ -8,6 +8,7 @@
  

  #include <stdio.h>

diff --git a/games-strategy/netherearth/files/netherearth-0.52-ldflags.patch b/games-strategy/netherearth/files/netherearth-0.52-ldflags.patch
index 6b7ed3a8989c..7d81f912764f 100644
--- a/games-strategy/netherearth/files/netherearth-0.52-ldflags.patch
+++ b/games-strategy/netherearth/files/netherearth-0.52-ldflags.patch
@@ -1,5 +1,5 @@
---- Makefile.old	2010-10-12 09:30:19.000000000 +0200
-+++ Makefile	2010-10-12 09:30:38.000000000 +0200
+--- a/Makefile.old	2010-10-12 09:30:19.000000000 +0200
++++ b/Makefile	2010-10-12 09:30:38.000000000 +0200
 @@ -17,4 +17,4 @@
  all: $(TARGET)

  

diff --git a/games-strategy/netherearth/netherearth-0.52.ebuild b/games-strategy/netherearth/netherearth-0.52-r1.ebuild
index 5fc80fe0afb0..e1aa7cabaaac 100644
--- a/games-strategy/netherearth/netherearth-0.52.ebuild
+++ b/games-strategy/netherearth/netherearth-0.52-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=6
+inherit desktop
 
 MY_PV="${PV/./}"
 DESCRIPTION="A remake of the SPECTRUM game Nether Earth"
@@ -12,19 +12,22 @@ SRC_URI="http://www.braingames.getput.com/nether/sources.zip
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="mirror bindist"
 
-RDEPEND=">=media-libs/libsdl-1.2.6-r3
+RDEPEND="
+	>=media-libs/libsdl-1.2.6-r3
 	>=media-libs/sdl-mixer-1.2.5-r1
-	media-libs/freeglut"
+	media-libs/freeglut
+"
 DEPEND="${RDEPEND}
-	app-arch/unzip"
+	app-arch/unzip
+"
 
-S=${WORKDIR}/sources
+S="${WORKDIR}/sources"
 
-data=../nether\ earth\ v${PV}
+data="../nether earth v${PV}"
 
 src_unpack() {
 	unzip -LL "${DISTDIR}/${PN}${MY_PV}.zip" >/dev/null || die
@@ -32,19 +35,21 @@ src_unpack() {
 }
 
 src_prepare() {
-	DATA_DIR=${GAMES_DATADIR}/${PN}
+	default
+
+	DATA_DIR=/usr/share/${PN}
 
 	cp "${FILESDIR}/Makefile" . || die
 
 	# Fix compilation errors/warnings
-	epatch "${FILESDIR}"/${P}-linux.patch
+	eapply "${FILESDIR}"/${P}-linux.patch
 
-	epatch "${FILESDIR}"/${P}-freeglut.patch \
+	eapply "${FILESDIR}"/${P}-freeglut.patch \
 		"${FILESDIR}"/${P}-glibc-212.patch \
 		"${FILESDIR}"/${P}-ldflags.patch
 
 	# Modify dirs and some fopen() permissions
-	epatch "${FILESDIR}/${P}-gentoo-paths.patch"
+	eapply "${FILESDIR}/${P}-gentoo-paths.patch"
 	sed -i \
 		-e "s:models:${DATA_DIR}/models:" \
 		-e "s:textures:${DATA_DIR}/textures:" \
@@ -66,7 +71,7 @@ src_prepare() {
 }
 
 src_install() {
-	dogamesbin nether_earth
+	dobin nether_earth
 
 	cd "${data}"
 
@@ -76,5 +81,6 @@ src_install() {
 
 	dodoc readme.txt
 
-	prepgamesdirs
+	newicon textures/nuclear.bmp ${PN}.bmp
+	make_desktop_entry nether_earth "Nether Earth" /usr/share/pixmaps/${PN}.bmp
 }