Gentoo Archives: gentoo-commits

From: Akinori Hattori <hattya@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/zinnia/, app-i18n/zinnia/files/
Date: Wed, 03 Nov 2021 12:48:03
Message-Id: 1635943671.dac1e7a53f3c93cfed7cb0cec030be8ceb47233f.hattya@gentoo
1 commit: dac1e7a53f3c93cfed7cb0cec030be8ceb47233f
2 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
3 AuthorDate: Wed Nov 3 12:45:38 2021 +0000
4 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 3 12:47:51 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dac1e7a5
7
8 app-i18n/zinnia: update patches
9
10 Package-Manager: Portage-3.0.28, Repoman-3.0.3
11 Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
12
13 .../files/{zinnia-0.06-c++-2011.patch => zinnia-0.06-c++11.patch} | 4 ++--
14 app-i18n/zinnia/files/zinnia-0.06-flags.patch | 4 ++--
15 .../{zinnia-0.06-perl_build.patch => zinnia-0.06-perl.patch} | 4 ++--
16 app-i18n/zinnia/zinnia-0.06-r3.ebuild | 8 ++++----
17 4 files changed, 10 insertions(+), 10 deletions(-)
18
19 diff --git a/app-i18n/zinnia/files/zinnia-0.06-c++-2011.patch b/app-i18n/zinnia/files/zinnia-0.06-c++11.patch
20 similarity index 84%
21 rename from app-i18n/zinnia/files/zinnia-0.06-c++-2011.patch
22 rename to app-i18n/zinnia/files/zinnia-0.06-c++11.patch
23 index 0ef6ae40e43..66a78a5a699 100644
24 --- a/app-i18n/zinnia/files/zinnia-0.06-c++-2011.patch
25 +++ b/app-i18n/zinnia/files/zinnia-0.06-c++11.patch
26 @@ -1,5 +1,5 @@
27 ---- /trainer.cpp
28 -+++ /trainer.cpp
29 +--- a/trainer.cpp
30 ++++ b/trainer.cpp
31 @@ -103,7 +103,7 @@
32 if (!fn) {
33 return false;
34
35 diff --git a/app-i18n/zinnia/files/zinnia-0.06-flags.patch b/app-i18n/zinnia/files/zinnia-0.06-flags.patch
36 index 80442ee4880..5c26415f601 100644
37 --- a/app-i18n/zinnia/files/zinnia-0.06-flags.patch
38 +++ b/app-i18n/zinnia/files/zinnia-0.06-flags.patch
39 @@ -1,5 +1,5 @@
40 ---- /configure.in
41 -+++ /configure.in
42 +--- a/configure.in
43 ++++ b/configure.in
44 @@ -59,15 +59,6 @@
45 AC_SUBST([pkgconfigdir])
46 AC_MSG_NOTICE([pkgconfig directory is ${pkgconfigdir}])
47
48 diff --git a/app-i18n/zinnia/files/zinnia-0.06-perl_build.patch b/app-i18n/zinnia/files/zinnia-0.06-perl.patch
49 similarity index 86%
50 rename from app-i18n/zinnia/files/zinnia-0.06-perl_build.patch
51 rename to app-i18n/zinnia/files/zinnia-0.06-perl.patch
52 index 4da9e1eeb90..02d52faf93a 100644
53 --- a/app-i18n/zinnia/files/zinnia-0.06-perl_build.patch
54 +++ b/app-i18n/zinnia/files/zinnia-0.06-perl.patch
55 @@ -1,5 +1,5 @@
56 ---- /perl/Makefile.PL
57 -+++ /perl/Makefile.PL
58 +--- a/perl/Makefile.PL
59 ++++ b/perl/Makefile.PL
60 @@ -4,7 +4,7 @@
61 'CC' => 'c++',
62 'LD' => 'c++',
63
64 diff --git a/app-i18n/zinnia/zinnia-0.06-r3.ebuild b/app-i18n/zinnia/zinnia-0.06-r3.ebuild
65 index 70d37abf609..3dd317b48c5 100644
66 --- a/app-i18n/zinnia/zinnia-0.06-r3.ebuild
67 +++ b/app-i18n/zinnia/zinnia-0.06-r3.ebuild
68 @@ -1,4 +1,4 @@
69 -# Copyright 2010-2020 Gentoo Authors
70 +# Copyright 2010-2021 Gentoo Authors
71 # Distributed under the terms of the GNU General Public License v2
72
73 EAPI="6"
74 @@ -15,9 +15,9 @@ KEYWORDS="amd64 ~arm64 ~ppc64 x86"
75 IUSE="perl static-libs"
76
77 PATCHES=(
78 - "${FILESDIR}/${P}-flags.patch"
79 - "${FILESDIR}/${P}-perl_build.patch"
80 - "${FILESDIR}/${P}-c++-2011.patch"
81 + "${FILESDIR}"/${P}-c++11.patch
82 + "${FILESDIR}"/${P}-flags.patch
83 + "${FILESDIR}"/${P}-perl.patch
84 )
85
86 DOCS=(AUTHORS)