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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 597731381F3 for ; Thu, 1 Oct 2020 09:59:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A09AE08F0; Thu, 1 Oct 2020 09:59:37 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 41D60E08F0 for ; Thu, 1 Oct 2020 09:59:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D93CA33BE66 for ; Thu, 1 Oct 2020 09:59:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8880526 for ; Thu, 1 Oct 2020 09:59:34 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1601546371.80bf7fd4245a65c07ac54d336b3b1854e3797734.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-rpg/manaplus/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-rpg/manaplus/manaplus-9999.ebuild X-VCS-Directories: games-rpg/manaplus/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 80bf7fd4245a65c07ac54d336b3b1854e3797734 X-VCS-Branch: master Date: Thu, 1 Oct 2020 09:59:34 +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: d1a40a57-d375-4706-8316-2f15b5524b4e X-Archives-Hash: 0a30d5141e3f9b1189e467ece520835a commit: 80bf7fd4245a65c07ac54d336b3b1854e3797734 Author: Lars Wendler gentoo org> AuthorDate: Thu Oct 1 08:53:56 2020 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Oct 1 09:59:31 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80bf7fd4 games-rpg/manaplus: Live ebuild adjustments - Respect prefix - Use primary git(lab) repo (not GitHub mirror) - Simplified symlink creation a bit Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Lars Wendler gentoo.org> games-rpg/manaplus/manaplus-9999.ebuild | 35 +++++++++++++++++---------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/games-rpg/manaplus/manaplus-9999.ebuild b/games-rpg/manaplus/manaplus-9999.ebuild index 3b6efa37c42..4682afacd0d 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() {