* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kterm/
@ 2018-03-31 13:44 Akinori Hattori
0 siblings, 0 replies; 13+ messages in thread
From: Akinori Hattori @ 2018-03-31 13:44 UTC (permalink / raw
To: gentoo-commits
commit: c56da02f60f6d824813dda0bad892427cfdce4a8
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 31 13:30:52 2018 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Mar 31 13:30:52 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c56da02f
x11-terms/kterm: update HOMEPAGE and SRC_URI
Package-Manager: Portage-2.3.24, Repoman-2.3.6
x11-terms/kterm/kterm-6.2.0-r5.ebuild | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/x11-terms/kterm/kterm-6.2.0-r5.ebuild b/x11-terms/kterm/kterm-6.2.0-r5.ebuild
index efcdd8e8b17..34a187da468 100644
--- a/x11-terms/kterm/kterm-6.2.0-r5.ebuild
+++ b/x11-terms/kterm/kterm-6.2.0-r5.ebuild
@@ -6,11 +6,11 @@ EAPI=4
inherit eutils flag-o-matic toolchain-funcs
DESCRIPTION="Japanese Kanji X Terminal"
-SRC_URI="ftp://ftp.x.org/contrib/applications/${P}.tar.gz
- http://www.asahi-net.or.jp/~hc3j-tkg/kterm/${P}-wpi.patch.gz
- http://www.st.rim.or.jp/~hanataka/${P}.ext02.patch.gz"
-# until someone who reads japanese can find a better place
-HOMEPAGE="http://www.asahi-net.or.jp/~hc3j-tkg/kterm/"
+#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
+ mirror://gentoo/${P}.ext02.patch.gz"
LICENSE="MIT HPND XC"
SLOT="0"
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kterm/
@ 2018-03-31 13:44 Akinori Hattori
0 siblings, 0 replies; 13+ messages in thread
From: Akinori Hattori @ 2018-03-31 13:44 UTC (permalink / raw
To: gentoo-commits
commit: 9f83213cd5ea43ede3c74fc2c037c571431445c4
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 31 13:42:04 2018 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Mar 31 13:42:04 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f83213c
x11-terms/kterm: update to EAPI 6
Package-Manager: Portage-2.3.24, Repoman-2.3.6
x11-terms/kterm/kterm-6.2.0-r6.ebuild | 88 +++++++++++++++++++++++++++++++++++
x11-terms/kterm/metadata.xml | 8 ++--
2 files changed, 92 insertions(+), 4 deletions(-)
diff --git a/x11-terms/kterm/kterm-6.2.0-r6.ebuild b/x11-terms/kterm/kterm-6.2.0-r6.ebuild
new file mode 100644
index 00000000000..fd14facf722
--- /dev/null
+++ b/x11-terms/kterm/kterm-6.2.0-r6.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic 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
+ mirror://gentoo/${P}.ext02.patch.gz"
+
+LICENSE="MIT HPND XC"
+SLOT="0"
+KEYWORDS="-alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="Xaw3d"
+
+RDEPEND="app-text/rman
+ sys-libs/ncurses:=
+ x11-libs/libXaw
+ x11-libs/libXmu
+ x11-libs/libXp
+ x11-libs/libXpm
+ x11-libs/libxkbfile
+ Xaw3d? ( x11-libs/libXaw3d )"
+DEPEND="${RDEPEND}
+ x11-misc/gccmakedep
+ x11-misc/imake"
+
+PATCHES=(
+ "${WORKDIR}"/${P}-wpi.patch # wallpaper patch
+ "${WORKDIR}"/${P}.ext02.patch # JIS 0213 support
+ "${FILESDIR}"/${PN}-openpty.patch
+ "${FILESDIR}"/${PN}-gentoo.patch
+ "${FILESDIR}"/${PN}-ad-gentoo.patch
+ "${FILESDIR}"/${PN}-underline.patch
+)
+
+src_prepare(){
+ default
+ use Xaw3d && eapply "${FILESDIR}"/${PN}-Xaw3d.patch
+}
+
+src_configure() {
+ xmkmf -a || die
+}
+
+src_compile(){
+ emake \
+ CC="$(tc-getCC)" \
+ CDEBUGFLAGS="${CFLAGS}" \
+ LOCAL_LDFLAGS="${LDFLAGS} $("$(tc-getPKG_CONFIG)" --libs ncurses)" \
+ XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults"
+}
+
+src_install(){
+ emake \
+ BINDIR="${EPREFIX}/usr/bin" \
+ XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults" \
+ DESTDIR="${D}" \
+ install
+ einstalldocs
+
+ # install man pages
+ newman ${PN}.man ${PN}.1
+ insinto /usr/share/man/ja/man1
+ iconv -f ISO-2022-JP -t UTF-8 ${PN}.jman > ${PN}.ja.1
+ newins ${PN}.ja.1 ${PN}.1
+
+ # Remove link to avoid collision
+ rm -f "${ED}"/usr/lib/X11/app-defaults
+}
+
+pkg_postinst() {
+ elog
+ elog "KTerm wallpaper support is enabled."
+ elog "In order to use this feature,"
+ elog "you need specify favourite xpm file with -wp option"
+ elog
+ elog "\t% ${PN} -wp filename.xpm"
+ elog
+ elog "or set it with X resource"
+ elog
+ elog "\tKTerm*wallPaper: /path/to/filename.xpm"
+ elog
+}
diff --git a/x11-terms/kterm/metadata.xml b/x11-terms/kterm/metadata.xml
index c921b96adf6..6f2ca22da23 100644
--- a/x11-terms/kterm/metadata.xml
+++ b/x11-terms/kterm/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
-</maintainer>
+ <maintainer type="project">
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kterm/
@ 2018-03-31 13:44 Akinori Hattori
0 siblings, 0 replies; 13+ messages in thread
From: Akinori Hattori @ 2018-03-31 13:44 UTC (permalink / raw
To: gentoo-commits
commit: e85dc44664c62f661b9cf81199850d5357725af9
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 31 13:43:41 2018 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Mar 31 13:43:41 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e85dc446
x11-terms/kterm: drop unused x11-libs/libXp dependency
Closes: https://bugs.gentoo.org/649082
Package-Manager: Portage-2.3.24, Repoman-2.3.6
x11-terms/kterm/kterm-6.2.0-r6.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/x11-terms/kterm/kterm-6.2.0-r6.ebuild b/x11-terms/kterm/kterm-6.2.0-r6.ebuild
index fd14facf722..ad91d31e173 100644
--- a/x11-terms/kterm/kterm-6.2.0-r6.ebuild
+++ b/x11-terms/kterm/kterm-6.2.0-r6.ebuild
@@ -21,7 +21,6 @@ RDEPEND="app-text/rman
sys-libs/ncurses:=
x11-libs/libXaw
x11-libs/libXmu
- x11-libs/libXp
x11-libs/libXpm
x11-libs/libxkbfile
Xaw3d? ( x11-libs/libXaw3d )"
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kterm/
@ 2018-04-01 23:56 Matt Turner
0 siblings, 0 replies; 13+ messages in thread
From: Matt Turner @ 2018-04-01 23:56 UTC (permalink / raw
To: gentoo-commits
commit: 4a8736ba5a823b117a77c5ffc4352981c2f26226
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 1 23:50:57 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Apr 1 23:50:57 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a8736ba
x11-terms/kterm-6.2.0-r6: amd64 stable, bug 649082
x11-terms/kterm/kterm-6.2.0-r6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-terms/kterm/kterm-6.2.0-r6.ebuild b/x11-terms/kterm/kterm-6.2.0-r6.ebuild
index ad91d31e173..12e05be3866 100644
--- a/x11-terms/kterm/kterm-6.2.0-r6.ebuild
+++ b/x11-terms/kterm/kterm-6.2.0-r6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
LICENSE="MIT HPND XC"
SLOT="0"
-KEYWORDS="-alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="-alpha amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="Xaw3d"
RDEPEND="app-text/rman
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kterm/
@ 2018-04-01 23:56 Matt Turner
0 siblings, 0 replies; 13+ messages in thread
From: Matt Turner @ 2018-04-01 23:56 UTC (permalink / raw
To: gentoo-commits
commit: a6cdea0f065c40cf5e0cf6475a39a71795d32547
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 1 23:52:24 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Apr 1 23:52:32 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6cdea0f
x11-terms/kterm: Drop old
Closes: https://bugs.gentoo.org/649082
x11-terms/kterm/kterm-6.2.0-r5.ebuild | 77 -----------------------------------
1 file changed, 77 deletions(-)
diff --git a/x11-terms/kterm/kterm-6.2.0-r5.ebuild b/x11-terms/kterm/kterm-6.2.0-r5.ebuild
deleted file mode 100644
index 0cc9218fde1..00000000000
--- a/x11-terms/kterm/kterm-6.2.0-r5.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils flag-o-matic 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
- mirror://gentoo/${P}.ext02.patch.gz"
-
-LICENSE="MIT HPND XC"
-SLOT="0"
-KEYWORDS="-alpha amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="Xaw3d"
-
-RDEPEND="app-text/rman
- sys-libs/ncurses
- x11-libs/libXmu
- x11-libs/libXpm
- x11-libs/libxkbfile
- x11-libs/libXaw
- x11-libs/libXp
- Xaw3d? ( x11-libs/libXaw3d )"
-DEPEND="${RDEPEND}
- x11-misc/gccmakedep
- x11-misc/imake"
-
-src_prepare(){
- epatch "${WORKDIR}"/${P}-wpi.patch # wallpaper patch
- epatch "${WORKDIR}"/${P}.ext02.patch # JIS 0213 support
- epatch "${FILESDIR}"/${PN}-openpty.patch
- epatch "${FILESDIR}"/${PN}-gentoo.patch
- epatch "${FILESDIR}"/${PN}-ad-gentoo.patch
- epatch "${FILESDIR}"/${PN}-underline.patch
- use Xaw3d && epatch "${FILESDIR}"/${PN}-Xaw3d.patch
-}
-
-src_compile(){
- PKG_CONFIG=$(tc-getPKG_CONFIG)
- xmkmf -a || die
- emake CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \
- LOCAL_LDFLAGS="${LDFLAGS} $($PKG_CONFIG --libs ncurses)" \
- XAPPLOADDIR="${EPREFIX}"/usr/share/X11/app-defaults
-}
-
-src_install(){
- emake DESTDIR="${D}" BINDIR="${EPREFIX}"/usr/bin XAPPLOADDIR="${EPREFIX}"/usr/share/X11/app-defaults install
-
- # install man pages
- newman kterm.man kterm.1
- insinto /usr/share/man/ja/man1
- iconv -f ISO-2022-JP -t EUC-JP kterm.jman > kterm.ja.1
- newins kterm.ja.1 kterm.1
-
- # Remove link to avoid collision
- rm -f "${ED}"/usr/lib/X11/app-defaults
-
- dodoc README.kt
-}
-
-pkg_postinst() {
- elog
- elog "KTerm wallpaper support is enabled."
- elog "In order to use this feature,"
- elog "you need specify favourite xpm file with -wp option"
- elog
- elog "\t% kterm -wp filename.xpm"
- elog
- elog "or set it with X resource"
- elog
- elog "\tKTerm*wallPaper: /path/to/filename.xpm"
- elog
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kterm/
@ 2018-04-01 23:56 Matt Turner
0 siblings, 0 replies; 13+ messages in thread
From: Matt Turner @ 2018-04-01 23:56 UTC (permalink / raw
To: gentoo-commits
commit: 9c1fdbc7c33d7bf63799d3212e55cff352a771f9
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 1 23:51:00 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Apr 1 23:51:00 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c1fdbc7
x11-terms/kterm-6.2.0-r6: x86 stable, bug 649082
x11-terms/kterm/kterm-6.2.0-r6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-terms/kterm/kterm-6.2.0-r6.ebuild b/x11-terms/kterm/kterm-6.2.0-r6.ebuild
index 12e05be3866..f13a939ad24 100644
--- a/x11-terms/kterm/kterm-6.2.0-r6.ebuild
+++ b/x11-terms/kterm/kterm-6.2.0-r6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
LICENSE="MIT HPND XC"
SLOT="0"
-KEYWORDS="-alpha amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="-alpha amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="Xaw3d"
RDEPEND="app-text/rman
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kterm/
@ 2018-04-01 23:56 Matt Turner
0 siblings, 0 replies; 13+ messages in thread
From: Matt Turner @ 2018-04-01 23:56 UTC (permalink / raw
To: gentoo-commits
commit: 5770e7f42821955e22415de145619588fd5e71c0
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 1 23:51:27 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Apr 1 23:51:27 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5770e7f4
x11-terms/kterm-6.2.0-r6: Drop stable ppc keywords, bug 649082
x11-terms/kterm/kterm-6.2.0-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-terms/kterm/kterm-6.2.0-r5.ebuild b/x11-terms/kterm/kterm-6.2.0-r5.ebuild
index 34a187da468..0cc9218fde1 100644
--- a/x11-terms/kterm/kterm-6.2.0-r5.ebuild
+++ b/x11-terms/kterm/kterm-6.2.0-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
LICENSE="MIT HPND XC"
SLOT="0"
-KEYWORDS="-alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="-alpha amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="Xaw3d"
RDEPEND="app-text/rman
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kterm/
@ 2018-05-27 1:50 Akinori Hattori
0 siblings, 0 replies; 13+ messages in thread
From: Akinori Hattori @ 2018-05-27 1:50 UTC (permalink / raw
To: gentoo-commits
commit: 06bda2e208c8a29e60c48ec6e1e8427a17771f71
Author: Sławomir Nizio <slawomir.nizio <AT> sabayon <DOT> org>
AuthorDate: Thu Apr 26 20:01:04 2018 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun May 27 01:49:10 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06bda2e2
x11-terms/kterm: fix build with sys-libs/ncurses[tinfo]
Closes: https://bugs.gentoo.org/654146
Package-Manager: Portage-2.3.24, Repoman-2.3.6
x11-terms/kterm/kterm-6.2.0-r6.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/x11-terms/kterm/kterm-6.2.0-r6.ebuild b/x11-terms/kterm/kterm-6.2.0-r6.ebuild
index f13a939ad24..a4867bab0a4 100644
--- a/x11-terms/kterm/kterm-6.2.0-r6.ebuild
+++ b/x11-terms/kterm/kterm-6.2.0-r6.ebuild
@@ -50,7 +50,8 @@ src_compile(){
emake \
CC="$(tc-getCC)" \
CDEBUGFLAGS="${CFLAGS}" \
- LOCAL_LDFLAGS="${LDFLAGS} $("$(tc-getPKG_CONFIG)" --libs ncurses)" \
+ LOCAL_LDFLAGS="${LDFLAGS}" \
+ TERMCAPLIB="$("$(tc-getPKG_CONFIG)" --libs ncurses)" \
XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults"
}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kterm/
@ 2018-07-20 13:44 Akinori Hattori
0 siblings, 0 replies; 13+ messages in thread
From: Akinori Hattori @ 2018-07-20 13:44 UTC (permalink / raw
To: gentoo-commits
commit: 013d88aede625496a93adfec00504b5726377897
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 20 13:39:26 2018 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Fri Jul 20 13:39:26 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=013d88ae
x11-terms/kterm: tidy
Package-Manager: Portage-2.3.40, Repoman-2.3.9
x11-terms/kterm/kterm-6.2.0-r6.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/x11-terms/kterm/kterm-6.2.0-r6.ebuild b/x11-terms/kterm/kterm-6.2.0-r6.ebuild
index a4867bab0a4..f030178b8cd 100644
--- a/x11-terms/kterm/kterm-6.2.0-r6.ebuild
+++ b/x11-terms/kterm/kterm-6.2.0-r6.ebuild
@@ -65,9 +65,8 @@ src_install(){
# install man pages
newman ${PN}.man ${PN}.1
- insinto /usr/share/man/ja/man1
iconv -f ISO-2022-JP -t UTF-8 ${PN}.jman > ${PN}.ja.1
- newins ${PN}.ja.1 ${PN}.1
+ doman ${PN}.ja.1
# Remove link to avoid collision
rm -f "${ED}"/usr/lib/X11/app-defaults
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kterm/
@ 2021-04-15 6:39 Joonas Niilola
0 siblings, 0 replies; 13+ messages in thread
From: Joonas Niilola @ 2021-04-15 6:39 UTC (permalink / raw
To: gentoo-commits
commit: f218825807c87934ce211d5fa05721f01cbf53e8
Author: Ionen Wolkens <sudinave <AT> gmail <DOT> com>
AuthorDate: Wed Apr 14 14:28:05 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Apr 15 06:38:58 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2188258
x11-terms/kterm: fix build with -native-symlinks
Closes: https://bugs.gentoo.org/726244
Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
x11-terms/kterm/kterm-6.2.0-r6.ebuild | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/x11-terms/kterm/kterm-6.2.0-r6.ebuild b/x11-terms/kterm/kterm-6.2.0-r6.ebuild
index 8edbe912ce7..008593f2879 100644
--- a/x11-terms/kterm/kterm-6.2.0-r6.ebuild
+++ b/x11-terms/kterm/kterm-6.2.0-r6.ebuild
@@ -27,7 +27,7 @@ RDEPEND="app-text/rman
DEPEND="${RDEPEND}
virtual/pkgconfig
x11-misc/gccmakedep
- x11-misc/imake
+ >=x11-misc/imake-1.0.8-r1
"
PATCHES=(
@@ -45,7 +45,8 @@ src_prepare() {
}
src_configure() {
- xmkmf -a || die
+ CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+ IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die
}
src_compile() {
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kterm/
@ 2021-04-16 4:47 Sam James
0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2021-04-16 4:47 UTC (permalink / raw
To: gentoo-commits
commit: 44227058ea66ca28d81e4133a3482cb73e871aef
Author: Ionen Wolkens <sudinave <AT> gmail <DOT> com>
AuthorDate: Thu Apr 15 18:23:04 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 16 04:46:56 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44227058
x11-terms/kterm: EAPI-7 bump, flag-o-matic drop, tidy
Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-terms/kterm/kterm-6.2.0-r7.ebuild | 40 ++++++++++++++++++-----------------
1 file changed, 21 insertions(+), 19 deletions(-)
diff --git a/x11-terms/kterm/kterm-6.2.0-r7.ebuild b/x11-terms/kterm/kterm-6.2.0-r7.ebuild
index 7d388786579..82a0e0e0ef3 100644
--- a/x11-terms/kterm/kterm-6.2.0-r7.ebuild
+++ b/x11-terms/kterm/kterm-6.2.0-r7.ebuild
@@ -1,12 +1,11 @@
# 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,7 +16,8 @@ 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
@@ -26,11 +26,11 @@ RDEPEND="app-text/rman
Xaw3d? ( x11-libs/libXaw3d )
!<games-board/xgammon-0.98-r3
!<games-board/xscrabble-2.10-r4"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
virtual/pkgconfig
x11-misc/gccmakedep
- >=x11-misc/imake-1.0.8-r1
-"
+ >=x11-misc/imake-1.0.8-r1"
PATCHES=(
"${WORKDIR}"/${P}-wpi.patch # wallpaper patch
@@ -52,25 +52,27 @@ src_configure() {
}
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 (bug #668892,706322)
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kterm/
@ 2021-04-16 4:47 Sam James
0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2021-04-16 4:47 UTC (permalink / raw
To: gentoo-commits
commit: 2b541fdfe5df85dc7b55270d658404e53ffc735d
Author: Ionen Wolkens <sudinave <AT> gmail <DOT> com>
AuthorDate: Thu Apr 15 22:42:15 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 16 04:46:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b541fdf
x11-terms/kterm: revbump to fix the collision fix
Fix pre-existed to avoid collisions with games-board/xscrabble and
games-board/xgammon but didn't check for right libdir.
New revisions are able to coexist.
Closes: https://bugs.gentoo.org/668892
Closes: https://bugs.gentoo.org/706322
Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-terms/kterm/{kterm-6.2.0-r6.ebuild => kterm-6.2.0-r7.ebuild} | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/x11-terms/kterm/kterm-6.2.0-r6.ebuild b/x11-terms/kterm/kterm-6.2.0-r7.ebuild
similarity index 90%
rename from x11-terms/kterm/kterm-6.2.0-r6.ebuild
rename to x11-terms/kterm/kterm-6.2.0-r7.ebuild
index 008593f2879..7d388786579 100644
--- a/x11-terms/kterm/kterm-6.2.0-r6.ebuild
+++ b/x11-terms/kterm/kterm-6.2.0-r7.ebuild
@@ -23,7 +23,9 @@ RDEPEND="app-text/rman
x11-libs/libXmu
x11-libs/libXpm
x11-libs/libxkbfile
- Xaw3d? ( x11-libs/libXaw3d )"
+ Xaw3d? ( x11-libs/libXaw3d )
+ !<games-board/xgammon-0.98-r3
+ !<games-board/xscrabble-2.10-r4"
DEPEND="${RDEPEND}
virtual/pkgconfig
x11-misc/gccmakedep
@@ -71,8 +73,8 @@ src_install() {
iconv -f ISO-2022-JP -t UTF-8 ${PN}.jman > ${PN}.ja.1
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() {
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kterm/
@ 2022-09-30 11:02 Ionen Wolkens
0 siblings, 0 replies; 13+ messages in thread
From: Ionen Wolkens @ 2022-09-30 11:02 UTC (permalink / raw
To: gentoo-commits
commit: 7f04a2241960a2de4b91f9ae55e26cb1b4f81ae0
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 30 10:17:07 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 10:48:14 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f04a224
x11-terms/kterm: force gcc -E for imake's generation
Requires traditional cpp support and is broken in all sort of ways
with clang-cpp / -E. Can still use clang & friends for everything else.
Ideally these packages need to be built another way or last rited,
imake will just accumulate more problems.
wrt #873631, this only helps a bit and still has several clang issues.
Bug: https://bugs.gentoo.org/873631
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
x11-terms/kterm/kterm-6.2.0-r7.ebuild | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/x11-terms/kterm/kterm-6.2.0-r7.ebuild b/x11-terms/kterm/kterm-6.2.0-r7.ebuild
index 82a0e0e0ef31..5f674d0259b6 100644
--- a/x11-terms/kterm/kterm-6.2.0-r7.ebuild
+++ b/x11-terms/kterm/kterm-6.2.0-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -28,6 +28,7 @@ RDEPEND="
!<games-board/xscrabble-2.10-r4"
DEPEND="${RDEPEND}"
BDEPEND="
+ sys-devel/gcc
virtual/pkgconfig
x11-misc/gccmakedep
>=x11-misc/imake-1.0.8-r1"
@@ -48,7 +49,7 @@ src_prepare() {
src_configure() {
CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
- IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die
+ IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf -a || die
}
src_compile() {
^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2022-09-30 11:02 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-31 13:44 [gentoo-commits] repo/gentoo:master commit in: x11-terms/kterm/ Akinori Hattori
-- strict thread matches above, loose matches on Subject: below --
2018-03-31 13:44 Akinori Hattori
2018-03-31 13:44 Akinori Hattori
2018-04-01 23:56 Matt Turner
2018-04-01 23:56 Matt Turner
2018-04-01 23:56 Matt Turner
2018-04-01 23:56 Matt Turner
2018-05-27 1:50 Akinori Hattori
2018-07-20 13:44 Akinori Hattori
2021-04-15 6:39 Joonas Niilola
2021-04-16 4:47 Sam James
2021-04-16 4:47 Sam James
2022-09-30 11:02 Ionen Wolkens
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox