gentoo resync : 01.10.2020

5 files changed, 67 insertions, 23 deletions

diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index da94cdc5d8b6..db0466158b39 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/manaplus/Manifest b/games-rpg/manaplus/Manifest
index a7d21817d790..844d98dfe2e4 100644
--- a/games-rpg/manaplus/Manifest
+++ b/games-rpg/manaplus/Manifest
@@ -1,4 +1,5 @@
+AUX manaplus-1.9.3.23-metainfo.patch 1188 BLAKE2B 08a8e3f7a3992bf60f3cd34f097638e5f1c155753c70f4798bd5d3b288abbf7995cdb53d22c980234a9bc6ad09f390d8078f469b7e30c2ddbd4f701407d37ef1 SHA512 5653e2037e2f806bdf53bf54908d81e37518955329697fdb4c1b8af52e267fbe5cbd8000003b4674a5c19066902a0f6492179c647bbe534f6d7d61c25cf274f2
 DIST manaplus-1.9.3.23.tar.xz 15051860 BLAKE2B 6019799f13df0531ffcf662068f3dc85d31193a8db9fe6fa82b0c1c5740c527685efae822b800ca1836ec3ca00405f07ff368ecd3e0932465762e5f9efda7516 SHA512 0e74df08b4e18a826711c090e3ddf38da1b348c34acc1aff675c1f6c4dc523723a07b2b00d135a89ef136f11fe03f0dfc41e5830f0d6c34d5d44eb1414a2d361
-EBUILD manaplus-1.9.3.23.ebuild 3221 BLAKE2B 2a9d3a09228b89099201cffce07ea346f4aaf80c9126ed5a7e16b2a52d4c2070cd3e49f78f2b75e85f99426a67e2af4a75800fa4484975e9c62440eb391f2e46 SHA512 5013efed843c611d02218a62d3f389ee95e16c0bfa324dfa0aef78b7c887d470ca533e556f6f2240f706da8cdc5be19d7d1b9cfdf2403762ef9c8627ec070e67
-EBUILD manaplus-9999.ebuild 3196 BLAKE2B e08f8aed0fcb4d3c5164445bd0a4cf21eff7fcf4b838a98013ab2d22956d0c3ffda429fed02d0b4c53a7e392f4a74f909e104af66b53c93eb35492a77fd62fb8 SHA512 f05dff2e5138b2c0aec3478c951ecf358a5f0fe8ce57dc64e518e858fa62fee1079d6d2e8f9b65cbce1066912f9fad24031038a16c78b0d1dbea1e234127f0b7
+EBUILD manaplus-1.9.3.23-r1.ebuild 3242 BLAKE2B aa491a4d4a89d47cfdf5fae71616651899b7b880b65747d3e4345a2c5423999416ab05ba3288f89bc1035ab27be5b8395aa3acfd83c246c347e7f0328f8a0d33 SHA512 3276b30d1c522c35353826dff26696b9bc0afdd61ff26555f16520d783e718cf47b407cb733d74ad9d10c4503b21d9ce95b0014e75086e769523471565cafd8f
+EBUILD manaplus-9999.ebuild 3058 BLAKE2B aec84162569ccff174bb2515aeb3af38f8ce06f2aa61c984381d4c82a0d099aedffec1b42fa873992dddaaa39bce9c0946a46f3dfd1fb9466a89726c4b6b27cd SHA512 b0d7f1e664737a01d0198bd5804f50db5205abd6e6e24c77fa1e4d4e03616212f97d4b2b5de49293ceb33ff30c2f10dbc33a7808cd477ec968c81acd56eba475
 MISC metadata.xml 583 BLAKE2B a80e8b93497192e2f791f59ec8b09828daef0b03dc0fc5d37934ba79e564682cf3a12c8220d0e694685c0bc69aa2747c7fa07ab57ad82d40f55b18ab19dd6533 SHA512 18bb3e28b1a977edf857c93c6e1f15b56af67a29afa4b49f12a796aa8368c3e7d25144005befebe012194cee0b4cae1a3bd7616f272243a508908bb4532403e3
