gentoo resync : 18.12.2017

3 files changed, 2 insertions, 87 deletions

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="