From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DE3D4158086 for ; Sat, 6 Nov 2021 04:41:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 80FDDE08F3; Sat, 6 Nov 2021 04:41:40 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 39CFEE0905 for ; Sat, 6 Nov 2021 04:41:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0C7DC342BF5 for ; Sat, 6 Nov 2021 04:41:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 76EA8163 for ; Sat, 6 Nov 2021 04:41:35 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1636172940.eb9328fe3472b826a77241ffe6d01738cae2342e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-rpg/manaplus/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild games-rpg/manaplus/manaplus-9999.ebuild X-VCS-Directories: games-rpg/manaplus/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: eb9328fe3472b826a77241ffe6d01738cae2342e X-VCS-Branch: master Date: Sat, 6 Nov 2021 04:41:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 95a456ba-89af-4158-a8e1-dbe657a740d6 X-Archives-Hash: 8bcf8f3de8a94d07a875e9b6622467ab commit: eb9328fe3472b826a77241ffe6d01738cae2342e Author: Sam James gentoo org> AuthorDate: Sat Nov 6 04:29:00 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sat Nov 6 04:29:00 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb9328fe games-rpg/manaplus: drop unnecessary/incorrect src_test - 'make check' won't catch errors and the default src_test implementation works here for us anyway. - sync with live ebuild. Signed-off-by: Sam James gentoo.org> games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild | 58 ++++++++++++-------------- games-rpg/manaplus/manaplus-9999.ebuild | 10 ++--- 2 files changed, 30 insertions(+), 38 deletions(-) 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 a319f2a4328..c93acd1164d 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 4682afacd0d..c93acd1164d 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 -}