gentoo resync : 29.06.2020

5 files changed, 69 insertions, 6 deletions

diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index c822874fcca2..39d62cb761fe 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/berusky/Manifest b/games-arcade/berusky/Manifest
index 2a96470e7f2e..4829f249da2f 100644
--- a/games-arcade/berusky/Manifest
+++ b/games-arcade/berusky/Manifest
@@ -1,5 +1,5 @@
 DIST berusky-1.7.1.tar.gz 483794 BLAKE2B 8e1d6f6c2c47d72fdba73506f8d3ea231649b4eb4fae3e663e9111ed99fbf300b2a160573d54781f9dcb3f9bf62bcb57634d0b3e8abb77f8baffc70254b4640e SHA512 0b0c4d736bfd9b0b62accf11d932271e355cbcbf911e35adb0ccd0bb1b45e06c392d60830bddef04a24689ccfcee7302f2653f6357474ccceba4fd66c44d4383
 DIST berusky-data-1.7.tar.gz 5366663 BLAKE2B 88dbb0063be83b2cc60208e9e5d95ee3014ad381ba1a070d5e781b527324d9d1d4d8a8a56da64e76672995e09f9b57630cd7ba282e2da543dbc6773628362403 SHA512 1ccae352b8033df0dd8fe6f09b1daa83b0e25a67999d41a0f21019014620825551a4e22827f96bc28ccdf0958df85c9f3cfd2e8f1e83dd7edac5b0479413d438
 DIST berusky.png 1714 BLAKE2B 31c8c9c820fa030c5329c3a990bd2430797794e460c22301bb8f7f9577a4d5cfaae23e1ba0640389ffea7dad0146afd5d20ff2ca0fa3d65085207af1a0f625df SHA512 a8a5f7f8dca8d686bc05239adda10673e937361514b1aea07dc9fe66f2e009ae7c20b75ab63fd4db8ed206026a009d8620af3471bbb966b5e9b576ce89f66e54
-EBUILD berusky-1.7.1-r1.ebuild 744 BLAKE2B 0175d17f9d04d05ac36b8d646788509e358f663312a1001160a36c8d30673d026fa55e55bfb067a8b71b3037579eaf9aa4aa200e714f100c4156552f84cdb83c SHA512 40031b87dd26eacdd5180709eb60e22cd3a04a8246b23e889163c550b735e8e2307d5ee98a14ebdb875e6c33bc7e8f138b113bb325a119c362eb37f97a745cf9
+EBUILD berusky-1.7.1-r1.ebuild 745 BLAKE2B 53ac8329a31131a346d61477548a02e411a3dce90da4a83652cb6b6ea2e4b018671e6856f48dbea5964e477db5646fd4aee7f2be099dcf8fd0972522ccf86a81 SHA512 a19aa6b233b50c16fc849b283758b1fed95d4f27b61b91cdee801f3427155e69aed4dd858b91b054fa41aed156c538e6ae80741a2eda208eb75fc1ccf69aea19
 MISC metadata.xml 763 BLAKE2B 8aca8e43b681e917a1746a8e8932dee1aeaf0485f32a5e253874c28765b85e90c7a13c722d1c959a12ab5a419936df968f6e5d99fe54d6c4b432a8ae09441f4b SHA512 07baeac7dc22893b3e6bdf8c7ab687ba05ea622bd044e92d364d32358b2961bced3ea1263fb3434cb4ca386d9f90818834a5a3bc8d016cdc69a06e248d694ee1
diff --git a/games-arcade/berusky/berusky-1.7.1-r1.ebuild b/games-arcade/berusky/berusky-1.7.1-r1.ebuild
index d56b0203f7d5..57077ecfc396 100644
--- a/games-arcade/berusky/berusky-1.7.1-r1.ebuild
+++ b/games-arcade/berusky/berusky-1.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,12 +6,12 @@ inherit desktop gnome2
 
 DATAFILE="${PN}-data-1.7"
 DESCRIPTION="Free logic game based on an ancient puzzle named Sokoban"
-HOMEPAGE="http://anakreon.cz/?q=node/1"
-SRC_URI="http://www.anakreon.cz/download/${P}.tar.gz
-	http://www.anakreon.cz/download/${DATAFILE}.tar.gz
+HOMEPAGE="https://anakreon.cz/?q=node/1"
+SRC_URI="https://www.anakreon.cz/download/${P}.tar.gz
+	https://www.anakreon.cz/download/${DATAFILE}.tar.gz
 	https://dev.gentoo.org/~hasufell/distfiles/${PN}.png"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/games-arcade/blobwars/Manifest b/games-arcade/blobwars/Manifest
