Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/qkc/files/, app-i18n/qkc/
Date: Wed, 16 Sep 2020 11:41:09
Message-Id: 1600256427.5b66064e1089456501c8c8c64769e1930eeeea1d.soap@gentoo
1 commit: 5b66064e1089456501c8c8c64769e1930eeeea1d
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 16 11:40:27 2020 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 16 11:40:27 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b66064e
7
8 app-i18n/qkc: Port to EAPI 7
9
10 Closes: https://bugs.gentoo.org/742038
11 Package-Manager: Portage-3.0.7, Repoman-3.0.1
12 Signed-off-by: David Seifert <soap <AT> gentoo.org>
13
14 app-i18n/qkc/files/qkc-1.00-makefile.patch | 22 ++++++++++++++++++++++
15 app-i18n/qkc/qkc-1.00.ebuild | 14 ++++++--------
16 2 files changed, 28 insertions(+), 8 deletions(-)
17
18 diff --git a/app-i18n/qkc/files/qkc-1.00-makefile.patch b/app-i18n/qkc/files/qkc-1.00-makefile.patch
19 new file mode 100644
20 index 00000000000..ff9d1c97b92
21 --- /dev/null
22 +++ b/app-i18n/qkc/files/qkc-1.00-makefile.patch
23 @@ -0,0 +1,22 @@
24 +--- a/Makefile
25 ++++ b/Makefile
26 +@@ -1,18 +1,6 @@
27 + # Makefile for qkc
28 +
29 +-CC = cc
30 +-BIND = $(CC)
31 +-CFLAGS = -O
32 +-LFLAGS = -o qkc $(CFLAGS)
33 +-OBJ = qkc.o qkcopt.o qkchelp.o qkcconv.o qkctbl.o
34 +-
35 +-.c.o:
36 +- $(CC) $(CFLAGS) -c $<
37 +-
38 +-qkc: $(OBJ)
39 +- $(BIND) $(LFLAGS) $(OBJ)
40 +-
41 +-$(OBJ): qkc.h
42 ++qkc: qkcopt.o qkchelp.o qkcconv.o qkctbl.o
43 +
44 + clean:
45 + rm -f *.o qkc
46
47 diff --git a/app-i18n/qkc/qkc-1.00.ebuild b/app-i18n/qkc/qkc-1.00.ebuild
48 index b9877517dd4..164c0c12afa 100644
49 --- a/app-i18n/qkc/qkc-1.00.ebuild
50 +++ b/app-i18n/qkc/qkc-1.00.ebuild
51 @@ -1,7 +1,7 @@
52 # Copyright 1999-2020 Gentoo Authors
53 # Distributed under the terms of the GNU General Public License v2
54
55 -EAPI="4"
56 +EAPI=7
57
58 inherit toolchain-funcs
59
60 @@ -14,17 +14,15 @@ SRC_URI="http://hp.vector.co.jp/authors/VA000501/${MY_P}.zip"
61 LICENSE="freedist"
62 SLOT="0"
63 KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
64 -IUSE=""
65
66 -DEPEND="app-arch/unzip"
67 +BDEPEND="app-arch/unzip"
68 +
69 S="${WORKDIR}"
70
71 -src_prepare() {
72 - sed -i "/^LFLAGS/s:$: \${LDFLAGS}:" Makefile
73 -}
74 +PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
75
76 -src_compile() {
77 - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
78 +src_configure() {
79 + tc-export CC
80 }
81
82 src_install() {