gentoo resync : 02.04.2018

13 files changed, 245 insertions, 164 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 20d179cc2431..d5d51ff4a90e 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 83d249abbebc..21b177c4b926 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -2,7 +2,9 @@ AUX kitty-0.7.1-flags.patch 1514 BLAKE2B 1df4313bd4436200e114f9d9abadd6e160c34f2
 AUX kitty-0.7.1-svg-icon.patch 710 BLAKE2B 6377fe8ed9e344ba61881041d9eea72304f605ad633ac2d4ee68aebe363368c9a2b93c48297aca2e4edca14b7535c1a40c81f2dce4189bbeee563d7e6c23d6b7 SHA512 9f449cbc26cc8446425be0f5945e69cef49b4602f7578559d8ddc7456e4adb3afe1edf2c580eb009d1f2e3daa3f3b087c49b3e35a35e8a0a8fb7be584d5256af
 DIST kitty-0.8.2.tar.gz 3281308 BLAKE2B 6219dddc02e8b98b913356708fd2e398ad17aea97b0c539132b2333a736324d76136a6b6599b925424a8e7c578e9ef92b38ef5aa8ea5b42788731ecf19ad5e27 SHA512 4dabbce40a5fe0e54ac64b429baf3491ab492846f0f31b4b763c06c7aeba80a482bfd083419d3ddcd1bc267553458b719df82a2a179d90a88be3ce41a47d9897
 DIST kitty-0.8.3.tar.gz 3285120 BLAKE2B dcf47345f26beaaae5a63f122a3592c29a8ef2243406377ebb46fd44b9d8036f2f5493d7b1048195e12a7fb9874fce920ac52a0bb18e071e5e3db869691174d9 SHA512 b758a178b976d7dc133dd48bfafff5db8a373419a67206a8724695392c0654a9d5ba07867cbd6824afe1a5c013724d8472ab4087eae52c8bdb27843688b18968
+DIST kitty-0.8.4.tar.gz 3285125 BLAKE2B ad0e1b94caab2b572baabf8340dad703cf6e572494b938fd6941d053deaee9d628d652af9c542efee6ecc2fe71fd7c534595449cb25e50438276d4d0361a61d9 SHA512 1ed5b909f66abd113d643420fadf4034fe0af5b649c957590f0698c541e26d0d061a5d703b8e6220f4be826b2b9914ecb3559fc644eb41cb7cd4b9465030cd93
 EBUILD kitty-0.8.2-r1.ebuild 1713 BLAKE2B 34e80783bef14a24b48d843eb232aa8bb4b4db089789453973433cc5d702c12ba410c419e1d4f24f607c3fea483cbd42b1559cceffb227449dc4e1950e42fc52 SHA512 7290d0ccd2a5e72747a5a06f989bf58fb5489b85bf35c68b1572545a3edbdf6a17e7358107ef0eeb394f59546186998e8091eedae129d95eb6b4eee5c2cd3995
 EBUILD kitty-0.8.3.ebuild 1713 BLAKE2B 34e80783bef14a24b48d843eb232aa8bb4b4db089789453973433cc5d702c12ba410c419e1d4f24f607c3fea483cbd42b1559cceffb227449dc4e1950e42fc52 SHA512 7290d0ccd2a5e72747a5a06f989bf58fb5489b85bf35c68b1572545a3edbdf6a17e7358107ef0eeb394f59546186998e8091eedae129d95eb6b4eee5c2cd3995