index bc5169bdbf86..56a402713acb 100644
--- a/games-arcade/blobwars/Manifest
+++ b/games-arcade/blobwars/Manifest
@@ -1,3 +1,4 @@
 DIST blobwars-2.00.tar.gz 66982603 BLAKE2B 273b5eab5a569f7f4b78982499a85daf63e6fdfb7d4348290d64bbcbeb9be830bb7cf81a0a387df0daa176e7a2a82d62404e88c95f02d6af485bae054170ad38 SHA512 412afd029554e59e7947466f36b51ef863faf1712898397498d5497e9a38dced92777b7684c1fb231998d893a6ce2c435b8f4278429df41168385de8fa18725b
+EBUILD blobwars-2.00-r1.ebuild 1616 BLAKE2B 713c26a8d9111f20e96a4ecb81b8351533fe110874aac2f3a6276b75b8e635039dbd78820d477dc2e15c3b732cf08f6f9c5b24a0bc1020364203c2f605e0c8f7 SHA512 6cda604671dadc10c408cc2d032a6bea24ab9364b6f1407dc4cfb2d63c8de4011fa2cdb6de05f78592f336f620013867ad5da464546428c937ed4148ce1dbd80
 EBUILD blobwars-2.00.ebuild 1124 BLAKE2B fae1ab03f69036eff035e706ebbcaa069ffafe3e3506915530fc6f68ee33832c9562853ab148673f3e5e70c3a216987355a9f26e4e0f30ec8359f15da8463fc3 SHA512 307dc3ab6bec986c2883e47a2520a7505f1bb7167be768ef21f6fc253c84d72c678d2fe73b232ff973e3a0ebd110b2459f68b7d0678b9952eb571a51398814a9
 MISC metadata.xml 321 BLAKE2B 615ad32064001afb9fb3a3c4038f5e36e388193fef6855f157feb05085a5a803878035a225935e1c1350b10bc483c3ebd46c38f1f365828d2807d4387ce3a6d5 SHA512 9e885b0215caa2c061cfe52c19a389227087691b6ec1bca4fcd8c7279468454b21e32027c5f1d03aafdb982b873251ee8cddcad28987085d0960e3f39ad77867
diff --git a/games-arcade/blobwars/blobwars-2.00-r1.ebuild b/games-arcade/blobwars/blobwars-2.00-r1.ebuild
new file mode 100644
index 000000000000..1d51f12f8b9d
--- /dev/null
+++ b/games-arcade/blobwars/blobwars-2.00-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils xdg
+
+DESCRIPTION="Platform game about a blob and his quest to rescue MIAs from an alien invader"
+HOMEPAGE="https://sourceforge.net/projects/blobwars/ https://www.parallelrealities.co.uk/games/metalBlobSolid/ https://github.com/perpendicular-dimensions/blobwars"
+SRC_URI="mirror://sourceforge/blobwars/${P}.tar.gz"
+
+LICENSE="BSD CC-BY-SA-3.0 CC-BY-3.0 GPL-2 LGPL-2.1 fairuse public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/libsdl2
+	media-libs/sdl2-mixer
+	media-libs/sdl2-ttf
+	media-libs/sdl2-image
+	media-libs/sdl2-net
+	sys-libs/zlib
+	virtual/libintl
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+src_prepare() {
+	default
+
+	# Fixes from Fedora and OpenSuSE
+	sed -i -e 's|$(PREFIX)/games|$(PREFIX)/bin|;
+		s|$(PREFIX)/share/games|$(PREFIX)/share|;
+		s| -Werror||;
+		s|$(CXX) $(LIBS) $(GAMEOBJS) -o $(PROG)|$(CXX) $(GAMEOBJS) $(LIBS) -o $(PROG)|;
+		s|$(CXX) $(LIBS) $(PAKOBJS) -o pak|$(CXX) $(PAKOBJS) $(LIBS) -o pak|;
+		s|$(CXX) $(LIBS) $(MAPOBJS) -o mapeditor|$(CXX) $(MAPOBJS) $(LIBS) -o mapeditor|' \
+		Makefile || die
+	sed -i -e 's|gzclose(pak)|gzclose((gzFile)pak)|;
+		s|gzclose(fp)|gzclose((gzFile)fp)|' src/pak.cpp || die
+}
+
+src_compile() {
+	# USEPAK=1 breaks music
+	emake \
+		RELEASE="1" \
+		USEPAK="0"
+}
+
+src_install() {
+	emake \
+		BINDIR="/usr/bin/" \
+		USEPAK="0" \
+		DESTDIR="${D}" \
+		DOCDIR="/usr/share/doc/${PF}/html/" \
+		install
+
+	mv -vf \
+		"${D}"/usr/share/doc/${PF}/html/{changes,hacking,porting,readme} \
+		"${D}"/usr/share/doc/${PF}/
+}