gentoo resync : 22.04.2018

16 files changed, 19 insertions, 357 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 27044dbff24a..4ff654382ccf 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/eterm/Manifest b/x11-terms/eterm/Manifest
index 51378fe69963..6d81bcdf2953 100644
--- a/x11-terms/eterm/Manifest
+++ b/x11-terms/eterm/Manifest
@@ -4,6 +4,6 @@ DIST Eterm-0.9.6.tar.gz 831756 BLAKE2B cd309f2bd74c44066d5811845c2cfe7407064186c
 DIST Eterm-bg-0.9.5.tar.gz 1883627 BLAKE2B eef174aa7734dc4795c76213468ae2465d5d484aee73d7d6a09e181547614b9ac23dd55b3991e1d5daa7defd65e91d40a0e01e7a44c64968e94fc6ace3ed18d6 SHA512 2d58d1342c7750f8dde93451b732cff3a0580d76635054632728cf2d8e5c5298732c855672981810cf21a8d1f5d46626abe1f35fbf33e2b713cc5d6bc82d10f8
 DIST Eterm-bg-0.9.6.tar.gz 1883627 BLAKE2B eef174aa7734dc4795c76213468ae2465d5d484aee73d7d6a09e181547614b9ac23dd55b3991e1d5daa7defd65e91d40a0e01e7a44c64968e94fc6ace3ed18d6 SHA512 2d58d1342c7750f8dde93451b732cff3a0580d76635054632728cf2d8e5c5298732c855672981810cf21a8d1f5d46626abe1f35fbf33e2b713cc5d6bc82d10f8
 EBUILD eterm-0.9.5.ebuild 1794 BLAKE2B 09c5d2701044052c9464253380d2e017369589bdde628cf1f745bbef25dac1f300e2aebf4e22881212384b68d180597c1d30bb77563ae8b0e68123bf8ede3864 SHA512 168196e0f14619982ca99e63bca7d697d7893189513a3974b6c903fb8f942e42a2eeb58cc172c512acd52a31094c1152359947995c695473f50d9d393f00076a
-EBUILD eterm-0.9.6-r1.ebuild 1507 BLAKE2B 7989fbe23c7023911a1c31ee4e06ae7444fe5e31b3d826bfa343bb62cdbff66d5f82ad389ab838431e1a6cec85746478d68bc21a14f7c2b444d2fe9d0c4a8e5d SHA512 5ed6792b2ba6657c567a484112b9e9274bbc982e591837a2e53ecbde655a0a7dddcbc602f09fea614eadb8a19d7799d2b7a6f6bdc91e2c1aaf53c71f2688c487
+EBUILD eterm-0.9.6-r1.ebuild 1506 BLAKE2B 2cff42846ba9b195b774a9a39d5647d026d21584708cfefb9091fa0c6d2645f9365657d2e2f524966743afdd5bcedb83087c4a0a19df081d5e54a53d282e0e09 SHA512 c18b450edc3e335a3fab582954a7428a65bfc9f1b12bfeeb47593d220f25d3fea011442f1b964413b2fc00809e018efb54e84bc88ae97d383bb76e0e057d44c0
 EBUILD eterm-9999.ebuild 1234 BLAKE2B 9d3f80e2a63823451b8ead0cba5340d02fbf5136fd01afd7aaee62a9afadf6fe0368bc5397161be77a6ca3315286ffbdb63010b7fa3363c320abfe7fd7eee573 SHA512 7a497ea960be119407540fc0a0f95ccee51135cf625b78c674e1045a056f8ae93543653084221f82d1531bdb0b0a58263706dcee9a957a9435ca882b3a1163ce
 MISC metadata.xml 812 BLAKE2B c3f47ef367d27e0ad69c54e22fdbda24d3673208561b9a7827f612d1d487e4ab2ffd05c02832b112ef8c599921bc3a59c3296b50874a2bf52218fc5dbf76f960 SHA512 86f0b751166e5ccf7de8e65a8acc6c74a189be1d692b9e470c9142a351de2f436a7e62237dea218d1e143b0a2e5423e419d194cbbc911a5e1f5787bf570aba7a
diff --git a/x11-terms/eterm/eterm-0.9.6-r1.ebuild b/x11-terms/eterm/eterm-0.9.6-r1.ebuild
index 6e087089db4e..ec3b7e7eeee5 100644
--- a/x11-terms/eterm/eterm-0.9.6-r1.ebuild
+++ b/x11-terms/eterm/eterm-0.9.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x86-macos"
 IUSE="escreen minimal cpu_flags_x86_mmx cpu_flags_x86_sse2 unicode +utempter"
 
 RDEPEND="
