Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-rpg/manaplus/files/, games-rpg/manaplus/
Date: Thu, 01 Oct 2020 11:07:42
Message-Id: 1601550454.f6773157b4cafe701e3745087c99948737f2b65d.polynomial-c@gentoo
1 commit: f6773157b4cafe701e3745087c99948737f2b65d
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 1 11:05:40 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 1 11:07:34 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6773157
7
8 games-rpg/manaplus: Revbump for appdata -> metainfo
9
10 Bug: https://bugs.gentoo.org/739362
11 Package-Manager: Portage-3.0.8, Repoman-3.0.1
12 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
13
14 .../files/manaplus-1.9.3.23-metainfo.patch | 38 ++++++++++++++++++++++
15 ...1.9.3.23.ebuild => manaplus-1.9.3.23-r1.ebuild} | 12 ++++---
16 2 files changed, 46 insertions(+), 4 deletions(-)
17
18 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
19 new file mode 100644
20 index 00000000000..dd324e5da8b
21 --- /dev/null
22 +++ b/games-rpg/manaplus/files/manaplus-1.9.3.23-metainfo.patch
23 @@ -0,0 +1,38 @@
24 +From c8e83006fb78b5768de1e3e19993c91a29f5da6d Mon Sep 17 00:00:00 2001
25 +From: Lars Wendler <polynomial-c@g.o>
26 +Date: Thu, 1 Oct 2020 12:48:02 +0200
27 +Subject: [PATCH] Rename appdata to metainfo
28 +
29 +See https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html
30 +chapter 2.1.2 "Filesystem locations"
31 +
32 +Signed-off-by: Lars Wendler <polynomial-c@g.o>
33 +---
34 + Makefile.am | 4 ++--
35 + manaplus.appdata.xml => manaplus.metainfo.xml | 0
36 + 2 files changed, 2 insertions(+), 2 deletions(-)
37 + rename manaplus.appdata.xml => manaplus.metainfo.xml (100%)
38 +
39 +diff --git a/Makefile.am b/Makefile.am
40 +index 603cf8e16..70c6981be 100644
41 +--- a/Makefile.am
42 ++++ b/Makefile.am
43 +@@ -6,9 +6,9 @@ desktopdir = $(datarootdir)/applications
44 + desktop_DATA = manaplus.desktop \
45 + manaplustest.desktop
46 +
47 +-appdatadir = $(datarootdir)/appdata
48 ++appdatadir = $(datarootdir)/metainfo
49 +
50 +-appdata_DATA = manaplus.appdata.xml
51 ++appdata_DATA = manaplus.metainfo.xml
52 +
53 + # Extra files to include
54 + EXTRA_DIST = $(desktop_DATA) \
55 +diff --git a/manaplus.appdata.xml b/manaplus.metainfo.xml
56 +similarity index 100%
57 +rename from manaplus.appdata.xml
58 +rename to manaplus.metainfo.xml
59 +--
60 +2.28.0
61 +
62
63 diff --git a/games-rpg/manaplus/manaplus-1.9.3.23.ebuild b/games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild
64 similarity index 97%
65 rename from games-rpg/manaplus/manaplus-1.9.3.23.ebuild
66 rename to games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild
67 index 85e22dbccd8..a319f2a4328 100644
68 --- a/games-rpg/manaplus/manaplus-1.9.3.23.ebuild
69 +++ b/games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild
70 @@ -3,10 +3,12 @@
71
72 EAPI=7
73
74 +inherit autotools
75 +
76 DESCRIPTION="OpenSource 2D MMORPG client for Evol Online and The Mana World"
77 HOMEPAGE="https://manaplus.org"
78 if [[ ${PV} == 9999 ]] ; then
79 - inherit autotools git-r3
80 + inherit git-r3
81 EGIT_REPO_URI="https://github.com/ManaPlus/ManaPlus.git"
82 else
83 SRC_URI="http://download.evolonline.org/manaplus/download/${PV}/${P}.tar.xz"
84 @@ -56,11 +58,13 @@ BDEPEND="
85 virtual/pkgconfig
86 nls? ( sys-devel/gettext )"
87
88 +PATCHES=(
89 + "${FILESDIR}/${P}-metainfo.patch"
90 +)
91 +
92 src_prepare() {
93 default
94 - if [[ ${PV} == 9999 ]] ; then
95 - eautoreconf
96 - fi
97 + eautoreconf
98 }
99
100 src_configure() {