gentoo resync : 07.01.2022

5 files changed, 92 insertions, 15 deletions

diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 333abf48b414..25c9702e215b 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/love/Manifest b/games-engines/love/Manifest
index e3e641cac759..8737bfa1697e 100644
--- a/games-engines/love/Manifest
+++ b/games-engines/love/Manifest
@@ -4,8 +4,10 @@ AUX love-0.8.0-opengl_glext_prototypes.patch 1614 BLAKE2B 70bfd445e26a933b8d9f0b
 DIST love-0.7.2-linux-src.tar.gz 900209 BLAKE2B abd0db98d210c5523d3b5a75c30bcfa2fc9d7760c7642d08dda28690ab72ddf8a0c7b60793cd7b0f902a8e3fcf2750748c75caf29638a7455572d84683be7820 SHA512 cbca1d7e3425d1ecbdae019212dfa2814d8ac3bad1faedd4b052cf3e89b5bf2fac6e422283628e4c125858c9db050dee2129476d1a73ec44ffe8a4704f170f61
 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
+DIST love-11.4-linux-src.tar.gz 2925931 BLAKE2B 3f3a8aa1df69dad69edc89429ff5d9505d2de45a109962d3e110848eb1c3042b053472900cc68ddc485769045c9a26f39a2549efb9f15033bb6b2e08dc2cda44 SHA512 a1669e353c216b0f8de862eef877a178618499c38b5ad91143ee64e543affea8fccb13af4ea4957d8698c65dd703e45095ae1069601c4d0ff98d34d71d70ffd3
 EBUILD love-0.7.2-r100.ebuild 992 BLAKE2B fc4e808d37ab63d56e3dc84c6588d0f308a575e7f3b77b67639da0019d6c1b5adcddff0cd28569a46173b3ee56a4060b1c69c58261d8d542d4abdfb826166a08 SHA512 9116835de74556d5f9658b140a1e637bea20a04e084b34dd515fc6d58f6edbf27af8347c2a8c4d06974f7a46d51969f30087e1c5bf921dbcb542d3c4065cf514
 EBUILD love-0.8.0-r100.ebuild 975 BLAKE2B 69fccb2883cd450039d7615d7e2c66047146b7175734b7c0d92bf89024f962bb86baeeac3b441a209b4efca1c3c0c758ad7f62523b47afc9d71035765847eca4 SHA512 decfb6d849aaf80337fa94b6afcf4cda466273c64deaf79288ce48534d44e8a9638b392a958fa6ffd73ffe92f2ba2cdae5eb356fcf93f205b16cf43c65f80384
 EBUILD love-11.3-r100.ebuild 1725 BLAKE2B 179e2f030f3a07c0f78d18e26343b7d7713e19440cd3825751557fbe44268c62aabd43837ec45c9e296bb2bb5859f51734a4ad9f6fad564594f2ccd33bd78019 SHA512 bd67fd7f1d49158543a6ecf2881bfe915a6257a3cc1f8ee412f82bff5943f68f47f4d7df6f9d56220ab2dfbc79b01c6d59c99d4523b3d4bb707a196c5e1e3fd6
