From 8aebb228036d5e2863b7eaa6e319ab41c1669269 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 16 Apr 2018 16:47:37 +0100
Subject: gentoo resync : 16.04.2018

---
 games-arcade/crack-attack/Manifest                 |  6 +--
 .../crack-attack/crack-attack-1.1.14-r1.ebuild     | 44 --------------------
 .../crack-attack/crack-attack-1.1.14-r2.ebuild     | 47 ++++++++++++++++++++++
 .../files/crack-attack-1.1.14-gcc43.patch          |  4 +-
 .../files/crack-attack-1.1.14-glut.patch           |  4 +-
 5 files changed, 54 insertions(+), 51 deletions(-)
 delete mode 100644 games-arcade/crack-attack/crack-attack-1.1.14-r1.ebuild
 create mode 100644 games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild

(limited to 'games-arcade/crack-attack')

diff --git a/games-arcade/crack-attack/Manifest b/games-arcade/crack-attack/Manifest
index 364a8d3adcbb..d10de329e972 100644
--- a/games-arcade/crack-attack/Manifest
+++ b/games-arcade/crack-attack/Manifest
@@ -1,5 +1,5 @@
-AUX crack-attack-1.1.14-gcc43.patch 172 BLAKE2B 8da652831768386637a2871bd795931f9420defe07ac6284bcd40e325a0bf49673b928df8fff4198429f99ba79cafa82cac299925d2fbce77e69ae78a744c6b8 SHA512 2d60dbaa6dc2b0486b7863106a8d10171d99b30d6673aaaec2acbe91aacb2b273c51cf913d3843f4fc3d2665922446db5d7f6fea446052a5ed7ce7f0906d2c52
-AUX crack-attack-1.1.14-glut.patch 381 BLAKE2B b10806967dd377218f4c28e51a701ec0fee1fac1c48ba6e42d11701742afce95a16e46248860123d67edfd6672d35504c1581e5cbb3c67e3a3a1b10f47a67a45 SHA512 8ecf14f9262242c1c1cf6ee7e7a6009136122e3907b832f77151227c705f58c3ddc39d785f8b433f3dbba9c66946c98779a5386b7f9de0364b1b1ba3599dbf33
+AUX crack-attack-1.1.14-gcc43.patch 176 BLAKE2B 31ae3d2ada1212633ded026c9fbbdd517e7a7cc9742ad24036698c474a4b173cb7521857f6a41b7fe72cfff78f5db89236cc7ef3920658c7b3dc43a60cee793a SHA512 e9e5cc3c93bb00ad8e8b7d6bafd2035c13673fc27217fa6ba3d66ad285bd4d9f6048fbb933723d91e4c60495175fd065acc6663bcce0b2fb606f23f4ecbf4fb3
+AUX crack-attack-1.1.14-glut.patch 385 BLAKE2B 1f1b3830199c3488e71a6055b9db1092b1a730e194ed8f68974e6b8f867a8399b5d3f5b49011839a3e07a9265bca7e5e0f3d33ea634ffcb92fa68aa80dc4a3aa SHA512 d39bbd78172d9454a3f2244dff21e9f538c2235e86a3d8a53e855d0eb4f70403ff75b7fcaf774ad2054f77e9002786a802d1e3cfcc8d8dbb3ba082379e037949
 DIST crack-attack-1.1.14.tar.bz2 801404 BLAKE2B 78c6fa9ee16ddb341aa1f11d1964c7036c85d0b1f0145c6fe57d585eb4c237fdb33d351f0d5510eabaf7666a63e74f8afbe0f09952ec1d4c5713a87a89963b82 SHA512 1afc1a59e25359a82cabc33a1f999e1166dcf74c031c29a366f8414989bc7c32b9a40e467ee40a37901f2bd08f4569fed25c4d3021b1a75254614840410a7bfa