diff --git a/x11-terms/hanterm/Manifest b/x11-terms/hanterm/Manifest
deleted file mode 100644
index 3ad8af4e1446..000000000000
--- a/x11-terms/hanterm/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX Hanterm.gentoo 5617 BLAKE2B 4a25921b8584d8fdf4d387a48207010ed89b4647aee1a337bd3db3222e77e5a80055db84c225d7d7085c10c88b58c29883fc7d432964e6141ed3a764b967eee2 SHA512 f00c5e3a5b4e41f47a9f187d6db7825d672b48bbc7871e219ca3165c73e2fdb39bfd88b3332317435a343de35ed651159ff4fea82a39e3be90a97cfa7aac4f60
-AUX hanterm-3.1.6-gentoo.patch 1232 BLAKE2B fe6d994eafd2816d946b94d27015a03b777613dee440d982f53adb70265b93bb1efd79ba12889e64690c41495458de70de928c249ed1ce7db70ffd725a39417c SHA512 82f77d9da49e4e63c903c36e38c2819b1230f1c6bd8aa69a2b387f8e73f3fe9edcfe8eaf1fd358b8800d794fba3532b1fd734eeda877849d45cddbdfbd816adc
-AUX hanterm-3.1.6-utmp.patch 272 BLAKE2B 821dac63855c9c06fe13bf5f58573c98f901ce73939ad77fa8d953e63730438e25f4472978df9148307c29d6242c2ba982b6bc80a241e3fba9f56200a9982fe4 SHA512 59170ce59cf4ee2a9e4ad16c0288cb2e16652ef2f847cc4afd345773979ea6492df4f58789956d2d7342a4de83c9d90234360c9b97fbb26231ca3125e019d350
-DIST hanterm-3.1.6.tar.gz 323736 BLAKE2B fc6d874db720d4a22388075da60c31be2fd2a7d575f0a3b583597a2e592b131a60197b2930a8d78adf369a81b6508f69715fa90990c24a0fcdcaa59d02b2a4e8 SHA512 57ce81091bf60184b6b17e90c56b78f279da96d040bf9e8bf23c1ae2d0ae536486c31afe2f038a284883e3be0cf881ecaece8366d5069e1e43b4a49a5bcd7016
-EBUILD hanterm-3.1.6-r2.ebuild 1127 BLAKE2B b398f6b3dc388f88a7b676a56fda5b9e218fb703a4d2114e552ad423b4911cd4342d66cab41ca6af0d7a5852f1f4b87c7c0746cfd7d9d83f60da75378dc34df1 SHA512 c495ea4f3605da7654f524b7e294bbacb1ea607cd42969146bda707b609eec9b087ee4215f9eb7d4f8d374e89df137141677bea3d65b0e42d8847a454ea5b600
-EBUILD hanterm-3.1.6-r4.ebuild 1189 BLAKE2B 97932c1207f8435519548ef38812764ab15b69b1edf55850097085c20c972ef1447b2400b11fe3d27e7edaf07d0bbc5024b6d43202c0de7fa54beea5ad6502d6 SHA512 57a58072a5329d9c23aa1b44db7d6c12496bf17d43546ac94a9bc3b8071d1ff604c6717fd3b9eceb542ff96236066b15f1371a54c99ece5d923097d79ff1e4bc
-MISC metadata.xml 325 BLAKE2B cbe12204dcc185328649cda2e60682ba37adf463f11c09d96b60d4a4d1274c3c6a01446f745b23f9b7ccefb548784e302d29004697b7a08b82172eb41db991a6 SHA512 8e7927390eb1e722bbb0c26630b08cc0dd6a7c9ce2d8ac24b3c3ae8981db1acc0eab803ecb1e6b64bf833dcb797b6596eb8ad2d5513412f91b8f9ff4c35cc25b
diff --git a/x11-terms/hanterm/files/Hanterm.gentoo b/x11-terms/hanterm/files/Hanterm.gentoo
deleted file mode 100644
index a71aa96f04c0..000000000000
--- a/x11-terms/hanterm/files/Hanterm.gentoo
+++ /dev/null
@@ -1,156 +0,0 @@
-!!!!! 3.1.6¿¡¼­ Ãß°¡µÈ ¿É¼Ç
-
-! ÇÑ±Û ÀÚÆÇ Á¾·ù. ±âº»°ªÀº 2.
-! 2 : µÎ¹ú½Ä  391 ¶Ç´Â 3FINAL : ¼¼¹ú½Ä ÃÖÁ¾  3 ¶Ç´Â 390 : ¼¼¹ú½Ä 390
-!Hanterm*hangulKeyboard: 3FINAL
-
-! ÇÑ±Û ÄÚµå Ç¥½Ã. ±âº»°ªÀº true.
-!Hanterm*showCodeStatus: false
-
-! ÇÑ±Û ÀÚÆÇ Á¾·ù Ç¥½ÃÇÒ °ÍÀÎÁö. ±âº»°ªÀº true.
-!Hanterm*showHanKbdLayout: false
-
-! ¿µ¹® ±Û²Ã°ú ÇÑ±Û ±Û²Ã baselineÀ» ¸ÂÃâ °ÍÀÎÁö °áÁ¤. ±âº»°ªÀº true.
-! trueÀÎ °æ¿ì ÆùÆ® Á¤º¸´ë·Î Ãâ·Â. ⠾Ʒ¡À§ Å©±â°¡ Ä¿Áü.
-! falseÀÎ °æ¿ì ÆùÆ® Á¤º¸¸¦ ¹«½ÃÇÔ. ⠾Ʒ¡À§ Å©±â°¡ ÀÛ¾ÆÁü.
-!Hanterm*keepBaseLine: false
-
-!!!!! 3.1.5¿¡¼­ Ãß°¡µÈ ¿É¼Ç
-! Dvorak ÀÚÆÇ ·¹À̾ƿô »ç¿ëÇÒ °ÍÀÎÁö¸¦ °áÁ¤. ±âº»°ªÀº false
-!Hanterm*useDvorakLayout: true
-
-!!!!! 3.1.4 ÀÌÀüºÎÅÍ ÀÖ´ø ¿É¼Ç
-
-!!!!! Font Setting
-!Hanterm*Font: -schumacher-clean-bold-r-normal--16-160-75-75-c-80-*
-!Hanterm*hangulFont: -kaist-iyagi-bold-r-normal--16-160-75-75-c-160-johabsh-1
-
-!!!!! Gentoo Linux Setting ----------------------------------------------------
-Hanterm*Font: -*-lucidatypewriter-medium-r-normal-sans-12-120-*-*-*-70-iso8859-1
-Hanterm*hangulFont: -*-gulim-medium-r-normal--14-140-75-75-*-140-ksx1001.1998-0
-
-Hanterm*title: Hangul Terminal - Hanterm
-Hanterm*iconName: Hangul Terminal - Hanterm
-Hanterm*nowChatScroll: true
-
-Hanterm*VT100.Translations: #override\n\
-        <KeyPress>      Hangul:                toggle-hangul()\n\
-       <KeyPress>      Hangul_Hanja:   hanja-input()\n\
-       <Btn4Down>:                     scroll-back(5,line) \n\
-       <Btn5Down>:                     scroll-forw(5,line)\n
-
-Hanterm*background: black
-Hanterm*foreground: white
-Hanterm*vt100.cursorColor:  #FFFF99
-Hanterm*SimpleMenu*background:  #CCCCCC
-Hanterm*SimpleMenu*foreground:  #000000
-
-Hanterm*international: True
-Hanterm*eightBitInput: False
-
-! VGA Setting by jjack@dreamwiz.com
-Hanterm*VT100*color0: #000000
-Hanterm*VT100*color1: #993333
-Hanterm*VT100*color2: #339933
-Hanterm*VT100*color3: #999933
-Hanterm*VT100*color4: #333399
-Hanterm*VT100*color5: #993399
-Hanterm*VT100*color6: #339999
-Hanterm*VT100*color7: #CCCCCC
-Hanterm*VT100*color8: #666666
-Hanterm*VT100*color9: #FF9999
-Hanterm*VT100*color10: #99FF99
-Hanterm*VT100*color11: #FFFF99
-Hanterm*VT100*color12: #9999FF
-Hanterm*VT100*color13: #FF99FF
-Hanterm*VT100*color14: #99FFFF
-Hanterm*VT100*color15: #FFFFFF
-
-Hanterm*VT100*colorBD: yellow
-!!!!! Gentoo Linux Setting ----------------------------------------------------
-
-Hanterm*SimpleMenu*BackingStore: NotUseful
-Hanterm*SimpleMenu*menuLabel.font: -adobe-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-*
-Hanterm*SimpleMenu*menuLabel.vertSpace: 	100
-Hanterm*SimpleMenu*HorizontalMargins: 16
-Hanterm*SimpleMenu*Sme.height:	16
-
-Hanterm*SimpleMenu*Cursor: left_ptr
-Hanterm*mainMenu.Label:  Main Options
-Hanterm*mainMenu*securekbd*Label:  Secure Keyboard
-Hanterm*mainMenu*allowsends*Label:  Allow SendEvents
-Hanterm*mainMenu*logging*Label:  Log to File
-Hanterm*mainMenu*redraw*Label:  Redraw Window
-Hanterm*mainMenu*suspend*Label:  Send STOP Signal
-Hanterm*mainMenu*continue*Label:  Send CONT Signal
-Hanterm*mainMenu*interrupt*Label:  Send INT Signal
-Hanterm*mainMenu*hangup*Label:  Send HUP Signal
-Hanterm*mainMenu*terminate*Label:  Send TERM Signal
-Hanterm*mainMenu*kill*Label:  Send KILL Signal
-Hanterm*mainMenu*quit*Label:  Quit
-
-Hanterm*vtMenu.Label:  VT Options
-Hanterm*vtMenu*scrollbar*Label:  Enable Scrollbar
-Hanterm*vtMenu*jumpscroll*Label:  Enable Jump Scroll
-Hanterm*vtMenu*reversevideo*Label:  Enable Reverse Video
-Hanterm*vtMenu*autowrap*Label:  Enable Auto Wraparound
-Hanterm*vtMenu*reversewrap*Label:  Enable Reverse Wraparound
-Hanterm*vtMenu*autolinefeed*Label:  Enable Auto Linefeed
-Hanterm*vtMenu*appcursor*Label:  Enable Application Cursor Keys
-Hanterm*vtMenu*appkeypad*Label:  Enable Application Keypad
-Hanterm*vtMenu*scrollkey*Label:  Scroll to Bottom on Key Press
-Hanterm*vtMenu*scrollttyoutput*Label:  Scroll to Bottom on Tty Output
-Hanterm*vtMenu*allow132*Label: Allow 80/132 Column Switching
-Hanterm*vtMenu*cursesemul*Label:  Enable Curses Emulation
-Hanterm*vtMenu*visualbell*Label:  Enable Visual Bell
-Hanterm*vtMenu*marginbell*Label:  Enable Margin Bell
-Hanterm*vtMenu*altscreen*Label:  Show Alternate Screen
-Hanterm*vtMenu*softreset*Label:  Do Soft Reset
-Hanterm*vtMenu*hardreset*Label:  Do Full Reset
-Hanterm*vtMenu*clearsavedlines*Label:  Reset and Clear Saved Lines
-
-Hanterm*fontMenu.Label:  VT Fonts
-Hanterm*fontMenu*fontdefault*Label:	Default
-Hanterm*fontMenu*font1*Label:	Unreadable
-Hanterm*VT100*font1:		nil2
-Hanterm*fontMenu*font2*Label:	Tiny
-Hanterm*VT100*font2:		5x7
-Hanterm*fontMenu*font3*Label:	Small
-Hanterm*VT100*font3:		6x10
-Hanterm*fontMenu*font4*Label:	Medium
-Hanterm*VT100*font4:		7x13
-Hanterm*fontMenu*font5*Label:	Large
-Hanterm*VT100*font5:		9x15
-Hanterm*fontMenu*font6*Label:	Huge
-Hanterm*VT100*font6:		10x20
-Hanterm*fontMenu*fontescape*Label:	Escape Sequence
-Hanterm*fontMenu*fontsel*Label:		Selection
-
-! Comment this not to use color for underline attribute
-Hanterm*VT100*colorULMode: on
-Hanterm*VT100*underLine: off
-
-! Comment this not to use color for the bold attribute
-Hanterm*VT100*colorBDMode: on
-
-!Hanterm*foreground: white
-!Hanterm*background: black
-
-!Hanterm*VT100*color0: black
-!Hanterm*VT100*color1: red3
-!Hanterm*VT100*color2: green3
-!Hanterm*VT100*color3: yellow3
-!Hanterm*VT100*color4: blue3
-!Hanterm*VT100*color5: magenta3
-!Hanterm*VT100*color6: cyan3
-!Hanterm*VT100*color7: gray90
-!Hanterm*VT100*color8: gray30
-!Hanterm*VT100*color9: red
-!Hanterm*VT100*color10: green
-!Hanterm*VT100*color11: yellow
-!Hanterm*VT100*color12: blue
-!Hanterm*VT100*color13: magenta
-!Hanterm*VT100*color14: cyan
-!Hanterm*VT100*color15: white
-!Hanterm*VT100*colorBD: cyan
-!Hanterm*VT100*colorUL: yellow
diff --git a/x11-terms/hanterm/files/hanterm-3.1.6-gentoo.patch b/x11-terms/hanterm/files/hanterm-3.1.6-gentoo.patch
deleted file mode 100644
index bb3d6b1365df..000000000000
--- a/x11-terms/hanterm/files/hanterm-3.1.6-gentoo.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur hanterm-3.1.6.orig/button.c hanterm-3.1.6/button.c
---- hanterm-3.1.6.orig/button.c	2001-06-06 22:05:15.000000000 +0900
-+++ hanterm-3.1.6/button.c	2008-12-23 00:48:18.000000000 +0900
-@@ -42,7 +42,6 @@
- 
- void TrackText();
- 
--extern char *malloc();
- 
- extern void input_to_chat();
- extern void HideCursor();
-diff -Naur hanterm-3.1.6.orig/charproc.c hanterm-3.1.6/charproc.c
---- hanterm-3.1.6.orig/charproc.c	2001-06-06 22:05:15.000000000 +0900
-+++ hanterm-3.1.6/charproc.c	2008-12-23 00:48:32.000000000 +0900
-@@ -47,6 +47,7 @@
- #include <X11/Xmu/CharSet.h>
- #include <X11/Xmu/Converters.h>
- #include <stdio.h>
-+#include <stdlib.h>
- #include <errno.h>
- #include <setjmp.h>
- #include <ctype.h>
-@@ -81,8 +82,6 @@
- 
- extern Widget toplevel;
- extern void exit();
--extern char *malloc();
--extern char *realloc();
- 
- extern void FlushScroll();
- extern void InsertLine();
-diff -Naur hanterm-3.1.6.orig/scrollbar.c hanterm-3.1.6/scrollbar.c
---- hanterm-3.1.6.orig/scrollbar.c	1999-03-19 15:27:19.000000000 +0900
-+++ hanterm-3.1.6/scrollbar.c	2008-12-23 00:45:53.000000000 +0900
-@@ -28,6 +28,7 @@
- #include "ptyx.h"		/* gets Xt headers, too */
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <ctype.h>
- #include <X11/Xatom.h>
- 
diff --git a/x11-terms/hanterm/files/hanterm-3.1.6-utmp.patch b/x11-terms/hanterm/files/hanterm-3.1.6-utmp.patch
deleted file mode 100644
index 32659263b5d1..000000000000
--- a/x11-terms/hanterm/files/hanterm-3.1.6-utmp.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/main.c b/main.c
-index ac15032..e465329 100644
---- a/main.c
-+++ b/main.c
-@@ -1936,7 +1936,9 @@ spawn ()
- #endif	/* LASTLOG */
- #endif	/* UTMP */
- 
-+#ifdef UTMP
- 	memset (&utmp, '\0', sizeof(utmp));
-+#endif
- 
- 	screen->uid = getuid();
- 	screen->gid = getgid();
diff --git a/x11-terms/hanterm/hanterm-3.1.6-r2.ebuild b/x11-terms/hanterm/hanterm-3.1.6-r2.ebuild
deleted file mode 100644
index d22ea18728c9..000000000000
--- a/x11-terms/hanterm/hanterm-3.1.6-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Hanterm -- Korean terminal"
-HOMEPAGE="http://www.hanterm.org/"
-SRC_URI="http://download.kldp.net/hanterm/${P}.tar.gz"
-
-LICENSE="MIT HPND"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE=""
-
-DEPEND="x11-libs/libXmu
-	x11-libs/libICE
-	x11-libs/libXaw
-	>=x11-libs/libXaw3d-1.5"
-RDEPEND="${DEPEND}
-	media-fonts/baekmuk-fonts"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e "s:extern char \*malloc();::" \
-		-e "s:extern char \*realloc();::" \
-		button.c charproc.c
-}
-
-src_compile() {
-
-	econf --with-Xaw3d --with-utempter || die
-	perl -i -pe "s/VENDORNAME=(.*?) -/VENDORNAME=\"\1\" -/" Makefile || die
-	emake || die
-}
-
-src_install() {
-
-	einstall || die
-
-	insinto /usr/share/X11/app-defaults
-	newins Hanterm.ad Hanterm.orig
-	newins "${FILESDIR}"/Hanterm.gentoo Hanterm
-
-	newman hanterm.man hanterm.1
-
-	insinto /usr/share/doc/${PF}
-	doins doc/devel/3final.gif
-	dohtml doc/devel/hanterm.html
-
-	dodoc README ChangeLog doc/{AUTHORS,THANKS,TODO}
-	dodoc doc/devel/hanterm.sgml
-	dodoc doc/historic/{ChangeLog*,DGUX.note,README*}
-}
diff --git a/x11-terms/hanterm/hanterm-3.1.6-r4.ebuild b/x11-terms/hanterm/hanterm-3.1.6-r4.ebuild
deleted file mode 100644
index c73526c450f1..000000000000
--- a/x11-terms/hanterm/hanterm-3.1.6-r4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Hanterm -- Korean terminal"
-HOMEPAGE="http://www.hanterm.org/"
-SRC_URI="http://download.kldp.net/hanterm/${P}.tar.gz"
-
-LICENSE="MIT HPND"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="utempter"
-
-DEPEND="x11-libs/libXmu
-	x11-libs/libICE
-	x11-libs/libXaw
-	utempter? ( sys-libs/libutempter )
-	>=x11-libs/libXaw3d-1.5"
-RDEPEND="${DEPEND}
-	media-fonts/baekmuk-fonts"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gentoo.patch" \
-		"${FILESDIR}"/${P}-utmp.patch
-	sed -i -e "/^LDFLAGS/s:=:& ${LDFLAGS} :" \
-		-e "s:\$(CFLAGS):& \$(LDFLAGS) :" Makefile.in
-}
-
-src_configure() {
-	econf \
-		--with-Xaw3d \
-		$(use_with utempter)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin hanterm || die
-
-	insinto /usr/share/X11/app-defaults
-	newins Hanterm.ad Hanterm.orig
-	newins "${FILESDIR}/Hanterm.gentoo" Hanterm
-
-	newman hanterm.man hanterm.1
-
-	dohtml doc/devel/hanterm.html doc/devel/3final.gif
-
-	dodoc README ChangeLog doc/{AUTHORS,THANKS,TODO}
-	dodoc doc/devel/hanterm.sgml
-	dodoc doc/historic/{ChangeLog*,DGUX.note,README*}
-}
diff --git a/x11-terms/hanterm/metadata.xml b/x11-terms/hanterm/metadata.xml
deleted file mode 100644
index 784299475744..000000000000
--- a/x11-terms/hanterm/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>
-<use>
-	<flag name="utempter">Records user logins. Useful on multi-user
-		systems</flag>
-</use>
-</pkgmetadata>
diff --git a/x11-terms/tilda/Manifest b/x11-terms/tilda/Manifest
index e6a18cb2cbae..5510201dc3e7 100644
--- a/x11-terms/tilda/Manifest
+++ b/x11-terms/tilda/Manifest
@@ -1,7 +1,7 @@
-AUX tilda-0.9.6-gdk_resources.patch 624 BLAKE2B 73770f00afc0e1975cc0c6f71b8c51f37f1efffc4e55ef33251838e7b98d3f604daae09ff6796ff49ca8864037ebf29e6dbe6fdded0fff9ae4b2c3d61d962ccb SHA512 c32268a172c97551debcf9c5b57159546b5657f6726998bd6fadeeab1ae6a2e05d1efdfd1f61cae5f0d0972e3ac8c4d2b7409aaac31df921c417c99e22af9fcd
-AUX tilda-0.9.6-glib-single-include.patch 338 BLAKE2B 18b2b8412eab9bd15720b920b72abc4d7778cb6844f4f8717a400f8432b298073741558f7152193a8588bde4a56827d239421799c1b1b11a590b3ae1973238fb SHA512 e161ac8d6ac2e645efcdbed7247baff2a360128a7c5dff3aa9ecf4fcfe0c8e05bab2276fbe5970674f4b59385515e4c9aaaab5619687e41c1ab9390d34b93500
+AUX tilda-0.9.6-gdk_resources.patch 556 BLAKE2B f0d461e63577b0693a2ef5e393130ac28f8aba7898ffe82c98b5b0e1acb65a408a06798c87116b52c0c417d2611592e8c3692b3fa9245a015335559ab09f1758 SHA512 d799db69f9fd4c272621ba37f77b7b969f35468ea26651750b2e21e30c3763a2ff9f419bd4a66321e11d6d9f50f9e77f46b26d7852e2cec408ee24f7c2d89af1
+AUX tilda-0.9.6-glib-single-include.patch 204 BLAKE2B 8ee254da128ef666684fc6cdd35a57d12c8f8015f26918ae022973babad6be3c9dc4d884832087a4bb972f0db8042890db054792c40fc9c27cd9ce3cc66f1f37 SHA512 ef932dec3986a552488719e05cb1b38459ba6fd37135a0c98855bcf22ae44225d7ef8469bdd83d391d664179e8965580734052d27fcb895f52b9f3bb07ee9f05
 AUX tilda-0.9.6-makefile.patch 689 BLAKE2B d2132b3567d9bfdf9301184c73e5ba5f7add927f7d3d865473d8ebbda7e2d89aeb3ffa99cab95ecb96ea70f57cb874be1fe8badf4c90bb15f28d49113585cfeb SHA512 45ee0e4eb3ec9a62c5fd1b607fd548141738528bf4c82254a68b81baca1c52f10af81ca5c8450ea3dd6af6709d5e11e0d1d7bb7b6a77b88cf1c169677be1b7ed
 DIST tilda-0.9.6.tar.gz 307517 BLAKE2B dba49f28cf92a514977da5f8099e7f19366723b89785c9d9897138500eac7281a97d3ea3365acb08f17edb0a71ffe3a63d631987aaf39aa6e0058290f037e9dc SHA512 7d0ddaf289de2c3f9f48f5cce3ee71534b9fdd91f79a4e56a32a301fd8fc82c4a3d760cfcd16d8d2e2d9f0d963b8130547720563ab15c2bb2220ff546ea562b0