+EBUILD kitty-0.8.4.ebuild 1713 BLAKE2B 34e80783bef14a24b48d843eb232aa8bb4b4db089789453973433cc5d702c12ba410c419e1d4f24f607c3fea483cbd42b1559cceffb227449dc4e1950e42fc52 SHA512 7290d0ccd2a5e72747a5a06f989bf58fb5489b85bf35c68b1572545a3edbdf6a17e7358107ef0eeb394f59546186998e8091eedae129d95eb6b4eee5c2cd3995
 EBUILD kitty-9999.ebuild 1713 BLAKE2B 34e80783bef14a24b48d843eb232aa8bb4b4db089789453973433cc5d702c12ba410c419e1d4f24f607c3fea483cbd42b1559cceffb227449dc4e1950e42fc52 SHA512 7290d0ccd2a5e72747a5a06f989bf58fb5489b85bf35c68b1572545a3edbdf6a17e7358107ef0eeb394f59546186998e8091eedae129d95eb6b4eee5c2cd3995
 MISC metadata.xml 428 BLAKE2B 961cd7fc3036c8f5a641cb97de57765c423f157430bf1fd68ce7febf24713ab1b15080e03f568d20f6360da467044ea4ed1d3ee7bfb132250951b4239df58980 SHA512 49ffa8dee6be29ab8adacbc0717dc574ad15f690fa1e0726b2a9de439f90867d3770e3628734d9a7457aa45896334d96f15a51e217ad248c766271aa62d85061
