gentoo resync : 16.04.2018

6 files changed, 37 insertions, 32 deletions

diff --git a/games-arcade/criticalmass/Manifest b/games-arcade/criticalmass/Manifest
index f63baed66f57..f9612b200faa 100644
--- a/games-arcade/criticalmass/Manifest
+++ b/games-arcade/criticalmass/Manifest
@@ -1,8 +1,8 @@
-AUX criticalmass-1.0.2-cflags.patch 864 BLAKE2B 620b03696f5ee256af47aa423f97660f4ce391e814838e1684f5f17fa3df952de54e577a22733c2d3a30ea55c59ec192d311cf1a3ff0303cad65185ac2573482 SHA512 9368ce03d9b07c3e9428f98021f133c3692cf75e87eb59cf19c2e13b5dd8213281598ab6d51508ba4af2576c1408a105e18b54780e8ff1494f44e6d5a5ac509c
+AUX criticalmass-1.0.2-cflags.patch 868 BLAKE2B 5e4179592ab03bbc34e14e7649ebfca2268a8f22728f7afb92f4978aeb09461588b7daa6642fa07c8ce007597ee40296d28c44b9381bc734184c5c82f6eb2106 SHA512 545f822a3fb2709c52e4c9bbacc8ea56a7aee229acdaec1af3024928d67395de8f3f0014b5647bb48afa1a85478854945490c482c96486e908c5342eba2538e9
 AUX criticalmass-1.0.2-gcc43.patch 3150 BLAKE2B c039896207f59cc4e0c4c4e81ced2266ca91c4731cb853c6e4120b1962cef0b7ebce1094d0b38081fbec44c098d3e109fe3a2e2d294c483caf1008611c4a5209 SHA512 a3a23367de54d99b3e47951477c3c85fa861a6a48c3a2d81e2352e55d0a32d6c319f5fd37ff287c93a5b9b0dfa230c89a90a507219960bb72a567977058f3bd6
-AUX criticalmass-1.0.2-libpng14.patch 445 BLAKE2B 9096fd8819fcc88976de4fa189e255b43bb343af8a5c9277ef84c2b2029bb1c35f81576cd39a6f688f9af4f711869e81a8ef8a6155c2b06a256369e9b6ad807b SHA512 2dc628e5fe30163a865e08573556a808c9746c3d5a6bf1c57185743f7831f5761f83fcbbeba64deb135000f82b3b8da8f3c5159b9f761d4eac0f9be7efaad353
-AUX criticalmass-1.0.2-libpng15.patch 678 BLAKE2B c6f62fe816de14686d5ef3929be5a8236fd2bd0ec5f13a3a966bb6a1d12533d44e8a0dcce5853b3a5d34db538e04429dfba2ffbe169b522edc0d960e209460a6 SHA512 016a48d854f522b720161c35e0fa734579bf765d8996e3f82f92ebe95561a1315083406ffcaf1fa3879c25b6e8358d75c346afcec607b2b8c2d0d843d6bb76e3
-AUX criticalmass-1.0.2-system_curl.patch 964 BLAKE2B a2305b2f5f18b149e67b67d08cc235437e9ab9c6f3342f61465cab82ecee849adf30f5b0225cfc53596c60ca51906df736342e484df68a08e90d189248cb8dd0 SHA512 b4937525dd6a186fc420e79b2c5ee05cf24c429e57650dcf82656a6d30cacdd77f0b64371f3684b3c396efdf89668bec511361ee70b49fb7ed93522997b3b306
+AUX criticalmass-1.0.2-libpng14.patch 449 BLAKE2B e27405000136410be47bb241208c1321bbbf8540b8707244271e9368cfaaf7cd058172cc952ff0dd1d84a5e693f0373f2ec8ddd47db1b05b8768f242fa037488 SHA512 976cb237901945119fe54bf8b7e8856d70d7104ff7071b80cdeb7fdab64e783c3f69a6099bd1ee11aae2eb5bd94dcac681869328e44bb74c4808b3c67a23e975
+AUX criticalmass-1.0.2-libpng15.patch 686 BLAKE2B a96af03a21e1e12606acd4ea07631c9688d80b377d126b44e1ace016e5aa727446d2c8c18606983fa6b2288f83b19130488e96e4f3364dc1e2d42b543d1e3766 SHA512 c2a68f80f0f775e5b6acbb6ed3a565200f481c83f505320488073783a30265769ba32f545590f2756a1d4974b0cc65462f559f23237ce206cfb80be370195d97
+AUX criticalmass-1.0.2-system_curl.patch 976 BLAKE2B 8af3bae1f2653e882a8d2f0955ef7973af93058bcf646f2264ccacc7b804a622b6104c50cbfc5531775bd9da22660317d2fb00804566014f543ef8e5a1d231be SHA512 6ce040132b9b3a4d4cf7a14c48a3e33320cd95ae440512f8c1c78e78200e6936fe95140e1e16607a225ec0ed1421e03bc09ba065552bc5419cbb42ac74f44b47
 DIST CriticalMass-1.0.2.tar.bz2 5122126 BLAKE2B 91642309270aa9a76c1639b213b14f5b1feecce9a1bd9a516b84618e33d454542e31a34ffc974bb0e584b2ff5d5bad6b9112906a0c818662df7eb1ad0d812470 SHA512 af3200adc4b6ed9f24eaa89ef5b2f31e8d09e402d0c2eef8db604afcbb2d36bad48e76c3c11c1b2410d2d4e0ffd8554e2e9749a8c8cc4752b4636b8919a66037
