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 A514D1382C5 for ; Sun, 17 Jan 2021 04:34:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B1A1AE084E; Sun, 17 Jan 2021 04:34:38 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 7B2DDE0844 for ; Sun, 17 Jan 2021 04:34:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 17E11340B4D for ; Sun, 17 Jan 2021 04:34:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 60A0A49F for ; Sun, 17 Jan 2021 04:34: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: <1610858070.259b6ae7fb5218399a999441ad7d3e9563ed8494.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest-data/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-strategy/megaglest-data/Manifest games-strategy/megaglest-data/megaglest-data-3.11.1.ebuild games-strategy/megaglest-data/megaglest-data-3.13.0.ebuild X-VCS-Directories: games-strategy/megaglest-data/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 259b6ae7fb5218399a999441ad7d3e9563ed8494 X-VCS-Branch: master Date: Sun, 17 Jan 2021 04:34: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: 5a668b18-884d-4595-addc-349526d9ab2c X-Archives-Hash: c9b75fbaf7423365992264dac66601aa commit: 259b6ae7fb5218399a999441ad7d3e9563ed8494 Author: Nils Freydank posteo de> AuthorDate: Thu Jan 14 16:39:57 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jan 17 04:34:30 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=259b6ae7 games-strategy/megaglest-data: Bump to 3.13.0 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Nils Freydank posteo.de> Signed-off-by: Sam James gentoo.org> games-strategy/megaglest-data/Manifest | 1 + ...-3.11.1.ebuild => megaglest-data-3.13.0.ebuild} | 28 +++++++--------------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/games-strategy/megaglest-data/Manifest b/games-strategy/megaglest-data/Manifest index d0d907962af..c8ded569f74 100644 --- a/games-strategy/megaglest-data/Manifest +++ b/games-strategy/megaglest-data/Manifest @@ -1 +1,2 @@ DIST megaglest-data-3.11.1.tar.xz 283383936 BLAKE2B d3c3d6c99f8b5f1360ecf72f69b47ce1ee1777019bdd8c2c0cfad8128a0ca07906a906be031526bcd255c5db3565bf4225a1170fdbcfc76819f65055d4d69c79 SHA512 a0ca22c2ba44992ce244c19f1bf3b19983a76520566286728ff4de4c14ef568aec3b166a2dde615b221d4cded8f2714b873a56fd58c1beebdc7120508ba0e357 +DIST megaglest-data-3.13.0.tar.xz 291190184 BLAKE2B 369dfb2f9a0271c686b77b4368043717b57e5863f8918afe3cc429c630ed79173c025ad0c5bad1e94949f4caf841b0e3c6706491a8534b829568c7d89ba97383 SHA512 ac6a6dd85ec2e45d3107549199251b504f128b8fc254b683c7d9c0841b86cd4c32cd45c9d3cbddc3f989bd965d61ef5a0dca9212431876c00a13f8398ff45f4c diff --git a/games-strategy/megaglest-data/megaglest-data-3.11.1.ebuild b/games-strategy/megaglest-data/megaglest-data-3.13.0.ebuild similarity index 53% rename from games-strategy/megaglest-data/megaglest-data-3.11.1.ebuild rename to games-strategy/megaglest-data/megaglest-data-3.13.0.ebuild index c10fa689e22..b96462b4fb9 100644 --- a/games-strategy/megaglest-data/megaglest-data-3.11.1.ebuild +++ b/games-strategy/megaglest-data/megaglest-data-3.13.0.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit cmake-utils games +EAPI=7 +inherit cmake MY_PN="megaglest" DESCRIPTION="Data files for the cross-platform 3D realtime strategy game MegaGlest" -HOMEPAGE="http://www.megaglest.org/" +HOMEPAGE="https://www.megaglest.org/" SRC_URI="https://github.com/MegaGlest/megaglest-data/releases/download/${PV}/megaglest-data-${PV}.tar.xz" LICENSE="CC-BY-SA-3.0" @@ -16,27 +16,17 @@ IUSE="doc" DOCS=( docs/AUTHORS.data.txt docs/CHANGELOG.txt docs/README.txt ) -S=${WORKDIR}/${MY_PN}-${PV} - -src_prepare() { - cmake-utils_src_prepare -} +S="${WORKDIR}/${MY_PN}-${PV}" src_configure() { + # See bug https://bugs.gentoo.org/709450. local mycmakeargs=( - -DMEGAGLEST_BIN_INSTALL_PATH="${GAMES_BINDIR}" - -DMEGAGLEST_DATA_INSTALL_PATH="${GAMES_DATADIR}/${MY_PN}" - -DMEGAGLEST_ICON_INSTALL_PATH="/usr/share/pixmaps" + -DMEGAGLEST_APPDATA_INSTALL_PATH=/usr/metainfo ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile + cmake_src_configure } src_install() { use doc && HTML_DOCS="docs/glest_factions/" - cmake-utils_src_install - prepgamesdirs + cmake_src_install }