6 files changed, 95 insertions, 151 deletions
diff --git a/x11-terms/kterm/ChangeLog b/x11-terms/kterm/ChangeLog
index 03d4ada0a202..f71182a2eaa5 100644
--- a/x11-terms/kterm/ChangeLog
+++ b/x11-terms/kterm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-terms/kterm
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/kterm/ChangeLog,v 1.25 2008/02/06 22:05:37 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/kterm/ChangeLog,v 1.26 2008/06/20 18:01:50 matsuu Exp $
+
+*kterm-6.2.0-r5 (20 Jun 2008)
+
+  20 Jun 2008; MATSUU Takuto <matsuu@gentoo.org> -kterm-6.2.0-r2.ebuild,
+  -kterm-6.2.0-r3.ebuild, kterm-6.2.0-r4.ebuild, +kterm-6.2.0-r5.ebuild:
+  Fixed dependency, bug #227563. Removed bindnow-flags, bug #227031.
+  Removed old versions.
 
   06 Feb 2008; Fabian Groffen <grobian@gentoo.org> kterm-6.2.0-r2.ebuild:
   Dropped ppc-macos keyword, see you in prefix
diff --git a/x11-terms/kterm/Manifest b/x11-terms/kterm/Manifest
index 4e9d153cb52a..ad29bd9606ce 100644
--- a/x11-terms/kterm/Manifest
+++ b/x11-terms/kterm/Manifest
@@ -6,8 +6,7 @@ AUX kterm-ad-gentoo.diff 737 RMD160 1a3c32782bdd064d7a9c777117162e185caf4f6e SHA
 DIST kterm-6.2.0-wpi.patch.gz 6629 RMD160 8116e66d03b16b6c15e30071f7a992ce6fe0f06e SHA1 d3655dcbddc823748fd3371616cd854759fac9ca SHA256 f91f37ef8b9bf84ebfb24b26b43089af25f9756680cbf875320fda774de2b591
 DIST kterm-6.2.0.ext02.patch.gz 15290 RMD160 02746f8c23c876583dbc314fd38307ed96a1f446 SHA1 e94208009e8f18a7ecab4ffbaf9589e9c4632623 SHA256 4501522c5632936b316ba820633cfa887192942e123a28b031d72b4d675c85eb
 DIST kterm-6.2.0.tar.gz 200448 RMD160 d23c755f119b5602a3c6f6ac97e27e10c43a8bfe SHA1 23b612254e9f7c9f5e233a4bcacc651887a3f7ee SHA256 ecc965b926483cb97b74d1da5808359fac95d937dfa5e7338395988b1a3afaa5
