summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-terms')
-rw-r--r--x11-terms/aterm/Manifest1
-rw-r--r--x11-terms/aterm/aterm-1.0.1-r2.ebuild85
-rw-r--r--x11-terms/aterm/files/aterm-1.0.1-deadkeys.patch35
-rw-r--r--x11-terms/aterm/files/aterm-1.0.1-display-security-issue.patch24
-rw-r--r--x11-terms/aterm/metadata.xml13
-rw-r--r--x11-terms/eterm/Manifest4
-rw-r--r--x11-terms/eterm/eterm-0.9.5.ebuild79
-rw-r--r--x11-terms/eterm/eterm-0.9.6.ebuild86
-rw-r--r--x11-terms/eterm/eterm-9999.ebuild82
-rw-r--r--x11-terms/eterm/files/eterm-0.9.6-asm-gnu-stack.patch13
-rw-r--r--x11-terms/eterm/metadata.xml20
-rw-r--r--x11-terms/evilvte/Manifest2
-rw-r--r--x11-terms/evilvte/evilvte-0.5.1.ebuild44
-rw-r--r--x11-terms/evilvte/evilvte-0.5.2_pre1.ebuild59
-rw-r--r--x11-terms/evilvte/metadata.xml5
-rw-r--r--x11-terms/gnome-terminal/Manifest3
-rw-r--r--x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-fix-crash.patch26
-rw-r--r--x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-title-option.patch166
-rw-r--r--x11-terms/gnome-terminal/files/gnome-terminal-3.16.2-restore-dark.patch196
-rw-r--r--x11-terms/gnome-terminal/files/gnome-terminal-3.16.2-restore-transparency.patch1604
-rw-r--r--x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild80
-rw-r--r--x11-terms/gnome-terminal/gnome-terminal-3.14.3.ebuild69
-rw-r--r--x11-terms/gnome-terminal/gnome-terminal-3.16.2-r2.ebuild77
-rw-r--r--x11-terms/gnome-terminal/metadata.xml9
-rw-r--r--x11-terms/guake/Manifest6
-rw-r--r--x11-terms/guake/files/guake-0.7.0-desktop.patch18
-rw-r--r--x11-terms/guake/guake-0.5.0.ebuild58
-rw-r--r--x11-terms/guake/guake-0.5.1.ebuild53
-rw-r--r--x11-terms/guake/guake-0.5.2.ebuild53
-rw-r--r--x11-terms/guake/guake-0.6.1.ebuild53
-rw-r--r--x11-terms/guake/guake-0.7.0.ebuild55
-rw-r--r--x11-terms/guake/guake-0.7.2.ebuild53
-rw-r--r--x11-terms/guake/guake-9999.ebuild60
-rw-r--r--x11-terms/guake/metadata.xml8
-rw-r--r--x11-terms/hanterm/Manifest1
-rw-r--r--x11-terms/hanterm/files/Hanterm.gentoo156
-rw-r--r--x11-terms/hanterm/files/hanterm-3.1.6-gentoo.patch42
-rw-r--r--x11-terms/hanterm/files/hanterm-3.1.6-utmp.patch14
-rw-r--r--x11-terms/hanterm/hanterm-3.1.6-r2.ebuild53
-rw-r--r--x11-terms/hanterm/hanterm-3.1.6-r4.ebuild56
-rw-r--r--x11-terms/hanterm/metadata.xml9
-rw-r--r--x11-terms/kterm/Manifest3
-rw-r--r--x11-terms/kterm/files/6.2.0-underline.patch22
-rw-r--r--x11-terms/kterm/files/kterm-6.2.0-Xaw3d.patch25
-rw-r--r--x11-terms/kterm/files/kterm-6.2.0-gentoo.patch51
-rw-r--r--x11-terms/kterm/files/kterm-6.2.0-openpty.patch59
-rw-r--r--x11-terms/kterm/files/kterm-ad-gentoo.diff21
-rw-r--r--x11-terms/kterm/kterm-6.2.0-r5.ebuild81
-rw-r--r--x11-terms/kterm/metadata.xml5
-rw-r--r--x11-terms/lilyterm/Manifest1
-rw-r--r--x11-terms/lilyterm/lilyterm-0.9.9.4.ebuild30
-rw-r--r--x11-terms/lilyterm/metadata.xml8
-rw-r--r--x11-terms/mate-terminal/Manifest2
-rw-r--r--x11-terms/mate-terminal/mate-terminal-1.8.0.ebuild41
-rw-r--r--x11-terms/mate-terminal/mate-terminal-1.8.1.ebuild41
-rw-r--r--x11-terms/mate-terminal/metadata.xml8
-rw-r--r--x11-terms/metadata.xml39
-rw-r--r--x11-terms/mlterm/Manifest3
-rw-r--r--x11-terms/mlterm/files/mlterm-2.9.4-uim15-fix.patch10
-rw-r--r--x11-terms/mlterm/files/mlterm-3.0.5-ibus.patch55
-rw-r--r--x11-terms/mlterm/files/mlterm-3.0.7-underlinking.patch13
-rw-r--r--x11-terms/mlterm/metadata.xml17
-rw-r--r--x11-terms/mlterm/mlterm-3.0.11-r1.ebuild92
-rw-r--r--x11-terms/mlterm/mlterm-3.4.5.ebuild107
-rw-r--r--x11-terms/mlterm/mlterm-3.5.0.ebuild115
-rw-r--r--x11-terms/mrxvt/Manifest1
-rw-r--r--x11-terms/mrxvt/files/mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch13
-rw-r--r--x11-terms/mrxvt/files/mrxvt-0.5.4-libpng14.patch33
-rw-r--r--x11-terms/mrxvt/metadata.xml16
-rw-r--r--x11-terms/mrxvt/mrxvt-0.5.4.ebuild119
-rw-r--r--x11-terms/multi-aterm/Manifest1
-rw-r--r--x11-terms/multi-aterm/files/0.2.1-initialize-vars.patch11
-rw-r--r--x11-terms/multi-aterm/files/multi-aterm-0.2.1-display-security-issue.patch23
-rw-r--r--x11-terms/multi-aterm/files/multi-aterm-0.2.1-libpng14.patch20
-rw-r--r--x11-terms/multi-aterm/metadata.xml7
-rw-r--r--x11-terms/multi-aterm/multi-aterm-0.2.1-r1.ebuild59
-rw-r--r--x11-terms/pangoterm/Manifest1
-rw-r--r--x11-terms/pangoterm/metadata.xml9
-rw-r--r--x11-terms/pangoterm/pangoterm-0.0_pre20150323.ebuild29
-rw-r--r--x11-terms/qterminal/Manifest3
-rw-r--r--x11-terms/qterminal/metadata.xml8
-rw-r--r--x11-terms/qterminal/qterminal-0.4.0.ebuild22
-rw-r--r--x11-terms/qterminal/qterminal-0.5.0_p20140913.ebuild22
-rw-r--r--x11-terms/qterminal/qterminal-0.6.0.ebuild40
-rw-r--r--x11-terms/root-tail/Manifest1
-rw-r--r--x11-terms/root-tail/files/root-tail-1.2-kde.patch125
-rw-r--r--x11-terms/root-tail/metadata.xml7
-rw-r--r--x11-terms/root-tail/root-tail-1.2-r3.ebuild47
-rw-r--r--x11-terms/roxterm/Manifest3
-rw-r--r--x11-terms/roxterm/metadata.xml10
-rw-r--r--x11-terms/roxterm/roxterm-2.6.3.ebuild60
-rw-r--r--x11-terms/roxterm/roxterm-2.6.5.ebuild50
-rw-r--r--x11-terms/roxterm/roxterm-2.9.3-r1.ebuild65
-rw-r--r--x11-terms/roxterm/roxterm-2.9.3.ebuild64
-rw-r--r--x11-terms/rxvt-unicode/Manifest1
-rw-r--r--x11-terms/rxvt-unicode/files/rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch33
-rw-r--r--x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-case-insensitive-fs.patch10
-rw-r--r--x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-font-width.patch21
-rw-r--r--x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-no-urgency-if-focused.diff15
-rw-r--r--x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-popups-hangs.patch13
-rw-r--r--x11-terms/rxvt-unicode/files/rxvt-unicode-9.14-clear.patch25
-rw-r--r--x11-terms/rxvt-unicode/files/rxvt-unicode-9.19-secondary-wheel.patch123
-rw-r--r--x11-terms/rxvt-unicode/files/rxvt-unicode-9.21-xsubpp.patch11
-rw-r--r--x11-terms/rxvt-unicode/metadata.xml33
-rw-r--r--x11-terms/rxvt-unicode/rxvt-unicode-9.21.ebuild134
-rw-r--r--x11-terms/rxvt/Manifest2
-rw-r--r--x11-terms/rxvt/files/rxvt-2.7.10-CVE-2008-1142-DISPLAY.patch52
-rw-r--r--x11-terms/rxvt/files/rxvt-2.7.10-asneeded.patch13
-rw-r--r--x11-terms/rxvt/files/rxvt-2.7.10-azz4.diff126
-rw-r--r--x11-terms/rxvt/files/rxvt-2.7.10-line-scroll.patch13
-rw-r--r--x11-terms/rxvt/files/rxvt-2.7.10-rk.patch82
-rw-r--r--x11-terms/rxvt/metadata.xml21
-rw-r--r--x11-terms/rxvt/rxvt-2.7.10-r4.ebuild93
-rw-r--r--x11-terms/sakura/Manifest3
-rw-r--r--x11-terms/sakura/files/sakura-3.1.3-flags.patch15
-rw-r--r--x11-terms/sakura/metadata.xml17
-rw-r--r--x11-terms/sakura/sakura-3.2.0.ebuild44
-rw-r--r--x11-terms/sakura/sakura-3.2.1.ebuild44
-rw-r--r--x11-terms/sakura/sakura-3.3.0.ebuild44
-rw-r--r--x11-terms/st/Manifest2
-rw-r--r--x11-terms/st/metadata.xml8
-rw-r--r--x11-terms/st/st-0.5.ebuild59
-rw-r--r--x11-terms/st/st-0.6.ebuild59
-rw-r--r--x11-terms/st/st-9999.ebuild60
-rw-r--r--x11-terms/terminator/Manifest2
-rw-r--r--x11-terms/terminator/files/0.90-without-icon-cache.patch11
-rw-r--r--x11-terms/terminator/files/0.93-session.patch13
-rw-r--r--x11-terms/terminator/files/0.94-session.patch13
-rw-r--r--x11-terms/terminator/files/terminator-0.97-brightness.patch35
-rw-r--r--x11-terms/terminator/metadata.xml20
-rw-r--r--x11-terms/terminator/terminator-0.96-r1.ebuild53
-rw-r--r--x11-terms/terminator/terminator-0.96-r2.ebuild48
-rw-r--r--x11-terms/terminator/terminator-0.96-r3.ebuild61
-rw-r--r--x11-terms/terminator/terminator-0.97-r1.ebuild64
-rw-r--r--x11-terms/terminator/terminator-0.97.ebuild63
-rw-r--r--x11-terms/terminology/Manifest6
-rw-r--r--x11-terms/terminology/metadata.xml9
-rw-r--r--x11-terms/terminology/terminology-0.4.0.ebuild20
-rw-r--r--x11-terms/terminology/terminology-0.5.0.ebuild20
-rw-r--r--x11-terms/terminology/terminology-0.5.1.ebuild20
-rw-r--r--x11-terms/terminology/terminology-0.6.1.ebuild20
-rw-r--r--x11-terms/terminology/terminology-0.7.0.ebuild20
-rw-r--r--x11-terms/terminology/terminology-0.8.0.ebuild19
-rw-r--r--x11-terms/terminology/terminology-9999.ebuild23
-rw-r--r--x11-terms/terra/metadata.xml11
-rw-r--r--x11-terms/terra/terra-9999.ebuild31
-rw-r--r--x11-terms/tilda/Manifest1
-rw-r--r--x11-terms/tilda/files/tilda-0.9.6-gdk_resources.patch12
-rw-r--r--x11-terms/tilda/files/tilda-0.9.6-glib-single-include.patch13
-rw-r--r--x11-terms/tilda/metadata.xml10
-rw-r--r--x11-terms/tilda/tilda-0.9.6.ebuild28
-rw-r--r--x11-terms/valaterm/Manifest1
-rw-r--r--x11-terms/valaterm/metadata.xml11
-rw-r--r--x11-terms/valaterm/valaterm-0.6.ebuild42
-rw-r--r--x11-terms/xfce4-terminal/Manifest1
-rw-r--r--x11-terms/xfce4-terminal/metadata.xml8
-rw-r--r--x11-terms/xfce4-terminal/xfce4-terminal-0.6.3.ebuild34
-rw-r--r--x11-terms/xterm/Manifest4
-rw-r--r--x11-terms/xterm/metadata.xml14
-rw-r--r--x11-terms/xterm/xterm-314.ebuild92
-rw-r--r--x11-terms/xterm/xterm-315.ebuild92
-rw-r--r--x11-terms/xterm/xterm-317.ebuild92
-rw-r--r--x11-terms/xterm/xterm-318.ebuild92
-rw-r--r--x11-terms/xvt/Manifest2
-rw-r--r--x11-terms/xvt/files/xvt-int-main.patch23
-rw-r--r--x11-terms/xvt/files/xvt-makefile.patch20
-rw-r--r--x11-terms/xvt/files/xvt-pts.patch12
-rw-r--r--x11-terms/xvt/files/xvt-ttyinit-svr4pty.diff63
-rw-r--r--x11-terms/xvt/metadata.xml10
-rw-r--r--x11-terms/xvt/xvt-2.1-r3.ebuild48
-rw-r--r--x11-terms/yeahconsole/Manifest1
-rw-r--r--x11-terms/yeahconsole/files/yeahconsole-0.3.4-make.patch30
-rw-r--r--x11-terms/yeahconsole/metadata.xml8
-rw-r--r--x11-terms/yeahconsole/yeahconsole-0.3.4-r1.ebuild41
174 files changed, 7811 insertions, 0 deletions
diff --git a/x11-terms/aterm/Manifest b/x11-terms/aterm/Manifest
new file mode 100644
index 00000000000..6a75a2dbda0
--- /dev/null
+++ b/x11-terms/aterm/Manifest
@@ -0,0 +1 @@
+DIST aterm-1.0.1.tar.bz2 276810 SHA256 a161c3b2d9c7149130a41963899993af21eae92e8e362f4b5b3c7c4cb16760ce SHA512 05c78590bba55d892d9f7add384e4ae8d56197dbcd9caff2be4a52d5c162e767a464359ba806fc95961d8035575a2b4a962fc35cfa44f95025b477fa3e15e56b WHIRLPOOL 8586aeef3536bbfb36dffbc3d8d68f86253ecb9f3677908c539fa518e22d6361671a8763867a325058a6931acb71710c9cacdd532d8594c92a68870758946cc2
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 00000000000..d272af9ee56
--- /dev/null
+++ b/x11-terms/aterm/aterm-1.0.1-r2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+inherit flag-o-matic eutils
+
+DESCRIPTION="A terminal emulator with transparency support as well as rxvt backwards compatibility"
+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 ~x86-interix ~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/files/aterm-1.0.1-deadkeys.patch b/x11-terms/aterm/files/aterm-1.0.1-deadkeys.patch
new file mode 100644
index 00000000000..958f40900bc
--- /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 00000000000..e44c0b360d2
--- /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 00000000000..9bd821cc786
--- /dev/null
+++ b/x11-terms/aterm/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+ <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>
+</pkgmetadata>
diff --git a/x11-terms/eterm/Manifest b/x11-terms/eterm/Manifest
new file mode 100644
index 00000000000..5d89a30677e
--- /dev/null
+++ b/x11-terms/eterm/Manifest
@@ -0,0 +1,4 @@
+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
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 00000000000..68d8b95583e
--- /dev/null
+++ b/x11-terms/eterm/eterm-0.9.5.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+inherit eutils autotools
+
+MY_P=Eterm-${PV}
+
+if [[ ${PV} == "9999" ]] ; then
+ ESVN_REPO_URI="http://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 00000000000..ffc82d69b4a
--- /dev/null
+++ b/x11-terms/eterm/eterm-0.9.6.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+inherit eutils autotools
+
+MY_P=Eterm-${PV}
+
+if [[ ${PV} == "9999" ]] ; then
+ ESVN_REPO_URI="http://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 ~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 00000000000..62fc0a59bb1
--- /dev/null
+++ b/x11-terms/eterm/eterm-9999.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+inherit eutils autotools
+
+MY_P=Eterm-${PV}
+
+if [[ ${PV} == "9999" ]] ; then
+ ESVN_REPO_URI="http://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 ~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_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/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 00000000000..777397170d3
--- /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 00000000000..c27b995175c
--- /dev/null
+++ b/x11-terms/eterm/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>
+<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>
+</pkgmetadata>
diff --git a/x11-terms/evilvte/Manifest b/x11-terms/evilvte/Manifest
new file mode 100644
index 00000000000..51f2dde93e1
--- /dev/null
+++ b/x11-terms/evilvte/Manifest
@@ -0,0 +1,2 @@
+DIST evilvte-0.5.1.tar.xz 59732 SHA256 d48166677410e6cb577ee46014a138620bbc95b3425e0ee3f9b7e95ae3ba30cd SHA512 a0381378e42ed7dcae59268c705cc70281756139967a505455d51dca0980b4f768bd96342bc5a26369aa37f616b2680c5c803d0bdf3a6335c788442918741c04 WHIRLPOOL 5fb67705537ce65f565d79f4244eb1d7dceecc973d5eaef165ab48e0d61ffd2ceaf4ef03357c286b018572dd291de4acf53af6eba66d5dc9323094fa3256c122
+DIST evilvte-0.5.2~pre1.tar.xz 60804 SHA256 d51e75f7e1daad12fa55289c17cb2cfb35bcfdbd61b0dfce3b16a966f64e81ec SHA512 db6b08e7c2670f986c454203c24d5fc65663e23b3d2839a84b610f9630047a79daaaeb833834c011dcb6dca3747657b37ac22e6746af9662e2568103fb7c4398 WHIRLPOOL 5bff0681285751a88e5c379ed3036f413c320f56c442b87791c2d16d934d2300b6bf60ffc021f719514272dc21dfd346abceb9f467944c17a391035f0b12bd69
diff --git a/x11-terms/evilvte/evilvte-0.5.1.ebuild b/x11-terms/evilvte/evilvte-0.5.1.ebuild
new file mode 100644
index 00000000000..2d18c4cfb54
--- /dev/null
+++ b/x11-terms/evilvte/evilvte-0.5.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+MY_P=${P/_/\~}
+inherit toolchain-funcs savedconfig
+
+DESCRIPTION="VTE based, super lightweight terminal emulator"
+HOMEPAGE="http://www.calno.com/evilvte"
+SRC_URI="http://www.calno.com/${PN}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2
+ x11-libs/gtk+:3
+ x11-libs/vte:2.90"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( ChangeLog )
+
+src_prepare() {
+ restore_config src/config.h
+}
+
+src_configure() {
+ tc-export CC
+ ./configure --prefix=/usr --with-gtk=3.0 || die
+}
+
+src_compile() {
+ emake -j1
+}
+
+src_install() {
+ default
+ save_config src/config.h
+}
diff --git a/x11-terms/evilvte/evilvte-0.5.2_pre1.ebuild b/x11-terms/evilvte/evilvte-0.5.2_pre1.ebuild
new file mode 100644
index 00000000000..7c9967a3b03
--- /dev/null
+++ b/x11-terms/evilvte/evilvte-0.5.2_pre1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit gnome2-utils toolchain-funcs savedconfig
+
+MY_P=${P/_/\~}
+
+DESCRIPTION="VTE based, super lightweight terminal emulator"
+HOMEPAGE="http://www.calno.com/evilvte"
+SRC_URI="http://www.calno.com/${PN}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2
+ x11-libs/gtk+:3
+ x11-libs/vte:2.90"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=ChangeLog
+
+src_prepare() {
+ restore_config src/config.h
+}
+
+src_configure() {
+ tc-export CC
+ ./configure --prefix=/usr --with-gtk=3.0 || die
+}
+
+src_compile() {
+ emake -j1
+}
+
+src_install() {
+ default
+ save_config src/config.h
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ savedconfig_pkg_postinst
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/x11-terms/evilvte/metadata.xml b/x11-terms/evilvte/metadata.xml
new file mode 100644
index 00000000000..540f810e069
--- /dev/null
+++ b/x11-terms/evilvte/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
new file mode 100644
index 00000000000..e2474c8cec5
--- /dev/null
+++ b/x11-terms/gnome-terminal/Manifest
@@ -0,0 +1,3 @@
+DIST gnome-terminal-3.14.2.tar.xz 1784996 SHA256 886bf9accb863d59791c5d8f2078d0fb022245a79854ad4a131b7b2186c27d2b SHA512 43a81d9f4ff43dd4ffcd023755f765a20ec2d2f922d58bee230386d97d38712dbb8b41d7da62143689fb9ed0d0e5500e849de743ec033494231a804e02969cd9 WHIRLPOOL 1ce5eafb8bd8baa2658413aa9acfcef96bbd2f587052233573d3e540d9389c348d9e94d976be5cffa8c739dd915a4359576bc5cfb2d687db21e362f53794ec6f
+DIST gnome-terminal-3.14.3.tar.xz 1781712 SHA256 db9b7bb8b24f657ea00bdfa0e1de1792a6a3fb0369edbf66496924d63cc37fd3 SHA512 21e1292391d77a658b01be12ca7f2f5a8f2f504ef9c57c587dc699e455fc4e052e65c90111ffd7ceb8c23422b60d75a0dffca699e57a2af245277e25f38f0655 WHIRLPOOL db3870d34d5bffce3493af3c1eff479633553b570d9c462bbe7ed4a5bb2305011b45a912331d5d9649d68918a6c9fd80c11bd5d9fb8599a66437a5fd2105089c
+DIST gnome-terminal-3.16.2.tar.xz 1798620 SHA256 9df7bab7bfd15ca9a3c60612e425baaf5c8b32ba181619f740b7129a0768f4e0 SHA512 06327569de64ec9d1a045ea191edaabfe80e62dc55b5b8722d36e9d419f8d0cdfda29503f4aec68ae61798d77269ad902864eee8609369da31315368a9ab254f WHIRLPOOL 559833e2080c784080e001260a732fa480f187d17a8d1d069253175b9afd053d4fbd1d7a557442c467b915d31432e50bb4f0f9a94699fb3ed95810fb5f32b56e
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-fix-crash.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-fix-crash.patch
new file mode 100644
index 00000000000..40ddbc0e2d8
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-fix-crash.patch
@@ -0,0 +1,26 @@
+From 664f1e9e8b224658c3f01a062517ad386129d953 Mon Sep 17 00:00:00 2001
+From: Egmont Koblinger <egmont@gmail.com>
+Date: Thu, 8 Jan 2015 14:33:13 +0100
+Subject: screen: Fix crash with empty child process command line
+
+https://bugzilla.gnome.org/show_bug.cgi?id=742560
+(cherry picked from commit 1c7ed77b003f14bb94527c8fe548c6c414c0da9e)
+
+diff --git a/src/terminal-screen.c b/src/terminal-screen.c
+index ad78388..9f63239 100644
+--- a/src/terminal-screen.c
++++ b/src/terminal-screen.c
+@@ -1904,7 +1904,9 @@ terminal_screen_has_foreground_process (TerminalScreen *screen,
+ if (process_name)
+ gs_transfer_out_value (process_name, &name);
+
+- for (i = 0; i < len - 1; i++)
++ if (len > 0 && data[len - 1] == '\0')
++ len--;
++ for (i = 0; i < len; i++)
+ {
+ if (data[i] == '\0')
+ data[i] = ' ';
+--
+cgit v0.10.1
+
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-title-option.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-title-option.patch
new file mode 100644
index 00000000000..1e3ddd3d94b
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-title-option.patch
@@ -0,0 +1,166 @@
+From c730504aa3893978cdb667d7fcf1357d2951841e Mon Sep 17 00:00:00 2001
+From: Christian Persch <chpe@gnome.org>
+Date: Sat, 15 Nov 2014 21:11:08 +0100
+Subject: client: Hide obsolete --title option
+
+Accept it for compatibility, but ignore it.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=740188
+(cherry picked from commit 0033eca2909ddccf3358c1f089bce05d3473b123)
+
+diff --git a/src/gterminal.vala b/src/gterminal.vala
+index cf1ffae..7e55678 100644
+--- a/src/gterminal.vala
++++ b/src/gterminal.vala
+@@ -233,7 +233,6 @@ namespace GTerminal
+
+ public static string? working_directory = null;
+ public static string? profile = null;
+- public static string? title = null;
+ public static double zoom = 1.0;
+
+ private static bool option_profile (string option_name,
+@@ -269,8 +268,6 @@ namespace GTerminal
+ { "profile", 0, 0, OptionArg.CALLBACK, (void*) option_profile,
+ N_("Use the given profile instead of the default profile"),
+ N_("UUID") },
+- { "title", 0, 0, OptionArg.STRING, ref title,
+- N_("Set the terminal title"), N_("TITLE") },
+ { "cwd", 0, 0, OptionArg.FILENAME, ref working_directory,
+ N_("Set the working directory"), N_("DIRNAME") },
+ { "zoom", 0, 0, OptionArg.CALLBACK, (void*) option_zoom,
+@@ -418,7 +415,7 @@ namespace GTerminal
+ OpenOptions.geometry,
+ OpenOptions.role,
+ OpenOptions.profile,
+- OpenOptions.title,
++ null /* title */,
+ OpenOptions.maximise,
+ OpenOptions.fullscreen);
+ if (OpenOptions.show_menubar_set)
+diff --git a/src/terminal-options.c b/src/terminal-options.c
+index 75fc64d..0280f11 100644
+--- a/src/terminal-options.c
++++ b/src/terminal-options.c
+@@ -96,7 +96,6 @@ initial_tab_new (char *profile /* adopts */)
+
+ it->profile = profile;
+ it->exec_argv = NULL;
+- it->title = NULL;
+ it->working_dir = NULL;
+ it->zoom = 1.0;
+ it->zoom_set = FALSE;
+@@ -110,7 +109,6 @@ initial_tab_free (InitialTab *it)
+ {
+ g_free (it->profile);
+ g_strfreev (it->exec_argv);
+- g_free (it->title);
+ g_free (it->working_dir);
+ g_slice_free (InitialTab, it);
+ }
+@@ -596,30 +594,6 @@ option_load_config_cb (const gchar *option_name,
+ }
+
+ static gboolean
+-option_title_callback (const gchar *option_name,
+- const gchar *value,
+- gpointer data,
+- GError **error)
+-{
+- TerminalOptions *options = data;
+-
+- if (options->initial_windows)
+- {
+- InitialTab *it = ensure_top_tab (options);
+-
+- g_free (it->title);
+- it->title = g_strdup (value);
+- }
+- else
+- {
+- g_free (options->default_title);
+- options->default_title = g_strdup (value);
+- }
+-
+- return TRUE;
+-}
+-
+-static gboolean
+ option_working_directory_callback (const gchar *option_name,
+ const gchar *value,
+ gpointer data,
+@@ -789,7 +763,6 @@ terminal_options_parse (const char *working_directory,
+ options->initial_windows = NULL;
+ options->default_role = NULL;
+ options->default_geometry = NULL;
+- options->default_title = NULL;
+ options->zoom = 1.0;
+ options->zoom_set = FALSE;
+
+@@ -928,7 +901,6 @@ terminal_options_merge_config (TerminalOptions *options,
+ /* it->width = g_key_file_get_integer (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_WIDTH, NULL);
+ it->height = g_key_file_get_integer (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_HEIGHT, NULL);*/
+ it->working_dir = terminal_util_key_file_get_string_unescape (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_WORKING_DIRECTORY, NULL);
+- it->title = g_key_file_get_string (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_TITLE, NULL);
+
+ if (g_key_file_has_key (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_COMMAND, NULL) &&
+ !(it->exec_argv = terminal_util_key_file_get_argv (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_COMMAND, NULL, error)))
+@@ -985,7 +957,6 @@ terminal_options_free (TerminalOptions *options)
+ g_free (options->default_role);
+ g_free (options->default_geometry);
+ g_free (options->default_working_dir);
+- g_free (options->default_title);
+ g_free (options->default_profile);
+
+ g_strfreev (options->exec_argv);
+@@ -1156,11 +1127,10 @@ get_goption_context (TerminalOptions *options)
+ {
+ "title",
+ 't',
+- 0,
++ G_OPTION_FLAG_HIDDEN,
+ G_OPTION_ARG_CALLBACK,
+- option_title_callback,
+- N_("Set the terminal title"),
+- N_("TITLE")
++ unsupported_option_callback,
++ NULL, NULL
+ },
+ {
+ "working-directory",
+diff --git a/src/terminal-options.h b/src/terminal-options.h
+index a1e645b..17f42b4 100644
+--- a/src/terminal-options.h
++++ b/src/terminal-options.h
+@@ -75,7 +75,6 @@ typedef struct
+ char *default_role;
+ char *default_geometry;
+ char *default_working_dir;
+- char *default_title;
+ char **exec_argv;
+ char *default_profile;
+ gboolean default_profile_is_id;
+@@ -95,7 +94,6 @@ typedef struct
+ char *profile;
+ gboolean profile_is_id;
+ char **exec_argv;
+- char *title;
+ char *working_dir;
+ double zoom;
+ guint zoom_set : 1;
+diff --git a/src/terminal.c b/src/terminal.c
+index 2dd5a6d..b6a6f5e 100644
+--- a/src/terminal.c
++++ b/src/terminal.c
+@@ -102,7 +102,7 @@ handle_options (TerminalFactory *factory,
+ iw->geometry,
+ iw->role,
+ it->profile ? it->profile : options->default_profile,
+- it->title ? it->title : options->default_title,
++ NULL /* title */,
+ iw->start_maximized,
+ iw->start_fullscreen);
+
+--
+cgit v0.10.1
+
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.16.2-restore-dark.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.16.2-restore-dark.patch
new file mode 100644
index 00000000000..0b98c35cd14
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-3.16.2-restore-dark.patch
@@ -0,0 +1,196 @@
+From 7da7309d203e51fb03c002f87a9a6ddd8ee67978 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir@gnome.org>
+Date: Tue, 17 Feb 2015 13:22:11 +0100
+Subject: [PATCH 1/2] Revert "prefs: Remove dark theme pref"
+
+This reverts commit 5f6c514a8840a5d1b87a8c399defee3b5052ec18.
+---
+ src/org.gnome.Terminal.gschema.xml | 5 +++++
+ src/preferences.ui | 16 ++++++++++++++++
+ src/terminal-app.c | 4 ++++
+ src/terminal-prefs.c | 9 ++++++++-
+ src/terminal-schemas.h | 1 +
+ 5 files changed, 34 insertions(+), 1 deletion(-)
+
+diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml
+index 051bdc4..95c5405 100644
+--- a/src/org.gnome.Terminal.gschema.xml
++++ b/src/org.gnome.Terminal.gschema.xml
+@@ -656,6 +656,11 @@
+ <summary>Whether to show the menubar in new windows</summary>
+ </key>
+
++ <key name="dark-theme" type="b">
++ <default>false</default>
++ <summary>Whether to use a dark theme variant</summary>
++ </key>
++
+ <key name="new-terminal-mode" enum="org.gnome.Terminal.NewTerminalMode">
+ <default>'window'</default>
+ <summary>Whether to open new terminals as windows or tabs</summary>
+diff --git a/src/preferences.ui b/src/preferences.ui
+index f64a11b..df82508 100644
+--- a/src/preferences.ui
++++ b/src/preferences.ui
+@@ -139,6 +139,22 @@
+ </packing>
+ </child>
+ <child>
++ <object class="GtkCheckButton" id="dark-theme-checkbutton">
++ <property name="label" translatable="yes">Use _dark theme variant</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">True</property>
++ <property name="position">3</property>
++ </packing>
++ </child>
++ <child>
+ <object class="GtkBox" id="hbox140">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+diff --git a/src/terminal-app.c b/src/terminal-app.c
+index 8a9434f..95302c5 100644
+--- a/src/terminal-app.c
++++ b/src/terminal-app.c
+@@ -362,6 +362,10 @@ terminal_app_init (TerminalApp *app)
+
+ /* Terminal global settings */
+ app->global_settings = g_settings_new (TERMINAL_SETTING_SCHEMA);
++ g_settings_bind (app->global_settings, TERMINAL_SETTING_DARK_THEME_KEY,
++ gtk_settings_get_default (),
++ "gtk-application-prefer-dark-theme",
++ G_SETTINGS_BIND_GET);
+
+ /* Check if we need to migrate from gconf to dconf */
+ maybe_migrate_settings (app);
+diff --git a/src/terminal-prefs.c b/src/terminal-prefs.c
+index 97f6c33..a57dde6 100644
+--- a/src/terminal-prefs.c
++++ b/src/terminal-prefs.c
+@@ -562,7 +562,7 @@ terminal_prefs_show_preferences (GtkWindow *transient_parent,
+ GtkWidget *show_menubar_button, *disable_mnemonics_button, *disable_menu_accel_button;
+ GtkWidget *disable_shortcuts_button;
+ GtkWidget *tree_view_container, *new_button, *edit_button, *clone_button, *remove_button;
+- GtkWidget *new_terminal_mode_combo;
++ GtkWidget *dark_theme_button, *new_terminal_mode_combo;
+ GtkWidget *default_hbox, *default_label;
+ GtkTreeSelection *selection;
+ GSettings *settings;
+@@ -583,6 +583,7 @@ terminal_prefs_show_preferences (GtkWindow *transient_parent,
+ "preferences-dialog",
+ "preferences-dialog", &dialog,
+ "default-show-menubar-checkbutton", &show_menubar_button,
++ "dark-theme-checkbutton", &dark_theme_button,
+ "new-terminal-mode-combobox", &new_terminal_mode_combo,
+ "disable-mnemonics-checkbutton", &disable_mnemonics_button,
+ "disable-shortcuts-checkbutton", &disable_shortcuts_button,
+@@ -613,6 +614,12 @@ terminal_prefs_show_preferences (GtkWindow *transient_parent,
+ G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
+
+ g_settings_bind (settings,
++ TERMINAL_SETTING_DARK_THEME_KEY,
++ dark_theme_button,
++ "active",
++ G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
++
++ g_settings_bind (settings,
+ TERMINAL_SETTING_NEW_TERMINAL_MODE_KEY,
+ new_terminal_mode_combo,
+ "active-id",
+diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h
+index 0fcbf52..c6acd7c 100644
+--- a/src/terminal-schemas.h
++++ b/src/terminal-schemas.h
+@@ -69,6 +69,7 @@ G_BEGIN_DECLS
+
+ #define TERMINAL_SETTING_CONFIRM_CLOSE_KEY "confirm-close"
+ #define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY "default-show-menubar"
++#define TERMINAL_SETTING_DARK_THEME_KEY "dark-theme"
+ #define TERMINAL_SETTING_ENABLE_MENU_BAR_ACCEL_KEY "menu-accelerator-enabled"
+ #define TERMINAL_SETTING_ENABLE_MNEMONICS_KEY "mnemonics-enabled"
+ #define TERMINAL_SETTING_ENABLE_SHORTCUTS_KEY "shortcuts-enabled"
+--
+2.1.0
+
+
+From 9fc68b087180e48cb4e2275f3134f66f2c43de14 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir@gnome.org>
+Date: Tue, 17 Feb 2015 13:22:21 +0100
+Subject: [PATCH 2/2] Revert "help: Remove dark theme pref"
+
+This reverts commit baaca6a4cc5ca78d7b0e02cfaee6c159bad7ce4b.
+---
+ help/C/pref-theme.page | 41 +++++++++++++++++++++++++++++++++++++++++
+ help/Makefile.am | 1 +
+ 2 files changed, 42 insertions(+)
+ create mode 100644 help/C/pref-theme.page
+
+diff --git a/help/C/pref-theme.page b/help/C/pref-theme.page
+new file mode 100644
+index 0000000..a997d14
+--- /dev/null
++++ b/help/C/pref-theme.page
+@@ -0,0 +1,41 @@
++<page xmlns="http://projectmallard.org/1.0/"
++ xmlns:its="http://www.w3.org/2005/11/its"
++ type="guide"
++ id="pref-theme">
++
++ <info>
++ <link type="guide" xref="index#appearance"/>
++ <revision pkgversion="3.12" date="2014-02-26" status="review"/>
++
++ <credit type="author copyright">
++ <name>Ekaterina Gerasimova</name>
++ <email its:translate="no">kittykat3756@gmail.com</email>
++ <years>2014</years>
++ </credit>
++ <!--<credit type="copyright editor">
++ <name></name>
++ <email its:translate="no"></email>
++ <years></years>
++ </credit>-->
++
++ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
++
++ <desc>Use either the light or dark theme for <app>Terminal</app>.</desc>
++ </info>
++
++ <title>Chose the window theme</title>
++
++ <p>You can chose to use either the dark theme or the light theme for the
++ terminal window.</p>
++
++ <steps>
++ <item>
++ <p>Select
++ <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">General</gui></guiseq>.</p>
++ </item>
++ <item>
++ <p>To use the dark theme, select <gui>Use dark theme variant</gui>.</p>
++ </item>
++ </steps>
++
++</page>
+diff --git a/help/Makefile.am b/help/Makefile.am
+index 33389c5..9c02a74 100644
+--- a/help/Makefile.am
++++ b/help/Makefile.am
+@@ -35,6 +35,7 @@ HELP_FILES = \
+ pref-profile-encoding.page \
+ pref-scrolling.page \
+ pref-tab-window.page \
++ pref-theme.page \
+ pref-user-input.page \
+ profile.page \
+ prob-reset.page \
+--
+2.1.0
+
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.16.2-restore-transparency.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.16.2-restore-transparency.patch
new file mode 100644
index 00000000000..56bebcdfb9f
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-3.16.2-restore-transparency.patch
@@ -0,0 +1,1604 @@
+From 181dca2c0b50af1326a84e1ec0134afab88ff5b2 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 0f8433f..104e662 100644
+--- a/src/org.gnome.Terminal.gschema.xml
++++ b/src/org.gnome.Terminal.gschema.xml
+@@ -333,6 +333,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 3e8ccaf..f09b6bc 100644
+--- a/src/profile-editor.c
++++ b/src/profile-editor.c
+@@ -1106,7 +1106,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 eb2fa26..7f8a471 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="model1">
+ <columns>
+ <!-- column-name gchararray -->
+@@ -1045,6 +1050,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 17ffdb2..0fcbf52 100644
+--- a/src/terminal-schemas.h
++++ b/src/terminal-schemas.h
+@@ -64,6 +64,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 df3fdde..48174c2 100644
+--- a/src/terminal-screen.c
++++ b/src/terminal-screen.c
+@@ -750,7 +750,9 @@ terminal_screen_profile_changed_cb (GSettings *profile,
+ prop_name == I_(TERMINAL_PROFILE_BACKGROUND_COLOR_KEY) ||
+ prop_name == I_(TERMINAL_PROFILE_BOLD_COLOR_SAME_AS_FG_KEY) ||
+ prop_name == I_(TERMINAL_PROFILE_BOLD_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))
+@@ -816,6 +818,8 @@ update_color_scheme (TerminalScreen *screen)
+ GdkRGBA fg, bg, bold, theme_fg, theme_bg;
+ GdkRGBA *boldp;
+ GtkStyleContext *context;
++ GtkWidget *toplevel;
++ gboolean transparent;
+
+ context = gtk_widget_get_style_context (widget);
+ gtk_style_context_get_color (context, GTK_STATE_FLAG_NORMAL, &theme_fg);
+@@ -836,9 +840,25 @@ update_color_scheme (TerminalScreen *screen)
+ boldp = NULL;
+
+ 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);
++
++ 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 12cae4f..366e4f8 100644
+--- a/src/terminal-window.c
++++ b/src/terminal-window.c
+@@ -2549,6 +2549,8 @@ terminal_window_init (TerminalWindow *window)
+ TerminalWindowPrivate *priv;
+ TerminalApp *app;
+ TerminalSettingsList *profiles_list;
++ GdkScreen *screen;
++ GdkVisual *visual;
+ GtkActionGroup *action_group;
+ GtkAction *action;
+ GtkUIManager *manager;
+@@ -2564,6 +2566,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.1.0
+
+
+From de7d64698ac700f63898221a5815af939001ba18 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 366e4f8..2458656 100644
+--- a/src/terminal-window.c
++++ b/src/terminal-window.c
+@@ -2189,6 +2189,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)
+ {
+@@ -2753,6 +2773,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.1.0
+
+
+From dfc31fb0803d546cc21ef8bcd33e54c30e14dc1c Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir@gnome.org>
+Date: Tue, 17 Feb 2015 17:06:17 +0100
+Subject: [PATCH 3/3] Restore translations for transparency
+
+---
+ po/am.po | 4 ++--
+ po/ar.po | 4 ++--
+ po/as.po | 4 ++--
+ po/ast.po | 4 ++--
+ po/az.po | 4 ++--
+ po/be.po | 3 +++
+ po/be@latin.po | 4 ++--
+ po/bg.po | 3 +++
+ po/bn_IN.po | 3 +++
+ po/bs.po | 4 ++++
+ po/ca.po | 3 +++
+ po/ca@valencia.po | 3 +++
+ po/cs.po | 3 +++
+ po/cy.po | 4 ++--
+ po/da.po | 4 ++--
+ po/de.po | 4 ++--
+ po/dz.po | 4 ++--
+ po/el.po | 3 +++
+ po/en@shaw.po | 4 ++--
+ po/en_CA.po | 4 ++--
+ po/en_GB.po | 4 ++--
+ po/es.po | 4 ++--
+ po/et.po | 3 +++
+ po/eu.po | 4 ++--
+ po/fa.po | 3 +++
+ po/fi.po | 5 ++++-
+ po/fr.po | 3 +++
+ po/fur.po | 4 ++--
+ po/ga.po | 3 +++
+ po/gl.po | 4 ++--
+ po/gu.po | 4 ++--
+ po/he.po | 4 ++--
+ po/hi.po | 4 ++--
+ po/hr.po | 4 ++--
+ po/hu.po | 3 +++
+ po/hy.po | 4 ++--
+ po/id.po | 3 +++
+ po/it.po | 3 +++
+ po/ja.po | 3 +++
+ po/ka.po | 2 +-
+ po/kk.po | 3 +++
+ po/kn.po | 3 +++
+ po/ko.po | 3 +++
+ po/ku.po | 4 ++--
+ po/lt.po | 3 +++
+ po/lv.po | 4 ++--
+ po/mai.po | 4 ++--
+ po/mg.po | 4 ++--
+ po/mk.po | 4 ++--
+ po/ml.po | 4 ++--
+ po/mn.po | 4 ++--
+ po/mr.po | 4 ++--
+ po/ms.po | 4 ++--
+ po/nb.po | 3 +++
+ po/nds.po | 4 ++--
+ po/ne.po | 4 ++--
+ po/nl.po | 3 +++
+ po/nn.po | 4 ++--
+ po/oc.po | 4 ++--
+ po/or.po | 4 ++--
+ po/pa.po | 4 ++--
+ po/pl.po | 3 +++
+ po/ps.po | 4 ++--
+ po/pt.po | 4 ++--
+ po/pt_BR.po | 3 +++
+ po/ro.po | 4 ++--
+ po/ru.po | 3 +++
+ po/rw.po | 2 +-
+ po/si.po | 4 ++--
+ po/sk.po | 3 +++
+ po/sl.po | 3 +++
+ po/sq.po | 4 ++--
+ po/sr.po | 3 +++
+ po/sr@latin.po | 3 +++
+ po/sv.po | 3 +++
+ po/ta.po | 4 ++--
+ po/te.po | 4 ++--
+ po/th.po | 4 ++--
+ po/tr.po | 3 +++
+ po/ug.po | 4 ++--
+ po/uk.po | 4 ++--
+ po/vi.po | 3 +++
+ po/wa.po | 4 ++--
+ po/xh.po | 4 ++--
+ po/zh_CN.po | 3 +++
+ po/zh_HK.po | 3 +++
+ po/zh_TW.po | 3 +++
+ 87 files changed, 210 insertions(+), 101 deletions(-)
+
+diff --git a/po/am.po b/po/am.po
+index 27a7e96..04a8ad9 100644
+--- a/po/am.po
++++ b/po/am.po
+@@ -613,8 +613,8 @@ msgid "_Text color:"
+ msgstr "የ_ጽሑፍ ቀለም፦"
+
+ #: ../src/gnome-terminal.glade2.h:102
+-msgid "_Transparent background"
+-msgstr "_የሚያሳይ መደብ"
++msgid "Transparent background"
++msgstr "የሚያሳይ መደብ"
+
+ #: ../src/gnome-terminal.glade2.h:103
+ msgid "_Update login records when command is launched"
+diff --git a/po/ar.po b/po/ar.po
+index c27cd9c..f541938 100644
+--- a/po/ar.po
++++ b/po/ar.po
+@@ -2914,8 +2914,8 @@ msgstr "أغ_لق النافذة"
+ #~ msgid "Background image _scrolls"
+ #~ msgstr "صورة الخلفية ت_لتف"
+
+-#~ msgid "_Transparent background"
+-#~ msgstr "خلفية _شفافة"
++msgid "Transparent background"
++msgstr "خلفية شفافة"
+
+ #~ msgid "S_hade transparent or image background:"
+ #~ msgstr "_ظلل شفافية أو صورة الخلفية:"
+diff --git a/po/as.po b/po/as.po
+index 0bd699d..63fca01 100644
+--- a/po/as.po
++++ b/po/as.po
+@@ -2979,8 +2979,8 @@ msgstr "উইন্ডো বন্ধ কৰক (_l)"
+ #~ msgid "Background image _scrolls"
+ #~ msgstr "পটভূমিৰ ছবি স্ক্ৰল কৰক (_s)"
+
+-#~ msgid "_Transparent background"
+-#~ msgstr "স্বচ্চ পটভূমি (_T)"
++msgid "Transparent background"
++msgstr "স্বচ্চ পটভূমি "
+
+ #~ msgid "S_hade transparent or image background:"
+ #~ msgstr "স্বচ্ছ বা ছবিৰ সৈতে পটভূমি ছায়া আচ্ছন্ন কৰক (_h):"
+diff --git a/po/ast.po b/po/ast.po
+index d1c6e7b..4210820 100644
+--- a/po/ast.po
++++ b/po/ast.po
+@@ -1598,8 +1598,8 @@ msgid "_Text color:"
+ msgstr "Color del _testu:"
+
+ #: ../src/profile-preferences.glade.h:77
+-msgid "_Transparent background"
+-msgstr "Fondu _tresparente"
++msgid "Transparent background"
++msgstr "Fondu tresparente"
+
+ #: ../src/profile-preferences.glade.h:78
+ msgid "_Underline color:"
+diff --git a/po/az.po b/po/az.po
+index b0f2e3e..877f114 100644
+--- a/po/az.po
++++ b/po/az.po
+@@ -619,8 +619,8 @@ msgid "_Text color:"
+ msgstr "_Mətn rəngi:"
+
+ #: ../src/gnome-terminal.glade2.h:102
+-msgid "_Transparent background"
+-msgstr "_Şəffaf arxa plan"
++msgid "Transparent background"
++msgstr "Şəffaf arxa plan"
+
+ #: ../src/gnome-terminal.glade2.h:103
+ msgid "_Update login records when command is launched"
+diff --git a/po/be.po b/po/be.po
+index fca0ae4..74ff329 100644
+--- a/po/be.po
++++ b/po/be.po
+@@ -2015,3 +2015,6 @@ msgstr ""
+ msgid "C_lose Window"
+ msgstr "_Закрыць акно"
+
++msgid "Transparent background"
++msgstr "Празрысты фон"
++
+diff --git a/po/be@latin.po b/po/be@latin.po
+index 1e057c7..1d22a58 100644
+--- a/po/be@latin.po
++++ b/po/be@latin.po
+@@ -1425,8 +1425,8 @@ msgid "_Text color:"
+ msgstr "Koler _tekstu:"
+
+ #: ../src/profile-preferences.glade.h:73
+-msgid "_Transparent background"
+-msgstr "_Prazrysty fon"
++msgid "Transparent background"
++msgstr "Prazrysty fon"
+
+ #: ../src/profile-preferences.glade.h:74
+ msgid "_Update login records when command is launched"
+diff --git a/po/bg.po b/po/bg.po
+index 7e9c9be..241ef52 100644
+--- a/po/bg.po
++++ b/po/bg.po
+@@ -2100,3 +2100,6 @@ msgstr ""
+ #: ../src/terminal-window.c:3652
+ msgid "C_lose Window"
+ msgstr "_Затваряне на този прозорец"
++
++msgid "Transparent background"
++msgstr "Прозрачен фон"
+diff --git a/po/bn_IN.po b/po/bn_IN.po
+index c74246a..d65b322 100644
+--- a/po/bn_IN.po
++++ b/po/bn_IN.po
+@@ -2358,3 +2358,6 @@ msgstr "উইন্ডো বন্ধ করুন (_l)"
+
+ #~ msgid "_Title:"
+ #~ msgstr "শিরোনাম: (_T)"
++
++msgid "Transparent background"
++msgstr "স্বচ্চ পটভূমি "
+diff --git a/po/bs.po b/po/bs.po
+index 49e7108..fccfa86 100644
+--- a/po/bs.po
++++ b/po/bs.po
+@@ -680,6 +680,10 @@ msgstr "Kratica tastature za povećavanje fonta"
+ msgid "Keyboard shortcut to make font smaller"
+ msgstr "Kratica tastature za smanjivanje fonta"
+
++#: ../src/gnome-terminal.glade2.h:102
++msgid "Transparent background"
++msgstr "Providna pozadina"
++
+ #: ../src/org.gnome.Terminal.gschema.xml.h:78
+ msgid "Keyboard shortcut to make font normal-size"
+ msgstr "Kratica tastature za postavljanje fonta na normalnu veličinu"
+diff --git a/po/ca.po b/po/ca.po
+index 567b344..156eed1 100644
+--- a/po/ca.po
++++ b/po/ca.po
+@@ -2111,3 +2111,6 @@ msgstr "Tanca la _finestra"
+
+ #~ msgid "Use _dark theme variant"
+ #~ msgstr "Utilitza la variant de tema _fosc"
++
++msgid "Transparent background"
++msgstr "Fons transparent"
+diff --git a/po/ca@valencia.po b/po/ca@valencia.po
+index 1c279a0..4073f71 100644
+--- a/po/ca@valencia.po
++++ b/po/ca@valencia.po
+@@ -2092,3 +2092,6 @@ msgstr ""
+ #: ../src/terminal-window.c:3645
+ msgid "C_lose Window"
+ msgstr "Tanca la _finestra"
++
++msgid "Transparent background"
++msgstr "Fons transparent"
+diff --git a/po/cs.po b/po/cs.po
+index f1e8c44..912b4df 100644
+--- a/po/cs.po
++++ b/po/cs.po
+@@ -2063,3 +2063,6 @@ msgstr ""
+ #: ../src/terminal-window.c:3652
+ msgid "C_lose Window"
+ msgstr "_Zavřít okno"
++
++msgid "Transparent background"
++msgstr "Průsvitné pozadí"
+diff --git a/po/cy.po b/po/cy.po
+index 06d0e3c..2491bd1 100644
+--- a/po/cy.po
++++ b/po/cy.po
+@@ -1447,8 +1447,8 @@ msgid "_Text color:"
+ msgstr "Lliw'r _testun:"
+
+ #: ../src/profile-preferences.glade.h:73
+-msgid "_Transparent background"
+-msgstr "Cefndir _tryloyw"
++msgid "Transparent background"
++msgstr "Cefndir tryloyw"
+
+ #: ../src/profile-preferences.glade.h:74
+ msgid "_Update login records when command is launched"
+diff --git a/po/da.po b/po/da.po
+index 74b7d0b..af69a6b 100644
+--- a/po/da.po
++++ b/po/da.po
+@@ -2987,8 +2987,8 @@ msgstr "_Luk vindue"
+ #~ msgid "_Solid color"
+ #~ msgstr "_Ensfarvet"
+
+-#~ msgid "_Transparent background"
+-#~ msgstr "_Gennemsigtig baggrund"
++msgid "Transparent background"
++msgstr "Gennemsigtig baggrund"
+
+ #~ msgid ""
+ #~ "You already have a profile called “%s”. Do you want to create another "
+diff --git a/po/de.po b/po/de.po
+index 6b2bb19..2b814c0 100644
+--- a/po/de.po
++++ b/po/de.po
+@@ -3060,8 +3060,8 @@ msgstr "Fenster _schließen"
+ #~ msgid "Background image _scrolls"
+ #~ msgstr "Hintergrundbild _folgt Bildlauf"
+
+-#~ msgid "_Transparent background"
+-#~ msgstr "_Transparenter Hintergrund"
++msgid "Transparent background"
++msgstr "Transparenter Hintergrund"
+
+ #~ msgid "S_hade transparent or image background:"
+ #~ msgstr "Transparenz und Bildhintergründe _abdunkeln:"
+diff --git a/po/dz.po b/po/dz.po
+index ecb8fd5..290934a 100644
+--- a/po/dz.po
++++ b/po/dz.po
+@@ -1551,8 +1551,8 @@ msgid "_Text color:"
+ msgstr "ཚིག་ཡིག་ཚོས་གཞི་:(_T)"
+
+ #: ../src/profile-preferences.glade.h:77
+-msgid "_Transparent background"
+-msgstr "དྭངས་གསལ་རྒྱབ་གཞི།(_T)"
++msgid "Transparent background"
++msgstr "དྭངས་གསལ་རྒྱབ་གཞི།"
+
+ #: ../src/profile-preferences.glade.h:78
+ #, fuzzy
+diff --git a/po/el.po b/po/el.po
+index b81802c..a32ae26 100644
+--- a/po/el.po
++++ b/po/el.po
+@@ -2289,3 +2289,6 @@ msgstr "Κ_λείσιμο παραθύρου"
+
+ #~ msgid "_Input Methods"
+ #~ msgstr "_Μέθοδοι εισαγωγής"
++
++msgid "Transparent background"
++msgstr "Διάφανο παρασκήνιο"
+diff --git a/po/en@shaw.po b/po/en@shaw.po
+index 65f3d41..05dc99d 100644
+--- a/po/en@shaw.po
++++ b/po/en@shaw.po
+@@ -1467,8 +1467,8 @@ msgid "_Text color:"
+ msgstr "_𐑑𐑧𐑒𐑕𐑑 𐑒𐑳𐑤𐑼:"
+
+ #: ../src/profile-preferences.glade.h:78
+-msgid "_Transparent background"
+-msgstr "_𐑑𐑮𐑨𐑯𐑕𐑐𐑸𐑩𐑯𐑑 𐑚𐑨𐑒𐑜𐑮𐑬𐑯𐑛"
++msgid "Transparent background"
++msgstr "𐑑𐑮𐑨𐑯𐑕𐑐𐑸𐑩𐑯𐑑 𐑚𐑨𐑒𐑜𐑮𐑬𐑯𐑛"
+
+ #: ../src/profile-preferences.glade.h:79
+ msgid "_Underline color:"
+diff --git a/po/en_CA.po b/po/en_CA.po
+index c79cbf5..b8b14d2 100644
+--- a/po/en_CA.po
++++ b/po/en_CA.po
+@@ -556,8 +556,8 @@ msgid "_Text color:"
+ msgstr "_Text colour:"
+
+ #: ../src/gnome-terminal.glade2.h:86
+-msgid "_Transparent background"
+-msgstr "_Transparent background"
++msgid "Transparent background"
++msgstr "Transparent background"
+
+ #: ../src/gnome-terminal.glade2.h:87
+ msgid "_Update login records when command is launched"
+diff --git a/po/en_GB.po b/po/en_GB.po
+index 4d38486..69e7113 100644
+--- a/po/en_GB.po
++++ b/po/en_GB.po
+@@ -2732,8 +2732,8 @@ msgstr "_Title:"
+ #~ msgid "Background image _scrolls"
+ #~ msgstr "Background image _scrolls"
+
+-#~ msgid "_Transparent background"
+-#~ msgstr "_Transparent background"
++msgid "Transparent background"
++msgstr "Transparent background"
+
+ #~ msgid "S_hade transparent or image background:"
+ #~ msgstr "S_hade transparent or image background:"
+diff --git a/po/es.po b/po/es.po
+index c8b47fe..4d33066 100644
+--- a/po/es.po
++++ b/po/es.po
+@@ -3095,8 +3095,8 @@ msgstr "_Cerrar ventana"
+ #~ msgid "_Solid color"
+ #~ msgstr "Color _sólido"
+
+-#~ msgid "_Transparent background"
+-#~ msgstr "Fondo _transparente"
++msgid "Transparent background"
++msgstr "Fondo transparente"
+
+ #~ msgid "No such profile \"%s\", using default profile\n"
+ #~ msgstr "No existe el perfil «%s», usando el perfil predeterminado\n"
+diff --git a/po/et.po b/po/et.po
+index 4b1c2a7..7707611 100644
+--- a/po/et.po
++++ b/po/et.po
+@@ -1747,3 +1747,6 @@ msgstr "Su_lge aken"
+
+ #~ msgid "Choose base profile"
+ #~ msgstr "Vali põhiprofiil"
++
++msgid "Transparent background"
++msgstr "Läbipaistev taust"
+diff --git a/po/eu.po b/po/eu.po
+index 97bb976..b53f33c 100644
+--- a/po/eu.po
++++ b/po/eu.po
+@@ -2972,8 +2972,8 @@ msgstr "It_xi leihoa"
+ #~ msgid "_Solid color"
+ #~ msgstr "_Kolore solidoa"
+
+-#~ msgid "_Transparent background"
+-#~ msgstr "_Atzeko plano gardena"
++msgid "Transparent background"
++msgstr "Atzeko plano gardena"
+
+ #~ msgid ""
+ #~ "You already have a profile called “%s”. Do you want to create another "
+diff --git a/po/fa.po b/po/fa.po
+index 2090863..b9a05af 100644
+--- a/po/fa.po
++++ b/po/fa.po
+@@ -2027,3 +2027,6 @@ msgstr "ذخیره به نام..."
+ #: ../src/terminal-window.c:3456
+ msgid "_Title:"
+ msgstr "_عنوان:"
++
++msgid "Transparent background"
++msgstr "پس‌زمینه‌ی شفاف"
+diff --git a/po/fi.po b/po/fi.po
+index f80a962..dacd609 100644
+--- a/po/fi.po
++++ b/po/fi.po
+@@ -2069,6 +2069,9 @@ msgstr ""
+ msgid "C_lose Window"
+ msgstr "_Sulje ikkuna"
+
++msgid "Transparent background"
++msgstr "Läpinäkyvä tausta"
++
+ #~ msgid "Set the terminal title"
+ #~ msgstr "Aseta päätteen otsikko"
+
+@@ -2083,4 +2086,4 @@ msgstr "_Sulje ikkuna"
+ #~ msgstr "Käytetäänkö teeman tummaan muunnelmaa"
+
+ #~ msgid "Use _dark theme variant"
+-#~ msgstr "Käytä _teeman tummaa muunnelmaa"
++#~ msgstr "Käytä _teeman tummaa muunnelmaa"
+\ No newline at end of file
+diff --git a/po/fr.po b/po/fr.po
+index fd28f38..babd28d 100644
+--- a/po/fr.po
++++ b/po/fr.po
+@@ -2135,3 +2135,6 @@ msgstr "Fermer _la fenêtre"
+
+ #~ msgid "Use _dark theme variant"
+ #~ msgstr "Utiliser une variante de thème _foncée"
++
++msgid "Transparent background"
++msgstr "Arrière-plan transparent"
+diff --git a/po/fur.po b/po/fur.po
+index 5a20170..8c3daaf 100644
+--- a/po/fur.po
++++ b/po/fur.po
+@@ -580,8 +580,8 @@ msgid "_Text color:"
+ msgstr "Colôr dal _test:"
+
+ #: ../src/gnome-terminal.glade2.h:86
+-msgid "_Transparent background"
+-msgstr "Fondâl _trasparent"
++msgid "Transparent background"
++msgstr "Fondâl trasparent"
+
+ #: ../src/gnome-terminal.glade2.h:87
+ msgid "_Update login records when command is launched"
+diff --git a/po/ga.po b/po/ga.po
+index 93d5fa9..feb87dc 100644
+--- a/po/ga.po
++++ b/po/ga.po
+@@ -1925,3 +1925,6 @@ msgstr "_Dún Fuinneog"
+ #: ../src/terminal-window.c:3582
+ msgid "C_lose Terminal"
+ msgstr "_Dún Teirminéal"
++
++msgid "Transparent background"
++msgstr "Cúlra trédhearcach"
+diff --git a/po/gl.po b/po/gl.po
+index 1429c66..6820190 100644
+--- a/po/gl.po
++++ b/po/gl.po
+@@ -3055,8 +3055,8 @@ msgstr "P_echar a xanela"
+ #~ msgid "Background image _scrolls"
+ #~ msgstr "A imaxe de fondo _desprázase"
+
+-#~ msgid "_Transparent background"
+-#~ msgstr "Fondo _transparente"
++msgid "Transparent background"
++msgstr "Fondo transparente"
+
+ #~ msgid "S_hade transparent or image background:"
+ #~ msgstr "_Sombra transparente ou imaxe de fondo:"
+diff --git a/po/gu.po b/po/gu.po
+index 0bcb195..f72a807 100644
+--- a/po/gu.po
++++ b/po/gu.po
+@@ -2944,8 +2944,8 @@ msgstr "વિન્ડો બંધ કરો (_l)"
+ #~ msgid "_Solid color"
+ #~ msgstr "ઘટ્ટ રંગ (_S)"
+
+-#~ msgid "_Transparent background"
+-#~ msgstr "પારદર્શક પાશ્વ ભાગનો ભાગ (_T)"
++msgid "Transparent background"
++msgstr "પારદર્શક પાશ્વ ભાગનો ભાગ"
+
+ #~ msgid "No such profile \"%s\", using default profile\n"
+ #~ msgstr "\"%s\" જેવી કોઈ રૂપરેખા નથી, મૂળભૂત રૂપરેખા વાપરી રહ્યા છે\n"
+diff --git a/po/he.po b/po/he.po
+index 0d9dfe0..ff4cc33 100644
+--- a/po/he.po
++++ b/po/he.po
+@@ -3007,8 +3007,8 @@ msgstr "סגירת ה_חלון"
+ #~ msgid "_Solid color"
+ #~ msgstr "צבע _אחיד"
+
+-#~ msgid "_Transparent background"
+-#~ msgstr "רקע _שקוף"
++msgid "Transparent background"
++msgstr "רקע שקוף"
+
+ #~ msgid "No such profile \"%s\", using default profile\n"
+ #~ msgstr "No such profile \"%s\", using default profile\n"
+diff --git a/po/hi.po b/po/hi.po
+index 2d7dc5b..adf8d35 100644
+--- a/po/hi.po
++++ b/po/hi.po
+@@ -2979,8 +2979,8 @@ msgstr "विंडो बंद करें (_l)"
+ #~ msgid "_Background image"
+ #~ msgstr "पृष्ठभूमि छवि (_B)"
+
+-#~ msgid "_Transparent background"
+-#~ msgstr "पारदर्शी पृष्ठभूमि (_T)"
++msgid "Transparent background"
++msgstr "पारदर्शी पृष्ठभूमि"
+
+ #~ msgid "S/Key Challenge Response"
+ #~ msgstr "एस/कुंजी चैलेंज प्रतिक्रिया"
+diff --git a/po/hr.po b/po/hr.po
+index cb48c52..747cf48 100644
+--- a/po/hr.po
++++ b/po/hr.po
+@@ -1362,8 +1362,8 @@ msgid "_Text color:"
+ msgstr "_Boja teksta:"
+
+ #: ../src/profile-preferences.glade.h:69
+-msgid "_Transparent background"
+-msgstr "_Prozirna pozadina"
++msgid "Transparent background"
++msgstr "Prozirna pozadina"
+
+ #: ../src/profile-preferences.glade.h:70
+ msgid "_Update login records when command is launched"
+diff --git a/po/hu.po b/po/hu.po
+index ad585ef..b9a481b 100644
+--- a/po/hu.po
++++ b/po/hu.po
+@@ -2509,3 +2509,6 @@ msgstr "_Ablak bezárása"
+
+ #~ msgid "Background type"
+ #~ msgstr "Háttér típusa"
++
++msgid "Transparent background"
++msgstr "Áttetsző háttér"
+diff --git a/po/hy.po b/po/hy.po
+index 5584901..caadbba 100644
+--- a/po/hy.po
++++ b/po/hy.po
+@@ -1011,8 +1011,8 @@ msgid "_Text color:"
+ msgstr "_Տեքստի գույնը՝"
+
+ #: ../src/profile-preferences.glade.h:73
+-msgid "_Transparent background"
+-msgstr "_Թափանցիկ նախադրյալ"
++msgid "Transparent background"
++msgstr "Թափանցիկ նախադրյալ"
+
+ #: ../src/profile-preferences.glade.h:74
+ msgid "_Update login records when command is launched"
+diff --git a/po/id.po b/po/id.po
+index 346b5d8..2448444 100644
+--- a/po/id.po
++++ b/po/id.po
+@@ -2068,3 +2068,6 @@ msgstr ""
+ #: ../src/terminal-window.c:3652
+ msgid "C_lose Window"
+ msgstr "Tutup Jende_la"
++
++msgid "Transparent background"
++msgstr "Latar belakang transparan"
+diff --git a/po/it.po b/po/it.po
+index 5a1847f..2eb1d62 100644
+--- a/po/it.po
++++ b/po/it.po
+@@ -2093,3 +2093,6 @@ msgstr ""
+ #: ../src/terminal-window.c:3652
+ msgid "C_lose Window"
+ msgstr "Chiudi _finestra"
++
++msgid "Transparent background"
++msgstr "Sfondo trasparente"
+diff --git a/po/ja.po b/po/ja.po
+index 4f8f4de..ce2ec95 100644
+--- a/po/ja.po
++++ b/po/ja.po
+@@ -1902,3 +1902,6 @@ msgstr "この端末には未だ実行中のプロセスが存在しています
+ #: ../src/terminal-window.c:3652
+ msgid "C_lose Window"
+ msgstr "ウィンドウを閉じる(_L)"
++
++msgid "Transparent background"
++msgstr "透過な画像にする"
+diff --git a/po/ka.po b/po/ka.po
+index 8415e88..3717b7e 100644
+--- a/po/ka.po
++++ b/po/ka.po
+@@ -568,7 +568,7 @@ msgstr "_ტექსტის ფერი:"
+
+ #: ../src/gnome-terminal.glade2.h:86
+ #, fuzzy
+-msgid "_Transparent background"
++msgid "Transparent background"
+ msgstr "გამჭირვალე"
+
+ #: ../src/gnome-terminal.glade2.h:87
+diff --git a/po/kk.po b/po/kk.po
+index dba7503..f7ac993 100644
+--- a/po/kk.po
++++ b/po/kk.po
+@@ -2030,3 +2030,6 @@ msgstr "Терезені жа_бу"
+
+ #~ msgid "Be quiet"
+ #~ msgstr "Тыныш болу"
++
++msgid "Transparent background"
++msgstr "Мөлдір фон"
+diff --git a/po/kn.po b/po/kn.po
+index c887f88..e899ef3 100644
+--- a/po/kn.po
++++ b/po/kn.po
+@@ -2344,3 +2344,6 @@ msgstr "ಕಿಟಕಿಯನ್ನು ಮುಚ್ಚು (_l)"
+
+ #~ msgid "_Title:"
+ #~ msgstr "ಶೀರ್ಷಿಕೆ(_T):"
++
++msgid "Transparent background"
++msgstr "ಪಾರದರ್ಶಕ ಹಿನ್ನಲೆ"
+diff --git a/po/ko.po b/po/ko.po
+index 0700e25..912e940 100644
+--- a/po/ko.po
++++ b/po/ko.po
+@@ -2078,3 +2078,6 @@ msgstr "창 닫기(_L)"
+
+ #~ msgid "Use _dark theme variant"
+ #~ msgstr "어두운 테마 사용(_D)"
++
++msgid "Transparent background"
++msgstr "투명한 배경"
+diff --git a/po/ku.po b/po/ku.po
+index 221825b..96e3581 100644
+--- a/po/ku.po
++++ b/po/ku.po
+@@ -557,8 +557,8 @@ msgid "_Text color:"
+ msgstr "Rengê _nivîsê:"
+
+ #: ../src/gnome-terminal.glade2.h:86
+-msgid "_Transparent background"
+-msgstr "Rûerdê _transparan"
++msgid "Transparent background"
++msgstr "Rûerdê transparan"
+
+ #: ../src/gnome-terminal.glade2.h:87
+ msgid "_Update login records when command is launched"
+diff --git a/po/lt.po b/po/lt.po
+index 294482b..c0ec0cf 100644
+--- a/po/lt.po
++++ b/po/lt.po
+@@ -2082,3 +2082,6 @@ msgstr "_Užverti langą"
+
+ #~ msgid "Use _dark theme variant"
+ #~ msgstr "Nau_doti tamsų temos variantą"
++
++msgid "Transparent background"
++msgstr "Permatomas fonas"
+diff --git a/po/lv.po b/po/lv.po
+index a50f529..b29541f 100644
+--- a/po/lv.po
++++ b/po/lv.po
+@@ -3016,8 +3016,8 @@ msgstr "Aizvērt _logu"
+ #~ msgid "Background image _scrolls"
+ #~ msgstr "Fona attēla ritināšanā_s"
+
+-#~ msgid "_Transparent background"
+-#~ msgstr "_Caurspīdīgs fons"
++msgid "Transparent background"
++msgstr "Caurspīdīgs fons"
+
+ #~ msgid "S_hade transparent or image background:"
+ #~ msgstr "_Aizēnot caurspīdīgo vai attēla fonu:"
+diff --git a/po/mai.po b/po/mai.po
+index 9b984a0..a3c0e17 100644
+--- a/po/mai.po
++++ b/po/mai.po
+@@ -1290,8 +1290,8 @@ msgid "_Text color:"
+ msgstr "पाठ रँग (_T):"
+
+ #: ../src/profile-preferences.glade.h:69
+-msgid "_Transparent background"
+-msgstr "पारदर्शी पृष्ठभूमि (_T)"
++msgid "Transparent background"
++msgstr "पारदर्शी पृष्ठभूमि"
+
+ #: ../src/profile-preferences.glade.h:70
+ msgid "_Update login records when command is launched"
+diff --git a/po/mg.po b/po/mg.po
+index 1c1895c..a805417 100644
+--- a/po/mg.po
++++ b/po/mg.po
+@@ -566,8 +566,8 @@ msgid "_Text color:"
+ msgstr "Lokon'ny _soratra:"
+
+ #: ../src/gnome-terminal.glade2.h:86
+-msgid "_Transparent background"
+-msgstr "_Afara tatera-pahazavana"
++msgid "Transparent background"
++msgstr "Afara tatera-pahazavana"
+
+ #: ../src/gnome-terminal.glade2.h:87
+ msgid "_Update login records when command is launched"
+diff --git a/po/mk.po b/po/mk.po
+index e31378a..d2b74d4 100644
+--- a/po/mk.po
++++ b/po/mk.po
+@@ -1166,8 +1166,8 @@ msgid "_Text color:"
+ msgstr "_Боја на текстот:"
+
+ #: ../src/profile-preferences.glade.h:77
+-msgid "_Transparent background"
+-msgstr "_Транспарентна позадина"
++msgid "Transparent background"
++msgstr "Транспарентна позадина"
+
+ #: ../src/profile-preferences.glade.h:78
+ #| msgid "_Text color:"
+diff --git a/po/ml.po b/po/ml.po
+index cc1928d..62abd21 100644
+--- a/po/ml.po
++++ b/po/ml.po
+@@ -2751,8 +2751,8 @@ msgstr "ടെര്‍മിനല്‍ അ_ടയ്ക്കുക"
+ #~ msgid "_Solid color"
+ #~ msgstr "_സോളിഡ് നിറം"
+
+-#~ msgid "_Transparent background"
+-#~ msgstr "_പുറകിലുള്ളവ കാണാവുന്ന പശ്ചാത്തലം"
++msgid "Transparent background"
++msgstr "പുറകിലുള്ളവ കാണാവുന്ന പശ്ചാത്തലം"
+
+ #~ msgid "S/Key Challenge Response"
+ #~ msgstr "S/Key ചാലഞ്ച് മറുപടി"
+diff --git a/po/mn.po b/po/mn.po
+index 4922041..9696b7f 100644
+--- a/po/mn.po
++++ b/po/mn.po
+@@ -617,8 +617,8 @@ msgid "_Text color:"
+ msgstr "_Текстийн өнгө:"
+
+ #: ../src/gnome-terminal.glade2.h:102
+-msgid "_Transparent background"
+-msgstr "_Тунгалаг дэвсгэр"
++msgid "Transparent background"
++msgstr "Тунгалаг дэвсгэр"
+
+ #: ../src/gnome-terminal.glade2.h:103
+ msgid "_Update login records when command is launched"
+diff --git a/po/mr.po b/po/mr.po
+index 61997da..50451d7 100644
+--- a/po/mr.po
++++ b/po/mr.po
+@@ -3015,8 +3015,8 @@ msgstr "चौकट बंद करा (_l)"
+ #~ msgid "_Solid color"
+ #~ msgstr "गडद रंग (_S)"
+
+-#~ msgid "_Transparent background"
+-#~ msgstr "पारदर्शी पार्श्वभूमी(_T)"
++msgid "Transparent background"
++msgstr "पारदर्शी पार्श्वभूमी"
+
+ #~ msgid "Disabled"
+ #~ msgstr "अकार्यान्वीतित"
+diff --git a/po/ms.po b/po/ms.po
+index 5b663aa..38a2afe 100644
+--- a/po/ms.po
++++ b/po/ms.po
+@@ -630,8 +630,8 @@ msgid "_Text color:"
+ msgstr "Warna _Teks:"
+
+ #: ../src/gnome-terminal.glade2.h:102
+-msgid "_Transparent background"
+-msgstr "LatarBelakang _Telus"
++msgid "Transparent background"
++msgstr "LatarBelakang Telus"
+
+ #: ../src/gnome-terminal.glade2.h:103
+ msgid "_Update login records when command is launched"
+diff --git a/po/nb.po b/po/nb.po
+index c14ae58..f5a590e 100644
+--- a/po/nb.po
++++ b/po/nb.po
+@@ -2054,3 +2054,6 @@ msgstr ""
+ #: ../src/terminal-window.c:3652
+ msgid "C_lose Window"
+ msgstr "_Lukk vindu"
++
++msgid "Transparent background"
++msgstr "Gjennomsiktig bakgrunn"
+diff --git a/po/nds.po b/po/nds.po
+index 98a1287..94fd757 100644
+--- a/po/nds.po
++++ b/po/nds.po
+@@ -995,8 +995,8 @@ msgid "_Text color:"
+ msgstr "_Textklöör:"
+
+ #: ../src/profile-preferences.glade.h:73
+-msgid "_Transparent background"
+-msgstr "_Döörschienenachtergrund:"
++msgid "Transparent background"
++msgstr "Döörschienenachtergrund:"
+
+ #: ../src/profile-preferences.glade.h:74
+ msgid "_Update login records when command is launched"
+diff --git a/po/ne.po b/po/ne.po
+index 4fe16cc..d9a90ad 100644
+--- a/po/ne.po
++++ b/po/ne.po
+@@ -2398,8 +2398,8 @@ msgstr "सञ्झ्याल बन्द गर्नुहोस्"
+ #~ msgid "_None (use solid color)"
+ #~ msgstr "कुनै पनि होइन (एउटै रङ प्रयोग गर्नुहोस्)"
+
+-#~ msgid "_Transparent background"
+-#~ msgstr "पारदर्शी पृष्ठभूमि"
++msgid "Transparent background"
++msgstr "पारदर्शी पृष्ठभूमि"
+
+ #~ msgid "_Use the system fixed width font"
+ #~ msgstr "प्रणाली निश्चित गरिएको फन्ट चौडाइ प्रयोग गर्नुहोस्"
+diff --git a/po/nl.po b/po/nl.po
+index a51720b..111b032 100644
+--- a/po/nl.po
++++ b/po/nl.po
+@@ -2352,3 +2352,6 @@ msgstr "Venster sl_uiten"
+
+ #~ msgid "Switch to Tab 12"
+ #~ msgstr "Ga naar tab 12"
++
++msgid "Transparent background"
++msgstr "Transparante achtergrond"
+diff --git a/po/nn.po b/po/nn.po
+index 91cd6ab..9284459 100644
+--- a/po/nn.po
++++ b/po/nn.po
+@@ -1428,8 +1428,8 @@ msgid "_Text color:"
+ msgstr "_Tekstfarge:"
+
+ #: ../src/profile-preferences.glade.h:73
+-msgid "_Transparent background"
+-msgstr "_Gjennomskinleg bakgrunn"
++msgid "Transparent background"
++msgstr "Gjennomskinleg bakgrunn"
+
+ #: ../src/profile-preferences.glade.h:74
+ msgid "_Update login records when command is launched"
+diff --git a/po/oc.po b/po/oc.po
+index 5e7ca58..3bd9991 100644
+--- a/po/oc.po
++++ b/po/oc.po
+@@ -1285,8 +1285,8 @@ msgid "_Text color:"
+ msgstr "Color del _tèxt :"
+
+ #: ../src/profile-preferences.glade.h:78
+-msgid "_Transparent background"
+-msgstr "Fons _transparent"
++msgid "Transparent background"
++msgstr "Fons transparent"
+
+ #: ../src/profile-preferences.glade.h:79
+ msgid "_Underline color:"
+diff --git a/po/or.po b/po/or.po
+index ec1e6bf..218acd7 100644
+--- a/po/or.po
++++ b/po/or.po
+@@ -2705,8 +2705,8 @@ msgstr "ଶୀର୍ଷକ (_T):"
+ #~ msgid "Background image _scrolls"
+ #~ msgstr "ପୃଷ୍ଠଭୂମି ଚିତ୍ର ସ୍କ୍ରୋଲଗୁଡିକ (_s)"
+
+-#~ msgid "_Transparent background"
+-#~ msgstr "ସ୍ବଚ୍ଛ ପୃଷ୍ଠଭୂମି (_T)"
++msgid "Transparent background"
++msgstr "ସ୍ବଚ୍ଛ ପୃଷ୍ଠଭୂମି"
+
+ #~ msgid "S_hade transparent or image background:"
+ #~ msgstr "ଛାୟା ସ୍ବଚ୍ଛ କିମ୍ବା ଚିତ୍ର ପୃଷ୍ଠଭୂମି (_h):"
+diff --git a/po/pa.po b/po/pa.po
+index 9c95b66..5e5b8ba 100644
+--- a/po/pa.po
++++ b/po/pa.po
+@@ -3008,8 +3008,8 @@ msgstr "ਵਿੰਡੋ ਬੰਦ ਕਰੋ(_l)"
+ #~ msgid "_Solid color"
+ #~ msgstr "ਇੱਕ ਰੰਗ ਵਰਤੋਂ(_S)"
+
+-#~ msgid "_Transparent background"
+-#~ msgstr "ਪਾਰਦਰਸ਼ੀ ਬੈਕਗਰਾਊਂਡ(_T)"
++msgid "Transparent background"
++msgstr "ਪਾਰਦਰਸ਼ੀ ਬੈਕਗਰਾਊਂਡ"
+
+ #~ msgid "S/Key Challenge Response"
+ #~ msgstr "S/ਸਵਿੱਚ ਚੈਲੰਜ਼ ਜਵਾਬ"
+diff --git a/po/pl.po b/po/pl.po
+index deb91b7..f772171 100644
+--- a/po/pl.po
++++ b/po/pl.po
+@@ -2116,3 +2116,6 @@ msgid ""
+ msgstr ""
+ "Wartość między 0 a 100, gdzie 0 oznacza nieprzezroczystość, a 100 oznacza "
+ "całkowitą przezroczystość."
++
++msgid "Transparent background"
++msgstr "Przezroczyste tło"
+diff --git a/po/ps.po b/po/ps.po
+index b1de52c..a16ac49 100644
+--- a/po/ps.po
++++ b/po/ps.po
+@@ -1052,8 +1052,8 @@ msgid "_Text color:"
+ msgstr ":د ليکنې رنګ_"
+
+ #: ../src/profile-preferences.glade.h:69
+-msgid "_Transparent background"
+-msgstr "روڼ شاليد_"
++msgid "Transparent background"
++msgstr "روڼ شاليد"
+
+ #: ../src/profile-preferences.glade.h:70
+ msgid "_Update login records when command is launched"
+diff --git a/po/pt.po b/po/pt.po
+index 68bb2dd..9078dcb 100644
+--- a/po/pt.po
++++ b/po/pt.po
+@@ -2948,8 +2948,8 @@ msgstr "_Fechar janela"
+ #~ msgid "Background image _scrolls"
+ #~ msgstr "Imagem de fundo _rola"
+
+-#~ msgid "_Transparent background"
+-#~ msgstr "Fundo _transparente"
++msgid "Transparent background"
++msgstr "Fundo transparente"
+
+ #~ msgid "S_hade transparent or image background:"
+ #~ msgstr "Transparente som_breado ou imagem de fundo:"
+diff --git a/po/pt_BR.po b/po/pt_BR.po
+index 8fac135..b79275c 100644
+--- a/po/pt_BR.po
++++ b/po/pt_BR.po
+@@ -2865,3 +2865,6 @@ msgstr "_Fechar janela"
+ #~ "poderão usar. Essa é a paleta, na forma de uma lista de nomes de cores "
+ #~ "separada por dois pontos. Os nomes de cores devem estar no formato "
+ #~ "hexadecimal. Exemplo: \"#FF00FF\""
++
++msgid "Transparent background"
++msgstr "Fundo transparente"
+diff --git a/po/ro.po b/po/ro.po
+index 179dd77..f7fc7ae 100644
+--- a/po/ro.po
++++ b/po/ro.po
+@@ -1576,8 +1576,8 @@ msgid "_Text color:"
+ msgstr "Culoare _text:"
+
+ #: ../src/profile-preferences.glade.h:77
+-msgid "_Transparent background"
+-msgstr "Fundal _transparent"
++msgid "Transparent background"
++msgstr "Fundal transparent"
+
+ #: ../src/profile-preferences.glade.h:78
+ msgid "_Underline color:"
+diff --git a/po/ru.po b/po/ru.po
+index 01d1683..672ab01 100644
+--- a/po/ru.po
++++ b/po/ru.po
+@@ -2073,3 +2073,6 @@ msgstr ""
+ #: ../src/terminal-window.c:3652
+ msgid "C_lose Window"
+ msgstr "_Закрыть окно"
++
++msgid "Transparent background"
++msgstr "Прозрачный фон"
+diff --git a/po/rw.po b/po/rw.po
+index 3f02231..b7fff4c 100644
+--- a/po/rw.po
++++ b/po/rw.po
+@@ -748,7 +748,7 @@ msgstr "Ibara ry'Inyandiko..."
+
+ #: ../src/gnome-terminal.glade2.h:102
+ #, fuzzy
+-msgid "_Transparent background"
++msgid "Transparent background"
+ msgstr "Mbuganyuma"
+
+ #: ../src/gnome-terminal.glade2.h:103
+diff --git a/po/si.po b/po/si.po
+index 81dbf65..5cb0e5a 100644
+--- a/po/si.po
++++ b/po/si.po
+@@ -537,8 +537,8 @@ msgid "_Text color:"
+ msgstr "පෙළ වර්‍ණ: (_T)"
+
+ #: ../src/gnome-terminal.glade2.h:86
+-msgid "_Transparent background"
+-msgstr "විනිවිද පෙනෙන පසුබිම (_T)"
++msgid "Transparent background"
++msgstr "විනිවිද පෙනෙන පසුබිම"
+
+ #: ../src/gnome-terminal.glade2.h:87
+ msgid "_Update login records when command is launched"
+diff --git a/po/sk.po b/po/sk.po
+index 9bef0bf..52e4af2 100644
+--- a/po/sk.po
++++ b/po/sk.po
+@@ -2354,3 +2354,6 @@ msgstr "_Zavrieť okno"
+ #~ "\n"
+ #~ "Viac informácii o jednotlivých príkazoch získate pomocou „%s PRÍKAZ --"
+ #~ "help“.\n"
++
++msgid "Transparent background"
++msgstr "Priehľadné pozadie"
+diff --git a/po/sl.po b/po/sl.po
+index 3a7ee4a..4f6ce0d 100644
+--- a/po/sl.po
++++ b/po/sl.po
+@@ -2316,3 +2316,6 @@ msgstr "_Zapri okno"
+
+ #~ msgid "_Profile Preferences…"
+ #~ msgstr "Možnosti _profila ..."
++
++msgid "Transparent background"
++msgstr "Prosojno ozadje"
+diff --git a/po/sq.po b/po/sq.po
+index e59c0b6..6fb4090 100644
+--- a/po/sq.po
++++ b/po/sq.po
+@@ -567,8 +567,8 @@ msgstr "Ngjyra e _tekstit:"
+
+ # (pofilter) simplecaps: checks the capitalisation of two strings isn't wildly different
+ #: ../src/gnome-terminal.glade2.h:85
+-msgid "_Transparent background"
+-msgstr "Sfond _Trasparent"
++msgid "Transparent background"
++msgstr "Sfond Trasparent"
+
+ #: ../src/gnome-terminal.glade2.h:86
+ msgid "_Update login records when command is launched"
+diff --git a/po/sr.po b/po/sr.po
+index fce0f63..22f129a 100644
+--- a/po/sr.po
++++ b/po/sr.po
+@@ -2230,3 +2230,6 @@ msgstr "_Затвори прозор"
+
+ #~ msgid "Close Window"
+ #~ msgstr "Затвори прозор"
++
++msgid "Transparent background"
++msgstr "Провидна позадина"
+diff --git a/po/sr@latin.po b/po/sr@latin.po
+index c82646c..55f6a0e 100644
+--- a/po/sr@latin.po
++++ b/po/sr@latin.po
+@@ -2230,3 +2230,6 @@ msgstr "_Zatvori prozor"
+
+ #~ msgid "Close Window"
+ #~ msgstr "Zatvori prozor"
++
++msgid "Transparent background"
++msgstr "Providna pozadina"
+diff --git a/po/sv.po b/po/sv.po
+index 8f64ba2..b0d6fcb 100644
+--- a/po/sv.po
++++ b/po/sv.po
+@@ -2080,5 +2080,8 @@ msgstr "Stän_g fönster"
+ #~ msgid "Unknown completion request for \"%s\""
+ #~ msgstr "Okänd kompletteringsbegäran för \"%s\""
+
++msgid "Transparent background"
++msgstr "Genomskinlig bakgrund"
++
+ #~ msgid "Missing command"
+ #~ msgstr "Kommando saknas"
+diff --git a/po/ta.po b/po/ta.po
+index 80aa2f6..61185b4 100644
+--- a/po/ta.po
++++ b/po/ta.po
+@@ -3028,8 +3028,8 @@ msgstr "_l சாளரத்தை மூடவும்"
+ #~ msgid "_Solid color"
+ #~ msgstr "(_S) ஒரே வண்ணம்"
+
+-#~ msgid "_Transparent background"
+-#~ msgstr "_T புலப்பாடு பின்னணி"
++msgid "Transparent background"
++msgstr "புலப்பாடு பின்னணி"
+
+ #~ msgid "No such profile \"%s\", using default profile\n"
+ #~ msgstr "\"%s\" என்ற வரியுரு கிடையாது, முன்னிருப்பு வரியுரு பயன்படுத்தப்படும்\n"
+diff --git a/po/te.po b/po/te.po
+index 000cda3..6dcf793 100644
+--- a/po/te.po
++++ b/po/te.po
+@@ -2898,8 +2898,8 @@ msgstr "కిటికీని మూసివేయి (_l)"
+ #~ msgid "Background image _scrolls"
+ #~ msgstr "నేపథ్యచిత్రము స్క్రాల్స్ (_s)"
+
+-#~ msgid "_Transparent background"
+-#~ msgstr "పారదర్శక నేపథ్యం (_T)"
++msgid "Transparent background"
++msgstr "పారదర్శక నేపథ్యం"
+
+ #~ msgid "S_hade transparent or image background:"
+ #~ msgstr "పారదర్శకంగా మారు లేదా చిత్రము బ్యాక్‌గ్రౌండ్ కు మారు(_h):"
+diff --git a/po/th.po b/po/th.po
+index be9b0cb..482907f 100644
+--- a/po/th.po
++++ b/po/th.po
+@@ -2616,8 +2616,8 @@ msgstr "ปิ_ดหน้าต่าง"
+ #~ msgid "_Solid color"
+ #~ msgstr "สี_ทึบ"
+
+-#~ msgid "_Transparent background"
+-#~ msgstr "พื้นหลังโปร่งแ_สง"
++msgid "Transparent background"
++msgstr "พื้นหลังโปร่งแสง"
+
+ #~ msgid ""
+ #~ "You already have a profile called “%s”. Do you want to create another "
+diff --git a/po/tr.po b/po/tr.po
+index 02a704a..78f26ba 100644
+--- a/po/tr.po
++++ b/po/tr.po
+@@ -1968,3 +1968,6 @@ msgstr "Hala bir süreç bu uçbirimde çalışıyor. Uçbirimi kapatmak onu son
+ #: ../src/terminal-window.c:3652
+ msgid "C_lose Window"
+ msgstr "_Pencereyi Kapat"
++
++msgid "Transparent background"
++msgstr "Şeffaf arkaplan"
+diff --git a/po/ug.po b/po/ug.po
+index 1673bb3..e21e61e 100644
+--- a/po/ug.po
++++ b/po/ug.po
+@@ -2616,8 +2616,8 @@ msgstr "ماۋزۇ (_T):"
+ #~ msgid "_Solid color"
+ #~ msgstr "ساپ رەڭ(_S)"
+
+-#~ msgid "_Transparent background"
+-#~ msgstr "سۈزۈك تەگلىك(_T)"
++msgid "Transparent background"
++msgstr "سۈزۈك تەگلىك"
+
+ #~ msgid ""
+ #~ "You already have a profile called “%s”. Do you want to create another "
+diff --git a/po/uk.po b/po/uk.po
+index a8db018..414c413 100644
+--- a/po/uk.po
++++ b/po/uk.po
+@@ -2946,8 +2946,8 @@ msgstr "Закр_ити вікно"
+ #~ msgid "_Solid color"
+ #~ msgstr "_Суцільний колір"
+
+-#~ msgid "_Transparent background"
+-#~ msgstr "П_розоре тло"
++msgid "Transparent background"
++msgstr "Прозоре тло"
+
+ #~ msgid "Switch to Tab 2"
+ #~ msgstr "До вкладки 2"
+diff --git a/po/vi.po b/po/vi.po
+index e943917..87846ac 100644
+--- a/po/vi.po
++++ b/po/vi.po
+@@ -2671,3 +2671,6 @@ msgstr "Đón_g cửa sổ"
+ #~ "Phím tắt để đặt lại thiết bị cuối. Dùng dạng chuỗi có cùng một khuôn dạng "
+ #~ "với tập tin tài nguyên GTK+. Nếu bạn đặt tùy chọn là chuỗi “disabled” (bị "
+ #~ "tắt), nghĩa là không có phím tắt cho hành động này."
++
++msgid "Transparent background"
++msgstr "Nền trong suốt"
+diff --git a/po/wa.po b/po/wa.po
+index 2856571..f068531 100644
+--- a/po/wa.po
++++ b/po/wa.po
+@@ -563,8 +563,8 @@ msgid "_Text color:"
+ msgstr "Coleur pol _tecse:"
+
+ #: ../src/gnome-terminal.glade2.h:86
+-msgid "_Transparent background"
+-msgstr "Fond k' on voet _houte"
++msgid "Transparent background"
++msgstr "Fond k' on voet houte"
+
+ #: ../src/gnome-terminal.glade2.h:87
+ msgid "_Update login records when command is launched"
+diff --git a/po/xh.po b/po/xh.po
+index e5981c6..7f9f804 100644
+--- a/po/xh.po
++++ b/po/xh.po
+@@ -620,8 +620,8 @@ msgid "_Text color:"
+ msgstr "_Umbala wombhalo:"
+
+ #: ../src/gnome-terminal.glade2.h:102
+-msgid "_Transparent background"
+-msgstr "_Okungasemva okucace gca"
++msgid "Transparent background"
++msgstr "Okungasemva okucace gca"
+
+ #: ../src/gnome-terminal.glade2.h:103
+ msgid "_Update login records when command is launched"
+diff --git a/po/zh_CN.po b/po/zh_CN.po
+index b18a9e7..287db04 100644
+--- a/po/zh_CN.po
++++ b/po/zh_CN.po
+@@ -2280,3 +2280,6 @@ msgstr "关闭窗口(_L)"
+
+ #~ msgid "_Find..."
+ #~ msgstr "查找(_F)..."
++
++msgid "Transparent background"
++msgstr "透明背景"
+diff --git a/po/zh_HK.po b/po/zh_HK.po
+index eb0ede7..aceb184 100644
+--- a/po/zh_HK.po
++++ b/po/zh_HK.po
+@@ -2376,3 +2376,6 @@ msgstr "關閉視窗(_L)"
+
+ #~ msgid "Show session management options"
+ #~ msgstr "顯示作業階段管理選項"
++
++msgid "Transparent background"
++msgstr "透明背景"
+diff --git a/po/zh_TW.po b/po/zh_TW.po
+index a32a539..f0674dc 100644
+--- a/po/zh_TW.po
++++ b/po/zh_TW.po
+@@ -2379,3 +2379,6 @@ msgstr "關閉視窗(_L)"
+
+ #~ msgid "Show session management options"
+ #~ msgstr "顯示作業階段管理選項"
++
++msgid "Transparent background"
++msgstr "透明背景"
+--
+2.1.0
+
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild
new file mode 100644
index 00000000000..382af2bfc98
--- /dev/null
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 readme.gentoo
+
+DESCRIPTION="The Gnome Terminal"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="debug +gnome-shell +nautilus"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
+
+# FIXME: automagic dependency on gtk+[X]
+RDEPEND="
+ >=dev-libs/glib-2.40:2[dbus]
+ >=x11-libs/gtk+-3.10:3[X]
+ >=x11-libs/vte-0.38:2.91
+ >=gnome-base/dconf-0.14
+ >=gnome-base/gsettings-desktop-schemas-0.1.0
+ sys-apps/util-linux
+ x11-libs/libSM
+ x11-libs/libICE
+ gnome-shell? ( gnome-base/gnome-shell )
+ nautilus? ( >=gnome-base/nautilus-3 )
+"
+# gtk+:2 needed for gtk-builder-convert, bug 356239
+# 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/appdata-tools
+ dev-util/gdbus-codegen
+ || ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 )
+ dev-util/itstool
+ >=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.sh"
+
+src_prepare() {
+ # client: Hide obsolete --title option (from '3.14')
+ epatch "${FILESDIR}/${P}-title-option.patch"
+
+ # screen: Fix crash with empty child process command line (from '3.14')
+ epatch "${FILESDIR}/${P}-fix-crash.patch"
+
+ 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.14.3.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.14.3.ebuild
new file mode 100644
index 00000000000..e95d005f00f
--- /dev/null
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.14.3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 readme.gentoo
+
+DESCRIPTION="The Gnome Terminal"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="debug +gnome-shell +nautilus"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
+
+# FIXME: automagic dependency on gtk+[X]
+RDEPEND="
+ >=dev-libs/glib-2.40:2[dbus]
+ >=x11-libs/gtk+-3.10:3[X]
+ >=x11-libs/vte-0.38:2.91
+ >=gnome-base/dconf-0.14
+ >=gnome-base/gsettings-desktop-schemas-0.1.0
+ sys-apps/util-linux
+ x11-libs/libSM
+ x11-libs/libICE
+ 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/appdata-tools
+ dev-util/gdbus-codegen
+ dev-util/gtk-builder-convert
+ dev-util/itstool
+ >=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.sh"
+
+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.16.2-r2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.16.2-r2.ebuild
new file mode 100644
index 00000000000..e8ad4ac1530
--- /dev/null
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.16.2-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 readme.gentoo
+
+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 ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
+
+# FIXME: automagic dependency on gtk+[X]
+RDEPEND="
+ >=dev-libs/glib-2.40:2[dbus]
+ >=x11-libs/gtk+-3.10:3[X]
+ >=x11-libs/vte-0.40.2:2.91
+ >=gnome-base/dconf-0.14
+ >=gnome-base/gsettings-desktop-schemas-0.1.0
+ sys-apps/util-linux
+ x11-libs/libSM
+ x11-libs/libICE
+ 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/itstool
+ >=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.sh"
+
+src_prepare() {
+ gnome2_src_prepare
+ if ! use vanilla; then
+ # Fedora patch, https://bugzilla.gnome.org/show_bug.cgi?id=695371
+ epatch "${FILESDIR}"/${PN}-3.16.2-restore-transparency.patch
+ # Fedora patch, https://bugzilla.gnome.org/show_bug.cgi?id=721932
+ epatch "${FILESDIR}"/${PN}-3.16.2-restore-dark.patch
+ fi
+}
+
+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 00000000000..04c70dc7bc2
--- /dev/null
+++ b/x11-terms/gnome-terminal/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+<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 00000000000..f0b85dec740
--- /dev/null
+++ b/x11-terms/guake/Manifest
@@ -0,0 +1,6 @@
+DIST guake-0.5.0.tar.gz 307488 SHA256 08206d0a003f42194a3779094e78d46b116829c258f5261d31d862010dcce0ca SHA512 8de0ad2ae13ca1306fb32cc3d889091fea4c190fcaa8e4068077277e7c851c15f7c52521272e94d663332bf400648a1c94263bdc27b903b1b0524559cdceb5d0 WHIRLPOOL 27f75440f175cd03038b17e86914cf4e5aaa7be2a31df297dd2d2e8446c718d7701b57c26e88297c71b2645331131548b89b069ce6af328777a1d789135fdb2e
+DIST guake-0.5.1.tar.gz 311818 SHA256 ba4cb2b890c7141de28569152566b59590e162bc17a1b1a426d871c4cee69d27 SHA512 172cee2135b591dcfb61c87d1b1e7b01802f1da3fdd51e14a135917fa3f1201cf9cbad01802fa785f689420585bb3cc1af04d465661f79c2fd7466d6bb8360b2 WHIRLPOOL 698ba3f7798989deeddab040ca677ee1bfa346167938ae32fb113ce9d9d9c64a8bf51f1ffeb70d69771abc8585fcf32d26003e22f422285b5724ce1b5159bbb7
+DIST guake-0.5.2.tar.gz 315481 SHA256 a46802999721a9dd8b91f0977711641e561736dc0694506d2c3b6d636bc2c94e SHA512 34c28cae0561bac6109716555169d7133583987fae23de51ba14314190375190e877f9c7c03cf17b227ba3793779cc1fa35cc83ea6a7b461406cab9a20b1342b WHIRLPOOL ebb66c03cc7208987ee67da37e3bc5c1e7be8fc56ea3e56490750180d89a13570009e3d480feac3d10980de8c54f9ecfd6efc6eb1f88714288053a8fbe1653b2
+DIST guake-0.6.1.tar.gz 325041 SHA256 5d5f907b410829a7698e7d9ad9de8ef6900e12f4fa85598c9805a839beee0a32 SHA512 268cb16c1e0efd26ba4178921556a26360b504dd3a82c2eb9f59ad5656e7be632fe406b4d017249c291fa0ee228c980bf03578ec02a464624450feb3ab7ee2ca WHIRLPOOL ac5442bad8a5abd023e3a61d11719e34ddd83ea038f34f026440df6dc73d7c71dfc8ba4e2d1eb0ab3e50d9dfdc441257cda80462b51aaf74dc306e1a8a86facb
+DIST guake-0.7.0.tar.gz 341020 SHA256 ce771ac377d3ef74c793b50936617b0dda5682dd687c2599db568f77de24de5b SHA512 1c3481334301261950f7e542172da215e9b1820eba17d750134986f3a58c4616e8e97bc9da8fe083c7534e83410e213351957a6f6f02d747518a1d57f1f02b58 WHIRLPOOL 0dbf8d94895281ba9ae592eef8651d7966b06b1109d1990f2869bdf6be4970f88cc2f2fa8d2401d9f149b4259d4eb6f9fc37b243178457630d782c8186cb8945
+DIST guake-0.7.2.tar.gz 351702 SHA256 761bb608d7ec907cab3281c7c67317ac6413fdf52293bd5e9c8e4dc1024a5993 SHA512 1fd27b35fcc25743be7a49cc560fbc1a269f78d7e4c07afbd0fe489c1b8e0edbe31e73fb9735a6405668a3e5748cbc4757defd2996a51815d245283f4fca2c16 WHIRLPOOL 08579c7493cc74f9a0b97396e08d7223e9c614d86697ba9d7dfd262240e7c8123a3d4b117a3457a0af27fcc483a0a5a28571f181f49baf9bffa21a2e10d09742
diff --git a/x11-terms/guake/files/guake-0.7.0-desktop.patch b/x11-terms/guake/files/guake-0.7.0-desktop.patch
new file mode 100644
index 00000000000..8838b83913e
--- /dev/null
+++ b/x11-terms/guake/files/guake-0.7.0-desktop.patch
@@ -0,0 +1,18 @@
+--- a/data/guake-prefs.desktop.in
++++ b/data/guake-prefs.desktop.in
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-_Name=Guake Preferences
+-_Comment=Configure your Guake sessions
++Name=Guake Preferences
++Comment=Configure your Guake sessions
+ TryExec=guake-prefs
+ Exec=guake-prefs
+ Icon=guake-prefs
+@@ -10,4 +10,4 @@
+ StartupNotify=true
+ Categories=GTK;GNOME;Settings;X-GNOME-PersonalSettings;
+ X-Desktop-File-Install-Version=0.15
+-_Keywords=Terminal;Utility;
++Keywords=Terminal;Utility;
diff --git a/x11-terms/guake/guake-0.5.0.ebuild b/x11-terms/guake/guake-0.5.0.ebuild
new file mode 100644
index 00000000000..e7edbba29c5
--- /dev/null
+++ b/x11-terms/guake/guake-0.5.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GCONF_DEBUG=no
+GNOME2_LA_PUNT=yes
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools gnome2 python-single-r1
+
+DESCRIPTION="Drop-down terminal for GTK+ desktops"
+HOMEPAGE="http://guake.org/"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+
+RDEPEND="
+ dev-python/dbus-python
+ dev-python/gconf-python
+ dev-python/notify-python
+ dev-python/pygtk
+ dev-python/pyxdg
+ 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 )
+
+S=${WORKDIR}/${PN}-${P}
+
+src_prepare() {
+ eautoreconf
+
+ # python_fix_shebang does not handle this?
+ sed -i -e '/^PYTHON=/s|python|'${EPYTHON}'|' src/guake-prefs || die
+
+ gnome2_src_prepare
+
+ G2CONF="--disable-static"
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+}
diff --git a/x11-terms/guake/guake-0.5.1.ebuild b/x11-terms/guake/guake-0.5.1.ebuild
new file mode 100644
index 00000000000..823ee197c24
--- /dev/null
+++ b/x11-terms/guake/guake-0.5.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GCONF_DEBUG=no
+GNOME2_LA_PUNT=yes
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools 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"
+
+RDEPEND="
+ dev-python/dbus-python
+ dev-python/gconf-python
+ dev-python/notify-python
+ dev-python/pygtk
+ dev-python/pyxdg
+ 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() {
+ eautoreconf
+
+ gnome2_src_prepare
+
+ G2CONF="--disable-static"
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+}
diff --git a/x11-terms/guake/guake-0.5.2.ebuild b/x11-terms/guake/guake-0.5.2.ebuild
new file mode 100644
index 00000000000..a2be1bf36cf
--- /dev/null
+++ b/x11-terms/guake/guake-0.5.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GCONF_DEBUG=no
+GNOME2_LA_PUNT=yes
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools 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"
+
+RDEPEND="
+ dev-python/dbus-python
+ dev-python/gconf-python
+ dev-python/notify-python
+ dev-python/pygtk
+ dev-python/pyxdg
+ 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() {
+ eautoreconf
+
+ gnome2_src_prepare
+
+ G2CONF="--disable-static"
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+}
diff --git a/x11-terms/guake/guake-0.6.1.ebuild b/x11-terms/guake/guake-0.6.1.ebuild
new file mode 100644
index 00000000000..49f933adda9
--- /dev/null
+++ b/x11-terms/guake/guake-0.6.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GCONF_DEBUG=no
+GNOME2_LA_PUNT=yes
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools 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"
+
+RDEPEND="
+ dev-python/dbus-python
+ dev-python/gconf-python
+ dev-python/notify-python
+ dev-python/pygtk
+ dev-python/pyxdg
+ 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() {
+ eautoreconf
+
+ gnome2_src_prepare
+
+ G2CONF="--disable-static"
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+}
diff --git a/x11-terms/guake/guake-0.7.0.ebuild b/x11-terms/guake/guake-0.7.0.ebuild
new file mode 100644
index 00000000000..f62f5ce7524
--- /dev/null
+++ b/x11-terms/guake/guake-0.7.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GCONF_DEBUG=no
+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"
+
+RDEPEND="
+ dev-python/dbus-python
+ dev-python/gconf-python
+ dev-python/notify-python
+ dev-python/pygtk
+ dev-python/pyxdg
+ 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() {
+ epatch "${FILESDIR}"/${PN}-0.7.0-desktop.patch
+
+ eautoreconf
+
+ gnome2_src_prepare
+
+ G2CONF="--disable-static"
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+}
diff --git a/x11-terms/guake/guake-0.7.2.ebuild b/x11-terms/guake/guake-0.7.2.ebuild
new file mode 100644
index 00000000000..8d97e7efbac
--- /dev/null
+++ b/x11-terms/guake/guake-0.7.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GCONF_DEBUG=no
+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"
+
+RDEPEND="
+ dev-python/dbus-python
+ dev-python/gconf-python
+ dev-python/notify-python
+ dev-python/pygtk
+ dev-python/pyxdg
+ 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() {
+ eautoreconf
+
+ gnome2_src_prepare
+
+ G2CONF="--disable-static"
+}
+
+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 00000000000..b27be6d845f
--- /dev/null
+++ b/x11-terms/guake/guake-9999.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GCONF_DEBUG=no
+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=""
+
+RDEPEND="
+ dev-python/dbus-python
+ dev-python/gconf-python
+ dev-python/notify-python
+ dev-python/pygtk
+ dev-python/pyxdg
+ 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() {
+ eautoreconf
+
+ gnome2_src_prepare
+
+ G2CONF="--disable-static"
+}
+
+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 00000000000..41ba86c657b
--- /dev/null
+++ b/x11-terms/guake/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>desktop-misc</herd>
+ <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 00000000000..90f61621a09
--- /dev/null
+++ b/x11-terms/hanterm/Manifest
@@ -0,0 +1 @@
+DIST hanterm-3.1.6.tar.gz 323736 SHA256 2686e4ba1ce6c42ec38e68a4d61722aa894543dae0f4f7d7eaa220dd9fa5d7e7 SHA512 57ce81091bf60184b6b17e90c56b78f279da96d040bf9e8bf23c1ae2d0ae536486c31afe2f038a284883e3be0cf881ecaece8366d5069e1e43b4a49a5bcd7016 WHIRLPOOL ae939e0ec6a34c0623e41c80c6ae2552d7622b5923c3ee649fef071dc36f96b86442198615521a0202a1b6b749b43354557568ec68ede211515e76605c5ff23b
diff --git a/x11-terms/hanterm/files/Hanterm.gentoo b/x11-terms/hanterm/files/Hanterm.gentoo
new file mode 100644
index 00000000000..a71aa96f04c
--- /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 00000000000..bb3d6b1365d
--- /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 00000000000..32659263b5d
--- /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 00000000000..72f868b9492
--- /dev/null
+++ b/x11-terms/hanterm/hanterm-3.1.6-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 00000000000..d46bc7f8f8c
--- /dev/null
+++ b/x11-terms/hanterm/hanterm-3.1.6-r4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 00000000000..d137f43ff97
--- /dev/null
+++ b/x11-terms/hanterm/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>cjk</herd>
+<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 00000000000..45f0257365e
--- /dev/null
+++ b/x11-terms/kterm/Manifest
@@ -0,0 +1,3 @@
+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
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 00000000000..5324c4cfa3f
--- /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 00000000000..cda8856a8cf
--- /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 00000000000..f05a0b13537
--- /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 00000000000..ee8bc1814ae
--- /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 00000000000..a502bac0eb7
--- /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 00000000000..4dc36fd1c6f
--- /dev/null
+++ b/x11-terms/kterm/kterm-6.2.0-r5.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 00000000000..2d5852c16c6
--- /dev/null
+++ b/x11-terms/kterm/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>cjk</herd>
+</pkgmetadata>
diff --git a/x11-terms/lilyterm/Manifest b/x11-terms/lilyterm/Manifest
new file mode 100644
index 00000000000..af28aa40127
--- /dev/null
+++ b/x11-terms/lilyterm/Manifest
@@ -0,0 +1 @@
+DIST lilyterm-0.9.9.4.tar.gz 346180 SHA256 b72626431d4f5645e0e0f18449319fbb69bef4eab4345d5e37cde0ae712a5d74 SHA512 2fcd9d31a28d6bf9d953cd77b38cb3c67591dd04157f0efd418ce3ac9eab0f8090156435207c8bc18e619dda45e726f3346b1344f2d37fd308fa802476d3b5da WHIRLPOOL 401ea44884b836fbf36e89cf20c850607723c35f9e25bcd604816d6426bc656301e9b66845e79e1f109d97a9099af4cf3f6ce375ee564eaf4f5cce62d56ea100
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 00000000000..9e6feee149a
--- /dev/null
+++ b/x11-terms/lilyterm/lilyterm-0.9.9.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 00000000000..4bff79f2c77
--- /dev/null
+++ b/x11-terms/lilyterm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>desktop-misc</herd>
+<maintainer>
+<email>jer@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-terms/mate-terminal/Manifest b/x11-terms/mate-terminal/Manifest
new file mode 100644
index 00000000000..082faa3007f
--- /dev/null
+++ b/x11-terms/mate-terminal/Manifest
@@ -0,0 +1,2 @@
+DIST mate-terminal-1.8.0.tar.xz 1150588 SHA256 9efe1f9e3ee6ef9bc90e233ebe0a440cdb24761edfb9743dcc8b56f8b7a57c09 SHA512 c672a85afd5188cc883eadeae468750cbe1544a8d95fd6b3af0c5d8b41aaeb563227a4d4effdc4a13ea49d823d2ac28adf4caae4f7b3c68d69f0fc49adfc00fb WHIRLPOOL 6112fb99c37c8049b9d5c9f564a387556b734cc87892afe0cbd6e0cba9777514814a15f71a025da9a3cf1a240bc86ca5257f66a14c5278ce28753fffbf737caf
+DIST mate-terminal-1.8.1.tar.xz 1160064 SHA256 d4ba3fd495feb4f8836ea9ca4c201c78fe9564c8190a2d3c84ca4e514a7aa39d SHA512 fec2b2a48ca5a6218a73694627e9a690f61be9706c12999428467755949a47d1f57fb5767370fe9c1fba02333b4802ecbebae0b7f87f547539cdd1b3eaa44ee1 WHIRLPOOL 8d1ed15964ffc67d22094c52a68b6c88aded026511d3de2c9bf9c0a494424ae27f5f234db5b9e2ce29eabfd512605cd478a5f255b22f6281f8da536fb5298cbd
diff --git a/x11-terms/mate-terminal/mate-terminal-1.8.0.ebuild b/x11-terms/mate-terminal/mate-terminal-1.8.0.ebuild
new file mode 100644
index 00000000000..308e891326c
--- /dev/null
+++ b/x11-terms/mate-terminal/mate-terminal-1.8.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GCONF_DEBUG="no"
+
+inherit gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="The MATE Terminal"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+
+RDEPEND="app-text/rarian:0
+ dev-libs/atk:0
+ >=dev-libs/glib-2.25:2
+ >=gnome-base/dconf-0.10:0
+ >=mate-base/mate-desktop-1.8:0
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-2.18:2
+ x11-libs/libICE:0
+ x11-libs/libSM:0
+ x11-libs/libX11:0
+ x11-libs/pango:0
+ >=x11-libs/vte-0.27.1:0"
+
+DEPEND="${RDEPEND}
+ >=app-text/scrollkeeper-dtd-1:1.0
+ app-text/yelp-tools:0
+ >=dev-util/intltool-0.40:*
+ sys-devel/gettext:*
+ virtual/pkgconfig:*"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
diff --git a/x11-terms/mate-terminal/mate-terminal-1.8.1.ebuild b/x11-terms/mate-terminal/mate-terminal-1.8.1.ebuild
new file mode 100644
index 00000000000..2268495b7f7
--- /dev/null
+++ b/x11-terms/mate-terminal/mate-terminal-1.8.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GCONF_DEBUG="no"
+
+inherit gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="The MATE Terminal"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="app-text/rarian:0
+ dev-libs/atk:0
+ >=dev-libs/glib-2.25:2
+ >=gnome-base/dconf-0.10:0
+ >=mate-base/mate-desktop-1.8:0
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-2.18:2
+ x11-libs/libICE:0
+ x11-libs/libSM:0
+ x11-libs/libX11:0
+ x11-libs/pango:0
+ >=x11-libs/vte-0.27.1:0"
+
+DEPEND="${RDEPEND}
+ >=app-text/scrollkeeper-dtd-1:1.0
+ app-text/yelp-tools:0
+ >=dev-util/intltool-0.40:*
+ sys-devel/gettext:*
+ virtual/pkgconfig:*"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
diff --git a/x11-terms/mate-terminal/metadata.xml b/x11-terms/mate-terminal/metadata.xml
new file mode 100644
index 00000000000..8cdad0d3875
--- /dev/null
+++ b/x11-terms/mate-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>
+ <herd>mate</herd>
+ <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 00000000000..7b2e8b135e7
--- /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 00000000000..3c171ef542d
--- /dev/null
+++ b/x11-terms/mlterm/Manifest
@@ -0,0 +1,3 @@
+DIST mlterm-3.0.11.tar.gz 4328395 SHA256 808f15756aa40ada65a9b5760d9d1e4f281b62bb915ab51f4dd44e21a43f1e55 SHA512 e624ed4be1dce7b827e22981648d5574e9ae0543dbf2ca0bd9d7ab9fe17860c160e2bd7ad4a36044018daface70533518de7b9feba80e26605dc14d9e4d26d72 WHIRLPOOL 173721847d75878e445b928773298b53d93aebac88f727095406cb2e6e1460088cec1a83e53e2bc87d1f85c7656794aadf3def62f9f1e3919e676f7a9ecfa6f8
+DIST mlterm-3.4.5.tar.gz 3659801 SHA256 7df146099e1d578caddaeb7e93459f96ca1e2381fcc51157a25fe00336072752 SHA512 a85d092680dfe5498a90a4ad4935d441e41efa4ce3aa26f2e8897ef254f9c20d053bb045b5709626ee5bb4c9fdecda9f311a26db7fac6d6369d50336af7ab1f5 WHIRLPOOL 4533009727ad30b94b9b2814a17464975986df7eb2a42b383e654b1233651455a1ff938fae5273af350ccce29cbe08c7e68d26237a511ab7e3fcc45d05665b58
+DIST mlterm-3.5.0.tar.gz 3707639 SHA256 dedb211c52a8cdaa8891920da0a4f08f4b72f7b3514a5acb038b38419b24e4d3 SHA512 aaeac36a23d8544428b511760a5a23a843509fb75ceec59fea6f012d1626ca99f2772b9b18155d6b527482de649304b7e01ee8b7caef211bf5a01d71718d5ca8 WHIRLPOOL 347286ddcdc4aa97f6ebaa55ddcc0d8930f8396491b2d999d504cea2041d61b9eea090b70921b6f35c4f3eef26093403fcdde6538b1fcdb21299aae348b906ad
diff --git a/x11-terms/mlterm/files/mlterm-2.9.4-uim15-fix.patch b/x11-terms/mlterm/files/mlterm-2.9.4-uim15-fix.patch
new file mode 100644
index 00000000000..e69a2c93206
--- /dev/null
+++ b/x11-terms/mlterm/files/mlterm-2.9.4-uim15-fix.patch
@@ -0,0 +1,10 @@
+--- a/inputmethod/uim/im_uim.c 2008-05-25 23:41:46.871924640 +0900
++++ b/inputmethod/uim/im_uim.c 2008-05-25 23:42:34.149923480 +0900
+@@ -35,6 +35,7 @@
+ #include <uim-helper.h>
+ #include <uim-im-switcher.h>
+
++#include <stdio.h>
+ #include <X11/keysym.h> /* XK_xxx */
+ #include <kiklib/kik_mem.h> /* malloc/alloca/free */
+ #include <kiklib/kik_str.h> /* kik_str_alloca_dup kik_str_sep kik_snprintf*/
diff --git a/x11-terms/mlterm/files/mlterm-3.0.5-ibus.patch b/x11-terms/mlterm/files/mlterm-3.0.5-ibus.patch
new file mode 100644
index 00000000000..22b78301379
--- /dev/null
+++ b/x11-terms/mlterm/files/mlterm-3.0.5-ibus.patch
@@ -0,0 +1,55 @@
+diff -Naur mlterm-3.0.5.orig/configure.in mlterm-3.0.5/configure.in
+--- mlterm-3.0.5.orig/configure.in 2011-06-04 01:26:40.000000000 +0900
++++ mlterm-3.0.5/configure.in 2011-06-09 10:45:00.653322007 +0900
+@@ -671,7 +671,8 @@
+ if test "x$ibus" = "xyes" ; then
+ AC_PROG_CXX
+ PKG_CHECK_MODULES(IBUS, ibus-1.0 >= 1.3.0, has_ibus=yes, has_ibus=no)
+- if test "x$has_ibus" = xyes ; then
++ PKG_CHECK_MODULES(DBUS, dbus-1, has_dbus=yes, has_dbus=no)
++ if test "x$has_ibus" = xyes -a "x$has_dbus" = xyes ; then
+ IM_CFLAGS="$IM_CFLAGS -DUSE_IBUS"
+ MAKE_DIRS="inputmethod/ibus ${MAKE_DIRS}"
+ OUTPUT_FILES="inputmethod/ibus/Makefile ${OUTPUT_FILES}"
+@@ -683,6 +684,8 @@
+ fi
+ AC_SUBST(IBUS_CFLAGS)
+ AC_SUBST(IBUS_LIBS)
++AC_SUBST(DBUS_CFLAGS)
++AC_SUBST(DBUS_LIBS)
+
+ #
+ # --- SCIM ---
+diff -Naur mlterm-3.0.5.orig/inputmethod/ibus/Makefile.in mlterm-3.0.5/inputmethod/ibus/Makefile.in
+--- mlterm-3.0.5.orig/inputmethod/ibus/Makefile.in 2011-06-04 01:26:34.000000000 +0900
++++ mlterm-3.0.5/inputmethod/ibus/Makefile.in 2011-06-09 10:45:31.063416229 +0900
+@@ -19,11 +19,12 @@
+ @CPPFLAGS@ \
+ @IM_CFLAGS@ \
+ @IBUS_CFLAGS@ \
++ @DBUS_CFLAGS@ \
+ -I$(top_srcdir)/mlterm \
+ -I${top_srcdir}/xwindow \
+ -I/usr/local/include
+
+-LIBS = $(LIBS_LOCAL) @KIK_LIBS_FOR_MODULE@ @IBUS_LIBS@
++LIBS = $(LIBS_LOCAL) @KIK_LIBS_FOR_MODULE@ @IBUS_LIBS@ @DBUS_LIBS@
+
+ CC = @CC@
+ INSTALL = @INSTALL@
+diff -Naur mlterm-3.0.5.orig/inputmethod/ibus/im_ibus.c mlterm-3.0.5/inputmethod/ibus/im_ibus.c
+--- mlterm-3.0.5.orig/inputmethod/ibus/im_ibus.c 2011-06-04 01:26:34.000000000 +0900
++++ mlterm-3.0.5/inputmethod/ibus/im_ibus.c 2011-06-09 10:39:58.560385917 +0900
+@@ -4,11 +4,11 @@
+
+ #include <stdio.h>
+ #include <ibus.h>
++#include <dbus/dbus.h>
+ #include <x_im.h>
+ #include <kiklib/kik_list.h>
+ #include <kiklib/kik_debug.h>
+ #include "../im_info.h"
+-
+ #if 0
+ #define IM_IBUS_DEBUG 1
+ #endif
diff --git a/x11-terms/mlterm/files/mlterm-3.0.7-underlinking.patch b/x11-terms/mlterm/files/mlterm-3.0.7-underlinking.patch
new file mode 100644
index 00000000000..4e5ed669037
--- /dev/null
+++ b/x11-terms/mlterm/files/mlterm-3.0.7-underlinking.patch
@@ -0,0 +1,13 @@
+diff --git a/xwindow/Makefile.in b/xwindow/Makefile.in
+index 50137e0..1e83104 100644
+--- a/xwindow/Makefile.in
++++ b/xwindow/Makefile.in
+@@ -32,7 +32,7 @@ OBJ = $(OBJ1) $(OBJ2@WIN32TAG@)
+
+ LKIK = @LKIK@
+ LMKF = @LMKF@
+-LMLTERM = ../mlterm/libmlterm.a ../mlterm/@LMLTERM_CORE@
++LMLTERM = ../mlterm/libmlterm.a ../mlterm/@LMLTERM_CORE@ -lm
+ LKIK_DEB = -lkik_deb
+ LMKF_DEB = -lmkf_deb
+
diff --git a/x11-terms/mlterm/metadata.xml b/x11-terms/mlterm/metadata.xml
new file mode 100644
index 00000000000..1ca794ab6c6
--- /dev/null
+++ b/x11-terms/mlterm/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>cjk</herd>
+ <use>
+ <flag name="fcitx">Enable <pkg>app-i18n/fcitx</pkg> support</flag>
+ <flag name="ibus">Enable <pkg>app-i18n/ibus</pkg> support</flag>
+ <flag name="libssh2">Enable <pkg>net-libs/libssh2</pkg> support</flag>
+ <flag name="regis">Enable ReGIS support</flag>
+ <flag name="scim">Enable <pkg>app-i18n/scim</pkg> support</flag>
+ <flag name="uim">Enable <pkg>app-i18n/uim</pkg> support</flag>
+ <flag name="utempter">Enable <pkg>sys-libs/libutempter</pkg> support</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">mlterm</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-terms/mlterm/mlterm-3.0.11-r1.ebuild b/x11-terms/mlterm/mlterm-3.0.11-r1.ebuild
new file mode 100644
index 00000000000..d4e9eb62fd2
--- /dev/null
+++ b/x11-terms/mlterm/mlterm-3.0.11-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+inherit autotools eutils
+
+IUSE="bidi debug gtk ibus libssh2 m17n-lib nls scim static-libs uim xft"
+
+DESCRIPTION="A multi-lingual terminal emulator"
+HOMEPAGE="http://mlterm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mlterm/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="amd64 hppa ppc ppc64 x86"
+LICENSE="BSD"
+
+RDEPEND="|| ( sys-libs/libutempter sys-apps/utempter )
+ x11-libs/libX11
+ x11-libs/libICE
+ x11-libs/libSM
+ gtk? ( x11-libs/gtk+:2 )
+ xft? ( x11-libs/libXft )
+ bidi? ( >=dev-libs/fribidi-0.10.4 )
+ ibus? ( >=app-i18n/ibus-1.3 )
+ libssh2? ( net-libs/libssh2 )
+ nls? ( virtual/libintl )
+ uim? ( >=app-i18n/uim-1.0 )
+ scim? ( >=app-i18n/scim-1.4 )
+ m17n-lib? ( >=dev-libs/m17n-lib-1.2.0 )"
+# vte? ( x11-libs/vte )
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-2.9.4-uim15-fix.patch \
+ "${FILESDIR}"/${PN}-3.0.5-ibus.patch \
+ "${FILESDIR}"/${PN}-3.0.7-underlinking.patch
+
+ eautoconf
+}
+
+src_configure() {
+ local myconf
+
+ if use gtk ; then
+ myconf="${myconf} --with-imagelib=gdk-pixbuf"
+ else
+ myconf="${myconf} --with-tools=mlclient,mlcc"
+ fi
+
+ if use xft ; then
+ myconf="${myconf} --with-type-engines=xft"
+ else
+ myconf="${myconf} --with-type-engines=xcore"
+ fi
+
+ # iiimf isn't stable enough
+ #myconf="${myconf} $(use_enable iiimf)"
+
+ econf --enable-utmp \
+ $(use_enable bidi fribidi) \
+ $(use_enable debug) \
+ $(use_enable ibus) \
+ $(use_enable libssh2 ssh2) \
+ $(use_enable nls) \
+ $(use_enable uim) \
+ $(use_enable scim) \
+ $(use_enable m17n-lib m17nlib) \
+ $(use_enable static-libs static) \
+ ${myconf} || die "econf failed"
+}
+
+src_install () {
+ emake DESTDIR="${D}" install || die
+
+ if ! use static-libs ; then
+ find "${ED}" -name '*.la' -delete || die
+ fi
+
+ doicon contrib/icon/mlterm* || die
+ make_desktop_entry mlterm mlterm mlterm-icon "System;TerminalEmulator" || die
+
+ dodoc ChangeLog README || die
+
+ docinto ja
+ dodoc doc/ja/* || die
+ docinto en
+ dodoc doc/en/* || die
+}
diff --git a/x11-terms/mlterm/mlterm-3.4.5.ebuild b/x11-terms/mlterm/mlterm-3.4.5.ebuild
new file mode 100644
index 00000000000..76864ca4213
--- /dev/null
+++ b/x11-terms/mlterm/mlterm-3.4.5.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools-utils eutils
+
+DESCRIPTION="A multi-lingual terminal emulator"
+HOMEPAGE="http://mlterm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mlterm/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc ppc64 x86"
+IUSE="bidi cairo debug fcitx gtk ibus libssh2 m17n-lib nls regis scim static-libs uim utempter xft"
+
+RDEPEND="x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ bidi? ( dev-libs/fribidi )
+ cairo? ( x11-libs/cairo )
+ fcitx? ( app-i18n/fcitx )
+ gtk? ( x11-libs/gtk+ )
+ 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 )
+ uim? ( app-i18n/uim )
+ utempter? ( sys-libs/libutempter )
+ xft? ( x11-libs/libXft )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )"
+
+DOCS=( ChangeLog README doc/{en,ja} )
+
+AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
+
+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
+
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=(
+ --with-type-engines=xcore$(usex xft ",xft" "")$(usex cairo ",cairo" "")
+ --enable-optimize-redrawing
+ --enable-vt52
+ $(use_enable bidi fribidi)
+ $(use_enable debug)
+ $(use_enable fcitx)
+ $(use_enable ibus)
+ $(use_enable libssh2 ssh2)
+ $(use_enable m17n-lib m17nlib)
+ $(use_enable nls)
+ $(use_enable scim)
+ $(use_enable uim)
+ $(use_enable utempter utmp)
+ )
+
+ local scrollbars="sample,extra"
+ local tools="mlclient,mlcc,mlmenu,mlterm-zoom"
+ if use gtk; then
+ myeconfargs+=(--with-imagelib=gdk-pixbuf)
+ if has_version x11-libs/gtk+:3; then
+ myeconfargs+=(--with-gtk=3.0)
+ else
+ myeconfargs+=(--with-gtk=2.0)
+ fi
+ scrollbars+=",pixmap_engine"
+ tools+=",mlconfig,mlimgloader"
+ fi
+ if use regis; then
+ tools+=",registobmp"
+ fi
+ myeconfargs+=(--with-scrollbars="${scrollbars}")
+ myeconfargs+=(--with-tools="${tools}")
+
+ addpredict /dev/ptmx
+ autotools-utils_src_configure
+}
+
+src_test() {
+ :
+}
+
+src_install () {
+ autotools-utils_src_install
+ 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.5.0.ebuild b/x11-terms/mlterm/mlterm-3.5.0.ebuild
new file mode 100644
index 00000000000..47ab396430b
--- /dev/null
+++ b/x11-terms/mlterm/mlterm-3.5.0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools-utils eutils
+
+DESCRIPTION="A multi-lingual terminal emulator"
+HOMEPAGE="http://mlterm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mlterm/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="bidi cairo canna debug fcitx freewnn gtk ibus libssh2 m17n-lib nls regis scim static-libs uim utempter xft"
+
+RDEPEND="x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ bidi? ( dev-libs/fribidi )
+ cairo? ( x11-libs/cairo )
+ canna? ( app-i18n/canna )
+ fcitx? ( app-i18n/fcitx )
+ freewnn? ( app-i18n/freewnn )
+ gtk? ( >=x11-libs/gtk+-2 )
+ 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 )
+ uim? ( app-i18n/uim )
+ utempter? ( sys-libs/libutempter )
+ xft? ( x11-libs/libXft )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )"
+
+DOCS=( ChangeLog README doc/{en,ja} )
+
+AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
+
+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
+
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=(
+ --with-type-engines=xcore$(usex xft ",xft" "")$(usex cairo ",cairo" "")
+ --enable-optimize-redrawing
+ --enable-vt52
+ $(use_enable bidi fribidi)
+ $(use_enable canna)
+ $(use_enable debug)
+ $(use_enable fcitx)
+ $(use_enable freewnn wnn)
+ $(use_enable ibus)
+ $(use_enable libssh2 ssh2)
+ $(use_enable m17n-lib m17nlib)
+ $(use_enable nls)
+ $(use_enable scim)
+ $(use_enable uim)
+ $(use_enable utempter utmp)
+ )
+
+ local scrollbars="sample,extra"
+ local tools="mlclient,mlcc,mlmenu,mlterm-zoom"
+ if use gtk; then
+ myeconfargs+=(--with-imagelib=gdk-pixbuf)
+ if has_version x11-libs/gtk+:3; then
+ myeconfargs+=(--with-gtk=3.0)
+ else
+ myeconfargs+=(--with-gtk=2.0)
+ fi
+ scrollbars+=",pixmap_engine"
+ tools+=",mlconfig,mlimgloader"
+ fi
+ if use regis; then
+ tools+=",registobmp"
+ fi
+ myeconfargs+=(--with-scrollbars="${scrollbars}")
+ myeconfargs+=(--with-tools="${tools}")
+
+ addpredict /dev/ptmx
+ autotools-utils_src_configure
+}
+
+src_test() {
+ :
+}
+
+src_install () {
+ autotools-utils_src_install
+ docinto contrib/icon
+ dodoc contrib/icon/README
+
+ doicon contrib/icon/mlterm*
+ make_desktop_entry mlterm mlterm mlterm-icon "System;TerminalEmulator"
+}
+
+pkg_postinst() {
+ elog "The 'use_scrollbar' option was renamed to 'use_mdi'."
+}
diff --git a/x11-terms/mrxvt/Manifest b/x11-terms/mrxvt/Manifest
new file mode 100644
index 00000000000..28e88e2c592
--- /dev/null
+++ b/x11-terms/mrxvt/Manifest
@@ -0,0 +1 @@
+DIST mrxvt-0.5.4.tar.gz 603978 SHA256 f403ad5a908fcd38a55ed0a7e1b85584cb77be8781199653a39b8af1a9ad10d7 SHA512 572bb4dda9f9b9dcb597f3185922646523bce34003f536acca82992f68f8f7c1a5f2778d626f805ea2cd061e8451fbbf12010e5d655221f76b83440825c80992 WHIRLPOOL 770acc0b03e13e113bfe01f56e9ec58ddba6ae2ee989236836f4dd557dfa89334af8404e3fb5a08e1ffea989852f89871004eb6bd46a2d0b2b9830aaf1dc0455
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 00000000000..a52a10269bc
--- /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 00000000000..a475b70685d
--- /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 00000000000..295329dc87f
--- /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>
+ <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 00000000000..f40c0ffbad3
--- /dev/null
+++ b/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 00000000000..9b3dee66ad4
--- /dev/null
+++ b/x11-terms/multi-aterm/Manifest
@@ -0,0 +1 @@
+DIST multi-aterm-0.2.1.tar.gz 237428 SHA256 de12604e29dabd0157ce061c785b482ad8c9721027ec31f60609dc9f647bd5fb SHA512 f5326314c97514609c84ae997c336afe6baa334d2295b4d4803e72411c07c377475a713473193a8d4260eca9008fbbc31c0ef93805e66024ea0814ab504c8d2a WHIRLPOOL 79a869ff5c431a4058f5be63ba4d0c014d7c4999f70d642362c315f17e7c12df35745e74d179f9033858297897ff1077bb8dc22e90a54713b703e1a2859518a1
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 00000000000..58be689bb96
--- /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 00000000000..93978548403
--- /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 00000000000..6aeadc47780
--- /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 00000000000..ff62877c67a
--- /dev/null
+++ b/x11-terms/multi-aterm/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</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 00000000000..5f44c80aa5a
--- /dev/null
+++ b/x11-terms/multi-aterm/multi-aterm-0.2.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Terminal emulator with transparency support as well as rxvt backwards compatibility with 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 00000000000..31275dfa102
--- /dev/null
+++ b/x11-terms/pangoterm/Manifest
@@ -0,0 +1 @@
+DIST pangoterm-0.0_pre20150323.tar.gz 22053 SHA256 8df2bebdd70a77698803d3dd12472b313e29aa5e6387a7b926e0988e0689cf00 SHA512 c8614d51459c68bb03a95e1a59a31d5c199c94001995f880f23a369b9aa6ee72a6769790a8c4592d8829eb52ea246ef051fd36fd729f35c4a80931fd9e42b916 WHIRLPOOL 30adcf8098f3ef03c57f47e7f01ae996572058fc8318e4e31ac2d88ab2d8054c9d5e279bc5721a98bb66a5620356f7dde1aaf7d1a0eeca14c53069eef1126140
diff --git a/x11-terms/pangoterm/metadata.xml b/x11-terms/pangoterm/metadata.xml
new file mode 100644
index 00000000000..aadcb625e42
--- /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>
+ <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 00000000000..2871e1324fe
--- /dev/null
+++ b/x11-terms/pangoterm/pangoterm-0.0_pre20150323.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://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/qterminal/Manifest b/x11-terms/qterminal/Manifest
new file mode 100644
index 00000000000..8c3715f4448
--- /dev/null
+++ b/x11-terms/qterminal/Manifest
@@ -0,0 +1,3 @@
+DIST qterminal-0.4.0.tar.xz 83256 SHA256 f939358e2a31aaeb656d59ca919bbdba2fa78c2b99e691b9cfcd8259e80a495e SHA512 ac858eaac34fc346e6498146307c98b95f133df5a435af01842427f06362c5afb8817197981a0d3aa79f25321117050c80305a978260127a23a252d3a98027eb WHIRLPOOL b78eb321567803cceb4579637ead93c3bfe2cf9148ecdc9565b0a34dbe791a77eac3f567366a1e5152b17181eb7447b734a81ad3cc4b7763c7ca94d0ced1c0ae
+DIST qterminal-0.5.0_p20140913.tar.xz 99988 SHA256 965ad96262d22fc88a465f60f5d0f66d650fa8380a906dc70d4eae06b874430a SHA512 8f3a360be2e173c06ab454f0c6e9ac71ecf305ad46c9ad16ff37b3174a160624266ac2c2bd5588a805bcb72aab2c9774ca159eba7e3d2db85a970350fc51da09 WHIRLPOOL a3c7011e75d93888b9de95ddd25bdada4511bd4bd0e02e8af3f1413715efaa7cd9e2d77f8739fd46c5484c2c3f930e8dedbb2ef7a80feff5f97e5ef31d2f03b1
+DIST qterminal-0.6.0.tar.xz 100660 SHA256 61121ad0d1d34a5129e1109b6689d7fb7b10130a32831eaf500a86909b29d9bc SHA512 e51b768dc9b467800c7439bf7b021e04d83073a236023632e76ba00551bffa70f3b96f2098c68092283287914ce9103c8dfae8af79c9c25e119528b3f102ab34 WHIRLPOOL 4d67cce15b1ced30916f123ad140f3b00237bd5f4535fe0fb9adbd31829cfdb3120b6788f29cb9545d23d892c6ce22970793c0afed2e5ed225ba8e9a2487a88d
diff --git a/x11-terms/qterminal/metadata.xml b/x11-terms/qterminal/metadata.xml
new file mode 100644
index 00000000000..1a44f652bb9
--- /dev/null
+++ b/x11-terms/qterminal/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>qt</herd>
+ <upstream>
+ <remote-id type="github">qterminal/qterminal</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-terms/qterminal/qterminal-0.4.0.ebuild b/x11-terms/qterminal/qterminal-0.4.0.ebuild
new file mode 100644
index 00000000000..ed57a5ec897
--- /dev/null
+++ b/x11-terms/qterminal/qterminal-0.4.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit cmake-utils
+
+DESCRIPTION="Qt4-based multitab terminal emulator"
+HOMEPAGE="https://github.com/qterminal/"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
+
+DEPEND="dev-qt/qtgui:4
+ x11-libs/qtermwidget"
+RDEPEND="${DEPEND}"
+
+#todo: translations
diff --git a/x11-terms/qterminal/qterminal-0.5.0_p20140913.ebuild b/x11-terms/qterminal/qterminal-0.5.0_p20140913.ebuild
new file mode 100644
index 00000000000..b0000202c4a
--- /dev/null
+++ b/x11-terms/qterminal/qterminal-0.5.0_p20140913.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="Qt4-based multitab terminal emulator"
+HOMEPAGE="https://github.com/qterminal/qterminal"
+SRC_URI="https://dev.gentoo.org/~kensington/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
+
+DEPEND="dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ x11-libs/libqxt
+ >=x11-libs/qtermwidget-0.4.0.37"
+RDEPEND="${DEPEND}"
diff --git a/x11-terms/qterminal/qterminal-0.6.0.ebuild b/x11-terms/qterminal/qterminal-0.6.0.ebuild
new file mode 100644
index 00000000000..b2354fb6c68
--- /dev/null
+++ b/x11-terms/qterminal/qterminal-0.6.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils
+
+DESCRIPTION="Qt-based multitab terminal emulator"
+HOMEPAGE="https://github.com/qterminal/qterminal"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug qt4 qt5"
+
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+DEPEND="
+ qt4? (
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ x11-libs/libqxt
+ ~x11-libs/qtermwidget-${PV}[qt4(+)]
+ )
+ qt5? (
+ dev-qt/linguist-tools:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ ~x11-libs/qtermwidget-${PV}[qt5(-)]
+ )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_use qt5)
+ $(cmake-utils_use_use qt4 SYSTEM_QXT)
+ )
+ cmake-utils_src_configure
+}
diff --git a/x11-terms/root-tail/Manifest b/x11-terms/root-tail/Manifest
new file mode 100644
index 00000000000..f4fdde8447e
--- /dev/null
+++ b/x11-terms/root-tail/Manifest
@@ -0,0 +1 @@
+DIST root-tail-1.2.tar.gz 20805 SHA256 08fb829cc0edd533aaf2af7bcf12d877a6ff51d60c59be48ba354c5940b80691
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 00000000000..750edf2fefa
--- /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 00000000000..91f4e72fb54
--- /dev/null
+++ b/x11-terms/root-tail/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+</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 00000000000..628cc3bf252
--- /dev/null
+++ b/x11-terms/root-tail/root-tail-1.2-r3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 00000000000..14d28d34961
--- /dev/null
+++ b/x11-terms/roxterm/Manifest
@@ -0,0 +1,3 @@
+DIST roxterm-2.6.3.tar.bz2 301226 SHA256 0c809acbf31f5200594c7c992239f5e1b87206d96ab8a61ef2ee8d81c2378e69 SHA512 9adbb64a1b5c2cfb861d657345dd7d84e804dc55de1ad58dc8a4d9bdf04617f88da4d7de6bfe679345a30d291b10b00a32df0220776fb430b30551e4e6d9a2f7 WHIRLPOOL 35dae640675b036ed3a0a616eba4e86dc65b16e2cca72876eab9fb43508364bb7df2f328486adeded852a6775853373b2f6a4e8dadf80f02245c27fc924ffda5
+DIST roxterm-2.6.5.tar.bz2 300892 SHA256 e8b2dd5ce320b763b66590ebef77c422ab90181bb1a84d30fea8c47da0d46cab SHA512 a614680e3c3139342552ef01274635409d9618e573c575dbcbf2f80e50922dce677fd7b7039c3e2af034eb1950933a1fddb189c65cfc89fcbaf15fbe677da71e WHIRLPOOL 6e473149e2d3341d9500e666cc4ac27549c813b66b1eb0a727d24ef182b6ca26466928f72c533b99e89a4ebc768f12a2def20ba31f9793016be78a9c2e5493bd
+DIST roxterm-2.9.3.tar.bz2 364120 SHA256 36131decfe79fa7d4c8fd325d4feaa843f348532a3871b173e6712fcde5cbda7 SHA512 3f197ebc532721a6132da96d3b4bf65032def43eba4d7b00ecb2c74223c43c0549a9605753e81992c2c4b4955adbbc041e8a31f22947752dc52a9edd46457d16 WHIRLPOOL 956b92892e43a88c3e6aa3894f67d23b8ceace0feb42cb808c3e81916e5f8e1f0c3354f8b6337fbfcd8e315503a17631a699c58d97c5b88fb1b3ae96c7b501c4
diff --git a/x11-terms/roxterm/metadata.xml b/x11-terms/roxterm/metadata.xml
new file mode 100644
index 00000000000..e1f135a3b2b
--- /dev/null
+++ b/x11-terms/roxterm/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>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">roxterm</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-terms/roxterm/roxterm-2.6.3.ebuild b/x11-terms/roxterm/roxterm-2.6.3.ebuild
new file mode 100644
index 00000000000..3ce0b3dee6a
--- /dev/null
+++ b/x11-terms/roxterm/roxterm-2.6.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit gnome2-utils python 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.98
+ >=dev-libs/glib-2.16
+ x11-libs/gtk+:3
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/vte:2.90"
+DEPEND="${RDEPEND}
+ dev-lang/python:2.7
+ dev-libs/libxslt
+ virtual/pkgconfig
+ dev-python/lockfile
+ || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+ nls? ( app-text/po4a sys-devel/gettext )"
+
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
+ python_convert_shebangs 2 mscript.py
+
+ # the "maitch" build system is complete junk. let's stab it...
+ sed -i -e 's:TerminalEmulator:System;&:' roxterm.desktop || die
+ sed -i -e '/ctx.install_doc/s:COPYING COPYING-LGPL ::' mscript.py || die
+ sed -i -e "/CFLAGS/s:-O2 -g:${CFLAGS}:" {maitch,mscript}.py || die
+ sed -i \
+ -e 's:gcc:${CC}:' \
+ -e "/LDFLAGS/s:'':'${LDFLAGS}':" \
+ -e 's:--mode=link:--mode=link --tag=CC:' \
+ maitch.py || die
+}
+
+src_configure() {
+ local myconf=( GCC="$(tc-getCC)" --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-2.6.5.ebuild b/x11-terms/roxterm/roxterm-2.6.5.ebuild
new file mode 100644
index 00000000000..849865b708e
--- /dev/null
+++ b/x11-terms/roxterm/roxterm-2.6.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit gnome2-utils python 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}
+ dev-lang/python:2.7
+ dev-libs/libxslt
+ dev-python/lockfile
+ virtual/pkgconfig
+ || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+ nls? ( app-text/po4a sys-devel/gettext )"
+
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
+ python_convert_shebangs 2 mscript.py
+}
+
+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-2.9.3-r1.ebuild b/x11-terms/roxterm/roxterm-2.9.3-r1.ebuild
new file mode 100644
index 00000000000..d472f1e18d8
--- /dev/null
+++ b/x11-terms/roxterm/roxterm-2.9.3-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~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
+ || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+ 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-2.9.3.ebuild b/x11-terms/roxterm/roxterm-2.9.3.ebuild
new file mode 100644
index 00000000000..1f02fd0d597
--- /dev/null
+++ b/x11-terms/roxterm/roxterm-2.9.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit gnome2-utils python 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 ~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}
+ dev-lang/python:2.7
+ dev-libs/libxslt
+ dev-python/lockfile
+ virtual/pkgconfig
+ || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+ nls? ( app-text/po4a sys-devel/gettext )"
+
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
+ python_convert_shebangs 2 mscript.py
+}
+
+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 00000000000..4eafb1e1127
--- /dev/null
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -0,0 +1 @@
+DIST rxvt-unicode-9.21.tar.bz2 925293 SHA256 75270ed72bc5895a64a1d7392bf45a622204192371c3965bd3dd978dc088956b SHA512 d50adf6b1e6ae3b13492b4f40455d3a56bb174a7c6db4d4525a1277736994adfb74a2cd1e7d3e8a8cfdc4509a9ae32c05a627829e295dc1bd4a5ba7cc2f80776 WHIRLPOOL 92499cfa0ca154d3cbe1d7b6525e01de6a5d14677a28c605a6b676c88f1d9bc0f6cd663a1f1d8b003ac7cc46a9c6fbe49ff9adc7b3dd63eb345c80de9038a6ad
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 00000000000..0e8d256f921
--- /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 00000000000..49fa01adc34
--- /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
+
+--- Makefile.in
++++ 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 00000000000..2c803335d64
--- /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 00000000000..3408d73731c
--- /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 00000000000..cad5a793d37
--- /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 00000000000..050907cea43
--- /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 00000000000..3a4d4a40981
--- /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 00000000000..1d71e96c86d
--- /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 00000000000..fec1922ffcd
--- /dev/null
+++ b/x11-terms/rxvt-unicode/metadata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>jer@gentoo.org</email>
+<name>Jeroen Roovers</name>
+</maintainer>
+<maintainer>
+<email>wired@gentoo.org</email>
+<name>Alex Alexander</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 00000000000..86ab6691e94
--- /dev/null
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.21.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/Manifest b/x11-terms/rxvt/Manifest
new file mode 100644
index 00000000000..485430a7b3a
--- /dev/null
+++ b/x11-terms/rxvt/Manifest
@@ -0,0 +1,2 @@
+DIST rxvt-2.7.10-xim-fix.patch.gz 602 SHA256 09ba6a98927e0f60defc399acc0b0d4debfb95d69035d99c1aa779315c2573e9 SHA512 d2d65136c7ba630157eeab8234a1d7281f0cbb77817bb86974e91cdf154a815a637d314ae8f9e5d27c8a09a3d90e6be1a28d961e0e8e4b78bf6508da4a7e32ed WHIRLPOOL c584957a76ba9b6daaffbc33f92f6815a80c51f2da2faeb3e8ef5d5615b9a8d68bb3e439483c9ebc2e7eed68f69df2e3d2f4f31fef0ed0254aba971811aba09b
+DIST rxvt-2.7.10.tar.gz 595073 SHA256 616ad56502820264e6933d07bc4eb752aa6940ec14add6e780ffccf15f38d449 SHA512 cff86c2f94c533d906b412a949fe754726a0c67d87534b8f9794080898aa20744ee5de6f9109e9de1db14291cb6de7c1c4c1944ec9192e4ea42b0a3fe598b2a1 WHIRLPOOL 5c54110bd8ab79e3d8c23c447f5fce9631a9cd2492f816a1732eb8c2aab09eb1b31f61a0a6f0cfe3a456953fc4a3819b630a513cbd4b3b9f3fa4f95d526818fb
diff --git a/x11-terms/rxvt/files/rxvt-2.7.10-CVE-2008-1142-DISPLAY.patch b/x11-terms/rxvt/files/rxvt-2.7.10-CVE-2008-1142-DISPLAY.patch
new file mode 100644
index 00000000000..e817f8d0e31
--- /dev/null
+++ b/x11-terms/rxvt/files/rxvt-2.7.10-CVE-2008-1142-DISPLAY.patch
@@ -0,0 +1,52 @@
+# CVE-2008-1142 (rxvt 2.6.4 opens an xterm on :0 if the DISPLAY environment variable is not set, which might allow local users to hijack X11 connections.)
+# Based on http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=41;filename=diff;att=1;bug=469296
+# bug 217819
+
+diff -Naur rxvt-2.7.10.orig/rclock/rclock.c rxvt-2.7.10/rclock/rclock.c
+--- rxvt-2.7.10.orig/rclock/rclock.c 2008-05-03 14:23:07.264082222 +0200
++++ rxvt-2.7.10/rclock/rclock.c 2008-05-03 14:24:55.433082735 +0200
+@@ -324,9 +324,6 @@
+ CheckMaildir();
+ #endif
+
+- if ((display_name = getenv ("DISPLAY")) == NULL)
+- display_name = ":0";
+-
+ /* parse the command line */
+ for (i = 1; i < argc; i += 2)
+ {
+@@ -424,7 +421,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");
+ goto Abort;
+ }
+
+diff -Naur rxvt-2.7.10.orig/src/init.c rxvt-2.7.10/src/init.c
+--- rxvt-2.7.10.orig/src/init.c 2008-05-03 14:23:07.247082766 +0200
++++ rxvt-2.7.10/src/init.c 2008-05-03 14:43:44.705227631 +0200
+@@ -532,8 +532,7 @@
+ /*
+ * Open display, get options/resources and create the window
+ */
+- if ((rs[Rs_display_name] = getenv("DISPLAY")) == NULL)
+- rs[Rs_display_name] = ":0";
++ rs[Rs_display_name] = getenv("DISPLAY");
+
+ rxvt_get_options(r, r_argc, r_argv);
+ free(r_argv);
+@@ -550,7 +549,9 @@
+
+ if (r->Xdisplay == NULL
+ && (r->Xdisplay = XOpenDisplay(rs[Rs_display_name])) == NULL) {
+- rxvt_print_error("can't open display %s", rs[Rs_display_name]);
++ rxvt_print_error("can't open display %s",
++ rs[Rs_display_name]?rs[Rs_display_name]:
++ "as no -display option given and DISPLAY not set");
+ exit(EXIT_FAILURE);
+ }
+
diff --git a/x11-terms/rxvt/files/rxvt-2.7.10-asneeded.patch b/x11-terms/rxvt/files/rxvt-2.7.10-asneeded.patch
new file mode 100644
index 00000000000..e1a48cde8af
--- /dev/null
+++ b/x11-terms/rxvt/files/rxvt-2.7.10-asneeded.patch
@@ -0,0 +1,13 @@
+Index: rxvt-2.7.10/src/Makefile.in
+===================================================================
+--- rxvt-2.7.10.orig/src/Makefile.in
++++ rxvt-2.7.10/src/Makefile.in
+@@ -103,7 +103,7 @@ rxvt: version.h rxvt.o librxvt.la
+ date >.protos
+
+ librxvt.la: $(LIBOBJS)
+- $(LIBTOOL) --mode=link $(LINK) -rpath $(libdir) -version-info $(LIBVERSION) $(LIBOBJS) $(LIBS) -o $@
++ $(LIBTOOL) --mode=link $(LINK) -rpath $(libdir) -version-info $(LIBVERSION) $(LIBOBJS) $(LIBS) $(XLIB) -o $@
+ #-------------------------------------------------------------------------
+ tags: $(SRCS) $(HDRS) $(EXTRAHDRS)
+ ctags $(SRCS) $(HDRS) $(EXTRAHDRS)
diff --git a/x11-terms/rxvt/files/rxvt-2.7.10-azz4.diff b/x11-terms/rxvt/files/rxvt-2.7.10-azz4.diff
new file mode 100644
index 00000000000..4baf507685b
--- /dev/null
+++ b/x11-terms/rxvt/files/rxvt-2.7.10-azz4.diff
@@ -0,0 +1,126 @@
+diff -Naurp rxvt-2.7.10.orig/AZZ-ChangeLog rxvt-2.7.10/AZZ-ChangeLog
+--- rxvt-2.7.10.orig/AZZ-ChangeLog 1969-12-31 19:00:00.000000000 -0500
++++ rxvt-2.7.10/AZZ-ChangeLog 2003-03-31 14:11:43.000000000 -0500
+@@ -0,0 +1,7 @@
++- Modified to support borderlessness with -nb and override-redirect with
++ -or (or resources borderless and overrideRedirect).
++- Modified to allow an arbitrary command to be run instead of the bell
++ with -bc.
++- Fixed buffer overflow in command.c (not that you should install this suid
++ root anyway)
++
+diff -Naurp rxvt-2.7.10.orig/src/command.c rxvt-2.7.10/src/command.c
+--- rxvt-2.7.10.orig/src/command.c 2003-03-26 01:01:23.000000000 -0500
++++ rxvt-2.7.10/src/command.c 2003-03-31 14:11:43.000000000 -0500
+@@ -3098,7 +3098,7 @@ rxvt_tt_printf(rxvt_t *r, const char *fm
+ unsigned char buf[256];
+
+ va_start(arg_ptr, fmt);
+- vsprintf((char *)buf, fmt, arg_ptr);
++ vsnprintf((char *)buf, sizeof buf, fmt, arg_ptr);
+ va_end(arg_ptr);
+ rxvt_tt_write(r, buf, (unsigned int)STRLEN(buf));
+ }
+diff -Naurp rxvt-2.7.10.orig/src/init.c rxvt-2.7.10/src/init.c
+--- rxvt-2.7.10.orig/src/init.c 2002-12-04 00:21:39.000000000 -0500
++++ rxvt-2.7.10/src/init.c 2003-03-31 14:11:43.000000000 -0500
+@@ -34,6 +34,7 @@
+ #include "../config.h" /* NECESSARY */
+ #include "rxvt.h" /* NECESSARY */
+ #include "init.h"
++#include <Xm/MwmUtil.h>
+
+ #include <signal.h>
+
+@@ -1126,6 +1127,24 @@ rxvt_Create_Windows(rxvt_t *r, int argc,
+ r->PixColors[Color_border],
+ r->PixColors[Color_fg]);
+ #endif
++ if (r->Options & Opt_borderless) {
++ Atom mwmatom;
++ MotifWmHints hints;
++
++ mwmatom = XInternAtom(r->Xdisplay, _XA_MOTIF_WM_HINTS, FALSE);
++ hints.flags = MWM_HINTS_DECORATIONS;
++ hints.decorations = 0;
++ XChangeProperty(r->Xdisplay, r->TermWin.parent[0], mwmatom, mwmatom,
++ 32, PropModeReplace, (unsigned char *)&hints,
++ sizeof(MotifWmHints)/sizeof(long));
++ }
++ if (r->Options & Opt_overrideredirect) {
++ XSetWindowAttributes attrib;
++
++ attrib.override_redirect = True;
++ XChangeWindowAttributes(r->Xdisplay, r->TermWin.parent[0],
++ CWOverrideRedirect, &attrib);
++ }
+ rxvt_xterm_seq(r, XTerm_title, r->h->rs[Rs_title], CHAR_ST);
+ rxvt_xterm_seq(r, XTerm_iconName, r->h->rs[Rs_iconName], CHAR_ST);
+
+diff -Naurp rxvt-2.7.10.orig/src/rxvt.h rxvt-2.7.10/src/rxvt.h
+--- rxvt-2.7.10.orig/src/rxvt.h 2003-03-06 20:17:18.000000000 -0500
++++ rxvt-2.7.10/src/rxvt.h 2003-03-31 14:11:43.000000000 -0500
+@@ -581,6 +581,9 @@ enum {
+ Rs_modifier,
+ Rs_answerbackstring,
+ Rs_tripleclickwords,
++ Rs_borderless,
++ Rs_overrideRedirect,
++ Rs_bellCommand,
+ NUM_RESOURCES
+ } ;
+
+diff -Naurp rxvt-2.7.10.orig/src/rxvtlib.h.in rxvt-2.7.10/src/rxvtlib.h.in
+--- rxvt-2.7.10.orig/src/rxvtlib.h.in 2003-02-27 20:03:16.000000000 -0500
++++ rxvt-2.7.10/src/rxvtlib.h.in 2003-03-31 14:12:59.000000000 -0500
+@@ -218,6 +218,8 @@ typedef enum {
+ #define Opt_scrollWithBuffer (1LU<<17)
+ #define Opt_jumpScroll (1LU<<18)
+ #define Opt_mouseWheelScrollPage (1LU<<19)
++#define Opt_borderless (1LU<<20)
++#define Opt_overrideredirect (1LU<<21)
+ /* place holder used for parsing command-line options */
+ #define Opt_Reverse (1LU<<30)
+ #define Opt_Boolean (1LU<<31)
+diff -Naurp rxvt-2.7.10.orig/src/screen.c rxvt-2.7.10/src/screen.c
+--- rxvt-2.7.10.orig/src/screen.c 2003-03-23 11:56:06.000000000 -0500
++++ rxvt-2.7.10/src/screen.c 2003-03-31 14:11:43.000000000 -0500
+@@ -29,6 +29,7 @@
+ #include "screen.intpro" /* PROTOS for internal routines */
+
+ #include <X11/Xmd.h> /* get the typedef for CARD32 */
++#include <stdlib.h>
+
+ /* ------------------------------------------------------------------------- */
+ #ifdef MULTICHAR_SET
+@@ -1832,6 +1833,9 @@ rxvt_scr_changeview(rxvt_t *r, u_int16_t
+ void
+ rxvt_scr_bell(rxvt_t *r)
+ {
++ if (r->h->rs[Rs_bellCommand]) {
++ system(r->h->rs[Rs_bellCommand]);
++ } else {
+ #ifndef NO_BELL
+ # ifndef NO_MAPALERT
+ # ifdef MAPALERT_OPTION
+@@ -1845,6 +1849,7 @@ rxvt_scr_bell(rxvt_t *r)
+ } else
+ XBell(r->Xdisplay, 0);
+ #endif
++ }
+ }
+
+ /* ------------------------------------------------------------------------- */
+diff -Naurp rxvt-2.7.10.orig/src/xdefaults.c rxvt-2.7.10/src/xdefaults.c
+--- rxvt-2.7.10.orig/src/xdefaults.c 2003-02-27 20:03:18.000000000 -0500
++++ rxvt-2.7.10/src/xdefaults.c 2003-03-31 14:11:43.000000000 -0500
+@@ -108,6 +108,9 @@ static const struct {
+ "scroll-on-tty-output inhibit"),
+ BOOL(Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress,
+ "scroll-on-keypress"),
++ BOOL(Rs_borderless, "borderless", "nb", Opt_borderless, "use MWM hints to remove the window border"),
++ BOOL(Rs_overrideRedirect, "overrideRedirect", "or", Opt_overrideredirect, "set the override_redirect flag"),
++ STRG(Rs_bellCommand, "bellCommand", "bc", "string", "command to execute instead of beeping"),
+ BOOL(Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer,
+ "scroll-with-buffer"),
+ #ifdef TRANSPARENT
diff --git a/x11-terms/rxvt/files/rxvt-2.7.10-line-scroll.patch b/x11-terms/rxvt/files/rxvt-2.7.10-line-scroll.patch
new file mode 100644
index 00000000000..cabb21cbef2
--- /dev/null
+++ b/x11-terms/rxvt/files/rxvt-2.7.10-line-scroll.patch
@@ -0,0 +1,13 @@
+--- src/feature.h.orig 2005-06-29 11:58:06.000000000 -0400
++++ src/feature.h 2005-06-29 11:58:41.000000000 -0400
+@@ -211,8 +211,8 @@
+ * SCROLL_ON_* defines above.).
+ * Also for modifier+Home/End keys to move to top/bottom
+ */
+-/* #define SCROLL_ON_UPDOWN_KEYS */
+-/* #define SCROLL_ON_HOMEEND_KEYS */
++#define SCROLL_ON_UPDOWN_KEYS
++#define SCROLL_ON_HOMEEND_KEYS
+
+ /*
+ * Allow unshifted Next/Prior keys to scroll forward/back
diff --git a/x11-terms/rxvt/files/rxvt-2.7.10-rk.patch b/x11-terms/rxvt/files/rxvt-2.7.10-rk.patch
new file mode 100644
index 00000000000..471c7a26b73
--- /dev/null
+++ b/x11-terms/rxvt/files/rxvt-2.7.10-rk.patch
@@ -0,0 +1,82 @@
+diff -urN rxvt-2.7.10.ORIG/src/screen.c rxvt-2.7.10/src/screen.c
+--- rxvt-2.7.10.ORIG/src/screen.c 2003-03-24 01:56:06.000000000 +0900
++++ rxvt-2.7.10/src/screen.c 2003-06-30 02:11:27.000000000 +0900
+@@ -828,10 +828,18 @@
+ if (h->chstat == WBYTE) {
+ h->rstyle |= RS_multi2; /* multibyte 2nd byte */
+ h->chstat = SBYTE;
+- if ((r->encoding_method == EUCJ) || (r->encoding_method == GB))
++ if ((r->encoding_method == EUCJ) && ((char)stp[r->screen.cur.col - 1] == (char)0x8e))
++ h->rstyle &= ~RS_multiMask, r->screen.cur.col--;
++ else if ((r->encoding_method == EUCJ) || (r->encoding_method == GB))
+ c |= 0x80; /* maybe overkill, but makes it selectable */
+ } else if (h->chstat == SBYTE) {
+- if (h->multi_byte || (c & 0x80)) { /* multibyte 1st byte */
++ if (r->encoding_method == SJIS) {
++ if ((h->multi_byte || ((c >= (char)0x81 && c <= (char)0x9f) ||
++(c >= (char)0xe0 && c <= (char)0xfc)))) {
++ h->rstyle |= RS_multi1;
++ h->chstat = WBYTE;
++ }
++ } else if (h->multi_byte || (c & 0x80)) { /* multibyte 1st byte */
+ h->rstyle |= RS_multi1;
+ h->chstat = WBYTE;
+ if ((r->encoding_method == EUCJ)
+@@ -2932,6 +2940,9 @@
+ unsigned char *new_selection_text;
+ char *str;
+ text_t *t;
++#ifdef MULTICHAR_SET
++ rend_t *tr;
++#endif
+
+ D_SELECT((stderr, "rxvt_selection_make(): r->selection.op=%d, r->selection.clicks=%d", r->selection.op, r->selection.clicks));
+ switch (r->selection.op) {
+@@ -2966,10 +2977,22 @@
+ */
+ for (; row < end_row; row++, col = 0) {
+ t = &(r->screen.text[row][col]);
++#ifdef MULTICHAR_SET
++ tr = &(r->screen.rend[row][col]);
++#endif
+ if ((end_col = r->screen.tlen[row]) == -1)
+ end_col = r->TermWin.ncol;
++#ifdef MULTICHAR_SET
++ for (; col < end_col; col++, str++, t++, tr++) {
++ if ( (r->encoding_method == EUCJ)
++ && (*t & 0x80) && !(*tr & RS_multiMask) )
++ *str++ = 0x8E;
++ *str = *t;
++ }
++#else
+ for (; col < end_col; col++)
+ *str++ = *t++;
++#endif
+ if (r->screen.tlen[row] != -1)
+ *str++ = '\n';
+ }
+@@ -2977,12 +3000,24 @@
+ * B: end row
+ */
+ t = &(r->screen.text[row][col]);
++#ifdef MULTICHAR_SET
++ tr = &(r->screen.rend[row][col]);
++#endif
+ end_col = r->screen.tlen[row];
+ if (end_col == -1 || r->selection.end.col <= end_col)
+ end_col = r->selection.end.col;
+ MIN_IT(end_col, r->TermWin.ncol); /* CHANGE */
++#ifdef MULTICHAR_SET
++ for (; col < end_col; col++, str++, t++, tr++) {
++ if ( (r->encoding_method == EUCJ)
++ && (*t & 0x80) && !(*tr & RS_multiMask) )
++ *str++ = 0x8E;
++ *str = *t;
++ }
++#else
+ for (; col < end_col; col++)
+ *str++ = *t++;
++#endif
+ #ifndef NO_OLD_SELECTION
+ if (r->selection_style == OLD_SELECT)
+ if (end_col == r->TermWin.ncol)
diff --git a/x11-terms/rxvt/metadata.xml b/x11-terms/rxvt/metadata.xml
new file mode 100644
index 00000000000..0d1ab3f4367
--- /dev/null
+++ b/x11-terms/rxvt/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+ <longdescription lang="en">
+ rxvt is a color vt102 terminal emulator intended as an xterm(1)
+ replacement for users who do not require features such as Tektronix
+ 4014 emulation and toolkit-style configurability. As a result, rxvt
+ uses much less swap space.
+ </longdescription>
+ <use>
+ <flag name="linuxkeys">Define LINUX_KEYS (changes Home/End key)</flag>
+ <flag name="xgetdefault">Enable resources via X instead of rxvt small
+ version</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">rxvt</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-terms/rxvt/rxvt-2.7.10-r4.ebuild b/x11-terms/rxvt/rxvt-2.7.10-r4.ebuild
new file mode 100644
index 00000000000..4204dba86dd
--- /dev/null
+++ b/x11-terms/rxvt/rxvt-2.7.10-r4.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic libtool toolchain-funcs
+
+DESCRIPTION="A nice small x11 terminal"
+HOMEPAGE="http://rxvt.sourceforge.net/
+ http://www.giga.it.okayama-u.ac.jp/~ishihara/opensource/"
+SRC_URI="mirror://sourceforge/rxvt/${P}.tar.gz
+ http://www.giga.it.okayama-u.ac.jp/~ishihara/opensource/${P}-xim-fix.patch.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
+IUSE="motif cjk xgetdefault linuxkeys"
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXpm
+ x11-libs/libXext
+ motif? ( >=x11-libs/motif-2.3:0 )"
+DEPEND="${RDEPEND}
+ x11-proto/xproto"
+
+src_prepare() {
+ tc-export AR
+
+ epatch "${FILESDIR}"/${P}-line-scroll.patch\
+ "${FILESDIR}"/${P}-asneeded.patch
+ use motif && epatch "${FILESDIR}"/${P}-azz4.diff
+ if use cjk ; then
+ epatch "${DISTDIR}"/${P}-xim-fix.patch.gz
+ if use linguas_ja ; then
+ epatch "${FILESDIR}"/${P}-rk.patch
+ fi
+ fi
+
+ epatch "${FILESDIR}"/${P}-CVE-2008-1142-DISPLAY.patch
+ elibtoolize
+}
+
+src_compile() {
+ local term
+ if [ -n "${RXVT_TERM}" ] ; then
+ term="${RXVT_TERM}"
+ else
+ term="rxvt"
+ fi
+
+ # bug #22325
+ use linuxkeys && append-flags -DLINUX_KEYS
+
+ econf \
+ --enable-everything \
+ --enable-rxvt-scroll \
+ --enable-next-scroll \
+ --enable-xterm-scroll \
+ --enable-transparency \
+ --enable-xpm-background \
+ --enable-utmp \
+ --enable-wtmp \
+ --enable-mousewheel \
+ --enable-slipwheeling \
+ --enable-smart-resize \
+ --enable-256-color \
+ --enable-menubar \
+ $(use_enable cjk languages) \
+ --enable-xim \
+ --enable-shared \
+ --enable-keepscrolling \
+ --with-term=${term} \
+ $(use_enable xgetdefault)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ cd "${S}"/doc
+ dodoc README* *.txt BUGS FAQ
+ dohtml *.html
+}
+
+pkg_postinst() {
+ einfo
+ einfo "If you want to change default TERM variable other than rxvt,"
+ einfo "set RXVT_TERM environment variable and then emerge rxvt."
+ einfo "Especially, if you use rxvt under monochrome X you might need to run"
+ einfo "\t RXVT_TERM=rxvt-basic emerge rxvt"
+ einfo "otherwise curses based program will not work."
+ einfo
+}
diff --git a/x11-terms/sakura/Manifest b/x11-terms/sakura/Manifest
new file mode 100644
index 00000000000..f5a3494bb22
--- /dev/null
+++ b/x11-terms/sakura/Manifest
@@ -0,0 +1,3 @@
+DIST sakura-3.2.0.tar.bz2 51651 SHA256 20d166b038b5692b7a34e4792daecba264cae084dca3cecb8c3f4f36cb60dbdd SHA512 7d58e7b3d76e724a6b9a3baf6f0d02c79a97004e130864e008e7c81f71be78dc4f60d211b2f216a688548e42dd272c7e8550a55b5744199c42d3ff4470579e8d WHIRLPOOL e706671e28322ef06a675061b49cc9ac1f5eaf99225cbd6aad3130f43de190912d47c8b3196ae41bde389c8870943ad88b040be94ddb98c83e4b993e0e122a6e
+DIST sakura-3.2.1.tar.bz2 51799 SHA256 a4cfe197d56e61eb6915278e5349f1e648dbaac8f7b6b837b8736dd13ba7ba4e SHA512 8851657db57278cf906e5b3622e484045611d86cf49c81b3888f0e50bddfd2be0c7de8fcfeb500d57bc14444991b5be68f71d2405a894ae81e2d8fda8650c77d WHIRLPOOL 96fbfa53ae48fee1633b5c63707ffdc37a3fe49fedaa6c20059e1630678dbc82f99a13383e7e58b508cbe315a0ceab97a4290ccde36ee927c67eb8417d6fb043
+DIST sakura-3.3.0.tar.bz2 51576 SHA256 418d191fd2957f72d8381aec501505b94fb396c8c35c4c6f02236aca3fb5f267 SHA512 2db70b69547f7d02329631166cc66e25c1e1205fbd0080d0a6295b1ebb89f77b4806dd570601df599588f24f69d2b917c03e803fffed24927abd8d77562acd98 WHIRLPOOL 95917d6ce0bb8c0b9ed3b28873f002623cba65e4d23ab4390da5cfc0b9d61924074ae333d70ea2513f3f7e23b9291d54137d3f8c13d0a11e3ee5227fea0a73a3
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 00000000000..28b72dd694a
--- /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 00000000000..dd8e5f462ca
--- /dev/null
+++ b/x11-terms/sakura/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>desktop-misc</herd>
+ <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.2.0.ebuild b/x11-terms/sakura/sakura-3.2.0.ebuild
new file mode 100644
index 00000000000..4b26f96f6cd
--- /dev/null
+++ b/x11-terms/sakura/sakura-3.2.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://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/vte-0.28:2.90
+ x11-libs/gtk+:3
+"
+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.2.1.ebuild b/x11-terms/sakura/sakura-3.2.1.ebuild
new file mode 100644
index 00000000000..87ab70f80ee
--- /dev/null
+++ b/x11-terms/sakura/sakura-3.2.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://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/vte-0.28:2.90
+ x11-libs/gtk+:3
+"
+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.3.0.ebuild b/x11-terms/sakura/sakura-3.3.0.ebuild
new file mode 100644
index 00000000000..712257b145f
--- /dev/null
+++ b/x11-terms/sakura/sakura-3.3.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://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/vte:2.91
+ x11-libs/gtk+:3
+"
+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/st/Manifest b/x11-terms/st/Manifest
new file mode 100644
index 00000000000..4861996828f
--- /dev/null
+++ b/x11-terms/st/Manifest
@@ -0,0 +1,2 @@
+DIST st-0.5.tar.gz 36710 SHA256 ae80ddfaf8146f7665772efc9b85e05e08be5087682a689ecdf71aa4d4bfdd4e SHA512 fb5d3b6dfb56f35c60a83164d0da2aef67d9fc23b81fdd7c26b9a618c92524a601db5fc4149a3a5054ca3306ecc80e104fa629ecb1516c047a726012237c83d5 WHIRLPOOL 90083bfaca02f7507e706c4d251736b300553e95c12640d948a8a5c273c5339b2080e34d54113a69e7cd0d083207634c645a55744c443efe77a2f7b40a82f9ad
+DIST st-0.6.tar.gz 40271 SHA256 85310c08c3814e099b5e45888f8ac7548640e69e9973e934d4fba38b03737a2b SHA512 31e4b6d2b27d6cea79d6a31dabd7ff4e08a8ab376f06c113123810c05eab25e3964482a6429eecd65c369983cc8ee3694f367e3894ed2cc740c67738c1898d29 WHIRLPOOL 94b526dffa7cb2446160acf4d2bb5e78d25f300c3f2ff4549bbe39ad5fae7ea80428ccdaa61a3603c1a3e6f4b98040983f5d468f218542204c62cb88fb776917
diff --git a/x11-terms/st/metadata.xml b/x11-terms/st/metadata.xml
new file mode 100644
index 00000000000..5b80fb94c39
--- /dev/null
+++ b/x11-terms/st/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>
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-terms/st/st-0.5.ebuild b/x11-terms/st/st-0.5.ebuild
new file mode 100644
index 00000000000..0ac64c4c77a
--- /dev/null
+++ b/x11-terms/st/st-0.5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib savedconfig toolchain-funcs
+
+DESCRIPTION="simple terminal implementation for X"
+HOMEPAGE="http://st.suckless.org/"
+SRC_URI="http://dl.suckless.org/st/${P}.tar.gz"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~x86"
+IUSE="savedconfig"
+
+RDEPEND="media-libs/fontconfig
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXft"
+DEPEND="${RDEPEND}
+ sys-libs/ncurses
+ virtual/pkgconfig
+ x11-proto/xextproto
+ x11-proto/xproto"
+
+src_prepare() {
+ epatch_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:@::' \
+ -i Makefile || die
+ tc-export CC
+
+ restore_config config.h
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+ tic -s -o "${ED}"/usr/share/terminfo st.info || die
+ 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/st/st-0.6.ebuild b/x11-terms/st/st-0.6.ebuild
new file mode 100644
index 00000000000..0190c0183f4
--- /dev/null
+++ b/x11-terms/st/st-0.6.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib savedconfig toolchain-funcs
+
+DESCRIPTION="simple terminal implementation for X"
+HOMEPAGE="http://st.suckless.org/"
+SRC_URI="http://dl.suckless.org/st/${P}.tar.gz"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="savedconfig"
+
+RDEPEND="media-libs/fontconfig
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXft"
+DEPEND="${RDEPEND}
+ sys-libs/ncurses
+ virtual/pkgconfig
+ x11-proto/xextproto
+ x11-proto/xproto"
+
+src_prepare() {
+ epatch_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:@::' \
+ -i Makefile || die
+ tc-export CC
+
+ restore_config config.h
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+ tic -s -o "${ED}"/usr/share/terminfo st.info || die
+ 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/st/st-9999.ebuild b/x11-terms/st/st-9999.ebuild
new file mode 100644
index 00000000000..7cde185fdd8
--- /dev/null
+++ b/x11-terms/st/st-9999.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils git-r3 multilib savedconfig toolchain-funcs
+
+DESCRIPTION="simple terminal implementation for X"
+HOMEPAGE="http://st.suckless.org/"
+EGIT_REPO_URI="git://git.suckless.org/st"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+KEYWORDS=""
+IUSE="savedconfig"
+
+RDEPEND="media-libs/fontconfig
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXft"
+DEPEND="${RDEPEND}
+ sys-libs/ncurses
+ virtual/pkgconfig
+ x11-proto/xextproto
+ x11-proto/xproto"
+
+src_prepare() {
+ epatch_user
+
+ sed -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:}" \
+ -i config.mk || die
+ sed -e '/@echo/!s:@::' \
+ -i Makefile || die
+ tc-export CC
+
+ restore_config config.h
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+ tic -s -o "${ED}"/usr/share/terminfo st.info || die
+ 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 00000000000..1f8d777adf7
--- /dev/null
+++ b/x11-terms/terminator/Manifest
@@ -0,0 +1,2 @@
+DIST terminator-0.97.tar.gz 5025337 SHA256 0281b568913f392eec92ebee3c6fea15afe4f4e01869bad38d9efe0eb305be49 SHA512 ac1dfb5c014323ddd3b3347645ac26083d96fe8e895d31c5992d185863d40b5f1a67c5db1315b48f483d9511faeb1adb16133a4aef1e1f178656f3437d4a7470 WHIRLPOOL 9d83bd34e1018dc535af573af27d08b425def1af5498de7be793e7c90298d0140c2e78479bae4264fa7315bcfa9b36d2d464f822b58af0d7452802a3cfc18583
+DIST terminator_0.96.tar.gz 264226 SHA256 d708c783c36233fcafbd0139a91462478ae40f5cf696ef4acfcaf5891a843201 SHA512 f74b5887ea7a11bf5c6866eae5e879a60badd81dd5056cfd0fdb5e4940b81917e6cd05ea50b56a9c7beba8e9fc9e842b25d3c8ad3ed7b574b72f43a1d4fc6c5e WHIRLPOOL 53fed7d74a3a76e7cca01cb0ab7f1780f981b81aec9606a1f4416c3e786773aca41abac174e40f1b49b9285edc9d7c8fcf599395c09a9a23ec3ec4d745e35b55
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 00000000000..c7862def3ea
--- /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.93-session.patch b/x11-terms/terminator/files/0.93-session.patch
new file mode 100644
index 00000000000..c904a8ca494
--- /dev/null
+++ b/x11-terms/terminator/files/0.93-session.patch
@@ -0,0 +1,13 @@
+diff --git a/terminatorlib/terminator.py b/terminatorlib/terminator.py
+index 34726cb..5adb7e7 100755
+--- a/terminatorlib/terminator.py
++++ b/terminatorlib/terminator.py
+@@ -60,8 +60,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 attempt_gnome_client(self):
+ """Attempt to find a GNOME Session to register with"""
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 00000000000..4583b0cff7b
--- /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 00000000000..9e35d7d593f
--- /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/metadata.xml b/x11-terms/terminator/metadata.xml
new file mode 100644
index 00000000000..0a689a803c0
--- /dev/null
+++ b/x11-terms/terminator/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>
+ <email>jlec@gentoo.org</email>
+ </maintainer>
+ <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.96-r1.ebuild b/x11-terms/terminator/terminator-0.96-r1.ebuild
new file mode 100644
index 00000000000..b3c31439ae1
--- /dev/null
+++ b/x11-terms/terminator/terminator-0.96-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+PYTHON_MODNAME="terminatorlib"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit gnome2 distutils eutils
+
+DESCRIPTION="Multiple GNOME terminals in one window"
+HOMEPAGE="http://www.tenshu.net/p/terminator.html"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${PN}_${PV}.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
+ dev-python/pygtk:2
+ )
+ libnotify? ( dev-python/notify-python )"
+DEPEND="dev-util/intltool"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/0.90-without-icon-cache.patch \
+ "${FILESDIR}"/0.94-session.patch
+ distutils_src_prepare
+}
+
+src_configure() { :; }
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+ distutils_pkg_postinst
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+ distutils_pkg_postrm
+}
diff --git a/x11-terms/terminator/terminator-0.96-r2.ebuild b/x11-terms/terminator/terminator-0.96-r2.ebuild
new file mode 100644
index 00000000000..7658a80a4f5
--- /dev/null
+++ b/x11-terms/terminator/terminator-0.96-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_NO_PARALLEL_BUILD=true
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="Multiple GNOME terminals in one window"
+HOMEPAGE="http://www.tenshu.net/p/terminator.html"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${PN}_${PV}.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"
+
+python_prepare_all() {
+ local PATCHES=(
+ "${FILESDIR}"/0.90-without-icon-cache.patch
+ "${FILESDIR}"/0.94-session.patch
+ )
+ distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+}
diff --git a/x11-terms/terminator/terminator-0.96-r3.ebuild b/x11-terms/terminator/terminator-0.96-r3.ebuild
new file mode 100644
index 00000000000..1bfb6f0ffdc
--- /dev/null
+++ b/x11-terms/terminator/terminator-0.96-r3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_NO_PARALLEL_BUILD=true
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="Multiple GNOME terminals in one window"
+HOMEPAGE="http://www.tenshu.net/p/terminator.html"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${PN}_${PV}.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"
+
+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
+
+ distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+}
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 00000000000..0cce9db79cf
--- /dev/null
+++ b/x11-terms/terminator/terminator-0.97-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_NO_PARALLEL_BUILD=true
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="Multiple GNOME terminals in one window"
+HOMEPAGE="http://www.tenshu.net/p/terminator.html"
+SRC_URI="http://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.97.ebuild b/x11-terms/terminator/terminator-0.97.ebuild
new file mode 100644
index 00000000000..f26ca8b914d
--- /dev/null
+++ b/x11-terms/terminator/terminator-0.97.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_NO_PARALLEL_BUILD=true
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="Multiple GNOME terminals in one window"
+HOMEPAGE="http://www.tenshu.net/p/terminator.html"
+SRC_URI="http://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
+ )
+
+ 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/terminology/Manifest b/x11-terms/terminology/Manifest
new file mode 100644
index 00000000000..64b11885f78
--- /dev/null
+++ b/x11-terms/terminology/Manifest
@@ -0,0 +1,6 @@
+DIST terminology-0.4.0.tar.bz2 1055230 SHA256 1e833a74f1311be2d80b2334d210d2c0099a521e61703c49f4f6a95c13cd1c6d SHA512 d0b70376574c563bc7ebe3221a0dc1fd5e677e753dcdea14b2ecd1015e8f64698c072ad078883ce65873e8e09d361958438c19fb16245e71e837432c4f1616c4 WHIRLPOOL 49b731d93a95954076229e21f35a350859fd9f1b1d2dfa0bf7804d14557b6f303ce5b88de32f932a39bc4178e544406017e38c9e5a4ea12925fb9c7c148d8749
+DIST terminology-0.5.0.tar.bz2 3087455 SHA256 ccd7a6fceb6533830df456ea32d3803f4a44542aac58e659d9b44c98542c9e62 SHA512 bcdc6bf3fd8ec2c8b65fb9953a6e868f38917b376dbc309f96778c5a9ce08ed2b10d49e8ede82f3b154167e9cb8183dc36f3fd04f476f613561f29b817952705 WHIRLPOOL b4b718d498cd6b40709c284cea11931799692c1882301eda1052786008348ee2a6b84805550144b0d5c12e5a245b16bf00917dd4ba1b78e336724d8e3db41e10
+DIST terminology-0.5.1.tar.bz2 3087354 SHA256 ab0766f6cf4a06cff2f6f48e59529c0b1caa5cd4da71f628ba7b26a0e2dca833 SHA512 c2fdf1686e09f38ed925fb7b96a73c67aae77ed5bb1da216a54a32ce44477d8f84469d7120470f606f4352758582328563ccff2e354ae82169e50fe52bfb0c2d WHIRLPOOL cac0d199506966a9385d36e69fcc75196895ecd435dc9847ebe6fb0fffefb51675e0b756e5ae7d3bb1fd7874fddacca6c90c0a03d6340d48d48c85e9c442ef51
+DIST terminology-0.6.1.tar.xz 3066124 SHA256 0c8e636918b118151d801bb5cddf85fe97b3941be115334fa711d0ab45408151 SHA512 14bf741640d03f448d47e38ef93f0e4d38ad79c61fc44cc9bc0018b31119803dd42759df651924ac10fbf77e9ab001679d05ac48e38dae30ca34498b41924c11 WHIRLPOOL f7d541c03fd778d8118f512259fe8ca62f4bf33e45649f77024a463456a38dc5a1c0f7e893c11b4e6cb1e8fc34c5a12d790c99c0af397753ccc98271c140ea6d
+DIST terminology-0.7.0.tar.xz 3194548 SHA256 4fe3ca0fa4ec7e1d8bb83a224df29871801bbf1bd3a9da34e732e3a6e8272275 SHA512 9958202ffad4ee7a1e3f37f14907732b2eab539a8819a2e37e2a7cb14575276d2fe2a89fda6ea05d072b8c546bebf69cb2d8577e677a5db62d18d55927cdeef9 WHIRLPOOL 5b06bd05684e1a3f587049975b7e33b08283f4b58156433e16646f0935dd92752e013eb9db613ae90b47eb7d103790c3b7b26bf5ed22a0946e3489f5a636dbaf
+DIST terminology-0.8.0.tar.xz 2867120 SHA256 e21f1c03a13b7fa4425a078cf8f2d914499ea1311fc99a04e6155ddf6a33786a SHA512 d31e244ceef2ec9bc63173b31bf83377be047a53b59201b66b542a5c81df880e0442628c6f5b9b27f04f28afb4963602bcdf83758e392df65780ea77d0861a21 WHIRLPOOL 9173ff622f45e5f05908e7e64ecf67e189b5bb04d0a0d5f678dafe998698909febc8da0adb9c2654ca24c6247ea74e8861beb09b64ecb26d4d047edf0adaee45
diff --git a/x11-terms/terminology/metadata.xml b/x11-terms/terminology/metadata.xml
new file mode 100644
index 00000000000..55d1435ab6e
--- /dev/null
+++ b/x11-terms/terminology/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>enlightenment</herd>
+<maintainer>
+ <email>sera@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
+
diff --git a/x11-terms/terminology/terminology-0.4.0.ebuild b/x11-terms/terminology/terminology-0.4.0.ebuild
new file mode 100644
index 00000000000..dd565834a01
--- /dev/null
+++ b/x11-terms/terminology/terminology-0.4.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Feature rich terminal emulator using the Enlightenment Foundation Libraries"
+HOMEPAGE="http://www.enlightenment.org/p.php?p=about/terminology"
+SRC_URI="http://download.enlightenment.org/rel/apps/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-libs/efl-1.8.1
+ >=media-libs/elementary-1.8.0"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
diff --git a/x11-terms/terminology/terminology-0.5.0.ebuild b/x11-terms/terminology/terminology-0.5.0.ebuild
new file mode 100644
index 00000000000..dd565834a01
--- /dev/null
+++ b/x11-terms/terminology/terminology-0.5.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Feature rich terminal emulator using the Enlightenment Foundation Libraries"
+HOMEPAGE="http://www.enlightenment.org/p.php?p=about/terminology"
+SRC_URI="http://download.enlightenment.org/rel/apps/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-libs/efl-1.8.1
+ >=media-libs/elementary-1.8.0"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
diff --git a/x11-terms/terminology/terminology-0.5.1.ebuild b/x11-terms/terminology/terminology-0.5.1.ebuild
new file mode 100644
index 00000000000..dd565834a01
--- /dev/null
+++ b/x11-terms/terminology/terminology-0.5.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Feature rich terminal emulator using the Enlightenment Foundation Libraries"
+HOMEPAGE="http://www.enlightenment.org/p.php?p=about/terminology"
+SRC_URI="http://download.enlightenment.org/rel/apps/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-libs/efl-1.8.1
+ >=media-libs/elementary-1.8.0"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
diff --git a/x11-terms/terminology/terminology-0.6.1.ebuild b/x11-terms/terminology/terminology-0.6.1.ebuild
new file mode 100644
index 00000000000..2980b01f7aa
--- /dev/null
+++ b/x11-terms/terminology/terminology-0.6.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Feature rich terminal emulator using the Enlightenment Foundation Libraries"
+HOMEPAGE="http://www.enlightenment.org/p.php?p=about/terminology"
+SRC_URI="http://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-libs/efl-1.8.1
+ >=media-libs/elementary-1.8.0"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
diff --git a/x11-terms/terminology/terminology-0.7.0.ebuild b/x11-terms/terminology/terminology-0.7.0.ebuild
new file mode 100644
index 00000000000..1f6bc4b02d6
--- /dev/null
+++ b/x11-terms/terminology/terminology-0.7.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Feature rich terminal emulator using the Enlightenment Foundation Libraries"
+HOMEPAGE="http://www.enlightenment.org/p.php?p=about/terminology"
+SRC_URI="http://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-libs/efl-1.8.1
+ >=media-libs/elementary-1.8.0"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
diff --git a/x11-terms/terminology/terminology-0.8.0.ebuild b/x11-terms/terminology/terminology-0.8.0.ebuild
new file mode 100644
index 00000000000..518c457782c
--- /dev/null
+++ b/x11-terms/terminology/terminology-0.8.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="Feature rich terminal emulator using the Enlightenment Foundation Libraries"
+HOMEPAGE="http://www.enlightenment.org/p.php?p=about/terminology"
+SRC_URI="http://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/efl-1.13.1
+ >=media-libs/elementary-1.13.1"
+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 00000000000..5055b4e8e9a
--- /dev/null
+++ b/x11-terms/terminology/terminology-9999.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+if [[ "${PV}" == "9999" ]] ; then
+ EGIT_SUB_PROJECT="core"
+ EGIT_URI_APPEND="${PN}"
+else
+ SRC_URI="http://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
+ EKEY_STATE="snap"
+fi
+
+inherit enlightenment
+
+DESCRIPTION="Feature rich terminal emulator using the Enlightenment Foundation Libraries"
+HOMEPAGE="http://www.enlightenment.org/p.php?p=about/terminology"
+
+RDEPEND=">=dev-libs/efl-1.13.1
+ >=media-libs/elementary-1.13.1"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
diff --git a/x11-terms/terra/metadata.xml b/x11-terms/terra/metadata.xml
new file mode 100644
index 00000000000..0adcfc7b6f3
--- /dev/null
+++ b/x11-terms/terra/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>
+ <email>hasufell@gentoo.org</email>
+ <name>Julian Ospald</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="launchpad">terra</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-terms/terra/terra-9999.ebuild b/x11-terms/terra/terra-9999.ebuild
new file mode 100644
index 00000000000..ab1dad7becf
--- /dev/null
+++ b/x11-terms/terra/terra-9999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit bzr distutils-r1
+
+DESCRIPTION="Terminal emulator with split-screen support"
+HOMEPAGE="https://launchpad.net/terra"
+EBZR_REPO_URI="lp:terra"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="<dev-python/python-distutils-extra-2.34"
+RDEPEND="dev-libs/gobject-introspection
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ dev-python/python-xlib
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:3[introspection]
+ x11-libs/vte:2.90[introspection]"
+
+src_install() {
+ distutils-r1_src_install
+ rm -f "${D}"/usr/share/doc/terra/README.md
+}
diff --git a/x11-terms/tilda/Manifest b/x11-terms/tilda/Manifest
new file mode 100644
index 00000000000..8688c09e46a
--- /dev/null
+++ b/x11-terms/tilda/Manifest
@@ -0,0 +1 @@
+DIST tilda-0.9.6.tar.gz 307517 SHA256 b3bd0f63eb83a5001ef26056ca116e5f8005d454f8f82a94f334868862068411 SHA512 7d0ddaf289de2c3f9f48f5cce3ee71534b9fdd91f79a4e56a32a301fd8fc82c4a3d760cfcd16d8d2e2d9f0d963b8130547720563ab15c2bb2220ff546ea562b0 WHIRLPOOL 1f3b25f508291b79872947441a981d1582bdbab57996f1e3673c1b575079fadaf6f39912f9e94cfc8559fead39615383c3515a3c4a8f6178e4a568ad7a67c088
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 00000000000..a26ba91f5ec
--- /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 00000000000..fcc734f771d
--- /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/metadata.xml b/x11-terms/tilda/metadata.xml
new file mode 100644
index 00000000000..d19d75f8fb7
--- /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>
+ <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.ebuild b/x11-terms/tilda/tilda-0.9.6.ebuild
new file mode 100644
index 00000000000..95d4582e39e
--- /dev/null
+++ b/x11-terms/tilda/tilda-0.9.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-interix ~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/valaterm/Manifest b/x11-terms/valaterm/Manifest
new file mode 100644
index 00000000000..1badde23a23
--- /dev/null
+++ b/x11-terms/valaterm/Manifest
@@ -0,0 +1 @@
+DIST valaterm-0.6.tar.gz 173874 SHA256 3220bb1ec444b339c1c46d3922fbd2741a34667b3ddf744e70b3c30e84bf2298 SHA512 a593b28e437287869020150314e2058f441f0435580b1d95cf2652b81f60fa9a11d59b8ec2dd68801dbc82d1ca070c9135b805c4d771bb4f099f13ebff243ad4 WHIRLPOOL a3822ef2f7479f297cc9a36750f8787988fd1c715f938c7b4aa1dc61533762a3c9da24e63d0db588fa3b9b8472653b345a34f60d5c2939a17eb15e6a4f03e830
diff --git a/x11-terms/valaterm/metadata.xml b/x11-terms/valaterm/metadata.xml
new file mode 100644
index 00000000000..2a3ba4a1c03
--- /dev/null
+++ b/x11-terms/valaterm/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>
+ <email>ssuominen@gentoo.org</email>
+ <name>Samuli Suominen</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="gitorious">valaterm</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-terms/valaterm/valaterm-0.6.ebuild b/x11-terms/valaterm/valaterm-0.6.ebuild
new file mode 100644
index 00000000000..c28b65a3ff2
--- /dev/null
+++ b/x11-terms/valaterm/valaterm-0.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+VALA_MIN_API_VERSION="0.16"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-any-r1 waf-utils vala
+
+DESCRIPTION="A lightweight vala based terminal"
+HOMEPAGE="http://gitorious.org/valaterm"
+SRC_URI="http://gitorious.org/${PN}/${PN}/archive-tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="nls"
+
+RDEPEND=">=dev-libs/glib-2
+ x11-libs/gtk+:3
+ x11-libs/vte:2.90"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ $(vala_depend)
+ virtual/pkgconfig
+ nls? (
+ dev-util/intltool
+ sys-devel/gettext
+ )"
+
+DOCS="AUTHORS ChangeLog README TODO"
+
+S=${WORKDIR}/${PN}-${PN}
+
+src_configure() {
+ local myconf
+ use nls || myconf='--disable-nls'
+ waf-utils_src_configure --custom-flags --verbose ${myconf}
+}
diff --git a/x11-terms/xfce4-terminal/Manifest b/x11-terms/xfce4-terminal/Manifest
new file mode 100644
index 00000000000..d3cb6ed6844
--- /dev/null
+++ b/x11-terms/xfce4-terminal/Manifest
@@ -0,0 +1 @@
+DIST xfce4-terminal-0.6.3.tar.bz2 815207 SHA256 912f4716c2395a14a80620ef982b4af1e2a67a8df9a1ef0b802ecae826057e08 SHA512 805390b75178b3a2fbff4f8dfe972474e5575ad5a80aaf775f7b4086f975cf5b444a335b1ec1a9a39bc89642c71e1d0cb1bbc14d96b913980bd231d32a081c49 WHIRLPOOL 199f305ae3996eeb5797dbc3fbe07f459c577bfb5a259c3ce820b2fea87ef92593ed26fd82745b7266a6e8801aef61c5a82ddd0f7e9cdc3f3c741e58ba37ed0a
diff --git a/x11-terms/xfce4-terminal/metadata.xml b/x11-terms/xfce4-terminal/metadata.xml
new file mode 100644
index 00000000000..008cf479f61
--- /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>
+ <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 00000000000..8caf0949a7e
--- /dev/null
+++ b/x11-terms/xfce4-terminal/xfce4-terminal-0.6.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="A terminal emulator for the Xfce desktop environment"
+HOMEPAGE="http://www.xfce.org/projects/terminal/"
+SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~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/xterm/Manifest b/x11-terms/xterm/Manifest
new file mode 100644
index 00000000000..6e8d1399ae3
--- /dev/null
+++ b/x11-terms/xterm/Manifest
@@ -0,0 +1,4 @@
+DIST xterm-314.tgz 1200426 SHA256 1dbf1e93796c1b71b22b84e82eb58bcf20a14a7f365158819f3b4dbb29fe93f0 SHA512 bce72207b6db288c3873f00b928797dfd2aaea51d183b11d377af008a1a83965bd781c648fd26d88b491197594315b2d2549cfdb44f0dbd856b269aebc31ad9f WHIRLPOOL a9eda394dc47d0d31ab27fe338e3a1d41ef581b1617d324fdb98289374e9d5e4854735ddc4a862323203ec1ecb2788f3ae7e4abe1f3b17b15dadecc6edb9f651
+DIST xterm-315.tgz 1206477 SHA256 fee60049291a19357aa1022d6860a341c2750728ddac88520f01dc0fcd787d02 SHA512 ac634824213001d7ac7fcd11408d9d2956b512095136162d855aa474083f3a801a7830881c9acedd2eae751928e8803170bd243e9083dac74e3ec815dfaa5996 WHIRLPOOL eadc97982d44ce5b9d4231b417f789a13c2c795f59dc2c39b93f20920e0cbdcc3bde19acdbaf3e7864a9ad8d6a11e49f93523e9d3df9640e6a8e46ce77af0454
+DIST xterm-317.tgz 1208960 SHA256 d2e5b0dbe47568f9e76123a4f0aeaafd586a4ce0c1beb63a476b07cd718e356d SHA512 43c92db70f22619cd09b6597f9c697ebf406a838388fcf10f8e34327e0e358c88c1853a0c375a0969e2f65c0689078fe4e7ca2f8f1eabd9ca89d7d32898eed55 WHIRLPOOL 1c9f30c8ecf27ec2227a87754d392cf8c5d9b3b0a55f28e9445c744f7892ed3dcec21b85ee995f3b90b7da6a3b53f9a998d6353f21641cff90657fc9b5d2d7d5
+DIST xterm-318.tgz 1208968 SHA256 e71f2b0fb11d6c723c1f9af10fc01048b776f44c1636aa1b71e5eff77deb81d7 SHA512 d1ff9b4359a49f47cc9e5e7d6311242b7beef57e554389fe3033f69263b871ad5ba89d74b428d79564f013efced2d2d36cfac987aed8ab873722fdeb8fd6abf6 WHIRLPOOL 3712f84d50f3b281793ac7a2ffd9e604f663218d4a99f064c5b5d899ee11581a1bcdfdabf5f4be6c9c619f8069ed84777f64a50922b1d9e1bb28d84cc5e0831d
diff --git a/x11-terms/xterm/metadata.xml b/x11-terms/xterm/metadata.xml
new file mode 100644
index 00000000000..eb809ad385f
--- /dev/null
+++ b/x11-terms/xterm/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>
+ <email>dickey@invisible-island.net</email>
+ <name>Thomas Dickey</name>
+ </maintainer>
+ <herd>x11</herd>
+ <herd>proxy-maintainers</herd>
+ <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-314.ebuild b/x11-terms/xterm/xterm-314.ebuild
new file mode 100644
index 00000000000..061f0bc8ece
--- /dev/null
+++ b/x11-terms/xterm/xterm-314.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="Terminal Emulator for X Windows"
+HOMEPAGE="http://invisible-island.net/xterm/"
+SRC_URI="ftp://invisible-island.net/${PN}/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~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"
+
+COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter )
+ kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
+ >=sys-libs/ncurses-5.7-r7
+ 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 )"
+RDEPEND="${COMMON_DEPEND}
+ media-fonts/font-misc-misc"
+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) \
+ --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-315.ebuild b/x11-terms/xterm/xterm-315.ebuild
new file mode 100644
index 00000000000..8058aea813c
--- /dev/null
+++ b/x11-terms/xterm/xterm-315.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="Terminal Emulator for X Windows"
+HOMEPAGE="http://invisible-island.net/xterm/"
+SRC_URI="ftp://invisible-island.net/${PN}/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~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"
+
+COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter )
+ kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
+ >=sys-libs/ncurses-5.7-r7
+ 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 )"
+RDEPEND="${COMMON_DEPEND}
+ media-fonts/font-misc-misc"
+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) \
+ --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-317.ebuild b/x11-terms/xterm/xterm-317.ebuild
new file mode 100644
index 00000000000..8058aea813c
--- /dev/null
+++ b/x11-terms/xterm/xterm-317.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="Terminal Emulator for X Windows"
+HOMEPAGE="http://invisible-island.net/xterm/"
+SRC_URI="ftp://invisible-island.net/${PN}/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~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"
+
+COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter )
+ kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
+ >=sys-libs/ncurses-5.7-r7
+ 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 )"
+RDEPEND="${COMMON_DEPEND}
+ media-fonts/font-misc-misc"
+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) \
+ --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-318.ebuild b/x11-terms/xterm/xterm-318.ebuild
new file mode 100644
index 00000000000..8058aea813c
--- /dev/null
+++ b/x11-terms/xterm/xterm-318.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="Terminal Emulator for X Windows"
+HOMEPAGE="http://invisible-island.net/xterm/"
+SRC_URI="ftp://invisible-island.net/${PN}/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~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"
+
+COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter )
+ kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
+ >=sys-libs/ncurses-5.7-r7
+ 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 )"
+RDEPEND="${COMMON_DEPEND}
+ media-fonts/font-misc-misc"
+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) \
+ --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 00000000000..7f77b58dc1e
--- /dev/null
+++ b/x11-terms/xvt/Manifest
@@ -0,0 +1,2 @@
+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
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 00000000000..81baa76ce5e
--- /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 00000000000..368fdeeb00b
--- /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 00000000000..a86504ad29e
--- /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 00000000000..a858250c1d8
--- /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 00000000000..a0c8ba6f17e
--- /dev/null
+++ b/x11-terms/xvt/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>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+ <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 00000000000..4f872a1a6bf
--- /dev/null
+++ b/x11-terms/xvt/xvt-2.1-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 00000000000..0715a23e673
--- /dev/null
+++ b/x11-terms/yeahconsole/Manifest
@@ -0,0 +1 @@
+DIST yeahconsole-0.3.4.tar.gz 12281 RMD160 0503254c8ff4f124ca7ec122b3a204826e03a43a SHA1 78b589c21dc16d5b570ceade1d6c9bf337a51eef SHA256 fcf3481f78a263a70f1cb5163630fc22e78bb0915013eb05689c6f4aeb0583ef
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 00000000000..0075c433292
--- /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 00000000000..c3a21340a39
--- /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>
+ <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 00000000000..453d5637468
--- /dev/null
+++ b/x11-terms/yeahconsole/yeahconsole-0.3.4-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ;-)."
+}