added more support for escape characters. thanks to OKUMURA N, Shin-ya (#104028)

Package-Manager: portage-2.1_pre4-r1

5 files changed, 125 insertions, 7 deletions

diff --git a/x11-terms/kterm/ChangeLog b/x11-terms/kterm/ChangeLog
index 2154a59d4ae9..286a96ee987e 100644
--- a/x11-terms/kterm/ChangeLog
+++ b/x11-terms/kterm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-terms/kterm
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/kterm/ChangeLog,v 1.18 2006/02/15 00:13:03 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/kterm/ChangeLog,v 1.19 2006/02/16 19:13:08 liquidx Exp $
+
+*kterm-6.2.0-r4 (16 Feb 2006)
+
+  16 Feb 2006; Alastair Tse <liquidx@gentoo.org>
+  +files/6.2.0-underline.patch, +kterm-6.2.0-r4.ebuild:
+  added more support for escape characters. thanks to OKUMURA N, Shin-ya
+  (#104028)
 
   15 Feb 2006; Luis Medinas <metalgod@gentoo.org> kterm-6.2.0-r3.ebuild:
   Added ~amd64 keyword.
diff --git a/x11-terms/kterm/Manifest b/x11-terms/kterm/Manifest
index 0364106a9de8..d9c451a3a330 100644
--- a/x11-terms/kterm/Manifest
+++ b/x11-terms/kterm/Manifest
@@ -1,15 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1da5bf155302aa8ff24d06de3ad40d07 ChangeLog 2637
-RMD160 865c140e55f4bf0b84282df23cd392adf76707d7 ChangeLog 2637
-SHA256 6394b553cf1ff7724577fdd1d8bfe5593a3de18ee93d57475b10a9a2cbbca30e ChangeLog 2637
+MD5 4e306559c3f34b30bad1018ce1800349 ChangeLog 2858
+RMD160 4ac48db078f1aa5b0889ef080b72503d5abc73cd ChangeLog 2858
+SHA256 2e2a915489b4770ac6a11f22cc001810d717cc06f1e96f4d2e7d129ed2c81b01 ChangeLog 2858
+MD5 d6502de9f8df5d2e7fd13e9b85e7720d files/6.2.0-underline.patch 540
+RMD160 1d410fd3187387cfc3f25288391b9873faa4a9e8 files/6.2.0-underline.patch 540
+SHA256 00198e2c7fa6f262821273a8ab1e1d598c5d1991a8edeb65991603d28215465b files/6.2.0-underline.patch 540
 MD5 a56faea61552cc728261f1021372c95d files/digest-kterm-6.2.0-r2 200
 RMD160 76cf72fc3629c73aef68d9eb80934bde8e964533 files/digest-kterm-6.2.0-r2 200
 SHA256 c3826cabda03b3f2b228cb2cbeeec926cc0bc6cb155cf825a9f48b3ad1e10650 files/digest-kterm-6.2.0-r2 200
 MD5 a56faea61552cc728261f1021372c95d files/digest-kterm-6.2.0-r3 200
 RMD160 76cf72fc3629c73aef68d9eb80934bde8e964533 files/digest-kterm-6.2.0-r3 200
 SHA256 c3826cabda03b3f2b228cb2cbeeec926cc0bc6cb155cf825a9f48b3ad1e10650 files/digest-kterm-6.2.0-r3 200
+MD5 1b6c09371ccf7164dbe927b5ec3930ae files/digest-kterm-6.2.0-r4 738
+RMD160 d356c696ed1745d135d4be359a9f3092361009ce files/digest-kterm-6.2.0-r4 738
+SHA256 b9d350e1d11a126bc622d0d24d5a3acd931787fdf7d2925dbe3060a3c430ed45 files/digest-kterm-6.2.0-r4 738
 MD5 2456d786b69d21ffb9ac133e8de1718b files/kterm-6.2.0-Xaw3d.patch 937
 RMD160 e967877091c41eb49c713c3726398c602acbb548 files/kterm-6.2.0-Xaw3d.patch 937
 SHA256 9753f060289e82b8a173cfdf8ec3e684dc539224efac8a85a8c668157f0a8879 files/kterm-6.2.0-Xaw3d.patch 937
@@ -28,13 +34,16 @@ SHA256 cd1420a2579289626ba239ee4238d5eb3959029f8730b99bbdc5b6ab33257c17 kterm-6.
 MD5 eba79edba2a5e8a0f8532231fd204c4b kterm-6.2.0-r3.ebuild 1798
 RMD160 7e3a0eec0031faa938f0ec72b4b8b4d48f58d36d kterm-6.2.0-r3.ebuild 1798
 SHA256 8afba7c344361bdb3bacf1dd14d08a77e3082f552341a3d9efd1dc216fb8df50 kterm-6.2.0-r3.ebuild 1798
+MD5 b897d4a91159bbdb381247dba98028ff kterm-6.2.0-r4.ebuild 1841
+RMD160 829c08eb2998d8818ba092f19066fdde59443b91 kterm-6.2.0-r4.ebuild 1841
+SHA256 659bf3eb9d5b4315e8962a30c38e6f1905f1fdf219c27518ead313cfe95d73be kterm-6.2.0-r4.ebuild 1841
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156
 SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 metadata.xml 156
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFD8nIkwUpWvClEHQoRAjwkAJ41KDNVrmxhli5BrHJwBQwoMQwG2wCfVy8Z
-x7f68CUsc3b9MFMb3Gk2HWo=
-=xGnP
+iD8DBQFD9M7q9ZFPrqoILX8RAj9kAKDFeJwy4ByaxFOSqlTsbQzSAHzYjACfQCJT
+YsuhVOgjtimWePxzkMa3Hng=
+=pYtk
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/kterm/files/6.2.0-underline.patch b/x11-terms/kterm/files/6.2.0-underline.patch
new file mode 100644
index 000000000000..5324c4cfa3f8
--- /dev/null
+++ b/x11-terms/kterm/files/6.2.0-underline.patch
@@ -0,0 +1,22 @@
+--- charproc.c.orig	2005-08-28 17:55:50.000000000 +0900
++++ charproc.c	2005-08-28 18:30:14.000000000 +0900
+@@ -1897,6 +1897,19 @@
+ 				 case 7:
+ 					term->flags |= INVERSE;
+ 					break;
++				 case 22:	/* Reset bold.		*/
++						/* ECMA-ly incorrect	*/
++					term->flags &= ~BOLD;
++					break;
++				 case 24:
++					term->flags &= ~UNDERLINE;
++					break;
++				 case 25:	/* Blink, really.	*/
++					term->flags &= ~BOLD;
++					break;
++				 case 27:
++					term->flags &= ~INVERSE;
++					break;
+ #ifdef KTERM_COLOR
+ 				 case 30:
+ 				 case 31:
diff --git a/x11-terms/kterm/files/digest-kterm-6.2.0-r4 b/x11-terms/kterm/files/digest-kterm-6.2.0-r4
new file mode 100644
index 000000000000..412217727714
--- /dev/null
+++ b/x11-terms/kterm/files/digest-kterm-6.2.0-r4
@@ -0,0 +1,9 @@
+MD5 9b7f06ce63fa06a656e45b752f8f6240 kterm-6.2.0-wpi.patch.gz 6629
+RMD160 8116e66d03b16b6c15e30071f7a992ce6fe0f06e kterm-6.2.0-wpi.patch.gz 6629
+SHA256 f91f37ef8b9bf84ebfb24b26b43089af25f9756680cbf875320fda774de2b591 kterm-6.2.0-wpi.patch.gz 6629
+MD5 f68251692cb979c0c3bb39fb26843ae8 kterm-6.2.0.ext02.patch.gz 15290
+RMD160 02746f8c23c876583dbc314fd38307ed96a1f446 kterm-6.2.0.ext02.patch.gz 15290
+SHA256 4501522c5632936b316ba820633cfa887192942e123a28b031d72b4d675c85eb kterm-6.2.0.ext02.patch.gz 15290
+MD5 9cc72841b50dfba92bce01dbbebf3039 kterm-6.2.0.tar.gz 200448
+RMD160 d23c755f119b5602a3c6f6ac97e27e10c43a8bfe kterm-6.2.0.tar.gz 200448
+SHA256 ecc965b926483cb97b74d1da5808359fac95d937dfa5e7338395988b1a3afaa5 kterm-6.2.0.tar.gz 200448
diff --git a/x11-terms/kterm/kterm-6.2.0-r4.ebuild b/x11-terms/kterm/kterm-6.2.0-r4.ebuild
new file mode 100644
index 000000000000..7c16642140dd
--- /dev/null
+++ b/x11-terms/kterm/kterm-6.2.0-r4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/kterm/kterm-6.2.0-r4.ebuild,v 1.1 2006/02/16 19:13:08 liquidx Exp $
+
+inherit eutils flag-o-matic
+
+IUSE="Xaw3d"
+
+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/"
+LICENSE="X11"
+SLOT="0"
+KEYWORDS="-alpha ~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="app-text/rman
+	sys-libs/ncurses
+	|| ( ( x11-libs/libXmu x11-libs/libXpm x11-libs/libxkbfile )
+	     virtual/x11 )
+	Xaw3d? ( x11-libs/Xaw3d )"
+
+src_unpack(){
+	unpack ${A}
+
+	cd ${S}
+	epatch ${WORKDIR}/${P}-wpi.patch		# wallpaper patch
+	epatch ${WORKDIR}/${P}.ext02.patch		# JIS 0213 support
+	epatch ${FILESDIR}/${P}-openpty.patch
+	epatch ${FILESDIR}/${P}-gentoo.patch
+	epatch ${FILESDIR}/${PN}-ad-gentoo.diff
+	epatch ${FILESDIR}/${PV}-underline.patch
+
+	if use Xaw3d ; then
+		epatch ${FILESDIR}/kterm-6.2.0-Xaw3d.patch
+	fi
+}
+
+src_compile(){
+	xmkmf -a || die
+	emake EXTRA_LDOPTIONS="$(bindnow-flags)" || die
+}
+
+src_install(){
+
+	einstall DESTDIR=${D} BINDIR=/usr/bin || die
+
+	# 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
+
+	dodoc README.kt
+}
+
+pkg_postinst() {
+	einfo
+	einfo "KTerm wallpaper support is enabled."
+	einfo "In order to use this feature,"
+	einfo "you need specify favourite xpm file with -wp option"
+	einfo
+	einfo "\t% kterm -wp filename.xpm"
+	einfo
+	einfo "or set it with X resource"
+	einfo
+	einfo "\tKTerm*wallPaper: /path/to/filename.xpm"
+	einfo
+}