-EBUILD kterm-6.2.0-r2.ebuild 1695 RMD160 060671f9639e3ac0622fea764477873dad0995ca SHA1 ff0aebf43727c6588b5be19d77ca7e7a51bed8ec SHA256 03b234b9fc04c72c02423622b7fabfbcdba596dd0e1bd4141dd56e20396299e2
-EBUILD kterm-6.2.0-r3.ebuild 1789 RMD160 79f42935b357a274297e2e1d37c2e65b6b41d0e8 SHA1 29980d2f4f3cb52c3a3e0c43679fcad57e40d048 SHA256 662ab3a0c1563c76e1ea07e69729d10d8ea62c2c7d93219b56eed3bddab4225e
-EBUILD kterm-6.2.0-r4.ebuild 2116 RMD160 1d06bce9ee2859c255ff32732b41e925f9cf6a4c SHA1 ebd3da5693357e84337b5682c1bf8d6ddc71de86 SHA256 a9f16aa4896585bd89a82cbe1ec7c4027df53e58a9fa82746352ef62e0c7a01a
-MISC ChangeLog 3768 RMD160 6604911673e45ead2b05d0fcf919033325023883 SHA1 a2510d4b5d3c964a63b3af933c49cc8f5321c2db SHA256 14536d02702ed35c912409466d0deef71f1154f1e4603a7c1a5575d31a4f892a
+EBUILD kterm-6.2.0-r4.ebuild 2129 RMD160 ba411dc3337420bc13652897d65a8d3a93eb5073 SHA1 60b9762406c13f373b8794d173e5efece2d4bad8 SHA256 3988815efe7eaf2ce1defc16ea39cd29fe48f79453f0debf162f7d61d6db84cb
+EBUILD kterm-6.2.0-r5.ebuild 2126 RMD160 673e1f5e55f9ff323f06605cd8da668b3f3623ad SHA1 ecfa9051d91a6ff2c13c4b5ea922b19063400e89 SHA256 92d95a028c8f7a74e6f674c4587df257662bec0462290e6f2950721db7e71b85
+MISC ChangeLog 4038 RMD160 e1173c71ae4a4130cf7c554ffff8b0bfd117876b SHA1 ee61244d5a02fa62de2b5ffa00960511f92f2061 SHA256 0852b00edeaa872f88fe34717b7bd9828932c9f6f797af33fb6feb867363dda9
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
diff --git a/x11-terms/kterm/kterm-6.2.0-r2.ebuild b/x11-terms/kterm/kterm-6.2.0-r2.ebuild
deleted file mode 100644
index 5747f8c41ade..000000000000
--- a/x11-terms/kterm/kterm-6.2.0-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2008 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-r2.ebuild,v 1.11 2008/02/06 22:05:37 grobian Exp $
-
-inherit eutils
-
-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="x86 ~sparc -alpha ppc"
-
-DEPEND="app-text/rman
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libxkbfile
-	x11-libs/libXaw
-	sys-libs/ncurses
-	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}-gentoo.patch
-	epatch ${FILESDIR}/${PN}-ad-gentoo.diff
-
-	if use Xaw3d ; then
-		epatch ${FILESDIR}/kterm-6.2.0-Xaw3d.patch
-	fi
-}
-
-src_compile(){
-
-	xmkmf -a || die
-	emake || 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
-}
diff --git a/x11-terms/kterm/kterm-6.2.0-r3.ebuild b/x11-terms/kterm/kterm-6.2.0-r3.ebuild
deleted file mode 100644
index d433d0d9dcbf..000000000000
--- a/x11-terms/kterm/kterm-6.2.0-r3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2007 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-r3.ebuild,v 1.8 2007/07/22 05:48:10 dberkholz 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
-	x11-libs/libXaw
-	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
-
-	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
-}
diff --git a/x11-terms/kterm/kterm-6.2.0-r4.ebuild b/x11-terms/kterm/kterm-6.2.0-r4.ebuild
index 0be6ef4c37e9..9351f7ed23cd 100644
--- a/x11-terms/kterm/kterm-6.2.0-r4.ebuild
+++ b/x11-terms/kterm/kterm-6.2.0-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.6 2007/07/22 05:48:10 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/kterm/kterm-6.2.0-r4.ebuild,v 1.7 2008/06/20 18:01:50 matsuu Exp $
 
 inherit eutils flag-o-matic
 
@@ -22,6 +22,7 @@ RDEPEND="app-text/rman
 	x11-libs/libXpm
 	x11-libs/libxkbfile
 	x11-libs/libXaw
+	x11-libs/libXp
 	Xaw3d? ( x11-libs/Xaw3d )"
 
 DEPEND="${RDEPEND}
diff --git a/x11-terms/kterm/kterm-6.2.0-r5.ebuild b/x11-terms/kterm/kterm-6.2.0-r5.ebuild
new file mode 100644
index 000000000000..60e7eb447632
--- /dev/null
+++ b/x11-terms/kterm/kterm-6.2.0-r5.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2008 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-r5.ebuild,v 1.1 2008/06/20 18:01:50 matsuu Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+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"
+
+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/Xaw3d )"
+
+DEPEND="${RDEPEND}
+	x11-misc/gccmakedep
+	x11-misc/imake"
+
+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 CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" LOCAL_LDFLAGS="${LDFLAGS}" \
+		XAPPLOADDIR=/etc/X11/app-defaults || die "emake failed"
+}
+
+src_install(){
+	emake DESTDIR="${D}" BINDIR=/usr/bin XAPPLOADDIR=/etc/X11/app-defaults install || 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
+
+	# Remove link to avoid collision
+	rm -f "${D}"/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
+}