reinit the tree, so we can have metadata

155 files changed, 6167 insertions, 0 deletions

diff --git a/x11-terms/aterm/Manifest b/x11-terms/aterm/Manifest
new file mode 100644
index 000000000000..c17cae882974
--- /dev/null
+++ b/x11-terms/aterm/Manifest
@@ -0,0 +1,8 @@
+AUX aterm-1.0.1-deadkeys.patch 1358 SHA256 5611f694ee0368c46e45389e87cfc8f66a8d4e7ad3b6141098ce7f325cf89640 SHA512 58831fbcc38f14f036a759606baed7beadc4d8b7a377e6c6de2d1fcb5a4e0ad06aff4c0d64f189efd26d790c5cc56d631c51797ce8334879997db4f373bd9298 WHIRLPOOL 5bd0988eaf27d4e719464d75a2b2e64744a1682f733cfa043693a03b7d2e2fd7a45d073d8000db37a80e45686da5e705a3d8f48a2c43ecde1f27e284709dd0ae
+AUX aterm-1.0.1-display-security-issue.patch 797 SHA256 2fa7012ff386d4bc4b7f1b42ce0ddf75243bc6c9bb48b4c7ed009d6651b63ff4 SHA512 23e088f188b2d454f5a3c1f863439426c80524f71c1d8484e451f301aa7b4007ba54988a86b4fe49fc8f3401e0af7ff9b725c5d3e8c08ba2eef007b7ada13e4d WHIRLPOOL 600e2782f3f5ae2b3c46769f9d064e1383e225ea478810e4a4319d51ef20bf31c6eeb47c636244228d57552b921f3a07ee1106b03ca75d9303eaeff4b3b913ba
+DIST aterm-1.0.1.tar.bz2 276810 SHA256 a161c3b2d9c7149130a41963899993af21eae92e8e362f4b5b3c7c4cb16760ce SHA512 05c78590bba55d892d9f7add384e4ae8d56197dbcd9caff2be4a52d5c162e767a464359ba806fc95961d8035575a2b4a962fc35cfa44f95025b477fa3e15e56b WHIRLPOOL 8586aeef3536bbfb36dffbc3d8d68f86253ecb9f3677908c539fa518e22d6361671a8763867a325058a6931acb71710c9cacdd532d8594c92a68870758946cc2
+EBUILD aterm-1.0.1-r2.ebuild 1995 SHA256 fb990031ca5b4e98f95f8098d63889d41ba95136385e409ad22963f0ca7cfd32 SHA512 f344337763155570f96bf1da4e630deb27beae3b57ccdbbe3d4e6e211e45b891f99a1579404495c49a990472b72792015ef0bef948ada584f0c2fb9f1f31a031 WHIRLPOOL 95b33c68f5602a6547ab846bb0a0ee43870af07810d05674f203329f4d493ebdbc51550fb1cd0029390337d66c58d2dbb93f5f92e84476a898ae4d7a6936c2ea
+EBUILD aterm-1.0.1-r3.ebuild 2017 SHA256 ee7a6c4def29729b9eeccd2eef854ebd9d42a447117d8e8841a4b0a64da0c0ba SHA512 1d2734be8e0e72c6d5edbf26bf1837a0b5a34bddfeef11a928286fa72b1b7656cfc1b8d070c0ebddfff90b64b8ab6f926171f1d77709c8348612c2ea201a9702 WHIRLPOOL 80ec4131f2ce62b752fbc645da18e056fe158dc6c35098d3779501ef2698cd22ce950618f4721ee01b7b351d410fad8b21e577a31692e92000a6ddf9270e8bde
+MISC ChangeLog 3155 SHA256 82989c0c7c922fd46518a9ae705a4f0fac05658edd465b39ddf6754da1563ba6 SHA512 cb6de21a57f935dcf39137690763c97e6617216d87bc74d99f61b6933661a0ef1c5c77712d80a8cded019ba7cb3ea7f527015eb898966216151b9967132acf6f WHIRLPOOL 41f7c9a10b3c454ccb70b66ba339c71a5dc28f8b6d6a44fce648df479b5c04576b9fab725727f9ada73afddbea3d16864383054f6acbf1f3a1d0827e45b537b5
+MISC ChangeLog-2015 19945 SHA256 707c1b1328efdd39d7b29048ef906cde508b4253817d8029c72216367792e992 SHA512 4b1bc0f37cfe9ed301415868d29a7787168bb0841c2b879c5bba0735b1f6a15520e149131d24bd9ac3a5b183043b7a6c43d3ffb0fa22b0a7d51a1063358ca999 WHIRLPOOL 01a675e34972a13fc3bebc44da5acc38bf363ee7679f033b12c036baa2f666f35b96df93e389a8e29216cdd05d09d1105c94598204be412a1672a203c6f8cf33
+MISC metadata.xml 456 SHA256 4f24c3c2b44842fa1cd575392461f929125fdcadeaf4f9b268f33dc7c5b6ebf8 SHA512 664fece05ae3d5cf3fcf713f83ec9756c1248dbde0fdbb6dd4cc5174ba54aa3238fb2ad1ec060cd9e665a83d83c0eacecddd1422ea44cc95850fe680198806cf WHIRLPOOL 123c3882e57bf373e7d67a96c2beb5b3c0fb72f59e7bdf5cd528a3311f0b378425ef2eb7a6f61e7a6754c647e6bc27a2f3ba874472ea31fff046b1af61069c9f
diff --git a/x11-terms/aterm/aterm-1.0.1-r2.ebuild b/x11-terms/aterm/aterm-1.0.1-r2.ebuild
new file mode 100644
index 000000000000..067274a1a236
--- /dev/null
+++ b/x11-terms/aterm/aterm-1.0.1-r2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=3
+inherit flag-o-matic eutils
+
+DESCRIPTION="rxvt compatible terminal emulator with transparency support"
+HOMEPAGE="http://aterm.sourceforge.net"
+SRC_URI="ftp://ftp.afterstep.org/apps/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="background cjk xgetdefault"
+
+RDEPEND="virtual/jpeg
+	media-libs/libpng
+	background? ( x11-wm/afterstep )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libICE"
+
+DEPEND="${RDEPEND}
+	x11-libs/libXt
+	x11-proto/xproto"
+
+src_prepare() {
+	# Security bug #219746
+	epatch "${FILESDIR}/${P}-display-security-issue.patch"
+	epatch "${FILESDIR}"/${P}-deadkeys.patch
+
+	#fix pre-stripped files
+	sed -i -e "/INSTALL_PROGRAM/ s:-s::" autoconf/Make.common.in || die "sed Makefile
+	failed"
+}
+
+src_configure() {
+	local myconf
+
+	use cjk && myconf="$myconf
+		--enable-kanji
+		--enable-thai
+		--enable-big5"
+
+	case "${CHOST}" in
+		*-darwin*) myconf="${myconf} --enable-wtmp" ;;
+		*-interix*) ;;
+		*) myconf="${myconf} --enable-utmp --enable-wtmp"
+	esac
+
+	econf \
+		$(use_enable xgetdefault) \
+		$(use_enable background background-image) \
+		--with-terminfo="${EPREFIX}"/usr/share/terminfo \
+		--enable-transparency \
+		--enable-fading \
+		--enable-background-image \
+		--enable-menubar \
+		--enable-graphics \
+		--with-x \
+		${myconf}
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	fowners root:utmp /usr/bin/aterm
+	fperms g+s /usr/bin/aterm
+
+	doman doc/aterm.1
+	dodoc ChangeLog doc/FAQ doc/README.*
+	docinto menu
+	dodoc doc/menu/*
+	dohtml -r .
+}
+
+pkg_postinst() {
+	echo
+	ewarn "The transparent background will only work if you have the 'real'"
+	ewarn "root wallpaper set. Some tools that might help include: Esetroot"
+	ewarn "(x11-terms/eterm), wmsetbg (x11-wm/windowmaker), and/or"
+	ewarn "media-gfx/feh."
+	echo
+}
diff --git a/x11-terms/aterm/aterm-1.0.1-r3.ebuild b/x11-terms/aterm/aterm-1.0.1-r3.ebuild
new file mode 100644
index 000000000000..e8db05b719d5
--- /dev/null
+++ b/x11-terms/aterm/aterm-1.0.1-r3.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="rxvt compatible terminal emulator with transparency support"
+HOMEPAGE="http://aterm.sourceforge.net"
+SRC_URI="ftp://ftp.afterstep.org/apps/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="background cjk xgetdefault"
+
+RDEPEND="
+	virtual/jpeg:0
+	media-libs/libpng:0=
+	background? ( x11-wm/afterstep )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libICE
+"
+DEPEND="${RDEPEND}
+	x11-libs/libXt
+	x11-proto/xproto
+"
+
+src_prepare() {
+	# Security bug #219746
+	eapply "${FILESDIR}/${P}-display-security-issue.patch"
+	eapply "${FILESDIR}"/${P}-deadkeys.patch
+
+	#fix pre-stripped files
+	sed -i -e "/INSTALL_PROGRAM/ s:-s::" autoconf/Make.common.in || die "sed Makefile failed"
+
+	default
+}
+
+src_configure() {
+	local myconf
+
+	use cjk && myconf="$myconf
+		--enable-kanji
+		--enable-thai
+		--enable-big5"
+
+	case "${CHOST}" in
+		*-darwin*) myconf="${myconf} --enable-wtmp" ;;
+		*-interix*) ;;
+		*) myconf="${myconf} --enable-utmp --enable-wtmp"
+	esac
+
+	econf \
+		$(use_enable xgetdefault) \
+		$(use_enable background background-image) \
+		--with-terminfo="${EPREFIX}"/usr/share/terminfo \
+		--enable-transparency \
+		--enable-fading \
+		--enable-background-image \
+		--enable-menubar \
+		--enable-graphics \
+		--with-x \
+		${myconf}
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	fowners root:utmp /usr/bin/aterm
+	fperms g+s /usr/bin/aterm
+
+	doman doc/aterm.1
+	dodoc ChangeLog doc/FAQ doc/README.*
+	docinto menu
+	dodoc doc/menu/*
+	dohtml -r .
+}
+
+pkg_postinst() {
+	echo
+	elog "The transparent background will only work if you have the 'real'"
+	elog "root wallpaper set. Some tools that might help include: Esetroot"
+	elog "(x11-terms/eterm), wmsetbg (x11-wm/windowmaker), and/or"
+	elog "media-gfx/feh."
+	echo
+}
diff --git a/x11-terms/aterm/files/aterm-1.0.1-deadkeys.patch b/x11-terms/aterm/files/aterm-1.0.1-deadkeys.patch
new file mode 100644
index 000000000000..958f40900bcd
--- /dev/null
+++ b/x11-terms/aterm/files/aterm-1.0.1-deadkeys.patch
@@ -0,0 +1,35 @@
+--- aterm-1.0.1~/src/command.c	2006-06-26 20:01:20.000000000 +0200
++++ aterm-1.0.1/src/command.c	2007-09-26 15:03:19.000000000 +0200
+@@ -1486,19 +1486,21 @@
+  	numlock_state = (ev->xkey.state & ModNumLockMask);	/* numlock toggle */
+ 	PrivMode((!numlock_state), PrivMode_aplKP);
+     }
+-#ifdef USE_XIM
++#if defined(USE_XIM) || !defined(NO_XLOCALE)
+     len = 0;
+-    if (Input_Context != NULL) {
+-      Status          status_return;
++    if (!XFilterEvent(ev, *(&ev->xkey.window))) {
++        if (Input_Context != NULL) {
++            Status          status_return;
+ 
+-      kbuf[0] = '\0';
+-      len = XmbLookupString(Input_Context, &ev->xkey, kbuf,
+-                          sizeof(kbuf), &keysym,
+-                          &status_return);
+-    } else {
+-      len = XLookupString(&ev->xkey, kbuf,
+-                        sizeof(kbuf), &keysym,
+-                        &compose);
++            kbuf[0] = '\0';
++            len = XmbLookupString(Input_Context, &ev->xkey, kbuf,
++                    sizeof(kbuf), &keysym,
++                    &status_return);
++        } else {
++            len = XLookupString(&ev->xkey, kbuf,
++                    sizeof(kbuf), &keysym,
++                    &compose);
++        }
+     }
+ #else                         /* USE_XIM */
+     len = XLookupString(&ev->xkey, (char *) kbuf, sizeof(kbuf), &keysym, &compose);
diff --git a/x11-terms/aterm/files/aterm-1.0.1-display-security-issue.patch b/x11-terms/aterm/files/aterm-1.0.1-display-security-issue.patch
new file mode 100644
index 000000000000..e44c0b360d21
--- /dev/null
+++ b/x11-terms/aterm/files/aterm-1.0.1-display-security-issue.patch
@@ -0,0 +1,24 @@
+--- aterm-1.0.1/src/main.c	2007-08-01 16:08:29.000000000 +0200
++++ aterm-1.0.1.new/src/main.c	2008-05-03 14:06:52.000000000 +0200
+@@ -2057,10 +2057,6 @@
+  */
+     get_options(argc, argv);
+ 
+-	if( display_name == NULL )
+-    	if ((display_name = getenv("DISPLAY")) == NULL)
+-			display_name = ":0";
+-
+ #ifdef HAVE_AFTERSTEP
+ #ifdef MyArgs_IS_MACRO	
+     MyArgsPtr = safecalloc(1, sizeof(ASProgArgs) );
+@@ -2102,7 +2098,9 @@
+ 	Xdisplay = XOpenDisplay(display_name);
+     
+ 	if (!Xdisplay) {
+-		print_error("can't open display %s", display_name);
++		print_error("can't open display %s", display_name?display_name:
++				getenv("DISPLAY")?getenv("DISPLAY"):
++				"as no -d given and DISPLAY not set");
+ 		exit(EXIT_FAILURE);
+     }
+   /* changed from _MOTIF_WM_INFO - Vaevictus - gentoo bug #139554 */
diff --git a/x11-terms/aterm/metadata.xml b/x11-terms/aterm/metadata.xml
new file mode 100644
index 000000000000..edce71995413
--- /dev/null
+++ b/x11-terms/aterm/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="background">Enable background image support via
+			<pkg>media-libs/libafterimage</pkg></flag>
+		<flag name="xgetdefault">Enable resources via X instead of aterm small
+			version</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">aterm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-terms/eterm/Manifest b/x11-terms/eterm/Manifest
new file mode 100644
index 000000000000..5fd790ab52a7
--- /dev/null
+++ b/x11-terms/eterm/Manifest
@@ -0,0 +1,11 @@
+AUX eterm-0.9.6-asm-gnu-stack.patch 292 SHA256 21bd47bd0f516144548307e050d5693bb1ca0ca7ca7473d166b2784ff06bf7d1 SHA512 cb4a1d3910fcf23bba51069b0639a1725b375a09d1bd9ae43985c1dfdd29737291888cabcb2ce03961fbd3a219437567509eaea8b3072a297774bf4cdf534baf WHIRLPOOL 284ace264a9c1333a2b60b89c873dea487c2859de22bd7ac6ab4e8808b322528ba61d81591f109abd9d95a7d1c4e02097a5a059780d19632c55b194ec4b270b6
+DIST Eterm-0.9.5.tar.gz 796872 SHA256 63ad6e3d89571a72d8302274ebb00d569b8789e24fae038beaee7aa4b8362bd2 SHA512 ef16ec5ddf0dd91ed4c40eff2289f7a61aa5c0fbf3b95bd14afe38557572f586f1dcd459c258cdfadb1dfbc1c50874492c9cc69ee4152a569b097e86c0d7cc44 WHIRLPOOL a9f9b3ad8343caa084a4cfd9b900d15eb90b657dd5cfdf4746e0d42ab84bc8b7ee6a9e17c4da658cec44d69b30a682900a753d178ad42ae58bc87b15dbb16522
+DIST Eterm-0.9.6.tar.gz 831756 SHA256 72b907aa64f8bcf053f2ecbc8a2e243c6de353a94ecaf579ff2c4e3ae5d7e13c SHA512 07ef5587b7c8444d49ffd6f20f09c98bd248ccee9b3de311f5705961579f707c4a8e2b69a2193500b75cc1e4bdeabb711a1dd23637d6b94433508d8a93d377fe WHIRLPOOL 51a958675fba197ec0dd069028e6a6066ab1133c030ddaad1bccf8c2e541b5063b0612ae7db80e40f30331ab5930da2b7d628b21c7da4d64eb9697163f05d90b
+DIST Eterm-bg-0.9.5.tar.gz 1883627 SHA256 8be436c38337557b77bb73d31a65c4dfe21966e84b7d3306e1e28c5c1e809c55 SHA512 2d58d1342c7750f8dde93451b732cff3a0580d76635054632728cf2d8e5c5298732c855672981810cf21a8d1f5d46626abe1f35fbf33e2b713cc5d6bc82d10f8 WHIRLPOOL f03b6432d406b7882ab28f80fd0f4b63bee15d8c720a54eb42f400f7cae51c2d96641656b5e779d5ccdc19c098b1c54e03d1dc0cb27a344dad5a5c5181b571a1
+DIST Eterm-bg-0.9.6.tar.gz 1883627 SHA256 8be436c38337557b77bb73d31a65c4dfe21966e84b7d3306e1e28c5c1e809c55 SHA512 2d58d1342c7750f8dde93451b732cff3a0580d76635054632728cf2d8e5c5298732c855672981810cf21a8d1f5d46626abe1f35fbf33e2b713cc5d6bc82d10f8 WHIRLPOOL f03b6432d406b7882ab28f80fd0f4b63bee15d8c720a54eb42f400f7cae51c2d96641656b5e779d5ccdc19c098b1c54e03d1dc0cb27a344dad5a5c5181b571a1
+EBUILD eterm-0.9.5.ebuild 1804 SHA256 edd96a623f0b20be9a24e75a4b10dfa1884e6c0be0ea0aba7455adb0f49e29ea SHA512 f8fab71fe59b0484af42542d78d0b0ff915360df85a8f668064b78c7e80b1cc296480c93b67252cd85565f448a9b1e793daec1c50858daadaa115eb7070ee1dc WHIRLPOOL 53d5c587021aa92b7686f73942bd191c22490b9bb938b6e17a7b8cb37fd7a33cb4159742409f37f780b869d086fd13e01a5ecce16849f1f2add3a7ff933c0416
+EBUILD eterm-0.9.6.ebuild 1967 SHA256 05876ed0cb51c5c28c63f6fca37db6e39f421673e85ccdb2e7c40fed6a531234 SHA512 495a02c891aa40cc18d4bedd411d1eb89583535c9402aaccd87e046bd1485846749ac319f0d169d8597cadb9dab6e58c5bbe6007aa9e57f0e5eee49aff1e6184 WHIRLPOOL c8edade2def4b75bfa57c665076a1fc00c0a517b4bf2578e12877c18f883e04d39342942bf73358c26e9d255f6c1592bd9e2c4bd6c04ef4eeb58c4ef9aef9b0b
+EBUILD eterm-9999.ebuild 1849 SHA256 914707dcb10d950df63ca7d81cb0e82778073ad8db40e7565f4fc7d9c29c9608 SHA512 4556b92cd607f3262b3180901d876d4a919f5dcc465d4774e4bf7ea92a6754932b9a7c08842233e4650a7103f4d36dafcb7e4bb4f117b7c192fbc1c82b57bc08 WHIRLPOOL 484f43508a2e3e894125a466ec8a415982ad3ff2c6dafcf56ecb83163e5a08f4568afa4d692e0bfd1bf12413098099a19b2976854c853ac8aa09713ac984df0f
+MISC ChangeLog 3254 SHA256 888a7a978e56497d0481cd3403b078940f890a7b3483dc5afe2a98607c0dbe59 SHA512 af39c273bf98c2abcd7a19a643b63579d5d1c7bce12dd6076a270777448a91ff16dd16011b9bdfaad6c357df120e221684b2f40c69331c216abac7e380e51386 WHIRLPOOL 1a40a6d97ecb20ef3d9baf35ecfea31028e29b9bd0c7cbbbb2965f88e5dd0ad6a9804ef65b95d30a91f07f1804c7a3e98e2c2ae5245dacf627e53e56ae6acdfc
+MISC ChangeLog-2015 11021 SHA256 76e89f7f49881a173bb72b36ddb4d09d5b38a93e81672e4ce81587ea2c81e3f4 SHA512 475e6b9c61158936bedba770ccdadff49ac1742b8e78b8b8cc5add102926f958d3cf5d9ff5977b7c111a37f6b3797e9df9821e0c2fd76e22716705449813df30 WHIRLPOOL 13ce036f4ec7caa8be820edcb2f2b9da3a632069cd44e68f292b72638196100f02d9f335be95f8b6c6b21aba4d2629245f2d8fde667a672173c4a0117477f4ba
+MISC metadata.xml 862 SHA256 6b8db8c357067bed0a2b4f5a0450f1abbab2701ef24cce341b04cd92629d34cb SHA512 5512226bf7c4dbe11844ce39ba92b105fe7090fbbea88bbeff1c5c9f82db1c52e28854e567897c09aa5224cda6d05cd84e2325d41eb124f4e8672545626c6c9a WHIRLPOOL 9674b8b106ba3a8eea61e7917c197755970b7df1f2f8b77fcadf118ab7b07688e40784299927de827a40ab3f67bfd52d52810cb03ea2b2af6629ee44cd06ff3b
diff --git a/x11-terms/eterm/eterm-0.9.5.ebuild b/x11-terms/eterm/eterm-0.9.5.ebuild
new file mode 100644
index 000000000000..58632914f707
--- /dev/null
+++ b/x11-terms/eterm/eterm-0.9.5.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+inherit eutils autotools
+
+MY_P=Eterm-${PV}
+
+if [[ ${PV} == "9999" ]] ; then
+	ESVN_REPO_URI="https://svn.enlightenment.org/svn/e/trunk/eterm/Eterm"
+	inherit subversion
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://www.eterm.org/download/${MY_P}.tar.gz
+		!minimal? ( http://www.eterm.org/download/Eterm-bg-${PV}.tar.gz )
+		mirror://sourceforge/eterm/${MY_P}.tar.gz
+		!minimal? ( mirror://sourceforge/eterm/Eterm-bg-${PV}.tar.gz )"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="A vt102 terminal emulator for X"
+HOMEPAGE="http://www.eterm.org/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="escreen minimal cpu_flags_x86_mmx cpu_flags_x86_sse2 unicode"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-proto/xextproto
+	x11-proto/xproto
+	>=x11-libs/libast-0.6.1
+	media-libs/imlib2[X]
+	media-fonts/font-misc-misc
+	escreen? ( app-misc/screen )"
+DEPEND="${RDEPEND}"
+
+if [[ ${PV} == "9999" ]] ; then
+	S=${WORKDIR}/${ECVS_MODULE}
+else
+	S=${WORKDIR}/${MY_P}
+fi
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		subversion_src_unpack
+		cd "${S}"
+		eautoreconf
+	else
+		unpack ${MY_P}.tar.gz
+		cd "${S}"
+		use minimal || unpack Eterm-bg-${PV}.tar.gz
+	fi
+}
+
+src_configure() {
+	export TIC="true"
+	econf \
+		$(use_enable escreen) \
+		--with-imlib \
+		--enable-trans \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable unicode multi-charset) \
+		--with-delete=execute \
+		--with-backspace=auto
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	dodoc ChangeLog README ReleaseNotes
+	use escreen && dodoc doc/README.Escreen
+	dodoc bg/README.backgrounds
+}
diff --git a/x11-terms/eterm/eterm-0.9.6.ebuild b/x11-terms/eterm/eterm-0.9.6.ebuild
new file mode 100644
index 000000000000..9743d88c9aa9
--- /dev/null
+++ b/x11-terms/eterm/eterm-0.9.6.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="3"
+inherit eutils autotools
+
+MY_P=Eterm-${PV}
+
+if [[ ${PV} == "9999" ]] ; then
+	ESVN_REPO_URI="https://svn.enlightenment.org/svn/e/trunk/eterm/Eterm"
+	inherit subversion
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://www.eterm.org/download/${MY_P}.tar.gz
+		!minimal? ( http://www.eterm.org/download/Eterm-bg-${PV}.tar.gz )"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos"
+fi
+
+DESCRIPTION="A vt102 terminal emulator for X"
+HOMEPAGE="http://www.eterm.org/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="escreen minimal cpu_flags_x86_mmx cpu_flags_x86_sse2 unicode +utempter"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-proto/xextproto
+	x11-proto/xproto
+	>=x11-libs/libast-0.6.1
+	media-libs/imlib2[X]
+	media-fonts/font-misc-misc
+	escreen? ( app-misc/screen )"
+DEPEND="${RDEPEND}"
+
+if [[ ${PV} == "9999" ]] ; then
+	S=${WORKDIR}/${ECVS_MODULE}
+else
+	S=${WORKDIR}/${MY_P}
+fi
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		subversion_src_unpack
+		cd "${S}"
+		eautoreconf
+	else
+		unpack ${MY_P}.tar.gz
+		cd "${S}"
+		use minimal || unpack Eterm-bg-${PV}.tar.gz
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-asm-gnu-stack.patch #440618
+}
+
+src_configure() {
+	export TIC="true"
+	econf \
+		--disable-static \
+		$(use_enable escreen) \
+		--with-imlib \
+		--enable-trans \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable unicode multi-charset) \
+		$(use_enable utempter utmp) \
+		--with-delete=execute \
+		--with-backspace=auto
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ChangeLog README ReleaseNotes
+	use escreen && dodoc doc/README.Escreen
+	dodoc bg/README.backgrounds
+
+	# We don't install headers to link against this library
+	rm -f "${D}"/usr/*/libEterm.{so,la}
+}
diff --git a/x11-terms/eterm/eterm-9999.ebuild b/x11-terms/eterm/eterm-9999.ebuild
new file mode 100644
index 000000000000..dfc9e2055dbb
--- /dev/null
+++ b/x11-terms/eterm/eterm-9999.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils autotools
+
+MY_P=Eterm-${PV}
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://git.enlightenment.org/apps/eterm.git"
+	inherit git-r3
+else
+	SRC_URI="http://www.eterm.org/download/${MY_P}.tar.gz
+		!minimal? ( http://www.eterm.org/download/Eterm-bg-${PV}.tar.gz )"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos"
+fi
+
+DESCRIPTION="A vt102 terminal emulator for X"
+HOMEPAGE="http://www.eterm.org/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="escreen minimal cpu_flags_x86_mmx cpu_flags_x86_sse2 unicode +utempter"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-proto/xextproto
+	x11-proto/xproto
+	>=x11-libs/libast-0.6.1
+	media-libs/imlib2[X]
+	media-fonts/font-misc-misc
+	escreen? ( app-misc/screen )
+"
+DEPEND="${RDEPEND}"
+
+if [[ ${PV} == "9999" ]] ; then
+	S=${WORKDIR}/${P}
+else
+	S=${WORKDIR}/${MY_P}
+fi
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+		cd "${S}" || die
+		eautoreconf
+	else
+		unpack ${MY_P}.tar.gz
+		cd "${S}" || die
+		use minimal || unpack Eterm-bg-${PV}.tar.gz
+	fi
+}
+
+src_configure() {
+	export TIC="true"
+	econf \
+		--disable-static \
+		$(use_enable escreen) \
+		--with-imlib \
+		--enable-trans \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable unicode multi-charset) \
+		$(use_enable utempter utmp) \
+		--with-delete=execute \
+		--with-backspace=auto
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog README ReleaseNotes
+	use escreen && dodoc doc/README.Escreen
+	dodoc bg/README.backgrounds
+
+	# We don't install headers to link against this library
+	rm -f "${D}"/usr/*/libEterm.{so,la}
+}
diff --git a/x11-terms/eterm/files/eterm-0.9.6-asm-gnu-stack.patch b/x11-terms/eterm/files/eterm-0.9.6-asm-gnu-stack.patch
new file mode 100644
index 000000000000..777397170d30
--- /dev/null
+++ b/x11-terms/eterm/files/eterm-0.9.6-asm-gnu-stack.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/440618
+
+--- Eterm/src/mmx_cmod.S	(revision 78909)
++++ Eterm/src/mmx_cmod.S	(working copy)
+@@ -485,4 +485,8 @@ shade_ximage_32_mmx:
+ 3:
+         LEAVE
+ 
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
++
+ #endif /* HAVE_MMX */
diff --git a/x11-terms/eterm/metadata.xml b/x11-terms/eterm/metadata.xml
new file mode 100644
index 000000000000..d565cffc696d
--- /dev/null
+++ b/x11-terms/eterm/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>vapier@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+Eterm is a color vt102 terminal emulator intended as a replacement for 
+xterm. It is designed with a Freedom of Choice philosophy, leaving as 
+much power, flexibility, and freedom as possible in the hands of the 
+user. It is designed to look good and work well, but takes a 
+feature-rich approach rather than one of minimalism while still 
+maintaining speed and efficiency.
+	</longdescription>
+	<use>
+		<flag name="escreen">Enable built-in <pkg>app-misc/screen</pkg>
+		support</flag>
+		<flag name="utempter">Include libutempter support</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">eterm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
new file mode 100644
index 000000000000..3a9b0ddf2338
--- /dev/null
+++ b/x11-terms/gnome-terminal/Manifest
@@ -0,0 +1,9 @@
+AUX gnome-terminal-3.22.0-transparency.patch 21283 SHA256 70aa720e948aebd24d548f1abe7561820befac61c30bc0fbfd887b900d690431 SHA512 b4c92b2c660aa365657d84d3c485dd930870200f6cc8a4ce629a9a6cf818b783f8646390989fefcb99098e5b211d3cf406b855b0f88e6e008f8b216f627b0ecf WHIRLPOOL 0ff2cc3ffae06d7e0f2f8050b1b6b284dfde4c5a072b2119bee0c536fec277bfbdf9db80c9914feadf788f76aaf15095b050faa948ab62495b4d855a280873ff
+DIST gnome-terminal-3.22.2.tar.xz 1952372 SHA256 9a5fa5ecad5ac74e8e125bbd201e15e03c794df4cf4a662eab53eaa3523dfc58 SHA512 3fa550c49c35d53c220d1f7a3f3d49d5130e3dd4af657e05627782abb84a449c6632a9919f5a97c78a5b9d92137e8d4bd68d8b880cd86203f866b85b9cda3db3 WHIRLPOOL a7e8333211199d5bd3d6c72f5a561ec67e443036039b1dfe99309c79cf9fc2f23bb419a7a5da59b7ddb24f2edeece28195bf225d61282380d4eee9ff6c90bfdb
+DIST gnome-terminal-3.24.2.tar.xz 1960952 SHA256 281edac30a07ca45beaaaf0a13fe2219cf8b87ece5e55dccbfc49ef769dfec0f SHA512 08cd7b1b08cf22618554b1a051dcfee4a967165bfe93b77a6bc8b0c935695101e773e8d53a482d71aadb9ba7be7ac991d82dbf53b7a6f74f1f5144e4158f8a93 WHIRLPOOL e3f7b6528edc8f257d1c43abc1ee07b8ae1c8c1dfb1e2ae0dae727ba5c3f7f90c06df92eb84b37ef6f52b6338b732e7e3af14729a9ddad887cce64142e784911
+DIST gnome-terminal-notify-open-title-transparency.patch.xz 37448 SHA256 7b83879f7035be77528b68328fed18018ae459792f7f22fae5e3d8b631d7e2cf SHA512 9af0d56df105a5bdb81b2609794669557a7f442f71b240ee10a6411fab20ad74c14489dbb9a536e208515053ea17776b3a15afb3b949a75a66f8c2ab3dbbff96 WHIRLPOOL 2059fc03a98a76b1f15e9adc7d0002daf3d337960d5d90dac9ae5d551762c18fcbc9530b32afa02edf0e5bd58140267bffbf99c9d50268338784428fe5244329
+EBUILD gnome-terminal-3.22.2.ebuild 2005 SHA256 616f1cafd63f0f4ce7fa2c0a6967f431913366220cf2b80e7acc2e3af26fe17f SHA512 2851a6b477c8acebb9ad84b79181d77042446b51659eacf01aae75453ccc990518b1a149bbe2dd26b00062e07227f5e4e15fd375044410494c245cf5fc1e97da WHIRLPOOL c48f0d5711641c14305348754d6f8a1ed03548c3dc855ba7af9c39b0848297b0def9f763115ea3e722b43472f550aff5b6f791843a45410f40f3d505a0dee66a
+EBUILD gnome-terminal-3.24.2.ebuild 2614 SHA256 0a35a862d5a27e863c05f9ca9d50013af5124f06174a2e8694201ee6a6370e25 SHA512 515d9e38de1c9cdc6a31ec5af0391ad81f4ef756e40fccbb41af60acb8c94405371abe5c5aff2a029f7fa713ccd08539d363a08d557757faa914fbbde15a31ce WHIRLPOOL 7baea13ecce8e09859db0877a9d1849338f976f84c2160988403e8ef5db7ac500d27499d42fb44f75753cba17490ec791fea45f7c478d55a90a5cf1a85e7fe28
+MISC ChangeLog 7190 SHA256 8f879d25d67616c942e18e997fac9447ef8b07d8bf1f64dc5c958355918563ac SHA512 4cc047666ece5fffc7a42572eea10defa217774f553af4e8850de0d65e55dfc3c4517f362b75d9ff739c1331cbe4cb47d398b0ad7e6017e6378cde1d911d335b WHIRLPOOL 70fb2599f0046550ff152251e8209f4238a1c5361cb9f55c298631e0cf3fb178a678ca2a01abf6d91dd862773d64577869920f5be1b6bc26e1f67b4b09d6072f
+MISC ChangeLog-2015 45392 SHA256 6386509fda7a6ee0a9c8ac757bb87be68d8ff2bf1f78af5a0481595edadb6d4e SHA512 b046c7d97ab8eaf1e192632e86dc25de769590cd128eedb5dbc2b3bd9afaa7b606fe5b7eff82be25bec75cb07ce068f7b76eaf867303c9fa09262daee4aa6072 WHIRLPOOL 428af5d48b300cb804166056c583f97551370e96087c171b6b24b47fd34b93c02a3173bc96d26dbe256f0671cf0dbbf67e644dd557d41b0e79d026191415e785
+MISC metadata.xml 417 SHA256 13622945e7760a98312d19565c5432fb22c2fa0e9dfa7205759ddf2b2467f22f SHA512 a41ea1b6fc9d3dcbdf296590b206f924cb42c7dea27b68f593eb3e50aa37c6dd3df20b47c34f8cca2671dacd4fba6ec0f86caebebe6f66d496b7936d3cf0a688 WHIRLPOOL 08a197270b7c87b0464391cec5d11ca7921754f153b699460c9fff162bfaf49dc13207197ae42f70f0cf36aa2bb859069c560b685a221e3ce7ebf5cbeebd1860
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.22.0-transparency.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.22.0-transparency.patch
new file mode 100644
index 000000000000..981fc6d13197
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-3.22.0-transparency.patch
@@ -0,0 +1,463 @@
+From 000785a2194012702c5245b0ac69b0003371bcdd Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir@gnome.org>
+Date: Mon, 12 May 2014 14:57:18 +0200
+Subject: [PATCH 1/3] Restore transparency
+
+The transparency settings were removed as a side effect of
+2bff4b63ed3ceef6055e35563e9b0b33ad57349d
+
+This restores them and you will need a compositing window manager to
+use it. The background image setting, also known as faux transparency,
+was not restored.
+
+The transparency checkbox lost its mnemonic accelerator because 't'
+is already taken and using any other letter would make it hard to
+restore the translations of the string.
+---
+ src/org.gnome.Terminal.gschema.xml | 10 +++++
+ src/profile-editor.c               | 11 +++++
+ src/profile-preferences.ui         | 92 ++++++++++++++++++++++++++++++++++++++
+ src/terminal-schemas.h             |  3 ++
+ src/terminal-screen.c              | 22 ++++++++-
+ src/terminal-window.c              |  7 +++
+ 6 files changed, 144 insertions(+), 1 deletion(-)
+
+diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml
+index c031c8a..7bdd156 100644
+--- a/src/org.gnome.Terminal.gschema.xml
++++ b/src/org.gnome.Terminal.gschema.xml
+@@ -370,6 +370,16 @@
+       <default>'narrow'</default>
+       <summary>Whether ambiguous-width characters are narrow or wide when using UTF-8 encoding</summary>
+     </key>
++    <key name="use-transparent-background" type="b">
++      <default>false</default>
++      <summary>Whether to use a transparent background</summary>
++    </key>
++    <key name="background-transparency-percent" type="i">
++      <default>50</default>
++      <range min="0" max="100"/>
++      <summary>Adjust the amount of transparency</summary>
++      <description>A value between 0 and 100, where 0 is opaque and 100 is fully transparent.</description>
++    </key>
+   </schema>
+ 
+   <!-- Keybinding settings -->
+diff --git a/src/profile-editor.c b/src/profile-editor.c
+index 002561d..1a758a9 100644
+--- a/src/profile-editor.c
++++ b/src/profile-editor.c
+@@ -1215,7 +1215,18 @@ terminal_profile_edit (GSettings  *profile,
+                    "active-id",
+                    G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
+ 
++  g_settings_bind (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND,
++                   gtk_builder_get_object (builder, "use-transparent-background"),
++                   "active", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
++  g_settings_bind (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND,
++                   gtk_builder_get_object (builder, "background-transparent-scale-box"),
++                   "sensitive", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_NO_SENSITIVITY);
++  g_settings_bind (profile, TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT,
++                   gtk_builder_get_object (builder, "background-transparent-adjustment"),
++                   "value", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
++
+   /* Finished! */
++
+   terminal_util_bind_mnemonic_label_sensitivity (editor);
+ 
+   terminal_util_dialog_focus_widget (editor, widget_name);
+diff --git a/src/profile-preferences.ui b/src/profile-preferences.ui
+index 5adcb53..b7decb2 100644
+--- a/src/profile-preferences.ui
++++ b/src/profile-preferences.ui
+@@ -23,6 +23,11 @@
+     <property name="step_increment">1</property>
+     <property name="page_increment">100</property>
+   </object>
++  <object class="GtkAdjustment" id="background-transparent-adjustment">
++    <property name="upper">100</property>
++    <property name="step_increment">1</property>
++    <property name="page_increment">10</property>
++  </object>
+   <object class="GtkListStore" id="cjk-ambiguous-width-model">
+     <columns>
+       <!-- column-name gchararray -->
+@@ -1036,6 +1041,93 @@
+                                 <property name="position">1</property>
+                               </packing>
+                             </child>
++                            <child>
++                              <object class="GtkBox" id="use-transparent-background-box">
++                                <property name="visible">True</property>
++                                <property name="can_focus">False</property>
++                                <property name="orientation">horizontal</property>
++                                <property name="spacing">12</property>
++                                <child>
++                                  <object class="GtkCheckButton" id="use-transparent-background">
++                                    <property name="label" translatable="yes">Transparent background</property>
++                                    <property name="visible">True</property>
++                                    <property name="can_focus">True</property>
++                                    <property name="receives_default">False</property>
++                                    <property name="use_underline">True</property>
++                                    <property name="xalign">0</property>
++                                    <property name="draw_indicator">True</property>
++                                  </object>
++                                  <packing>
++                                    <property name="expand">False</property>
++                                    <property name="fill">False</property>
++                                    <property name="position">0</property>
++                                  </packing>
++                                </child>
++                                <child>
++                                  <object class="GtkBox" id="background-transparent-scale-box">
++                                    <property name="visible">True</property>
++                                    <property name="can_focus">False</property>
++                                    <property name="orientation">horizontal</property>
++                                    <property name="spacing">6</property>
++                                    <child>
++                                      <object class="GtkLabel" id="background-transparent-min-label">
++                                        <property name="visible">True</property>
++                                        <property name="can_focus">False</property>
++                                        <property name="xalign">0.5</property>
++                                        <property name="label" translatable="yes">none</property>
++                                        <style>
++                                          <class name="dim-label"/>
++                                        </style>
++                                      </object>
++                                      <packing>
++                                        <property name="expand">False</property>
++                                        <property name="fill">False</property>
++                                        <property name="position">0</property>
++                                      </packing>
++                                    </child>
++                                    <child>
++                                      <object class="GtkScale" id="background-transparent-scale">
++                                        <property name="visible">True</property>
++                                        <property name="can_focus">True</property>
++                                        <property name="adjustment">background-transparent-adjustment</property>
++                                        <property name="draw_value">False</property>
++                                      </object>
++                                      <packing>
++                                        <property name="expand">True</property>
++                                        <property name="fill">True</property>
++                                        <property name="position">1</property>
++                                      </packing>
++                                    </child>
++                                    <child>
++                                      <object class="GtkLabel" id="background-transparent-max-label">
++                                        <property name="visible">True</property>
++                                        <property name="can_focus">False</property>
++                                        <property name="xalign">0.5</property>
++                                        <property name="label" translatable="yes">full</property>
++                                        <style>
++                                          <class name="dim-label"/>
++                                        </style>
++                                      </object>
++                                      <packing>
++                                        <property name="expand">False</property>
++                                        <property name="fill">False</property>
++                                        <property name="position">2</property>
++                                      </packing>
++                                    </child>
++                                  </object>
++                                  <packing>
++                                    <property name="expand">True</property>
++                                    <property name="fill">True</property>
++                                    <property name="position">1</property>
++                                  </packing>
++                                </child>
++                              </object>
++                              <packing>
++                                <property name="expand">True</property>
++                                <property name="fill">True</property>
++                                <property name="position">2</property>
++                              </packing>
++                            </child>
+                           </object>
+                         </child>
+                       </object>
+diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h
+index 4b734a3..e434075 100644
+--- a/src/terminal-schemas.h
++++ b/src/terminal-schemas.h
+@@ -69,6 +69,9 @@ G_BEGIN_DECLS
+ #define TERMINAL_PROFILE_VISIBLE_NAME_KEY               "visible-name"
+ #define TERMINAL_PROFILE_WORD_CHAR_EXCEPTIONS_KEY       "word-char-exceptions"
+ 
++#define TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND      "use-transparent-background"
++#define TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT "background-transparency-percent"
++
+ #define TERMINAL_SETTING_CONFIRM_CLOSE_KEY              "confirm-close"
+ #define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY       "default-show-menubar"
+ #define TERMINAL_SETTING_ENABLE_MENU_BAR_ACCEL_KEY      "menu-accelerator-enabled"
+diff --git a/src/terminal-screen.c b/src/terminal-screen.c
+index 9a0b450..eab0cec 100644
+--- a/src/terminal-screen.c
++++ b/src/terminal-screen.c
+@@ -827,7 +827,9 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
+       prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_COLORS_SET_KEY) ||
+       prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_BACKGROUND_COLOR_KEY) ||
+       prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_FOREGROUND_COLOR_KEY) ||
+-      prop_name == I_(TERMINAL_PROFILE_PALETTE_KEY))
++      prop_name == I_(TERMINAL_PROFILE_PALETTE_KEY) ||
++      prop_name == I_(TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND) ||
++      prop_name == I_(TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT))
+     update_color_scheme (screen);
+ 
+   if (!prop_name || prop_name == I_(TERMINAL_PROFILE_AUDIBLE_BELL_KEY))
+@@ -897,6 +899,8 @@ update_color_scheme (TerminalScreen *screen)
+   GdkRGBA *cursor_bgp = NULL, *cursor_fgp = NULL;
+   GdkRGBA *highlight_bgp = NULL, *highlight_fgp = NULL;
+   GtkStyleContext *context;
++  GtkWidget *toplevel;
++  gboolean transparent;
+   gboolean use_theme_colors;
+ 
+   context = gtk_widget_get_style_context (widget);
+@@ -938,6 +942,18 @@ update_color_scheme (TerminalScreen *screen)
+     }
+ 
+   colors = terminal_g_settings_get_rgba_palette (priv->profile, TERMINAL_PROFILE_PALETTE_KEY, &n_colors);
++
++  transparent = g_settings_get_boolean (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND);
++  if (transparent)
++    {
++      gint transparency_percent;
++
++      transparency_percent = g_settings_get_int (profile, TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT);
++      bg.alpha = (100 - transparency_percent) / 100.0;
++    }
++  else
++    bg.alpha = 1.0;
++
+   vte_terminal_set_colors (VTE_TERMINAL (screen), &fg, &bg,
+                            colors, n_colors);
+   vte_terminal_set_color_bold (VTE_TERMINAL (screen), boldp);
+@@ -945,6 +961,10 @@ update_color_scheme (TerminalScreen *screen)
+   vte_terminal_set_color_cursor_foreground (VTE_TERMINAL (screen), cursor_fgp);
+   vte_terminal_set_color_highlight (VTE_TERMINAL (screen), highlight_bgp);
+   vte_terminal_set_color_highlight_foreground (VTE_TERMINAL (screen), highlight_fgp);
++
++  toplevel = gtk_widget_get_toplevel (GTK_WIDGET (screen));
++  if (toplevel != NULL && gtk_widget_is_toplevel (toplevel))
++    gtk_widget_set_app_paintable (toplevel, transparent);
+ }
+ 
+ static void
+diff --git a/src/terminal-window.c b/src/terminal-window.c
+index a290d9f..020c6f0 100644
+--- a/src/terminal-window.c
++++ b/src/terminal-window.c
+@@ -2621,6 +2621,8 @@ terminal_window_init (TerminalWindow *window)
+   TerminalWindowPrivate *priv;
+   TerminalApp *app;
+   TerminalSettingsList *profiles_list;
++  GdkScreen *screen;
++  GdkVisual *visual;
+   GSettings *gtk_debug_settings;
+   GtkActionGroup *action_group;
+   GtkAction *action;
+@@ -2637,6 +2639,11 @@ terminal_window_init (TerminalWindow *window)
+ 
+   gtk_widget_init_template (GTK_WIDGET (window));
+ 
++  screen = gtk_widget_get_screen (GTK_WIDGET (window));
++  visual = gdk_screen_get_rgba_visual (screen);
++  if (visual != NULL)
++    gtk_widget_set_visual (GTK_WIDGET (window), visual);
++
+   uuid_generate (u);
+   uuid_unparse (u, uuidstr);
+   priv->uuid = g_strdup (uuidstr);
+-- 
+2.10.0
+
+
+From 9be09f1e055ae7aa2589ec94add5e994260929e3 Mon Sep 17 00:00:00 2001
+From: Lars Uebernickel <lars.uebernickel@canonical.com>
+Date: Wed, 28 May 2014 14:11:02 +0200
+Subject: [PATCH 2/3] window: Make the drawing robust across all themes
+
+There are lots of themes out there in the wild that do not specify a
+background-color for all widgets and the default is transparent. This
+is usually not a problem because GTK+ sets an opaque region on the
+whole window and things without a background-color get drawn with the
+theme's default background colour. However, to achieve transparency
+we disable the opaque region by making the window app-paintable. This
+can lead to transparent menubars or notebook tabs in some themes. We
+can avoid this by ensuring that the window always renders a background.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=730016
+---
+ src/terminal-window.c | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+diff --git a/src/terminal-window.c b/src/terminal-window.c
+index 020c6f0..a9f3ff7 100644
+--- a/src/terminal-window.c
++++ b/src/terminal-window.c
+@@ -2295,6 +2295,26 @@ terminal_window_realize (GtkWidget *widget)
+ }
+ 
+ static gboolean
++terminal_window_draw (GtkWidget *widget,
++                      cairo_t   *cr)
++{
++  if (gtk_widget_get_app_paintable (widget))
++    {
++      GtkStyleContext *context;
++      int width;
++      int height;
++
++      context = gtk_widget_get_style_context (widget);
++      width = gtk_widget_get_allocated_width (widget);
++      height = gtk_widget_get_allocated_height (widget);
++      gtk_render_background (context, cr, 0, 0, width, height);
++      gtk_render_frame (context, cr, 0, 0, width, height);
++    }
++
++  return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr);
++}
++
++static gboolean
+ terminal_window_state_event (GtkWidget            *widget,
+                              GdkEventWindowState  *event)
+ {
+@@ -2832,6 +2852,7 @@ terminal_window_class_init (TerminalWindowClass *klass)
+ 
+   widget_class->show = terminal_window_show;
+   widget_class->realize = terminal_window_realize;
++  widget_class->draw = terminal_window_draw;
+   widget_class->window_state_event = terminal_window_state_event;
+   widget_class->screen_changed = terminal_window_screen_changed;
+   widget_class->style_updated = terminal_window_style_updated;
+-- 
+2.10.0
+
+
+From 682a729942c07c375fbc075484bc49f188be40cd Mon Sep 17 00:00:00 2001
+From: "Owen W. Taylor" <otaylor@fishsoup.net>
+Date: Fri, 13 Nov 2015 15:16:42 +0100
+Subject: [PATCH 3/3] screen, window: Extra padding around transparent
+ terminals in Wayland
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207943
+---
+ src/terminal-screen.c | 40 +++++++++++++++++++++++++++++++++++++---
+ src/terminal-window.c | 18 ++++++++++++------
+ 2 files changed, 49 insertions(+), 9 deletions(-)
+
+diff --git a/src/terminal-screen.c b/src/terminal-screen.c
+index eab0cec..5d321a7 100644
+--- a/src/terminal-screen.c
++++ b/src/terminal-screen.c
+@@ -137,6 +137,8 @@ static void terminal_screen_system_font_changed_cb (GSettings *,
+ static gboolean terminal_screen_popup_menu (GtkWidget *widget);
+ static gboolean terminal_screen_button_press (GtkWidget *widget,
+                                               GdkEventButton *event);
++static void terminal_screen_hierarchy_changed (GtkWidget *widget,
++                                               GtkWidget *previous_toplevel);
+ static gboolean terminal_screen_do_exec (TerminalScreen *screen,
+                                          FDSetupData    *data,
+                                          GError **error);
+@@ -482,6 +484,7 @@ terminal_screen_class_init (TerminalScreenClass *klass)
+   widget_class->drag_data_received = terminal_screen_drag_data_received;
+   widget_class->button_press_event = terminal_screen_button_press;
+   widget_class->popup_menu = terminal_screen_popup_menu;
++  widget_class->hierarchy_changed = terminal_screen_hierarchy_changed;
+ 
+   terminal_class->child_exited = terminal_screen_child_exited;
+ 
+@@ -885,6 +888,32 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
+ }
+ 
+ static void
++update_toplevel_transparency (TerminalScreen *screen)
++{
++  GtkWidget *widget = GTK_WIDGET (screen);
++  TerminalScreenPrivate *priv = screen->priv;
++  GSettings *profile = priv->profile;
++  GtkWidget *toplevel;
++
++  toplevel = gtk_widget_get_toplevel (widget);
++  if (toplevel != NULL && gtk_widget_is_toplevel (toplevel))
++    {
++      gboolean transparent;
++
++      transparent = g_settings_get_boolean (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND);
++      if (gtk_widget_get_app_paintable (toplevel) != transparent)
++        {
++          gtk_widget_set_app_paintable (toplevel, transparent);
++
++          /* The opaque region of the toplevel isn't updated until the toplevel is allocated;
++           * set_app_paintable() doesn't force an allocation, so do that manually.
++           */
++          gtk_widget_queue_resize (toplevel);
++        }
++    }
++}
++
++static void
+ update_color_scheme (TerminalScreen *screen)
+ {
+   GtkWidget *widget = GTK_WIDGET (screen);
+@@ -962,9 +991,7 @@ update_color_scheme (TerminalScreen *screen)
+   vte_terminal_set_color_highlight (VTE_TERMINAL (screen), highlight_bgp);
+   vte_terminal_set_color_highlight_foreground (VTE_TERMINAL (screen), highlight_fgp);
+ 
+-  toplevel = gtk_widget_get_toplevel (GTK_WIDGET (screen));
+-  if (toplevel != NULL && gtk_widget_is_toplevel (toplevel))
+-    gtk_widget_set_app_paintable (toplevel, transparent);
++  update_toplevel_transparency (screen);
+ }
+ 
+ static void
+@@ -1567,6 +1594,13 @@ terminal_screen_do_popup (TerminalScreen *screen,
+   terminal_screen_popup_info_unref (info);
+ }
+ 
++static void
++terminal_screen_hierarchy_changed (GtkWidget *widget,
++                                   GtkWidget *previous_toplevel)
++{
++  update_toplevel_transparency (TERMINAL_SCREEN (widget));
++}
++
+ static gboolean
+ terminal_screen_button_press (GtkWidget      *widget,
+                               GdkEventButton *event)
+diff --git a/src/terminal-window.c b/src/terminal-window.c
+index a9f3ff7..d09484e 100644
+--- a/src/terminal-window.c
++++ b/src/terminal-window.c
+@@ -2300,15 +2300,21 @@ terminal_window_draw (GtkWidget *widget,
+ {
+   if (gtk_widget_get_app_paintable (widget))
+     {
++      GtkAllocation child_allocation;
+       GtkStyleContext *context;
+-      int width;
+-      int height;
++      GtkWidget *child;
++
++      /* Get the *child* allocation, so we don't overwrite window borders */
++      child = gtk_bin_get_child (GTK_BIN (widget));
++      gtk_widget_get_allocation (child, &child_allocation);
+ 
+       context = gtk_widget_get_style_context (widget);
+-      width = gtk_widget_get_allocated_width (widget);
+-      height = gtk_widget_get_allocated_height (widget);
+-      gtk_render_background (context, cr, 0, 0, width, height);
+-      gtk_render_frame (context, cr, 0, 0, width, height);
++      gtk_render_background (context, cr,
++                             child_allocation.x, child_allocation.y,
++                             child_allocation.width, child_allocation.height);
++      gtk_render_frame (context, cr,
++                        child_allocation.x, child_allocation.y,
++                        child_allocation.width, child_allocation.height);
+     }
+ 
+   return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr);
+-- 
+2.10.0
+
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.22.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.22.2.ebuild
new file mode 100644
index 000000000000..0ef374d387ce
--- /dev/null
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.22.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools gnome2 readme.gentoo-r1
+
+DESCRIPTION="The Gnome Terminal"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="debug +gnome-shell +nautilus vanilla"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+# FIXME: automagic dependency on gtk+[X], just transitive but needs proper control
+RDEPEND="
+	>=dev-libs/glib-2.42:2[dbus]
+	>=x11-libs/gtk+-3.20:3[X]
+	>=x11-libs/vte-0.46.1:2.91
+	>=dev-libs/libpcre2-10
+	>=gnome-base/dconf-0.14
+	>=gnome-base/gsettings-desktop-schemas-0.1.0
+	sys-apps/util-linux
+	gnome-shell? ( gnome-base/gnome-shell )
+	nautilus? ( >=gnome-base/nautilus-3 )
+"
+# itstool required for help/* with non-en LINGUAS, see bug #549358
+# xmllint required for glib-compile-resources, see bug #549304
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-libs/libxml2
+	dev-util/gdbus-codegen
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS="To get previous working directory inherited in new opened
+	tab you will need to add the following line to your ~/.bashrc:\n
+	. /etc/profile.d/vte-2.91.sh"
+
+src_prepare() {
+	if ! use vanilla; then
+		# OpenSuSE patches, https://bugzilla.gnome.org/show_bug.cgi?id=695371
+		# http://pkgs.fedoraproject.org/cgit/rpms/gnome-terminal.git/tree/gnome-terminal-transparency-notify.patch (first 3 parts)
+		eapply "${FILESDIR}"/${PN}-3.22.0-transparency.patch
+		eautoreconf
+	fi
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--disable-migration \
+		$(use_enable debug) \
+		$(use_enable gnome-shell search-provider) \
+		$(use_with nautilus nautilus-extension) \
+		VALAC=$(type -P true)
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS"
+	gnome2_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.24.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.24.2.ebuild
new file mode 100644
index 000000000000..0a7b6da09997
--- /dev/null
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.24.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 readme.gentoo-r1
+
+DESCRIPTION="The Gnome Terminal"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="debug +gnome-shell +nautilus vanilla"
+SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/gnome-terminal-notify-open-title-transparency.patch.xz )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+# FIXME: automagic dependency on gtk+[X], just transitive but needs proper control
+# Needed vte in 3.24.2 is 0.48.2, but we add desktop notification patches in 0.48.3 that non-vanilla needs
+RDEPEND="
+	>=dev-libs/glib-2.42:2[dbus]
+	>=x11-libs/gtk+-3.20:3[X]
+	>=x11-libs/vte-0.48.3:2.91[!vanilla?]
+	>=dev-libs/libpcre2-10
+	>=gnome-base/dconf-0.14
+	>=gnome-base/gsettings-desktop-schemas-0.1.0
+	sys-apps/util-linux
+	gnome-shell? ( gnome-base/gnome-shell )
+	nautilus? ( >=gnome-base/nautilus-3 )
+"
+# itstool/yelp-tools required for help/* with non-en LINGUAS, see bug #549358
+# xmllint required for glib-compile-resources, see bug #549304
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-libs/libxml2
+	dev-util/gdbus-codegen
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS="To get previous working directory inherited in new opened tab, or
+	notifications of long-running commands finishing, you will need
+	to add the following line to your ~/.bashrc:\n
+	. /etc/profile.d/vte-2.91.sh"
+
+src_prepare() {
+	if ! use vanilla; then
+		# https://bugzilla.gnome.org/show_bug.cgi?id=695371
+		# Fedora patches:
+		# Restore transparency support (with compositing WMs only)
+		# OSC 777 desktop notification support (notifications on tabs for long-running commands completing)
+		# Restore separate menuitems for opening tabs and windows
+		# Restore "Set title" support
+		# http://pkgs.fedoraproject.org/cgit/rpms/gnome-terminal.git/plain/gnome-terminal-notify-open-title-transparency.patch
+		# Depends on vte[-vanilla] for OSC 777 patch in VTE
+		eapply "${WORKDIR}"/${PN}-notify-open-title-transparency.patch
+	fi
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--disable-migration \
+		$(use_enable debug) \
+		$(use_enable gnome-shell search-provider) \
+		$(use_with nautilus nautilus-extension) \
+		VALAC=$(type -P true)
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS"
+	gnome2_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/x11-terms/gnome-terminal/metadata.xml b/x11-terms/gnome-terminal/metadata.xml
new file mode 100644
index 000000000000..84390e63b96c
--- /dev/null
+++ b/x11-terms/gnome-terminal/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+	<flag name="gnome-shell">Integrate with <pkg>gnome-base/gnome-shell</pkg> search</flag>
+	<flag name="nautilus">Build gnome-base/nautilus extension</flag>
+</use>
+</pkgmetadata>
diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest
new file mode 100644
index 000000000000..1b4c56260177
--- /dev/null
+++ b/x11-terms/guake/Manifest
@@ -0,0 +1,10 @@
+DIST guake-0.8.10.tar.gz 405407 SHA256 ded226b94a7b184b056b62a02d6a1cade1e53158a87bcae9c030a5cdf9c71644 SHA512 6a5986b95a3a0b7029276f2b34780dc3d58d7afa186f31a15f4adc3d8368b1dae8ed6100a2baf9683c9d5aa416daf32ef1c6f274c852fa0bd4a17d0c9f50ba98 WHIRLPOOL 69a0391dad4021a08014edbe9f685560e53baf31d2c9a713fca9a687633e94507d79fff3968bfd226e00a59e8010393cd518e159cf9019195b852d9cfab76f2a
+DIST guake-0.8.8.tar.gz 395143 SHA256 dbed79b7350e40412121b21d03a26c480a93add315d3a196c450cc62e4e1a42e SHA512 cbff208ea985669c5063793aaa74504a0de92127b52af23499b7c95df7c3841558ae61586e56771ce8e0d444bbe95a95e12e1af41f8a4ac9c74c13b3e9df8dc2 WHIRLPOOL 94474c908ce179fa78eb9db96b2d054ccbf93fce30cbfdf4d6bff922c704494f7eac6ca5eadc9c6a68372089a2bc9ff6e5b008f27769c792c70968034f763ace
+DIST guake-0.8.9.tar.gz 403678 SHA256 09de63d24e35182ecb84a300375ef3591f0b0df38f9695633945835a1abc1c2e SHA512 fecf481fe5940e64b51329e0fdfacfc26083755bc4fbc8358b92fd5c78c5d2ce0bdc65a2af2e9b0679c04d61c4be6cd202179a0c45965c4a71ee82246f53c02c WHIRLPOOL 96ac6a5bb9b5c03b0a79294669933d2797c61666309828f8f2c27c64e54f3d7e2a53ea822a645515336c238743b1c61618cdf31461c1f3b61816184b85c98c23
+EBUILD guake-0.8.10.ebuild 1061 SHA256 b09fe246c157f7fe07424b60573a569c9ab518c962d8c9a583aec21f6378a463 SHA512 be7aadda9705d2948f1fa18a0adbd38536de768e724d2185824121c46b48199128281e3189ced568de9aea6c2bb59e85ad0d8c9e0369d8d82586840f2fc33828 WHIRLPOOL 31a9f9af794f717b1afdea254dd18705fb2c0e71a12325602c18800df447f1f275ebd9b9f0f0e1b9f9194e6f2c665a64c24bab82abcfefb547a5ae07c627f40f
+EBUILD guake-0.8.8.ebuild 1058 SHA256 a0caba65377fe7b9d0dff0128df1b12bbc9c2753c8e390507c6e719e6ea9cd05 SHA512 c54fcbf25a5c05632fac0d8d63c3ac1b65a55e9eb8e5e33a0130f6f2622514da25b3d0af6d8231040dc6a2e362cc34f1b7b2a88484f29503d3566c103d173135 WHIRLPOOL d163acf91726229b7c3c707598608611c52be06996f733bacab7a1b117d983d4b6aa18f4fa72ae010f226afad9fabf7064ce3ec8059bcb13aeacbc80525cf11b
+EBUILD guake-0.8.9.ebuild 1061 SHA256 b09fe246c157f7fe07424b60573a569c9ab518c962d8c9a583aec21f6378a463 SHA512 be7aadda9705d2948f1fa18a0adbd38536de768e724d2185824121c46b48199128281e3189ced568de9aea6c2bb59e85ad0d8c9e0369d8d82586840f2fc33828 WHIRLPOOL 31a9f9af794f717b1afdea254dd18705fb2c0e71a12325602c18800df447f1f275ebd9b9f0f0e1b9f9194e6f2c665a64c24bab82abcfefb547a5ae07c627f40f
+EBUILD guake-9999.ebuild 1084 SHA256 952fd9a093dbba91da6276e69c84af4234ca10f60d5c4cdc1041a4c9c359ed4b SHA512 fd45ce1f2b51ca645e7a68b58d3a8483b530e8f99033a7e756375512481e4087f89f9f72fc6845b84882fdf79c9cba8c7b447935d64df0fdba5058dcfa90a8a2 WHIRLPOOL 6abd7eaac0e04d3ae4a07d64020dabd1397e9c87ce33b931f72eb9475396f62fb250bf9d8a2f1ea1cb32633f5757dc50e3efd261dcb5b5ab469040189d7bb1c2
+MISC ChangeLog 6343 SHA256 e6ba6b6861644e3fd4612f894e3f1f5e08900a16aa7c2b4e2c3201d313e7c70f SHA512 a9a7a5a7815268a1ee4b4dcc1c5425dea1b98892a1b33ceda56f88730fbc174820d726e3cdcacb7359f0476bdba8b3889420da65731b90429cc90e3eac6b62b0 WHIRLPOOL 7b2113c7f06807d26c6e63bf881a29e016a4e02c5653304092b09668c9cdfcb5ca91561def8c8d2fe550a6b98be9659378c1c8a904468599fa47183c81be390d
+MISC ChangeLog-2015 5673 SHA256 d68984cd865d8e72a8305c6fea36ae3c344806dda97a6592131c31652b0ba7a3 SHA512 80c7180d0b525843ce2f5ee08fce77f1a75853a9bbd0f54ac77591cea94fbef2fd66d4a53a454273cfa45b31153beb84bd69111dd5fb9d3966f01370b2b96ef6 WHIRLPOOL 1db1a0f75ba05bd233c82be5047a69936090387b38b78caea2ac70dca7b793338ad199a990438912bcaa48134d0a878a9f091dcd5052bc654440dd79a37cd53a
+MISC metadata.xml 362 SHA256 4f40e93d8523b13bd91a231c13509b56787c8be05bc65908ae0e32f192e8661e SHA512 a3a6f19649b81ef87c6775fea804fed2358e2a440fe7c2328ea6f743fa3ae303ad743a8067746b05be2b23090e7dbbb6fee4b05c0d8ce12605378de7cc7cca72 WHIRLPOOL 135dd14202d473326b744b0aa2a2d5cab840320d5de0d2c6c68f82bd6c8618875dae6b35c4ee6b548a04c910aa205cfeceb23fe28fdbf55b3272ced481666191
diff --git a/x11-terms/guake/guake-0.8.10.ebuild b/x11-terms/guake/guake-0.8.10.ebuild
new file mode 100644
index 000000000000..2a8e13d38000
--- /dev/null
+++ b/x11-terms/guake/guake-0.8.10.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GNOME2_LA_PUNT=yes
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2 python-single-r1
+
+DESCRIPTION="Drop-down terminal for GTK+ desktops"
+HOMEPAGE="https://github.com/Guake/guake"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/keybinder:0[python,${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/gconf-python[${PYTHON_USEDEP}]
+	dev-python/notify-python[${PYTHON_USEDEP}]
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/vte:0[python]
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README.rst )
+
+src_prepare() {
+	eapply_user
+
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/x11-terms/guake/guake-0.8.8.ebuild b/x11-terms/guake/guake-0.8.8.ebuild
new file mode 100644
index 000000000000..1544863d0db5
--- /dev/null
+++ b/x11-terms/guake/guake-0.8.8.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GNOME2_LA_PUNT=yes
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2 python-single-r1
+
+DESCRIPTION="Drop-down terminal for GTK+ desktops"
+HOMEPAGE="https://github.com/Guake/guake"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/keybinder:0[python,${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/gconf-python[${PYTHON_USEDEP}]
+	dev-python/notify-python[${PYTHON_USEDEP}]
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/vte:0[python]
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README.rst )
+
+src_prepare() {
+	eapply_user
+
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/x11-terms/guake/guake-0.8.9.ebuild b/x11-terms/guake/guake-0.8.9.ebuild
new file mode 100644
index 000000000000..2a8e13d38000
--- /dev/null
+++ b/x11-terms/guake/guake-0.8.9.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GNOME2_LA_PUNT=yes
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2 python-single-r1
+
+DESCRIPTION="Drop-down terminal for GTK+ desktops"
+HOMEPAGE="https://github.com/Guake/guake"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/keybinder:0[python,${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/gconf-python[${PYTHON_USEDEP}]
+	dev-python/notify-python[${PYTHON_USEDEP}]
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/vte:0[python]
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README.rst )
+
+src_prepare() {
+	eapply_user
+
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/x11-terms/guake/guake-9999.ebuild b/x11-terms/guake/guake-9999.ebuild
new file mode 100644
index 000000000000..5f3f7f992452
--- /dev/null
+++ b/x11-terms/guake/guake-9999.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GNOME2_LA_PUNT=yes
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools git-r3 gnome2 python-single-r1
+
+DESCRIPTION="Drop-down terminal for GTK+ desktops"
+HOMEPAGE="https://github.com/Guake/guake"
+# override gnome.org.eclass SRC_URI
+SRC_URI=''
+EGIT_REPO_URI="https://github.com/Guake/guake.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/gconf-python[${PYTHON_USEDEP}]
+	dev-python/notify-python[${PYTHON_USEDEP}]
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/vte:0[python]
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README.rst )
+
+src_unpack() {
+	# override gnome2_src_unpack()
+	git-r3_src_unpack
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/x11-terms/guake/metadata.xml b/x11-terms/guake/metadata.xml
new file mode 100644
index 000000000000..c92b9b25198a
--- /dev/null
+++ b/x11-terms/guake/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">Guake/guake</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-terms/hanterm/Manifest b/x11-terms/hanterm/Manifest
new file mode 100644
index 000000000000..1d6ee712ecb5
--- /dev/null
+++ b/x11-terms/hanterm/Manifest
@@ -0,0 +1,9 @@
+AUX Hanterm.gentoo 5617 SHA256 3c8fee42483bdd00eeb02ae93481017488ee5a601a2d208a14a9b40fe9ac77ff SHA512 f00c5e3a5b4e41f47a9f187d6db7825d672b48bbc7871e219ca3165c73e2fdb39bfd88b3332317435a343de35ed651159ff4fea82a39e3be90a97cfa7aac4f60 WHIRLPOOL d9eabb8ee90988b0e8d55dff88f1a8d5ff53078032a6c2c93510d498687633f1969ce98bd35c39ed559b48d7f2a08a21080a5b1c5fc169a58828f2680e472bfb
+AUX hanterm-3.1.6-gentoo.patch 1232 SHA256 b976129ef80d708f106f78b331ddfb99f586fd0170388a928e35c02091eb0ff4 SHA512 82f77d9da49e4e63c903c36e38c2819b1230f1c6bd8aa69a2b387f8e73f3fe9edcfe8eaf1fd358b8800d794fba3532b1fd734eeda877849d45cddbdfbd816adc WHIRLPOOL 41683183cb234875ce9b1b76f6c8fbbe1fff43693a6391819a1466107281e8e679ec6305a6fa4d836b11548c2a63d1402c0f4b36f151e9c5e5f45d89569f9aff
+AUX hanterm-3.1.6-utmp.patch 272 SHA256 74a8035ca8b55294f21d4761027e889bf88ba9b250f875ab1ec95c26abf506a9 SHA512 59170ce59cf4ee2a9e4ad16c0288cb2e16652ef2f847cc4afd345773979ea6492df4f58789956d2d7342a4de83c9d90234360c9b97fbb26231ca3125e019d350 WHIRLPOOL 5b936d217220bc397e896402931fc1800e20c25e659489b3ea00df43f2245ce84beb8b6711f9cdbfc7164665006c8b7ad9b2fcb3cfe80d2b72101326e346939b
+DIST hanterm-3.1.6.tar.gz 323736 SHA256 2686e4ba1ce6c42ec38e68a4d61722aa894543dae0f4f7d7eaa220dd9fa5d7e7 SHA512 57ce81091bf60184b6b17e90c56b78f279da96d040bf9e8bf23c1ae2d0ae536486c31afe2f038a284883e3be0cf881ecaece8366d5069e1e43b4a49a5bcd7016 WHIRLPOOL ae939e0ec6a34c0623e41c80c6ae2552d7622b5923c3ee649fef071dc36f96b86442198615521a0202a1b6b749b43354557568ec68ede211515e76605c5ff23b
+EBUILD hanterm-3.1.6-r2.ebuild 1127 SHA256 5dd474c4c27d77d0700a1d353ed825ff9fc2997846c6b12ea99f8c034a6ecb5c SHA512 c495ea4f3605da7654f524b7e294bbacb1ea607cd42969146bda707b609eec9b087ee4215f9eb7d4f8d374e89df137141677bea3d65b0e42d8847a454ea5b600 WHIRLPOOL c2d4572ff9f4ffb0c27cb5d8aa3bac5ffd1c7b24db7582803d7f3cd3d76282c3f7588f8dc69471d1ad48e4d7b54038e65d0aed08d7bf985990c27ab64dad2578
+EBUILD hanterm-3.1.6-r4.ebuild 1189 SHA256 f12afed3056b7545c36594200fd4d6cc43ca0c359198dd6caf5f4827ba5a0da6 SHA512 57a58072a5329d9c23aa1b44db7d6c12496bf17d43546ac94a9bc3b8071d1ff604c6717fd3b9eceb542ff96236066b15f1371a54c99ece5d923097d79ff1e4bc WHIRLPOOL 99f187a4ff160e342b2bc29fe07fce40299ba053dc7a25dfcec41c5eefaba5f19804b921808e40a4f04450bf80ef2a71a21d382c355977f6775670f142e33160
+MISC ChangeLog 2978 SHA256 1602b3292a0bc9c2477c47a33eeca071644f64ceded3f26982979b9d0d27e30e SHA512 c77fcdd4f478d72c946cd7205d329ee44cc86ff74d3aaf8a059033a97ad252680f6f4d3f34f9f77152ba72ec3bd0038386059d43ede3fed7a4ed6290bae01cea WHIRLPOOL f127a21c32089939c505859c8cf1b4dde2d55d2f222a4bb78dbcf13af36663963c17dd9c7ff1c23a2062c79b135502fa11ac4039d557c15422191e1456b31ed8
+MISC ChangeLog-2015 3835 SHA256 be0c57bb3312010e889c663877eb6eb9f3ad6917cfb7eef05f666215d61d9365 SHA512 09656e47ec36b0fb199a2343ab5aa24a2e20048d307d2552cd5120cf5c34ca09f392b4b9ee6052a470cb4378ae932f65e0ae5173a95603e052473b6eb560ad48 WHIRLPOOL ed9c25d5b9d852fa9e07f1435574fda65a61804356549e0c3205163358f3927395a44c65391051a7e2f0828c5d7957af3a2c370ae4a4c09cd27b306ddcb5b7cd
+MISC metadata.xml 325 SHA256 26ab941442915705cc20c688e22fad2e3f2cacdcc48b9f7e81de9f094c02a184 SHA512 8e7927390eb1e722bbb0c26630b08cc0dd6a7c9ce2d8ac24b3c3ae8981db1acc0eab803ecb1e6b64bf833dcb797b6596eb8ad2d5513412f91b8f9ff4c35cc25b WHIRLPOOL 1f5944318c4cd544ac6ab774391451261b783812907ac99227ff3438a8abb71123f3d89ef75d770b1b2e40a8eba90c63f0165b82326db57bdd57bb4c4c36c2e3
diff --git a/x11-terms/hanterm/files/Hanterm.gentoo b/x11-terms/hanterm/files/Hanterm.gentoo
new file mode 100644
index 000000000000..a71aa96f04c0
--- /dev/null
+++ b/x11-terms/hanterm/files/Hanterm.gentoo
@@ -0,0 +1,156 @@
+!!!!! 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
new file mode 100644
index 000000000000..bb3d6b1365df
--- /dev/null
+++ b/x11-terms/hanterm/files/hanterm-3.1.6-gentoo.patch
@@ -0,0 +1,42 @@
+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
new file mode 100644
index 000000000000..32659263b5d1
--- /dev/null
+++ b/x11-terms/hanterm/files/hanterm-3.1.6-utmp.patch
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 000000000000..d22ea18728c9
--- /dev/null
+++ b/x11-terms/hanterm/hanterm-3.1.6-r2.ebuild
@@ -0,0 +1,52 @@
+# 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
new file mode 100644
index 000000000000..c73526c450f1
--- /dev/null
+++ b/x11-terms/hanterm/hanterm-3.1.6-r4.ebuild
@@ -0,0 +1,55 @@
+# 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
new file mode 100644
index 000000000000..784299475744
--- /dev/null
+++ b/x11-terms/hanterm/metadata.xml
@@ -0,0 +1,12 @@
+<?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/kterm/Manifest b/x11-terms/kterm/Manifest
new file mode 100644
index 000000000000..901cdef0076f
--- /dev/null
+++ b/x11-terms/kterm/Manifest
@@ -0,0 +1,12 @@
+AUX 6.2.0-underline.patch 540 SHA256 00198e2c7fa6f262821273a8ab1e1d598c5d1991a8edeb65991603d28215465b SHA512 cd4b0fc54c76fb184e2e3a71b575e6f1aa0f9c80129a16b0b35835e55d472329adba6c9638d1994f7fcc8d07e4daabe73c5e3f1b8f256939193fa7b20af54810 WHIRLPOOL 0db9fa633571b56d9aa534a6155db8a4b014b7621f44f7c29cfb01639e8b8fdb46ec1b7c34094838d522cfeea64960d9b0839c68b82ceac4ee3308c2f606f911
+AUX kterm-6.2.0-Xaw3d.patch 937 SHA256 9753f060289e82b8a173cfdf8ec3e684dc539224efac8a85a8c668157f0a8879 SHA512 2f4317cf668ad389cf887b619acc90666c08e621518e7640f33b20112a93c81382cf14d9161cbee6fe512689181f31e6edaac13a9181d82661ad6c43ffd7bf14 WHIRLPOOL 9824a7cc813d2d1c6a0b7a3c1e186cd1ad219b96fb5e83331f1abf0dc861738a291ceefca069bf60ca0bbccea00db12dfe943cf131ba36b90c160c7f3e748bae
+AUX kterm-6.2.0-gentoo.patch 1519 SHA256 aa1623037a477f81cb1fd76a5408a3d62bb6a4ceb30e04bc00760d6e8f4934f9 SHA512 09de92db649ad2de751b269495922ee787aafde1b5f4b7875cfff37de9c5e4fe68756c24920b76225cd5afaffb651eab12c56ebda086fd7cb097ae551c4b07cb WHIRLPOOL eb1debfe68ef5d1113a310b55eabc887b0a960f31b27463821458a97c13697e51433019aba2e41da3e795f5caa8a5fb84c2047d22fd163bfdf92d897fe8a3a17
+AUX kterm-6.2.0-openpty.patch 1734 SHA256 3da9a52054866560a04aa02c7ad3f4063336b27d10c2c8885302143eb6ed6ba4 SHA512 1d509e52a3355991116762e6a47005f5303c6db82f869a2ae15a03814ece17e94fe39a723cbc5c6b734980928a17a4f5fcb379fcc075112fec0a79dba1fa21df WHIRLPOOL c12186f81864319aadedc11d22131a4f239ba462a7a08b72c0b8bb1565152fd3f86442e4c97aea33e9463a640f30ac783bd5105a1e4b197e3a2ff0f311af31ea
+AUX kterm-ad-gentoo.diff 737 SHA256 f0a65afb967d42d94f91abb6eed0723100d0ad035232eab0c7f97b8251f6e06a SHA512 f156c3a4b4ec51bafc1ef0ce2f98dd82fa1c4599a489d3ab24cd07c8f76cfae9039577e61d520bf218156f82236404f6216d5d35d05f8ce3b832278d2f10595b WHIRLPOOL 8163d0d42d3421d1b8281f776cea27c420f1b3310ca4b99d57d4342909c8a3e2370c46580d7fed0c7f239d62227d7b179bb88378569f5e608fa68f636956a96b
+DIST kterm-6.2.0-wpi.patch.gz 6629 SHA256 f91f37ef8b9bf84ebfb24b26b43089af25f9756680cbf875320fda774de2b591 SHA512 b3ae44ce3a2a5ed7d08055c7b9a006844441c77727694ec1eb5f07752f745c8f1990ce23115070006999bd035fd934f09322bb6dc407f825f0da2b06a163faab WHIRLPOOL e9f8c3e8338118482f0debd341380fce7f2e9b8af8b7aa6284019a20581c389aad0c57242fe5ef706356edc4fa6efed2e515b3ccb1e4750dcefe22e967da6705
+DIST kterm-6.2.0.ext02.patch.gz 15290 SHA256 4501522c5632936b316ba820633cfa887192942e123a28b031d72b4d675c85eb SHA512 95b70f61496ed43dcbdda22b3250c651b3dbce07ef2209a7baec3f729ef954d6781dd5e18a5368d34792db4a3e310adec4fad5c05d3dfd211c0dc7f89c5ae356 WHIRLPOOL edb9f3ad01cbba27556a86450aba8f81c8b71505f54959bd462f2c081fcf4273a1b92aa36d8021da7c4ab1fec3df2eb8d89c9b2623ddcf03ee1c4c2977bab0bf
+DIST kterm-6.2.0.tar.gz 200448 SHA256 ecc965b926483cb97b74d1da5808359fac95d937dfa5e7338395988b1a3afaa5 SHA512 c84a5b57154dc14ab93e1bc6cd33103495716c203a648d57044672c4218cb7e4e80110f7e6e7c0900c80c2e55843ecb190de4f61d0c72dcf9b1ada306348ce1f WHIRLPOOL e6bfdde3def0eea89e4bbfdf62471ba87bee9e9e9ba52e6e15ee6ff6335dada1dea0b63abdb21fba464c7298bfc1200848815a335116bc92e9e87a136ff4b223
+EBUILD kterm-6.2.0-r5.ebuild 2126 SHA256 52a53a2f92916106699ad38a140c68f776d8c4253bcde51410e3c4da23c7276c SHA512 a407636dfa516d0c3d2fc04bc778ba96f54fde538529286b3a0538c18d40a14658b87dc96f0bbbf1d576595d91778480b32839c3f49824a8006356a1b2bfa5a9 WHIRLPOOL d52b81d9611b840b7150a10afdb1ea2c82bab64d0c7fd7230f0efbe6e3001dfc003cf8f732b908c178a63a14c198f35564d578cd355523ea21b4fe664e6eacde
+MISC ChangeLog 2590 SHA256 44c5835d705d54585a699632f904fc57ba3f12d8c642d3dbdeab9cff455a2ae6 SHA512 0a1c02abf0a1d91685b750a29105f0152ed829523cd82a0cf173eb868d2673fd926891847b17069f77e4c2a5598a32a84fed64b1eb061d6619aae6575ee7ae68 WHIRLPOOL 6ac085e70a797aa09937f3ff01047c338ba6b0129e18c3f49e0127ab0d016b24bb2839801b669222d5cbb961dff2a89ddf73738dcfc574b30cb2e7f4eb50b177
+MISC ChangeLog-2015 5084 SHA256 d7c50d3d48cced7d5e5559c37f37e66cb8c2a184aae77d6179dddadbbe10a068 SHA512 69c2cdd89fa1290998a21e55a2dab93e8971114f78128b5480fd44b44e23aa241f4b52971aa4bd5357958356a4f43301a23523fab1dd9feab0bcda6d82cfa373 WHIRLPOOL 035bbebd205497b8be3f696151607a6df2bdff176c40ff8ed0993664fa10d750b09ab5cfe34be14b389bc9e9fea43061880e5e5e313f309ccfaea0b1cd0fd745
+MISC metadata.xml 230 SHA256 5fc421627b578ee2d1317320525119c0b406026597bb1d054f96254a241bf96a SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1 WHIRLPOOL b3c1363540645200abd5bf0b5b7fb3cae0b738bfd359f7b13b56d97650f9381fccede1e3f867dbc736461ee7c7906725a3c53eabd9ac99929d5c7c520a831082
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/kterm-6.2.0-Xaw3d.patch b/x11-terms/kterm/files/kterm-6.2.0-Xaw3d.patch
new file mode 100644
index 000000000000..cda8856a8cff
--- /dev/null
+++ b/x11-terms/kterm/files/kterm-6.2.0-Xaw3d.patch
@@ -0,0 +1,25 @@
+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
+@@ -23,6 +23,10 @@
+     PUCCPTYDDEF = -DPUCC_PTYD		/* does not need to be setuid */
+          PTYLIB = -lpucc
+ #endif
++#ifdef KTERM_XAW3D
++	XAWLIB = -lXaw3d
++	XAW6LIB =  -lXaw3d
++#endif
+ 
+  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
+@@ -36,6 +36,6 @@
+ #define KTERM_KINPUT2	/* Kinput2 protocol */
+ #define KTERM_COLOR	/* color sequence */
+ #define KTERM_NOTEK	/* disables Tektronix emulation */
+-#undef  KTERM_XAW3D	/* Xaw3d -DARROW_SCROLLBAR support */
++#define KTERM_XAW3D	/* Xaw3d -DARROW_SCROLLBAR support */
+ 
+ #endif /* !_KTERM_H_ */
diff --git a/x11-terms/kterm/files/kterm-6.2.0-gentoo.patch b/x11-terms/kterm/files/kterm-6.2.0-gentoo.patch
new file mode 100644
index 000000000000..f05a0b135371
--- /dev/null
+++ b/x11-terms/kterm/files/kterm-6.2.0-gentoo.patch
@@ -0,0 +1,51 @@
+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-openpty.patch b/x11-terms/kterm/files/kterm-6.2.0-openpty.patch
new file mode 100644
index 000000000000..ee8bc1814ae0
--- /dev/null
+++ b/x11-terms/kterm/files/kterm-6.2.0-openpty.patch
@@ -0,0 +1,59 @@
+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
+@@ -23,6 +23,11 @@
+     PUCCPTYDDEF = -DPUCC_PTYD		/* does not need to be setuid */
+          PTYLIB = -lpucc
+ #endif
++#ifdef LinuxArchitecture
++         PTYLIB = -lutil
++#undef InstallXtermSetUID
++#define InstallXtermSetUID 0
++#endif
+ 
+  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
+@@ -41,8 +41,6 @@
+ #include "error.h"
+ #include "menu.h"
+ 
+-extern char *malloc();
+-
+ 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
+@@ -102,8 +102,6 @@
+ extern XtAppContext app_con;
+ extern Widget toplevel;
+ extern void exit();
+-extern char *malloc();
+-extern char *realloc();
+ 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
+@@ -143,6 +143,7 @@
+ #define HAS_UTMP_UT_HOST
+ #define LASTLOG
+ #define WTMP
++#include <pty.h>
+ #endif
+ 
+ #include <sys/ioctl.h>
+@@ -1871,7 +1872,7 @@
+ get_pty (pty)
+     int *pty;
+ {
+-#ifdef __osf__
++#if defined(__osf__) || defined(linux)
+     int tty;
+     return (openpty(pty, &tty, ttydev, NULL, NULL));
+ #endif
diff --git a/x11-terms/kterm/files/kterm-ad-gentoo.diff b/x11-terms/kterm/files/kterm-ad-gentoo.diff
new file mode 100644
index 000000000000..a502bac0eb73
--- /dev/null
+++ b/x11-terms/kterm/files/kterm-ad-gentoo.diff
@@ -0,0 +1,21 @@
+--- KTerm.ad.orig	2004-01-07 06:25:15.000000000 +0900
++++ KTerm.ad	2004-01-07 06:27:43.550017672 +0900
+@@ -125,3 +125,18 @@
+ 
+ *VT100*translations: #override  Shift<Key>space: \
+ 	begin-conversion(_JAPANESE_CONVERSION)
++
++! default values added by portage
++*VT100*kanjiMode:       euc
++*inputMethod:           kinput2
++!*openIm:                true
++! To use wallpaper, uncomment and set it to your favorite image
++!*wallPaper: /path/to/filename.xpm
++
++! To enable wheel mouse
++KTerm*VT100.Translations: #override\n\
++	<KeyPress>Prior:scroll-back(1,page)\n\
++	<KeyPress>Next:scroll-forw(1,page)\n\
++	Shift<Key>space:begin-conversion(_JAPANESE_CONVERSION)\n\
++	<Btn4Down>:scroll-back(1,halfpage)\n\
++	<Btn5Down>:scroll-forw(1,halfpage)\n
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..b91eada35378
--- /dev/null
+++ b/x11-terms/kterm/kterm-6.2.0-r5.ebuild
@@ -0,0 +1,80 @@
+# 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/metadata.xml b/x11-terms/kterm/metadata.xml
new file mode 100644
index 000000000000..c921b96adf6c
--- /dev/null
+++ b/x11-terms/kterm/metadata.xml
@@ -0,0 +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>
+</pkgmetadata>
diff --git a/x11-terms/lilyterm/Manifest b/x11-terms/lilyterm/Manifest
new file mode 100644
index 000000000000..45f2732390a5
--- /dev/null
+++ b/x11-terms/lilyterm/Manifest
@@ -0,0 +1,7 @@
+AUX lilyterm-0.9.9.4-gettext.patch 246 SHA256 078a712822ffbdedfd1a3310534357941102cb3522e5c21db72d301f4d1906dd SHA512 94308160a63482d3c07f5baac819111958e7d3e6ddb10318671a30db866a18756b59ccc79e7ea866864c520865c24dd0f3e3920aa3e4259e2accf2dce05219f1 WHIRLPOOL aefe4b3f7f45e0f3cb310943e3d4b46093de399fc9194b558ba616cac71ffc0e5bd83eb3f4e09fc6622aad7861b925a33594fa8a97337031924bfc99ef199c05
+DIST lilyterm-0.9.9.4.tar.gz 346180 SHA256 b72626431d4f5645e0e0f18449319fbb69bef4eab4345d5e37cde0ae712a5d74 SHA512 2fcd9d31a28d6bf9d953cd77b38cb3c67591dd04157f0efd418ce3ac9eab0f8090156435207c8bc18e619dda45e726f3346b1344f2d37fd308fa802476d3b5da WHIRLPOOL 401ea44884b836fbf36e89cf20c850607723c35f9e25bcd604816d6426bc656301e9b66845e79e1f109d97a9099af4cf3f6ce375ee564eaf4f5cce62d56ea100
+EBUILD lilyterm-0.9.9.4-r1.ebuild 595 SHA256 5d5701979809315a670a94d23ecc6086567371321a2ccf873748767d1ab0bfdc SHA512 1fdd235181575d04b206e697eb6a57af6e99f2aa52b18c99b410f17a42f59d08882c216da116e7c10e0137e8d34c128fdf588ea9e02917c05fb71038cd36bd32 WHIRLPOOL 4e13100d88085ceab2343158151fac60bbe5ea0aaa09e8db2ee400ab8d53a656d6f3b31f301ec18f10b8d5f333941cb51934eebfaf6023ba68255c304c9e5ae6
+EBUILD lilyterm-0.9.9.4.ebuild 537 SHA256 75f137c07acfa6eec59bd06f92dcdf39cdac9a1d1575c36df6ac3916fdd5fbde SHA512 10f413887f4c733fd5c229c3b2b2d9a78bd31365036a3f9548fd2c4ef5be4efde9f8c7f0c0fcb979d0914bb64f1f38cdd756a323136261aba7d1959796b5b768 WHIRLPOOL 3584b0e767cb2c41e9579c754f59ec7d65225094f2c30ddc9acc8f37075d4db1529f9d1bcf3693d40780a1a8451c5d8cd1443f59c2d785b88ffba25509ba4f47
+MISC ChangeLog 2664 SHA256 66a7ad21be440898a32072d9c223cb3d6d1b589e38f21f0b6c814b85d7aae066 SHA512 53788d3625cea6301498da5bf43bb5a908b5588a73c28e1282917556c4aac9e9fa5303531d3bad5e86fe8c661aceba6d95de2ad56e85504e83241f9c49091296 WHIRLPOOL 1893baec7be7b4872bb5aa02b3c3328229598a4e492494229603da124e56ea87822d485e5069ca570e7c4900e2ceb113234bc2887f11596973616e67243f44f8
+MISC ChangeLog-2015 460 SHA256 98a4bc42c13a1ec704b34e4385f65dd55b6d02c5da1f41ab73ebea9f63c4d6b0 SHA512 05bad307efd31533c0f914e219e55c02e979b9a0f7017575dd288ca720a714dab7e8fca34cdff09815e1c2dff29b71ab11d4c8f55613b627df26dda6c8b6aa3b WHIRLPOOL 4a71bee8bf9cf864b1a6137151a3d022f55c4ba865b6cf19f1fe6e39c72876f84a58657c9a18b47cc8660f4b0ef4e7d9adab4474ca18c0fd8525a660c1eff41f
+MISC metadata.xml 341 SHA256 19573015bfef2e6e789d36f4bf887bb0669d7046855f6f9c47ac3a303fe18631 SHA512 ca3133afa9d86a0fbc7517036679d00bd1b6d657c85e393038ff445c2d4946aa053abbee66f72f35486bf20d5c278782e805a1a7f02318f1d4413f79f942719b WHIRLPOOL f05f88c55a1fd56f5f892e27fe45ed2579e9638b08fd6ee2cce4dde645772c883a2d9c7e2e5b21f6455937fb1466abb195f3e1d4635c512325576c47e663a2e2
diff --git a/x11-terms/lilyterm/files/lilyterm-0.9.9.4-gettext.patch b/x11-terms/lilyterm/files/lilyterm-0.9.9.4-gettext.patch
new file mode 100644
index 000000000000..c6df78d65398
--- /dev/null
+++ b/x11-terms/lilyterm/files/lilyterm-0.9.9.4-gettext.patch
@@ -0,0 +1,12 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -51,7 +51,7 @@
+ 
+ AC_PROG_INTLTOOL
+ ALL_LINGUAS="$_LANG_LIST"
+-GETTEXT_PACKAGE="$_PACKAGE"
++GETTEXT_PACKAGE="$_BINARY"
+ AC_SUBST(GETTEXT_PACKAGE)
+ AM_GLIB_GNU_GETTEXT
+ AM_GLIB_DEFINE_LOCALEDIR(LOCALEDIR)
+
diff --git a/x11-terms/lilyterm/lilyterm-0.9.9.4-r1.ebuild b/x11-terms/lilyterm/lilyterm-0.9.9.4-r1.ebuild
new file mode 100644
index 000000000000..f82789c0b1d0
--- /dev/null
+++ b/x11-terms/lilyterm/lilyterm-0.9.9.4-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="a terminal emulator based off of libvte that aims to be fast and lightweight"
+HOMEPAGE="http://lilyterm.luna.com.tw"
+LICENSE="GPL-3"
+SRC_URI="http://${PN}.luna.com.tw/file/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	x11-libs/vte:0
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog README TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.9.9.4-gettext.patch
+
+	./autogen.sh
+}
diff --git a/x11-terms/lilyterm/lilyterm-0.9.9.4.ebuild b/x11-terms/lilyterm/lilyterm-0.9.9.4.ebuild
new file mode 100644
index 000000000000..f271afbcddba
--- /dev/null
+++ b/x11-terms/lilyterm/lilyterm-0.9.9.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="a terminal emulator based off of libvte that aims to be fast and lightweight"
+HOMEPAGE="http://lilyterm.luna.com.tw"
+LICENSE="GPL-3"
+SRC_URI="http://${PN}.luna.com.tw/file/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	x11-libs/vte:0
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog README TODO )
+
+src_prepare() {
+	./autogen.sh
+}
diff --git a/x11-terms/lilyterm/metadata.xml b/x11-terms/lilyterm/metadata.xml
new file mode 100644
index 000000000000..5cbd11fe1bca
--- /dev/null
+++ b/x11-terms/lilyterm/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>jer@gentoo.org</email>
+</maintainer>
+<maintainer type="project">
+<email>desktop-misc@gentoo.org</email>
+<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-terms/mate-terminal/Manifest b/x11-terms/mate-terminal/Manifest
new file mode 100644
index 000000000000..ac5922e1210a
--- /dev/null
+++ b/x11-terms/mate-terminal/Manifest
@@ -0,0 +1,12 @@
+DIST mate-terminal-1.12.1.tar.xz 1143628 SHA256 d4e16a7b2742e0a904e304b2251fb8e5028833a6813e75bd8214ee542cd86c0e SHA512 c37b725db1522153fcb4dc596205f9382605bf981504217c8b087a4d7e6086a5c40644cdab1eb3c0593632d4f38d45fbcdfd763cb1ef62ff7359335c54b6ff42 WHIRLPOOL 8e0dc57b48e19cab8f821e922519045dd97bf9c3b18052aa3aad81ce2d238a8f1c513e2cf5ca426b7b87cbfeb184c02cd02ecd2f2c1c63a912856860d53c2813
+DIST mate-terminal-1.14.1.tar.xz 1313612 SHA256 248f8e4db544a76a521e7e80cceb3e6736b60c64880376b08f552cb66c378b29 SHA512 e7c68dfce1e9b886449774567f225cf267366ab857e510de3bae9867442306defe0b1d86bc90782326f4c252620311f6846a50b89a3f8939e8cfb816e25db209 WHIRLPOOL fc1337b2f270ccc7bab7d3887ef3afb3e50b917995133d44497e276e395670564d5c20289ce114f1da71105ebd535cd815037d66266d942f4e0d183a2a0d7e9d
+DIST mate-terminal-1.16.1.tar.xz 1269040 SHA256 c032a11a6a4f5ccb84c3453cedba6c0b7100858cf1a2fa5d7f97173d4c33bccc SHA512 28505ba425ecdcacb33a49b082101887ee012b37026d92a2ec666f5251ca28fb6c039c1066c55d533cad195c75577c00d93a2b3fad08d20f3619891596e6c2e1 WHIRLPOOL caf3607c674a8ee62b417ae02dd9acf30e1d6b1726b0c2485889071eb8e946f66f31333c0191ba0d67e83eb9450ef5eeda0c066fb92ddc6bbb601e5fcad0d272
+DIST mate-terminal-1.18.1.tar.xz 1299492 SHA256 4135b2212a2ed5d6c20b645e17a76d814aa8212f68f83c0a67a9899680a930fe SHA512 3b102c683137951d425c5c4f177e1498be037cabb9483bd89fea61c1c03e9a5d481a5aa9418e92f3007ac64f7ed3bf298109ba9564f741634c4b5dad94ddddf3 WHIRLPOOL e7d347b523ec0d0a1d7ce2e3ecd0b48bc7900e6da181be7af9cb56a9c72779bc9927096a15d1546c46417672f12363e949f6a7cb38407b3188b841b5a30a8e1a
+EBUILD mate-terminal-1.12.1-r1.ebuild 826 SHA256 cbc7a2cf104767d9bdb1e38a526acd6bd86b2b16bd0cde2ff6be32b2b7c1d59f SHA512 68f12ae9b1a734a4c69347487a7974a9dabdb971f0286abdf87e6485119aec13b85db64f1c4d504733ab2a57115870fe06e08449740e1602d0c0478a67612623 WHIRLPOOL e38e65e9ee7153d73b99bddeb9f8f56dbf2fdd5e463db0a2ecad15c1c57bd23af5356abe42ac4bbe1f57f49375a1c1c6b4af775bb2a2050ec36466ce62638019
+EBUILD mate-terminal-1.12.1.ebuild 821 SHA256 a05ae393832f9f352c57f684907e754887ff76bd963a94ba69b93cac4ba82015 SHA512 80f90a2640950924ba5c7133d11fbfa7f44ca1914d4c5b387b8712ea1dd62247051dca12cd978dd204cebd7400bdd223220a70f046ed651adefac2ad927e370a WHIRLPOOL 576194c527af47a763d93e1429f6468a9bf15c57e6944de8f4c5b24e292202938e84ed1bdb57f562f593af89007fd660525ba87f66834fa2e95f0c832c108a0d
+EBUILD mate-terminal-1.14.1-r1.ebuild 866 SHA256 b45ab1dd81b6c587579e77fb14e25fe74868ee0a283af69cd7f375899ec5f7ec SHA512 aeb95bf228187367d4f84e874982b7a9fd2a7fdbd7cf55b4b3f29ae8e7765d14558d8d22ee25dc95d96e771aa73a0f82069ada2bc0c12ff33a0c8bf706bb14c0 WHIRLPOOL 679c6f8659cec518afbc8cd5797a69e32fe8b9376833c242c96e2fd0eb69cf74bc8a719201d690c61af6291f1dc7452e0d849dd1e011322d2445150ae550e1e9
+EBUILD mate-terminal-1.16.1-r2.ebuild 727 SHA256 c755f4a79734c22ffabd24d83a81059f5452b36a4853d30cefdd98f3e45be946 SHA512 a2ac4837e016ac8d4ca407353da9fc56477e3058c6217b40f8ff7cddea4879928590df665795064d991bb81b425fd506e716264223cc3f3dccd276018c8575e8 WHIRLPOOL 3c6072e4647f499fe8b2e8c0941bf3f2dd6648b8645282e11d6c158b7e5be8f9b145bebd5d615bb74739646476f108a0d8e3abd0c07b57f13342aee0492e5e53
+EBUILD mate-terminal-1.18.1.ebuild 727 SHA256 c755f4a79734c22ffabd24d83a81059f5452b36a4853d30cefdd98f3e45be946 SHA512 a2ac4837e016ac8d4ca407353da9fc56477e3058c6217b40f8ff7cddea4879928590df665795064d991bb81b425fd506e716264223cc3f3dccd276018c8575e8 WHIRLPOOL 3c6072e4647f499fe8b2e8c0941bf3f2dd6648b8645282e11d6c158b7e5be8f9b145bebd5d615bb74739646476f108a0d8e3abd0c07b57f13342aee0492e5e53
+MISC ChangeLog 4834 SHA256 503e260d874a30fb64895e95ecca4c1f844ed7c6f05b6d52a98a485d668ad384 SHA512 fd6f5a1eefc0f5954549e302af39e91571efd82d086790435c86e1701fd08239d996a7d2dae0d232d954269b5b2f1e0ec844b71f8155ba52529bbf009bacfeb3 WHIRLPOOL 492039c859fe5199badf06303dfb57fd970d12f10dc3a1e8e33d25b452f57d3361821437107756d27dc4f2620f97ecbb861679581d6eddab13e75344659d2772
+MISC ChangeLog-2015 1597 SHA256 8969ddf032c43d395210253f77b5e9a99c4272a753ccf51bb229e21cce4830ae SHA512 7bea513258f34b81c67e4a00174f953421cf2cce03896d7308ba0f96ef97affaf54fae1987e5e4a830dea8e0eab92864ec15ed9abba4cb50216e68ae7be14347 WHIRLPOOL 66d20f22e148255209e2bb53575c366e5debb1ca19499f5c51648cdb6ff4a5416580f0e87d3bc9b55516e2e38cfeeb9e90ce98c1c959381d031bed928d84b30a
+MISC metadata.xml 418 SHA256 fd07c75610b8dc9010d5e500b17f4c8704dbe324ce219c538e01b01a07cb4840 SHA512 fc7439e9cd6aee179e6e6bf2ad282c0a62dc78b53dc5a0b33798ac90006159ffcc00625c156cdf93a474ef592ee3be2134ac4c7778d5d8b2768fed1ae1464cee WHIRLPOOL 0bb6c5e36d4710dcd153a5feb837437d38fed444f5b1ac8d844fc88b04ccf6efb6f4095770888c070538432ccaaf4563a071d91841ea1598715822c89054ed41
diff --git a/x11-terms/mate-terminal/mate-terminal-1.12.1-r1.ebuild b/x11-terms/mate-terminal/mate-terminal-1.12.1-r1.ebuild
new file mode 100644
index 000000000000..9823dc8c3f04
--- /dev/null
+++ b/x11-terms/mate-terminal/mate-terminal-1.12.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="The MATE Terminal"
+LICENSE="GPL-3"
+SLOT="0"
+
+IUSE="gtk3"
+
+RDEPEND="app-text/rarian:0
+	dev-libs/atk:0
+	>=dev-libs/glib-2.36:2
+	>=mate-base/mate-desktop-1.6[gtk3(-)=]
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE:0
+	x11-libs/libSM:0
+	x11-libs/libX11:0
+	x11-libs/pango:0
+	!gtk3? (
+		>=x11-libs/gtk+-2.24.0:2
+		>=x11-libs/vte-0.28:0
+	)
+	gtk3? (
+		>=x11-libs/gtk+-3.0:3[X]
+		>=x11-libs/vte-0.38:2.91
+	)"
+
+DEPEND="${RDEPEND}
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure \
+		--with-gtk=$(usex gtk3 3.0 2.0)
+}
diff --git a/x11-terms/mate-terminal/mate-terminal-1.12.1.ebuild b/x11-terms/mate-terminal/mate-terminal-1.12.1.ebuild
new file mode 100644
index 000000000000..9eb68011adb6
--- /dev/null
+++ b/x11-terms/mate-terminal/mate-terminal-1.12.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="amd64 ~arm x86"
+fi
+
+DESCRIPTION="The MATE Terminal"
+LICENSE="GPL-3"
+SLOT="0"
+
+IUSE="gtk3"
+
+RDEPEND="app-text/rarian:0
+	dev-libs/atk:0
+	>=dev-libs/glib-2.36:2
+	>=mate-base/mate-desktop-1.6[gtk3(-)=]
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE:0
+	x11-libs/libSM:0
+	x11-libs/libX11:0
+	x11-libs/pango:0
+	!gtk3? (
+		>=x11-libs/gtk+-2.24.0:2
+		>=x11-libs/vte-0.28:0
+	)
+	gtk3? (
+		>=x11-libs/gtk+-3.0:3
+		>=x11-libs/vte-0.38:2.91
+	)"
+
+DEPEND="${RDEPEND}
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure \
+		--with-gtk=$(usex gtk3 3.0 2.0)
+}
diff --git a/x11-terms/mate-terminal/mate-terminal-1.14.1-r1.ebuild b/x11-terms/mate-terminal/mate-terminal-1.14.1-r1.ebuild
new file mode 100644
index 000000000000..8c3f9cc7b3bd
--- /dev/null
+++ b/x11-terms/mate-terminal/mate-terminal-1.14.1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="The MATE Terminal"
+LICENSE="GPL-3"
+SLOT="0"
+
+IUSE="gtk3"
+
+COMMON_DEPEND="dev-libs/atk:0
+	>=dev-libs/glib-2.36:2
+	>=mate-base/mate-desktop-1.6[gtk3(-)=]
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE:0
+	x11-libs/libSM:0
+	x11-libs/libX11:0
+	x11-libs/pango:0
+	!gtk3? (
+		>=x11-libs/gtk+-2.24.0:2
+		>=x11-libs/vte-0.28:0
+	)
+	gtk3? (
+		>=x11-libs/gtk+-3.0:3[X]
+		>=x11-libs/vte-0.38:2.91
+	)"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/rarian:0
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure \
+		--with-gtk=$(usex gtk3 3.0 2.0)
+}
diff --git a/x11-terms/mate-terminal/mate-terminal-1.16.1-r2.ebuild b/x11-terms/mate-terminal/mate-terminal-1.16.1-r2.ebuild
new file mode 100644
index 000000000000..4184916b569b
--- /dev/null
+++ b/x11-terms/mate-terminal/mate-terminal-1.16.1-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="The MATE Terminal"
+LICENSE="GPL-3"
+SLOT="0"
+
+IUSE=""
+
+COMMON_DEPEND="dev-libs/atk:0
+	>=dev-libs/glib-2.36:2
+	>=gnome-base/dconf-0.13.4:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE:0
+	x11-libs/libSM:0
+	x11-libs/libX11:0
+	x11-libs/pango:0
+	>=x11-libs/gtk+-3.14:3[X]
+	>=x11-libs/vte-0.38:2.91"
+
+RDEPEND="${COMMON_DEPEND}
+	>=mate-base/mate-desktop-1.6"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/rarian:0
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
diff --git a/x11-terms/mate-terminal/mate-terminal-1.18.1.ebuild b/x11-terms/mate-terminal/mate-terminal-1.18.1.ebuild
new file mode 100644
index 000000000000..4184916b569b
--- /dev/null
+++ b/x11-terms/mate-terminal/mate-terminal-1.18.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="The MATE Terminal"
+LICENSE="GPL-3"
+SLOT="0"
+
+IUSE=""
+
+COMMON_DEPEND="dev-libs/atk:0
+	>=dev-libs/glib-2.36:2
+	>=gnome-base/dconf-0.13.4:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE:0
+	x11-libs/libSM:0
+	x11-libs/libX11:0
+	x11-libs/pango:0
+	>=x11-libs/gtk+-3.14:3[X]
+	>=x11-libs/vte-0.38:2.91"
+
+RDEPEND="${COMMON_DEPEND}
+	>=mate-base/mate-desktop-1.6"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/rarian:0
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
diff --git a/x11-terms/mate-terminal/metadata.xml b/x11-terms/mate-terminal/metadata.xml
new file mode 100644
index 000000000000..2f0acb5747d8
--- /dev/null
+++ b/x11-terms/mate-terminal/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">mate-desktop/mate-terminal</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-terms/metadata.xml b/x11-terms/metadata.xml
new file mode 100644
index 000000000000..7b2e8b135e7d
--- /dev/null
+++ b/x11-terms/metadata.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The x11-terms category contains terminal emulators for X11 environments.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie x11-terms enthält Terminalemulatoren für verschiedene
+		Desktopumgebungen und Window Manager.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría x11-terms contiene emuladores de terminal para varios
+		ambientes X11.
+	</longdescription>
+	<longdescription lang="ja">
+		x11-termsカテゴリー��X11環境�使�ターミナル・エミュレーター���れ����。
+	</longdescription>
+	<longdescription lang="nl">
+		De x11-terms categorie bevat terminalemulators voor verschillende
+		desktopomgevingen en window managers.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm x11-term chứa các terminal emulator cho X11.
+	</longdescription>
+	<longdescription lang="sk">
+		Kategória x11-term obsahuje emulátory terminálu pre prostredia X11.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria x11-terms contiene emulatori di terminale per gli ambienti X11.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria x11-terms contém emuladores de terminal para
+		ambientes X11.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria x11-terms zawiera emulatory terminala dla środowisk X11.
+	</longdescription>
+</catmetadata>
+
diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest
new file mode 100644
index 000000000000..c797e652c686
--- /dev/null
+++ b/x11-terms/mlterm/Manifest
@@ -0,0 +1,10 @@
+AUX mlterm-font.patch 606 SHA256 405d1414af9565cd5924b8a74134e132836910b8b6194e60f33595253beb806a SHA512 60e625e554341feda77a926f3a59c4858ab19a810eeba39810701c429a504666643e1a614586b88379fe2d42606865f0afa8da6c14c1499a52aa1200e8bd5c4a WHIRLPOOL baaf761d87fe657771a07e00ca1ae224482f11bdc6bfa7c4ad3dfc6333f29bacf2856443cec84fb66313daeef8c2d140495e937b6fce3b9a788236bc5352a213
+DIST mlterm-3.8.0.tar.gz 3756779 SHA256 6be0165fe43dc45099c4b37303fcca918e5dd07c5b0abb1fd4e35c8d73e9bf01 SHA512 86d163aaf24668dea77e54ff775cb448c6c699bcc82e1d84fe9a9fbed90d9c834ee3e61348de77713b2dbd229b37b76d2be817d788710f224cd5c53e7f93049f WHIRLPOOL b189d06d420a42ded64e84c17158c21d3968353ac69bc1027bc1895a2eccc21cafe402d6b4f9497ca652d436ecc51c99ce8287ec96790e75d526facd7a830558
+DIST mlterm-3.8.1.tar.gz 3789935 SHA256 464fa3a76ea562e38945067003c68e5ce320b60063f412bff01cb6a0f5c5d6d9 SHA512 fd57ffefb9f96a58bb63751cc06b3381e0b3d5b50c5023cbd95fa5dc0351f958a783f6eabbf71b6625774312d03c5284db957c47f83f5352ae594d0e4864c52e WHIRLPOOL 5db8da0598b0419bca47448eb6471aed7ba2d57511d31944c41a26333f697b758c0a002b12ee60f5e4bebd61dedfbeea12ce90122fd7d66293c2906e7153ea17
+DIST mlterm-3.8.2.tar.gz 3836220 SHA256 30278fc4b43bf66eebd8ff728f943674554e7593a3989d0f3ea68c4b34270399 SHA512 f0dafdc60cec8d221681669f7d53bc46615b22b05fe5d3de21946c7b62ec1631acedda4e80530e84df3be6234d198cd35a1595a73626884f2b21d03a09ecdace WHIRLPOOL 4941f21b1826368fef1a0f473f4bdab3b463c47979a823862883a9a67464bae11c2c62a3f7767d6d5d52084dd6ee875024844f31b974fa3c4f5f4d0fd61ef71d
+EBUILD mlterm-3.8.0.ebuild 2660 SHA256 000d1c19fbbd08ec307e9e080c06d5ceb66f199dbaf26b47285b2edc3217be27 SHA512 b7e16960a4808a682eeba79693b812116078a274dd956fc4a38b3f7622ce1b88549ab94480264f751f0f6b6b5aea0cfc529a086656c833cdd086283bbdc27977 WHIRLPOOL 5c27e8da33ef4f06fdfb9c2f2262cb73fe2e3b3e1bfe0b519b85ac3be759dcb3a060d3c38b9616a995b4bce9a8156c7030e8666bb6567551f6bcbce9d97cb487
+EBUILD mlterm-3.8.1.ebuild 2779 SHA256 cf32c0f12cc9ad7c61761bcde6b4a09a8c76bcdc60f4f51ebd140ab4da7d06a4 SHA512 de0ce6cd5743fcd2f39bf02762c8352141aa8065efaeb53dcba08473cd604cbd749577c1deb82051a21ac83824d39ecbb2ad37e933b17694301f9402272f32d3 WHIRLPOOL edf31e4b8086a37d0888ed878dc865f17645c809a362ac274b371a532ed74b62544e0d01d1ed3559cec6acd6e430899ca9ba7f7b2aeefe229d994d37e3545b23
+EBUILD mlterm-3.8.2.ebuild 2779 SHA256 cf32c0f12cc9ad7c61761bcde6b4a09a8c76bcdc60f4f51ebd140ab4da7d06a4 SHA512 de0ce6cd5743fcd2f39bf02762c8352141aa8065efaeb53dcba08473cd604cbd749577c1deb82051a21ac83824d39ecbb2ad37e933b17694301f9402272f32d3 WHIRLPOOL edf31e4b8086a37d0888ed878dc865f17645c809a362ac274b371a532ed74b62544e0d01d1ed3559cec6acd6e430899ca9ba7f7b2aeefe229d994d37e3545b23
+MISC ChangeLog 4653 SHA256 7a81772695483166a58ca97ed0d5ee91fe8cc4089daa2ae3abe845d0a1892b32 SHA512 e4c1b0e895b612a2852150dfc826bf43ab8ee9d8f638ad56213b9eebc81ca7470d24280e39ae4b80842eed9276e93cb4bcca1f4b2718589038e2607c8677fa82 WHIRLPOOL b3a10f6ab61659ef0bcc4ac61758268bddcaba261f2d9c5e6e27c675dc3e05c1c434ee32251d7947f62a32d727e7d8ac53ebf1b853f84c074931e621fac1eee8
+MISC ChangeLog-2015 15612 SHA256 cbf544f705153207426d67ce0c95ca08bbc84ebe323c1d11b5ce0bcbe739aa4a SHA512 f451f7df167831c7f476278331b8672c8fcd74b2292a70d037b0286ebd2e451a651468c95d6ed987f9d973777a7c2be3e6f7b70342b2610430080f0396a4c3e9 WHIRLPOOL bfd253da04a069d230b0ef18cb20f7adf585e4eb7aeb70faddb78dc29faa918297f32fd04225fbd24feec12bb045af9229266cb01797e1e1f456a78c46aa24f5
+MISC metadata.xml 1178 SHA256 693b37b75f4937fe88b63402acaf070c3f74634902db1fad5c9cbe5f5b8fe044 SHA512 358608208d6ce16bfa3e9e792ca85921b4368d6a6c5c0934aaeb5819f985e276cd4de8a35a54ea5699d1e988cd1c08aab669eab1939ff78753b29c3668425a6f WHIRLPOOL 49c88af090afa9d85a69d7421fb429abcc9bf30a52b6143976c03ea4beb0d347d0d2e9a5b17502ad01d5ef688fac67c294a48d17690918108e2425d91038e9b5
diff --git a/x11-terms/mlterm/files/mlterm-font.patch b/x11-terms/mlterm/files/mlterm-font.patch
new file mode 100644
index 000000000000..c091a08b6130
--- /dev/null
+++ b/x11-terms/mlterm/files/mlterm-font.patch
@@ -0,0 +1,17 @@
+--- a/uitoolkit/fb/ui_font.c
++++ b/uitoolkit/fb/ui_font.c
+@@ -1625,11 +1625,11 @@
+       }
+       percent = 0;
+ #else /* __linux__ */
+-      if (stat("/usr/share/fonts/X11/misc/unifont.pcf.gz", &st) == 0) {
+-        font_file = "/usr/share/fonts/X11/misc/unifont.pcf.gz";
++      if (stat(XDATADIR "/fonts/unifont/unifont.pcf.gz", &st) == 0) {
++        font_file = XDATADIR "/fonts/unifont/unifont.pcf.gz";
+         percent = 100;
+       } else {
+-        font_file = "/usr/share/fonts/X11/misc/10x20.pcf.gz";
++        font_file = XDATADIR "/fonts/misc/10x20.pcf.gz";
+         percent = 0;
+       }
+ #endif
diff --git a/x11-terms/mlterm/metadata.xml b/x11-terms/mlterm/metadata.xml
new file mode 100644
index 000000000000..f995734984c6
--- /dev/null
+++ b/x11-terms/mlterm/metadata.xml
@@ -0,0 +1,25 @@
+<?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="fcitx">Enable support for <pkg>app-i18n/fcitx</pkg></flag>
+    <flag name="gtk2">
+      Build with <pkg>x11-libs/gtk+</pkg>:2 instead of <pkg>x11-libs/gtk+</pkg>:3
+    </flag>
+    <flag name="harfbuzz">Enable support for OpenType Layout (<pkg>media-libs/harfbuzz</pkg>)</flag>
+    <flag name="ibus">Enable support for <pkg>app-i18n/ibus</pkg></flag>
+    <flag name="libssh2">Enable support for <pkg>net-libs/libssh2</pkg></flag>
+    <flag name="regis">Enable support for ReGIS</flag>
+    <flag name="scim">Enable support for <pkg>app-i18n/scim</pkg></flag>
+    <flag name="skk">Enable support for SKK (<pkg>virtual/skkserv</pkg> or <pkg>app-i18n/skk-jisyo</pkg>)</flag>
+    <flag name="uim">Enable support for <pkg>app-i18n/uim</pkg></flag>
+    <flag name="utempter">Enable support for <pkg>sys-libs/libutempter</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">mlterm</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-terms/mlterm/mlterm-3.8.0.ebuild b/x11-terms/mlterm/mlterm-3.8.0.ebuild
new file mode 100644
index 000000000000..6baa9c1fb9d4
--- /dev/null
+++ b/x11-terms/mlterm/mlterm-3.8.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils
+
+DESCRIPTION="A multi-lingual terminal emulator"
+HOMEPAGE="http://mlterm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
+IUSE="bidi cairo canna debug fcitx freewnn gtk gtk2 harfbuzz ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter xft"
+
+RDEPEND="x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	bidi? ( dev-libs/fribidi )
+	cairo? ( x11-libs/cairo[X(+)] )
+	canna? ( app-i18n/canna )
+	fcitx? ( app-i18n/fcitx )
+	freewnn? ( app-i18n/freewnn )
+	gtk? (
+		gtk2? ( x11-libs/gtk+:2 )
+		!gtk2? ( x11-libs/gtk+:3 )
+	)
+	harfbuzz? ( media-libs/harfbuzz[truetype(+)] )
+	ibus? ( app-i18n/ibus )
+	libssh2? ( net-libs/libssh2 )
+	m17n-lib? ( dev-libs/m17n-lib )
+	nls? ( virtual/libintl )
+	regis? (
+		|| (
+			media-libs/sdl-ttf
+			media-libs/sdl2-ttf
+		)
+	)
+	scim? ( app-i18n/scim )
+	skk? (
+		|| (
+			virtual/skkserv
+			app-i18n/skk-jisyo
+		)
+	)
+	uim? ( app-i18n/uim )
+	utempter? ( sys-libs/libutempter )
+	xft? ( x11-libs/libXft )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+REQUIRED_USE="gtk2? ( gtk )"
+
+DOCS=( doc/{en,ja} )
+
+src_prepare() {
+	# default config
+	sed -i \
+		-e "/ icon_path =/aicon_path = ${EPREFIX}/usr/share/pixmaps/mlterm-icon.svg" \
+		-e "/ scrollbar_view_name =/ascrollbar_view_name = sample" \
+		etc/main
+
+	default
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable bidi fribidi)
+		$(use_enable canna)
+		$(use_enable debug)
+		$(use_enable fcitx)
+		$(use_enable freewnn wnn)
+		$(use_enable harfbuzz otl)
+		$(use_enable ibus)
+		$(use_enable libssh2 ssh2)
+		$(use_enable m17n-lib m17nlib)
+		$(use_enable nls)
+		$(use_enable scim)
+		$(use_enable skk)
+		$(use_enable uim)
+		$(use_enable utempter utmp)
+		--with-type-engines=xcore$(usex xft ",xft" "")$(usex cairo ",cairo" "")
+		--enable-optimize-redrawing
+		--enable-vt52
+		--disable-static
+	)
+
+	local scrollbars="sample,extra"
+	local tools="mlclient,mlcc,mlfc,mlmenu,mlterm-zoom"
+	if use gtk; then
+		myconf+=(
+			$(use_with gtk gtk $(usex gtk2 2.0 3.0))
+			--with-imagelib=gdk-pixbuf
+		)
+		scrollbars+=",pixmap_engine"
+		tools+=",mlconfig,mlimgloader"
+	fi
+	if use regis; then
+		tools+=",registobmp"
+	fi
+	myconf+=( --with-scrollbars="${scrollbars}" )
+	myconf+=( --with-tools="${tools}" )
+
+	addpredict /dev/ptmx
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	:
+}
+
+src_install () {
+	default
+	prune_libtool_files
+
+	docinto contrib/icon
+	dodoc contrib/icon/README
+
+	doicon contrib/icon/mlterm*
+	make_desktop_entry mlterm mlterm mlterm-icon "System;TerminalEmulator"
+}
diff --git a/x11-terms/mlterm/mlterm-3.8.1.ebuild b/x11-terms/mlterm/mlterm-3.8.1.ebuild
new file mode 100644
index 000000000000..2babacfcbd35
--- /dev/null
+++ b/x11-terms/mlterm/mlterm-3.8.1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils
+
+DESCRIPTION="A multi-lingual terminal emulator"
+HOMEPAGE="http://mlterm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="bidi cairo canna debug fbcon fcitx freewnn gtk gtk2 harfbuzz ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter xft"
+
+RDEPEND="x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	bidi? ( dev-libs/fribidi )
+	cairo? ( x11-libs/cairo[X(+)] )
+	canna? ( app-i18n/canna )
+	fbcon? ( media-fonts/unifont )
+	fcitx? ( app-i18n/fcitx )
+	freewnn? ( app-i18n/freewnn )
+	gtk? (
+		gtk2? ( x11-libs/gtk+:2 )
+		!gtk2? ( x11-libs/gtk+:3 )
+	)
+	harfbuzz? ( media-libs/harfbuzz[truetype(+)] )
+	ibus? ( app-i18n/ibus )
+	libssh2? ( net-libs/libssh2 )
+	m17n-lib? ( dev-libs/m17n-lib )
+	nls? ( virtual/libintl )
+	regis? (
+		|| (
+			media-libs/sdl-ttf
+			media-libs/sdl2-ttf
+		)
+	)
+	scim? ( app-i18n/scim )
+	skk? (
+		|| (
+			virtual/skkserv
+			app-i18n/skk-jisyo
+		)
+	)
+	uim? ( app-i18n/uim )
+	utempter? ( sys-libs/libutempter )
+	xft? ( x11-libs/libXft )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+REQUIRED_USE="gtk2? ( gtk )"
+
+PATCHES=( "${FILESDIR}"/${PN}-font.patch )
+DOCS=( doc/{en,ja} )
+
+src_prepare() {
+	# default config
+	sed -i \
+		-e "/ icon_path =/aicon_path = ${EPREFIX}/usr/share/pixmaps/mlterm-icon.svg" \
+		-e "/ scrollbar_view_name =/ascrollbar_view_name = sample" \
+		etc/main
+
+	default
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable bidi fribidi)
+		$(use_enable canna)
+		$(use_enable debug)
+		$(use_enable fcitx)
+		$(use_enable freewnn wnn)
+		$(use_enable harfbuzz otl)
+		$(use_enable ibus)
+		$(use_enable libssh2 ssh2)
+		$(use_enable m17n-lib m17nlib)
+		$(use_enable nls)
+		$(use_enable scim)
+		$(use_enable skk)
+		$(use_enable uim)
+		$(use_enable utempter utmp)
+		--with-gui=xlib$(usex fbcon ",fb" "")
+		--with-type-engines=xcore$(usex xft ",xft" "")$(usex cairo ",cairo" "")
+		--enable-optimize-redrawing
+		--enable-vt52
+		--disable-static
+	)
+
+	local scrollbars="sample,extra"
+	local tools="mlclient,mlcc,mlfc,mlmenu,mlterm-zoom"
+	if use gtk; then
+		myconf+=(
+			$(use_with gtk gtk $(usex gtk2 2.0 3.0))
+			--with-imagelib=gdk-pixbuf
+		)
+		scrollbars+=",pixmap_engine"
+		tools+=",mlconfig,mlimgloader"
+	fi
+	if use regis; then
+		tools+=",registobmp"
+	fi
+	myconf+=( --with-scrollbars="${scrollbars}" )
+	myconf+=( --with-tools="${tools}" )
+
+	addpredict /dev/ptmx
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	:
+}
+
+src_install () {
+	default
+	prune_libtool_files
+
+	docinto contrib/icon
+	dodoc contrib/icon/README
+
+	doicon contrib/icon/mlterm*
+	make_desktop_entry mlterm mlterm mlterm-icon "System;TerminalEmulator"
+}
diff --git a/x11-terms/mlterm/mlterm-3.8.2.ebuild b/x11-terms/mlterm/mlterm-3.8.2.ebuild
new file mode 100644
index 000000000000..2babacfcbd35
--- /dev/null
+++ b/x11-terms/mlterm/mlterm-3.8.2.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils
+
+DESCRIPTION="A multi-lingual terminal emulator"
+HOMEPAGE="http://mlterm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="bidi cairo canna debug fbcon fcitx freewnn gtk gtk2 harfbuzz ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter xft"
+
+RDEPEND="x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	bidi? ( dev-libs/fribidi )
+	cairo? ( x11-libs/cairo[X(+)] )
+	canna? ( app-i18n/canna )
+	fbcon? ( media-fonts/unifont )
+	fcitx? ( app-i18n/fcitx )
+	freewnn? ( app-i18n/freewnn )
+	gtk? (
+		gtk2? ( x11-libs/gtk+:2 )
+		!gtk2? ( x11-libs/gtk+:3 )
+	)
+	harfbuzz? ( media-libs/harfbuzz[truetype(+)] )
+	ibus? ( app-i18n/ibus )
+	libssh2? ( net-libs/libssh2 )
+	m17n-lib? ( dev-libs/m17n-lib )
+	nls? ( virtual/libintl )
+	regis? (
+		|| (
+			media-libs/sdl-ttf
+			media-libs/sdl2-ttf
+		)
+	)
+	scim? ( app-i18n/scim )
+	skk? (
+		|| (
+			virtual/skkserv
+			app-i18n/skk-jisyo
+		)
+	)
+	uim? ( app-i18n/uim )
+	utempter? ( sys-libs/libutempter )
+	xft? ( x11-libs/libXft )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+REQUIRED_USE="gtk2? ( gtk )"
+
+PATCHES=( "${FILESDIR}"/${PN}-font.patch )
+DOCS=( doc/{en,ja} )
+
+src_prepare() {
+	# default config
+	sed -i \
+		-e "/ icon_path =/aicon_path = ${EPREFIX}/usr/share/pixmaps/mlterm-icon.svg" \
+		-e "/ scrollbar_view_name =/ascrollbar_view_name = sample" \
+		etc/main
+
+	default
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable bidi fribidi)
+		$(use_enable canna)
+		$(use_enable debug)
+		$(use_enable fcitx)
+		$(use_enable freewnn wnn)
+		$(use_enable harfbuzz otl)
+		$(use_enable ibus)
+		$(use_enable libssh2 ssh2)
+		$(use_enable m17n-lib m17nlib)
+		$(use_enable nls)
+		$(use_enable scim)
+		$(use_enable skk)
+		$(use_enable uim)
+		$(use_enable utempter utmp)
+		--with-gui=xlib$(usex fbcon ",fb" "")
+		--with-type-engines=xcore$(usex xft ",xft" "")$(usex cairo ",cairo" "")
+		--enable-optimize-redrawing
+		--enable-vt52
+		--disable-static
+	)
+
+	local scrollbars="sample,extra"
+	local tools="mlclient,mlcc,mlfc,mlmenu,mlterm-zoom"
+	if use gtk; then
+		myconf+=(
+			$(use_with gtk gtk $(usex gtk2 2.0 3.0))
+			--with-imagelib=gdk-pixbuf
+		)
+		scrollbars+=",pixmap_engine"
+		tools+=",mlconfig,mlimgloader"
+	fi
+	if use regis; then
+		tools+=",registobmp"
+	fi
+	myconf+=( --with-scrollbars="${scrollbars}" )
+	myconf+=( --with-tools="${tools}" )
+
+	addpredict /dev/ptmx
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	:
+}
+
+src_install () {
+	default
+	prune_libtool_files
+
+	docinto contrib/icon
+	dodoc contrib/icon/README
+
+	doicon contrib/icon/mlterm*
+	make_desktop_entry mlterm mlterm mlterm-icon "System;TerminalEmulator"
+}
diff --git a/x11-terms/mrxvt/Manifest b/x11-terms/mrxvt/Manifest
new file mode 100644
index 000000000000..79b340f52cba
--- /dev/null
+++ b/x11-terms/mrxvt/Manifest
@@ -0,0 +1,7 @@
+AUX mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch 380 SHA256 1b4e5c18d5c2ed6c9e1f198a97e058016b8e6589e1690d494c01bc899c010f30 SHA512 703d32e803d73e21ba5c746bcea94331c43e53e6f1b84a86271e94ae4cc59e6c4e8d4e86cbc3e29d594aec04881db57f587b1e94c42249b2beef08e718b69a36 WHIRLPOOL debf23f883f87477f770659763100e655520c67941552900826aefcbbaf665e5e73098c7c902dbd0890b12583327c17d04f5d2e02a30eaca481088871ee9f51d
+AUX mrxvt-0.5.4-libpng14.patch 841 SHA256 3d37317e91085a8e0ae080590f41bbfbc8159a6b932fc6bc0b9fb6351ef28ba7 SHA512 469f2f40b5f09e645be2f59166787b01eb76215e2810b9804d088ed271f743f8d1850e4ed60795674e5d041364e465da8e1f2159131a5b48cab015a106b383c6 WHIRLPOOL 89f50ebfed2760ff395d403edda2616ed26504f028f04d14a15d27ac54645d47c8510dd5abfca6937fef954bb6588bfb0c9cd5520e8da599b487bc403775ca50
+DIST mrxvt-0.5.4.tar.gz 603978 SHA256 f403ad5a908fcd38a55ed0a7e1b85584cb77be8781199653a39b8af1a9ad10d7 SHA512 572bb4dda9f9b9dcb597f3185922646523bce34003f536acca82992f68f8f7c1a5f2778d626f805ea2cd061e8451fbbf12010e5d655221f76b83440825c80992 WHIRLPOOL 770acc0b03e13e113bfe01f56e9ec58ddba6ae2ee989236836f4dd557dfa89334af8404e3fb5a08e1ffea989852f89871004eb6bd46a2d0b2b9830aaf1dc0455
+EBUILD mrxvt-0.5.4.ebuild 3470 SHA256 6cf4e09e5662201003563cec6bff54903292b3786aeb0bd6e2448f9ee766f052 SHA512 1e16e4cfd43d662eb6e3e6e94515985e40f5eff169dfb54d91b3892d06fea8a965df62f29ca88bef9213bb6fd57c3132882cdc66fb78c919d881cc29a35b4698 WHIRLPOOL 4a1e4890946ad9957efb8653d69c6348bcaa770985e0b66c1ee4ebd29480b288669ec548678f4481936b1d43f0dd53fa2069f05e4688738504f15d7e8ffeeb36
+MISC ChangeLog 2265 SHA256 4cdae9564fd66c1906df3b78851dd592a11b43fce910c8e901515d204fe5e9e6 SHA512 689d4262b40497870c65550883e920da74700a60be92ea3c3f57cf0d5116c4c752eeb22ef1bc9ce21f4c972b13102c4d8130dd2e3118c5283844ec7a16ff0f7e WHIRLPOOL 980043dafb94e05c34d63f800847d5999895e9bd496b3ff7451f1b99545af511159d96a1845127d46b8525496a9308c5bbe2bd10639c1ce4e2a4536e20d42a0f
+MISC ChangeLog-2015 11302 SHA256 218e53716e2fa783ac471cd3fa520d77694e22b6464f9685f8fe36160f7da41b SHA512 a726c23ce34d629d1bc7d134da10d07cdec430812058d4f73ac0e9d83131b20bea57103248658e08a2766ab84b848252c3b6d031265fa86258970075700e2623 WHIRLPOOL c75c3c3a69f582c2c7f106c5416d99748f0af285b4e60b8304a3e3ae3f2a0e5cc75679e1d5aea67061672473b9f8ba64a69d9d79e707cd7d8745b857d1d0aade
+MISC metadata.xml 478 SHA256 2d7e45fccbbd7bf3351ec74f1409784c7519652515c1dbcd9d8bd68f3a21d708 SHA512 fb26a82c0a26b3e23e9307ab811cc05fc6affce3bdf705d9417d8f10de7c8448b506414da9134888f4fc3c6fbf4d261646b77916730df711a0e86952a352ce72 WHIRLPOOL 98b09d7a24ecd48b25aae8dc9c022aa26b4fa5903c6783e474b013beb72dadc7850616df95b056ff45a539bca8602cb346fab92ad78f3fb037a73092df2074d4
diff --git a/x11-terms/mrxvt/files/mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch b/x11-terms/mrxvt/files/mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch
new file mode 100644
index 000000000000..a52a10269bc1
--- /dev/null
+++ b/x11-terms/mrxvt/files/mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch
@@ -0,0 +1,13 @@
+Index: src/tabbar.c
+===================================================================
+--- src/tabbar.c	(revision 337)
++++ src/tabbar.c	(working copy)
+@@ -1327,7 +1327,7 @@
+ 		if( p.we_wordc > 1)
+ 		    rxvt_msg( DBG_ERROR, DBG_TABBAR,
+ 			    "Too many words when expanding %s\n", cwdOption );
+-		else
++		else if( NOT_NULL( *p.we_wordv ) )
+ 		{
+ 		    filename = *p.we_wordv;
+ 
diff --git a/x11-terms/mrxvt/files/mrxvt-0.5.4-libpng14.patch b/x11-terms/mrxvt/files/mrxvt-0.5.4-libpng14.patch
new file mode 100644
index 000000000000..a475b70685dc
--- /dev/null
+++ b/x11-terms/mrxvt/files/mrxvt-0.5.4-libpng14.patch
@@ -0,0 +1,33 @@
+http://repos.archlinux.org/wsvn/packages/mrxvt/trunk/libpng14.patch
+
+--- configure.ac
++++ configure.ac
+@@ -952,7 +952,7 @@
+ if test "x$support_png" = "xyes"; then
+     AC_CHECK_LIB(
+         png,
+-        png_check_sig,
++        png_sig_cmp,
+         [],
+         [support_png=no],
+         [-lz -lm]
+--- src/mpng.c
++++ src/mpng.c
+@@ -83,7 +83,7 @@
+     display_depth = XDefaultDepth(display,XDefaultScreen(display));
+ 
+     fread(sig, 1, 8, ifile);
+-    if (!png_check_sig(sig, 8)){
++    if (png_sig_cmp(sig, 0, 8)){
+       fclose(ifile);
+       return -1;
+     }
+@@ -113,7 +113,7 @@
+ 
+     if (png_depth < 8){
+       if (png_color_type == PNG_COLOR_TYPE_GRAY ){
+-        png_set_gray_1_2_4_to_8(png_ptr);
++        png_set_expand_gray_1_2_4_to_8(png_ptr);
+         png_row_bytes = png_width;
+       }else{
+         png_set_expand(png_ptr);
diff --git a/x11-terms/mrxvt/metadata.xml b/x11-terms/mrxvt/metadata.xml
new file mode 100644
index 000000000000..851e6fdb2596
--- /dev/null
+++ b/x11-terms/mrxvt/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<use>
+		<flag name="menubar">Enable mrxvt menubar</flag>
+		<flag name="utempter">REcords user logins. Useful on multi-user
+			systems</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">materm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild b/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
new file mode 100644
index 000000000000..cb411ad2200f
--- /dev/null
+++ b/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="Multi-tabbed rxvt clone with XFT, transparent background and CJK support"
+HOMEPAGE="http://materm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/materm/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~mips ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+LINGUAS_IUSE="linguas_el linguas_ja linguas_ko linguas_th linguas_zh_CN linguas_zh_TW"
+IUSE="debug png jpeg session truetype menubar utempter xpm ${LINGUAS_IUSE}"
+
+RDEPEND="png? ( media-libs/libpng )
+	utempter? ( sys-libs/libutempter )
+	jpeg? ( virtual/jpeg )
+	truetype? ( x11-libs/libXft
+		media-libs/fontconfig
+		media-libs/freetype
+		elibc_uclibc? ( dev-libs/libiconv ) )
+	x11-libs/libX11
+	x11-libs/libXt
+	xpm? ( x11-libs/libXpm )
+	x11-libs/libXrender"
+
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-001-fix-segfault-when-wd-empty.patch \
+		"${FILESDIR}"/${P}-libpng14.patch
+
+	eautoreconf
+
+	if use elibc_uclibc && use truetype; then
+		# It is stated in the README "Multichar support under XFT requires GNU iconv"
+		sed -i -e 's/LIBS = @LIBS@/LIBS = @LIBS@ -liconv/' "${S}/src/Makefile.in"
+	fi
+}
+
+src_configure() {
+	local myconf
+
+	# if you want to pass any other flags, use EXTRA_ECONF.
+	if use linguas_el ; then
+		myconf="${myconf} --enable-greek"
+	fi
+	if use linguas_ja ; then
+		# --with-encoding=sjis
+		myconf="${myconf} --enable-kanji --with-encoding=eucj"
+	fi
+	if use linguas_ko ; then
+		myconf="${myconf} --enable-kr --with-encoding=kr"
+	fi
+	if use linguas_th ; then
+		myconf="${myconf} --enable-thai"
+	fi
+	if use linguas_zh_CN ; then
+		# --with-encoding=gbk
+		myconf="${myconf} --enable-gb --with-encoding=gb"
+	fi
+	if use linguas_zh_TW ; then
+		myconf="${myconf} --enable-big5 --with-encoding=big5"
+	fi
+
+	# 2006-03-13 gi1242: mrxvt works best with TERM=rxvt AND correctly set
+	# termcap / terminfo entries. If the rxvt termcap / terminfo entries are
+	# messed up then then it's better to set TERM=xterm.
+	#
+	# Provide support for this by setting the or RXVT_TERM environment variables
+	# before emerging, as done in the rxvt ebuild.
+
+	if [[ -n ${RXVT_TERM} ]]; then
+		myconf="${myconf} --with-term=${RXVT_TERM}"
+	fi
+
+	econf \
+		--enable-everything \
+		--with-atab-extra=25 \
+		$(use_enable debug) \
+		$(use_enable jpeg) \
+		$(use_enable png) \
+		$(use_enable xpm) \
+		$(use_enable session sessionmgr) \
+		$(use_enable truetype xft) \
+		$(use_enable utempter) \
+		$(use_enable menubar) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir="${EPREFIX}"/usr/share/doc/${PF} install
+	# Give mrxvt perms to update utmp
+	fowners root:utmp /usr/bin/mrxvt
+	fperms g+s /usr/bin/mrxvt
+	dodoc AUTHORS CREDITS ChangeLog FAQ NEWS README* TODO
+}
+
+pkg_postinst() {
+	if [[ -z $RXVT_TERM ]]; then
+		einfo
+		einfo "If you experience problems with curses programs, then this is"
+		einfo "most likely because of incorrectly set termcap / terminfo"
+		einfo "entries. To fix this you can dry and run (as user)"
+		einfo "	tic /usr/share/doc/${P}/etc/mrxvt.terminfo"
+		einfo "Alternately, run the offending programs with TERM=xterm."
+		einfo
+		einfo "To emerge mrxvt with TERM=xterm by default, set the RXVT_TERM"
+		einfo "environment variable to 'xterm', or your desired default"
+		einfo "terminal name. Alternately you can put 'Mrxvt.termName: xterm'"
+		einfo "in your ~/.mrxvtrc, or /etc/mrxvt/mrxvtrc."
+		einfo
+	fi
+}
diff --git a/x11-terms/multi-aterm/Manifest b/x11-terms/multi-aterm/Manifest
new file mode 100644
index 000000000000..cacf651b42d3
--- /dev/null
+++ b/x11-terms/multi-aterm/Manifest
@@ -0,0 +1,8 @@
+AUX 0.2.1-initialize-vars.patch 317 SHA256 81d6d19a0a364781f26081b867e8b3d45d061b6bee3ed810f0fcff17e06135b3 SHA512 be7a0dde783074c859ffcf6c0ee4a527e2a3229ef19ac9f820116edbdda7d6fe1beac56eb4d682cf0ccd48bccd9252924c1bf0bbd2f7217bfb528be5e671e255 WHIRLPOOL 588c03d02cf0dbf180b9dc4fadb8d5a1aa793d6bfd9221321d96c50504179792a4e10e0d231946990c2d1b9cf3a5bce6a1447ca5b34fcf1792ac43352811cc2b
+AUX multi-aterm-0.2.1-display-security-issue.patch 550 SHA256 1f1f9c52ec352302fb4269205c8ff08342ad8f000eaa4e14ecff84f626772503 SHA512 dd8b216a33585a0d54e4d261a6361b94f626bfef4be5d65d4bde797384f7dcaed85137ae000261775f31c93077a1f42bc56da466713b5e905d61554718b2efaa WHIRLPOOL aaf49e64eac3d08d34a52d8151f27df929eaba6823dcf05751cf8600accd2e9fd011d1b7877cc9b36c7e444baee4389276d6fba906212e07c009a4f99017d6ac
+AUX multi-aterm-0.2.1-libpng14.patch 539 SHA256 25a75cae7cf473872982f5ca0cd2fea827e7a5110d5a495fbe641b7de4b8bd75 SHA512 74b31a1692299f92e85c6894a6ed220be1f20983da2bc8649454bc02d6f1186ebc97b645bee122578dc64630bdb098cd54707ab7b9850fc123a6cf6c9c9c52a6 WHIRLPOOL e011704cdbdb7e717836e3e48d4bd40022edd95bc433d982fd2818697fc99acd5f715395efa79b99c373f62c919d2fbaaea8b0b5ae5887eee589c9573491c1a3
+DIST multi-aterm-0.2.1.tar.gz 237428 SHA256 de12604e29dabd0157ce061c785b482ad8c9721027ec31f60609dc9f647bd5fb SHA512 f5326314c97514609c84ae997c336afe6baa334d2295b4d4803e72411c07c377475a713473193a8d4260eca9008fbbc31c0ef93805e66024ea0814ab504c8d2a WHIRLPOOL 79a869ff5c431a4058f5be63ba4d0c014d7c4999f70d642362c315f17e7c12df35745e74d179f9033858297897ff1077bb8dc22e90a54713b703e1a2859518a1
+EBUILD multi-aterm-0.2.1-r1.ebuild 1197 SHA256 c45650af0e2ab3afe9a22f8c480601047ca81a2afb5ba6cb67738b734e284f9f SHA512 bcbd7c7be5187d06541118b2daa310d86a37dd1fcf94ff7b64e0a2436a6c5b52db1eb1d1df4f816afe119ae777eb0d868f562977162edc1f5f0edd84a77718f2 WHIRLPOOL 5c46bc397ccba8094bc2ca527cd99f55d69d9aa65744f681aa1f63efa248ba09b85de8f7667801aad79b72397e0cbfacf0afbe278c36b7248110f4b053173a08
+MISC ChangeLog 2679 SHA256 fb1b6f17191aad666c68d6a7356d2886f7c1f08ed2592b5b766b28d0fefa2ea3 SHA512 c75ee8265c5cb7b8e65352ace4f98c5b4ba631d690bc249326ae90733fbb91535ca9b8153b364588d1a6f6f9b5ebc22c1f934ff6e1a7394b57e3c401556498b1 WHIRLPOOL 1c14118d4c9b56a40fbba69fb37131eb2bc9c412894227b3d4f7e23356a834f6f022a37404d676c3f620eeb45bb8501aeccf91489e4f28c4610e537ada35a374
+MISC ChangeLog-2015 4353 SHA256 a60273ea57790b5071551d499ce378aff44ca24c6e2c0230e059c69bf657d7eb SHA512 e31a26fd5c54cc90187ed9cb485960e9a570f5d83d72fdfc7b4ce6d9e0c01e57a5a5403bf180eac88a280d49f9b205b0e7662de58c34333d6d206ff65d0f8b05 WHIRLPOOL b02601568ca04a16137a16a132363344e77b27754682c686e020da064209c6b0f49064f82e3d093ab27e76a1a1851a54c6cb95029c11c34576b34022e8a6174f
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/x11-terms/multi-aterm/files/0.2.1-initialize-vars.patch b/x11-terms/multi-aterm/files/0.2.1-initialize-vars.patch
new file mode 100644
index 000000000000..58be689bb961
--- /dev/null
+++ b/x11-terms/multi-aterm/files/0.2.1-initialize-vars.patch
@@ -0,0 +1,11 @@
+--- src/command.c
++++ src/command.c
+@@ -1487,7 +1487,7 @@
+ 	static XComposeStatus compose = { NULL, 0 };
+ 	static unsigned char kbuf[KBUFSZ];
+ 	int             ctrl, meta, shft, len;
+-	KeySym          keysym;
++	KeySym          keysym = 0;
+ 
+ /*
+  * use Num_Lock to toggle Keypad on/off.  If Num_Lock is off, allow an
diff --git a/x11-terms/multi-aterm/files/multi-aterm-0.2.1-display-security-issue.patch b/x11-terms/multi-aterm/files/multi-aterm-0.2.1-display-security-issue.patch
new file mode 100644
index 000000000000..939785484030
--- /dev/null
+++ b/x11-terms/multi-aterm/files/multi-aterm-0.2.1-display-security-issue.patch
@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/219754
+
+--- src/main.c
++++ src/main.c
+@@ -1853,15 +1853,13 @@
+   //get_options(argc, argv);
+   //display_options();
+ 
+-	if (display_name == NULL)
+-		if ((display_name = getenv("DISPLAY")) == NULL)
+-			display_name = ":0";
+-
+ 	Xdisplay = XOpenDisplay(display_name);
+ 
+ 	if (!Xdisplay)
+ 	{
+-		print_error("can't open display %s", display_name);
++		print_error("can't open display %s", display_name?display_name:
++				getenv("DISPLAY")?getenv("DISPLAY"):
++				"as no -d given and DISPLAY not set");
+ 		exit(EXIT_FAILURE);
+ 	}
+   
diff --git a/x11-terms/multi-aterm/files/multi-aterm-0.2.1-libpng14.patch b/x11-terms/multi-aterm/files/multi-aterm-0.2.1-libpng14.patch
new file mode 100644
index 000000000000..6aeadc47780e
--- /dev/null
+++ b/x11-terms/multi-aterm/files/multi-aterm-0.2.1-libpng14.patch
@@ -0,0 +1,20 @@
+--- src/png.c
++++ src/png.c
+@@ -86,7 +86,7 @@
+     display_depth = XDefaultDepth(display,XDefaultScreen(display));
+ 
+     fread(sig, 1, 8, ifile);
+-    if (!png_check_sig(sig, 8)){
++    if (png_sig_cmp (sig, 0, 8)){
+       fclose(ifile);
+       return -1;
+     }
+@@ -116,7 +116,7 @@
+ 
+     if (png_depth < 8){
+       if (png_color_type == PNG_COLOR_TYPE_GRAY ){
+-        png_set_gray_1_2_4_to_8(png_ptr);
++        png_set_expand_gray_1_2_4_to_8(png_ptr);
+         png_row_bytes = png_width;
+       }else{
+         png_set_expand(png_ptr);
diff --git a/x11-terms/multi-aterm/metadata.xml b/x11-terms/multi-aterm/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/x11-terms/multi-aterm/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/x11-terms/multi-aterm/multi-aterm-0.2.1-r1.ebuild b/x11-terms/multi-aterm/multi-aterm-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..3b237a98a4a6
--- /dev/null
+++ b/x11-terms/multi-aterm/multi-aterm-0.2.1-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="rxvt compatible terminal emulator with transparency and tab support"
+HOMEPAGE="http://www.nongnu.org/materm/materm.html"
+SRC_URI="http://www.nongnu.org/materm/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86"
+IUSE="cjk debug jpeg png"
+
+RDEPEND="x11-libs/libXpm
+	jpeg? ( virtual/jpeg )
+	png? ( media-libs/libpng )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+DOCS=( AUTHORS ChangeLog NEWS TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-initialize-vars.patch \
+		"${FILESDIR}"/${P}-display-security-issue.patch \
+		"${FILESDIR}"/${P}-libpng14.patch
+
+	sed -i \
+		-e 's:png_check_sig:png_sig_cmp:' \
+		configure || die
+}
+
+src_configure() {
+	econf \
+		--enable-transparency \
+		--enable-fading \
+		--enable-xterm-scroll \
+		--enable-half-shadow \
+		--enable-graphics \
+		--enable-mousewheel \
+		--with-x \
+		--with-xpm=/usr \
+		$(use_enable cjk kanji) \
+		$(use_enable debug) \
+		$(use_enable jpeg) \
+		$(use_enable png)
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	default
+	newdoc doc/TODO TODO.2
+}
diff --git a/x11-terms/pangoterm/Manifest b/x11-terms/pangoterm/Manifest
new file mode 100644
index 000000000000..892ab25f6d7c
--- /dev/null
+++ b/x11-terms/pangoterm/Manifest
@@ -0,0 +1,11 @@
+DIST pangoterm-0.0_pre20150323.tar.gz 22053 SHA256 8df2bebdd70a77698803d3dd12472b313e29aa5e6387a7b926e0988e0689cf00 SHA512 c8614d51459c68bb03a95e1a59a31d5c199c94001995f880f23a369b9aa6ee72a6769790a8c4592d8829eb52ea246ef051fd36fd729f35c4a80931fd9e42b916 WHIRLPOOL 30adcf8098f3ef03c57f47e7f01ae996572058fc8318e4e31ac2d88ab2d8054c9d5e279bc5721a98bb66a5620356f7dde1aaf7d1a0eeca14c53069eef1126140
+DIST pangoterm-0.0_pre20150913.tar.gz 22074 SHA256 9fcdaaaa572f0e5fb3ac7b1fe3119e724373ed0250518efd47601f902acd1335 SHA512 2efed960bde9378ea25d96e41460245925952d50f60a4f0580ffc71519acb278101cd16c3aedaa8037c2734f09d14a0590731a1a42fe2f357ef9222a8e0bd260 WHIRLPOOL f07e8f407a62fa3e55f312b89937d5b5d6adfd2a4ccdee8e21b0c1d301bdc6b9684bec03f6cc6b2cc222b6e154408116fbd92596bd44a97f42564871a07215e2
+DIST pangoterm-0.0_pre20151022.tar.gz 22588 SHA256 bf0f1f3898aa3bf2533d94036a219fe57e8a9e85558b41e050692261a01b84a7 SHA512 716acd0c47fbca35961aff21a8dba886ec4cb152d89544f20d9752828f9e005a5561090959be64f1db864bde71db1d205d045b8a7baa36d23471e1a87c7fee14 WHIRLPOOL 5a5f5b4b6c34e758d0ac064a12872b45627e335100751cdca6362af990ff1b14dedbbad2ee3b1d75c47d15a9aaf32d2d1255b0249b64a1aa6e413955620f1bea
+DIST pangoterm-0.0_pre20160305.tar.gz 22802 SHA256 47225f8c445a930f22d3a975567dc18116796698657fab9cec15557de6ed8496 SHA512 570c8fe1f7233884a849aa9b9160930b77682a9c3ef6f9c26891eb604c861e01a3ce13d418c8febc92e1cdb2794d5a1cf0097c27183395098c505540146f8467 WHIRLPOOL e23ea7661141fb0f9b6efdc0b46b71d3cbf06d1ab3da5bb670d9077bf0f23f6625919b43fd44dc10268ede52ed116ec91ca38efe1443da89f03c97c92605638a
+EBUILD pangoterm-0.0_pre20150323.ebuild 628 SHA256 a973232d327e3a8add517a1be8228daa21e600ad4dff6d080ee2eabc3b89f282 SHA512 8545395a2d87ea702b2933ebd98190b812ff69e5a910f402facdc18b6407b575877f862d511043482d754b8ab4ba0bc2feca51573dc33cb9c359d9106c722f2c WHIRLPOOL 776d0b9e6a8554ab54a3965646ca9419ab3968338c8941e0082d1f14b1bcdd98682f01606feff895040313e447d42d83e2c0bdf8de9d65e640e32ae0ff68082b
+EBUILD pangoterm-0.0_pre20150913.ebuild 611 SHA256 4afa0a5ac3a980c438e16aa8aabbf20a06ceeb4d56d293adef6fce7c0f527a6b SHA512 79c5bb7b25f843b4947cdd5dc94e7a7f44d81a6c6276817177f4d56f5f575a4a0d41f4127973ffffd45ff5e7c027ccf9ed92f3435c47b2b79d1a58f180ee66b0 WHIRLPOOL 2cd20130258ea5c532603ff89f9f564dc17a43a7c47d6c04d5a0040987406ab9843e72dd1c09c955e525f1f68013403c552c52a641dec060fce7be003457d256
+EBUILD pangoterm-0.0_pre20151022.ebuild 622 SHA256 b5e28836a20a17344e36031cf1ef968076d0c33d07712daf7a0b1dc17624d7d3 SHA512 82b3f5dc51d565257232b732ae6abb2366751fa14326af570036b3a711dcff4071fc49a47f40d53ccb40057c5a0d98fb02e1b883d25c758888bce7f91bed4062 WHIRLPOOL 9a814f92450ada7ea716f67a6867292e3767c8fcfcd9c7769fdfe3dcea42ad313a00797393820c9b4bfde08e02b2390aca6c67825e86fa26513bab2e7cd90bc8
+EBUILD pangoterm-0.0_pre20160305.ebuild 622 SHA256 66a6de4a69d77f73d240b4c006e5452ea9378b93d4367220cb4e03978c54dbc5 SHA512 a694df69939569b7b574a13f13f230e47d133661f01560d9ae3f0b7732f1fe96492c45d87f21567725dc31cd464d5a549c7bbe18dabbca72d05e2dc67bd4324e WHIRLPOOL 0c86ead668ceb6319daed1f12064122820dc2b4dc8b79e5a3b6d2c9e4845bbce0777ceda4a4693b0d71e9dcc0bde0c146ad31950e5303cf83cbf1bb1ccb9a9a9
+MISC ChangeLog 2834 SHA256 31f198b5bdae0e1f4f8916ddee46c27863d1e8bce6d6dff45403606241af4158 SHA512 b47c049b9dbe1ca3f340eae65d2256b6a0690bddcfcf4dface3f340d19119c11fa3ab6b9654e9d5be1d7284a888cc5c2dbc1533758b7df5b6fb21f0c48d2e843 WHIRLPOOL d03d69095052a5dcaf171d75569310f3f75e8d11de208d1ebff95f26f9ec30ebcba6a7ef18d72aa330641799ee63233ade33392d1aac04fe6ba084b39f3b9d39
+MISC ChangeLog-2015 385 SHA256 c6bd02cd5f6852750e1b14bd99d2036411dab0befb898f5d5e9e3e9bbaf09582 SHA512 27d25b3f058ba78dd77bd39e2ba44146d9b5261d7549b5c408acd82334e8db319029193853d2669d32c825d759180dfbe08c6cd1453321d17c2405b7ad88de7d WHIRLPOOL eebc8057124d8f163309dd9fe0bf0cf94046c1bfada8790af1013fbfa2aeb35ec5bb2a393a9a37d7e61b1d03be2794196e7ea4e116fd1ad65fa01c1d103e1002
+MISC metadata.xml 360 SHA256 686e7430277a224011fb5aa02bc084aea7dd377a835c346c76093bebdacbd4aa SHA512 e923c4f5ead3b472bd9fb130faf0196cf29c342efcf7f491ba237a953adb7e7c632714801dbf75398b0f918f8e0e2b8f761f6b5dbf8b386b56745c7a65b85154 WHIRLPOOL 6883cfbd68082431d02b9aaccaad16f2782ca5d49a1d23a72442ec33a432c995540b3672a5815574085fa4839e7a93b812581c0608eec29c7d596447d4169714
diff --git a/x11-terms/pangoterm/metadata.xml b/x11-terms/pangoterm/metadata.xml
new file mode 100644
index 000000000000..624d69d414e3
--- /dev/null
+++ b/x11-terms/pangoterm/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tranquility@gentoo.org</email>
+		<name>Ole Reifschneider</name>
+		<description>A GTK/Pango-based terminal that uses libvterm to provide terminal emulation</description>
+	</maintainer>
+</pkgmetadata>
diff --git a/x11-terms/pangoterm/pangoterm-0.0_pre20150323.ebuild b/x11-terms/pangoterm/pangoterm-0.0_pre20150323.ebuild
new file mode 100644
index 000000000000..f731f0a5896f
--- /dev/null
+++ b/x11-terms/pangoterm/pangoterm-0.0_pre20150323.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A GTK/Pango-based terminal that uses libvterm to provide terminal emulation"
+HOMEPAGE="http://www.leonerd.org.uk/code/pangoterm/"
+SRC_URI="https://dev.gentoo.org/~tranquility/distfiles/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="=dev-libs/libvterm-neovim-0.0_pre20150309"
+RDEPEND="${DEPEND}
+	dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/pango
+"
+
+S=${WORKDIR}/pangoterm-0
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" install
+}
diff --git a/x11-terms/pangoterm/pangoterm-0.0_pre20150913.ebuild b/x11-terms/pangoterm/pangoterm-0.0_pre20150913.ebuild
new file mode 100644
index 000000000000..e67980475a8b
--- /dev/null
+++ b/x11-terms/pangoterm/pangoterm-0.0_pre20150913.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A GTK/Pango-based terminal that uses libvterm to provide terminal emulation"
+HOMEPAGE="http://www.leonerd.org.uk/code/pangoterm/"
+SRC_URI="https://dev.gentoo.org/~tranquility/distfiles/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-libs/libvterm-neovim"
+RDEPEND="${DEPEND}
+	dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/pango
+"
+
+S=${WORKDIR}/pangoterm-0
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" install
+}
diff --git a/x11-terms/pangoterm/pangoterm-0.0_pre20151022.ebuild b/x11-terms/pangoterm/pangoterm-0.0_pre20151022.ebuild
new file mode 100644
index 000000000000..46525d76f3e7
--- /dev/null
+++ b/x11-terms/pangoterm/pangoterm-0.0_pre20151022.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A GTK/Pango-based terminal that uses libvterm to provide terminal emulation"
+HOMEPAGE="http://www.leonerd.org.uk/code/pangoterm/"
+SRC_URI="https://dev.gentoo.org/~tranquility/distfiles/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-libs/libvterm-0.0_pre20151022"
+RDEPEND="${DEPEND}
+	dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/pango
+"
+
+S=${WORKDIR}/pangoterm-0
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" install
+}
diff --git a/x11-terms/pangoterm/pangoterm-0.0_pre20160305.ebuild b/x11-terms/pangoterm/pangoterm-0.0_pre20160305.ebuild
new file mode 100644
index 000000000000..ba7acaacaa4d
--- /dev/null
+++ b/x11-terms/pangoterm/pangoterm-0.0_pre20160305.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A GTK/Pango-based terminal that uses libvterm to provide terminal emulation"
+HOMEPAGE="http://www.leonerd.org.uk/code/pangoterm/"
+SRC_URI="https://dev.gentoo.org/~tranquility/distfiles/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-libs/libvterm-0.0_pre20151022"
+RDEPEND="${DEPEND}
+	dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/pango
+"
+
+S=${WORKDIR}/pangoterm-0
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" install
+}
diff --git a/x11-terms/qterminal/Manifest b/x11-terms/qterminal/Manifest
new file mode 100644
index 000000000000..5371bf1c4bbb
--- /dev/null
+++ b/x11-terms/qterminal/Manifest
@@ -0,0 +1,8 @@
+AUX qterminal-0.7.1-no-liblxqt.patch 1547 SHA256 074d8dbe85f38e6819fd153dc4a9731a4905a9acfcfc9389801b80863bbf022c SHA512 b3c90fdb4de7b72a71141e7366e9a24226876931cf6f006d96f5546b4590e2bced6f20fed7e043554d075a38552fdee82566f606cb7a1234d70f87ff67ae5138 WHIRLPOOL 6e763292e9897a81afb4ee584e5f0296e2f42a5c1f69fdc1d8faae2ef933044f4cd12c71f1fb69fbabe12d7a02856f3806d84282a872c50bdcbc24ac63c61cdf
+AUX qterminal-9999-nofetch.patch 992 SHA256 99bdba8612cf75b7ce9468681b48da4ef5fcf6100297a9aaa1630f804ad3217b SHA512 d46bfb3d3785088e81274645c56f908fcc7978415394c3cdc4d9c164d57f7d8b7743d99d97446c348d6c09424cf7e839041b0450fb8cf5d8f84a1b90cac1b56e WHIRLPOOL f859ae5a4e0878a720cfcd23f194d8b83fd09ead1024b7e13821594555058f7b9311728496b382e82c856d4fcec1ca0d5aeae951bd213696d3d73e7530190b11
+DIST qterminal-0.7.1.tar.xz 99164 SHA256 8d49b29febccc158dd115a099115e4ed1c487d4308ec92818e1abeb8821c848f SHA512 45f83a4179a90379678b7875de386e04c77505d89d8c0c447a0892a279bc1776d0847a54683d43af085bcb306cc0e4d0858f1c49dc6e0e08f549d7350584625d WHIRLPOOL 2070cc0f49ed28e75d1ce846ecb1981fb38e167bee558e7e40a3c6faff6cb3022043d9bff6e17f17d6769f7215af6f0aaa86eac9349ecdeafa4e55abb2425eda
+EBUILD qterminal-0.7.1.ebuild 722 SHA256 53179dc4e57566896e3b21ff05b4bf8200e89628f2a4fb469a4dcf6f60ea82cf SHA512 144dcfbd8f53912d2270c82b0c38bdbd504da0de84258e7f547364b130c7dff4f2cee9fa67b62646417b6adfe474919c54db8b855787380b6c67d21cfbc31b9c WHIRLPOOL 4a494f48fb632a0b5cbf259a64641f4276449c68d6a1bc4192f64096a5802b4b09e044558f7da845e43ff1ea4edd457cf0bdaf5c8deed7baa72de184bffdf124
+EBUILD qterminal-9999.ebuild 670 SHA256 31a83eae2f83261daa6eb06848263554b8bc8bc5c7fa55c912c926733a544dc5 SHA512 7832caf4d48f088efe935ad0f56b1b1de1e66498622d40c4019c6d798e483f2ea0b82f8acf97a68e0940c23bbbc2ba9e6f2a6c25914b05732264fb1035ee0629 WHIRLPOOL d78b98242cf275d44013bc294d5a9b7301f8b136437deafc996cf65075fc9ffafd25a7e0bc48efee6f760e56afdf670ce231552472a90543564c119b742e4132
+MISC ChangeLog 3649 SHA256 2b4e5e131e6d3fc281dfcc96f6e66854fe92ca9ae06a853583dc5537b8932904 SHA512 cafacdc2de2bb66926d3adaa09f73d07fc3d742dbb8cf0949a5de562f8b06f91361da8375306c5d4d37ac8a71f07fc3024d1b800a06275ab4203121b2bb5fa4b WHIRLPOOL b78556fcb41292eebaa456ed2e875789d681d5ab55ebfb58b302016af70eb91644d40cbfc602d01c924efcb7b2e5aa0b641e230f83bde7f046713a26ebe15108
+MISC ChangeLog-2015 1159 SHA256 39bfb245d2dabab0da30ea14704c6bccbd6fc324c802cf23ccfd9976aa584e5d SHA512 9d0da85b387c98a9ea34c2f978528a93c7edc4bb269ca2dedabf7c727e7e49e96c2425bc325ea361622d49b3321cb7b5835bea0f12512f20e6a706a47e9cbc05 WHIRLPOOL 89d05483f8b9d88a58b331fcbcfd47b5a01854d27f9d0a927d6ff90f84381566c25d12782765101ce4bc7b6e3c196701f77477d2592ffcd403885edbafae0bfb
+MISC metadata.xml 331 SHA256 a568f3f0a552ee5ef199da875d44a375ebcd3320bafd3a92cf7e0fc00fcb29e9 SHA512 6093916b3ba5afc8249b5b0444f021719336ab71c8749827c8c629ceb2b6b1edc0aeed5eae3f098f0e3fc120e80f691669ccf85a195386dd17bf6f343121bdd5 WHIRLPOOL 8d3ec83ca620f364642a4a65ad2354c36c9a60e99eb8043a9c5f0ca3cc0d3b7eaa47c39ae5c5ac84bd92dfd93e388762bd28d078502204c5b46316dc05b7da40
diff --git a/x11-terms/qterminal/files/qterminal-0.7.1-no-liblxqt.patch b/x11-terms/qterminal/files/qterminal-0.7.1-no-liblxqt.patch
new file mode 100644
index 000000000000..536c971a0da1
--- /dev/null
+++ b/x11-terms/qterminal/files/qterminal-0.7.1-no-liblxqt.patch
@@ -0,0 +1,51 @@
+Translations are fetched from upstream git repo at build time, so disable them.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -30,14 +30,14 @@
+ # we need qpa/qplatformnativeinterface.h for global shortcut
+ find_package(Qt5Gui REQUIRED)
+ find_package(Qt5Widgets REQUIRED)
+-find_package(Qt5LinguistTools REQUIRED)
++#find_package(Qt5LinguistTools REQUIRED)
+ if(APPLE)
+ elseif(UNIX)
+     find_package(Qt5X11Extras REQUIRED)
+ endif()
+ find_package(QTermWidget5 REQUIRED)
+-find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
+-include(LXQtTranslateTs)
++#find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
++#include(LXQtTranslateTs)
+ message(STATUS "Qt version: ${Qt5Core_VERSION_STRING}")
+ 
+ include(${QTERMWIDGET_USE_FILE})
+@@ -110,17 +110,17 @@
+ qt5_wrap_ui( QTERM_UI ${QTERM_UI_SRC} )
+ qt5_wrap_cpp( QTERM_MOC ${QTERM_MOC_SRC} )
+ qt5_add_resources( QTERM_RCC ${QTERM_RCC_SRC} )
+-lxqt_translate_ts(QTERM_QM
+-    TRANSLATION_DIR "src/translations"
+-    PULL_TRANSLATIONS
+-        ${PULL_TRANSLATIONS}
+-    CLEAN_TRANSLATIONS
+-        ${CLEAN_TRANSLATIONS}
+-    TRANSLATIONS_REPO
+-        ${TRANSLATIONS_REPO}
+-    TRANSLATIONS_REFSPEC
+-        ${TRANSLATIONS_REFSPEC}
+-)
++#lxqt_translate_ts(QTERM_QM
++#    TRANSLATION_DIR "src/translations"
++#    PULL_TRANSLATIONS
++#        ${PULL_TRANSLATIONS}
++#    CLEAN_TRANSLATIONS
++#        ${CLEAN_TRANSLATIONS}
++#    TRANSLATIONS_REPO
++#        ${TRANSLATIONS_REPO}
++#    TRANSLATIONS_REFSPEC
++#        ${TRANSLATIONS_REFSPEC}
++#)
+ 
+ include_directories(
+     "${CMAKE_SOURCE_DIR}"
diff --git a/x11-terms/qterminal/files/qterminal-9999-nofetch.patch b/x11-terms/qterminal/files/qterminal-9999-nofetch.patch
new file mode 100644
index 000000000000..72876c954a0e
--- /dev/null
+++ b/x11-terms/qterminal/files/qterminal-9999-nofetch.patch
@@ -0,0 +1,36 @@
+Do not fetch translations using git at build time.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,7 +24,6 @@
+ endif()
+ find_package(QTermWidget5 REQUIRED)
+ find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
+-include(LXQtTranslateTs)
+ include(LXQtCompilerSettings NO_POLICY_SCOPE)
+ message(STATUS "Qt version: ${Qt5Core_VERSION}")
+ 
+@@ -108,23 +107,6 @@
+ qt5_wrap_ui( QTERM_UI ${QTERM_UI_SRC} )
+ qt5_wrap_cpp( QTERM_MOC ${QTERM_MOC_SRC} )
+ qt5_add_resources( QTERM_RCC ${QTERM_RCC_SRC} )
+-lxqt_translate_ts(QTERM_QM
+-    UPDATE_TRANSLATIONS
+-        ${UPDATE_TRANSLATIONS}
+-    SOURCES
+-        ${QTERM_SRC}
+-        ${QTERM_UI_SRC}
+-        ${QTERM_MOC_SRC}
+-    TRANSLATION_DIR "src/translations"
+-    PULL_TRANSLATIONS
+-        ${PULL_TRANSLATIONS}
+-    CLEAN_TRANSLATIONS
+-        ${CLEAN_TRANSLATIONS}
+-    TRANSLATIONS_REPO
+-        ${TRANSLATIONS_REPO}
+-    TRANSLATIONS_REFSPEC
+-        ${TRANSLATIONS_REFSPEC}
+-)
+ 
+ include_directories(
+     "${PROJECT_SOURCE_DIR}"
diff --git a/x11-terms/qterminal/metadata.xml b/x11-terms/qterminal/metadata.xml
new file mode 100644
index 000000000000..948bf4eaacd2
--- /dev/null
+++ b/x11-terms/qterminal/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">qterminal/qterminal</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-terms/qterminal/qterminal-0.7.1.ebuild b/x11-terms/qterminal/qterminal-0.7.1.ebuild
new file mode 100644
index 000000000000..53bd102090d7
--- /dev/null
+++ b/x11-terms/qterminal/qterminal-0.7.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Qt-based multitab terminal emulator"
+HOMEPAGE="https://github.com/lxde/qterminal"
+SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+	~x11-libs/qtermwidget-${PV}
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-0.7.1-no-liblxqt.patch" )
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-terms/qterminal/qterminal-9999.ebuild b/x11-terms/qterminal/qterminal-9999.ebuild
new file mode 100644
index 000000000000..791a464a7be2
--- /dev/null
+++ b/x11-terms/qterminal/qterminal-9999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils git-r3 gnome2-utils
+
+DESCRIPTION="Qt-based multitab terminal emulator"
+HOMEPAGE="https://github.com/lxde/qterminal"
+EGIT_REPO_URI="https://github.com/lxde/qterminal.git"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+	~x11-libs/qtermwidget-${PV}
+"
+DEPEND="${RDEPEND}
+	dev-util/lxqt-build-tools
+"
+
+PATCHES=( "${FILESDIR}/${P}-nofetch.patch" )
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-terms/root-tail/Manifest b/x11-terms/root-tail/Manifest
new file mode 100644
index 000000000000..73ae61b944fb
--- /dev/null
+++ b/x11-terms/root-tail/Manifest
@@ -0,0 +1,6 @@
+AUX root-tail-1.2-kde.patch 3188 SHA256 e188b8a8a6af4f592ff4777cf3cee32bc5d087b9ff6ec1c97fab5193acd14296 SHA512 f99c8cd04664d7e1afe21854d2ba9114387c55fa89268aca7cbeb88ecfeedad26529bdfd2b52dbe88d74959f4943571bda1f518fb41d8827f04f25e250bc7fb7 WHIRLPOOL c57b26ddd7dbd32956dd44575e4863433ff6332ae11ddd079682209b1dbba426c7723b9769674338f1800a7f71bba7931da7f9e0f057cdb72cb6cb36f1610b33
+DIST root-tail-1.2.tar.gz 20805 SHA256 08fb829cc0edd533aaf2af7bcf12d877a6ff51d60c59be48ba354c5940b80691 SHA512 9e0b046d3e22ad8e85baa356ae8850885759e28624840901465c88c5791595db89da8d7908446cfa52cef180d2ae5a6d3857310679dc37545b6a9cabdd1d3e10 WHIRLPOOL 792109b03d878a10324d3a769c753d38c7aab22774679ca64ed7c98a2d4ed4335903d007cd521785731eab05865020c55f7bb0991ec35ff8234b4b4d8869aa83
+EBUILD root-tail-1.2-r3.ebuild 1016 SHA256 ea56ae797563f942f0c76e7568b575a30f7b90f40e08126d484be58375edc2f0 SHA512 567d3509d6c786fa51d12e5ce3f649779eed6aedd3dc501515b7ac81664c54a1d19863229af667c79de32fc2e463b966d8860d0abca77b6708c249f1387096b8 WHIRLPOOL d8f8a7a68228ab44ef415439b968680e53008c52c05593a7556ebf961f89ac79f12c1ea78674b063b7c8c33f9bc87433e04fd58fb95f8f6dd47eb8b101ada6d0
+MISC ChangeLog 2563 SHA256 3915e70059023935bcbd65b1d46c34e31f2438cb4ab8ceee86611fef9e10f570 SHA512 3f50560838978f8ab1f6c43188ab1b3649975fae6e6580694b31ee16e3d4135140e270e060836329bec90537ed5a33779fb7a38205d26b59c98829ff116daea8 WHIRLPOOL 03e6c8dca1f2bf755d8eba11941808b74b6136d625822433b4d45841dea50bb2cb8ce10be0b4a387bc6e36cff46ef72de12862c05b35c16e11266f07df405173
+MISC ChangeLog-2015 7040 SHA256 bbc0295ba4d474270ba76eb09eece3d28b2143f90b1f65abfd68d8b9b20602b1 SHA512 2bedf15537b3354774ff2450a4d74746d6eab02a0c830d71c09b4f485d91749ad26ce37ff048e502bdcf3cf087fab60a6258d19dca42443a7425864f8e31030d WHIRLPOOL 9926ea1ebeb0aba5d1e7a5d2725b9f84e90151bef58bc3e8c0cf387ccbdf721d6523a075856aaf642e243a41df29035e6e249ade7ef1c23c966f95a9994a5634
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/x11-terms/root-tail/files/root-tail-1.2-kde.patch b/x11-terms/root-tail/files/root-tail-1.2-kde.patch
new file mode 100644
index 000000000000..750edf2fefa0
--- /dev/null
+++ b/x11-terms/root-tail/files/root-tail-1.2-kde.patch
@@ -0,0 +1,125 @@
+diff -bBurN root-tail-1.2/config.h root-tail-my/config.h
+--- root-tail-1.2/config.h	2004-07-30 23:32:39.000000000 +0400
++++ root-tail-my/config.h	2005-02-23 13:02:48.878912688 +0300
+@@ -15,3 +15,4 @@
+ 
+ #define VERSION "1.2"
+ 
++#define KDE
+diff -bBurN root-tail-1.2/root-tail.c root-tail-my/root-tail.c
+--- root-tail-1.2/root-tail.c	2004-07-30 23:33:20.000000000 +0400
++++ root-tail-my/root-tail.c	2005-02-23 13:02:37.599627400 +0300
+@@ -148,6 +148,11 @@
+ regex_t *transformre;
+ #endif
+ 
++#ifdef KDE
++#define ATOM(a) XInternAtom(disp, #a, False)
++
++int screen, ScreenWidth, ScreenHeight;
++#endif
+ 
+ /* prototypes */
+ void list_files (int);
+@@ -227,7 +232,7 @@
+   return Color.pixel;
+ }
+ 
+-#ifndef USE_TOON_GET_ROOT_WINDOW
++#if !defined(USE_TOON_GET_ROOT_WINDOW) && !defined(KDE)
+ static void
+ find_root_window (Display *display, int screen_number)
+ {
+@@ -280,14 +285,91 @@
+         fprintf (stderr, "Can't query tree on root window 0x%lx", root);
+     }
+ }
+-#endif /* USE_TOON_GET_ROOT_WINDOW */
++#elif defined(KDE)
++static Window find_subwindow(Window win, int w, int h) {
++  unsigned int i, j;
++  Window troot, parent, *children;
++  unsigned int n;
++
++  /* search subwindows with same size as display or work area */
++
++  for (i=0; i<10; i++) {
++    XQueryTree(disp, win, &troot, &parent, &children, &n);
++
++    for (j=0; j<n; j++) {
++      XWindowAttributes attrs;
++
++      if (XGetWindowAttributes(disp, children[j], &attrs)) {
++        /* Window must be mapped and same size as display or work space */
++        if (attrs.map_state != 0 &&
++            ((attrs.width == ScreenWidth && attrs.height == ScreenHeight) ||
++             (attrs.width == w && attrs.height == h))) {
++          win = children[j];
++          break;
++        }
++      }
++    }
++
++    XFree(children);
++    if (j == n) break;
++  }
++
++  return win;
++}
++
++static void
++find_root_window (Display *display, int screen_number)
++{
++  Atom type;
++  int format, i;
++  unsigned long nitems, bytes;
++  unsigned int n;
++  root = RootWindow(display, screen_number);
++  Window win = root;
++  Window troot, parent, *children;
++  unsigned char *buf = NULL;
++
++  /* some window managers set __SWM_VROOT to some child of root window */
++
++  XQueryTree(display, root, &troot, &parent, &children, &n);
++  for (i=0; i<(int)n; i++) {
++    if (XGetWindowProperty(display, children[i], ATOM(__SWM_VROOT),
++          0, 1, False, XA_WINDOW, &type, &format, &nitems, &bytes,
++          &buf) == Success && type == XA_WINDOW) {
++      win = * (Window *) buf;
++      XFree(buf);
++      XFree(children);
++      fprintf(stderr, "torsmo: drawing to window from __SWM_VROOT property\n");
++      root=win;
++      return;
++    }
++
++    if (buf) {
++      XFree(buf);
++      buf = 0;
++    }
++  }
++  XFree(children);
++
++  /* get subwindows from root */
++  win = find_subwindow(root, -1, -1);
++
++  win = find_subwindow(win, width, height);
++
++  if (buf) { XFree(buf); buf = 0; }
++
++  root=win;
++}
++#endif /* USE_TOON_GET_ROOT_WINDOW && KDE*/
+ 
+ void
+ InitWindow (void)
+ {
+   XGCValues gcv;
+   unsigned long gcm;
++#ifndef KDE
+   int screen, ScreenWidth, ScreenHeight;
++#endif
+   struct logfile_entry *e;
+ 
+   if (!(disp = XOpenDisplay (dispname)))
diff --git a/x11-terms/root-tail/metadata.xml b/x11-terms/root-tail/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/x11-terms/root-tail/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/x11-terms/root-tail/root-tail-1.2-r3.ebuild b/x11-terms/root-tail/root-tail-1.2-r3.ebuild
new file mode 100644
index 000000000000..db2c2f19a68d
--- /dev/null
+++ b/x11-terms/root-tail/root-tail-1.2-r3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Terminal to display (multiple) log files on the root window"
+HOMEPAGE="http://oldhome.schmorp.de/marc/root-tail.html"
+SRC_URI="http://oldhome.schmorp.de/marc/data/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="kde debug"
+
+RDEPEND="x11-libs/libXext
+	x11-libs/libX11"
+DEPEND="x11-misc/imake
+	app-text/rman
+	x11-misc/gccmakedep
+	x11-libs/libX11
+	x11-proto/xproto"
+
+src_prepare() {
+	use kde && epatch "${FILESDIR}"/${P}-kde.patch
+}
+
+src_configure() {
+	xmkmf -a
+}
+
+src_compile() {
+	sed -i 's:/usr/X11R6/bin:/usr/bin:' Makefile || die "sed Makefile failed"
+	use debug && append-flags -DDEBUG
+	emake \
+		CC=$(tc-getCC) \
+		CCOPTIONS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}" \
+		|| die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install.man || die "make install failed"
+	dodoc Changes README
+}
diff --git a/x11-terms/roxterm/Manifest b/x11-terms/roxterm/Manifest
new file mode 100644
index 000000000000..8976eb388593
--- /dev/null
+++ b/x11-terms/roxterm/Manifest
@@ -0,0 +1,7 @@
+DIST roxterm-2.9.3.tar.bz2 364120 SHA256 36131decfe79fa7d4c8fd325d4feaa843f348532a3871b173e6712fcde5cbda7 SHA512 3f197ebc532721a6132da96d3b4bf65032def43eba4d7b00ecb2c74223c43c0549a9605753e81992c2c4b4955adbbc041e8a31f22947752dc52a9edd46457d16 WHIRLPOOL 956b92892e43a88c3e6aa3894f67d23b8ceace0feb42cb808c3e81916e5f8e1f0c3354f8b6337fbfcd8e315503a17631a699c58d97c5b88fb1b3ae96c7b501c4
+DIST roxterm-3.1.5.tar.xz 309892 SHA256 78cfb639f97ef4bcf12178fe44d287571227b6d1539cbb8fa98810e597f4109f SHA512 f07989331b1cf915e94582bfceff8cb87f20613eb272ccc502fb49c7508a1330cfa3b137c59f300b8541595aed541867c1b0aad36809e7e9a326f7119fde2acd WHIRLPOOL c06a720411c51eae79c649aada2c7c2743b0855860fe6c3103faf37073eb95a7e0ebda110f6c5cf99f41a87d5fa6a7e0f4044e3827cd50a6a5c37b7160f7fb8c
+EBUILD roxterm-2.9.3-r2.ebuild 1236 SHA256 de3a69e8710cfb3c00511a14f5cf826fe1cc2598d0759f820946713bc949d789 SHA512 12107227383bd3df051d4e4164f2b8eb7987f811eed0f49e52b7610ac30dae98ae2203d133c086883072d0b055c823801ba55ab0b92c314e259675f4073f6c61 WHIRLPOOL 16bf6124bbc7fbdaddcf33251888a891f9e637502e7d104f67cfc99c8290b2fa2b23c431eb9a7b008491302cb967fac0e4c5be3d8e58755acc50009f9395bbc8
+EBUILD roxterm-3.1.5-r1.ebuild 1339 SHA256 1c462f57f2523a75e11bf962cc0d36b85f85613d3f7e5b32ea46fba2f71a2235 SHA512 d25e9f15a22cf616e4d0d2b607ffdc699e5ec927f31f431917a5c5f9759f2cbf484e577b877c6295aa365201c12184d2a39560bb9340960e37fe5f92ae65f142 WHIRLPOOL 5c1a1703a8ae670fee059427ed454ad936db3573489298d857f05735f2adbddbdda0239d8a05f379c25cfec0c76dc2a7d8291fc42cb66f5cdfb297c6fab874c4
+MISC ChangeLog 3855 SHA256 d459f5344d0efbd827f05e68af09506339393eb4c934c6b6ba56661e596c9867 SHA512 ec8689f53ee7986d1edac770c6ffccf9a9ecfb74668d2947a509bc27a2ff96fc9cfafd80e94e03ce435ee436d99acbca8f65bfa4ebdd250ad8bdbb887186d919 WHIRLPOOL 4c293c58f9c2e4cb26b0fdfced0272341388b6ecbaf86c5e3c266a19a38438f8a7e77ef2add65ae0ec0738f70ec8dcc45090a58d69eb6b170b88f699d1a16b62
+MISC ChangeLog-2015 9743 SHA256 17ef396eb767cb90b25aefe5080c7bd2cf79a9c41d9c8b1a6593624fa687cecd SHA512 6f1f742daea3820fa78f0cbc168ff5bc0526c55969a6c53969e3afcc2d1e0c179c011a7332768e1329bcef0fb52c27de0a1a395fbbcad62ec451cbe86eed8f0b WHIRLPOOL bd86a9942e0be4b321df8e2cea83d8471eb06a54562155dd3d6e2fa11b8bb8cd97c8af636218c3577c086c1f32b88496efe3755dce35d06dd1fcc629060c3d62
+MISC metadata.xml 504 SHA256 835e79999de65d5678bdeb7af77bca73ebcc476a087c1e5ebff2d45c0db26514 SHA512 604e68ac08757215cae6a19af2076fc31c9e49cc68b751eeba92e17319234c8a6e1e5f85b58b3ea364b41831dc1b2484fd8e47f2dcdb7c4a21b12b7bf4327bca WHIRLPOOL 871a02d3b8c34e7550d0291fd7bd5d9a1bee65f5d5e626668500689192872bcda4b28d2aca99cfd987284dc27c4f31fed4c810336af38c43779e1b985994b47c
diff --git a/x11-terms/roxterm/metadata.xml b/x11-terms/roxterm/metadata.xml
new file mode 100644
index 000000000000..84bf8a1bd86a
--- /dev/null
+++ b/x11-terms/roxterm/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>russell@annunaki2k2.co.uk</email>
+		<name>Russell Knighton</name>
+		<description>Proxy (user) maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">roxterm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-terms/roxterm/roxterm-2.9.3-r2.ebuild b/x11-terms/roxterm/roxterm-2.9.3-r2.ebuild
new file mode 100644
index 000000000000..4cf99a29d538
--- /dev/null
+++ b/x11-terms/roxterm/roxterm-2.9.3-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit gnome2-utils python-any-r1 toolchain-funcs
+
+DESCRIPTION="A terminal emulator designed to integrate with the ROX environment"
+HOMEPAGE="http://roxterm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/roxterm/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="nls"
+
+RDEPEND=">=dev-libs/dbus-glib-0.100
+	>=dev-libs/glib-2.28
+	x11-libs/gtk+:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/vte:2.90"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-libs/libxslt
+	dev-python/lockfile
+	virtual/pkgconfig
+	virtual/imagemagick-tools
+	nls? ( app-text/po4a sys-devel/gettext )"
+
+src_configure() {
+	local myconf=(
+		CC="$(tc-getCC)"
+		CFLAGS="${CFLAGS}"
+		LDFLAGS="${LDFLAGS}"
+		--prefix=/usr
+		--docdir="/usr/share/doc/${PF}"
+		--destdir="${D}"
+	)
+
+	use nls || myconf+=( --disable-gettext --disable-po4a --disable-translations )
+	./mscript.py configure "${myconf[@]}"
+}
+
+src_compile() {
+	./mscript.py build
+}
+
+src_install() {
+	./mscript.py install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-terms/roxterm/roxterm-3.1.5-r1.ebuild b/x11-terms/roxterm/roxterm-3.1.5-r1.ebuild
new file mode 100644
index 000000000000..5c11d4d707c5
--- /dev/null
+++ b/x11-terms/roxterm/roxterm-3.1.5-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit gnome2-utils python-any-r1 toolchain-funcs
+
+DESCRIPTION="A terminal emulator designed to integrate with the ROX environment"
+HOMEPAGE="http://roxterm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/roxterm/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-3"
+SLOT="1"
+KEYWORDS="amd64 x86"
+IUSE="nls"
+
+RDEPEND=">=dev-libs/dbus-glib-0.100
+	dev-libs/glib:2
+	x11-libs/gtk+:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/vte:2.91
+	!x11-terms/roxterm:0"
+# slotted versions of roxterm need block one another due to file collisions. #565288
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-libs/libxslt
+	dev-python/lockfile
+	virtual/pkgconfig
+	virtual/imagemagick-tools
+	nls? ( app-text/po4a sys-devel/gettext )"
+
+src_configure() {
+	local myconf=(
+		CC="$(tc-getCC)"
+		CFLAGS="${CFLAGS}"
+		LDFLAGS="${LDFLAGS}"
+		--prefix=/usr
+		--docdir="/usr/share/doc/${PF}"
+		--destdir="${D}"
+	)
+
+	use nls || myconf+=( --disable-gettext --disable-po4a --disable-translations )
+	./mscript.py configure "${myconf[@]}"
+}
+
+src_compile() {
+	./mscript.py build
+}
+
+src_install() {
+	./mscript.py install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
new file mode 100644
index 000000000000..81e51e4650ee
--- /dev/null
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -0,0 +1,17 @@
+AUX rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch 1230 SHA256 59eb0b72ef05be7e7d9071ec5f05a349359768daa3c5893b14917c50e5e10175 SHA512 233e9af5179468f74c4c0c5dfffe9d41bcd270561354f1feec59feb8a50c12d3d79ac3a5e117c46e24b3eed5c0f62697a440d2fac26b4effdd64b3ceb98302af WHIRLPOOL f3735da4c7645f18531cf4e4b8344bbcbd5e625f5f227552573245e1309b7580f3514ee7eaca971e342d1d06b9a89474301a54be4129d26fe780119c81c32e29
+AUX rxvt-unicode-9.06-case-insensitive-fs.patch 238 SHA256 160a1d88b64ddc4c12c982e11fc61bbc79ab91852e82bd9a5b281a63b9687b9a SHA512 5257b1d33e25a6a390da2f23100fc3a2b8dcc4787205273933c2ba64ecf72e663cdc0cb86273a1ffa1a87b04bbeeff9edbc8c028c521ae612722f21cf6c40762 WHIRLPOOL 1f22c6201042240df6fe4994814366fb5da34b44ed1b02ce7b64fd75d89caf516ad3fa774458a01ab3e8a6519d07dc3954d3b62f18ec641c4e6f554e88299b4e
+AUX rxvt-unicode-9.06-font-width.patch 790 SHA256 fc241d7c11b86f589f41a0f488e8f04875ca6ca937e57bc2347c19dff423a38a SHA512 d2fb68b3e11a78328ded4d2d646ffbaae657e9f23f3b4b81e11bc4350dd3e1e7585eeaeee47a70246bdfb7e12fbb667e40a7766989154235064f56ed4ad0a987 WHIRLPOOL 470399ecdbbb08e13c04d4ca6d814ea4798d0e38f73a2b206e228d4beaef72a03717e0ca267d25b7aa1f9ba28a4af905f6c5b24ed4c0c716fa65b34f171233ef
+AUX rxvt-unicode-9.06-no-urgency-if-focused.diff 287 SHA256 00fc63035890be675e6485277053c8bd0ba4b2253f81af15741a79c5f259fa79 SHA512 3f270ac762c82e678c023e370c1b2ee2fbc1e505243a8aeb91ebcfa70917d0a28c2346657dd75b2fc5869ff1831b23798a292d92c30faebb3acdb29575416025 WHIRLPOOL 30f17087bd0c508d5611305047341299343ae63e9c10890188cd87d833040b93dbdf265b4eb6b32e0d4fcd0b83e34192521dea090a236fd903fc567a8cdd14cc
+AUX rxvt-unicode-9.06-popups-hangs.patch 447 SHA256 34126249d44f55aa74e7b0929994821543fe2d0ec2d789496344a23426532642 SHA512 2f544e686e0e07185ef5bb13c4a511aa417a76b52657ec9d56aed71ea29da28c0fbf7023a2a14690c27660474b4d1c562a5ce6af1111cdaaeec7ea8956bd7055 WHIRLPOOL 983444a94aaa8747f738041d2f3ad4185074a8144d7cd2cab7ec161a1f24345091e1f12a684be002e64b0be5a6901d0c8fad068096034fd2e720eb1eb7ce3fa2
+AUX rxvt-unicode-9.14-clear.patch 937 SHA256 c1010b15d74f56671351e8314264d76f638230e94d4e334691af29a9353a9540 SHA512 fcec6a10359939b6aa9263c5e175893477115ea0e28971283859d3c891fa8f66247dea908883bc712aa044648ef2abb8749697229ea8375dbbc2ca851b0ae527 WHIRLPOOL a3f430b81d46d55c15173ea94d5f30c87b3d023ae1e4d767ef64f36253006d41bad3b3620bea156be23be976fe5f4142aa518ced531e335a8c118bb38cb773e4
+AUX rxvt-unicode-9.19-secondary-wheel.patch 5009 SHA256 1fcc9ecb433fe4ab7568d2ac66199ad112b2f5d685489b7f5fd8b4a9dbf3827a SHA512 adf2b3e48041fddec1ebd617e5d15226d40bfa55e9fb57af3d70084ef44d1110641f393921932c0613a03fe9cba34cf78f0e022b56c522610fc5cd8e24ec0db9 WHIRLPOOL 3a7d0231f843b3949cbfe274c4d95bc8d0041e9258b2cad04a9ec39155d5ed6ed3957453c1a6980e47d133a94cc2fc504e4bddfdb74e0b9345b9d34390a8c07a
+AUX rxvt-unicode-9.21-xsubpp.patch 640 SHA256 845d753be1c61a881344700f4b5b2e4e21f2d49f04f5c80350d4c8d7f2834992 SHA512 70f4c5cb7b6a440f009f693c4dc2f8595051e198250d375cd18704c35059596d77938a3d062740bd26f947bfebdb67ea7d46f59f8cbf08fc73193a62267723ec WHIRLPOOL af26cf6e4da79ee73f4d346bb410a863d075223e4ab410532ac41c3de5ea6188ba6a3fb06183065c429d2335caae932a5e46f0071a55e2ba920dcf13260e67b0
+DIST rxvt-unicode-9.21.tar.bz2 925293 SHA256 75270ed72bc5895a64a1d7392bf45a622204192371c3965bd3dd978dc088956b SHA512 d50adf6b1e6ae3b13492b4f40455d3a56bb174a7c6db4d4525a1277736994adfb74a2cd1e7d3e8a8cfdc4509a9ae32c05a627829e295dc1bd4a5ba7cc2f80776 WHIRLPOOL 92499cfa0ca154d3cbe1d7b6525e01de6a5d14677a28c605a6b676c88f1d9bc0f6cd663a1f1d8b003ac7cc46a9c6fbe49ff9adc7b3dd63eb345c80de9038a6ad
+DIST rxvt-unicode-9.22.tar.bz2 931198 SHA256 e94628e9bcfa0adb1115d83649f898d6edb4baced44f5d5b769c2eeb8b95addd SHA512 b39f1b2cbe6dd3fbd2a0ad6a9d391a2b6f49d7c5e67bc65fe44a9c86937f8db379572c67564c6e21ff6e09b447cdfd4e540544e486179e94da0e0db679c04dd9 WHIRLPOOL 46758c75a86ab82feaec1fb49c3920db87b55865daabb6f576503f2c7ba0cc1e147fb8de74c9fae422512378e31e0c2133f73fb23c2129c68b2d84f47cc85522
+EBUILD rxvt-unicode-9.21.ebuild 3867 SHA256 2c4b54fcab44e3e955c97d9ac0f08d7c07c65557e3a1d884f8abd31ba650171a SHA512 19e003ac52950eca3904e011d7c92a2990c2f3b23781414b8d89d6f6265c957bccb8dedcab4bb7cfa2cbd8debbaab378f906c41bad453b2ef4ecf45f7157c8a3 WHIRLPOOL 74c310b0cb608fe7d16e520724cb7e7d99518076703864b00598c412ffe52e744f2810c9a81ebae83464a4c1ac0682300c3be26792f61c49d0584765a4fa64b8
+EBUILD rxvt-unicode-9.22-r1.ebuild 2051 SHA256 954c2d876b33f7262ef3b570255769ad8e96a834fecf543200bff73a4eaf356d SHA512 1c2706e2378fa7888e2c50115387add5ce7aa81d2cf77f0c7655b19dad0c07a495d4d797c18dd2f7954af3e22816decd0a62e5aedd10ebc328d54371ace4dce4 WHIRLPOOL f1ccca968cfa880bdc755fb0bfe8276cd370cda668005c1105f69bb17ae0aac856ece199fe3daaa8e7f527cc68ca59194242a48dc7e8173b22b583ddd2bd0046
+EBUILD rxvt-unicode-9.22.ebuild 3878 SHA256 4d02bee925e8c46e5d3c2488175ffc4f3a5675760e941e6b391e33115608dfa0 SHA512 7e56cbd35101381acb8133d264ac7724f27d82bd2902217ed2488af59b83a68faf43c1e00beea2261601806e7cc1a2f9095deb10c20dd6e733bd6a3f77d61c9c WHIRLPOOL 32e7beb9d3d5a3931aacf222450a76f1a3a0027815db475e7ff20a0f74db633a67d59c0a3c1e2dde6974246bef6bb66f25bd3eb6f631de28e80a4646d3637da5
+EBUILD rxvt-unicode-9999.ebuild 2015 SHA256 664f782360d2a72053920ee4bf1eb518dbe02d7e21c68c8b347002108072fdff SHA512 882253208d6e089a4294c71e09711b601c3155b2b5dabd7a6e43330f7949c2e9a85c9d1f98da121c159ef61c014bd04eb5574eb8f3fdf2b43a5dfd6b1cd676fb WHIRLPOOL 5ff874505138f14ea67638b5421ad8dcf1a3c6d834af18c1ad95c23b584a594fb24fe931b9a9d674bd14eeed67e679a3aa76c308c93b245c05edafc9b0dd8595
+MISC ChangeLog 3395 SHA256 cd61d8c9958c19050337324a4f82a25ab76517500037107b716cf1aef71291a1 SHA512 8625b6f629b3c076fd091af58e8104dc4d428204d87c0817169dea2f92cf25e6a5110125b236b90b31ab7f33f06e9ecfa4323c5c98ac4b02e76e4619700185ef WHIRLPOOL 7a8010298d8b3207c9548941d333b9b793fc5f998fa9c879b9157a3d898c97a25111f3fbdac93912d50c539d72df36bb7b6efd456427dbf7c5c63e9c5991e950
+MISC ChangeLog-2015 40296 SHA256 1e3bc3d3d42a2415233e6dfd9db9915bd9c6dfdf181add5ab6d57f11756c2485 SHA512 713140bf88fad2f88cc6e6131d263f7cde55a4e6936809b3504b41eb4b9ef8a992c021f2dc12205daad7e949a68eb38d11a60401d715c6095930deffbab32cda WHIRLPOOL 3e7102fda93c10e87a9669feef2d3a72ee43412b26a9d43e4e6c8932036343076ccc3032e8c0e0df492ab6810f1ee78c69b617d94fb7780f40da23f1d26d995d
+MISC metadata.xml 1603 SHA256 a006d48cfe14a165418a9361f6dae1204a6b43ce48d3a2f115ceac3f04709306 SHA512 26bf3b229ba3ec60ee18779d8b4a67f23c8cc7358687adf1434fb3b9d4807187d22514467ce3cfeee1d82c925418b2e2f6efde691109897cd7d5b401b9e1d979 WHIRLPOOL 434d3653ceb534a280b5bcded929179772592cc429d551b72068eb141d16be38ac0398e3060dc782591a7c7708a90e249f54943e83cabc28ccd930e3fad30fbf
diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch
new file mode 100644
index 000000000000..0e8d256f9219
--- /dev/null
+++ b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch
@@ -0,0 +1,33 @@
+While setting MWM_HINTS_DECORATIONS to disable window decorations
+seems to work with most window managers, using _MOTIF_WM_INFO seems
+not to, and in some cases can lead to severe problems with focus
+management. Therefore this patch here disables the _MOTIF_WM_INFO
+check and always attempts to have the window manager honour the
+decorations hint.
+
+If your window manager does not honour MWM_HINTS_DECORATIONS, and you
+are determined that you want to have borderless windows nevertheless,
+you are still free to enable override-redirect manually, using the
+corresponding command line option or X resource.
+
+See also: http://bugs.gentoo.org/show_bug.cgi?id=237271
+2008-09-10 Martin von Gagern
+
+--- a/src/init.C	15 Jul 2008 16:41:22 -0000	1.253
++++ b/src/init.C	10 Sep 2008 08:07:09 -0000
+@@ -1078,15 +1078,7 @@
+ #if ENABLE_FRILLS
+   if (option (Opt_borderLess))
+     {
+-      if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
+-        {
+-          // rxvt_warn("Window Manager does not support MWM hints.  Bypassing window manager control for borderless window.\n");
+-          attributes.override_redirect = true;
+-        }
+-      else
+-        {
+           mwmhints.flags = MWM_HINTS_DECORATIONS;
+-        }
+     }
+ #endif
+ 
diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-case-insensitive-fs.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-case-insensitive-fs.patch
new file mode 100644
index 000000000000..916e24aab385
--- /dev/null
+++ b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-case-insensitive-fs.patch
@@ -0,0 +1,10 @@
+Avoid "make: `install' is up to date." on case insensitive filesystems
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -86,3 +86,5 @@
+ dist: tar.bz2
+ 
+ # ------------------------------------------------------------------------
++
++.PHONY: install
diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-font-width.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-font-width.patch
new file mode 100644
index 000000000000..2c803335d64f
--- /dev/null
+++ b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-font-width.patch
@@ -0,0 +1,21 @@
+--- a/src/rxvtfont.C	2008-07-09 12:21:45.000000000 +0400
++++ b/src/rxvtfont.C	2009-10-30 14:32:53.000000000 +0300
+@@ -1195,12 +1195,14 @@
+           XGlyphInfo g;
+           XftTextExtents16 (disp, f, &ch, 1, &g);
+ 
+-          g.width -= g.x;
+-
++/*  
++ * bukind: don't use g.width as a width of a character!
++ * instead use g.xOff, see e.g.: http://keithp.com/~keithp/render/Xft.tutorial
++ */
+           int wcw = WCWIDTH (ch);
+-          if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
++          if (wcw > 1) g.xOff = g.xOff / wcw;
++          if (width < g.xOff) width = g.xOff;
+ 
+-          if (width    < g.width       ) width    = g.width;
+           if (height   < g.height      ) height   = g.height;
+           if (glheight < g.height - g.y) glheight = g.height - g.y;
+         }
diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-no-urgency-if-focused.diff b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-no-urgency-if-focused.diff
new file mode 100644
index 000000000000..3408d73731c9
--- /dev/null
+++ b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-no-urgency-if-focused.diff
@@ -0,0 +1,15 @@
+--- a/src/screen.C
++++ b/src/screen.C
+@@ -1927,11 +1927,11 @@
+ #  endif
+     XMapWindow (dpy, parent[0]);
+ # endif
+ 
+ # if ENABLE_FRILLS
+-  if (option (Opt_urgentOnBell))
++  if (option (Opt_urgentOnBell) && !focus)
+     set_urgency (1);
+ # endif
+ 
+   if (option (Opt_visualBell))
+     {
diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-popups-hangs.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-popups-hangs.patch
new file mode 100644
index 000000000000..cad5a793d378
--- /dev/null
+++ b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-popups-hangs.patch
@@ -0,0 +1,13 @@
+--- a/src/rxvtperl.xs	30 May 2009 08:51:23 -0000	1.127
++++ b/src/rxvtperl.xs	30 Jul 2009 22:19:33 -0000
+@@ -929,7 +929,9 @@
+ rxvt_term::grab (Time eventtime, int sync = 0)
+ 	CODE:
+ {
+-        int mode = sync ? GrabModeSync : GrabModeAsync;
++        // TA:  20090730:  Always assume Async mode here -- recent Xorg
++        // Servers don't appreciate being put in Sync mode.
++        int mode = GrabModeAsync;
+ 
+         THIS->perl.grabtime = 0;
+ 
diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.14-clear.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.14-clear.patch
new file mode 100644
index 000000000000..050907cea435
--- /dev/null
+++ b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.14-clear.patch
@@ -0,0 +1,25 @@
+store visible lines to buffer before clearing the screen when pressing ctrl-l
+
+patch by rlblaster
+https://bbs.archlinux.org/viewtopic.php?id=129302
+
+--- a/src/command.C
++++ b/src/command.C
+@@ -2932,6 +2932,17 @@
+ 
+       case CSI_CUP:		/* 8.3.21: (1,1) CURSOR POSITION */
+       case CSI_HVP:		/* 8.3.64: (1,1) CHARACTER AND LINE POSITION */
++        if (nargs == 1 && current_screen == 0)
++          {
++            // This is usually followed with clear screen so add some extra
++            // lines to avoid deleting the lines already on screen. If we are
++            // already at the top, add an extra screen height of lines.
++            int extra_lines = nrow-1;
++            if (screen.cur.row == 0)
++              extra_lines += nrow;
++            for (int i = 0; i < extra_lines; ++i)
++              scr_add_lines (L"\r\n", 2);
++          }
+         scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0);
+         break;
+ 
diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.19-secondary-wheel.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.19-secondary-wheel.patch
new file mode 100644
index 000000000000..3a4d4a409814
--- /dev/null
+++ b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.19-secondary-wheel.patch
@@ -0,0 +1,123 @@
+secondary wheel support:
+when using the mouse wheel, if you’re on secondary screen then no scrolling
+will occur, and instead some (3, to be exact) “fake� keystrokes will be sent to
+the running application.
+
+patch by jacky
+i.am.jack.mail@gmail.com
+http://lists.schmorp.de/pipermail/rxvt-unicode/2011q4/001491.html
+
+diff -r d5f9ea7306c4 -r cca1997c1a85 doc/rxvt.1.pod
+--- a/doc/rxvt.1.pod	Wed Dec 21 22:59:04 2011 +0100
++++ b/doc/rxvt.1.pod	Wed Dec 21 23:01:28 2011 +0100
+@@ -455,6 +455,11 @@
+ Turn on/off secondary screen scroll (default enabled); resource
+ B<secondaryScroll>.
+ 
++=item B<-ssw>|B<+ssw>
++
++Turn on/off secondary screen wheel support (default disabled); resource
++B<secondaryWheel>.
++
+ =item B<-hold>|B<+hold>
+ 
+ Turn on/off hold window after exit support. If enabled, @@RXVT_NAME@@
+@@ -1167,6 +1172,13 @@
+ scrollback buffer and, when secondaryScreen is off, switching
+ to/from the secondary screen will instead scroll the screen up.
+ 
++=item B<secondaryWheel:> I<boolean>
++
++Turn on/off secondary wheel (default disabled). If enabled, when on
++secondary screen, using the mouse wheel will not scroll in the buffer
++but instead send 3 "fake" keystrokes (Up/Down arrow) to the running
++application (allows e.g. natural scrolling in B<man>, B<less>, etc).
++
+ =item B<hold>: I<boolean>
+ 
+ Turn on/off hold window after exit support. If enabled, @@RXVT_NAME@@
+diff -r d5f9ea7306c4 -r cca1997c1a85 src/command.C
+--- a/src/command.C	Wed Dec 21 22:59:04 2011 +0100
++++ b/src/command.C	Wed Dec 21 23:01:28 2011 +0100
+@@ -2197,10 +2197,46 @@
+                 }
+               else
+ # endif
++#ifndef NO_SECONDARY_SCREEN
+                 {
+-                  scr_page (dirn, lines);
+-                  scrollBar.show (1);
++                  /* on SECONDARY screen, we send "fake" UP/DOWN keys instead
++                   * (this allows to scroll within man, less, etc) */
++                  if (option (Opt_secondaryWheel) && current_screen != PRIMARY)
++                    {
++                       XKeyEvent event;
++                       event.display     = ev.display;
++                       event.window      = ev.window;
++                       event.root        = ev.root;
++                       event.subwindow   = ev.subwindow;
++                       event.time        = ev.time;
++                       event.x           = ev.x;
++                       event.y           = ev.y;
++                       event.x_root      = ev.x_root;
++                       event.y_root      = ev.y_root;
++                       event.same_screen = ev.same_screen;
++                       event.state       = 0;
++                       event.keycode     = XKeysymToKeycode(ev.display,
++                                            (dirn == UP) ? XK_Up : XK_Down);
++                       for (lines = 0; lines < 3; ++lines)
++                         {
++                            event.type = KeyPress;
++                            XSendEvent (event.display, event.window, True,
++                                        KeyPressMask, (XEvent *) &event);
++                            event.type = KeyRelease;
++                            XSendEvent (event.display, event.window, True,
++                                        KeyPressMask, (XEvent *) &event);
++                          }
++                    }
++                  /* on PRIMARY screen, we scroll in the buffer */
++                  else
++#endif
++                    {
++                       scr_page (dirn, lines);
++                       scrollBar.show (1);
++                    }
++#ifndef NO_SECONDARY_SCREEN
+                 }
++#endif
+             }
+             break;
+ #endif
+diff -r d5f9ea7306c4 -r cca1997c1a85 src/optinc.h
+--- a/src/optinc.h	Wed Dec 21 22:59:04 2011 +0100
++++ b/src/optinc.h	Wed Dec 21 23:01:28 2011 +0100
+@@ -26,6 +26,7 @@
+  def(cursorBlink)
+  def(secondaryScreen)
+  def(secondaryScroll)
++ def(secondaryWheel)
+  def(pastableTabs)
+  def(cursorUnderline)
+ #if ENABLE_FRILLS
+diff -r d5f9ea7306c4 -r cca1997c1a85 src/rsinc.h
+--- a/src/rsinc.h	Wed Dec 21 22:59:04 2011 +0100
++++ b/src/rsinc.h	Wed Dec 21 23:01:28 2011 +0100
+@@ -102,6 +102,7 @@
+ #ifndef NO_SECONDARY_SCREEN
+   def (secondaryScreen)
+   def (secondaryScroll)
++  def (secondaryWheel)
+ #endif
+ #ifdef OFF_FOCUS_FADING
+   def (fade)
+diff -r d5f9ea7306c4 -r cca1997c1a85 src/xdefaults.C
+--- a/src/xdefaults.C	Wed Dec 21 22:59:04 2011 +0100
++++ b/src/xdefaults.C	Wed Dec 21 23:01:28 2011 +0100
+@@ -261,6 +261,7 @@
+ #ifndef NO_SECONDARY_SCREEN
+               BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
+               BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
++              BOOL (Rs_secondaryWheel, "secondaryWheel", "ssw", Opt_secondaryWheel, 0, "enable secondary screen wheel"),
+ #endif
+ #if ENABLE_PERL
+               RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.21-xsubpp.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.21-xsubpp.patch
new file mode 100644
index 000000000000..1d71e96c86dd
--- /dev/null
+++ b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.21-xsubpp.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -136,7 +136,7 @@
+ 	$(PERL) -MExtUtils::Embed -e xsinit -- -std urxvt
+ 
+ rxvtperl.C: rxvtperl.xs iom_perl.h iom_perl.xs typemap typemap.iom
+-	PERL="$(PERL)" $(PERL) @PERLPRIVLIBEXP@/ExtUtils/xsubpp -C++ -typemap @PERLPRIVLIBEXP@/ExtUtils/typemap -typemap 'typemap.iom' -typemap 'typemap' -prototypes $(srcdir)/rxvtperl.xs >$@
++	PERL="$(PERL)" $(PERL) /usr/bin/xsubpp -C++ -typemap @PERLPRIVLIBEXP@/ExtUtils/typemap -typemap 'typemap.iom' -typemap 'typemap' -prototypes $(srcdir)/rxvtperl.xs >$@
+ 
+ rxvtperl.o: rxvtperl.C perlxsi.c
+ 	$(COMPILE) $(PERLFLAGS) -DLIBDIR="\"$(libdir)/urxvt\"" -c $<
diff --git a/x11-terms/rxvt-unicode/metadata.xml b/x11-terms/rxvt-unicode/metadata.xml
new file mode 100644
index 000000000000..7d1c93339ec7
--- /dev/null
+++ b/x11-terms/rxvt-unicode/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jer@gentoo.org</email>
+		<name>Jeroen Roovers</name>
+	</maintainer>
+	<use>
+		<flag name="256-color">Enable 256 color support</flag>
+		<flag name="alt-font-width">Calculate the font width using a different method</flag>
+		<flag name="blink">Enable blinking text</flag>
+		<flag name="buffer-on-clear">Store visible output to history buffer when clearing the screen with ctrl-l.
+	Read https://bbs.archlinux.org/viewtopic.php?id=129302</flag>
+		<flag name="fading-colors">Enable colors fading when off focus</flag>
+		<flag name="focused-urgency">Enable the urgent flag when a terminal window is focused</flag>
+		<flag name="font-styles">Enable support for bold and italic fonts</flag>
+		<flag name="iso14755">Enable ISO-14755 support</flag>
+		<flag name="mousewheel">Enable scrolling via mouse wheel or buttons 4 and 5</flag>
+		<flag name="perl">Enable perl script support. You can still disable this at runtime with -pe ""</flag>
+		<flag name="pixbuf">Enable transparency support using gtk's pixbuf</flag>
+		<flag name="secondary-wheel">Support for wheel scrolling on secondary screens (like mutt).
+	Read http://lists.schmorp.de/pipermail/rxvt-unicode/2011q4/001491.html</flag>
+		<flag name="unicode3">Use 21 instead of 16 bits to represent unicode characters</flag>
+		<flag name="wcwidth">Enable wide char width support</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:rxvt-unicode:rxvt-unicode</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.21.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.21.ebuild
new file mode 100644
index 000000000000..089a6cb89b44
--- /dev/null
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.21.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="rxvt clone with xft and unicode support"
+HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html"
+SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="
+	256-color alt-font-width blink buffer-on-clear +focused-urgency
+	fading-colors +font-styles iso14755 +mousewheel +perl pixbuf secondary-wheel
+	startup-notification xft unicode3 +vanilla wcwidth
+"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.7-r6
+	kernel_Darwin? ( dev-perl/Mac-Pasteboard )
+	media-libs/fontconfig
+	perl? ( dev-lang/perl:= )
+	pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
+	startup-notification? ( x11-libs/startup-notification )
+	x11-libs/libX11
+	x11-libs/libXrender
+	xft? ( x11-libs/libXft )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xproto
+"
+
+RESTRICT="test"
+REQUIRED_USE="vanilla? ( !alt-font-width !buffer-on-clear focused-urgency !secondary-wheel !wcwidth )"
+
+src_prepare() {
+	# fix for prefix not installing properly
+	epatch \
+		"${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch \
+		"${FILESDIR}"/${PN}-9.21-xsubpp.patch
+
+	if ! use vanilla; then
+		ewarn "You are going to include unsupported third-party bug fixes/features."
+		ewarn "If you want even more control over patches, then set USE=vanilla"
+		ewarn "and store your patch set in /etc/portage/patches/${CATEGORY}/${PF}/"
+
+		use wcwidth && epatch doc/wcwidth.patch
+
+		# bug #240165
+		use focused-urgency || epatch "${FILESDIR}"/${PN}-9.06-no-urgency-if-focused.diff
+
+		# bug #263638
+		epatch "${FILESDIR}"/${PN}-9.06-popups-hangs.patch
+
+		# bug #237271
+		epatch "${FILESDIR}"/${PN}-9.05_no-MOTIF-WM-INFO.patch
+
+		# support for wheel scrolling on secondary screens
+		use secondary-wheel && epatch "${FILESDIR}"/${PN}-9.19-secondary-wheel.patch
+
+		# ctrl-l buffer fix
+		use buffer-on-clear && epatch "${FILESDIR}"/${PN}-9.14-clear.patch
+
+		use alt-font-width && epatch "${FILESDIR}"/${PN}-9.06-font-width.patch
+	fi
+
+	# kill the rxvt-unicode terminfo file - #192083
+	sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed"
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=''
+
+	use iso14755 || myconf='--disable-iso14755'
+
+	econf --enable-everything \
+		$(use_enable 256-color) \
+		$(use_enable blink text-blink) \
+		$(use_enable fading-colors fading) \
+		$(use_enable font-styles) \
+		$(use_enable mousewheel) \
+		$(use_enable perl) \
+		$(use_enable pixbuf) \
+		$(use_enable startup-notification) \
+		$(use_enable xft) \
+		$(use_enable unicode3) \
+		${myconf}
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	sed -i \
+		-e 's/RXVT_BASENAME = "rxvt"/RXVT_BASENAME = "urxvt"/' \
+		"${S}"/doc/rxvt-tabbed || die "tabs sed failed"
+}
+
+src_install() {
+	default
+
+	dodoc \
+		README.FAQ Changes doc/README* doc/changes.txt doc/etc/* doc/rxvt-tabbed
+
+	make_desktop_entry urxvt rxvt-unicode utilities-terminal \
+		"System;TerminalEmulator"
+}
+
+pkg_postinst() {
+	if use buffer-on-clear; then
+		ewarn "You have enabled the buffer-on-clear USE flag."
+		ewarn "Please note that, although this works well for most prompts,"
+		ewarn "there have been cases with fancy prompts, like bug #397829,"
+		ewarn "where it caused issues. Proceed with caution."
+		ewarn "  (keep this terminal open until you make sure it works)"
+	fi
+	if use secondary-wheel; then
+		elog "You have enabled the secondary-wheel USE flag."
+		elog "This allows you to scroll in secondary screens"
+		elog "(like mutt's message list/view or nano) using the mouse wheel."
+		elog
+		elog "To actually enable the feature you have to add"
+		elog "  URxvt*secondaryWheel: true"
+		elog "in your ~/.Xdefaults file"
+	fi
+}
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild
new file mode 100644
index 000000000000..e7b929cafa03
--- /dev/null
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils
+
+DESCRIPTION="rxvt clone with xft and unicode support"
+HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html"
+SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="
+	256-color blink fading-colors +font-styles iso14755 +mousewheel +perl
+	pixbuf startup-notification unicode3 xft
+"
+RESTRICT="test"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.7-r6:=
+	kernel_Darwin? ( dev-perl/Mac-Pasteboard )
+	media-libs/fontconfig
+	perl? ( dev-lang/perl:= )
+	pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
+	startup-notification? ( x11-libs/startup-notification )
+	x11-libs/libX11
+	x11-libs/libXrender
+	xft? ( x11-libs/libXft )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xproto
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch
+	"${FILESDIR}"/${PN}-9.21-xsubpp.patch
+)
+
+src_prepare() {
+	default
+
+	# kill the rxvt-unicode terminfo file - #192083
+	sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	# --enable-everything goes first: the order of the arguments matters
+	econf \
+		--enable-everything \
+		$(use_enable 256-color) \
+		$(use_enable blink text-blink) \
+		$(use_enable fading-colors fading) \
+		$(use_enable font-styles) \
+		$(use_enable iso14755) \
+		$(use_enable mousewheel) \
+		$(use_enable perl) \
+		$(use_enable pixbuf) \
+		$(use_enable startup-notification) \
+		$(use_enable unicode3) \
+		$(use_enable xft)
+}
+
+src_compile() {
+	default
+
+	sed -i \
+		-e 's/RXVT_BASENAME = "rxvt"/RXVT_BASENAME = "urxvt"/' \
+		"${S}"/doc/rxvt-tabbed || die
+}
+
+src_install() {
+	default
+
+	dodoc \
+		README.FAQ Changes doc/README* doc/changes.txt doc/etc/* doc/rxvt-tabbed
+
+	make_desktop_entry urxvt rxvt-unicode utilities-terminal \
+		"System;TerminalEmulator"
+}
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22.ebuild
new file mode 100644
index 000000000000..d690b6b09cd5
--- /dev/null
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.22.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="rxvt clone with xft and unicode support"
+HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html"
+SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="
+	256-color alt-font-width blink buffer-on-clear +focused-urgency
+	fading-colors +font-styles iso14755 +mousewheel +perl pixbuf secondary-wheel
+	startup-notification xft unicode3 +vanilla wcwidth
+"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.7-r6:=
+	kernel_Darwin? ( dev-perl/Mac-Pasteboard )
+	media-libs/fontconfig
+	perl? ( dev-lang/perl:= )
+	pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
+	startup-notification? ( x11-libs/startup-notification )
+	x11-libs/libX11
+	x11-libs/libXrender
+	xft? ( x11-libs/libXft )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xproto
+"
+
+RESTRICT="test"
+REQUIRED_USE="vanilla? ( !alt-font-width !buffer-on-clear focused-urgency !secondary-wheel !wcwidth )"
+
+src_prepare() {
+	# fix for prefix not installing properly
+	epatch \
+		"${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch \
+		"${FILESDIR}"/${PN}-9.21-xsubpp.patch
+
+	if ! use vanilla; then
+		ewarn "You are going to include unsupported third-party bug fixes/features."
+		ewarn "If you want even more control over patches, then set USE=vanilla"
+		ewarn "and store your patch set in /etc/portage/patches/${CATEGORY}/${PF}/"
+
+		use wcwidth && epatch doc/wcwidth.patch
+
+		# bug #240165
+		use focused-urgency || epatch "${FILESDIR}"/${PN}-9.06-no-urgency-if-focused.diff
+
+		# bug #263638
+		epatch "${FILESDIR}"/${PN}-9.06-popups-hangs.patch
+
+		# bug #237271
+		epatch "${FILESDIR}"/${PN}-9.05_no-MOTIF-WM-INFO.patch
+
+		# support for wheel scrolling on secondary screens
+		use secondary-wheel && epatch "${FILESDIR}"/${PN}-9.19-secondary-wheel.patch
+
+		# ctrl-l buffer fix
+		use buffer-on-clear && epatch "${FILESDIR}"/${PN}-9.14-clear.patch
+
+		use alt-font-width && epatch "${FILESDIR}"/${PN}-9.06-font-width.patch
+	fi
+
+	# kill the rxvt-unicode terminfo file - #192083
+	sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed"
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=''
+
+	use iso14755 || myconf='--disable-iso14755'
+
+	econf --enable-everything \
+		$(use_enable 256-color) \
+		$(use_enable blink text-blink) \
+		$(use_enable fading-colors fading) \
+		$(use_enable font-styles) \
+		$(use_enable mousewheel) \
+		$(use_enable perl) \
+		$(use_enable pixbuf) \
+		$(use_enable startup-notification) \
+		$(use_enable xft) \
+		$(use_enable unicode3) \
+		${myconf}
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	sed -i \
+		-e 's/RXVT_BASENAME = "rxvt"/RXVT_BASENAME = "urxvt"/' \
+		"${S}"/doc/rxvt-tabbed || die "tabs sed failed"
+}
+
+src_install() {
+	default
+
+	dodoc \
+		README.FAQ Changes doc/README* doc/changes.txt doc/etc/* doc/rxvt-tabbed
+
+	make_desktop_entry urxvt rxvt-unicode utilities-terminal \
+		"System;TerminalEmulator"
+}
+
+pkg_postinst() {
+	if use buffer-on-clear; then
+		ewarn "You have enabled the buffer-on-clear USE flag."
+		ewarn "Please note that, although this works well for most prompts,"
+		ewarn "there have been cases with fancy prompts, like bug #397829,"
+		ewarn "where it caused issues. Proceed with caution."
+		ewarn "  (keep this terminal open until you make sure it works)"
+	fi
+	if use secondary-wheel; then
+		elog "You have enabled the secondary-wheel USE flag."
+		elog "This allows you to scroll in secondary screens"
+		elog "(like mutt's message list/view or nano) using the mouse wheel."
+		elog
+		elog "To actually enable the feature you have to add"
+		elog "  URxvt*secondaryWheel: true"
+		elog "in your ~/.Xdefaults file"
+	fi
+}
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild
new file mode 100644
index 000000000000..43645a40943a
--- /dev/null
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools cvs eutils
+
+DESCRIPTION="rxvt clone with xft and unicode support"
+HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html"
+ECVS_SERVER="cvs.schmorp.de/schmorpforge"
+ECVS_USER="anonymous"
+ECVS_MODULE="rxvt-unicode"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="
+	256-color blink fading-colors +font-styles iso14755 +mousewheel +perl
+	pixbuf startup-notification xft unicode3
+"
+RESTRICT="test"
+
+RDEPEND="
+	media-libs/fontconfig
+	sys-libs/ncurses:*
+	x11-libs/libX11
+	x11-libs/libXrender
+	kernel_Darwin? ( dev-perl/Mac-Pasteboard )
+	perl? ( dev-lang/perl:= )
+	pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
+	startup-notification? ( x11-libs/startup-notification )
+	xft? ( x11-libs/libXft )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xproto
+"
+
+S=${WORKDIR}/${PN}
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch
+	"${FILESDIR}"/${PN}-9.21-xsubpp.patch
+
+)
+
+src_prepare() {
+	ecvs_clean
+
+	# kill the rxvt-unicode terminfo file - #192083
+	sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die
+
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=''
+
+	use iso14755 || myconf='--disable-iso14755'
+
+	# --enable-everything goes first: the order of the arguments matters
+	econf --enable-everything \
+		$(use_enable 256-color) \
+		$(use_enable blink text-blink) \
+		$(use_enable fading-colors fading) \
+		$(use_enable font-styles) \
+		$(use_enable iso14755) \
+		$(use_enable mousewheel) \
+		$(use_enable perl) \
+		$(use_enable pixbuf) \
+		$(use_enable startup-notification) \
+		$(use_enable unicode3) \
+		$(use_enable xft)
+}
+
+src_compile() {
+	default
+
+	sed -i \
+		-e 's/RXVT_BASENAME = "rxvt"/RXVT_BASENAME = "urxvt"/' \
+		"${S}"/doc/rxvt-tabbed || die
+}
+
+src_install() {
+	default
+
+	dodoc \
+		README.FAQ Changes doc/README* doc/changes.txt doc/etc/* doc/rxvt-tabbed
+
+	make_desktop_entry urxvt rxvt-unicode utilities-terminal \
+		"System;TerminalEmulator"
+}
diff --git a/x11-terms/sakura/Manifest b/x11-terms/sakura/Manifest
new file mode 100644
index 000000000000..b776b25c07b5
--- /dev/null
+++ b/x11-terms/sakura/Manifest
@@ -0,0 +1,10 @@
+AUX sakura-3.1.3-flags.patch 626 SHA256 072f4d0329f9667d235ef656c2d934dbd851ad9a8554652a94925d1bb11b13d7 SHA512 007a2f2ab722bd991cee0da708efba301b3c69bb86eff25a14519008ad485e8e6ed1c8e2ded6fcd88ff7066528ff539eced4d105a84d6774aa952150beddc57f WHIRLPOOL 674d9d9b915ee1880807d7aae90d05907c69d7130cd880c45a56c35d9dd0efd8582a8f6526e19e72242532b90a7973ad365f62035a968eebb87860974d1f9cd9
+DIST sakura-3.3.4.tar.bz2 52839 SHA256 27277214964851fa23ecc290f0eae391af3d11279ec42769d84a7be1feccd3ba SHA512 a84849e2fa7b45da513ff05a1e1636eb8d331b7c632f18605d6aa01463e44d877c057f2f628bfdc27e9f6ff29b0441ba248885d92341ed3a9b5eb281d02e34d7 WHIRLPOOL 22e10b9098db39151b32b6cfaec4cbffb1991e65212a3d1acc768e250aca3fb3f5ff17c86b09df66706e7a38cec868f5c66a9048cd71e754f03bae5efeffe110
+DIST sakura-3.4.0.tar.bz2 54907 SHA256 04487511049d596856d700d524c3354610c7caae8bb87ba3c16851356d3f40ee SHA512 5d8f62638bd826a294b240960f2bd696583f8cad4799ab5862796b6210320f94ee11e64847c36ca6765f9281fb8fabb7a699db6fcf1de41c5e7f82bb281e9512 WHIRLPOOL 4ebcd55b0deac473df39125397ce99ae3cfa68ba991e28eb447fbee0a8758a000400a748d142addf18ea60b3677ff4118dbd5a10ffa6adcefcabf16c141c86c3
+DIST sakura-3.5.0.tar.bz2 55432 SHA256 eb30ede41083fda2b07c6a3b7393150f48867e81d28ef70b15824740cab00c3a SHA512 20c691342c68a2a6f7397da754c83b19c7622e25984ae9fe9fef47492e19cd7589dd9d1bd2ccb82bd9c6ab82f92c97c1b742795434a101a0e169c6f901f40d9e WHIRLPOOL 7c0bff58bbe2725f64e38bcde594f1637d9e60c6a207d3ae44c005f34dea2417f6ace724f014ecd4f996f878166fadd4e4c336c980286b6e0a951134923ebd9d
+EBUILD sakura-3.3.4.ebuild 906 SHA256 0a5e25d7748cad167f94df9cd4371fc7a1903b27b7fb391e1df9a0e6e3169c54 SHA512 5461559e63d9eaf5ae4d3bd9da90228fb96cc1dea8a588f9297ed071222de6d799e6712671c41f15420b1b5851448bbbe22dd39457d77c236d8bea8a3964f2d1 WHIRLPOOL 08af7defc6d57d7184d6eb0b43d7071a07830dd3dea49e3b2f42d4bb49e61869680dd9b389cf6789dcf9c8ce4cf7ed1e746a24fdf5cbf89f2e95c438976dc3ec
+EBUILD sakura-3.4.0.ebuild 1216 SHA256 cf0776a648807df87c2eac88c4d029209a22a55efd4d91ebcda4455b4a948bdf SHA512 0bcedeb6b85b5499bcbc1ea73508af9ad12cdcb87f6807076368873f2880f6b945e8300327c7aa25d9808ce753438a269267dd6c1d81c40f8d4ac797dad6d5f2 WHIRLPOOL b1fc0ffafcc219a759194a637af82220ca7e1827ff31f9daec68718cd085b6b176d3285de88f7eebf91c20eec8b7382ca53c935832c7d245f2fab78f616f8acf
+EBUILD sakura-3.5.0.ebuild 1387 SHA256 e208366cdf363f6fa1324a51975ffc476d682d7404c61d26c840bf90c84f7e9d SHA512 c9842e1c0e4103071573cb8541609ab9ee9646e8847ae38decc980cdff44e7823d897ab4e63ee17e0dcf2d5b48014997c65902e8d67befe1806e03a083b85209 WHIRLPOOL f35cf1de89c2b37ad33a57160fe98950f65bbfc2ccce3b552ca71c7426f96879f486bc06b773812253a1cec0af7b1a64e67085720273d9a949ca9272d43cb034
+MISC ChangeLog 3715 SHA256 bacfb4fcedd79a39f4a393de94d01c5e12f3187b0216edb4fbf65c7b3ec122e6 SHA512 799273d3361d82e615554075a2c333c3372fd142ba4bf85c023ba837397d2b9ef4a1c60030a398eb4eaac264ab2cbd4c26289653fa22c87c2448df375a9f1b1a WHIRLPOOL 7a920beca99442a1da1391eedc644a2a56f19bc6db80f04b3724693ae3b322736cbb5a73fd48c70653a72bfad40d62ffff89e5b9e3bd849ac2fe7d0b072e3492
+MISC ChangeLog-2015 7488 SHA256 5a1c3023d2989df352031b715d474a1ef009046147b3aa0ab68d54a4ab4a1ce6 SHA512 f44f4617961a0f9d68d9e6435507f1ca734cb7ce93e96ba69c6859ecdc24c50a12ceb90682689e12547e0b46823886ad868193172caf082d5f03e02d534d0337 WHIRLPOOL 68356c08b1638055008844e574961c057c708f9aadc4e6ff6dce90a7475097c53d5b04a17b9a724791bfacabcdb8ee39971621077127d2364ed11b1271113f04
+MISC metadata.xml 928 SHA256 92d866e6e9eaaf4036133c69b4e50c6d8ec9809f25541ed9fee82e2dee45b23e SHA512 95be972f218e92365f8084f3a796199c3f7a182bc42c098761096f2146323afcdb2fc45e6c4ec975f03decdac05b9c01083c768162bf97c88c61dab892419ffb WHIRLPOOL 7969fc2db6a8db526ae0617c255ee468d33444ff053c13731091d7f40a7ed24611072420f8cbcd1f46e3a3d470206b409f483cf5cee800b38e56de3a213150c1
diff --git a/x11-terms/sakura/files/sakura-3.1.3-flags.patch b/x11-terms/sakura/files/sakura-3.1.3-flags.patch
new file mode 100644
index 000000000000..28b72dd694a6
--- /dev/null
+++ b/x11-terms/sakura/files/sakura-3.1.3-flags.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -35,12 +35,6 @@
+ ADD_DEFINITIONS (-DDATADIR=\\\"${CMAKE_INSTALL_PREFIX}/share\\\")
+ ADD_DEFINITIONS (-DBUILDTYPE=\\\"${CMAKE_BUILD_TYPE}\\\")
+ 
+-IF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
+-	SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+-ELSE (${CMAKE_BUILD_TYPE} NOT MATCHES "Debug")
+-	SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -Wno-deprecated-declarations")
+-ENDIF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
+-
+ INCLUDE_DIRECTORIES (. ${GTK_INCLUDE_DIRS} ${VTE_INCLUDE_DIRS})
+ LINK_DIRECTORIES (${GTK_LIBRARY_DIRS} ${VTE_LIBRARY_DIRS})
+ LINK_LIBRARIES (${GTK_LIBRARIES} ${VTE_LIBRARIES} m)
diff --git a/x11-terms/sakura/metadata.xml b/x11-terms/sakura/metadata.xml
new file mode 100644
index 000000000000..9825940be72b
--- /dev/null
+++ b/x11-terms/sakura/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
+  <longdescription>
+    sakura is a terminal emulator based on GTK and VTE. It's a terminal emulator
+    with few dependencies, so you don't need a full GNOME desktop installed to
+    have a decent terminal emulator. Current terminal emulators based on VTE are
+    gnome-terminal, XFCE Terminal, TermIt and a small sample program included
+    in the vte sources. Sakura differences from the last one is that it uses a
+    notebook to provide several terminals in one window and adds a contextual
+    menu with some basic options. No more no less.
+  </longdescription>
+  <upstream>
+    <remote-id type="launchpad">sakura</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-terms/sakura/sakura-3.3.4.ebuild b/x11-terms/sakura/sakura-3.3.4.ebuild
new file mode 100644
index 000000000000..f55472bc7960
--- /dev/null
+++ b/x11-terms/sakura/sakura-3.3.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit cmake-utils eutils
+
+DESCRIPTION="sakura is a terminal emulator based on GTK and VTE"
+HOMEPAGE="http://www.pleyades.net/david/projects/sakura/"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~arm-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-libs/glib-2.20:2
+	x11-libs/gtk+:3[X]
+	x11-libs/vte:2.91
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-lang/perl-5.10.1
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.1.3-flags.patch )
+
+DOCS=( AUTHORS )
+
+src_prepare() {
+	sed -i "/FILES INSTALL/d" CMakeLists.txt || die
+
+	strip-linguas -i po/
+	local lingua
+	for lingua in po/*.po; do
+		lingua="${lingua/po\/}"
+		lingua="${lingua/.po}"
+		if ! has ${lingua} ${LINGUAS}; then
+			rm po/${lingua}.po || die
+		fi
+	done
+
+	cmake-utils_src_prepare
+}
diff --git a/x11-terms/sakura/sakura-3.4.0.ebuild b/x11-terms/sakura/sakura-3.4.0.ebuild
new file mode 100644
index 000000000000..315f2a8ec16e
--- /dev/null
+++ b/x11-terms/sakura/sakura-3.4.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils eutils flag-o-matic
+
+DESCRIPTION="sakura is a terminal emulator based on GTK and VTE"
+HOMEPAGE="http://www.pleyades.net/david/projects/sakura/"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~arm-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-libs/glib-2.20:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libX11
+	x11-libs/vte:2.91
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-lang/perl-5.10.1
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.3-flags.patch
+)
+
+DOCS=(
+	AUTHORS
+)
+
+src_prepare() {
+	sed -i "/FILES INSTALL/d" CMakeLists.txt || die
+
+	strip-linguas -i po/
+	local lingua
+	for lingua in po/*.po; do
+		lingua="${lingua/po\/}"
+		lingua="${lingua/.po}"
+		if ! has ${lingua} ${LINGUAS}; then
+			rm po/${lingua}.po || die
+		fi
+	done
+
+	cmake-utils_src_prepare
+	# sakura.c:1740:3: warning: implicit declaration of function ‘readlink’
+	# [-Wimplicit-function-declaration]
+	append-cppflags -D_DEFAULT_SOURCE
+
+	# sakura.c:1348:9: error: ‘for’ loop initial declarations are only allowed
+	# in C99 or C11 mode
+	append-cflags -std=c99
+}
diff --git a/x11-terms/sakura/sakura-3.5.0.ebuild b/x11-terms/sakura/sakura-3.5.0.ebuild
new file mode 100644
index 000000000000..ea31dcb86d1b
--- /dev/null
+++ b/x11-terms/sakura/sakura-3.5.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils eutils flag-o-matic gnome2-utils xdg-utils
+
+DESCRIPTION="sakura is a terminal emulator based on GTK and VTE"
+HOMEPAGE="http://www.pleyades.net/david/projects/sakura/"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~arm-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-libs/glib-2.20:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libX11
+	x11-libs/vte:2.91
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-lang/perl-5.10.1
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.3-flags.patch
+)
+
+DOCS=(
+	AUTHORS
+)
+
+src_prepare() {
+	sed -i "/FILES INSTALL/d" CMakeLists.txt || die
+
+	strip-linguas -i po/
+	local lingua
+	for lingua in po/*.po; do
+		lingua="${lingua/po\/}"
+		lingua="${lingua/.po}"
+		if ! has ${lingua} ${LINGUAS}; then
+			rm po/${lingua}.po || die
+		fi
+	done
+
+	cmake-utils_src_prepare
+	# sakura.c:1740:3: warning: implicit declaration of function ‘readlink’
+	# [-Wimplicit-function-declaration]
+	append-cppflags -D_DEFAULT_SOURCE
+
+	# sakura.c:1348:9: error: ‘for’ loop initial declarations are only allowed
+	# in C99 or C11 mode
+	append-cflags -std=c99
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/x11-terms/st/Manifest b/x11-terms/st/Manifest
new file mode 100644
index 000000000000..d039c0d8bbae
--- /dev/null
+++ b/x11-terms/st/Manifest
@@ -0,0 +1,6 @@
+DIST st-0.7.tar.gz 42418 SHA256 f7870d906ccc988926eef2cc98950a99cc78725b685e934c422c03c1234e6000 SHA512 9384820d373bfaaef1887290351d8c34abeef26cd7d50ddbae56ffb865864bcca9be798c6238bf1ce595ba7c317f2c1d97653055da0aa302e322eeee822768d4 WHIRLPOOL 28a799a3fc770dea1d82136580217033245fd74488107afcd428d0cde665c87bcf03d18cec31df0cb74f77ed9ea8b84f22990ce29bc6457c4dafce43bfac1e22
+EBUILD st-0.7.ebuild 1124 SHA256 970827c413bad8afb2329a7af18542167cc47e3b7ec2732d19e30d4fd22f3542 SHA512 fac3471f7e30fc157c98b0813e9bcf8deec461a873374c72ae074141004ddf391f69872bbc9f39f5e6e0c5f3bab755613ffb7d569989dfe308ada22cea8e1cd6 WHIRLPOOL 90fa547056563d2833bf7e85fef6e66b49dad0927d44fc8644c495d8a858798adfe9f280e7bc393815596dd3149d0d901cd8ab75e786d2bb0264f283e0ebd8ac
+EBUILD st-9999.ebuild 1407 SHA256 33a55d01959e2052975c5e11c3e0c99ad0de3a4a03e77e3c0cb4e73f0eaed785 SHA512 a33b717161fc26ea0e7e62b8a62d9444a7a7316f5c1a22e56e5e997558122a2a01e7ee142e295bf58e188ec38094529ba58bc8a4233315bdae6358d17a87ab60 WHIRLPOOL d743224c2645e3c0dfc89744a897c238b11f75f553a9a9d0682d542874ff05c5b2ed53430b8d92ec61a93c3ee2c0663a8fd36a567229918f33f156ce295138d3
+MISC ChangeLog 3642 SHA256 8726c8ae22d3bedd5417949f693bf50d21691ea78a3c190234d2aa9a16ad2ff5 SHA512 7889ce964ee2b601f02a712f2eeedfa2f0ec8cf5ef08678a8f350d14913b2732ae99d0db0934ad46381f17aae1298e9239a54ce12bc1e55d88098a2faaef7e66 WHIRLPOOL 4fbda874e362e0bdab9e207cc7d5fa1ad17363b578805a8dfddde12cdb9a29c2510a2029a1ec50a7bcf7459cd97b51a385923ab39d74ece4974d8e4f54147bba
+MISC ChangeLog-2015 3168 SHA256 03d9360f27446eb492cff2ce257e7a90f0f7bc2a191c61f4054033f1fc28bab6 SHA512 1f796c0fa630454e5684f89b5d921b7ff0128aa25619532872c17add19271fd87c60444886613eab42c04cd70dad47662289863a60f25ba6964043092f0f3b70 WHIRLPOOL fce0f879ab34e93d30be72b6db7ad0fa162c8c798d14cda7b37872f750c5d2560dbd851ff9e582beca410d414d6f27efc1beceed51585bf903ac870f09f8e5ad
+MISC metadata.xml 308 SHA256 18d5d9a56dc72b7bb0e6f4b756632d93160768c827f5cfbb77d397a0bcc7657e SHA512 18e3f4a2e5cd9c0fc70a8069cb948383ff4ee7ebd4e02e6e5bb26d2b0650d42562602284d985484842a870c33693439614ba40b47d2d567a2fe1bc09e62d9fcb WHIRLPOOL 8a3a36fc4739ecb3a6b99d78e87e0cf5c81d9625dd11fae6b4e98d3d6c94faed983f28dd08a42728a9753f7702603280368d7d4d6b70b5e63f574b4fd3dbc500
diff --git a/x11-terms/st/metadata.xml b/x11-terms/st/metadata.xml
new file mode 100644
index 000000000000..58be0fec0782
--- /dev/null
+++ b/x11-terms/st/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+<maintainer type="person">
+<email>jer@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-terms/st/st-0.7.ebuild b/x11-terms/st/st-0.7.ebuild
new file mode 100644
index 000000000000..380a053d0680
--- /dev/null
+++ b/x11-terms/st/st-0.7.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils multilib savedconfig toolchain-funcs
+
+DESCRIPTION="simple terminal implementation for X"
+HOMEPAGE="https://st.suckless.org/"
+SRC_URI="https://dl.suckless.org/st/${P}.tar.gz"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+KEYWORDS="amd64 hppa x86"
+IUSE="savedconfig"
+
+RDEPEND="
+	>=sys-libs/ncurses-6.0:0=
+	media-libs/fontconfig
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+
+src_prepare() {
+	eapply_user
+
+	sed -e '/^CFLAGS/s:[[:space:]]-O[^[:space:]]*[[:space:]]: :' \
+		-e '/^X11INC/{s:/usr/X11R6/include:/usr/include/X11:}' \
+		-e "/^X11LIB/{s:/usr/X11R6/lib:/usr/$(get_libdir)/X11:}" \
+		-i config.mk || die
+	sed -e '/@echo/!s:@::' \
+		-e '/tic/d' \
+		-i Makefile || die
+	tc-export CC
+
+	restore_config config.h
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+
+	dodoc TODO
+
+	make_desktop_entry ${PN} simpleterm utilities-terminal 'System;TerminalEmulator;' ''
+
+	save_config config.h
+}
diff --git a/x11-terms/st/st-9999.ebuild b/x11-terms/st/st-9999.ebuild
new file mode 100644
index 000000000000..81e455048081
--- /dev/null
+++ b/x11-terms/st/st-9999.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils git-r3 multilib savedconfig toolchain-funcs
+
+DESCRIPTION="simple terminal implementation for X"
+HOMEPAGE="https://st.suckless.org/"
+EGIT_REPO_URI="https://git.suckless.org/st"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+IUSE="savedconfig"
+
+RDEPEND="
+	>=sys-libs/ncurses-6.0:0=
+	media-libs/fontconfig
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/^CFLAGS/s:[[:space:]]-Wall[[:space:]]: :' \
+		-e '/^CFLAGS/s:[[:space:]]-O[^[:space:]]*[[:space:]]: :' \
+		-e '/^LDFLAGS/{s:[[:space:]]-s[[:space:]]: :}' \
+		-e '/^X11INC/{s:/usr/X11R6/include:/usr/include/X11:}' \
+		-e "/^X11LIB/{s:/usr/X11R6/lib:/usr/$(get_libdir)/X11:}" \
+		config.mk || die
+	sed -i \
+		-e '/tic/d' \
+		Makefile || die
+
+	restore_config config.h
+
+	tc-export CC
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+	dodoc TODO
+
+	make_desktop_entry ${PN} simpleterm utilities-terminal 'System;TerminalEmulator;' ''
+
+	save_config config.h
+}
+
+pkg_postinst() {
+	if ! [[ "${REPLACING_VERSIONS}" ]]; then
+		elog "Please ensure a usable font is installed, like"
+		elog "    media-fonts/corefonts"
+		elog "    media-fonts/dejavu"
+		elog "    media-fonts/urw-fonts"
+	fi
+}
diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
new file mode 100644
index 000000000000..c78b62a00b8b
--- /dev/null
+++ b/x11-terms/terminator/Manifest
@@ -0,0 +1,13 @@
+AUX 0.90-without-icon-cache.patch 305 SHA256 b20fe414e6a443c0cb52c4da0da4be5c5f8ac8af90d5e9763b43c5383623978b SHA512 fbe50c186f67610b084d3a02e7d398c2bca668c63107203af0b59f49fd0491efd4922824fd0a78263b433877d1736d187deb2ab9f29c243d913fc3908d3076ca WHIRLPOOL 3d50d9de569a48d4097cadb6b73525eb5b7fb4895eb917d92f219615072f65097e5c3674fd6356e5323fe9779b6e2aa4528b6aaf82844145f752497a5f6af5af
+AUX 0.94-session.patch 496 SHA256 3db9e1065294e3c47b80b44c6e4cbfd4970fa963386d875ccd92efe02aaba05a SHA512 3a753cfe2be04132229327167d120c35814a9cdaf2eae2837eb4d294e90ce07ece7a6e4fbb69129474967fab3ad14e596d6c5a4eab55c909e234d19801aaaaae WHIRLPOOL 46a9c6b63dac7fd4a1abe1524fde02850d6169be19b754cb180f425f2a8a36d56bd82fbf7bcb8435a4b6353c9564d8958b13040a79524ab8693566307ff7ef46
+AUX terminator-0.97-brightness.patch 1622 SHA256 9164b379b6df3530c89e716031b676ba0fda2c838f255d9bd03246b6b1b96dcf SHA512 d87fbce864014d32ba57d3c81664384a13faacb7fb5b890b3eb524c915b505a98a86222700e22c6fce81031fa2b262d4830fb9ae608d5078608bb4a3507e4973 WHIRLPOOL 08d436c7f3ebce663fe0200cda3ade5632c132c4785ca20c8e61943adbb0258192902d024fc5dad5e7ef85a1138abce1915b1ab5d702d4d1a41ee6ef5982d6e5
+AUX terminator-1.0-desktop.patch 302 SHA256 33b47abc6fd156097c8e830d350fc24eceb38f237ffd18ba5ab29d9a6e8b7f40 SHA512 5da00b0117de9f8c56fee033685d28caaf2ca3b3926fcd9317113d397289fa79fa74912acbd9cd343efcac3fcf4b79d4374ccadf0f715de38ef046229e442a66 WHIRLPOOL c1b45d69355ac2cf7452f2fe455c00e83ba7e7741b7d8cfcce01ee5ad4cc548af00f3aa79ba846aa45d9856da3093d349a832e4943d5a94bcc7a26854fc66b87
+DIST terminator-0.97.tar.gz 5025337 SHA256 0281b568913f392eec92ebee3c6fea15afe4f4e01869bad38d9efe0eb305be49 SHA512 ac1dfb5c014323ddd3b3347645ac26083d96fe8e895d31c5992d185863d40b5f1a67c5db1315b48f483d9511faeb1adb16133a4aef1e1f178656f3437d4a7470 WHIRLPOOL 9d83bd34e1018dc535af573af27d08b425def1af5498de7be793e7c90298d0140c2e78479bae4264fa7315bcfa9b36d2d464f822b58af0d7452802a3cfc18583
+DIST terminator-0.98.tar.gz 6007243 SHA256 0a6d8c9ffe36d67e60968fbf2752c521e5d498ceda42ef171ad3e966c02f26c1 SHA512 c40ac1929bb446239f769d33f37a6d49ee79ea10755dda4bbbd228763f13661f0ef7efd950a592462150237e516077311318e2a19c9f08adac76a418cf633573 WHIRLPOOL b9a6e9bba8a945ca51aca6936b00dfc51b9c1d266315450b2f63af2d64600c18a7ff9cce712a342f236aded0bbda07b7d1a979685f68d45006a14cf7b0d9a160
+DIST terminator-1.0.tar.gz 881675 SHA256 88aa09e96591c4fd7ff2765617acee6c9bae9c188db2590652a8aba53bbbdadd SHA512 5dbd7463dd8eca2f3554d7d51ae4b8745279485f39b3160feff93c8a02e5e753fff24ecbeaed756320e8ef3e58f14f2c367efa41180224176cff49eaed04d590 WHIRLPOOL 80f83b3fbd25c2128e5c6a9b0f104b0afbd8c1404e63fd559ceb7999de4849ee8e15a8f0bfd3c314c668f8b0f4fbbf7fae916664ae5c0f27b6c44b78b2f1e4c3
+EBUILD terminator-0.97-r1.ebuild 1265 SHA256 89c9fc7d9384f5c20f2436999a06db2a6ad416eba003cfc693b85e3bd630aeec SHA512 6c7e0b90ab14481f56ef9d62f2722abfca52dcd130dff9721843b4969ea7dfc2d8ff6e220a483b3d104683391447c38ec1c9899efce4abdcd0d1eef5bb2aaba1 WHIRLPOOL 1a8a63378881910f86e9b163c55ce8041f0643d0419cc48b8fa80c7c9e0c889618fea3d55d207ac99520fc8b090af7b3e8e55ebf3032c0081c7014af47be512b
+EBUILD terminator-0.98.ebuild 1472 SHA256 6e26fffb8af4a4bef01bb8617b8811149cb7fe4003c80740d012689b7cf6e8d5 SHA512 f51c25917604d8eeea36251dd633dc028464c140ace44fff8bead72f15f84958b571f77b1f18335d932e23bc543302c87d258dbe00e36870fa70236d83b04759 WHIRLPOOL c744469fe0f5feba8c43f86e868ed0ccc7eee203959217ab138fb4b74bae9da92c730bad040c0c2a824722f1f53c7a7370e5db92dd476006591ec4354d4be44f
+EBUILD terminator-1.0.ebuild 1528 SHA256 29e4ed5a2c3fee6823ecab186de5afb674f1fc25c21e893b3b14eeb06c1bd342 SHA512 4e77c853bba93727f04eb1b3c46d9086e1933d73e18fdcbf3441b7d7a5ee817d7c5eb76f4b558c0dbe4682aaa630722eddf1a76d9f01455bd543726b7b44d6d4 WHIRLPOOL f52eb1616ea5c42340b6b560bb9266255b73388c0dedf04bc68fb3b47657e33265048e3978a6373e2228d2bb134db11881ac68fce7c973db78b6ab771bc3fa2c
+MISC ChangeLog 4863 SHA256 083d08a830e9cfea21a97b0dbc3f2a1b712fe7e14d1deba8a3148cad4d6677f5 SHA512 65aef6578ae63871b8ac41628b75baac2645c9466a54be3bc4afd3a263a2687a52d1c7f2fefc1d9403171be32b5edfa08d9f8192fe67ab8d8a9676564e678fa0 WHIRLPOOL ecb392bd3febd788ee6809b6aef9f56028446c3da312893ac8518758c235332bbd9dc67e2d7dd753a432fa0baba27c3479e6da67f29c47171d21d9c24e9c74a6
+MISC ChangeLog-2015 4636 SHA256 af8bb2028471677d4a3d3d947628e240eab3e6a211a999dc55b21cbbd055a29a SHA512 cf5360c1d39e83187083125f9b0a555a5efcf49258ee2a20b0bb2d9c44d599d2b724ccac7becf5b780a91ad9bd1e68b24e6859737a38ab7ff3f54bbdc1af56f2 WHIRLPOOL a2c0bc5ecf1413fd2dad71e6c112b031b0558517cd6473a601da05abba7a82c0b35cc6036dd28b42391d21420b52d8117248d7bcb145884d2aeb7d2b089fcd83
+MISC metadata.xml 703 SHA256 381a6d50eae95b2f2c9077744e6a0ab63d62561c787b250ffa4cd00aa9ba04e7 SHA512 fbc248ef9377fd404ea97e24437dda01c0f03c6c69c7e8eea2fe0f9778301efd1ecdb4dc70161ffd8754fe048fb5b43e30c443209dc7478a9fe46ea7f7f5ef95 WHIRLPOOL 9da99a56d6c401700dfc5d301e3db30da9995bf5d61a156e5e92214fc1c479b29937037a3c465181d2ffe9e6aef162bc753266f02b9314581a5c1905b6a948bb
diff --git a/x11-terms/terminator/files/0.90-without-icon-cache.patch b/x11-terms/terminator/files/0.90-without-icon-cache.patch
new file mode 100644
index 000000000000..c7862def3eaa
--- /dev/null
+++ b/x11-terms/terminator/files/0.90-without-icon-cache.patch
@@ -0,0 +1,11 @@
+--- setup.py.orig	2009-08-12 22:22:53.000000000 -0400
++++ setup.py	2009-08-12 22:22:57.000000000 -0400
+@@ -25,7 +25,7 @@
+ 
+   def __init__ (self, *args):
+     self.without_gettext = False
+-    self.without_icon_cache = False
++    self.without_icon_cache = True
+     Distribution.__init__(self, *args)
+ 
+ 
diff --git a/x11-terms/terminator/files/0.94-session.patch b/x11-terms/terminator/files/0.94-session.patch
new file mode 100644
index 000000000000..4583b0cff7b6
--- /dev/null
+++ b/x11-terms/terminator/files/0.94-session.patch
@@ -0,0 +1,13 @@
+diff --git a/terminatorlib/terminator.py b/terminatorlib/terminator.py
+index 1686006..960e53d 100755
+--- a/terminatorlib/terminator.py
++++ b/terminatorlib/terminator.py
+@@ -61,8 +61,6 @@ class Terminator(Borg):
+             self.doing_layout = False
+         if not self.pid_cwd:
+             self.pid_cwd = get_pid_cwd()
+-        if self.gnome_client is None:
+-            self.attempt_gnome_client()
+ 
+     def set_origcwd(self, cwd):
+         """Store the original cwd our process inherits"""
diff --git a/x11-terms/terminator/files/terminator-0.97-brightness.patch b/x11-terms/terminator/files/terminator-0.97-brightness.patch
new file mode 100644
index 000000000000..9e35d7d593f6
--- /dev/null
+++ b/x11-terms/terminator/files/terminator-0.97-brightness.patch
@@ -0,0 +1,35 @@
+=== modified file 'terminatorlib/prefseditor.py'
+--- terminatorlib/prefseditor.py	2013-02-16 00:10:45 +0000
++++ terminatorlib/prefseditor.py	2013-05-11 22:03:46 +0000
+@@ -923,6 +923,8 @@
+ 
+     def on_inactive_color_offset_change_value(self, widget, scroll, value):
+         """Inactive color offset setting changed"""
++        if value > 1.0:
++          value = 1.0
+         self.config['inactive_color_offset'] = round(value, 2)
+         self.config.save()
+ 
+
+=== modified file 'terminatorlib/terminal.py'
+--- terminatorlib/terminal.py	2013-02-15 15:10:55 +0000
++++ terminatorlib/terminal.py	2013-05-11 22:03:46 +0000
+@@ -621,11 +621,17 @@
+ 
+         factor = self.config['inactive_color_offset']
+         self.fgcolor_inactive = self.fgcolor_active.copy()
++        dbg(("fgcolor_inactive set to: RGB(%s,%s,%s)", getattr(self.fgcolor_inactive, "red"),
++                                                      getattr(self.fgcolor_inactive, "green"),
++                                                      getattr(self.fgcolor_inactive, "blue")))
+ 
+         for bit in ['red', 'green', 'blue']:
+             setattr(self.fgcolor_inactive, bit,
+                     getattr(self.fgcolor_inactive, bit) * factor)
+ 
++        dbg(("fgcolor_inactive set to: RGB(%s,%s,%s)", getattr(self.fgcolor_inactive, "red"),
++                                                      getattr(self.fgcolor_inactive, "green"),
++                                                      getattr(self.fgcolor_inactive, "blue")))
+         colors = self.config['palette'].split(':')
+         self.palette_active = []
+         self.palette_inactive = []
+
diff --git a/x11-terms/terminator/files/terminator-1.0-desktop.patch b/x11-terms/terminator/files/terminator-1.0-desktop.patch
new file mode 100644
index 000000000000..2edf260d76b3
--- /dev/null
+++ b/x11-terms/terminator/files/terminator-1.0-desktop.patch
@@ -0,0 +1,11 @@
+--- a/data/terminator.desktop.in
++++ b/data/terminator.desktop.in
+@@ -9,7 +9,7 @@
+ StartupNotify=true
+ X-Ubuntu-Gettext-Domain=terminator
+ X-Ayatana-Desktop-Shortcuts=NewWindow;
+-[NewWindow Shortcut Group]
++[X-NewWindow Shortcut Group]
+ Name=Open a New Window
+ Exec=terminator
+ TargetEnvironment=Unity
diff --git a/x11-terms/terminator/metadata.xml b/x11-terms/terminator/metadata.xml
new file mode 100644
index 000000000000..e41086ce9c48
--- /dev/null
+++ b/x11-terms/terminator/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <longdescription>
+	Much of the behaviour of Terminator is based on GNOME Terminal, and 
+	we are adding more features from that as time goes by, but we also 
+	want to extend out in different directions with useful features for 
+	sysadmins and other users. If you have any suggestions, please file 
+	wishlist bugs! (see below for the address)
+</longdescription>
+  <use>
+    <flag name="libnotify">Enables desktop notifications via<pkg>dev-python/notify-python</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="launchpad">terminator</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-terms/terminator/terminator-0.97-r1.ebuild b/x11-terms/terminator/terminator-0.97-r1.ebuild
new file mode 100644
index 000000000000..892774b21200
--- /dev/null
+++ b/x11-terms/terminator/terminator-0.97-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="Multiple GNOME terminals in one window"
+HOMEPAGE="http://www.tenshu.net/p/terminator.html"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="dbus gnome +libnotify"
+
+RDEPEND="
+	dev-libs/keybinder:0[python]
+	x11-libs/vte:0[python]
+	dbus? ( sys-apps/dbus )
+	gnome? (
+		dev-python/gconf-python
+		dev-python/libgnome-python
+		dev-python/pygobject:2[${PYTHON_USEDEP}]
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		)
+	libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )"
+DEPEND="dev-util/intltool"
+
+S="${WORKDIR}"/trunk
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/0.90-without-icon-cache.patch
+		"${FILESDIR}"/0.94-session.patch
+		"${FILESDIR}"/${P}-brightness.patch
+	)
+
+	local i p
+	if [[ -n "${LINGUAS+x}" ]] ; then
+		pushd "${S}"/po > /dev/null
+		strip-linguas -i .
+		for i in *.po; do
+			if ! has ${i%.po} ${LINGUAS} ; then
+				rm ${i} || die
+			fi
+		done
+		popd > /dev/null
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/x11-terms/terminator/terminator-0.98.ebuild b/x11-terms/terminator/terminator-0.98.ebuild
new file mode 100644
index 000000000000..45c961dd5710
--- /dev/null
+++ b/x11-terms/terminator/terminator-0.98.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 distutils-r1 virtualx
+
+DESCRIPTION="Multiple GNOME terminals in one window"
+HOMEPAGE="http://www.tenshu.net/p/terminator.html"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus doc gnome +libnotify"
+
+RDEPEND="
+	dev-libs/keybinder:0[python]
+	x11-libs/vte:0[python]
+	dbus? ( sys-apps/dbus )
+	gnome? (
+		dev-python/gconf-python
+		dev-python/libgnome-python
+		dev-python/pygobject:2[${PYTHON_USEDEP}]
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		)
+	libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )"
+DEPEND="dev-util/intltool"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/0.90-without-icon-cache.patch
+		"${FILESDIR}"/0.94-session.patch
+	)
+
+	local i p
+	if [[ -n "${LINGUAS+x}" ]] ; then
+		pushd "${S}"/po > /dev/null
+		strip-linguas -i .
+		for i in *.po; do
+			if ! has ${i%.po} ${LINGUAS} ; then
+				rm ${i} || die
+			fi
+		done
+		popd > /dev/null
+	fi
+
+	sed \
+		-e "/'share', 'doc'/s:${PN}:${PF}:g" \
+		-i setup.py terminatorlib/util.py || die
+
+	use doc || \
+		sed \
+			-e '/install_documentation/s:True:False:g' \
+			-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	VIRTUALX_COMMAND="esetup.py"
+	virtualmake test
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/x11-terms/terminator/terminator-1.0.ebuild b/x11-terms/terminator/terminator-1.0.ebuild
new file mode 100644
index 000000000000..22d00846e1b2
--- /dev/null
+++ b/x11-terms/terminator/terminator-1.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit gnome2 distutils-r1 virtualx
+
+DESCRIPTION="Multiple GNOME terminals in one window"
+HOMEPAGE="http://www.tenshu.net/p/terminator.html"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus doc gnome +libnotify"
+
+RDEPEND="
+	dev-libs/keybinder:0[python]
+	dev-python/psutil
+	x11-libs/vte:0[python]
+	dbus? ( sys-apps/dbus )
+	gnome? (
+		dev-python/gconf-python
+		dev-python/libgnome-python
+		dev-python/pygobject:2[${PYTHON_USEDEP}]
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		)
+	libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
+"
+DEPEND="
+	dev-util/intltool
+"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/0.90-without-icon-cache.patch
+		"${FILESDIR}"/0.94-session.patch
+		"${FILESDIR}"/${P}-desktop.patch
+	)
+
+	local i p
+	if [[ -n "${LINGUAS+x}" ]] ; then
+		pushd "${S}"/po > /dev/null
+		strip-linguas -i .
+		for i in *.po; do
+			if ! has ${i%.po} ${LINGUAS} ; then
+				rm ${i} || die
+			fi
+		done
+		popd > /dev/null
+	fi
+
+	sed \
+		-e "/'share', 'doc'/s:${PN}:${PF}:g" \
+		-i setup.py terminatorlib/util.py || die
+
+	use doc || \
+		sed \
+			-e '/install_documentation/s:True:False:g' \
+			-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	VIRTUALX_COMMAND="esetup.py"
+	virtualmake test
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/x11-terms/terminology/Manifest b/x11-terms/terminology/Manifest
new file mode 100644
index 000000000000..fb630a05c818
--- /dev/null
+++ b/x11-terms/terminology/Manifest
@@ -0,0 +1,8 @@
+DIST terminology-0.9.1.tar.xz 4961876 SHA256 ecee7ae6ba2fa10bfc5b6531292157dec2373dbb7d248cc62eb53d0be74e9bcf SHA512 c6db9fa62f3f168be635da1e3ed7a13deba13cbfa5bed75e3f97ee6e13837ca9cb5facab48c44f200baed34b8f32f852eadd9844de648795733602602fae32fd WHIRLPOOL 9e364709be4bf061eb8e0f5645271905cf04416843a5881ada24dda4a9eda27b07e0170e72eb10ba1f43beb210b0076e221dfb1889579a7c49f7750524aaeb9d
+DIST terminology-1.0.0.tar.xz 4979420 SHA256 bfed42b83bce854d35ba33a4d38373c6d42fb2c0ea0335d76420488c091692f4 SHA512 5c99e1e1eea0de24d67779059d3ba65a8fbd1fdf63d9f22099e38defc11fdc8923fbe50a7276bc483ce5ee7527f665e3f2c48358d85c3a06f33e551bd8ef2320 WHIRLPOOL e060fe3a92e68d6b331b7873fd1e9cbb428546f00699dce1dd07bdc8cc8f790cb94c50f31af2fe50e087563c85917332ab74406c7f0e272fae680e3059a04f72
+EBUILD terminology-0.9.1.ebuild 506 SHA256 f088ec85ebf89777a63d5bc5e25ce3d17f73c768c3e61685870723338e9814ca SHA512 caff7eac7a6502dbbe1141f46ebd187979ff4c68660dada0e6f887a7415c178d53667d3d12486ea12350b9aacb9058e85bc251215cce0b10049c5b8ab585717a WHIRLPOOL e148e87724885e13554e0fad8a7623b40d4ed0e7d8cc3301ae990a6724fd5f0a7edf2a2b48699a3ee3ffa4967218531caeff299eb15e01ad1a011f17ce29ac89
+EBUILD terminology-1.0.0.ebuild 588 SHA256 bc86ba6db0bcdff648f5194fc88729c1acd46c629c4ac5bbef8802b58a732df6 SHA512 a68f7ecc0f45cfd251bd45b7d7363c89ab2f321f38480424106a8cd1903894c88fb4a5a506c585cf4002ed380261fdfb56f301522de3ffda7993e291a3b81c57 WHIRLPOOL 4bb551e5f836ff42f97918521e1efdf375d34513aefd4ebff9a90fac1826b0d66d5b6ceff5c7b462738f53ab420392237a860774989dcc3286fccfe20846a105
+EBUILD terminology-9999.ebuild 576 SHA256 68e855689b019aa372f95df0ac78150508196d7a658f1484a8123f1a853e90f3 SHA512 9db6f350518a1bfd170086c261ade4aa6c720a22df37e70d1956abf514faba0d7ba812eb9054191f3a6a080216bb11bef132474a12397cfa56d294ffa634aa4b WHIRLPOOL ea53e5a5e38fe2b4c4035a468556c27ea7a3f44df47f822885ca9c5640e4b65a4983cc9ab8c3e1bf54b062c0de356615671e5ac9acf325380b171b389456cdd7
+MISC ChangeLog 4309 SHA256 461573684e8a767450844c0889b5050ccc0287246020235447d1751793c74397 SHA512 d5dbaed411f632b9eb4bf71a767053e1a3f8d02dde654d875d1b40435739245873f9761dc258d744a144293d8a4de3f31f67c35a8f3e1425388ec9eefe361bca WHIRLPOOL c6173211c1e711f873906061b10f92fda756dfacbda31122d98c69fddc4d0fc7ae1b31dafad20bb88d5f5fc830c0009f8b9656aca82566d1b9352d83321145f1
+MISC ChangeLog-2015 2357 SHA256 6325a04abed901351b58e0a7fb34e4c3d82bdaf98e1f80037d7ccb7ef1f6d1c6 SHA512 0d29a3c565efc1314875e1c77d870944b3516323b9eb01da76e27323f76aaebc73fbbe61e437a7bd5d6cd5ad1ed32db412d8d2f88da27463682c2e93c917defa WHIRLPOOL 325145c585cba30b4eb4288b437c2f905068d01f0e5950cebcd316b08a88b2663f3166b08c94119760eb9b75c5ce1aeb1d84ff53d862fcb0f9cc3d3ccdd0a5db
+MISC metadata.xml 258 SHA256 37dfcf5268b6c72244a1e88ef13818d60253d4814da400b82dd3d9a2cfc165e0 SHA512 59d30cd09990b755f6e1f0198e7ce860fe587038c5c020e44a9219aba431d96393ff0c5bdd5dd0db3512cc3d5c7b9992af242810204883663591432a0fa67997 WHIRLPOOL fbf816d88e3fad8cfab6bd5f4765697c37e9047b5122e4e567994e46c257a66939953d73378dd9c7ff0703315176c72e1e2a7edd5629a31de10c10c13c5707d8
diff --git a/x11-terms/terminology/metadata.xml b/x11-terms/terminology/metadata.xml
new file mode 100644
index 000000000000..8dca222b9693
--- /dev/null
+++ b/x11-terms/terminology/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-terms/terminology/terminology-0.9.1.ebuild b/x11-terms/terminology/terminology-0.9.1.ebuild
new file mode 100644
index 000000000000..9b08d95ad0d7
--- /dev/null
+++ b/x11-terms/terminology/terminology-0.9.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="Feature rich terminal emulator using the Enlightenment Foundation Libraries"
+HOMEPAGE="https://www.enlightenment.org/p.php?p=about/terminology"
+SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/efl-1.15.1
+	>=media-libs/elementary-1.15.1"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
diff --git a/x11-terms/terminology/terminology-1.0.0.ebuild b/x11-terms/terminology/terminology-1.0.0.ebuild
new file mode 100644
index 000000000000..dc28f45542c1
--- /dev/null
+++ b/x11-terms/terminology/terminology-1.0.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+MY_P=${P/_/-}
+
+if [[ "${PV}" == "9999" ]] ; then
+	EGIT_SUB_PROJECT="apps"
+	EGIT_URI_APPEND="${PN}"
+else
+	SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+inherit enlightenment
+
+DESCRIPTION="Feature rich terminal emulator using the Enlightenment Foundation Libraries"
+HOMEPAGE="https://www.enlightenment.org/p.php?p=about/terminology"
+
+RDEPEND=">=dev-libs/efl-1.18"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
diff --git a/x11-terms/terminology/terminology-9999.ebuild b/x11-terms/terminology/terminology-9999.ebuild
new file mode 100644
index 000000000000..f28072ea6386
--- /dev/null
+++ b/x11-terms/terminology/terminology-9999.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+MY_P=${P/_/-}
+
+if [[ "${PV}" == "9999" ]] ; then
+	EGIT_SUB_PROJECT="apps"
+	EGIT_URI_APPEND="${PN}"
+else
+	SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit enlightenment
+
+DESCRIPTION="Feature rich terminal emulator using the Enlightenment Foundation Libraries"
+HOMEPAGE="https://www.enlightenment.org/p.php?p=about/terminology"
+
+RDEPEND=">=dev-libs/efl-1.18"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
diff --git a/x11-terms/tilda/Manifest b/x11-terms/tilda/Manifest
new file mode 100644
index 000000000000..33ad25dbbf39
--- /dev/null
+++ b/x11-terms/tilda/Manifest
@@ -0,0 +1,9 @@
+AUX tilda-0.9.6-gdk_resources.patch 624 SHA256 39f255a190218c2df0d202dac94acc3496936e22ee24a0dd0484d1f8f27bc267 SHA512 c32268a172c97551debcf9c5b57159546b5657f6726998bd6fadeeab1ae6a2e05d1efdfd1f61cae5f0d0972e3ac8c4d2b7409aaac31df921c417c99e22af9fcd WHIRLPOOL 4a0091e53d05012f8d28160ea5fff3de2fee480bd579acb1dcd9ea824b6acaa6c58fa095af542be3df59241e7a78932b12a35a4c6e971d93b5aa57c92c7f32dd
+AUX tilda-0.9.6-glib-single-include.patch 338 SHA256 c387b349e3971320dee3326d5bb9d89a577a181b84b61982fb1989fc7bc6d1f2 SHA512 e161ac8d6ac2e645efcdbed7247baff2a360128a7c5dff3aa9ecf4fcfe0c8e05bab2276fbe5970674f4b59385515e4c9aaaab5619687e41c1ab9390d34b93500 WHIRLPOOL dd81b5eb67929ebb2c22c52fe7756e12ec6ab6f1d62f1390c6a150c0f1eb33d9accd032cb3a806852aa5a835e54d0fdbf1af836917e6691ca59fc70316a86e74
+AUX tilda-0.9.6-makefile.patch 689 SHA256 ae14760570e8850872446a6dac9558c91e64a6145367475512c54f1429d36539 SHA512 45ee0e4eb3ec9a62c5fd1b607fd548141738528bf4c82254a68b81baca1c52f10af81ca5c8450ea3dd6af6709d5e11e0d1d7bb7b6a77b88cf1c169677be1b7ed WHIRLPOOL 44b112678b194730b8e481cd3fa2e7fae9c58270a0eae6ae9b6171acc280a647863389cff187b0b37cdb69c51fefc62d26ccd567b1a9c46ead4fcb38629bdb2b
+DIST tilda-0.9.6.tar.gz 307517 SHA256 b3bd0f63eb83a5001ef26056ca116e5f8005d454f8f82a94f334868862068411 SHA512 7d0ddaf289de2c3f9f48f5cce3ee71534b9fdd91f79a4e56a32a301fd8fc82c4a3d760cfcd16d8d2e2d9f0d963b8130547720563ab15c2bb2220ff546ea562b0 WHIRLPOOL 1f3b25f508291b79872947441a981d1582bdbab57996f1e3673c1b575079fadaf6f39912f9e94cfc8559fead39615383c3515a3c4a8f6178e4a568ad7a67c088
+EBUILD tilda-0.9.6-r1.ebuild 756 SHA256 a01dd6bc6559061b721a4d10dfb026cfd6a844e7b4168f0c961a271d5d885c4e SHA512 3aaaecf25c8330b88373c13bfe4a626d9b4833db3a3cef3e7b92102a103be10160f78118d9e09be54c686c047f17b69b6c592b26c9f0554aa024d295e7680124 WHIRLPOOL 84e25481037f4cf6273285ca588d8b46dcd2afb500401596052ea434fb11cae8ffc96747c0c8119294626f1b0792e40911920cbd011ca55864960cae96ce06e4
+EBUILD tilda-0.9.6.ebuild 667 SHA256 611c0501ec5547fcbe0c10c9f4cd47daba9246302deaa9b9ba35536ce91fefc1 SHA512 716a1d992939ac7fd51828d96cef8ca1ee9fc3610e4fd4347ea32aa26ac43e1d84088027d1da96b8b223c78db8d4ad73c960f80aa0ccb001954d66dba4f63b1d WHIRLPOOL 981aef99a0ce80f97b39ba7a3b4eb495517c774e2af4d671e213de72cc0334290ff7154c71aff657ef1ea4b12de2f4142e74d237bc8e0fe8a5d69de26072e33c
+MISC ChangeLog 2261 SHA256 58c8729c564ddb5768abbc18b8959d3685332b9eae9d146281e6f7532e40f881 SHA512 32e50e0a37dc6dc688a166e20131b7a5f1b25eaa264008d7c180e023126ee636cfcd7f5066e7fe82b5361dfc8ca0103c021f59872f7f50d6608d0dbcbcd206f8 WHIRLPOOL 099deb11230d1d41b0a8943fad357d12a98262693c84c6e22cc34eaf872f916b0d31c191f0ac01ff757dd186aa888e88b55c4a0097db58471ebdf538c0146224
+MISC ChangeLog-2015 4157 SHA256 b8075a89dbf73b017674cb22403e2330e561de4a4d449477f5757dbaed664378 SHA512 5b3b53fe470e79b3da6abee66d8123cff8df9f22d62e2ad78a1037e1b765670a712aaadac080158f52c2b93ab4494f8fa31247fe6779ed4dcca1882f587f5fe9 WHIRLPOOL dcf5e34c63bd6ad062993ccd0e5ca8d849ce04093d775a89ca97d701ff4b813d9438dc547f9cf3c4a07015f63cb4ba6f458c762872edabcd66a2c1e47113a4b1
+MISC metadata.xml 299 SHA256 94862817f197532b8f236c0122f5d33ba0074dfe50f47708d2c88e40bb03fe59 SHA512 08e6bb5f5de750e280c9ec69419cc328fa651d4f7d9f3fa3705d073ce7c677985cd5404c730b5d5750f49fe306d3c05e5a3384feabf57e81d446ea228d28b8f0 WHIRLPOOL 3915e767499b937de9355aca69d3d442c1cbc13279637a93e9c924760d7a3c802eba3890aeb7a3c67f79b460730b82d75acc87a76090ec4aa156a3d0d2ba9616
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
new file mode 100644
index 000000000000..a26ba91f5ec0
--- /dev/null
+++ b/x11-terms/tilda/files/tilda-0.9.6-gdk_resources.patch
@@ -0,0 +1,12 @@
+--- src/tilda_window.c	2008-01-17 23:07:39.000000000 +0100
++++ src/tilda_window.c	2010-03-19 22:30:31.000000000 +0100
+@@ -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"));
+     gtk_window_resize (GTK_WINDOW(tw->window), config_getint ("max_width"), config_getint ("max_height"));
++    /* Create GDK resources now, to prevent crashes later on */
++    gtk_widget_realize (tw->window);
++
+     generate_animation_positions (tw);
+ 
+     return tw;
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
new file mode 100644
index 000000000000..fcc734f771d9
--- /dev/null
+++ b/x11-terms/tilda/files/tilda-0.9.6-glib-single-include.patch
@@ -0,0 +1,13 @@
+Index: tilda-0.9.6/src/tomboykeybinder.h
+===================================================================
+--- tilda-0.9.6.orig/src/tomboykeybinder.h
++++ tilda-0.9.6/src/tomboykeybinder.h
+@@ -2,7 +2,7 @@
+ #ifndef __TOMBOY_KEY_BINDER_H__
+ #define __TOMBOY_KEY_BINDER_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
diff --git a/x11-terms/tilda/files/tilda-0.9.6-makefile.patch b/x11-terms/tilda/files/tilda-0.9.6-makefile.patch
new file mode 100644
index 000000000000..cfb86fd0c522
--- /dev/null
+++ b/x11-terms/tilda/files/tilda-0.9.6-makefile.patch
@@ -0,0 +1,24 @@
+From 6ee8cb9e2d19b7b1e7b80f5f26557aaac1a91151 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Tue, 14 Mar 2017 01:40:28 +0100
+Subject: [PATCH] Make .desktop file use actual icon location
+
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 0378052..074837b 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -27,6 +27,6 @@ EXTRA_DIST = tilda.desktop.in tilda.png tilda.glade
+ 
+ tilda.desktop: tilda.desktop.in
+ 	sed -e 's|\@BINDIR\@|$(bindir)|' \
+-	    -e 's|\@PIXMAPSDIR\@|$(datadir)/applications|' $< > $@
++	    -e 's|\@PIXMAPSDIR\@|$(Pixmapsdir)|' $< > $@
+ 
+ ACLOCAL_AMFLAGS = -I m4
+-- 
+2.12.0
+
diff --git a/x11-terms/tilda/metadata.xml b/x11-terms/tilda/metadata.xml
new file mode 100644
index 000000000000..cf71538580b8
--- /dev/null
+++ b/x11-terms/tilda/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>steev@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">tilda</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-terms/tilda/tilda-0.9.6-r1.ebuild b/x11-terms/tilda/tilda-0.9.6-r1.ebuild
new file mode 100644
index 000000000000..85cda089c8c0
--- /dev/null
+++ b/x11-terms/tilda/tilda-0.9.6-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils
+
+DESCRIPTION="A drop down terminal, similar to the consoles found in first person shooters"
+HOMEPAGE="http://tilda.sourceforge.net"
+SRC_URI="mirror://sourceforge/tilda/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="x11-libs/vte:0
+	>=dev-libs/glib-2.8.4:2
+	dev-libs/confuse
+	gnome-base/libglade"
+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
+
+	eautoreconf
+}
diff --git a/x11-terms/tilda/tilda-0.9.6.ebuild b/x11-terms/tilda/tilda-0.9.6.ebuild
new file mode 100644
index 000000000000..fee09545ab77
--- /dev/null
+++ b/x11-terms/tilda/tilda-0.9.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="A drop down terminal, similar to the consoles found in first person shooters"
+HOMEPAGE="http://tilda.sourceforge.net"
+SRC_URI="mirror://sourceforge/tilda/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="x11-libs/vte:0
+	>=dev-libs/glib-2.8.4:2
+	dev-libs/confuse
+	gnome-base/libglade"
+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
+}
diff --git a/x11-terms/xfce4-terminal/Manifest b/x11-terms/xfce4-terminal/Manifest
new file mode 100644
index 000000000000..7f78b4515f79
--- /dev/null
+++ b/x11-terms/xfce4-terminal/Manifest
@@ -0,0 +1,9 @@
+DIST xfce4-terminal-0.6.3.tar.bz2 815207 SHA256 912f4716c2395a14a80620ef982b4af1e2a67a8df9a1ef0b802ecae826057e08 SHA512 805390b75178b3a2fbff4f8dfe972474e5575ad5a80aaf775f7b4086f975cf5b444a335b1ec1a9a39bc89642c71e1d0cb1bbc14d96b913980bd231d32a081c49 WHIRLPOOL 199f305ae3996eeb5797dbc3fbe07f459c577bfb5a259c3ce820b2fea87ef92593ed26fd82745b7266a6e8801aef61c5a82ddd0f7e9cdc3f3c741e58ba37ed0a
+DIST xfce4-terminal-0.8.5.1.tar.bz2 942117 SHA256 8a34568f78abf669957984602c54cd938f19c9343ee2691c2b787446629be064 SHA512 bf64877985d75c4d6b7a9da741c1f71486dacf2bf203de4555ceb6f45eee109938e29bdbb70487a67f40aa51a6a10fca7ee04b89d87e3e4f11a0a99cfbe1be9f WHIRLPOOL 4cba7e9bc1813464e5ad4cb98bd77bef15ecb572d9de8b762e7ffe07e85af2a5e57bd5a23dd5fdd63c50fb139e82d9656d0a106c2f69421e4b05d97984c83058
+DIST xfce4-terminal-0.8.6.tar.bz2 952859 SHA256 bc2a560409a0f0b666d1c557e991748b986ec27572a45ae88b0ee5a480d881d7 SHA512 96d9c3fab56ad9cd267bd7b33f4d8fb3831200b9507653a69e6872b673ca5e30adffc73ef2f73de6eb858a2817a98b781188a39a4c0d79298699711c49f8be97 WHIRLPOOL 51cfadde08d6925c33f22e9a9a811ab782d2f2cc1b233074b1af1eb6b82579957a528c3f510555ab645642f40b98552d867caff04fc75530deefcfff51154db4
+EBUILD xfce4-terminal-0.6.3.ebuild 797 SHA256 512ea2ce33ae470bccb723ed6174c05cb3890793cec9ffb7f39ac45ddd7a0a75 SHA512 8f4e7bd5b0bf6a633dcb3de46cf428d6b300072a90e6b96dbae51bf3efa19a77a29b927b08f742f74ede0a0355804ed991e8d72c769f4ba0cfef5b7d31298ff0 WHIRLPOOL f56ee6d20ede0b58855678cfa286f73669add83b3759040f0ab5f83f050644702df50408a0aaaa52ad1f817d01aa794b37ada34c1dca71a0ebcdce07c46ca7f9
+EBUILD xfce4-terminal-0.8.5.1.ebuild 747 SHA256 60dab9379872ef753c919f131a6626ac942e262993436442b192bac4a4836677 SHA512 7516c226517cfa1b55c447b259712c855f413ddaee16d252e101f9d793309fad42af7b1a731988f088db4236c916c21963c67aa06b425910fd088ff10a78009d WHIRLPOOL 97760226325f9488347489837b45e6aac2a1682b931f90fb1d3fbd364443313ee4a2b11ca2fb7a2e5963ddfefd90260c0869f67bed7b6edd685f4acb206d7f01
+EBUILD xfce4-terminal-0.8.6.ebuild 753 SHA256 3011f384ad948eba19ecec523730664a9020dc6e01f52854a92a73c757883d33 SHA512 01a6a29dace8d22de2904d86502530ddd8cad27ff76b3d9d58e63dec30a8c36c786e4b0dd3a91cd159de270ed0d86c08c28a42d6b6bcf92f6b369dafd0088628 WHIRLPOOL f80a95309410d67da11dcbffb7f5a5ec60ccccaad14a409fe9597e67652163cd96fd2c5e26ead94d57bb69973ae8c3dbfacb7258c39506c96a54e880e8940f57
+MISC ChangeLog 2932 SHA256 4db6c1dcfd132b508b0aaad6700b29396e2e989266dc334add4b253ef985b581 SHA512 6f3aacec6b93583a0996c1642f5d3684bdc93213cf6435ff229425d32efb4c80515d9be615a19bc8e4ef9a4e33e1a14c27b022583a5ba0334b871c8a7104ef40 WHIRLPOOL 3aa33f5811e1fab175873d2891f97c5e8335cddb922442d3a447bcd4a1add407e95a5ffa188d34d507556b1f10618b3db8cc5317fcc72550a853edef72bf7506
+MISC ChangeLog-2015 19385 SHA256 57493d99a442467704723789663188dcb55c10ee055410ffe1abe62f3228dda1 SHA512 384b922b5f2032f5ade62fef30dfa91326d6c231b8c589e982dfe337d829a34f434c9f91e001ca7cd4e418c8806b43da60d571f233cbbf4234b0f64d7a45c6d6 WHIRLPOOL 9859fdce57e252afb9f069413c2685fe2538d642f011b854bd51bafe50c0a75435251fb50e8dec603d6836cdf45ae40311c08d3a8c7cdc3fb6895fa25ec9271e
+MISC metadata.xml 247 SHA256 5e270543b0f1e81148a19b29d77d40191169f37a8b3e34c7c08bdca376150864 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203 WHIRLPOOL 15305f8aec1b5f5e255d6378d5b44652a3958e808017fd8ba00350b667528753ff0466bcf5b9b28b683fd3341d25bf8884396730003f071515ad28146d33893b
diff --git a/x11-terms/xfce4-terminal/metadata.xml b/x11-terms/xfce4-terminal/metadata.xml
new file mode 100644
index 000000000000..359901b31db4
--- /dev/null
+++ b/x11-terms/xfce4-terminal/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-0.6.3.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-0.6.3.ebuild
new file mode 100644
index 000000000000..35eeb6dcf136
--- /dev/null
+++ b/x11-terms/xfce4-terminal/xfce4-terminal-0.6.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="A terminal emulator for the Xfce desktop environment"
+HOMEPAGE="https://docs.xfce.org/apps/terminal/start"
+SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${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"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/glib-2.26
+	>=x11-libs/gtk+-2.24:2
+	x11-libs/libX11
+	>=x11-libs/vte-0.28:0
+	>=xfce-base/libxfce4ui-4.10"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_setup() {
+	XFCONF=(
+		$(xfconf_use_debug)
+		)
+
+	DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS )
+}
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.5.1.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.5.1.ebuild
new file mode 100644
index 000000000000..19a912343939
--- /dev/null
+++ b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.5.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A terminal emulator for the Xfce desktop environment"
+HOMEPAGE="https://docs.xfce.org/apps/terminal/start"
+SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*.*}/${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"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.32:2=
+	>=x11-libs/gtk+-3.16:3=
+	x11-libs/libX11:=
+	>=x11-libs/vte-0.38:2.91=
+	>=xfce-base/libxfce4ui-4.10:=[gtk3(+)]"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS )
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.6.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.6.ebuild
new file mode 100644
index 000000000000..86cf878e93ec
--- /dev/null
+++ b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A terminal emulator for the Xfce desktop environment"
+HOMEPAGE="https://docs.xfce.org/apps/terminal/start"
+SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${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"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.32:2=
+	>=x11-libs/gtk+-3.16:3=
+	x11-libs/libX11:=
+	>=x11-libs/vte-0.38:2.91=
+	>=xfce-base/libxfce4ui-4.10:=[gtk3(+)]"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS )
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
new file mode 100644
index 000000000000..7c7d0db43228
--- /dev/null
+++ b/x11-terms/xterm/Manifest
@@ -0,0 +1,11 @@
+DIST xterm-327.tgz 1240131 SHA256 66fb2f6c35b342148f549c276b12a3aa3fb408e27ab6360ddec513e14376150b SHA512 d9d9f3b870fea8db9ae3c076a9d85152488b2d392b9b1e2e4ebbeded287ed4911f1f63e5e035d5b3793b2506b993125c6fca437393b435a28aeb519d76147672 WHIRLPOOL 44254647e9e6e331d198763c5d38738ebf56386e9c93ee65beaf15ad5d0eb2f75731498608e1e9d503e7d2355a0a456336bcaa4b1d16ab791961cfa404a9489d
+DIST xterm-328.tgz 1264517 SHA256 b38a7ab2e9f6ab51784ab82a312ca9950e0039da846d37715db4c1ddd47b1d52 SHA512 4f3381440394e0cd2d6c4d6645573ab2eac1c1c98e510eb0b3281ed4d2b1082e57ae58b7f756a03704eb275925ae497a1ae6c5907d6ba1b8ec95f92eaf939656 WHIRLPOOL 40e23e7c7a33376641bc8a95993bfbba371a32c39b86bd16f407e6fd60acb0164a981e3464d6c8ffcc9bc20881700480c0d3855b3ae4b32a9c8f13c19d7477da
+DIST xterm-329.tgz 1265450 SHA256 1eb9f296240f2d1e3ea633023daa3410f8710854f0a1323a73e94de4c312891c SHA512 b6d68bde0796dc6848c02bb0f780b778226e110e7b495fd8c8d45870b1e78b1b91263a45748ef0fbfbd3a7262f4af78daeca07984c3f4cba4c5da67c4c3f0347 WHIRLPOOL 680a21b5038d0756bd6f9f3768e046161b552a7ce86d489d57ca8aaca40a2db21fa80b838419df88ec0a6072096d9f9dc26deb80a2dbea122b4b125d6601f05d
+DIST xterm-330.tgz 1273183 SHA256 7aeef9f29f6b95e09f481173c8c3053357bf5ffe162585647f690fd1707556df SHA512 3886745179ebabc10feea401444a153dc3f9e5f4c91da381870857fe21f514e0e975193af498b7c2b365602f833dd08e6c706e25cfc1e687d565125672136b62 WHIRLPOOL 24134ec8559154f113f227c31734371c1c7f3973a0427762b1ee5325588793aa97e084824868cadb1c71d14652c9bb20a0bad863950d9e41432ecfa40c011e9d
+EBUILD xterm-327.ebuild 2630 SHA256 d8db6d1f3bdf1bde70996a2479a6a443d4c501a561402f1d6811a2eecd719b03 SHA512 e6a979b95b5df8a3abcaaffc5de491feec31b6ab0a24b338612605e4916eb8e7c4384912f2c33a1f47372c144288dff5c6ef6df19c2711ceb11513a4c78f1f88 WHIRLPOOL 22b91f3f3ba7766b62e6579dbf6bcc70d803abe9d3eb3777a4d1eadeb5567acab874421df13c3b53f6fae1b0d5e9d7568e562994d2920cdf70c3e3ce7f3001ff
+EBUILD xterm-328.ebuild 2639 SHA256 2e19a3725718ac0fb94c0adc007a73b2829b4f675e9bf0a1a6bf346e6e241c6d SHA512 f08e2d1990bd096f681f19ef263638574d75cebd92734dfa6c6cf331d078169fc534d81e3c1cecc66457a3faf9f33ad7af186b244c0d30f2eb86cb2ec998c501 WHIRLPOOL fba3f3b3a2d739fa017db41a9be30fa2f0337c0956a3ad4ed975f03b00e881b29654d7a5cbd0e333e14842575a7770156791b281e6ad02b5fc720833e5dbd7d3
+EBUILD xterm-329.ebuild 2639 SHA256 2e19a3725718ac0fb94c0adc007a73b2829b4f675e9bf0a1a6bf346e6e241c6d SHA512 f08e2d1990bd096f681f19ef263638574d75cebd92734dfa6c6cf331d078169fc534d81e3c1cecc66457a3faf9f33ad7af186b244c0d30f2eb86cb2ec998c501 WHIRLPOOL fba3f3b3a2d739fa017db41a9be30fa2f0337c0956a3ad4ed975f03b00e881b29654d7a5cbd0e333e14842575a7770156791b281e6ad02b5fc720833e5dbd7d3
+EBUILD xterm-330.ebuild 2639 SHA256 2e19a3725718ac0fb94c0adc007a73b2829b4f675e9bf0a1a6bf346e6e241c6d SHA512 f08e2d1990bd096f681f19ef263638574d75cebd92734dfa6c6cf331d078169fc534d81e3c1cecc66457a3faf9f33ad7af186b244c0d30f2eb86cb2ec998c501 WHIRLPOOL fba3f3b3a2d739fa017db41a9be30fa2f0337c0956a3ad4ed975f03b00e881b29654d7a5cbd0e333e14842575a7770156791b281e6ad02b5fc720833e5dbd7d3
+MISC ChangeLog 8281 SHA256 5a196039cebd4841b8b19525c72a6de3e44a23f3f4ebbe9c82ce62894ddf9950 SHA512 9696edaf7bb1ffe1e8f95298467ab9217588c8c9cc67299b36c7f0f04ff3b38cefa538110597060501b248631ad3d4ecfaae137181500d2df8f8ec3d2c9353cd WHIRLPOOL 5571fdace9dfa5423f3859ce67ce87c77246a689899deadfaeabc453a25bb0525b2ac7225fce953328ae00c2c244bc202ac53ca0f602c74b33e3f81c7b1b6e0c
+MISC ChangeLog-2015 51820 SHA256 1bbaa77b814a199ddc1bcab15f83314708164931f8e71f1d58a64933dbcdd5a6 SHA512 7d8fb26c1868fedd19ae1a4adcbe4f6a2b4cf17f6f315d614ded055394c5d11c6141daef2db3973bdefa9fb0df0762a8c447a23ddfa59961a25724f6f8f28734 WHIRLPOOL acee97a45b4239bc9b12b029aca5026d034bfc595fb894be296e85454a8610767ac81b62b9770ff245adccabfe7b936b960fd021cb5546d7c5adf813c2f39869
+MISC metadata.xml 404 SHA256 b6abc17dcfac6b0dfb432d082682c4d1f4f15790b0792f858fb06c0fc87aea53 SHA512 2f6acf3970872f23aa82f12b76fce6758d579aaaf7d988b8a2b75d9d845528fef5d50faafa5de1d3e49262dda8b706107902beac035a5ff1fb171d35aaa2dd08 WHIRLPOOL 33eb96ffcd282e6ed51d7e487c18b92e502bff554d5380b778def057db63976ca89c43552a479e074405f7edb752a331fdcbb26f7cb3eba3cc4c0a5993c46227
diff --git a/x11-terms/xterm/metadata.xml b/x11-terms/xterm/metadata.xml
new file mode 100644
index 000000000000..717e3b6fdfa4
--- /dev/null
+++ b/x11-terms/xterm/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <use>
+    <flag name="openpty">Use openpty() in preference to posix_openpt()</flag>
+    <flag name="toolbar">Enable the xterm toolbar to be built</flag>
+  </use>
+</pkgmetadata>
diff --git a/x11-terms/xterm/xterm-327.ebuild b/x11-terms/xterm/xterm-327.ebuild
new file mode 100644
index 000000000000..fa8a8dd0a687
--- /dev/null
+++ b/x11-terms/xterm/xterm-327.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="Terminal Emulator for X Windows"
+HOMEPAGE="https://invisible-island.net/xterm/"
+SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+openpty toolbar truetype unicode Xaw3d xinerama"
+
+COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter )
+	kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
+	>=sys-libs/ncurses-5.7-r7:0=
+	x11-apps/xmessage
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXft
+	x11-libs/libxkbfile
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXt
+	unicode? ( x11-apps/luit )
+	Xaw3d? ( x11-libs/libXaw3d )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${COMMON_DEPEND}
+	media-fonts/font-misc-misc
+	x11-apps/rgb"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	x11-proto/kbproto
+	x11-proto/xproto"
+
+DOCS=( README{,.i18n} ctlseqs.txt )
+
+pkg_setup() {
+	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
+}
+
+src_configure() {
+	# 454736
+	# Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
+	# something sane like pkg-config or ncurses5-config and stops guessing libs
+	# Everything gets linked against ncurses anyways, so don't shout
+	append-libs $(pkg-config --libs ncurses)
+
+	econf \
+		--libdir="${EPREFIX}"/etc \
+		--disable-full-tgetent \
+		--with-app-defaults="${DEFAULTS_DIR}" \
+		--disable-setuid \
+		--disable-setgid \
+		--with-utempter \
+		--with-x \
+		$(use_with Xaw3d) \
+		$(use_with xinerama) \
+		--disable-imake \
+		--enable-256-color \
+		--enable-broken-osc \
+		--enable-broken-st \
+		--enable-exec-xterm \
+		$(use_enable truetype freetype) \
+		--enable-i18n \
+		--enable-load-vt-fonts \
+		--enable-logging \
+		$(use_enable openpty) \
+		$(use_enable toolbar) \
+		$(use_enable unicode mini-luit) \
+		$(use_enable unicode luit) \
+		--enable-wide-chars \
+		--enable-dabbrev \
+		--enable-warnings
+}
+
+src_install() {
+	default
+
+	dohtml xterm.log.html
+	domenu *.desktop
+
+	# Fix permissions -- it grabs them from live system, and they can
+	# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
+	# respectively (#69510).
+	# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
+	fperms 0755 /usr/bin/xterm
+
+	# restore the navy blue
+	sed -i -e "s:blue2$:blue:" "${D}${DEFAULTS_DIR}"/XTerm-color || die
+}
diff --git a/x11-terms/xterm/xterm-328.ebuild b/x11-terms/xterm/xterm-328.ebuild
new file mode 100644
index 000000000000..1dfbec154c2a
--- /dev/null
+++ b/x11-terms/xterm/xterm-328.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="Terminal Emulator for X Windows"
+HOMEPAGE="https://invisible-island.net/xterm/"
+SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+openpty toolbar truetype unicode Xaw3d xinerama"
+
+COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter )
+	kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
+	>=sys-libs/ncurses-5.7-r7:0=
+	x11-apps/xmessage
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXft
+	x11-libs/libxkbfile
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXt
+	unicode? ( x11-apps/luit )
+	Xaw3d? ( x11-libs/libXaw3d )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${COMMON_DEPEND}
+	media-fonts/font-misc-misc
+	x11-apps/rgb"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	x11-proto/kbproto
+	x11-proto/xproto"
+
+DOCS=( README{,.i18n} ctlseqs.txt )
+
+pkg_setup() {
+	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
+}
+
+src_configure() {
+	# 454736
+	# Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
+	# something sane like pkg-config or ncurses5-config and stops guessing libs
+	# Everything gets linked against ncurses anyways, so don't shout
+	append-libs $(pkg-config --libs ncurses)
+
+	econf \
+		--libdir="${EPREFIX}"/etc \
+		--disable-full-tgetent \
+		--with-app-defaults="${DEFAULTS_DIR}" \
+		--disable-setuid \
+		--disable-setgid \
+		--with-utempter \
+		--with-x \
+		$(use_with Xaw3d) \
+		$(use_with xinerama) \
+		--disable-imake \
+		--enable-256-color \
+		--enable-broken-osc \
+		--enable-broken-st \
+		--enable-exec-xterm \
+		$(use_enable truetype freetype) \
+		--enable-i18n \
+		--enable-load-vt-fonts \
+		--enable-logging \
+		$(use_enable openpty) \
+		$(use_enable toolbar) \
+		$(use_enable unicode mini-luit) \
+		$(use_enable unicode luit) \
+		--enable-wide-chars \
+		--enable-dabbrev \
+		--enable-warnings
+}
+
+src_install() {
+	default
+
+	dohtml xterm.log.html
+	domenu *.desktop
+
+	# Fix permissions -- it grabs them from live system, and they can
+	# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
+	# respectively (#69510).
+	# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
+	fperms 0755 /usr/bin/xterm
+
+	# restore the navy blue
+	sed -i -e "s:blue2$:blue:" "${D}${DEFAULTS_DIR}"/XTerm-color || die
+}
diff --git a/x11-terms/xterm/xterm-329.ebuild b/x11-terms/xterm/xterm-329.ebuild
new file mode 100644
index 000000000000..1dfbec154c2a
--- /dev/null
+++ b/x11-terms/xterm/xterm-329.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="Terminal Emulator for X Windows"
+HOMEPAGE="https://invisible-island.net/xterm/"
+SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+openpty toolbar truetype unicode Xaw3d xinerama"
+
+COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter )
+	kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
+	>=sys-libs/ncurses-5.7-r7:0=
+	x11-apps/xmessage
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXft
+	x11-libs/libxkbfile
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXt
+	unicode? ( x11-apps/luit )
+	Xaw3d? ( x11-libs/libXaw3d )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${COMMON_DEPEND}
+	media-fonts/font-misc-misc
+	x11-apps/rgb"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	x11-proto/kbproto
+	x11-proto/xproto"
+
+DOCS=( README{,.i18n} ctlseqs.txt )
+
+pkg_setup() {
+	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
+}
+
+src_configure() {
+	# 454736
+	# Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
+	# something sane like pkg-config or ncurses5-config and stops guessing libs
+	# Everything gets linked against ncurses anyways, so don't shout
+	append-libs $(pkg-config --libs ncurses)
+
+	econf \
+		--libdir="${EPREFIX}"/etc \
+		--disable-full-tgetent \
+		--with-app-defaults="${DEFAULTS_DIR}" \
+		--disable-setuid \
+		--disable-setgid \
+		--with-utempter \
+		--with-x \
+		$(use_with Xaw3d) \
+		$(use_with xinerama) \
+		--disable-imake \
+		--enable-256-color \
+		--enable-broken-osc \
+		--enable-broken-st \
+		--enable-exec-xterm \
+		$(use_enable truetype freetype) \
+		--enable-i18n \
+		--enable-load-vt-fonts \
+		--enable-logging \
+		$(use_enable openpty) \
+		$(use_enable toolbar) \
+		$(use_enable unicode mini-luit) \
+		$(use_enable unicode luit) \
+		--enable-wide-chars \
+		--enable-dabbrev \
+		--enable-warnings
+}
+
+src_install() {
+	default
+
+	dohtml xterm.log.html
+	domenu *.desktop
+
+	# Fix permissions -- it grabs them from live system, and they can
+	# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
+	# respectively (#69510).
+	# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
+	fperms 0755 /usr/bin/xterm
+
+	# restore the navy blue
+	sed -i -e "s:blue2$:blue:" "${D}${DEFAULTS_DIR}"/XTerm-color || die
+}
diff --git a/x11-terms/xterm/xterm-330.ebuild b/x11-terms/xterm/xterm-330.ebuild
new file mode 100644
index 000000000000..1dfbec154c2a
--- /dev/null
+++ b/x11-terms/xterm/xterm-330.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="Terminal Emulator for X Windows"
+HOMEPAGE="https://invisible-island.net/xterm/"
+SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+openpty toolbar truetype unicode Xaw3d xinerama"
+
+COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter )
+	kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
+	>=sys-libs/ncurses-5.7-r7:0=
+	x11-apps/xmessage
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXft
+	x11-libs/libxkbfile
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXt
+	unicode? ( x11-apps/luit )
+	Xaw3d? ( x11-libs/libXaw3d )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${COMMON_DEPEND}
+	media-fonts/font-misc-misc
+	x11-apps/rgb"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	x11-proto/kbproto
+	x11-proto/xproto"
+
+DOCS=( README{,.i18n} ctlseqs.txt )
+
+pkg_setup() {
+	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
+}
+
+src_configure() {
+	# 454736
+	# Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
+	# something sane like pkg-config or ncurses5-config and stops guessing libs
+	# Everything gets linked against ncurses anyways, so don't shout
+	append-libs $(pkg-config --libs ncurses)
+
+	econf \
+		--libdir="${EPREFIX}"/etc \
+		--disable-full-tgetent \
+		--with-app-defaults="${DEFAULTS_DIR}" \
+		--disable-setuid \
+		--disable-setgid \
+		--with-utempter \
+		--with-x \
+		$(use_with Xaw3d) \
+		$(use_with xinerama) \
+		--disable-imake \
+		--enable-256-color \
+		--enable-broken-osc \
+		--enable-broken-st \
+		--enable-exec-xterm \
+		$(use_enable truetype freetype) \
+		--enable-i18n \
+		--enable-load-vt-fonts \
+		--enable-logging \
+		$(use_enable openpty) \
+		$(use_enable toolbar) \
+		$(use_enable unicode mini-luit) \
+		$(use_enable unicode luit) \
+		--enable-wide-chars \
+		--enable-dabbrev \
+		--enable-warnings
+}
+
+src_install() {
+	default
+
+	dohtml xterm.log.html
+	domenu *.desktop
+
+	# Fix permissions -- it grabs them from live system, and they can
+	# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
+	# respectively (#69510).
+	# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
+	fperms 0755 /usr/bin/xterm
+
+	# restore the navy blue
+	sed -i -e "s:blue2$:blue:" "${D}${DEFAULTS_DIR}"/XTerm-color || die
+}
diff --git a/x11-terms/xvt/Manifest b/x11-terms/xvt/Manifest
new file mode 100644
index 000000000000..ca10687bf934
--- /dev/null
+++ b/x11-terms/xvt/Manifest
@@ -0,0 +1,10 @@
+AUX xvt-int-main.patch 458 SHA256 11e20ebf19b334ae4e1237147c56298ce6b6995a30de0dcd5695c435fc75d716 SHA512 511525c6016974951c3157a817bbd6c23e630de53f412f275112303bd01ca5b865412d5a2f69d2b2e38e02e1989dca25681707477298f39e501a20a9d8e6cc22 WHIRLPOOL 691c5765ef9bba66a43f61d58a0e3bb8a0d5cb3e46f663a002fca402c6c2b42a569ae50fd9abe140783a99c81142dca1338f06ebf2996d7a221a33ea98d97c4d
+AUX xvt-makefile.patch 583 SHA256 b5dcc3f2806d85085e215a844624b099bbf3f94b8bc8ba5defbf1c61f4e82992 SHA512 8c68862bc02a7646e4288a07b40bf703c3acb94ebb29725ed87c734643b4f039b828a65bd3c4745d69bb81ac4b358ca12b12e95ba51c453c8610a6cceaa7d146 WHIRLPOOL 0af7800dd3bab2fc953fdfc3975c86af5d7215d0adc06f9d9275c4c37884b40e4c0350de48141ce8342ec0f82d57728eb1baf6663ef8fba61589de63470121d5
+AUX xvt-pts.patch 211 SHA256 77d7dbfd2a2ed6d1341234b859337a4696ebea557a182c605dcd31f35b70efce SHA512 ba3f910018d7e5efaf788ff9d5fe5c7ec74a088522a04c46702f83f9a60455004310e3a32547b3a2feb679056c08af07ace19ad73ddbdbc93a797da7482b420d WHIRLPOOL 6679583a85c4845a6bedbce0133c22ba919bf8593c1e1bbff303bd9cb5ed1515ffc49e0272e9278871ce5dcabdb00ddae7c63816639dcbe2db68cf962b02f688
+AUX xvt-ttyinit-svr4pty.diff 1380 SHA256 9723dce5d6609a8fddaed166bf6143faeb1b84765bdd7818b4eec33bb8d2371c SHA512 790b97e5f05738bfc912af030733db4ee0b419844f1b9d4d6655b3dc3cf225d513fa3e3aed0f877a68bda9530fcd463fa0bb75bd34e38c3ba4eeccb4b8ff7da4 WHIRLPOOL bd14ede0578d143557a2e7d8d7132029ba72d4bc91ce290b5e0344eee3b1fa8bbda5a7e24c4773e30833747292c06bc5cad79d5a50c8a3e3cd42d56e1ab7ca8f
+DIST xvt-1.0.tar.Z 59445 SHA256 399013beff538467a307d8a5f132e47ea4f5e18d60aba62c4d438f3ae1f086a1 SHA512 671fdc931526821e9228c327d2231e0f241997c632b0f084b2be02b99296ececa64f2de2769e92c3682c0aa2e9cf8dc61ac561ffd1d10136256029d24f872a1b WHIRLPOOL 31bec7b379c44c691f9a56c9052bf7b45a6df763f06750494d2bb5b747b7cb515e681f9e215de85f1173f1da31121e826a41ed49b7e7b1fc32e2b132c7d6d636
+DIST xvt-2.1.diff.gz 39941 SHA256 c51e0b1ea281ce83138d6a3f724c21b65c6257cf5438d8d0d5c34a8006348607 SHA512 c229cb98ef3de7b4ab76b81ae888fc3a59ff9fcf5807ecdc58f8e5b634f9c2e618d2b3c17b4cd6410903004a712aac1c1d329751a48f05d605a7eb23dd58d612 WHIRLPOOL 9c0dcf583100a0637cd6dc126c2eb34c278b13399405c6a49adc2f2e3f964ca67a2743b83cf4958bc97f1ff3d48d2660d44f20e6d018596139240375b60084f2
+EBUILD xvt-2.1-r3.ebuild 965 SHA256 1bf86719f99169f788164f027d6bedaeaeb9f517259e76969ee8b2f7d2bc98a7 SHA512 3e6bbfa0293664fd218a21c0ce72ab7229b8f13b98a9519fdf9ea6c1564f938825045d7b118319681f82a390b814e76b416f1524f12bb05b301e3de8ccc943e9 WHIRLPOOL fab1b4ed2117140e3aee9c9e961d793f646a02737064fccabd55619c9edf28f39d170730e507e4bf43fc30a2ca895d0d7b88d5f91f3f19753a5cb92bf16cc108
+MISC ChangeLog 2624 SHA256 b2d06b30c6b14628fe1532e4dc3e94bff8c52f7521381b8ebc7e2e744eef44ef SHA512 45c92e84f0ba6411747a14cd9fb556ea3c8095d2a69576f9ffd46278b3a3a26339f811aa7ce24c9bf84da8337a23638abbfa994463e08fe9fd561bcd8e1ee834 WHIRLPOOL 3553d4d9665463686b4d8a39f89a1dd2526b144dbff6c072e3f3426a10cb9c49670e034c75da6cbd84b332fe0fb56e6b4939117ebdd6732f0141907f5c29f2e0
+MISC ChangeLog-2015 2768 SHA256 59f0a6303c8d19fadf48dfb95ef14a671fe83d119be4b9179bef32bf303522c8 SHA512 62d7d798014600926363226d08dc7fd52db1052d96a98a2af962581be7e6232ac76c05bdf1a2e0157aa1de53ffa995e01bfe555147b9e430f4c6bd96f2529d56 WHIRLPOOL 280f8b6732d48977e4f89fecbc7e8407ee5d97cabfec95b3db557beeb8fc8c563fad2e3eccaaba1899ad8ff39d587c363230e2177b21d63a2b4b7d41dee4e18c
+MISC metadata.xml 256 SHA256 41f0660fc66ddd75eb62be043243821841b42538deb7d153b186888b666790e5 SHA512 954fbecba4916b2b5e4b353a55a7c4ae6bd9be7190f6550ae4eb003f4037698a4576aee03847d4def6a5ca6dfbb9d145749a6fdb44b8a77477f726c92968643b WHIRLPOOL 08cd48931de8a40cc55417886a97fe47b16deba1fd8bd6713c27d6e68aee377de9cd306706a4c2aa992fcfebc3e28129f30f1c6052655047994e66a6c6489b12
diff --git a/x11-terms/xvt/files/xvt-int-main.patch b/x11-terms/xvt/files/xvt-int-main.patch
new file mode 100644
index 000000000000..81baa76ce5e0
--- /dev/null
+++ b/x11-terms/xvt/files/xvt-int-main.patch
@@ -0,0 +1,23 @@
+--- xvt-1.0/xvt.c.orig	2009-09-04 15:49:13.000000000 +0200
++++ xvt-1.0/xvt.c	2009-09-04 15:49:13.000000000 +0200
+@@ -41,9 +41,9 @@
+ #endif /* UKC_LOCATIONS */
+ 
+ #ifdef __STDC__
+-void main(int,char **);
++int main(int,char **);
+ #else
+-void main();
++int main();
+ #endif
+ 
+ extern int debugging;
+@@ -67,7 +67,7 @@
+  *  master end of the pseudo-teletype pair with the command talking to
+  *  the slave.
+  */
+-void
++int
+ main(argc,argv)
+ int argc;
+ char **argv;
diff --git a/x11-terms/xvt/files/xvt-makefile.patch b/x11-terms/xvt/files/xvt-makefile.patch
new file mode 100644
index 000000000000..368fdeeb00be
--- /dev/null
+++ b/x11-terms/xvt/files/xvt-makefile.patch
@@ -0,0 +1,20 @@
+--- xvt-1.0/Makefile.orig	2009-09-04 15:45:08.000000000 +0200
++++ xvt-1.0/Makefile	2009-09-04 15:46:00.000000000 +0200
+@@ -27,7 +27,7 @@
+ #ARCH=AIX3
+ #ARCH=ULTRIX
+ #ARCH=HPUX
+-#ARCH=LINUX
++ARCH=LINUX
+ #
+ #
+ # If this line is uncommented then `Make config' will unclude several options
+@@ -107,7 +107,7 @@
+ OBJ=xvt.o xsetup.o command.o screen.o sbar.o ttyinit.o
+ SRC=xvt.c xsetup.c command.c screen.c sbar.c ttyinit.c
+ #
+-CFLAGS=-O $(INCLUDE) $(OPTIONS) $(DEFS) -D$(ARCH)
++CFLAGS+= $(INCLUDE) $(OPTIONS) $(DEFS) -D$(ARCH)
+ #
+ xvt: $(OBJ)
+ 	$(CC) $(LDFLAGS) -o xvt $(OBJ) $(LIB) -lX11
diff --git a/x11-terms/xvt/files/xvt-pts.patch b/x11-terms/xvt/files/xvt-pts.patch
new file mode 100644
index 000000000000..a86504ad29e5
--- /dev/null
+++ b/x11-terms/xvt/files/xvt-pts.patch
@@ -0,0 +1,12 @@
+--- a/ttyinit.c
++++ b/ttyinit.c
+@@ -25,6 +25,9 @@ 
+ 
+ char xvt_ttyinit_c_sccsid[] = "@(#)ttyinit.c	1.3 11/1/94 (UKC)";
+ 
++#ifdef LINUX
++#define _XOPEN_SOURCE
++#endif
+ #ifdef __STDC__
+ #include <stdarg.h>
+ #else
diff --git a/x11-terms/xvt/files/xvt-ttyinit-svr4pty.diff b/x11-terms/xvt/files/xvt-ttyinit-svr4pty.diff
new file mode 100644
index 000000000000..a858250c1d8a
--- /dev/null
+++ b/x11-terms/xvt/files/xvt-ttyinit-svr4pty.diff
@@ -0,0 +1,63 @@
+--- ttyinit.c	2004-08-24 18:51:18.510722064 +0100
++++ ttyinit.c.new	2004-08-24 18:50:30.539014872 +0100
+@@ -46,6 +46,7 @@
+ #include <pwd.h>
+ #include <errno.h>
+ #include <string.h>
++#include <stropts.h>
+ #include "xvt.h"
+ #include "token.h"
+ #include "command.h"
+@@ -410,44 +411,6 @@
+ get_pseudo_tty(pmaster,pslave)
+ int *pmaster, *pslave;
+ {
+-#ifdef BSD_PTY
+-	int mfd, sfd;
+-	char *s3, *s4;
+-	static char ptyc3[] = "pqrstuvwxyz";
+-	static char ptyc4[] = "0123456789abcdef";
+-	static char ptynam[] = "/dev/ptyxx";
+-	static char ttynam[] = "/dev/ttyxx";
+-
+-	/*  First find a master pty that we can open.
+-	 */
+-	mfd = -1;
+-	for (s3 = ptyc3; *s3 != 0; s3++) {
+-		for (s4 = ptyc4; *s4 != 0; s4++) {
+-			ptynam[8] = ttynam[8] = *s3;
+-			ptynam[9] = ttynam[9] = *s4;
+-			if ((mfd = open(ptynam,O_RDWR)) >= 0) {
+-				if (geteuid() == 0 || access(ttynam,R_OK|W_OK) == 0)
+-					break;
+-				else {
+-					close(mfd);
+-					mfd = -1;
+-				}
+-			}
+-		}
+-		if (mfd >= 0)
+-			break;
+-	}
+-	if (mfd < 0) {
+-		error("Can't open a pseudo teletype");
+-		return(NULL);
+-	}
+-	if ((sfd = open(ttynam,O_RDWR)) < 0) {
+-		error("could not open slave tty %s",ttynam);
+-		return(NULL);
+-	}
+-#endif /* BSD_PTY */
+-
+-#ifdef SVR4_PTY
+ 	char *ttynam;
+ 	int mfd, sfd;
+ 
+@@ -464,7 +427,6 @@
+ 	}
+ 	ioctl(sfd,I_PUSH,"ptem");
+ 	ioctl(sfd,I_PUSH,"ldterm");
+-#endif /* SVR4_PTY */
+ 
+ 	*pslave = sfd;
+ 	*pmaster = mfd;
diff --git a/x11-terms/xvt/metadata.xml b/x11-terms/xvt/metadata.xml
new file mode 100644
index 000000000000..41c6dfc7341b
--- /dev/null
+++ b/x11-terms/xvt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		A tiny vt100 terminal emulator for X.
+	</longdescription>
+</pkgmetadata>
diff --git a/x11-terms/xvt/xvt-2.1-r3.ebuild b/x11-terms/xvt/xvt-2.1-r3.ebuild
new file mode 100644
index 000000000000..2720588b12f7
--- /dev/null
+++ b/x11-terms/xvt/xvt-2.1-r3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A tiny vt100 terminal emulator for X"
+HOMEPAGE="ftp://ftp.x.org/R5contrib/xvt-1.0.README"
+SRC_URI="ftp://ftp.x.org/R5contrib/xvt-1.0.tar.Z
+		mirror://gentoo/xvt-2.1.diff.gz"
+
+LICENSE="xvt"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+S=${WORKDIR}/${PN}-1.0
+
+src_prepare() {
+	# this brings the distribution upto version 2.1
+	epatch "${WORKDIR}"/${P}.diff
+
+	# fix #61393
+	epatch "${FILESDIR}/${PN}-ttyinit-svr4pty.diff"
+
+	# CFLAGS, CC #241554
+	epatch "${FILESDIR}/${PN}-makefile.patch"
+
+	# int main, not void main
+	epatch "${FILESDIR}/${PN}-int-main.patch"
+
+	# fix segfault (bug #363883)
+	epatch "${FILESDIR}/${PN}-pts.patch"
+
+	tc-export CC
+}
+
+src_install() {
+	dobin xvt || die "dobin failed"
+	doman xvt.1
+	dodoc README
+}
diff --git a/x11-terms/yeahconsole/Manifest b/x11-terms/yeahconsole/Manifest
new file mode 100644
index 000000000000..a80a87d54066
--- /dev/null
+++ b/x11-terms/yeahconsole/Manifest
@@ -0,0 +1,6 @@
+AUX yeahconsole-0.3.4-make.patch 769 SHA256 478d7469b804806468fefea15d7b71775e2508e0f3f25a093a8e95ff9acabb59 SHA512 e78ace16e451fabe508ff9e6b691ae215b626a1b16868d44f958801c01278b15921cd8a187d454dd685a75eea8b798cd00e71ae024d83c43918104c43cf1a58f WHIRLPOOL 64b2dfd9ed0ef19b3eafaef03894fa4dcf36312240784c43372088883bfa924381f8c889366ad604652a18df18c291f682d56a906da862eb0bd959f7581aace1
+DIST yeahconsole-0.3.4.tar.gz 12281 SHA256 fcf3481f78a263a70f1cb5163630fc22e78bb0915013eb05689c6f4aeb0583ef SHA512 cba74d988b3cb991d95de1796e9e79b881fe011d4fc8d6aa1f863f4c465aadfd31250e57d36ce0118dfc367225c2861cf8e80ac47996c2718d83756a8e638ead WHIRLPOOL 2e0ec6d593f96e28341277b32e3c8998232e0742e17cc6b96abb518cab809746b61c8f06ccb46da8264c1bbfac6e92be15a7290f10b2f51853b6e5734e923935
+EBUILD yeahconsole-0.3.4-r1.ebuild 854 SHA256 9f9bb8548307a2046fed3c99e02143cefc54195712c590f5561d63005843e226 SHA512 18f3e98027f3daf5ab144e3f6a811721c67f7fa2e9f6185133312c7be7eb40d4fe709c26898e93508254e8d470df6021debe3f43640d84b58895a9a8514d4e79 WHIRLPOOL 98fd98d2ae6e40ca6eba873e291259d19d7271aaf6819734b57f40cebf759383d91fbec3ad7744d9c3eaa78e24742f19d59218fb3868726d5671736cdfdf5f7f
+MISC ChangeLog 2234 SHA256 1f324e065636c6c46be073dcd67454e9e319f4d7b84ce946d712ee10f8eabfdc SHA512 bcc2f409637cb207c7de84fce96cfb7e9bdb173c42f672cf684167ebc0003fada27000a7c33fe6f5414c9493c41fd1b4f4778be859b7c71199cbbbb9ff74b73b WHIRLPOOL 9cf3dbfc210c290e9ed0836233eff852cade1497d4e837ce698eb364ddce95e6609a251ad3888fab9489f172a4052b2a5c633226f6f4c1b2037d6d2539c6a197
+MISC ChangeLog-2015 1875 SHA256 03a94ec7f29242edea4f399014fd90af1bbbe43c980e54eb3123070a7bef965f SHA512 3549d42e4cbdeec4748c16ae43c3bb44e8837807bee5b3390574e34a8e409e6af19851e156157207dcb7f6cf46493b65f42e21ab4e5decbcd0f84e3472bb0bdb WHIRLPOOL b8ff9a11dac05592428bd630543accb2e7ba4bd4971609433f7fb1e9ed9f979a16aa540f3c2786e12aec87ec2002bd41b4e30cb8036935acf5c480892236ae09
+MISC metadata.xml 240 SHA256 58d315d79d6b07d798e12d1f8f2481ca4eb03b71d430e68989603732bcd392c8 SHA512 25affa2d6d2fe48707ae81553343451aff9797885b4232e73973a29d4cc1d28a937d024cefca49f92383f01eb8cb811546cd2334cbb78f8e66f1db1f63ff4572 WHIRLPOOL 7d0fb1efdaf8bcd6f9a04c6f8635a1071bd50e6b223334139c275d55fabf5ad9e93390120ea7c823495048176a74f66b6dd09d3ffabc9a6e67f63cae2af73f24
diff --git a/x11-terms/yeahconsole/files/yeahconsole-0.3.4-make.patch b/x11-terms/yeahconsole/files/yeahconsole-0.3.4-make.patch
new file mode 100644
index 000000000000..0075c433292b
--- /dev/null
+++ b/x11-terms/yeahconsole/files/yeahconsole-0.3.4-make.patch
@@ -0,0 +1,30 @@
+--- a/Makefile	2006-01-14 16:54:05.000000000 +0100
++++ b/Makefile	2009-02-26 16:18:25.000000000 +0100
+@@ -1,6 +1,4 @@
+ TARGET = yeahconsole
+-CC = gcc
+-#CC = cc
+ INSTALL = install
+ 
+ PREFIX = /usr/local
+@@ -8,17 +6,16 @@
+ LIBS = -lX11 
+ INCLUDES = -I/usr/X11R6/include 
+ LIB_DIRS = -L/usr/X11R6/lib
+-FLAGS = -Os -Wall
++FLAGS = -Wall $(CFLAGS)
+ 
+ OBJECTS := yeahconsole.o
+ SOURCES := yeahconsole.c
+ 
+ $(TARGET): $(OBJECTS) 
+-	$(CC) $(DEFINES) $(INCLUDES) $(LIB_DIRS) $(LIBS) -o $@ $<
+-	strip $@
++	$(CC) $(FLAGS) $(LDFLAGS) $(DEFINES) $(INCLUDES) $(LIB_DIRS) -o $@ $< $(LIBS)
+ 
+ $(OBJECTS): $(SOURCES) 
+-	$(CC) $(FLAGS)  $(DEFINES) $(INCLUDES) $(LIB_DIRS) -c -o $@ $<
++	$(CC) $(FLAGS) $(DEFINES) $(INCLUDES) $(LIB_DIRS) -c -o $@ $<
+ 
+ clean:
+ 	rm -rf $(TARGET) $(OBJECTS)
diff --git a/x11-terms/yeahconsole/metadata.xml b/x11-terms/yeahconsole/metadata.xml
new file mode 100644
index 000000000000..f9f8bbfd9405
--- /dev/null
+++ b/x11-terms/yeahconsole/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>jer@gentoo.org</email>
+	<name>Jeroen Roovers</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-terms/yeahconsole/yeahconsole-0.3.4-r1.ebuild b/x11-terms/yeahconsole/yeahconsole-0.3.4-r1.ebuild
new file mode 100644
index 000000000000..08c40f4f0d49
--- /dev/null
+++ b/x11-terms/yeahconsole/yeahconsole-0.3.4-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="yeahconsole turns an xterm or rxvt-unicode into a game-like console"
+HOMEPAGE="http://phrat.de/yeahtools.html"
+SRC_URI="http://phrat.de/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa x86"
+
+IUSE=""
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-make.patch
+}
+
+src_compile() {
+	tc-export CC
+	emake || die "make failed"
+}
+
+src_install() {
+	dodir /usr/bin
+	emake PREFIX="${D}"/usr install || die "emake install failed"
+	dodoc README
+}
+
+pkg_postinst() {
+	elog "Do not forget to emerge an xterm compatible terminal emulator"
+	elog "(perhaps x11-terms/xterm or x11-terms/rxvt-unicode), or"
+	elog "${PN} will not work ;-)."
+}