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 DD8C3138359 for ; Thu, 1 Oct 2020 11:07:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 20292E08A8; Thu, 1 Oct 2020 11:07:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 051A6E08A8 for ; Thu, 1 Oct 2020 11:07:41 +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 94A8D340ADB for ; Thu, 1 Oct 2020 11:07:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 17948332 for ; Thu, 1 Oct 2020 11:07:39 +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: <1601550454.f6773157b4cafe701e3745087c99948737f2b65d.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-rpg/manaplus/files/, games-rpg/manaplus/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-rpg/manaplus/files/manaplus-1.9.3.23-metainfo.patch games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild games-rpg/manaplus/manaplus-1.9.3.23.ebuild X-VCS-Directories: games-rpg/manaplus/ games-rpg/manaplus/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: f6773157b4cafe701e3745087c99948737f2b65d X-VCS-Branch: master Date: Thu, 1 Oct 2020 11:07:39 +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: 524b8f9e-31c1-47da-a48a-1c045010643c X-Archives-Hash: 602c998f52d04e1c08aa466e2bbf5035 commit: f6773157b4cafe701e3745087c99948737f2b65d Author: Lars Wendler gentoo org> AuthorDate: Thu Oct 1 11:05:40 2020 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Oct 1 11:07:34 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6773157 games-rpg/manaplus: Revbump for appdata -> metainfo Bug: https://bugs.gentoo.org/739362 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Lars Wendler gentoo.org> .../files/manaplus-1.9.3.23-metainfo.patch | 38 ++++++++++++++++++++++ ...1.9.3.23.ebuild => manaplus-1.9.3.23-r1.ebuild} | 12 ++++--- 2 files changed, 46 insertions(+), 4 deletions(-) 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 00000000000..dd324e5da8b --- /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 +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 +--- + 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 similarity index 97% rename from games-rpg/manaplus/manaplus-1.9.3.23.ebuild rename to games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild index 85e22dbccd8..a319f2a4328 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() {