-EBUILD tilda-0.9.6-r1.ebuild 754 BLAKE2B 1698211d414d153a7d0db8718dceaaa73241e6fc424241cc5455773cd0ba2e18c684394d9f314d007469ed24e3d51d923afef48fe671a1c73fd2977ef1fb6c90 SHA512 557d62c256b05900f960e48a8d40d6663bf8067243d1a344c6e50b9a9a4341f0984286e9c377dbd159a8d8c40ae180c471c80c3f90b4282699607d6b2872137c
+EBUILD tilda-0.9.6-r1.ebuild 734 BLAKE2B 5fca14afc5adba2b0bdf21ec1cd2f3d2e32a866d0c4904319e8da81f5964c96ec520f930406219c3b96fc86ef5aa3f2172cc3075c1efbff60a6f6494f8c3a15d SHA512 814128f786cbb8e445505eda34fc5a66599d58b2dfa3b28c24bfa7a85f1e4b0c6d2694d9d628acb755c9e3253d9e12e4cdedb4533ae28bf31e9d238c7871d091
 EBUILD tilda-0.9.6.ebuild 667 BLAKE2B e7afc8555e4b0e973e3ba01ae0cdedf593671d2f832d0dbd981b753f3793eaa35e8c19280f0d7f3ea1c4960d6ce4bb121943e34fbaa51f340f2a43370fe2ced5 SHA512 716a1d992939ac7fd51828d96cef8ca1ee9fc3610e4fd4347ea32aa26ac43e1d84088027d1da96b8b223c78db8d4ad73c960f80aa0ccb001954d66dba4f63b1d
 MISC metadata.xml 218 BLAKE2B 7bf63b20a415707a67ee809f2baa9500a3235d261dbd05955a2079db6f345cb99e7570195dd2ce4e7035375fb08ae20418ab504322443253d588d7a6af47f524 SHA512 d5fe990e82840776a7f0f2442df94c1b7dc7a99ebee9fe9345a73fb364f6e6f3924a95e85135caac1c2a80a5ef2ddbaae3ad0eed96eeba97120b9a4bac08ec54