-EBUILD criticalmass-1.0.2.ebuild 1262 BLAKE2B b7e414a1501d03e0c25ad70510057c145a836fc9b78df5fecb0b7dfb4489ab1777f972eb0f6a36d641907e4bba448e92273fa58d433b06726186b248198dc2f2 SHA512 156991e0d507f29582a71d102b570f35972df93d51f66b296a5df24b09468847222e44251f2411a4cf09e4d0ff0982860d4f33c1a97b5fd9beac2ac830a40c98
+EBUILD criticalmass-1.0.2-r1.ebuild 1277 BLAKE2B 1d5b5a0b6941f8aab5ebcb29660e245d82a8db33046cf39b33efad6dbefb1d022413383540cb51f7948a8bbefea8057fafcd2afdc37c21e471e28a640e0c7064 SHA512 b0560a8d03dc9dc3b921d421949fcc3314055605d69af9ce20d354547a189819300fc36d01aaa919a8806f9ade279f5ef9660581b368be6405e01481eafc747f
 MISC metadata.xml 335 BLAKE2B 5b324731ab938d41661d143e1c10f44dcf05579341e642b07eb955252737e49eca38fffe4a95651f5d822de780ced0b9570bc0285d656e61c2f38f5ea594e214 SHA512 ef6dcb84323c49c9a21a59eea375bd3c1419ba2c7490f3e20e9daeab88942b4574d3d8668c465e2b2fc4221dff97695ba122d6790ebade3202f873f890fef9e4
diff --git a/games-arcade/criticalmass/criticalmass-1.0.2.ebuild b/games-arcade/criticalmass/criticalmass-1.0.2-r1.ebuild
index 9306a54dd145..5191beb0107f 100644
--- a/games-arcade/criticalmass/criticalmass-1.0.2.ebuild
+++ b/games-arcade/criticalmass/criticalmass-1.0.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils flag-o-matic games
+EAPI=6
+inherit autotools desktop flag-o-matic
 
 DESCRIPTION="SDL/OpenGL space shoot'em up game"
 HOMEPAGE="http://criticalmass.sourceforge.net/"
@@ -13,22 +13,29 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="media-libs/sdl-mixer
+RDEPEND="
+	media-libs/sdl-mixer
 	media-libs/sdl-image[png]
-	media-libs/libpng:0
+	media-libs/libpng:0=
 	virtual/opengl
