Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/pep/, app-text/pep/files/
Date: Fri, 30 Sep 2022 21:11:58
Message-Id: 1664571216.536aafdb262b842fee410b96ae6a92adaf41d6a3.sam@gentoo
1 commit: 536aafdb262b842fee410b96ae6a92adaf41d6a3
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 30 20:52:42 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 30 20:53:36 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=536aafdb
7
8 app-text/pep: fix build w/ Clang 16
9
10 Closes: https://bugs.gentoo.org/871081
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 app-text/pep/files/pep-2.8-Fix-Wimplicit-int.patch | 18 ++++++++++++++++++
14 app-text/pep/pep-2.8-r2.ebuild | 9 +++++----
15 2 files changed, 23 insertions(+), 4 deletions(-)
16
17 diff --git a/app-text/pep/files/pep-2.8-Fix-Wimplicit-int.patch b/app-text/pep/files/pep-2.8-Fix-Wimplicit-int.patch
18 new file mode 100644
19 index 000000000000..724873090c1c
20 --- /dev/null
21 +++ b/app-text/pep/files/pep-2.8-Fix-Wimplicit-int.patch
22 @@ -0,0 +1,18 @@
23 +From: Sam James <sam@g.o>
24 +Date: Fri, 30 Sep 2022 21:51:17 +0100
25 +Subject: [PATCH] Fix -Wimplicit-int
26 +
27 +Fixes build with Clang 16.
28 +
29 +Bug: https://bugs.gentoo.org/871081
30 +--- a/main.c
31 ++++ b/main.c
32 +@@ -410,7 +410,7 @@ static void dofile(int eflage)
33 +
34 + /*---( main )---------------------------------------------------------------*/
35 +
36 +-main(int argc, char **argv)
37 ++int main(int argc, char **argv)
38 + {
39 + struct stat statbuf;
40 + unsigned int statype;
41
42 diff --git a/app-text/pep/pep-2.8-r2.ebuild b/app-text/pep/pep-2.8-r2.ebuild
43 index 288dacb2649b..6ef0fb385c28 100644
44 --- a/app-text/pep/pep-2.8-r2.ebuild
45 +++ b/app-text/pep/pep-2.8-r2.ebuild
46 @@ -1,13 +1,14 @@
47 -# Copyright 1999-2021 Gentoo Authors
48 +# Copyright 1999-2022 Gentoo Authors
49 # Distributed under the terms of the GNU General Public License v2
50
51 -EAPI=7
52 +EAPI=8
53
54 inherit toolchain-funcs flag-o-matic
55
56 DESCRIPTION="General purpose filter and file cleaning program"
57 HOMEPAGE="https://hannemyr.com/enjoy/pep.html"
58 SRC_URI="https://hannemyr.com/enjoy/${PN}${PV//./}.zip -> ${P}.zip"
59 +S="${WORKDIR}"
60
61 LICENSE="GPL-2"
62 SLOT="0"
63 @@ -15,17 +16,17 @@ KEYWORDS="amd64 ~mips ppc x86 ~x86-linux ~ppc-macos"
64
65 BDEPEND="app-arch/unzip"
66
67 -S=${WORKDIR}
68 -
69 # pep does not come with autoconf so here's a patch to configure
70 # Makefile with the correct path
71 PATCHES=(
72 "${FILESDIR}"/${P}-gentoo.patch
73 "${FILESDIR}"/${P}-include.patch
74 + "${FILESDIR}"/${P}-Fix-Wimplicit-int.patch
75 )
76
77 src_prepare() {
78 default
79 +
80 # Darwin lacks stricmp and DIRCHAR
81 if [[ ${CHOST} == *-darwin* ]] ; then
82 sed -i -e '/^OBJS/s/^\(.*\)$/\1 bdmg.o/' Makefile || die