-EBUILD love-9999.ebuild 1725 BLAKE2B 179e2f030f3a07c0f78d18e26343b7d7713e19440cd3825751557fbe44268c62aabd43837ec45c9e296bb2bb5859f51734a4ad9f6fad564594f2ccd33bd78019 SHA512 bd67fd7f1d49158543a6ecf2881bfe915a6257a3cc1f8ee412f82bff5943f68f47f4d7df6f9d56220ab2dfbc79b01c6d59c99d4523b3d4bb707a196c5e1e3fd6
-MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
+EBUILD love-11.4.ebuild 1436 BLAKE2B d6ef7a3ed2cc25a0bd6531618d35ec343cb2af44313cfd77a49f3350590ff2471bc77886f793b36919405c34a28213c136193d7814012ce5bce80f10b3b5f38a SHA512 7ab80aac134ef54ce3bcf047a0b23975e25ac6a1f5b6e9775a6344475b39f7286b38c9fd986ef303730fc147e8d989db745b60284942fd6df0ea5c9592244224
+EBUILD love-9999.ebuild 1436 BLAKE2B d6ef7a3ed2cc25a0bd6531618d35ec343cb2af44313cfd77a49f3350590ff2471bc77886f793b36919405c34a28213c136193d7814012ce5bce80f10b3b5f38a SHA512 7ab80aac134ef54ce3bcf047a0b23975e25ac6a1f5b6e9775a6344475b39f7286b38c9fd986ef303730fc147e8d989db745b60284942fd6df0ea5c9592244224
+MISC metadata.xml 364 BLAKE2B 259c310ac7adc0b0d8fa0a7a6f2e01b86e93ab264194cd67e627444d5779c9d0ee83d001d2afd6253643d40bc7354f70e08074758761d1985fbfb355a18ae3be SHA512 7cf2aec8ede52561b14d590448f221da7a9d57a31b58cd0246b82cf8b1c5927b4cad662613bea15caf078a487a965a9b85eb042d33ad168b201361af8b2f99d4
diff --git a/games-engines/love/love-11.4.ebuild b/games-engines/love/love-11.4.ebuild
new file mode 100644
index 000000000000..fcc2e07df8e9
--- /dev/null
+++ b/games-engines/love/love-11.4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit lua-single 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="gme"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="sys-libs/zlib
+	${LUA_DEPS}
+	media-libs/freetype
+	media-libs/libmodplug
+	media-libs/libsdl2[joystick,opengl]
+	media-libs/libtheora
+	media-libs/libvorbis
+	media-libs/openal
+	media-sound/mpg123
+	virtual/opengl
+	gme? ( media-libs/game-music-emu )"
+DEPEND="${RDEPEND}"
+
+DOCS=( "readme.md" "changes.txt" )
+
+src_prepare() {
+	default
+	if [[ ${PV} == 9999* ]]; then
+		./platform/unix/automagic || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable gme)
+		--with-lua=$(usex lua_single_target_luajit luajit lua)
+		--with-luaversion=$(ver_cut 1-2 $(lua_get_version))
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+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 4de07ea8e793..fcc2e07df8e9 100644
--- a/games-engines/love/love-9999.ebuild
+++ b/games-engines/love/love-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-LUA_COMPAT=( lua5-{1..3} luajit )
+LUA_COMPAT=( lua5-{1..4} luajit )
 
 inherit lua-single xdg-utils
 
@@ -20,6 +20,7 @@ HOMEPAGE="https://love2d.org/"
 
 LICENSE="ZLIB"
 SLOT="0"
+IUSE="gme"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
@@ -28,12 +29,12 @@ RDEPEND="sys-libs/zlib
 	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"
+	virtual/opengl
+	gme? ( media-libs/game-music-emu )"
 DEPEND="${RDEPEND}"
 
 DOCS=( "readme.md" "changes.txt" )
@@ -46,21 +47,18 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --with-lua=$(usex lua_single_target_luajit luajit lua) \
+	local myeconfargs=(
+		$(use_enable gme)
+		--with-lua=$(usex lua_single_target_luajit luajit lua)
 		--with-luaversion=$(ver_cut 1-2 $(lua_get_version))
+	)
+	econf "${myeconfargs[@]}"
 }
 
 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() {
diff --git a/games-engines/love/metadata.xml b/games-engines/love/metadata.xml
index beac02a9af14..300455c21e7d 100644
--- a/games-engines/love/metadata.xml
+++ b/games-engines/love/metadata.xml
@@ -5,4 +5,7 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<use>
+		<flag name="gme">Use <pkg>media-libs/game-music-emu</pkg> to support additional music formats</flag>
+	</use>
 </pkgmetadata>