-	net-misc/curl"
-RDEPEND="${DEPEND}"
+	net-misc/curl
+"
+DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/CriticalMass-${PV}
+S="${WORKDIR}/CriticalMass-${PV}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc43.patch \
+	default
+
+	eapply "${FILESDIR}"/${P}-gcc43.patch \
 		"${FILESDIR}"/${P}-system_curl.patch \
 		"${FILESDIR}"/${P}-libpng14.patch \
 		"${FILESDIR}"/${P}-cflags.patch \
 		"${FILESDIR}"/${P}-libpng15.patch
+
 	rm -rf curl
+
+	mv configure.in configure.ac || die
 	eautoreconf
 }
 
@@ -38,16 +45,14 @@ src_configure() {
 }
 
 src_install() {
+	HTML_DOCS="Readme.html"
 	default
-	rm -f "${D}${GAMES_BINDIR}/Packer"
-	dohtml Readme.html
+	rm -f "${ED}/usr/bin/Packer"
 	newicon critter.png ${PN}.png
 	make_desktop_entry critter "Critical Mass"
-	prepgamesdirs
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	if ! has_version "media-libs/sdl-mixer[mod]" ; then
 		ewarn
 		ewarn "To hear music, you will have to rebuild media-libs/sdl-mixer"
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch
index 8b801e51c2cb..0d9063c37538 100644
--- a/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch
+++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch
@@ -1,5 +1,5 @@
---- configure.in.orig	2011-07-20 11:23:19.849122541 -0400
-+++ configure.in	2011-07-20 11:24:28.169713094 -0400
+--- a/configure.in.orig	2011-07-20 11:23:19.849122541 -0400
++++ b/configure.in	2011-07-20 11:24:28.169713094 -0400
 @@ -35,9 +35,6 @@
  AM_CONDITIONAL(APPLE,test "x$TARGET" = xAPPLE)
  AM_CONDITIONAL(WIN32,test "x$TARGET" = xWIN32)
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch
index 882869b43a14..f8a0eec2ad57 100644
--- a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch
+++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch
@@ -1,5 +1,5 @@
---- configure.in
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -99,7 +99,7 @@ if test "x$TARGET" = xWIN32; then
  else
      LIBS="-L/usr/local/lib -L/usr/X11R6/lib $LIBS"
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch
index ac1b8c0c617f..dbdfc9f32275 100644
--- a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch
+++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch
@@ -1,5 +1,5 @@
---- game/main.cpp
-+++ game/main.cpp
+--- a/game/main.cpp
++++ b/game/main.cpp
 @@ -28,6 +28,8 @@
  #include <sys/stat.h>
  #include <sys/types.h>
@@ -9,8 +9,8 @@
  void migrateConfig( void)
  {
      //if onlineCheck is not set, default it to true
---- utilssdl/PNG.cpp
-+++ utilssdl/PNG.cpp
+--- a/utilssdl/PNG.cpp
++++ b/utilssdl/PNG.cpp
 @@ -45,7 +45,7 @@
  {
      png_size_t check;
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch
index 02307ad7d8fc..1ab1a2d5ce52 100644
--- a/games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch
+++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch
@@ -1,5 +1,5 @@
---- configure.in
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -115,8 +115,6 @@ fi
  AC_CHECK_LIB(m, sin,, 
      AC_MSG_ERROR(libm is needed))
@@ -9,8 +9,8 @@
  AC_OUTPUT(Makefile utils/Makefile utilssdl/Makefile utilsgl/Makefile game/Makefile tools/Makefile data/Makefile data/music/Makefile tinyxml/Makefile)
  
  echo "Configuration:
---- game/Makefile.am
-+++ game/Makefile.am
+--- a/game/Makefile.am
++++ b/game/Makefile.am
 @@ -41,7 +41,7 @@ critter_SOURCES = \
          main.cpp
  
@@ -20,8 +20,8 @@
  	../utils/libutils.a \
  	../utilssdl/libutilssdl.a \
  	../utilsgl/libutilsgl.a \
---- Makefile.am
-+++ Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -4,7 +4,7 @@
  AUTOMAKE_OPTIONS = 1.4