gentoo resync : 29.01.2021

5 files changed, 10 insertions, 169 deletions

diff --git a/games-engines/love/Manifest b/games-engines/love/Manifest
index 15d8bece3b30..34cdad327120 100644
--- a/games-engines/love/Manifest
+++ b/games-engines/love/Manifest
@@ -5,10 +5,7 @@ DIST love-0.7.2-linux-src.tar.gz 900209 BLAKE2B abd0db98d210c5523d3b5a75c30bcfa2
 DIST love-0.8.0-linux-src.tar.gz 1027356 BLAKE2B bfbc2f9a3d5c3beffb4790a69716416815534c3b390b1554722eceaec57a7530377c06c15c6551aa972b33176bccdadfc8ad12bc186ceda201527bd9f8286d6f SHA512 6a0e28d102b950d3dddf7101996fe0ad04dfd7d4ec5e58797b41ef3382b60e74f90c6e707f882cf43cc0c5cc98703857eefc6418e6a6fd34e88f8019143f55a4
 DIST love-11.3-linux-src.tar.gz 2898851 BLAKE2B ae854dbe1f98fa2adaf118ac01b7519f87cbf684dff45622e0de6503a514bc6336c469b08a6c19ae55f7a0d65063bebffe0dc1d0a72483a9032902469c1c643f SHA512 d02900bbad658da7127bdbc52ceb8282a725b32d6a17fc51962327411be94f81b2c871d21b3c4bd8492a4ca355c3cfb1f04a7fe010d6c69ae35c7c5d64579e1b
 EBUILD love-0.7.2-r100.ebuild 992 BLAKE2B fc4e808d37ab63d56e3dc84c6588d0f308a575e7f3b77b67639da0019d6c1b5adcddff0cd28569a46173b3ee56a4060b1c69c58261d8d542d4abdfb826166a08 SHA512 9116835de74556d5f9658b140a1e637bea20a04e084b34dd515fc6d58f6edbf27af8347c2a8c4d06974f7a46d51969f30087e1c5bf921dbcb542d3c4065cf514
-EBUILD love-0.7.2-r2.ebuild 913 BLAKE2B 262eb47a410c0ba89f95d21a7773e4651b1c4745c1f7c881cf1bcc9dfff17012c6ae1970d70a6dacaa60b30165aef38e12bf0787b3e5bbd850ca6bbe8f76c9c6 SHA512 1437cf9d0053bbd646e68b71c224a5098a8cd8bf2fb97ac1788c2914999229a7dc2fafb40db0b1c5a6e8cc2938130c0d4cc09722dd096d8fc57688165b429450
 EBUILD love-0.8.0-r100.ebuild 975 BLAKE2B 69fccb2883cd450039d7615d7e2c66047146b7175734b7c0d92bf89024f962bb86baeeac3b441a209b4efca1c3c0c758ad7f62523b47afc9d71035765847eca4 SHA512 decfb6d849aaf80337fa94b6afcf4cda466273c64deaf79288ce48534d44e8a9638b392a958fa6ffd73ffe92f2ba2cdae5eb356fcf93f205b16cf43c65f80384
-EBUILD love-0.8.0-r2.ebuild 896 BLAKE2B a785a304e875066ee7840974db3dd7379c40d5987c884811ec00445d06da7598c2ffcbce63fa8efd015e6f3f3254ac9e9a88b10c067c2c04d1b96a9e1239d9fb SHA512 9dfef7919b56d6e0d085c48e600997411356f0f22a926be894957b24f3c82107ab02de4565935d2ba8d92577b301235a1ba320c00da955c5bc194f823c9770fe
 EBUILD love-11.3-r100.ebuild 1725 BLAKE2B 179e2f030f3a07c0f78d18e26343b7d7713e19440cd3825751557fbe44268c62aabd43837ec45c9e296bb2bb5859f51734a4ad9f6fad564594f2ccd33bd78019 SHA512 bd67fd7f1d49158543a6ecf2881bfe915a6257a3cc1f8ee412f82bff5943f68f47f4d7df6f9d56220ab2dfbc79b01c6d59c99d4523b3d4bb707a196c5e1e3fd6
-EBUILD love-11.3.ebuild 1631 BLAKE2B c507a9894db2718468e84688527cfde86b57ad1810e0684b9ab76ba2143e6385122d41897bf2fdd7d02537c02c45da305ec561f382f86250f8d61c0b4d298bf8 SHA512 445e51b862edaa6ef6f7a68f86403567fc7496b230c41b31d0ed41933e9c4c29ab6521587a3327c5ce66d6892fa14ae8004c878a537a51b0c98fa45721e01fa0
-EBUILD love-9999.ebuild 1630 BLAKE2B 27150d66d6b03c5be8828dad5b9a23be987386e441ad37639891729d10b0c086fd5dd99551b3e7f1ec08b009a1d671cbc6b2c34b9c918f8c6f9249408ce66571 SHA512 3226c12336a4288e3696b9f57d941a3e317baba021aef648426bda874c55611db4f3e31c9ac966a92701e972b6ac89f6449244ab5254b9bc7b68453ab33216f1
+EBUILD love-9999.ebuild 1725 BLAKE2B 179e2f030f3a07c0f78d18e26343b7d7713e19440cd3825751557fbe44268c62aabd43837ec45c9e296bb2bb5859f51734a4ad9f6fad564594f2ccd33bd78019 SHA512 bd67fd7f1d49158543a6ecf2881bfe915a6257a3cc1f8ee412f82bff5943f68f47f4d7df6f9d56220ab2dfbc79b01c6d59c99d4523b3d4bb707a196c5e1e3fd6
 MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/games-engines/love/love-0.7.2-r2.ebuild b/games-engines/love/love-0.7.2-r2.ebuild
