gentoo resync : 25.08.2020

3 files changed, 37 insertions, 20 deletions

diff --git a/games-puzzle/pingus/Manifest b/games-puzzle/pingus/Manifest
index a824fda5b7bb..b81ed747fedb 100644
--- a/games-puzzle/pingus/Manifest
+++ b/games-puzzle/pingus/Manifest
@@ -3,8 +3,9 @@ AUX pingus-0.7.6-echo-e.patch 489 BLAKE2B 4268205c1c12bc5e8d4a4fb44b49b15b460763
 AUX pingus-0.7.6-gcc47.patch 1096 BLAKE2B 8e7a56634eb69cc1c0797a2fa020b30e0eecf0e2ea7c00a0738915a92fd3dd4b5f51fe6dac3f7bd0cb84fea72f68f9e8edbac398b4d067dd7be2ff76560bb7be SHA512 7be7935ad664cde7c78d4363eef7391783ea868f096fc9dd03ce3e3eaaab69a839da5cb569449c106eae1779c41d9850f1a5683542bea4bf5cb98570f9d18e7d
 AUX pingus-0.7.6-gcc7.patch 675 BLAKE2B 76172b7151e30e800ab2210684a02605810b0f15b972ad6942b65c5c333f5f29e6ace7dd37a9d7541468906a2864925df5a899c5c98a6404b65dbfa802a9f5b7 SHA512 7e7fc8d7b23453b33899452d9ee19a134fe7ab1326a2560698624dc686de98108baeb026401704c06dd262c69542499b0cc3727c57d47f924f3a4020ff386027
 AUX pingus-0.7.6-noopengl.patch 315 BLAKE2B 49d2f078506c38d7da57847c6189bf0f9fd0b8a87e80b16fb848f52e37a466111be753f68dc9bf889c66d4ad9a4fea8495fe73b860001d644f2dbb0091b319fe SHA512 f375591892ddecea0659f94ab3d4fc6744625b546fdbc6d80524c25d8ee494163a9b4a90671eed9e7fa2724a1fd91ccde2e80b8ba097c21aa76e0e9fb7e6f4a0
+AUX pingus-0.7.6-python3.patch 553 BLAKE2B aa15a12e8e4d578a91ff1b96aceb51a529595eae59d4f78e80a1b7bd2427a8658fdb9d91e32602d7ab1125b9c3c59538cf47d17ae4eb23bfe23d38b401ef0890 SHA512 5be04a07beddefe33681c6e0cf043e46e514a10665732015ff0ca01be933752f67d5a6161729c72d277ba5a56eb9bd38ab80da3bf0755895d0784196ad349a1c
 AUX pingus-9999-no_libexec.patch 895 BLAKE2B 2cdbf1faffe66c4b6a9fe3518cbecbfce292995cc08f28ef4929a72d1df00a4f937a0c270d932ab724946986104f59a00af58676496950a429d14b1436386f39 SHA512 91bdecf06f47dca2ff3c019b6bafdbdba560ac05c49389b1fd9d59ab89f20b7251c3cfea62857b6f6de4720a2cba405e1c7bb8df5b36c76b2e2c0bf36fc7a5e4
 DIST pingus-0.7.6.tar.bz2 12622268 BLAKE2B 5ea1bbea7191919897bdedcda06f956d9b6cc0cda2ab11e475ef497ef8ba0c0de5a739ac334e2a5c9a0c138e6bfc44a23363dc59d3e4cfaea2b5388bbe57cc85 SHA512 6c8c2ace1a9229b4e3b506aee76aa94c0dd906a64fa2c817902c2cd3854df390cf675c8c6ddd3ba1926a467348b2103818bd44bc095378cc7bf3f2ff7af27188
