gentoo resync : 28.07.2021

6 files changed, 16 insertions, 88 deletions

diff --git a/games-rpg/openglad/Manifest b/games-rpg/openglad/Manifest
index 60573f340107..a2b3739e19c9 100644
--- a/games-rpg/openglad/Manifest
+++ b/games-rpg/openglad/Manifest
@@ -1,9 +1,4 @@
-AUX 0.98-gladpack.c.patch 511 BLAKE2B 57434e5edd25f0757e18f2c2c73198236fa069eb09e30fd4c314232db1d1448aa5b190f5a2c9d600419c37b6301e5760af2c7a7803f23026a9fd3b0d49a731af SHA512 ea9fca36e2fef7157a2d2b81541d8fd7be1cad6087349927874aa3950001e3e02f2d21ce3793cd5c600236b21e64e0ed86839c41a39e5ba458c1714220ad2f01
-AUX openglad-0.98-gcc43.patch 205 BLAKE2B 05dac9336eac12434d51ebe1322387ec1c32d77bda52f654312075260f1add0a24d4d5834e2d72d6c8208851f583b245147595a8df2e9a9b6e72bf72dcc1421c SHA512 c7f6b4602234f7119dea119a6fd7c2edd07af856dd711195a942d291063912c46a202f446db8183eb62cc0a2aea3586bb3a2b8e1140d4d915be1fd6e166eb4d1
-AUX openglad-0.98-ovfl.patch 381 BLAKE2B 28a7d1dabbacaf665f01f1b238c904855706921b9ae33e09802104734c3456889aa409cdc38bc12e076d609df0909f6ecab7a02be15933d90c4ec8fba11abb00 SHA512 00ac89d9cf223ac8db111b30ce7838b892f318ac8c8a93522afa719a98887c386eb95c788a912c4bfce99ef804a8395b3c2260b9ec22454651e6f2539d1833e8
-DIST openglad-0.98.tar.gz 724106 BLAKE2B 6cd9df5fd260af9902997bc0708c8285e48081e52fff7af05f432ae94f2f6fdbfba162c664ac4f531796a0372f1be3be064843dad75163e68b7e324b9b6d506d SHA512 3f9165fbf8fff081a862bfe81401a3b2ac227da58b84409beee8b0441f88b1a6deb3d24a1af6e71bd3a3484fc90de5574950fd54be82d837021a07f06302f0e1
 DIST openglad-0.98_p20200907.tar.gz 2060013 BLAKE2B 5ea16c0ab13e45f1723ceb0b4167fcbf5863d040e1fc54cd27fa59df14200f84e0e22c0cba87f9ad3294a90850d5b36199cba8e78804d1994fb2dea6ea493fff SHA512 b3bf582a780d90408fc585b28418f462602ec35434c018d6315fb8b119b34cb0dceabcd6b5a6450ba6beb2ab5dc931d6e21ecf46e76853c7f5051c9b3be9014c
 DIST openglad.png 5593 BLAKE2B 1fbc5a32861dc4cc5bb4aae4b1b42e92411756618ccfa4172e1494c4f98eb527f6bd36273a250cd7ce721baa76ba80548d75ec1e89b3da134c78d0a7b415b6bd SHA512 27419fcbbbf8640718968304a4824101860736c2091f494defcd111b5cc252856b5373c0e7a2bca1c79f9c7551012b0ba04577f9ed97769e436637ee25f5caeb
-EBUILD openglad-0.98-r1.ebuild 868 BLAKE2B 70f20201f2cbf7f82701e2d4d6058213121bd8d2c05fcfe3c1f0230410901feea5c82954933c3dfc30c5d852d574facccada3157571a4b07f36151f1ad052f4a SHA512 20fc6585c53de645d5a0b12858819cd28a2174a4f67518f245d33a8c6a8647ef69ccee4954df15365966ffa613a7c3bc3fe92b1e16b7cd5789c9af0e9bb7555e
-EBUILD openglad-0.98_p20200907.ebuild 1880 BLAKE2B 7cf82e365fa92ca87848cac9e312907af5594041c3637ce2078f1d32edcd1a657606a143d6b8bc340c4b7bc03019ff7e26f563fede65a229c93431f194a80fb9 SHA512 05c385eac139939a8229b1ebbcaa82d1bb7b337b0094c73161d2bf4a75e904811277eaa2d55aa29349fbec5f0f6cde54666bc4694a61f9ad0ff919ded19e00a0
+EBUILD openglad-0.98_p20200907.ebuild 2075 BLAKE2B e33cdd96b586f96de18305f0099a885ac6d1a4dd11c02c5d64a2777076243d0b68acaca6e184e38ef2f0a0d92a7e4535d3dce4f5b97fdc0d03157488647ac0fe SHA512 5b032c8f564bf90155f0515b6ce8966f582ba7b51b4007197ba4904d24c4f9f113bdcdf5a8b1a2a79e0c6401fca663c95278fff2710c581cd2fd678bb82a7915
 MISC metadata.xml 389 BLAKE2B 114b39daa76f110c2769567433582e1dfb984f3040ec53c0ce184ec621b6676c0697912b2e46f7cba0ebac1335caeb78312f23b16ad3892b3dec577c3ef54cbc SHA512 ccf5c251e70ae23dff515ae55b21e6f5ea03339e1477ae46e6da81b50666bcb0a201b0046c0d43e4fcb8f460ca0f2aea607f7b73e47cc3cd7c9d2dd83a329730
