6 files changed, 14 insertions, 95 deletions
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 4f2148b6beaf..07ba25b4b7c5 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/aterm/Manifest b/x11-terms/aterm/Manifest
index bcbab98e31fb..65e88b2b2bda 100644
--- a/x11-terms/aterm/Manifest
+++ b/x11-terms/aterm/Manifest
@@ -2,6 +2,5 @@ AUX aterm-1.0.1-deadkeys.patch 1358 BLAKE2B f692e190a33e50877da050cce3e7a3c8ab36
 AUX aterm-1.0.1-display-security-issue.patch 797 BLAKE2B 2f3d4bcc2c7e705106c6c1e81526e7575514e9a83e064158bcc3dc5a554db5f5592c3af2c33eea78864ff0d8d16770dadf1ef20aea52fa131c5c75ace20991d2 SHA512 23e088f188b2d454f5a3c1f863439426c80524f71c1d8484e451f301aa7b4007ba54988a86b4fe49fc8f3401e0af7ff9b725c5d3e8c08ba2eef007b7ada13e4d
 AUX aterm-1.0.1-dpy.patch 848 BLAKE2B 27325ce9a768ad44ab4d6e875e8b2c85c5e1cb419e4578d14a8bd960c754a5a3cce4646dc40e266f4e32a4fdffa2cddb395fd0af404405ac75d9578f61f8e061 SHA512 5d4040cf5c5933e91348531a271cf9687387a740312b12f5185f41877e91f58a0c216e5ad67be19bf47607b23eb9e1b31ca577ceed2a0239a01118073716c2bc
 DIST aterm-1.0.1.tar.bz2 276810 BLAKE2B 05d8e70caf20bfe2170ffcea2231b6a1bca0ff3414867bb9e48785e4822112a82868793c0b25f7111545b835aff61852f78461166a574288bc238146226be745 SHA512 05c78590bba55d892d9f7add384e4ae8d56197dbcd9caff2be4a52d5c162e767a464359ba806fc95961d8035575a2b4a962fc35cfa44f95025b477fa3e15e56b
-EBUILD aterm-1.0.1-r2.ebuild 1995 BLAKE2B b4768f5dbab89bdb3df89cc86c4eaf561d0b1047351a085396f9202b5df03e6000fe98568a6fe7c71ce51453fd43083fbc82089ff73e1cdc7a9557df855653cf SHA512 f344337763155570f96bf1da4e630deb27beae3b57ccdbbe3d4e6e211e45b891f99a1579404495c49a990472b72792015ef0bef948ada584f0c2fb9f1f31a031
-EBUILD aterm-1.0.1-r3.ebuild 2049 BLAKE2B f82988391d794f4139ee4988e0c7e8e62841cad6a9338df00c4d655b0edb98c77cdc04865b21bd294d74458bb414748ba2026231d778d51c8ab2d1cb1a931b2c SHA512 f9a999b0067003aa1c5d2c7c7a8575fb4a6db8038e979f7be710d8c09437f72bb3a73800056a4282d29b528eb0b4c2f87f0607b0293f1a44eb59a09f757caa13
+EBUILD aterm-1.0.1-r3.ebuild 2047 BLAKE2B 4e2335f96ebf493a2c8dac54b843ff74e98abeff2a473c00a2e536625012e35f10c5bc5144f3b73b151ef18978d7a48f1bbcef9ab492bdb1d3a984fae75ac762 SHA512 def49da830ad3308ea3e7b26b6b7b4cbd36d8e9d140fd872971f24803efe73c105fd20bc48b116c21927dc43ff3bc1cbb666e2028b4dbe200969e2ea5a5c200e
 MISC metadata.xml 456 BLAKE2B 268ce12677cb3678b091d810094c33905df594b0956e4103b132d6c5bc01bb234dffff4f65e34d8331a4ee76f2b893bf5fecbf4bc403b2c0690a357929a0a2cd SHA512 664fece05ae3d5cf3fcf713f83ec9756c1248dbde0fdbb6dd4cc5174ba54aa3238fb2ad1ec060cd9e665a83d83c0eacecddd1422ea44cc95850fe680198806cf