-EBUILD pingus-0.7.6-r2.ebuild 1291 BLAKE2B 1b5289f4ad87dd695fb0dcf14decdcf3362849bddade4b1163bb0153a1a6cb56cf64a94d9c13b1143dc2007be3b3c40ee7f0059439ba94f336cade955159149e SHA512 ead53dde486252dfcd2fc59e49b9694f186982b2e415453f5d00272c639267b10d211cebd4b0acc9e5de2eaeaed5a4b633f1b46f0c75c71c65d27e8e61c6923a
+EBUILD pingus-0.7.6-r3.ebuild 1283 BLAKE2B e7a05fa491ff63c3296f33c8cd08ebfba32eb60d286ef210ab9506465af06168f03603ff3f54d8f694f2a0d87834152b34f277532f5d5ecc76230f633dcb558d SHA512 3caa026bb9fa007cb248b51b192c93715a4f29a8c624a3ef7c9f3924c2770521e53bd1ebe23921e4518d5ee10b2e7abaf9207d3c3324baf514ed95e7d5dbb154
 EBUILD pingus-9999.ebuild 924 BLAKE2B c5ccb474cf9f56d636605c9826e0285519734ab0af9e0c3893de762f15ed5ae3495449e2ccf70e2e9f3540b0c95a0dce7552c7b92de8806cdbd6d96a4a6b0c54 SHA512 2d405c9c64afd9e3a0e2ff7bea2b84505bd4eb3bf2855f2203bf804b3637c0e79c2b0f6022aff1b985c6ace37fe5515d2168c0caa7c880397594dd66c8bca436
 MISC metadata.xml 1283 BLAKE2B 971b7c831e81413f71e70c7f66ef01b493296d33ff6bbb2997690b60c10eb1a4ffa29c47f335bbd4c57c178e35aef3d59586bbe06199bc50df34501f56b3be2d SHA512 04c0f4cb00f8b50e5f589d6bfa48389fb7fb2ff0ac2343c625f98383ec41ea77d63dbdc14d12325f3837e4961c544503f1a76a4298fa061458a71b1e198c8219
diff --git a/games-puzzle/pingus/files/pingus-0.7.6-python3.patch b/games-puzzle/pingus/files/pingus-0.7.6-python3.patch
new file mode 100644
index 000000000000..7df3bc9e983d
--- /dev/null
+++ b/games-puzzle/pingus/files/pingus-0.7.6-python3.patch
@@ -0,0 +1,19 @@
+--- a/SConscript.bak	2019-08-01 12:45:16.937878393 -0500
++++ b/SConscript	2019-08-01 12:46:13.648803035 -0500
+@@ -126,12 +126,12 @@
+     def configure_end(self):
+         self.env = self.conf.Finish()
+ 
+-        print "Reports:"
+-        print self.reports
++        print("Reports:")
++        print(self.reports)
+ 
+         if not self.fatal_error == "":
+-            print "Fatal Errors:"
+-            print self.fatal_error
++            print("Fatal Errors:")
++            print(self.fatal_error)
+             Exit(1)
+ 
+     def configure_gxx(self): 
diff --git a/games-puzzle/pingus/pingus-0.7.6-r2.ebuild b/games-puzzle/pingus/pingus-0.7.6-r3.ebuild
index 7a222f34d4f2..466c772c3579 100644
--- a/games-puzzle/pingus/pingus-0.7.6-r2.ebuild
+++ b/games-puzzle/pingus/pingus-0.7.6-r3.ebuild
@@ -1,11 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit scons-utils toolchain-funcs flag-o-matic xdg-utils
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
 
-DESCRIPTION="free Lemmings clone"
-HOMEPAGE="https://pingus.seul.org"
+inherit desktop flag-o-matic python-any-r1 scons-utils toolchain-funcs xdg
+
+DESCRIPTION="Free Lemmings clone"
+HOMEPAGE="https://pingus.gitlab.io/"
 SRC_URI="https://pingus.googlecode.com/files/${P}.tar.bz2"
 
 LICENSE="GPL-3"
@@ -13,15 +15,17 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="opengl music"
 
-RDEPEND="media-libs/libsdl[joystick,opengl?,video]
+RDEPEND="
+	media-libs/libsdl[joystick,opengl?,video]
 	media-libs/sdl-image[png]
 	media-libs/sdl-mixer
 	music? ( media-libs/sdl-mixer[mod] )
 	opengl? ( virtual/opengl )
 	media-libs/libpng:0=
-	dev-libs/boost:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-noopengl.patch
@@ -29,10 +33,11 @@ PATCHES=(
 	"${FILESDIR}"/${P}-echo-e.patch
 	"${FILESDIR}"/${P}-gcc7.patch
 	"${FILESDIR}"/${P}-boost_signals2.patch
+	"${FILESDIR}"/${P}-python3.patch
 )
 
 src_prepare() {
-	default
+	xdg_src_prepare
 	strip-flags
 }
 
@@ -51,13 +56,5 @@ src_install() {
 	doman doc/man/pingus.6
 	doicon data/images/icons/pingus.svg
 	make_desktop_entry ${PN} Pingus
-	dodoc AUTHORS NEWS README TODO
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
+	einstalldocs
 }