diff --git a/games-rpg/openglad/files/0.98-gladpack.c.patch b/games-rpg/openglad/files/0.98-gladpack.c.patch
deleted file mode 100644
index b4f5de9e3995..000000000000
--- a/games-rpg/openglad/files/0.98-gladpack.c.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- openglad-0.98/util/gladpack.c	2002-09-14 18:37:50.000000000 +1000
-+++ openglad-0.98/util/gladpack.c	2003-12-06 12:42:31.393812945 +1100
-@@ -9,8 +9,8 @@
- 
- int main(int argc, char **argv)
- {
--	if (argc > 1 && !strcmp(argv[1], "p")) pack(argc, argv);
--	else if (argc > 1 && !strcmp(argv[1], "u")) unpack(argc, argv);
-+	if (argc > 1 && !strcmp(argv[1], "p")) return pack(argc, argv);
-+	else if (argc > 1 && !strcmp(argv[1], "u")) return unpack(argc, argv);
- 	else
- 	{
- 		printf("Usage: gladpack (p|u) ...\n");
diff --git a/games-rpg/openglad/files/openglad-0.98-gcc43.patch b/games-rpg/openglad/files/openglad-0.98-gcc43.patch
deleted file mode 100644
index 9f46ce8e5b95..000000000000
--- a/games-rpg/openglad/files/openglad-0.98-gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/parser.cpp
-+++ b/src/parser.cpp
-@@ -23,6 +23,8 @@
- #include <iostream>
- #include <fstream>
- #include <string>
-+#include <cstring>
-+#include <cstdlib>
- #include "parser.h"
- 
- using namespace std;
diff --git a/games-rpg/openglad/files/openglad-0.98-ovfl.patch b/games-rpg/openglad/files/openglad-0.98-ovfl.patch
deleted file mode 100644
index 8ec89d22559d..000000000000
--- a/games-rpg/openglad/files/openglad-0.98-ovfl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/screen.cpp	2011-07-23 21:35:34.385063301 +0200
-+++ b/src/screen.cpp	2011-07-23 21:35:59.948063312 +0200
-@@ -2383,7 +2383,7 @@
- 	short listsize;
- 	short i;
- 	walker * new_guy;
--	char newgrid[12] = "grid.pix";  // default grid
-+	char newgrid[13] = "grid.pix";  // default grid
- 	char new_scen_type; // read the scenario type
- 	char oneline[80];
- 	char numlines, tempwidth;
diff --git a/games-rpg/openglad/openglad-0.98-r1.ebuild b/games-rpg/openglad/openglad-0.98-r1.ebuild
deleted file mode 100644
index 8d38d5ca0ff0..000000000000
--- a/games-rpg/openglad/openglad-0.98-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="An SDL clone of Gladiator, a classic RPG game"
-HOMEPAGE="http://snowstorm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/snowstorm/${P}.tar.gz
-	mirror://gentoo/${PN}.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	media-libs/libsdl[joystick,sound,video]
-	media-libs/sdl-image
-	media-libs/sdl-mixer"
-RDEPEND=${DEPEND}
-
-PATCHES=(
-		"${FILESDIR}"/${P}-gcc43.patch
-		"${FILESDIR}"/${PV}-gladpack.c.patch
-		"${FILESDIR}"/${P}-ovfl.patch
-)
-
-src_configure() {
-	econf \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--datadir=/usr/share/${PN}
-}
-
-src_install() {
-	emake install \
-		DESTDIR="${D}" \
-		docdir="${D}"/usr/share/doc/${PF}
-	doicon "${DISTDIR}"/${PN}.png
-	make_desktop_entry openglad OpenGladiator
-}
diff --git a/games-rpg/openglad/openglad-0.98_p20200907.ebuild b/games-rpg/openglad/openglad-0.98_p20200907.ebuild
index 132a5ea39795..33e42ea2dcea 100644
--- a/games-rpg/openglad/openglad-0.98_p20200907.ebuild
+++ b/games-rpg/openglad/openglad-0.98_p20200907.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	media-libs/sdl2-mixer"
 DEPEND="${RDEPEND}"
 BDEPEND="
-	dev-util/premake:4
+	dev-util/premake:5
 	virtual/pkgconfig"
 
 src_prepare() {
@@ -51,15 +51,25 @@ src_configure() {
 	append-cppflags $($(tc-getPKG_CONFIG) --cflags "${pkgs[@]}" || die)
 	append-libs $($(tc-getPKG_CONFIG) --libs "${pkgs[@]}" || die)
 
-	premake4 gmake || die
+	premake5 gmake || die
 }
 
 src_compile() {
-	emake verbose=y ARCH= CC="$(tc-getCC)" CXX="$(tc-getCXX)" LIBS="${LIBS}"
+	local emakeargs=(
+		config=release
+		verbose=y
+		ARCH= # build assumes this is -m64 and tries to pass it to the compiler
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		LIBS="${LIBS}"
+		ALL_LDFLAGS="${LDFLAGS}" # only used to override -s
+	)
+
+	emake "${emakeargs[@]}"
 }
 
 src_install() {
-	dobin ${PN}
+	dobin bin/Release/${PN}
 
 	insinto /usr/share/${PN}
 	doins -r builtin cfg extra_campaigns pix sound
@@ -69,5 +79,5 @@ src_install() {
 	einstalldocs
 
 	doicon "${DISTDIR}"/${PN}.png
-	make_desktop_entry openglad Openglad
+	make_desktop_entry ${PN} ${PN^}
 }