diff --git a/x11-terms/tilda/files/tilda-0.9.6-gdk_resources.patch b/x11-terms/tilda/files/tilda-0.9.6-gdk_resources.patch
index a26ba91f5ec0..3f5b763c1bd4 100644
--- a/x11-terms/tilda/files/tilda-0.9.6-gdk_resources.patch
+++ b/x11-terms/tilda/files/tilda-0.9.6-gdk_resources.patch
@@ -1,5 +1,5 @@
---- src/tilda_window.c	2008-01-17 23:07:39.000000000 +0100
-+++ src/tilda_window.c	2010-03-19 22:30:31.000000000 +0100
+--- a/src/tilda_window.c
++++ b/src/tilda_window.c
 @@ -427,6 +427,9 @@
      gtk_window_move (GTK_WINDOW(tw->window), config_getint ("x_pos"), config_getint ("y_pos"));
      gtk_window_set_default_size (GTK_WINDOW(tw->window), config_getint ("max_width"), config_getint ("max_height"));
diff --git a/x11-terms/tilda/files/tilda-0.9.6-glib-single-include.patch b/x11-terms/tilda/files/tilda-0.9.6-glib-single-include.patch
index fcc734f771d9..00eb5bd3be09 100644
--- a/x11-terms/tilda/files/tilda-0.9.6-glib-single-include.patch
+++ b/x11-terms/tilda/files/tilda-0.9.6-glib-single-include.patch
@@ -1,7 +1,5 @@
-Index: tilda-0.9.6/src/tomboykeybinder.h
-===================================================================
---- tilda-0.9.6.orig/src/tomboykeybinder.h
-+++ tilda-0.9.6/src/tomboykeybinder.h
+--- a/src/tomboykeybinder.h
++++ b/src/tomboykeybinder.h
 @@ -2,7 +2,7 @@
  #ifndef __TOMBOY_KEY_BINDER_H__
  #define __TOMBOY_KEY_BINDER_H__
