gentoo resync : 15.01.2020

3 files changed, 51 insertions, 51 deletions

diff --git a/games-arcade/funnyboat/Manifest b/games-arcade/funnyboat/Manifest
index 64b0b63e49c1..c21122a8a000 100644
--- a/games-arcade/funnyboat/Manifest
+++ b/games-arcade/funnyboat/Manifest
@@ -1,3 +1,4 @@
 DIST funnyboat-1.5-src.zip 3839990 BLAKE2B 30576f2bb20a236d518a5aca1b173d0e6f876a8411eef87d85950059536b3c6f1801b6f5a498d854ce6f390911ecc3a604f3c9bd438692943721b064f9c6d708 SHA512 7d38070e73825602d6f0a82e810fe8937fe919ce12f6e802ee25147ca1a2333c2b90821d92e20b8e071070505099bf9ec562e8c7b8cd8d241c3021b840e707cc
-EBUILD funnyboat-1.5-r2.ebuild 1020 BLAKE2B 0b50a20a35982b63165c17c2cdce6f396aedd8f74d21c2d2e18013e38d7681919c9a796adc1f462ed6c9181741aeb990902864dee540286d9aa79acd4de67423 SHA512 640fb4128d897d575650ff9b458420765b72f81791da96a5125d80eb53efb076f74f17cd7949c48b2d13efff91f481e1c40e9f1d0b15458a8aa48df4d2bce3d5
+DIST funnyboat_1.5-11.debian.tar.xz 12572 BLAKE2B 691a547cdc2ad07515268fe3e5c828d557f691746e9a9f136dc2634b9130210330ebd68b89fdc783373e5b660ddfe1caf2b74465e6d473b8e7c66a602b3a3f10 SHA512 9dd117e71715ec0a421061c1b71447ac9413b0d80f0337ab4cecc941324f6b9b2466981ed39a9670fa0c56075e60499eeb619ec0bfd8c7c010469d56d3ed66ec
+EBUILD funnyboat-1.5_p11.ebuild 1150 BLAKE2B c15fe28cca00f427063881d50fcf9e3746f2a142a447822826131d1f14a045496b488b0cda94d265f525a86c52ef2e4271a42885ee6ba6bc0b09eaaa13194a8a SHA512 16fe973c776bb5bb7f2b559b5888c4b496239c313f31ed9a2ad92d2b022842e8357b2620d4665e3ebd3e1398ee6a08bb72a19373c52da4e901178c39c39378a0
 MISC metadata.xml 332 BLAKE2B 0f043d28ad918706a08b16364c276af4e7cb3c7f686d799ccf40e54a673d87eceb011a1c72bff3332ce2ca2a9ea62268365f00c26b5bbc5d1f0f4a367522441f SHA512 840d32294f544c648307a82c390a64aea38a6f2931734e377d576ceff26047d9dbff9486d60b0164570a4826fbd148a5af14528c336aa41c4ad6dd51790095b7
diff --git a/games-arcade/funnyboat/funnyboat-1.5-r2.ebuild b/games-arcade/funnyboat/funnyboat-1.5-r2.ebuild
deleted file mode 100644
index f36cf2509f0d..000000000000
--- a/games-arcade/funnyboat/funnyboat-1.5-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit desktop eutils gnome2-utils python-single-r1
-
-DESCRIPTION="A side scrolling shooter game starring a steamboat on the sea"
-HOMEPAGE="http://funnyboat.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
-
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	>=dev-python/pygame-1.6.2[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/${PN}"
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r data *.py
-	python_optimize "${ED%/}"/usr/share/${PN}
-
-	dodoc *.txt
-
-	make_wrapper ${PN} "${EPYTHON} main.py" /usr/share/${PN}
-
-	newicon -s 32 data/kuvake.png ${PN}.png
-	make_desktop_entry ${PN} "Trip on the Funny Boat"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-arcade/funnyboat/funnyboat-1.5_p11.ebuild b/games-arcade/funnyboat/funnyboat-1.5_p11.ebuild
new file mode 100644
index 000000000000..39266cdc5900
--- /dev/null
+++ b/games-arcade/funnyboat/funnyboat-1.5_p11.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit desktop eutils gnome2-utils python-single-r1 xdg
+
+DESCRIPTION="A side scrolling shooter game starring a steamboat on the sea"
+HOMEPAGE="http://funnyboat.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P/_p*}-src.zip
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
+"
+
+LICENSE="GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/pygame-1.6.2[${PYTHON_USEDEP}]
+"
+DEPEND="${DEPEND}"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	# Drop Debian specific patch
+	rm "${WORKDIR}"/debian/patches/use_debian_vera_ttf.patch || die
+	eapply -p1 "${WORKDIR}"/debian/patches/*.patch
+
+	xdg_src_prepare
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins -r data *.py
+	python_optimize "${ED}"/usr/share/${PN}
+
+	dodoc *.txt
+
+	make_wrapper ${PN} "${EPYTHON} main.py" /usr/share/${PN}
+
+	newicon data/titanic.png ${PN}.png
+	make_desktop_entry ${PN} "Trip on the Funny Boat"
+}