gentoo resync : 15.06.2021

5 files changed, 47 insertions, 75 deletions

diff --git a/games-puzzle/meandmyshadow/Manifest b/games-puzzle/meandmyshadow/Manifest
index 9d426684462a..fc2665e2e1d1 100644
--- a/games-puzzle/meandmyshadow/Manifest
+++ b/games-puzzle/meandmyshadow/Manifest
@@ -1,4 +1,3 @@
-AUX meandmyshadow-0.4-cmake.patch 513 BLAKE2B c2a272dea4328ce3348b2fd06b4e050681f09ca2068399f445c3d65d9416b0ad885ca449c14467fdba191d8795b0ed42d31f2a89752cd72346b98a736aafb77a SHA512 e81037c98f55bebe587f878ff1f5f57c6c5558f8305f5e2cd50db0bbb5634bde418c5254f43051b07b0017b380b2144103eae8ae4fcdc3c780ce2b3134e3f538
-DIST meandmyshadow-0.4-src.tar.gz 16962805 BLAKE2B 607c08c0484b049e02ed54d2483f30f1c7af8aeffc31c977dba335e57eb14734517469f345387778875567db7f446b159dfbc7e51832cddc0d29e8352b308b29 SHA512 945f096fdc2df58b29f91314cd88953d897bbdbd094d8092d6712d33f7dbacadd298ca797e678ebad08ca579ed67a7b9d664e1fa202753e687a021935032a92b
-EBUILD meandmyshadow-0.4-r1.ebuild 1170 BLAKE2B e6d8232736deff162408bc3c544467b3386e7e362c2c7c89115925cea2d5ffa44b5f500ecf12869b12464222201f048f13baae1d0245630b9fd9031617e58870 SHA512 17c7bdec047c44a6cf39da425d813fc25b30f56380f45aef3abfa93067f3fa167551a3b80d6a6235bc20e654d3e567547613dd1ab6ee5235305263e77986e8ec
-MISC metadata.xml 336 BLAKE2B ef2dbc4f110f2be12490cafc36b1efa95c025822eebdcda0cbec755f1c943d4111304cb0b0a0b415b297ee8face8bef5328a062d28fac6f00ce5ab4f20a8f321 SHA512 8641b7544c71bf31e801587fb889e92e248b4c3500be88ae976423e39d93a6d870b18f05d7af9ce0e0c1d5e2ec081501cecb070cbf2a1452724cc20851617a55
+DIST meandmyshadow-0.5a-src.tar.gz 17527733 BLAKE2B 76d47908ac0151981c0a597d7fac8bacc98895d7038943ff6f349c60156d503266acbb3875415f7552202f36bd21d97c1508a3e0a9fed501a65c5d4c1cca70ab SHA512 c9e6de9c9b47af3839b6830faa3619ddc69b2c2cabf4d90f4c1393758805acf9835abcba45d79037766b4b6e5f006e6f880eba593d1142b0e829a887eb844f27
+EBUILD meandmyshadow-0.5a.ebuild 1079 BLAKE2B f585551216ec336152ad58ab9592c3c0ae78921f30a3e3dcfdf2b55f48d5d5313744a99bfcecead7cc677ae3ec3d76d2bf1a840ea1d5839cfeec96f018619e75 SHA512 48e50c5543a52fd731da618f1c3ee284b41f0ff545d9b2b83f716e9b5af40efcafe9ef2c83c19590287f7ae93eb6eeab9b014d527a2e2e91d1cecd149cd62c29
+MISC metadata.xml 397 BLAKE2B 82f3515fec81bd0125599afae726f07288a46c95b1a53ceb39b5c6b8cfb4da217ab36a74dafbe50bd4bf82f75a56a3def2d9e655b834c7054e3c5449115e20ef SHA512 5a7d09cdca621671373aa34495f53f240ff0733560315480a1e94fcff63818a9b796e9227d4a52675cfdbd4d45eb56e458e7a3318eadf9e5f57b3a5a7878c4f4
diff --git a/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch b/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch
deleted file mode 100644
index 0bd66d5d284a..000000000000
--- a/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- meandmyshadow-0.4.orig/CMakeLists.txt
-+++ meandmyshadow-0.4/CMakeLists.txt
-@@ -15,13 +15,12 @@
- Find_Package(CURL REQUIRED)