deleted file mode 100644
index 0743c3dd9250..000000000000
--- a/games-engines/love/love-0.7.2-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A framework for 2D games in Lua"
-HOMEPAGE="https://love2d.org/"
-SRC_URI="https://github.com/love2d/${PN}/releases/download/${PV}/${P}-linux-src.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0.7"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-games/physfs
-	dev-lang/lua:0[deprecated]
-	media-libs/devil[mng,png,tiff]
-	media-libs/freetype:2
-	media-libs/libmodplug
-	media-libs/libsdl[joystick,opengl]
-	media-libs/libvorbis
-	media-libs/openal
-	media-sound/mpg123
-	virtual/opengl
-"
-DEPEND="${RDEPEND}
-	media-libs/libmng:0
-	media-libs/tiff:0
-"
-
-S="${WORKDIR}/${PN}-HEAD"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.2-opengl_glext_prototypes.patch
-	"${FILESDIR}"/${PN}-0.8.0-freetype2.patch
-)
-
-src_install() {
-	DOCS="readme.txt changes.txt" \
-		default
-
-	mv "${ED}/usr/bin/${PN}" "${ED}/usr/bin/${PN}-${SLOT}" || die
-}
diff --git a/games-engines/love/love-0.8.0-r2.ebuild b/games-engines/love/love-0.8.0-r2.ebuild
deleted file mode 100644
index 9297277d9f52..000000000000
--- a/games-engines/love/love-0.8.0-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A framework for 2D games in Lua"
-HOMEPAGE="https://love2d.org/"
-SRC_URI="https://github.com/love2d/${PN}/releases/download/${PV}/${P}-linux-src.tar.gz"
-KEYWORDS="~amd64 ~arm ~x86"
-
-LICENSE="ZLIB"
-SLOT="0.8"
-IUSE=""
-
-RDEPEND="
-	dev-games/physfs
-	dev-lang/lua:0[deprecated]
-	media-libs/devil[mng,png,tiff]
-	media-libs/freetype:2
-	media-libs/libmodplug
-	media-libs/libsdl[joystick,opengl,video]
-	media-libs/libvorbis
-	media-libs/openal
-	media-sound/mpg123
-	virtual/opengl
-"
-DEPEND="${RDEPEND}
-	media-libs/libmng:0
-	media-libs/tiff:0
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.0-freetype2.patch
-	"${FILESDIR}"/${PN}-0.8.0-opengl_glext_prototypes.patch
-)
-
-src_install() {
-	DOCS="readme.md changes.txt" \
-		default
-
-	mv "${ED}/usr/bin/${PN}" "${ED}/usr/bin/${PN}-${SLOT}" || die
-}
diff --git a/games-engines/love/love-11.3.ebuild b/games-engines/love/love-11.3.ebuild
deleted file mode 100644
index df62bac35ad5..000000000000
--- a/games-engines/love/love-11.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/love2d/${PN}.git"
-else
-	SRC_URI="https://github.com/love2d/${PN}/releases/download/${PV}/${P}-linux-src.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="A framework for 2D games in Lua"
-HOMEPAGE="https://love2d.org/"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE="+luajit"
-
-RDEPEND="sys-libs/zlib
-	!luajit? ( dev-lang/lua:0 )
-	luajit? ( dev-lang/luajit:2 )
-	media-libs/freetype
-	media-libs/libmodplug
-	media-libs/libsdl2[joystick,opengl]
-	media-libs/libogg
-	media-libs/libtheora
-	media-libs/libvorbis
-	media-libs/openal
-	media-sound/mpg123
-	virtual/opengl"
-DEPEND="${RDEPEND}"
-
-DOCS=( "readme.md" "changes.txt" )
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999* ]]; then
-		./platform/unix/automagic || die
-	fi
-}
-
-src_configure() {
-	econf --with-lua=$(usex luajit luajit lua)
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-
-	if [[ ${SLOT} != 0 ]]; then
-		mv "${ED}/usr/bin/${PN}" "${ED}/usr/bin/${PN}-${SLOT}" || die
-		mv "${ED}"/usr/share/applications/love{,"-$SLOT"}.desktop || die
-		sed -i -e "/^Name=/s/$/ ($SLOT)/" -e "s|/usr/bin/love|/usr/bin/love-$SLOT|" "${ED}/usr/share/applications/love-$SLOT.desktop" || die
-		rm -r "${ED}"/usr/{lib64/liblove.so,share/{mime/,pixmaps/,icons/,man/}} || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/games-engines/love/love-9999.ebuild b/games-engines/love/love-9999.ebuild
index 6265299294f3..4de07ea8e793 100644
--- a/games-engines/love/love-9999.ebuild
+++ b/games-engines/love/love-9999.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=7
 
-inherit xdg-utils
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit lua-single xdg-utils
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
@@ -14,15 +16,15 @@ else
 fi
 
 DESCRIPTION="A framework for 2D games in Lua"
-HOMEPAGE="http://love2d.org/"
+HOMEPAGE="https://love2d.org/"
 
 LICENSE="ZLIB"
 SLOT="0"
-IUSE="+luajit"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 RDEPEND="sys-libs/zlib
-	!luajit? ( dev-lang/lua:0 )
-	luajit? ( dev-lang/luajit:2 )
+	${LUA_DEPS}
 	media-libs/freetype
 	media-libs/libmodplug
 	media-libs/libsdl2[joystick,opengl]
@@ -44,7 +46,8 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --with-lua=$(usex luajit luajit lua)
+	econf --with-lua=$(usex lua_single_target_luajit luajit lua) \
+		--with-luaversion=$(ver_cut 1-2 $(lua_get_version))
 }
 
 src_install() {