5 files changed, 30 insertions, 66 deletions
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 7d0db93cb26e..428306683776 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/pangoterm/Manifest b/x11-terms/pangoterm/Manifest
index 8e8276eb85df..7c6f7fae616c 100644
--- a/x11-terms/pangoterm/Manifest
+++ b/x11-terms/pangoterm/Manifest
@@ -2,8 +2,10 @@ DIST pangoterm-0.0_pre20150323.tar.gz 22053 BLAKE2B 853691df002c9afb04b6c0e71568
 DIST pangoterm-0.0_pre20150913.tar.gz 22074 BLAKE2B 9c6f7e3601ba44c360d777e0773ffa76b23691cdffd54c1f4d638caafe9fbdf1b09ad494595bf1c831317d3d35c7ee2dfd70e9de4c68f2497e60e038076d6ba6 SHA512 2efed960bde9378ea25d96e41460245925952d50f60a4f0580ffc71519acb278101cd16c3aedaa8037c2734f09d14a0590731a1a42fe2f357ef9222a8e0bd260
 DIST pangoterm-0.0_pre20151022.tar.gz 22588 BLAKE2B 635edd2536cc484eb6cbcbd21714b37feb3247624a655ee473d60459b060c59f1a1954576a74779ae12755db01761dbe41be8d1fb78ac628256f0e2c4eeae7de SHA512 716acd0c47fbca35961aff21a8dba886ec4cb152d89544f20d9752828f9e005a5561090959be64f1db864bde71db1d205d045b8a7baa36d23471e1a87c7fee14
 DIST pangoterm-0.0_pre20160305.tar.gz 22802 BLAKE2B 4dfc4a81b67caf95fabec38b815488d951e0c298859754cd77366149e0263964f7eeffd7f87f4eace7f228f8bf36c5c38201d58a181409b7e83359f99af6a2f4 SHA512 570c8fe1f7233884a849aa9b9160930b77682a9c3ef6f9c26891eb604c861e01a3ce13d418c8febc92e1cdb2794d5a1cf0097c27183395098c505540146f8467
+DIST pangoterm-0.0_pre20171111.tar.gz 23650 BLAKE2B 04270f98ab70a3d89a814e7d1e12e9a430a0c203cf5116a0c09813d0b52d8a9e37fc697d0104c3f58a99215b2922d7dac0f0b840cd226701510a8176a40ac540 SHA512 007c9dd4e623a04a1a0b8fd600d08adb1e9729a8f9ee9cbf5af93a33c902874deaf8cfb8227240369dc0ec0c9b93d6459693cb27e66f05163016f851e27cb4b3
 EBUILD pangoterm-0.0_pre20150323.ebuild 628 BLAKE2B 1e4c160d194d7fd74fd2e22205bcc362109e002af4913f897ba638b53e2899b013527235e3277fb0121b50a3c4fe89f47c8034523d55791f85b96f78d0021bd8 SHA512 8545395a2d87ea702b2933ebd98190b812ff69e5a910f402facdc18b6407b575877f862d511043482d754b8ab4ba0bc2feca51573dc33cb9c359d9106c722f2c
 EBUILD pangoterm-0.0_pre20150913.ebuild 611 BLAKE2B 8d329e4a4189c310854b34416823e035ff45f544314882c8b6a479d672b856afc08f284c53fd66a8e915b83c659a8e390beea5d897301d9ce415f44c4712e497 SHA512 79c5bb7b25f843b4947cdd5dc94e7a7f44d81a6c6276817177f4d56f5f575a4a0d41f4127973ffffd45ff5e7c027ccf9ed92f3435c47b2b79d1a58f180ee66b0
 EBUILD pangoterm-0.0_pre20151022.ebuild 622 BLAKE2B 2d4350c24d033ce8498abbb5cb882073778913e906395f22f7881b4fbc7dcbb97a8cce90a36b783a512037dec449fe008be1baadc022c559e685a51ec5daaaf7 SHA512 82b3f5dc51d565257232b732ae6abb2366751fa14326af570036b3a711dcff4071fc49a47f40d53ccb40057c5a0d98fb02e1b883d25c758888bce7f91bed4062
 EBUILD pangoterm-0.0_pre20160305.ebuild 622 BLAKE2B 3f65bac5771109dcbf7fdc2f13aa0fff29a2f335456eedeb1a085b433b2bde915bc8c3594c9a66ec39e3f58fba2e9dabbf30bc07b015c58f29b7905ee1f3980e SHA512 a694df69939569b7b574a13f13f230e47d133661f01560d9ae3f0b7732f1fe96492c45d87f21567725dc31cd464d5a549c7bbe18dabbca72d05e2dc67bd4324e
+EBUILD pangoterm-0.0_pre20171111.ebuild 622 BLAKE2B 326b1c23b4861811c435d201f143d980aad65ffa9310921ed9251b7b84508c05690daad5c1910124a809d9a2ec58f2b216dda8b9ef34a081f6ac678c89491413 SHA512 8cd2174e44d3a1cc882048ff36f6d9fa11b87caea1c333ddcce0514a8649f118305d422686f4e3e9e57d1cab64ae697a96f2a00d77742b1cf0a800416a202868
 MISC metadata.xml 255 BLAKE2B ce8556f284e2aeb414525da970f2d09bd347410b5bd062590d9f7a5210452d20216bd81d2f4be2680d8fb8c8cb6c57ad054754ef3f3cc99d057bff734b4e28fe SHA512 5666b3b1d8ef1d8f738e4c44c1ffe45eb019554a33fac80936cb005e2a6c6da95df236425dcd5922396ead1b3b7d1b1d9e70bafaf0631a36694e12f4613439f1