- Find_Package(LibArchive REQUIRED)

- Find_Package(OpenSSL REQUIRED)

-+Find_Package(X11 REQUIRED)

- 

- #Use openGL only when compiling with HARDWARE_ACCELERATION.

- #Otherwise we try to find XLib.

- if(HARDWARE_ACCELERATION)

- 	Find_Package(OpenGL REQUIRED)

--else(HARDWARE_ACCELERATION)

--	INCLUDE(FindX11)

- endif(HARDWARE_ACCELERATION)

- 

- #Add the include dirs of the libraries.

diff --git a/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild b/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild
deleted file mode 100644
index 809adb120794..000000000000
--- a/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Puzzle/platform game with a player and its shadow"
-HOMEPAGE="https://acmepjz.github.io/meandmyshadow/
-https://github.com/acmepjz/meandmyshadow/"
-SRC_URI="mirror://sourceforge/meandmyshadow/${PV}/${P}-src.tar.gz"
-
-LICENSE="GPL-3 OFL-1.1 CC-BY-SA-2.5"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="opengl"
-
-DEPEND="
-	app-arch/libarchive
-	dev-libs/openssl:0=
-	media-libs/libsdl[sound,video,X]
-	media-libs/sdl-gfx
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-ttf
-	net-misc/curl
-	x11-libs/libX11
-	opengl? ( virtual/opengl )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog README docs/{Controls,ThemeDescription}.txt )
-
-PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=TRUE
-		-DBINDIR="/usr/bin"
-		-DDATAROOTDIR="/usr/share"
-		-DICONDIR=/usr/share/icons
-		-DDESKTOPDIR=/usr/share/applications
-		-DHARDWARE_ACCELERATION=$(usex opengl)
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/games-puzzle/meandmyshadow/meandmyshadow-0.5a.ebuild b/games-puzzle/meandmyshadow/meandmyshadow-0.5a.ebuild
new file mode 100644
index 000000000000..66db4ae6b1b0
--- /dev/null
+++ b/games-puzzle/meandmyshadow/meandmyshadow-0.5a.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{2..4} )
+inherit xdg cmake lua-single
+
+DESCRIPTION="Puzzle/platform game with a player and its shadow"
+HOMEPAGE="https://acmepjz.github.io/meandmyshadow/"
+SRC_URI="mirror://sourceforge/meandmyshadow/${PV}/${P}-src.tar.gz"
+
+LICENSE="
+	Apache-2.0 BitstreamVera CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0
+	GPL-2+ GPL-3 GPL-3+ LGPL-2.1 OFL-1.1 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	${LUA_DEPS}
+	app-arch/libarchive:=
+	media-libs/libsdl2[sound,video]
+	media-libs/sdl2-image[jpeg,png]
+	media-libs/sdl2-mixer[vorbis]
+	media-libs/sdl2-ttf
+	net-misc/curl[ssl]"
+DEPEND="${RDEPEND}"
+
+DOCS=(
+	AUTHORS ChangeLog README.md
+	docs/{Controls,ScriptAPI,ThemeDescription}.md
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DLua_FIND_VERSION_MAJOR=$(ver_cut 1 $(lua_get_version))
+		-DLua_FIND_VERSION_MINOR=$(ver_cut 2 $(lua_get_version))
+		-DLua_FIND_VERSION_COUNT=2
+		-DLua_FIND_VERSION_EXACT=ON
+	)
+	cmake_src_configure
+}
diff --git a/games-puzzle/meandmyshadow/metadata.xml b/games-puzzle/meandmyshadow/metadata.xml
index d0cf56051e6c..825763c35375 100644
--- a/games-puzzle/meandmyshadow/metadata.xml
+++ b/games-puzzle/meandmyshadow/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">acmepjz/meandmyshadow</remote-id>
 		<remote-id type="sourceforge">meandmyshadow</remote-id>
 	</upstream>
 </pkgmetadata>