-EBUILD crack-attack-1.1.14-r1.ebuild 960 BLAKE2B 214fee1c32f64b0b6bef3868c97e886cf6686013098cdd2ad68495b686a57a5a33cacad87b7e4f17970b90aa41ffe91304c01a9c54a28c6524ce376fc77787cd SHA512 85023f1037628a0e01091124d03d3f0e105072d4ef7720ef93ed0e993790bd0c26cacb5a0634febc7bf1793541fb7d8ea60b3c70891aede77dadad4851a07165
+EBUILD crack-attack-1.1.14-r2.ebuild 946 BLAKE2B 2c67cf472dcfc489c32412e9685423ed355256654ebb3e1ffd96814efcec916eafdb2dfeae8931dfb2b1900bb2ea31c5041ddfe208d1007f5f405a7c43081228 SHA512 a39048eef58fb35ec783eb6836a7198e6550f191986ba25544f34c9138ba9971121a7b3324f61f888ce6f8cb7a21b3b3af732993c56317bd4bdaf77177765847
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/crack-attack/crack-attack-1.1.14-r1.ebuild b/games-arcade/crack-attack/crack-attack-1.1.14-r1.ebuild
deleted file mode 100644
index b91f0af19a74..000000000000
--- a/games-arcade/crack-attack/crack-attack-1.1.14-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="Addictive OpenGL-based block game"
-HOMEPAGE="http://www.nongnu.org/crack-attack/"
-SRC_URI="https://savannah.nongnu.org/download/crack-attack/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
-IUSE="gtk sdl"
-
-RDEPEND="media-libs/freeglut
-	sdl? ( media-libs/libsdl
-		media-libs/sdl-mixer )
-	gtk? ( >=x11-libs/gtk+-2.6:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-glut.patch \
-		"${FILESDIR}"/${P}-gcc43.patch
-	sed -i 's/-lXmu//' src/gtk-gui/Makefile.in src/Makefile.in || die
-	touch -r . * */*
-}
-
-src_configure() {
-	egamesconf \
-		--disable-binreloc \
-		$(use_enable sdl sound) \
-		$(use_enable gtk)
-}
-
-src_install() {
-	default
-	dohtml -A xpm doc/*
-	doicon data/crack-attack.xpm
-	make_desktop_entry crack-attack Crack-attack
-	prepgamesdirs
-}
diff --git a/games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild b/games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild
new file mode 100644
index 000000000000..eded2a71ead8
--- /dev/null
+++ b/games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+DESCRIPTION="Addictive OpenGL-based block game"
+HOMEPAGE="http://www.nongnu.org/crack-attack/"
+SRC_URI="https://savannah.nongnu.org/download/crack-attack/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
+IUSE="gtk sdl"
+
+RDEPEND="
+	media-libs/freeglut
+	sdl? ( media-libs/libsdl
+		media-libs/sdl-mixer )
+	gtk? ( >=x11-libs/gtk+-2.6:2 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	eapply \
+		"${FILESDIR}"/${P}-glut.patch \
+		"${FILESDIR}"/${P}-gcc43.patch
+	sed -i 's/-lXmu//' src/gtk-gui/Makefile.in src/Makefile.in || die
+	touch -r . * */*
+}
+
+src_configure() {
+	econf \
+		--disable-binreloc \
+		$(use_enable sdl sound) \
+		$(use_enable gtk)
+}
+
+src_install() {
+	HTML_DOCS="doc/*"
+	default
+	doicon data/crack-attack.xpm
+	make_desktop_entry crack-attack Crack-attack
+}
diff --git a/games-arcade/crack-attack/files/crack-attack-1.1.14-gcc43.patch b/games-arcade/crack-attack/files/crack-attack-1.1.14-gcc43.patch
index 009d062f2eac..8cabe7eb2574 100644
--- a/games-arcade/crack-attack/files/crack-attack-1.1.14-gcc43.patch
+++ b/games-arcade/crack-attack/files/crack-attack-1.1.14-gcc43.patch
@@ -1,5 +1,5 @@
---- src/Game.h
-+++ src/Game.h
+--- a/src/Game.h
++++ b/src/Game.h
 @@ -34,6 +34,7 @@
  #include <climits>
  #include <cstdlib>
diff --git a/games-arcade/crack-attack/files/crack-attack-1.1.14-glut.patch b/games-arcade/crack-attack/files/crack-attack-1.1.14-glut.patch
index fc16c1b8bc4e..430d4e742f31 100644
--- a/games-arcade/crack-attack/files/crack-attack-1.1.14-glut.patch
+++ b/games-arcade/crack-attack/files/crack-attack-1.1.14-glut.patch
@@ -2,8 +2,8 @@ Fix from upstream to work with newer freegluts.
 
 http://bugs.gentoo.org/97954
 
---- src/Attack.cxx
-+++ src/Attack.cxx
+--- a/src/Attack.cxx
++++ b/src/Attack.cxx
 @@ -83,6 +83,7 @@
    int height = -1, width = -1;
    
-- 
cgit v1.2.3