gentoo resync : 15.06.2021

5 files changed, 45 insertions, 69 deletions

diff --git a/games-rpg/freedroid/Manifest b/games-rpg/freedroid/Manifest
index 505b0ebe770c..2ed9106d170c 100644
--- a/games-rpg/freedroid/Manifest
+++ b/games-rpg/freedroid/Manifest
@@ -1,4 +1,3 @@
-AUX freedroid-1.0.2-format.patch 762 BLAKE2B ec8021ac592995cfa5bfde3e134e432b67d74980c9bbdf733ad9938ce9d11e665e2e21695400cc7ff333d65561420917e6e8c15bd807fdb887524c67c3d9d242 SHA512 cc2a49a22bfd8e574ee466ef837e1c4a32e7529a6275c0abab507e46291c63abbf641975fc08297f63b4a6204c4436a18b053231aeaed0ee40ed86b01217cf47
-DIST freedroid-1.0.2.tar.gz 4819173 BLAKE2B 9548cc350010eff47ca13b8b4fd6b1082f16e1fe41bad5c2359aecd7834ef22b27adc90d1d33564edc63a592ffa6934224a0ee16784cf736b98fcb56d287229a SHA512 cfafa4af86a2007fcf761b51e6c7dcc6dc40f4513057413901fede41b7a436b9c8cf7c3e5c29130e5410fab640ffbdc8100043a442555e862acffe9f33086be1
-EBUILD freedroid-1.0.2-r1.ebuild 841 BLAKE2B f7e5c35d2aed93408c84fe25345ee88e02ff155163ed378f25de4334f546efc437749004f20cfb732bddfaf8077d4785e6c335d15ebf4afbf14da5bbc06bc848 SHA512 43ca7bdbdde0e3284d3e76bc7af73002675b1d5d73be26c562c3322ce7a1464f0a04ff3b3bbb577a530e82c613e276bed99a0d1df79dc66d9a8e7ee90c54eb6b
-MISC metadata.xml 332 BLAKE2B ef2f4517b0f8c02b4e6703dc065c71280ad5b06e03293977118662f2a754ec15d4a1c18980ae945018e7315bf387a49f100e7b5a48d3391f9bd8f617d8f8f3a7 SHA512 4fe0371b423de98a48fb21ec25d0fc34e393ce7c2f497e815c2f991f65507b2762b1cb68c87742bd2f3714a063828d8764ea2a815e33cba086b102d5ad672932
+DIST freedroid-1.2.1.tar.gz 5875869 BLAKE2B fab7dfb16e421394b9b0564a29a2e438152cd3d8a5527e3581823edec174986df473040d58c705765ba50b4b73105a348d39f9e61bb0721bb742c70838cdef34 SHA512 4de2174935e432f6dc4fa3a0fb5efff9bed59ba25593c7860edbddbaea77875a490c3f1e11042b57f0bb72158a3a28e111bf53bb0d10bbf051f67717d4547913
+EBUILD freedroid-1.2.1.ebuild 911 BLAKE2B 307a38b27b8f38f066b87b62f955894937c19445e6e6ea58e39965957a5b96205c7c43060cfca72a2c5e06e600bb0d880ea66f6e1d1fc98ba7bb64ea73d029c9 SHA512 ebb8beb26d977352da193bdd61dd7e67e78d66e7c75eef483664dc7af9bea4bc37f3ca80d6f9db90e2b3ce1f6b3f83f6883bd42209407f3939a545c46189ab5a
+MISC metadata.xml 401 BLAKE2B b3f730ff3b4fef3cf815013a642d49f986c6538ffac7a82a39454762c5316a114b02f691b6fa8a3c166d42f0104c821c3e3b5f95e5caf1e1aa02a8f2ffc73a36 SHA512 8bd1e8e181eb30268797acf3c0800026af7f2bd5483c1b7b80e2ee93ec536c5911978d8189a7c9773868611eb2ab69fd64377a2106600e7311cbe5f352cf4953
diff --git a/games-rpg/freedroid/files/freedroid-1.0.2-format.patch b/games-rpg/freedroid/files/freedroid-1.0.2-format.patch
deleted file mode 100644
index 4dbf96bda3f0..000000000000
--- a/games-rpg/freedroid/files/freedroid-1.0.2-format.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/init.c	2015-10-24 17:37:24.431514375 +0200
-+++ b/src/init.c	2015-10-24 17:37:43.057157826 +0200
-@@ -554,13 +554,13 @@
- 	   * following gnu-coding standards for command line interfaces */
- 	case 'v':
- 	  printf ("\n%s %s  \n", PACKAGE, VERSION); 
--	  printf (copyright);
-+	  printf ("%s", copyright);
- 	  exit (0);
- 	  break;
- 
- 	case 'h':
- 	case '?':
--	  printf (usage_string);
-+	  printf ("%s", usage_string);
- 	  exit (0);
- 	  break;
- 
---- a/src/misc.c	2015-10-24 17:37:54.368941282 +0200
-+++ b/src/misc.c	2015-10-24 17:38:10.202638172 +0200
-@@ -889,7 +889,7 @@
-   if (db_level <= debug_level)
-     {
-       vsnprintf (buffer, 5000, fmt, args);
--      fprintf (stderr, buffer);
-+      fprintf (stderr, "%s", buffer);
-       fflush (stderr);
-     }
- 
diff --git a/games-rpg/freedroid/freedroid-1.0.2-r1.ebuild b/games-rpg/freedroid/freedroid-1.0.2-r1.ebuild
deleted file mode 100644
index e6eb377ac6db..000000000000
--- a/games-rpg/freedroid/freedroid-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Freedroid - a Paradroid clone"
-HOMEPAGE="http://freedroid.sourceforge.net/"
-SRC_URI="mirror://sourceforge/freedroid/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	virtual/jpeg:0
-	media-libs/libpng:0
-	media-libs/libsdl[joystick,sound,video]
-	media-libs/libvorbis
-	media-libs/sdl-image[jpeg,png]
-	media-libs/sdl-mixer[mod,vorbis]
-	sys-libs/zlib"
-RDEPEND=${DEPEND}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-format.patch
-)
-
-src_install() {
-	default
-	find "${D}" -name "Makefile*" -exec rm -f '{}' + || die
-	rm -rf "${D}/usr/share/${PN}/"{freedroid.6,mac-osx} || die
-	newicon graphics/paraicon.bmp ${PN}.bmp
-	make_desktop_entry freedroid Freedroid /usr/share/pixmaps/${PN}.bmp
-}
diff --git a/games-rpg/freedroid/freedroid-1.2.1.ebuild b/games-rpg/freedroid/freedroid-1.2.1.ebuild
new file mode 100644
index 000000000000..abc1f4b7f8a6
--- /dev/null
+++ b/games-rpg/freedroid/freedroid-1.2.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop
+
+DESCRIPTION="The original Freedroid, a clone of the C64 classic Paradroid"
+HOMEPAGE="https://github.com/ReinhardPrix/FreedroidClassic"
+SRC_URI="https://github.com/ReinhardPrix/FreedroidClassic/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/FreedroidClassic-release-${PV}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/libsdl[joystick,sound,video]
+	media-libs/sdl-gfx
+	media-libs/sdl-image[jpeg,png]
+	media-libs/sdl-mixer[mod,vorbis]"
+DEPEND="
+	${RDEPEND}
+	media-libs/libpng
+	media-libs/libvorbis
+	sys-libs/zlib
+	virtual/jpeg"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	newicon graphics/paraicon_48x48.png ${PN}.png
+	make_desktop_entry ${PN} Freedroid ${PN} "Game;"
+}
diff --git a/games-rpg/freedroid/metadata.xml b/games-rpg/freedroid/metadata.xml
index ca95edad2177..7a7b755b7520 100644
--- a/games-rpg/freedroid/metadata.xml
+++ b/games-rpg/freedroid/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">ReinhardPrix/FreedroidClassic</remote-id>
 		<remote-id type="sourceforge">freedroid</remote-id>
 	</upstream>
 </pkgmetadata>