Gentoo Archives: gentoo-commits

From: "Andreas K. Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/xournalpp/
Date: Wed, 20 Jan 2021 21:37:44
Message-Id: 1611178650.0d82b105540296a86f20ad188eaa2018f0ec53fc.dilfridge@gentoo
1 commit: 0d82b105540296a86f20ad188eaa2018f0ec53fc
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 20 21:37:07 2021 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 20 21:37:30 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d82b105
7
8 app-text/xournalpp: Version bump
9
10 Package-Manager: Portage-3.0.12, Repoman-3.0.2
11 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
12
13 app-text/xournalpp/Manifest | 1 +
14 .../{xournalpp-9999.ebuild => xournalpp-1.0.20.ebuild} | 10 +++++++---
15 app-text/xournalpp/xournalpp-9999.ebuild | 6 +++---
16 3 files changed, 11 insertions(+), 6 deletions(-)
17
18 diff --git a/app-text/xournalpp/Manifest b/app-text/xournalpp/Manifest
19 index 7c0401e0f4e..e1652032186 100644
20 --- a/app-text/xournalpp/Manifest
21 +++ b/app-text/xournalpp/Manifest
22 @@ -1 +1,2 @@
23 DIST xournalpp-1.0.18.tgz 14892343 BLAKE2B d2aaede0e85d724cf8032f38a6fa2c3c4862f26d410dbab8264dd50ab8ee0d26889eeab433ef615fe9ce271710192eca380ff80149431d5368125926cf8d2b25 SHA512 90568a2674a18ff711ecef5f1a66ea1c5746d7f1fde271b36342d9bf48e096e63075cf7fd8b69e39e144273a4d1b922c415eee929eba94b2fa515a0bb481815a
24 +DIST xournalpp-1.0.20.tgz 14895705 BLAKE2B f1a4721f4f0b2f0e666c7466d7ddbd1f299172576d5f86b4ab8150d3bf05231cc7bb40e750394d892fe8ce32b6106e29456e3e9fa976b1bf07a808bf1bfff953 SHA512 c73783d5e40262b2c6f7f6be372839c73a19ab25fc258a7524660654526a3a35a6ba16ba282f793e7982ff97d006703c103fdd579fc16a3e636bf6daf94fe346
25
26 diff --git a/app-text/xournalpp/xournalpp-9999.ebuild b/app-text/xournalpp/xournalpp-1.0.20.ebuild
27 similarity index 84%
28 copy from app-text/xournalpp/xournalpp-9999.ebuild
29 copy to app-text/xournalpp/xournalpp-1.0.20.ebuild
30 index 7057d336d41..8d5be9b04fe 100644
31 --- a/app-text/xournalpp/xournalpp-9999.ebuild
32 +++ b/app-text/xournalpp/xournalpp-1.0.20.ebuild
33 @@ -1,9 +1,9 @@
34 -# Copyright 1999-2020 Gentoo Authors
35 +# Copyright 1999-2021 Gentoo Authors
36 # Distributed under the terms of the GNU General Public License v2
37
38 EAPI=7
39
40 -inherit cmake-utils xdg
41 +inherit cmake xdg
42
43 if [[ ${PV} == *9999 ]]; then
44 inherit git-r3
45 @@ -40,6 +40,10 @@ BDEPEND="
46 sys-apps/lsb-release
47 "
48
49 +PATCHES=(
50 + "${FILESDIR}/${PN}-1.0.18-nostrip.patch" # bug 745255
51 +)
52 +
53 src_prepare() {
54 - cmake-utils_src_prepare
55 + cmake_src_prepare
56 }
57
58 diff --git a/app-text/xournalpp/xournalpp-9999.ebuild b/app-text/xournalpp/xournalpp-9999.ebuild
59 index 7057d336d41..6ef5cab3894 100644
60 --- a/app-text/xournalpp/xournalpp-9999.ebuild
61 +++ b/app-text/xournalpp/xournalpp-9999.ebuild
62 @@ -1,9 +1,9 @@
63 -# Copyright 1999-2020 Gentoo Authors
64 +# Copyright 1999-2021 Gentoo Authors
65 # Distributed under the terms of the GNU General Public License v2
66
67 EAPI=7
68
69 -inherit cmake-utils xdg
70 +inherit cmake xdg
71
72 if [[ ${PV} == *9999 ]]; then
73 inherit git-r3
74 @@ -41,5 +41,5 @@ BDEPEND="
75 "
76
77 src_prepare() {
78 - cmake-utils_src_prepare
79 + cmake_src_prepare
80 }