diff --git a/games-rpg/manaplus/files/manaplus-1.9.3.23-metainfo.patch b/games-rpg/manaplus/files/manaplus-1.9.3.23-metainfo.patch
new file mode 100644
index 000000000000..dd324e5da8b4
--- /dev/null
+++ b/games-rpg/manaplus/files/manaplus-1.9.3.23-metainfo.patch
@@ -0,0 +1,38 @@
+From c8e83006fb78b5768de1e3e19993c91a29f5da6d Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Thu, 1 Oct 2020 12:48:02 +0200
+Subject: [PATCH] Rename appdata to metainfo
+
+See https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html
+chapter 2.1.2 "Filesystem locations"
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ Makefile.am                                   | 4 ++--
+ manaplus.appdata.xml => manaplus.metainfo.xml | 0
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ rename manaplus.appdata.xml => manaplus.metainfo.xml (100%)
+
+diff --git a/Makefile.am b/Makefile.am
+index 603cf8e16..70c6981be 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,9 +6,9 @@ desktopdir = $(datarootdir)/applications
+ desktop_DATA = manaplus.desktop \
+ 	     manaplustest.desktop
+ 
+-appdatadir = $(datarootdir)/appdata
++appdatadir = $(datarootdir)/metainfo
+ 
+-appdata_DATA = manaplus.appdata.xml
++appdata_DATA = manaplus.metainfo.xml
+ 
+ # Extra files to include
+ EXTRA_DIST = $(desktop_DATA) \
+diff --git a/manaplus.appdata.xml b/manaplus.metainfo.xml
+similarity index 100%
+rename from manaplus.appdata.xml
+rename to manaplus.metainfo.xml
+-- 
+2.28.0
+
diff --git a/games-rpg/manaplus/manaplus-1.9.3.23.ebuild b/games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild
index 85e22dbccd84..a319f2a43284 100644
--- a/games-rpg/manaplus/manaplus-1.9.3.23.ebuild
+++ b/games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild
@@ -3,10 +3,12 @@
 
 EAPI=7
 
+inherit autotools
+
 DESCRIPTION="OpenSource 2D MMORPG client for Evol Online and The Mana World"
 HOMEPAGE="https://manaplus.org"
 if [[ ${PV} == 9999 ]] ; then
-	inherit autotools git-r3
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ManaPlus/ManaPlus.git"
 else
 	SRC_URI="http://download.evolonline.org/manaplus/download/${PV}/${P}.tar.xz"
