diff options
Diffstat (limited to 'x11-terms/kterm')
| -rw-r--r-- | x11-terms/kterm/Manifest | 2 | ||||
| -rw-r--r-- | x11-terms/kterm/kterm-6.2.0-r7.ebuild (renamed from x11-terms/kterm/kterm-6.2.0-r6.ebuild) | 53 |
2 files changed, 31 insertions, 24 deletions
diff --git a/x11-terms/kterm/Manifest b/x11-terms/kterm/Manifest index 05123cfcf242..84f54afd1f38 100644 --- a/x11-terms/kterm/Manifest +++ b/x11-terms/kterm/Manifest @@ -6,5 +6,5 @@ AUX kterm-underline.patch 467 BLAKE2B 5aa8a79a4262418f08d2618c3bc9a5ad2efaddba0c DIST kterm-6.2.0-wpi.patch.gz 6629 BLAKE2B 7a40d2305677cc8e8f7a0aba6c1a6ed2de19fac578a668719285a63f26c4b572e8b49e95e765f95a66ee54d485634acd9e685105ebb12503a23e5d2989adfd68 SHA512 b3ae44ce3a2a5ed7d08055c7b9a006844441c77727694ec1eb5f07752f745c8f1990ce23115070006999bd035fd934f09322bb6dc407f825f0da2b06a163faab DIST kterm-6.2.0.ext02.patch.gz 15290 BLAKE2B 031d59df558bbc8d6044a508542fe39b8e733df5964e6ba940be0914e376cf5f8e457028cfc9fbc2f8bb044babdffdb71ca6c43f246a74a781377c8a6c2a4dc1 SHA512 95b70f61496ed43dcbdda22b3250c651b3dbce07ef2209a7baec3f729ef954d6781dd5e18a5368d34792db4a3e310adec4fad5c05d3dfd211c0dc7f89c5ae356 DIST kterm-6.2.0.tar.gz 200448 BLAKE2B 99fa24b6fea6244df87e1ee052bd3368c8baab1271bc5530903c5b04dd0f5b531134f9d3721923a3d4c20fa8c84d01a22398b26c49d967e1a3aeabf1293f7350 SHA512 c84a5b57154dc14ab93e1bc6cd33103495716c203a648d57044672c4218cb7e4e80110f7e6e7c0900c80c2e55843ecb190de4f61d0c72dcf9b1ada306348ce1f -EBUILD kterm-6.2.0-r6.ebuild 1993 BLAKE2B 142e752c4da8255333a5f541ae7274b47b02c40363398996cd3701bae89198032f4dd132cd1d4b0d74abeb1796f323304b4fb7223270c5c235589958409ccdd9 SHA512 b621066e28534be3359ff3d650e32455f56ebedf341bb669078d8ea0cd81264fc55c7517b803b8a88a1ac5f7075dd34966ddaff2bb4d34b113096409bc5c15cf +EBUILD kterm-6.2.0-r7.ebuild 2199 BLAKE2B d12704f08b0f28382451c80edb40c3e932b7236b66ffc8cc54aee62a857d161ad69bef19ff22009603e324d5be7a4fcdd7ff384e98971aebeb82c9c378d1813d SHA512 7c7993eaf44872a0702ededa2fe07687605c1d478038c0505ef545ed9c31b3cd4163cce3300e63a46eb48a4ba347f8195a100d69b9687ba556252cdba4db3281 MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441 diff --git a/x11-terms/kterm/kterm-6.2.0-r6.ebuild b/x11-terms/kterm/kterm-6.2.0-r7.ebuild index 42d3f2717d3a..82a0e0e0ef31 100644 --- a/x11-terms/kterm/kterm-6.2.0-r6.ebuild +++ b/x11-terms/kterm/kterm-6.2.0-r7.ebuild @@ -1,12 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 -inherit flag-o-matic toolchain-funcs +inherit toolchain-funcs DESCRIPTION="Japanese Kanji X Terminal" -#HOMEPAGE="http://www.asahi-net.or.jp/~hc3j-tkg/kterm/" HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" SRC_URI="mirror://gentoo/${P}.tar.gz mirror://gentoo/${P}-wpi.patch.gz @@ -17,16 +16,21 @@ SLOT="0" KEYWORDS="-alpha amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="Xaw3d" -RDEPEND="app-text/rman +RDEPEND=" + app-text/rman sys-libs/ncurses:= x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libxkbfile - Xaw3d? ( x11-libs/libXaw3d )" -DEPEND="${RDEPEND} + Xaw3d? ( x11-libs/libXaw3d ) + !<games-board/xgammon-0.98-r3 + !<games-board/xscrabble-2.10-r4" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig x11-misc/gccmakedep - x11-misc/imake" + >=x11-misc/imake-1.0.8-r1" PATCHES=( "${WORKDIR}"/${P}-wpi.patch # wallpaper patch @@ -43,33 +47,36 @@ src_prepare() { } src_configure() { - xmkmf -a || die + CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ + IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die } src_compile() { - emake \ - CC="$(tc-getCC)" \ - CDEBUGFLAGS="${CFLAGS}" \ - LOCAL_LDFLAGS="${LDFLAGS}" \ - TERMCAPLIB="$("$(tc-getPKG_CONFIG)" --libs ncurses)" \ + local myemakeargs=( + CC="$(tc-getCC)" + CDEBUGFLAGS="${CFLAGS}" + LOCAL_LDFLAGS="${LDFLAGS}" + TERMCAPLIB="$("$(tc-getPKG_CONFIG)" --libs ncurses)" XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults" + ) + emake "${myemakeargs[@]}" } src_install() { - emake \ - BINDIR="${EPREFIX}/usr/bin" \ - XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults" \ - DESTDIR="${D}" \ - install + local myemakeargs=( + DESTDIR="${D}" + BINDIR="${EPREFIX}/usr/bin" + XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults" + ) + emake "${myemakeargs[@]}" install einstalldocs - # install man pages newman ${PN}.man ${PN}.1 - iconv -f ISO-2022-JP -t UTF-8 ${PN}.jman > ${PN}.ja.1 + iconv -f ISO-2022-JP -t UTF-8 ${PN}.jman > ${PN}.ja.1 || die doman ${PN}.ja.1 - # Remove link to avoid collision - rm -f "${ED}"/usr/lib/X11/app-defaults + # remove link to avoid collision (bug #668892,706322) + rm "${ED}"/usr/$(get_libdir)/X11/app-defaults || die } pkg_postinst() { |