gentoo resync : 12.05.2022

3 files changed, 3 insertions, 92 deletions

diff --git a/x11-terms/aterm/Manifest b/x11-terms/aterm/Manifest
index fd7a70fb5977..c56d430477e3 100644
--- a/x11-terms/aterm/Manifest
+++ b/x11-terms/aterm/Manifest
@@ -3,6 +3,5 @@ AUX aterm-1.0.1-display-security-issue.patch 797 BLAKE2B 2f3d4bcc2c7e705106c6c1e
 AUX aterm-1.0.1-dpy.patch 848 BLAKE2B 27325ce9a768ad44ab4d6e875e8b2c85c5e1cb419e4578d14a8bd960c754a5a3cce4646dc40e266f4e32a4fdffa2cddb395fd0af404405ac75d9578f61f8e061 SHA512 5d4040cf5c5933e91348531a271cf9687387a740312b12f5185f41877e91f58a0c216e5ad67be19bf47607b23eb9e1b31ca577ceed2a0239a01118073716c2bc
 AUX aterm-1.0.1-remove-streams.patch 1108 BLAKE2B df7ee9b3409127ab82dc110035baa2b91f4d785874febb615d6d864bc4e5561b371707c7acc25096f59a646468b83a0cba27d2270f57ab80564dcc8b541b50e2 SHA512 d0ee1e6edee1e4b936b4179d9673e78f7bc70266f6d576d88ae76c9e87f4ae939baeaf0d62ba2b19cb1195cc3f4e1e111608ed493d56de4531ffb11257d2967d
 DIST aterm-1.0.1.tar.bz2 276810 BLAKE2B 05d8e70caf20bfe2170ffcea2231b6a1bca0ff3414867bb9e48785e4822112a82868793c0b25f7111545b835aff61852f78461166a574288bc238146226be745 SHA512 05c78590bba55d892d9f7add384e4ae8d56197dbcd9caff2be4a52d5c162e767a464359ba806fc95961d8035575a2b4a962fc35cfa44f95025b477fa3e15e56b
-EBUILD aterm-1.0.1-r4.ebuild 1938 BLAKE2B 5caa5b800459dcd5a976191d909e8dd04f917d219ed7b0b90494421a9af163f84fd2e06a821aeda7f60bd8adfed0aabce388534a7e4eea86c6bd42eba28a19eb SHA512 b202b7be0fe2b02748214fcc2b56034722feaeb91ac6f988af25b3e7a5691b236db8aa86c8128422c54107172f1d03092446e4e86ab10f5d25fc2200dc4a35d0
-EBUILD aterm-1.0.1-r5.ebuild 1802 BLAKE2B 69bd45b1ce9cfbf4c2097d3ce9f65790f3e3e4ca0bccb725037ea2668302894a7a67882f4c94248b341f0da738fae3d51015ff60232c6ec5e668a9df9224eadc SHA512 b3720f86c26321de41559caa2f1b6dd71a1d3cc31ab7b668180703d20577ad00b9d02765e8e0781d81aedc80a722820bd34df648d12b5e29fbf2d9e1d343be1d
+EBUILD aterm-1.0.1-r5.ebuild 1814 BLAKE2B 5fc3a7dcf23c80ee12dcb0d671dc385406a42a33230ef18ecd688455c75f431cda008bbfd37e252e64f8cc60d20f0fe262ba2c3a7f9e5e722a965560467b4329 SHA512 5d1b043d78325956429bca10a06eb34b5fcc3dd44a3686da3b9b012e88df51b26b2e5d03f8eaadd1b2b00ebb3705eba2f9577dcf5497406955ccd767c345f117
 MISC metadata.xml 658 BLAKE2B 30e6dc08c1f0c00969cc695bcec0cda2d86b5d3b0a0ce11885c4405fa2e6fde85ce66b5c6558afa7e0515d52bac105e472874352732d0eab7d24eab11e0d4832 SHA512 3bf1d07d70812b6432cfde5815d4566e5d755d8bcb30accb3fe7fccfd72d524cc6542f89ec0a3ee4cfba05db9f5f42ad4edce3812bcf9521f0a2871450cb9830
diff --git a/x11-terms/aterm/aterm-1.0.1-r4.ebuild b/x11-terms/aterm/aterm-1.0.1-r4.ebuild
deleted file mode 100644
index 8cad83593e22..000000000000
--- a/x11-terms/aterm/aterm-1.0.1-r4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="rxvt compatible terminal emulator with transparency support"
-HOMEPAGE="http://aterm.sourceforge.net"
-SRC_URI="ftp://ftp.afterstep.org/apps/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="background cjk xgetdefault"
-
-RDEPEND="
-	virtual/jpeg:0
-	media-libs/libpng:0=
-	background? ( x11-wm/afterstep )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libICE
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXt
-"
-
-src_prepare() {
-	# Security bug #219746
-	eapply "${FILESDIR}/${P}-display-security-issue.patch"
-	eapply "${FILESDIR}"/${P}-deadkeys.patch
-	eapply "${FILESDIR}/${P}-dpy.patch"
-	eapply "${FILESDIR}/${P}-remove-streams.patch"
-
-	#fix pre-stripped files
-	sed -i -e "/INSTALL_PROGRAM/ s:-s::" autoconf/Make.common.in || die "sed Makefile failed"
-
-	default
-}
-
-src_configure() {
-	local myconf
-
-	use cjk && myconf="$myconf
-		--enable-kanji
-		--enable-thai
-		--enable-big5"
-
-	case "${CHOST}" in
-		*-darwin*) myconf="${myconf} --enable-wtmp" ;;
-		*-interix*) ;;
-		*) myconf="${myconf} --enable-utmp --enable-wtmp"
-	esac
-
-	econf \
-		$(use_enable xgetdefault) \
-		$(use_enable background background-image) \
-		--with-terminfo="${EPREFIX}"/usr/share/terminfo \
-		--enable-transparency \
-		--enable-fading \
-		--enable-background-image \
-		--enable-menubar \
-		--enable-graphics \
-		--with-x \
-		${myconf}
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	fowners root:utmp /usr/bin/aterm
-	fperms g+s /usr/bin/aterm
-
-	doman doc/aterm.1
-	dodoc ChangeLog doc/FAQ doc/README.*
-	docinto menu
-	dodoc doc/menu/*
-}
-
-pkg_postinst() {
-	echo
-	elog "The transparent background will only work if you have the 'real'"
-	elog "root wallpaper set. Some tools that might help include:"
-	elog "wmsetbg (x11-wm/windowmaker), and/or media-gfx/feh."
-	echo
-}
diff --git a/x11-terms/aterm/aterm-1.0.1-r5.ebuild b/x11-terms/aterm/aterm-1.0.1-r5.ebuild
index 4a5122d171eb..6d10a56641ed 100644
--- a/x11-terms/aterm/aterm-1.0.1-r5.ebuild
+++ b/x11-terms/aterm/aterm-1.0.1-r5.ebuild
@@ -9,11 +9,11 @@ SRC_URI="ftp://ftp.afterstep.org/apps/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="background cjk xgetdefault"
 
 RDEPEND="
-	virtual/jpeg:0
+	media-libs/libjpeg-turbo:0=
 	media-libs/libpng:0=
 	background? ( media-libs/libafterimage )
 	x11-libs/libX11