@@ -56,11 +58,13 @@ BDEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-metainfo.patch"
+)
+
 src_prepare() {
 	default
-	if [[ ${PV} == 9999 ]] ; then
-		eautoreconf
-	fi
+	eautoreconf
 }
 
 src_configure() {
diff --git a/games-rpg/manaplus/manaplus-9999.ebuild b/games-rpg/manaplus/manaplus-9999.ebuild
index 3b6efa37c423..4682afacd0d7 100644
--- a/games-rpg/manaplus/manaplus-9999.ebuild
+++ b/games-rpg/manaplus/manaplus-9999.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="OpenSource 2D MMORPG client for Evol Online and The Mana World"
 HOMEPAGE="https://manaplus.org"
 if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/ManaPlus/ManaPlus.git"
+	EGIT_REPO_URI="https://gitlab.com/manaplus/manaplus.git"
 else
 	SRC_URI="http://download.evolonline.org/manaplus/download/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
@@ -64,7 +64,7 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--localedir=/usr/share/locale
+		--localedir="${EPREFIX}/usr/share/locale"
 		--without-internalsdlgfx
 		$(use_with mumble)
 		$(use_enable nls)
@@ -73,26 +73,27 @@ src_configure() {
 		$(use_with sdl2)
 		$(use_enable test unittests)
 	)
-	CONFIG_SHELL=/bin/bash econf "${myeconfargs[@]}"
+	CONFIG_SHELL="/bin/bash" econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
 
-	local destpath="/usr/share/${PN}"
-	dosym ../../../fonts/dejavu/DejaVuSans-Bold.ttf "${destpath}"/data/fonts/dejavusans-bold.ttf
-	dosym ../../../fonts/dejavu/DejaVuSans.ttf "${destpath}"/data/fonts/dejavusans.ttf
-	dosym ../../../fonts/dejavu/DejaVuSansMono-Bold.ttf "${destpath}"/data/fonts/dejavusansmono-bold.ttf
-	dosym ../../../fonts/dejavu/DejaVuSansMono.ttf "${destpath}"/data/fonts/dejavusansmono.ttf
-	dosym ../../../fonts/dejavu/DejaVuSerifCondensed-Bold.ttf "${destpath}"/data/fonts/dejavuserifcondensed-bold.ttf
-	dosym ../../../fonts/dejavu/DejaVuSerifCondensed.ttf "${destpath}"/data/fonts/dejavuserifcondensed.ttf
-	dosym ../../../fonts/liberation-fonts/LiberationMono-Bold.ttf "${destpath}"/data/fonts/liberationsansmono-bold.ttf
-	dosym ../../../fonts/liberation-fonts/LiberationMono-Regular.ttf "${destpath}"/data/fonts/liberationsansmono.ttf
-	dosym ../../../fonts/liberation-fonts/LiberationSans-Bold.ttf "${destpath}"/data/fonts/liberationsans-bold.ttf
-	dosym ../../../fonts/liberation-fonts/LiberationSans-Regular.ttf "${destpath}"/data/fonts/liberationsans.ttf
-	dosym ../../../fonts/mplus-outline-fonts/mplus-1p-bold.ttf "${destpath}"/data/fonts/mplus-1p-bold.ttf
-	dosym ../../../fonts/mplus-outline-fonts/mplus-1p-regular.ttf "${destpath}"/data/fonts/mplus-1p-regular.ttf
-	dosym ../../../fonts/wqy-microhei/wqy-microhei.ttc "${destpath}"/data/fonts/wqy-microhei.ttf
+	local srcpath="../../../fonts"
+	local destpath="/usr/share/${PN}/data/fonts"
+	dosym ${srcpath}/dejavu/DejaVuSans-Bold.ttf "${destpath}"/dejavusans-bold.ttf
+	dosym ${srcpath}/dejavu/DejaVuSans.ttf "${destpath}"/dejavusans.ttf
+	dosym ${srcpath}/dejavu/DejaVuSansMono-Bold.ttf "${destpath}"/dejavusansmono-bold.ttf
+	dosym ${srcpath}/dejavu/DejaVuSansMono.ttf "${destpath}"/dejavusansmono.ttf
+	dosym ${srcpath}/dejavu/DejaVuSerifCondensed-Bold.ttf "${destpath}"/dejavuserifcondensed-bold.ttf
+	dosym ${srcpath}/dejavu/DejaVuSerifCondensed.ttf "${destpath}"/dejavuserifcondensed.ttf
+	dosym ${srcpath}/liberation-fonts/LiberationMono-Bold.ttf "${destpath}"/liberationsansmono-bold.ttf
+	dosym ${srcpath}/liberation-fonts/LiberationMono-Regular.ttf "${destpath}"/liberationsansmono.ttf
+	dosym ${srcpath}/liberation-fonts/LiberationSans-Bold.ttf "${destpath}"/liberationsans-bold.ttf
+	dosym ${srcpath}/liberation-fonts/LiberationSans-Regular.ttf "${destpath}"/liberationsans.ttf
+	dosym ${srcpath}/mplus-outline-fonts/mplus-1p-bold.ttf "${destpath}"/mplus-1p-bold.ttf
+	dosym ${srcpath}/mplus-outline-fonts/mplus-1p-regular.ttf "${destpath}"/mplus-1p-regular.ttf
+	dosym ${srcpath}/wqy-microhei/wqy-microhei.ttc "${destpath}"/wqy-microhei.ttf
 }
 
 src_test() {