| 1 |
commit: 44227058ea66ca28d81e4133a3482cb73e871aef |
| 2 |
Author: Ionen Wolkens <sudinave <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Apr 15 18:23:04 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 16 04:46:56 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44227058 |
| 7 |
|
| 8 |
x11-terms/kterm: EAPI-7 bump, flag-o-matic drop, tidy |
| 9 |
|
| 10 |
Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com> |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
x11-terms/kterm/kterm-6.2.0-r7.ebuild | 40 ++++++++++++++++++----------------- |
| 14 |
1 file changed, 21 insertions(+), 19 deletions(-) |
| 15 |
|
| 16 |
diff --git a/x11-terms/kterm/kterm-6.2.0-r7.ebuild b/x11-terms/kterm/kterm-6.2.0-r7.ebuild |
| 17 |
index 7d388786579..82a0e0e0ef3 100644 |
| 18 |
--- a/x11-terms/kterm/kterm-6.2.0-r7.ebuild |
| 19 |
+++ b/x11-terms/kterm/kterm-6.2.0-r7.ebuild |
| 20 |
@@ -1,12 +1,11 @@ |
| 21 |
# Copyright 1999-2021 Gentoo Authors |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
|
| 24 |
-EAPI="6" |
| 25 |
+EAPI=7 |
| 26 |
|
| 27 |
-inherit flag-o-matic toolchain-funcs |
| 28 |
+inherit toolchain-funcs |
| 29 |
|
| 30 |
DESCRIPTION="Japanese Kanji X Terminal" |
| 31 |
-#HOMEPAGE="http://www.asahi-net.or.jp/~hc3j-tkg/kterm/" |
| 32 |
HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" |
| 33 |
SRC_URI="mirror://gentoo/${P}.tar.gz |
| 34 |
mirror://gentoo/${P}-wpi.patch.gz |
| 35 |
@@ -17,7 +16,8 @@ SLOT="0" |
| 36 |
KEYWORDS="-alpha amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" |
| 37 |
IUSE="Xaw3d" |
| 38 |
|
| 39 |
-RDEPEND="app-text/rman |
| 40 |
+RDEPEND=" |
| 41 |
+ app-text/rman |
| 42 |
sys-libs/ncurses:= |
| 43 |
x11-libs/libXaw |
| 44 |
x11-libs/libXmu |
| 45 |
@@ -26,11 +26,11 @@ RDEPEND="app-text/rman |
| 46 |
Xaw3d? ( x11-libs/libXaw3d ) |
| 47 |
!<games-board/xgammon-0.98-r3 |
| 48 |
!<games-board/xscrabble-2.10-r4" |
| 49 |
-DEPEND="${RDEPEND} |
| 50 |
+DEPEND="${RDEPEND}" |
| 51 |
+BDEPEND=" |
| 52 |
virtual/pkgconfig |
| 53 |
x11-misc/gccmakedep |
| 54 |
- >=x11-misc/imake-1.0.8-r1 |
| 55 |
-" |
| 56 |
+ >=x11-misc/imake-1.0.8-r1" |
| 57 |
|
| 58 |
PATCHES=( |
| 59 |
"${WORKDIR}"/${P}-wpi.patch # wallpaper patch |
| 60 |
@@ -52,25 +52,27 @@ src_configure() { |
| 61 |
} |
| 62 |
|
| 63 |
src_compile() { |
| 64 |
- emake \ |
| 65 |
- CC="$(tc-getCC)" \ |
| 66 |
- CDEBUGFLAGS="${CFLAGS}" \ |
| 67 |
- LOCAL_LDFLAGS="${LDFLAGS}" \ |
| 68 |
- TERMCAPLIB="$("$(tc-getPKG_CONFIG)" --libs ncurses)" \ |
| 69 |
+ local myemakeargs=( |
| 70 |
+ CC="$(tc-getCC)" |
| 71 |
+ CDEBUGFLAGS="${CFLAGS}" |
| 72 |
+ LOCAL_LDFLAGS="${LDFLAGS}" |
| 73 |
+ TERMCAPLIB="$("$(tc-getPKG_CONFIG)" --libs ncurses)" |
| 74 |
XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults" |
| 75 |
+ ) |
| 76 |
+ emake "${myemakeargs[@]}" |
| 77 |
} |
| 78 |
|
| 79 |
src_install() { |
| 80 |
- emake \ |
| 81 |
- BINDIR="${EPREFIX}/usr/bin" \ |
| 82 |
- XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults" \ |
| 83 |
- DESTDIR="${D}" \ |
| 84 |
- install |
| 85 |
+ local myemakeargs=( |
| 86 |
+ DESTDIR="${D}" |
| 87 |
+ BINDIR="${EPREFIX}/usr/bin" |
| 88 |
+ XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults" |
| 89 |
+ ) |
| 90 |
+ emake "${myemakeargs[@]}" install |
| 91 |
einstalldocs |
| 92 |
|
| 93 |
- # install man pages |
| 94 |
newman ${PN}.man ${PN}.1 |
| 95 |
- iconv -f ISO-2022-JP -t UTF-8 ${PN}.jman > ${PN}.ja.1 |
| 96 |
+ iconv -f ISO-2022-JP -t UTF-8 ${PN}.jman > ${PN}.ja.1 || die |
| 97 |
doman ${PN}.ja.1 |
| 98 |
|
| 99 |
# remove link to avoid collision (bug #668892,706322) |
Archives