diff --git a/x11-terms/pangoterm/pangoterm-0.0_pre20171111.ebuild b/x11-terms/pangoterm/pangoterm-0.0_pre20171111.ebuild
new file mode 100644
index 000000000000..28979dc5381c
--- /dev/null
+++ b/x11-terms/pangoterm/pangoterm-0.0_pre20171111.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A GTK/Pango-based terminal that uses libvterm to provide terminal emulation"
+HOMEPAGE="http://www.leonerd.org.uk/code/pangoterm/"
+SRC_URI="https://dev.gentoo.org/~tranquility/distfiles/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-libs/libvterm-0.0_pre20151022"
+RDEPEND="${DEPEND}
+	dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/pango
+"
+
+S=${WORKDIR}/pangoterm-0
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" install
+}
diff --git a/x11-terms/roxterm/Manifest b/x11-terms/roxterm/Manifest
index be917961a090..35a8ac4c09df 100644
--- a/x11-terms/roxterm/Manifest
+++ b/x11-terms/roxterm/Manifest
@@ -1,5 +1,3 @@
-DIST roxterm-2.9.3.tar.bz2 364120 BLAKE2B f304ef08c5c5b9724ab4fb8275d657476ea946dffd7b412aa29cd37c6e9c18335755a3a2e8c1e9157deb89ecb5ca1c3ea426d65afa5b9d74c5f6496f7989cf56 SHA512 3f197ebc532721a6132da96d3b4bf65032def43eba4d7b00ecb2c74223c43c0549a9605753e81992c2c4b4955adbbc041e8a31f22947752dc52a9edd46457d16
 DIST roxterm-3.1.5.tar.xz 309892 BLAKE2B 11ede6d870a2aa96bfff4974ab33ac4814802f6b08e684f9367e3e268adc113be2b0c92eb337447f8d20a687c7be5f414854cf1f75831ef6c38f4d78d3897317 SHA512 f07989331b1cf915e94582bfceff8cb87f20613eb272ccc502fb49c7508a1330cfa3b137c59f300b8541595aed541867c1b0aad36809e7e9a326f7119fde2acd
-EBUILD roxterm-2.9.3-r2.ebuild 1236 BLAKE2B 31382c7feea894bf9d64d9116817da7f521a6d2fb09835ff315810eafe77391872cf72c44710b3c7421324205e1fde49cbb43088391a1e63f6af5945945db3e9 SHA512 12107227383bd3df051d4e4164f2b8eb7987f811eed0f49e52b7610ac30dae98ae2203d133c086883072d0b055c823801ba55ab0b92c314e259675f4073f6c61
 EBUILD roxterm-3.1.5-r1.ebuild 1339 BLAKE2B 7ef3dfb2e1627dfeb0fe407464590b796ac7eff24a3c3aad7206c08742e83048732f31c08167563258b76680eaf2c821ba8b02e9cdbeb1459e8d76295aa93e76 SHA512 d25e9f15a22cf616e4d0d2b607ffdc699e5ec927f31f431917a5c5f9759f2cbf484e577b877c6295aa365201c12184d2a39560bb9340960e37fe5f92ae65f142
 MISC metadata.xml 451 BLAKE2B de541f71407130ef2336489ed65e3dcb0987bd185b45e49d26ecaa81151d1f1b9fd307522181fc7ae17a8fd89697f7d50b0d3249e59f8933b999f4a7c30056f8 SHA512 e4ad584a3a03fcc666b476c78f7651c3d8f03256c1e3828a735b9bd5e0477be6d9231cbf89cc8608d7f93e3d3ea6473c715ab0995b3c5b24f07c7ce13a69c3b0
diff --git a/x11-terms/roxterm/roxterm-2.9.3-r2.ebuild b/x11-terms/roxterm/roxterm-2.9.3-r2.ebuild
deleted file mode 100644
index 4cf99a29d538..000000000000
--- a/x11-terms/roxterm/roxterm-2.9.3-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit gnome2-utils python-any-r1 toolchain-funcs
-
-DESCRIPTION="A terminal emulator designed to integrate with the ROX environment"
-HOMEPAGE="http://roxterm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/roxterm/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="nls"
-
-RDEPEND=">=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.28
-	x11-libs/gtk+:3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/vte:2.90"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-libs/libxslt
-	dev-python/lockfile
-	virtual/pkgconfig
-	virtual/imagemagick-tools
-	nls? ( app-text/po4a sys-devel/gettext )"
-
-src_configure() {
-	local myconf=(
-		CC="$(tc-getCC)"
-		CFLAGS="${CFLAGS}"
-		LDFLAGS="${LDFLAGS}"
-		--prefix=/usr
-		--docdir="/usr/share/doc/${PF}"
-		--destdir="${D}"
-	)
-
-	use nls || myconf+=( --disable-gettext --disable-po4a --disable-translations )
-	./mscript.py configure "${myconf[@]}"
-}
-
-src_compile() {
-	./mscript.py build
-}
-
-src_install() {
-	./mscript.py install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}