gentoo resync : 13.11.2021

5 files changed, 32 insertions, 79 deletions

diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index bdbcc92e7650..d60ca6478a40 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/manaplus/Manifest b/games-rpg/manaplus/Manifest
index e70177a8cf48..9426da20ea21 100644
--- a/games-rpg/manaplus/Manifest
+++ b/games-rpg/manaplus/Manifest
@@ -1,5 +1,4 @@
-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-r1.ebuild 3242 BLAKE2B aa491a4d4a89d47cfdf5fae71616651899b7b880b65747d3e4345a2c5423999416ab05ba3288f89bc1035ab27be5b8395aa3acfd83c246c347e7f0328f8a0d33 SHA512 3276b30d1c522c35353826dff26696b9bc0afdd61ff26555f16520d783e718cf47b407cb733d74ad9d10c4503b21d9ce95b0014e75086e769523471565cafd8f
-EBUILD manaplus-9999.ebuild 3058 BLAKE2B aec84162569ccff174bb2515aeb3af38f8ce06f2aa61c984381d4c82a0d099aedffec1b42fa873992dddaaa39bce9c0946a46f3dfd1fb9466a89726c4b6b27cd SHA512 b0d7f1e664737a01d0198bd5804f50db5205abd6e6e24c77fa1e4d4e03616212f97d4b2b5de49293ceb33ff30c2f10dbc33a7808cd477ec968c81acd56eba475
+EBUILD manaplus-1.9.3.23-r1.ebuild 3040 BLAKE2B 32f452d1cc17a32764795e0dcb90de18d58758cf70ce0c4f6159fc4ef2b90a77335d3376a3f837260021e30cb75464ac18fa740ea492b0785ce7fc43adfc7310 SHA512 2fc46633da8711a484e8ef2836b8e86e954f82706ef7f8d010ef58f05def2466ec24d0483ee12f0f19b20712e989d54cbe785eabbc1150c6351f6ebd1461bb15
+EBUILD manaplus-9999.ebuild 3040 BLAKE2B 32f452d1cc17a32764795e0dcb90de18d58758cf70ce0c4f6159fc4ef2b90a77335d3376a3f837260021e30cb75464ac18fa740ea492b0785ce7fc43adfc7310 SHA512 2fc46633da8711a484e8ef2836b8e86e954f82706ef7f8d010ef58f05def2466ec24d0483ee12f0f19b20712e989d54cbe785eabbc1150c6351f6ebd1461bb15
 MISC metadata.xml 584 BLAKE2B 8a3a7aded808b8593f7433cc35bcdd676fc4240270df11a58ae92c80c56e97a8e9de9a3d1adb0ad112bc04360719cedfbb6ca66e498a30ba03af4be05c2224ff SHA512 cd328ace8a351048ab3be7120c8890bfeabaa554dcb6da59c4df7061b3faa0587f4256e3fa06e65f754bcdc20a33c5417f14990f8bc4d2f99e82394a4eeaeb6b
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
deleted file mode 100644
index dd324e5da8b4..000000000000
--- a/games-rpg/manaplus/files/manaplus-1.9.3.23-metainfo.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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-r1.ebuild b/games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild
index a319f2a43284..c93acd1164d1 100644
--- a/games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild
+++ b/games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 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 git-r3
-	EGIT_REPO_URI="https://github.com/ManaPlus/ManaPlus.git"
+	inherit autotools git-r3
+	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"
@@ -53,23 +51,21 @@ RDEPEND="
 		media-libs/sdl-net
 		media-libs/sdl-ttf
 	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
+DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-PATCHES=(
-	"${FILESDIR}/${P}-metainfo.patch"
-)
-
 src_prepare() {
 	default
-	eautoreconf
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautoreconf
+	fi
 }
 
 src_configure() {
 	local myeconfargs=(
-		--localedir="${EPREFIX}"/usr/share/locale
+		--localedir="${EPREFIX}/usr/share/locale"
 		--without-internalsdlgfx
 		$(use_with mumble)
 		$(use_enable nls)
@@ -78,28 +74,26 @@ src_configure() {
 		$(use_with sdl2)
 		$(use_enable test unittests)
 	)
-	CONFIG_SHELL="/bin/bash" econf "${myeconfargs[@]}"
+
+	CONFIG_SHELL="${BROOT}/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
-}
-
-src_test() {
-	make check
+	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
 }
diff --git a/games-rpg/manaplus/manaplus-9999.ebuild b/games-rpg/manaplus/manaplus-9999.ebuild
index 4682afacd0d7..c93acd1164d1 100644
--- a/games-rpg/manaplus/manaplus-9999.ebuild
+++ b/games-rpg/manaplus/manaplus-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -57,6 +57,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	default
+
 	if [[ ${PV} == 9999 ]] ; then
 		eautoreconf
 	fi
@@ -73,7 +74,8 @@ src_configure() {
 		$(use_with sdl2)
 		$(use_enable test unittests)
 	)
-	CONFIG_SHELL="/bin/bash" econf "${myeconfargs[@]}"
+
+	CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}"
 }
 
 src_install() {
@@ -95,7 +97,3 @@ src_install() {
 	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() {
-	make check
-}