gentoo resync : 16.04.2018

5 files changed, 53 insertions, 45 deletions

diff --git a/games-arcade/asteroid/Manifest b/games-arcade/asteroid/Manifest
index 688af8e8357e..a62cbfbafe9d 100644
--- a/games-arcade/asteroid/Manifest
+++ b/games-arcade/asteroid/Manifest
@@ -1,4 +1,4 @@
-AUX asteroid-1.1-include.patch 189 BLAKE2B cb9fc17efd75781f2e2c44872e2e6dbeb42cc33022a422c3e5acdc1941a7a7f9015e6cb8c5ef401334f520bdae5e925771da10f2ec06e043af395891427f2adf SHA512 c11696fbae3466a695f0f195615dc4156f50a02105d7c82e713673dca428befba09f2917f927d050dee38feb8e8f961c080829124bd882c955f29a914566c905
-DIST asteroid-1.1.tar.bz2 386177 BLAKE2B c06470f16df0a534a3418b2f5730479f5f1a9ef7b05bbf91539d31b1eaf8ec578f81f6fc0c45a6372bf9fc873065e58c87d53413b09d2faa970e967a8543c442 SHA512 f3acae27a7c3296b6b9e9fc9aabf8c101cd020bfbf2065d2b4f5fabf14f7555c70b2e4543c2c661f0e4410b8128936eb1e0db930d7376c3a3bb3a898ce4ed4e4
-EBUILD asteroid-1.1.ebuild 664 BLAKE2B a06897b17c8c07c09e6f0036f1f1428b965acf332772a39b5d6d11c98868123b1942abdaed1e881efe4e0d208733c1978b8ebb0f6c5c2b585d8f6fe5d5d9fc3f SHA512 f5f86aca2b05363513eabc5d87a277e2dbddd90e34b5fd2004e9785b446a189e10ceb6d8ba61586ee5423dba5ad55765750823d65eec4b0acb221f7866cfeb35
+AUX asteroid-1.2.1-libm.patch 956 BLAKE2B c9d29ea30deb543bb0358ca4dfcc65eb94c9912022849e073d17f9057b1882de18b55a89d0ce8814623ab8ed2b7c36ff657523972c4889f19571936d73ec8f78 SHA512 d421eae4fc4ee5e7f5c00b5e6797f10e17030632a6224ed847d82e19b09e7dcac74d4fa84a19812eeeed9add4af3228f18e4d457b683a3adf73ed62d2671ca22
+DIST 1.2.1.tar.gz 307596 BLAKE2B c3f5363a0939cc4644425adfa9c3f2ca47ec04ae1beb9dd381fba912ee5e9d3330727fa82d4749b4f6402254988feaaaaef10f7f72aeea691656a1dd188ad5e2 SHA512 a88e0b85264d72bd40add0f3fc8b2b727b1acc0c190de6a60d4e1c79adcc484b17d0ed3537309b704667a6617f387219144cbec93df4fbff585d1237a9823b37
+EBUILD asteroid-1.2.1.ebuild 578 BLAKE2B 29537c18ba3d4d3a8404654afe21a90da28cf3779431805f3babd089ace473004c5afda39ffb8ed2342b5a009742bf25dda6a46485ec938e22a37a3c10f88633 SHA512 1168c4c64d2f67aa459e5d11f841d5998bb2cc7c7bf3b3457a8982ba04aea74113f453b26db3c73dd02f0fb3d94fc06234aeff51bb840df6e23685a5b13d8dc1
 MISC metadata.xml 334 BLAKE2B 651b210093aa77df8209cebb3e4cdb6c03064453e3ac2fa2f974388cdd8102cd2ab548d4b88bbb18052321360edf0d395395fb36e6c2ba1ce038932046c165c9 SHA512 e69632cf70047993dd2924f1bc7c42b428f6e2059482708c2b5cd72ae90263c11b76d4846c457d7f597dbff01ca6bb8296c2cff3e859551a9f5f57ea5ed7c794
diff --git a/games-arcade/asteroid/asteroid-1.1.ebuild b/games-arcade/asteroid/asteroid-1.1.ebuild
deleted file mode 100644
index f3284e2aa126..000000000000
--- a/games-arcade/asteroid/asteroid-1.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="A modern version of the arcade classic that uses OpenGL"
-HOMEPAGE="http://chaoslizard.sourceforge.net/asteroid/"
-SRC_URI="mirror://sourceforge/chaoslizard/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="virtual/opengl
-	media-libs/freeglut
-	virtual/glu
-	media-libs/libsdl
-	media-libs/sdl-mixer"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-include.patch
-}
-
-src_install() {
-	DOCS="$(echo asteroid-{authors,changes,readme}.txt)" \
-		default
-	prepgamesdirs
-}
diff --git a/games-arcade/asteroid/asteroid-1.2.1.ebuild b/games-arcade/asteroid/asteroid-1.2.1.ebuild
new file mode 100644
index 000000000000..ea62603c655c
--- /dev/null
+++ b/games-arcade/asteroid/asteroid-1.2.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils
+
+DESCRIPTION="A modern version of the arcade classic that uses OpenGL"
+HOMEPAGE="https://chazomaticus.github.io/asteroid/"
+SRC_URI="https://github.com/chazomaticus/${PN}/archive/${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+	virtual/opengl
+	media-libs/freeglut
+	virtual/glu
+	media-libs/libsdl
+	media-libs/sdl-mixer
+	x11-libs/gtk+:2
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-libm.patch )
diff --git a/games-arcade/asteroid/files/asteroid-1.1-include.patch b/games-arcade/asteroid/files/asteroid-1.1-include.patch
deleted file mode 100644
index 9eca5f83f2c8..000000000000
--- a/games-arcade/asteroid/files/asteroid-1.1-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/hiscore.c
-+++ src/hiscore.c
-@@ -35,6 +35,8 @@
- 

- #include <stdio.h>

- #include <ctype.h>

-+#include <stdlib.h>

-+#include <string.h>

- 

- #include "main.h"

- #include "hiscore.h"

diff --git a/games-arcade/asteroid/files/asteroid-1.2.1-libm.patch b/games-arcade/asteroid/files/asteroid-1.2.1-libm.patch
new file mode 100644
index 000000000000..cb6e7aaafe29
--- /dev/null
+++ b/games-arcade/asteroid/files/asteroid-1.2.1-libm.patch
@@ -0,0 +1,24 @@
+From 4efc7fc0a1246f023d6f96b94081678e302ab430 Mon Sep 17 00:00:00 2001
+From: Charles Lindsay <chaz@chazomatic.us>
+Date: Mon, 23 May 2016 18:50:34 -0700
+Subject: [PATCH] Add libm to link command
+
+Without it, some systems (and now mine!) would give a linker error about
+missing libm.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 29fd714..ab9a7ec 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -39,7 +39,7 @@ include_directories("${PROJECT_BINARY_DIR}/include")
+ file(GLOB asteroid_SRCS "src/*.c")
+ add_executable(asteroid ${asteroid_SRCS})
+ include_directories(${OPENGL_INCLUDE_DIR} ${GLUT_INCLUDE_DIR})
+-target_link_libraries(asteroid ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES})
++target_link_libraries(asteroid m ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES})
+ if(Asteroid_BUILD_GTK)
+    include_directories(${GTK2_INCLUDE_DIRS})
+    target_link_libraries(asteroid ${GTK2_LIBRARIES})