diff --git a/x11-terms/kitty/kitty-0.8.4.ebuild b/x11-terms/kitty/kitty-0.8.4.ebuild
new file mode 100644
index 000000000000..b51c9110b0ed
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.8.4.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit python-single-r1 toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/kovidgoyal/kitty/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
+HOMEPAGE="https://github.com/kovidgoyal/kitty"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug imagemagick wayland"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPS="
+	${PYTHON_DEPS}
+	>=media-libs/harfbuzz-1.5.0:=
+	sys-libs/zlib
+	media-libs/libpng:0=
+	media-libs/freetype:2
+	media-libs/fontconfig
+	x11-libs/libXcursor
+	x11-libs/libXrandr
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libxkbcommon[X]
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+	)
+"
+RDEPEND="
+	${COMMON_DEPS}
+	imagemagick? ( virtual/imagemagick-tools )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.1-flags.patch
+	"${FILESDIR}"/${PN}-0.7.1-svg-icon.patch
+)
+
+src_prepare() {
+	default
+
+	# disable wayland as required
+	if ! use wayland; then
+		sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
+	fi
+
+	tc-export CC
+}
+
+doecho() {
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	doecho "${EPYTHON}" setup.py --verbose $(usex debug --debug "") --libdir-name $(get_libdir) linux-package
+}
+
+src_test() {
+	export KITTY_CONFIG_DIRECTORY=${T}
+	"${EPYTHON}" test.py || die
+}
+
+src_install() {
+	mkdir -p "${ED}"usr || die
+	cp -r linux-package/* "${ED}usr" || die
+	python_fix_shebang "${ED}"
+
+	dodoc CHANGELOG.rst *.asciidoc
+}
diff --git a/x11-terms/kterm/Manifest b/x11-terms/kterm/Manifest
index 6228d0903610..8a900edca25a 100644
--- a/x11-terms/kterm/Manifest
+++ b/x11-terms/kterm/Manifest
@@ -1,10 +1,10 @@
-AUX 6.2.0-underline.patch 540 BLAKE2B 171627c3ad12657bbb5a9ff4645da8cc33ca410cc1758d6778b4291003ca01850c352bff54272d6a08fd543663ee6cc2368a433e73e682d74c3edf91389d8433 SHA512 cd4b0fc54c76fb184e2e3a71b575e6f1aa0f9c80129a16b0b35835e55d472329adba6c9638d1994f7fcc8d07e4daabe73c5e3f1b8f256939193fa7b20af54810
-AUX kterm-6.2.0-Xaw3d.patch 937 BLAKE2B ec18565e56c033b83916619b2c73bfb97f2a5eee7e16be15669b93cc6bbb0d97d2a33ce1d6d15000320b1971bfc4fb5967e5444c11da2d7668ba7c5a263c309b SHA512 2f4317cf668ad389cf887b619acc90666c08e621518e7640f33b20112a93c81382cf14d9161cbee6fe512689181f31e6edaac13a9181d82661ad6c43ffd7bf14
-AUX kterm-6.2.0-gentoo.patch 1519 BLAKE2B ad254e71c50dede31e01f7385d368de3298e9e81ba35afb31f246edcf61b2f3424903e248009aa199845f69acf843d277d4d8243405e771b639817c17b080055 SHA512 09de92db649ad2de751b269495922ee787aafde1b5f4b7875cfff37de9c5e4fe68756c24920b76225cd5afaffb651eab12c56ebda086fd7cb097ae551c4b07cb
-AUX kterm-6.2.0-openpty.patch 1734 BLAKE2B 87c218a287753d77c26c4f9c9aaa08bb29eb6c0babeeed400de2dc8a5f42a69a373f1e019984831f38b41a704d9c26d5c5bf4f56e2d60b27d7501ef276f68b86 SHA512 1d509e52a3355991116762e6a47005f5303c6db82f869a2ae15a03814ece17e94fe39a723cbc5c6b734980928a17a4f5fcb379fcc075112fec0a79dba1fa21df
-AUX kterm-ad-gentoo.diff 737 BLAKE2B 20e3ca1243200722855b3c5264f348a8ac103ad1d27a24d380a374201780469126c5731e306d141c3427bf49751e8e687d9bfcece5a302e24dff89846fa31524 SHA512 f156c3a4b4ec51bafc1ef0ce2f98dd82fa1c4599a489d3ab24cd07c8f76cfae9039577e61d520bf218156f82236404f6216d5d35d05f8ce3b832278d2f10595b
+AUX kterm-Xaw3d.patch 623 BLAKE2B eff442a01cdc6a246b8f57e447aa0e7e86d2bab410c1d31a371c400efe9c2e6a32fb36a5563340e974417916eef61be16a2a7e5dd102c9229d4826963d4eaadf SHA512 42fc65e39c35b1d59e5865683a2becdbe9bcd61e2aa1eda1b7a1b2518140ddf0c5964e86052ccef58efed2fcc9c79567cacbabdc199e26648872e29f1cb208ac
+AUX kterm-ad-gentoo.patch 664 BLAKE2B 8dc202050a16a5aa4a8158dc23be1d3e1d1abb618aa9bee562895ba0be2bbe387923f46fb036d316ddca51fa00ef39abe5a94ba1721f438cf2c28ea2a7efad0f SHA512 9e7868a6101a751e1f75e024e0df54b76e14d3a6b99fc7cee124640165dab7dbd9cfb70a1fe6755afd49d95a8b1bb7969cf073584f539f03c26ac57b01926b1f
+AUX kterm-gentoo.patch 907 BLAKE2B 81ed2b54eb61fe71fdae3060d7ba21ec1f7dadd4eae858165dcda810874900828334e3db497de304eeacaa6bd4e4ed099a8c6624d7145e5657a4a1fc940e225d SHA512 3f034670ae85a8169faef5ebdfc7fe432db3a0f91b44b1e4927a0979645647f7fd2fd346c04b89fce9b0a522f60f0e2f67b3ad9f0fa4c6385baa560daf5669a1
+AUX kterm-openpty.patch 1168 BLAKE2B 6177c71da92d87bbac0dea52398c3b86fca93c1d18d88d75086a5b9bc534ee4c19a605a928f2d53842ba5dcdbd4c6d0f44fd7e6e0bef15711d7cf42c1e075587 SHA512 80c4778fb9211161cfc1a7abcf7945b33470bf1b4e9d90a558350459e8c8690af724385fa0221ecf5bb92cfc2c20a60700c869222abe9c33b2d5b6691fe52a65
+AUX kterm-underline.patch 467 BLAKE2B 5aa8a79a4262418f08d2618c3bc9a5ad2efaddba0c24d0030d3a0f1bc06d06b756b69bf8d8f8d73e0bbb662c09104270c53a73c8b760670ea5f1d511a48c3026 SHA512 6b6b46219c36687f20af3a0964732396a8ce892188217531da386248596f97192e6d8d167a2cb746750d436d7d69ef751c68f14ed7ab75f1c1487c0a27b39fe6
 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-r5.ebuild 2126 BLAKE2B 88470535627f575f5c5825b918297c5481787038ece3cb9628b8e263f1f897730dc5eabecf1715e1077baf71b0eb1bee0a9f0a93c6b3bbbe5b3c3543695bde49 SHA512 a407636dfa516d0c3d2fc04bc778ba96f54fde538529286b3a0538c18d40a14658b87dc96f0bbbf1d576595d91778480b32839c3f49824a8006356a1b2bfa5a9
-MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
+EBUILD kterm-6.2.0-r6.ebuild 2017 BLAKE2B 2804e0e467b76fc3ce668b934954fad57403e2eb4a0aee782b036bca231c5a1a169dd5c2a348ef4b3abb5b67249123cefdf79a3823094c9fe4f68cbd0da3b2cf SHA512 765a4bb3e70a9c132d5008bea0b0bf88df7a67710e893a90f65f5cad853207f0a6b107dd325d9988061f35467483fda791d4fda2a54a0025cc3adf20a886ebbc
+MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/x11-terms/kterm/files/kterm-6.2.0-gentoo.patch b/x11-terms/kterm/files/kterm-6.2.0-gentoo.patch
deleted file mode 100644
index f05a0b135371..000000000000
--- a/x11-terms/kterm/files/kterm-6.2.0-gentoo.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Naur kterm-6.2.0/main.c kterm-6.2.0-gentoo/main.c
---- kterm-6.2.0/main.c	1996-07-12 14:01:38.000000000 +0900
-+++ kterm-6.2.0-gentoo/main.c	2002-05-21 08:37:31.000000000 +0900
-@@ -75,9 +75,12 @@
- #include <X11/Xos.h>
- #include <X11/cursorfont.h>
- #include <X11/Xaw/SimpleMenu.h>
-+/*
- #ifndef NO_XPOLL_H
- #include <X11/Xpoll.h>
- #endif
-+*/
-+#include <termios.h>
- #include <X11/Xlocale.h>
- #include <pwd.h>
- #include <ctype.h>
-@@ -283,7 +286,7 @@
- #include <lastlog.h>
- # endif
- #endif
--#include <sys/param.h>	/* for NOFILE */
-+//#include <sys/param.h>	/* for NOFILE */
- 
- #ifdef  PUCC_PTYD
- #include <local/openpty.h>
-diff -Naur kterm-6.2.0/screen.c kterm-6.2.0-gentoo/screen.c
---- kterm-6.2.0/screen.c	1996-06-23 17:00:26.000000000 +0900
-+++ kterm-6.2.0-gentoo/screen.c	2002-05-21 08:30:55.000000000 +0900
-@@ -46,7 +46,8 @@
- #include <sys/ptem.h>
- #endif
- 
--extern Char *calloc(), *malloc(), *realloc();
-+//extern Char *calloc(), *malloc(), *realloc();
-+extern void *calloc(), *malloc(), *realloc();
- extern void free();
- 
- ScrnBuf Allocate (nrow, ncol, addr)
-diff -Naur kterm-6.2.0/scrollbar.c kterm-6.2.0-gentoo/scrollbar.c
---- kterm-6.2.0/scrollbar.c	1996-07-12 14:01:39.000000000 +0900
-+++ kterm-6.2.0-gentoo/scrollbar.c	2002-05-21 08:30:39.000000000 +0900
-@@ -324,7 +324,8 @@
- 	register TScreen *screen = &xw->screen;
- 	register int border = 2 * screen->border;
- 	register int i;
--	Char *realloc(), *calloc();
-+//	Char *realloc(), *calloc();
-+	void *realloc(), *calloc();
- 
- 	if(screen->scrollbar)
- 		return;
diff --git a/x11-terms/kterm/files/kterm-6.2.0-Xaw3d.patch b/x11-terms/kterm/files/kterm-Xaw3d.patch
index cda8856a8cff..2b0192817735 100644
--- a/x11-terms/kterm/files/kterm-6.2.0-Xaw3d.patch
+++ b/x11-terms/kterm/files/kterm-Xaw3d.patch
@@ -1,6 +1,5 @@
-diff -Naur kterm-6.2.0/Imakefile kterm-6.2.0-Xaw3d/Imakefile
---- kterm-6.2.0/Imakefile	2003-12-13 15:35:05.000000000 +0900
-+++ kterm-6.2.0-Xaw3d/Imakefile	2003-12-13 23:10:24.000000000 +0900
+--- a/Imakefile
++++ b/Imakefile
 @@ -23,6 +23,10 @@
      PUCCPTYDDEF = -DPUCC_PTYD		/* does not need to be setuid */
           PTYLIB = -lpucc
@@ -12,9 +11,8 @@ diff -Naur kterm-6.2.0/Imakefile kterm-6.2.0-Xaw3d/Imakefile
  
   OSMAJORVERSION = OSMajorVersion
   OSMINORVERSION = OSMinorVersion
-diff -Naur kterm-6.2.0/kterm.h kterm-6.2.0-Xaw3d/kterm.h
---- kterm-6.2.0/kterm.h	2003-12-13 15:35:05.000000000 +0900
-+++ kterm-6.2.0-Xaw3d/kterm.h	2003-12-13 15:35:55.000000000 +0900
+--- a/kterm.h
++++ b/kterm.h
 @@ -36,6 +36,6 @@
  #define KTERM_KINPUT2	/* Kinput2 protocol */
  #define KTERM_COLOR	/* color sequence */
diff --git a/x11-terms/kterm/files/kterm-ad-gentoo.diff b/x11-terms/kterm/files/kterm-ad-gentoo.patch
index a502bac0eb73..b62fbc607b0d 100644
--- a/x11-terms/kterm/files/kterm-ad-gentoo.diff
+++ b/x11-terms/kterm/files/kterm-ad-gentoo.patch
@@ -1,5 +1,5 @@
---- KTerm.ad.orig	2004-01-07 06:25:15.000000000 +0900
-+++ KTerm.ad	2004-01-07 06:27:43.550017672 +0900
+--- a/KTerm.ad
++++ b/KTerm.ad
 @@ -125,3 +125,18 @@
  
  *VT100*translations: #override  Shift<Key>space: \
diff --git a/x11-terms/kterm/files/kterm-gentoo.patch b/x11-terms/kterm/files/kterm-gentoo.patch
new file mode 100644
index 000000000000..dda78137e9fd
--- /dev/null
+++ b/x11-terms/kterm/files/kterm-gentoo.patch
@@ -0,0 +1,43 @@
+--- a/main.c
++++ b/main.c
+@@ -75,9 +75,7 @@
+ #include <X11/Xos.h>
+ #include <X11/cursorfont.h>
+ #include <X11/Xaw/SimpleMenu.h>
+-#ifndef NO_XPOLL_H
+-#include <X11/Xpoll.h>
+-#endif
++#include <termios.h>
+ #include <X11/Xlocale.h>
+ #include <pwd.h>
+ #include <ctype.h>
+@@ -283,7 +281,6 @@
+ #include <lastlog.h>
+ # endif
+ #endif
+-#include <sys/param.h>	/* for NOFILE */
+ 
+ #ifdef  PUCC_PTYD
+ #include <local/openpty.h>
+--- a/screen.c
++++ b/screen.c
+@@ -46,7 +46,7 @@
+ #include <sys/ptem.h>
+ #endif
+ 
+-extern Char *calloc(), *malloc(), *realloc();
++extern void *calloc(), *malloc(), *realloc();
+ extern void free();
+ 
+ ScrnBuf Allocate (nrow, ncol, addr)
+--- a/scrollbar.c
++++ b/scrollbar.c
+@@ -324,7 +324,7 @@
+ 	register TScreen *screen = &xw->screen;
+ 	register int border = 2 * screen->border;
+ 	register int i;
+-	Char *realloc(), *calloc();
++	void *realloc(), *calloc();
+ 
+ 	if(screen->scrollbar)
+ 		return;
diff --git a/x11-terms/kterm/files/kterm-6.2.0-openpty.patch b/x11-terms/kterm/files/kterm-openpty.patch
index ee8bc1814ae0..0174b746e529 100644
--- a/x11-terms/kterm/files/kterm-6.2.0-openpty.patch
+++ b/x11-terms/kterm/files/kterm-openpty.patch
@@ -1,6 +1,5 @@
-diff -ru kterm-orig/Imakefile kterm-6.2.0/Imakefile
---- kterm-orig/Imakefile	2004-10-12 01:23:25.000000000 +0200
-+++ kterm-6.2.0/Imakefile	2004-10-12 01:37:59.100764752 +0200
+--- a/Imakefile
++++ b/Imakefile
 @@ -23,6 +23,11 @@
      PUCCPTYDDEF = -DPUCC_PTYD		/* does not need to be setuid */
           PTYLIB = -lpucc
@@ -13,9 +12,8 @@ diff -ru kterm-orig/Imakefile kterm-6.2.0/Imakefile
  
   OSMAJORVERSION = OSMajorVersion
   OSMINORVERSION = OSMinorVersion
-diff -ru kterm-orig/button.c kterm-6.2.0/button.c
---- kterm-orig/button.c	1996-07-02 07:01:46.000000000 +0200
-+++ kterm-6.2.0/button.c	2004-10-12 01:29:59.420687208 +0200
+--- a/button.c
++++ b/button.c
 @@ -41,8 +41,6 @@
  #include "error.h"
  #include "menu.h"
@@ -25,9 +23,8 @@ diff -ru kterm-orig/button.c kterm-6.2.0/button.c
  extern void DoSecureKeyboard();
  
  #define KeyState(x) (((x) & (ShiftMask|ControlMask)) + (((x) & Mod1Mask) ? 2 : 0))
-diff -ru kterm-orig/charproc.c kterm-6.2.0/charproc.c
---- kterm-orig/charproc.c	2004-10-12 01:23:25.000000000 +0200
-+++ kterm-6.2.0/charproc.c	2004-10-12 01:30:29.640093160 +0200
+--- a/charproc.c
++++ b/charproc.c
 @@ -102,8 +102,6 @@
  extern XtAppContext app_con;
  extern Widget toplevel;
@@ -37,9 +34,8 @@ diff -ru kterm-orig/charproc.c kterm-6.2.0/charproc.c
  extern fd_set Select_mask;
  extern fd_set X_mask;
  extern fd_set pty_mask;
-diff -ru kterm-orig/main.c kterm-6.2.0/main.c
---- kterm-orig/main.c	2004-10-12 01:23:25.000000000 +0200
-+++ kterm-6.2.0/main.c	2004-10-12 01:32:56.697737000 +0200
+--- a/main.c
++++ b/main.c
 @@ -143,6 +143,7 @@
  #define HAS_UTMP_UT_HOST
  #define LASTLOG
diff --git a/x11-terms/kterm/files/6.2.0-underline.patch b/x11-terms/kterm/files/kterm-underline.patch
index 5324c4cfa3f8..456b9f32c9dd 100644
--- a/x11-terms/kterm/files/6.2.0-underline.patch
+++ b/x11-terms/kterm/files/kterm-underline.patch
@@ -1,5 +1,5 @@
---- charproc.c.orig	2005-08-28 17:55:50.000000000 +0900
-+++ charproc.c	2005-08-28 18:30:14.000000000 +0900
+--- a/charproc.c
++++ b/charproc.c
 @@ -1897,6 +1897,19 @@
  				 case 7:
  					term->flags |= INVERSE;
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 b91eada35378..000000000000
--- a/x11-terms/kterm/kterm-6.2.0-r5.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2013 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"
-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="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}"/${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(){
-	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
-}
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 000000000000..f13a939ad24e
--- /dev/null
+++ b/x11-terms/kterm/kterm-6.2.0-r6.ebuild
@@ -0,0 +1,87 @@
+# 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/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 c921b96adf6c..6f2ca22da233 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>