diff --git a/x11-terms/aterm/aterm-1.0.1-r2.ebuild b/x11-terms/aterm/aterm-1.0.1-r2.ebuild
deleted file mode 100644
index 067274a1a236..000000000000
--- a/x11-terms/aterm/aterm-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-inherit flag-o-matic eutils
-
-DESCRIPTION="rxvt compatible terminal emulator with transparency support"
-HOMEPAGE="http://aterm.sourceforge.net"
-SRC_URI="ftp://ftp.afterstep.org/apps/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="background cjk xgetdefault"
-
-RDEPEND="virtual/jpeg
-	media-libs/libpng
-	background? ( x11-wm/afterstep )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libICE"
-
-DEPEND="${RDEPEND}
-	x11-libs/libXt
-	x11-proto/xproto"
-
-src_prepare() {
-	# Security bug #219746
-	epatch "${FILESDIR}/${P}-display-security-issue.patch"
-	epatch "${FILESDIR}"/${P}-deadkeys.patch
-
-	#fix pre-stripped files
-	sed -i -e "/INSTALL_PROGRAM/ s:-s::" autoconf/Make.common.in || die "sed Makefile
-	failed"
-}
-
-src_configure() {
-	local myconf
-
-	use cjk && myconf="$myconf
-		--enable-kanji
-		--enable-thai
-		--enable-big5"
-
-	case "${CHOST}" in
-		*-darwin*) myconf="${myconf} --enable-wtmp" ;;
-		*-interix*) ;;
-		*) myconf="${myconf} --enable-utmp --enable-wtmp"
-	esac
-
-	econf \
-		$(use_enable xgetdefault) \
-		$(use_enable background background-image) \
-		--with-terminfo="${EPREFIX}"/usr/share/terminfo \
-		--enable-transparency \
-		--enable-fading \
-		--enable-background-image \
-		--enable-menubar \
-		--enable-graphics \
-		--with-x \
-		${myconf}
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	fowners root:utmp /usr/bin/aterm
-	fperms g+s /usr/bin/aterm
-
-	doman doc/aterm.1
-	dodoc ChangeLog doc/FAQ doc/README.*
-	docinto menu
-	dodoc doc/menu/*
-	dohtml -r .
-}
-
-pkg_postinst() {
-	echo
-	ewarn "The transparent background will only work if you have the 'real'"
-	ewarn "root wallpaper set. Some tools that might help include: Esetroot"
-	ewarn "(x11-terms/eterm), wmsetbg (x11-wm/windowmaker), and/or"
-	ewarn "media-gfx/feh."
-	echo
-}
diff --git a/x11-terms/aterm/aterm-1.0.1-r3.ebuild b/x11-terms/aterm/aterm-1.0.1-r3.ebuild
index 0a0939af86a8..b0a0fda87d06 100644
--- a/x11-terms/aterm/aterm-1.0.1-r3.ebuild
+++ b/x11-terms/aterm/aterm-1.0.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.afterstep.org/apps/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="background cjk xgetdefault"
 
 RDEPEND="
diff --git a/x11-terms/terminology/Manifest b/x11-terms/terminology/Manifest
index f7989e12131b..eef1efca982d 100644
--- a/x11-terms/terminology/Manifest
+++ b/x11-terms/terminology/Manifest
@@ -2,5 +2,5 @@ DIST terminology-0.9.1.tar.xz 4961876 BLAKE2B 03aab7c5c0740bede4c06b90721d96c121
 DIST terminology-1.0.0.tar.xz 4979420 BLAKE2B cbc78b751a2e6812ab31c69a62ea4abe2bb53f12b647cea7adae03e54fe0a238c56c5c029c43057c3a1326c7c8af0412574a85a404896554a142ed068ab581ab SHA512 5c99e1e1eea0de24d67779059d3ba65a8fbd1fdf63d9f22099e38defc11fdc8923fbe50a7276bc483ce5ee7527f665e3f2c48358d85c3a06f33e551bd8ef2320
 EBUILD terminology-0.9.1.ebuild 506 BLAKE2B 3097c37a90df56759cbaf924688fdfa0d54ae3f66ca0081fccde7a7f6a5b1d0555f93dd7ca5920079f5490a45f73792c7d24d9de709fcd7ddd55be8982213a93 SHA512 caff7eac7a6502dbbe1141f46ebd187979ff4c68660dada0e6f887a7415c178d53667d3d12486ea12350b9aacb9058e85bc251215cce0b10049c5b8ab585717a
 EBUILD terminology-1.0.0.ebuild 588 BLAKE2B a750d055620ae81bc6c700dd1878078383542bbc90a32c052a85c78a9e5755909ea77b5ab746d71cc1c7d11fdc9ebee789977c9efe7d3ed53fe2e0eaa32ccc9c SHA512 a68f7ecc0f45cfd251bd45b7d7363c89ab2f321f38480424106a8cd1903894c88fb4a5a506c585cf4002ed380261fdfb56f301522de3ffda7993e291a3b81c57
-EBUILD terminology-9999.ebuild 576 BLAKE2B 369226a1c4c228abdc46838f5225eb650c4d74a2db5b9e3cfb14bc583e1e0229206389ee0efcbb7dcf84e46f74de889bb9f30899cfc47826b1d043c7ee70d0e5 SHA512 9db6f350518a1bfd170086c261ade4aa6c720a22df37e70d1956abf514faba0d7ba812eb9054191f3a6a080216bb11bef132474a12397cfa56d294ffa634aa4b
+EBUILD terminology-9999.ebuild 633 BLAKE2B 1b678fd3b8dac053848d407580dcfaa9e90c50c2f21e472bfd75b1c8c3d8b29813fb7e22bbf93c493b01395260e8d0a09d5ed6a388074ba120aeef69a0eb69af SHA512 d8fce4e45f7990c60bf282e13392b3a2224e368ec6a8bea06796ad697ffb1de5fa1e14532b1d896d2da8c82c962323eb70029e34bc5b54ece30175e6e3c80f44
 MISC metadata.xml 258 BLAKE2B 6f5319cbc6d7bd06cd594c3891600067b2e1dee2d7450ad6b5a7eee0d6e3bf29242a3511f8a28e9e561c6dabe340ab93490e110c4dfe249da6831697c991e27e SHA512 59d30cd09990b755f6e1f0198e7ce860fe587038c5c020e44a9219aba431d96393ff0c5bdd5dd0db3512cc3d5c7b9992af242810204883663591432a0fa67997
diff --git a/x11-terms/terminology/terminology-9999.ebuild b/x11-terms/terminology/terminology-9999.ebuild
index f28072ea6386..141d654af246 100644
--- a/x11-terms/terminology/terminology-9999.ebuild
+++ b/x11-terms/terminology/terminology-9999.ebuild
@@ -1,23 +1,27 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 MY_P=${P/_/-}
 
-if [[ "${PV}" == "9999" ]] ; then
-	EGIT_SUB_PROJECT="apps"
-	EGIT_URI_APPEND="${PN}"
-else
+if [[ "${PV}" != "9999" ]] ; then
 	SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${MY_P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://git.enlightenment.org/apps/${PN}.git"
 fi
 
-inherit enlightenment
+inherit meson
 
 DESCRIPTION="Feature rich terminal emulator using the Enlightenment Foundation Libraries"
 HOMEPAGE="https://www.enlightenment.org/p.php?p=about/terminology"
 
-RDEPEND=">=dev-libs/efl-1.18"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=dev-libs/efl-1.18[X]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"