diff --git a/x11-terms/tilda/tilda-0.9.6-r1.ebuild b/x11-terms/tilda/tilda-0.9.6-r1.ebuild
index ed11fc466333..128a4518d15a 100644
--- a/x11-terms/tilda/tilda-0.9.6-r1.ebuild
+++ b/x11-terms/tilda/tilda-0.9.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="A drop down terminal, similar to the consoles found in first person shooters"
 HOMEPAGE="http://tilda.sourceforge.net"
@@ -21,11 +21,13 @@ RDEPEND="x11-libs/vte:0
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.9.6-gdk_resources.patch
-	epatch "${FILESDIR}"/${PN}-0.9.6-glib-single-include.patch
-	epatch "${FILESDIR}"/${PN}-0.9.6-makefile.patch
-	eapply_user
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.6-gdk_resources.patch
+	"${FILESDIR}"/${PN}-0.9.6-glib-single-include.patch
+	"${FILESDIR}"/${PN}-0.9.6-makefile.patch
+)
 
+src_prepare() {
+	default
 	eautoreconf
 }
diff --git a/x11-terms/xfce4-terminal/Manifest b/x11-terms/xfce4-terminal/Manifest
index ba5cf2d20b00..77cbe0a07553 100644
--- a/x11-terms/xfce4-terminal/Manifest
+++ b/x11-terms/xfce4-terminal/Manifest
@@ -2,6 +2,6 @@ DIST xfce4-terminal-0.8.6.tar.bz2 952859 BLAKE2B 7f6ed679eb53196d2665003cc2af754
 DIST xfce4-terminal-0.8.7.2.tar.bz2 889974 BLAKE2B cf3aff96e0038f77fd40dcfd6dcfad898a85bd607ec6726606f4537864d4d222b7171675872e40a8c8133aafeedefd9fb9dfb5f3bfa3f2cae490dd68b1ccde13 SHA512 adcf43c6f9c8512ef82548347af985a2e23a7d88a2aea51eb48a483108cb23fd5fee7736b4cf85a6eac6911e063ea4d395d8cc25feee153ecd83250fb139ac5f
 DIST xfce4-terminal-0.8.7.3.tar.bz2 867967 BLAKE2B eaabf7ceefad7b9dcc79ce034fce3066cc2601c0cdebaab9e8c52688652bc49c6114dc2af735ac4bce15a8651f2fecd7a159ebe5f013b0c185b526f681a6871f SHA512 e7ff54c877d5ca20820210125b13fdd1bc6323ff8d56400ea284e1968eea6a907392e1a1edd78b06b5cf4595d1562fa1f86fce6d5f0c8cb09ba4857e1587a4a6
 EBUILD xfce4-terminal-0.8.6.ebuild 745 BLAKE2B dab102d7822ec3369d8cc09e97b2e5b45fef2f92a21e004cce4d748e2513d30cca8d769fb22b620866512f9d6994bf22fcea9a39cc760a77268adee1e9b14fc6 SHA512 c0304379a586baecb4953c9cb10bb72f8a3474e180332b30a030590d8211012584b4cadc1c7dbd471ad57e13e05e6ff4dd735fe5479f3d3d0bf82e78974525cc
-EBUILD xfce4-terminal-0.8.7.2.ebuild 907 BLAKE2B ad73a31c10a91437c4618942a4e2830700f2151ef52bac6d23993b76f479569fc6728917bfff009d71dbde4eaf4ee3ba129950b2005bafe65f9c799a34a9fafe SHA512 d70a233e5cfc142617f6c58e24182ceb6179b5b31324014796cce837e3b2c38d1da63adcd709c3523418ed5f8ecf75eabdeeef9c7bf02c2efecfcb877b9db6f4
+EBUILD xfce4-terminal-0.8.7.2.ebuild 906 BLAKE2B 4f13612871e82c96a622978434aefe5b3c7b0840c097c9ad5b2deb49d928752004e02fa48b65dc88869c1e0ffafa8b181d98fde80d80bffd7fa3392923e24caa SHA512 4e268e7a91ba509a08c3edda033ac9223b1d1342810de5f3240e3cd769d66c860b0003dd512591488d4d512ab7a3a60f70fb9b8c172f94f05574a8156e626c9a
 EBUILD xfce4-terminal-0.8.7.3.ebuild 912 BLAKE2B fb255ac1f93ffca698951b9078b4ff8f4a38bcd5cb00c9c0175a5ebe14cebecfe6cc2cca52e5d9c5939e63318946952d085e37b3db390e0e6f6afa7b9f61c20e SHA512 475ae086d375d86199d799544245d92bcc57c880f5e9f46504baee4f302061743cd88775ea662df47f2f63ed7fd34b2593a88515198bf233f0cb9a917f030581
 MISC metadata.xml 371 BLAKE2B c8a78256e1d987f23d6e7032a30d180633fd672a451f2b52ac41e3921142280ba9c69556dd3f425b2dfa7438b76fcbc1cdfd4aeadad8a263afeba7173fe43022 SHA512 7035e6d0ab1a3429faa848514df83f35869e291b9bee6cccad20ba5027ffe68b36c4ff371155be31762c4bf904c577a2144ba2a0366b6a4927500b083ccd7ddd
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.7.2.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.7.2.ebuild
index 2632e5375585..6aca43d3e0d1 100644
--- a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.7.2.ebuild
+++ b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="utempter"
 
 RDEPEND=">=dev-libs/glib-2.32:2=