gentoo auto-resync : 09:04:2023 - 05:33:50

3 files changed, 3 insertions, 88 deletions

diff --git a/x11-terms/aterm/Manifest b/x11-terms/aterm/Manifest
index aae766013dbe..6d80ca77f8d1 100644
--- a/x11-terms/aterm/Manifest
+++ b/x11-terms/aterm/Manifest
@@ -4,6 +4,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-r5.ebuild 1814 BLAKE2B 5fc3a7dcf23c80ee12dcb0d671dc385406a42a33230ef18ecd688455c75f431cda008bbfd37e252e64f8cc60d20f0fe262ba2c3a7f9e5e722a965560467b4329 SHA512 5d1b043d78325956429bca10a06eb34b5fcc3dd44a3686da3b9b012e88df51b26b2e5d03f8eaadd1b2b00ebb3705eba2f9577dcf5497406955ccd767c345f117
-EBUILD aterm-1.0.1-r6.ebuild 2022 BLAKE2B 102f807052567f27a75a8b02d2d23ed963d0951f44bd00cab790ed3b189a22f60fd54aa5c59a1de41fb7f5b3c1ee7541e6e5b3bfe1c0e863ea74c30183c8b777 SHA512 28d892ae1db1dc36a8da9ac76f1818f5ed736f4be8fb51a74dde9739e8c6596724fedd6119ca4ce2c80c4215860491daddda37925a505d8d18d493758aceac42
+EBUILD aterm-1.0.1-r6.ebuild 2021 BLAKE2B cc708f8a8bc5ac7c965fcddea4f753e45f3bb965e46546923f2e9dd577741a6feddd28dee540095e0f2656e5e9cd11c2ecf2fd8bcec9795a2b899bdd764ee2aa SHA512 20fc045474a2a5ed50122388cc6a175dd41a22e01d833a22c76b416a30ac0f1e47373b550a5e290894aa437d3bb9788a1ad9f1e88311f59524b97f8c68deb93c
 MISC metadata.xml 658 BLAKE2B 30e6dc08c1f0c00969cc695bcec0cda2d86b5d3b0a0ce11885c4405fa2e6fde85ce66b5c6558afa7e0515d52bac105e472874352732d0eab7d24eab11e0d4832 SHA512 3bf1d07d70812b6432cfde5815d4566e5d755d8bcb30accb3fe7fccfd72d524cc6542f89ec0a3ee4cfba05db9f5f42ad4edce3812bcf9521f0a2871450cb9830
diff --git a/x11-terms/aterm/aterm-1.0.1-r5.ebuild b/x11-terms/aterm/aterm-1.0.1-r5.ebuild
deleted file mode 100644
index 6d10a56641ed..000000000000
--- a/x11-terms/aterm/aterm-1.0.1-r5.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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="
-	media-libs/libjpeg-turbo:0=
-	media-libs/libpng:0=
-	background? ( media-libs/libafterimage )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libICE
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXt
-"
-
-PATCHES=(
-	# Security bug #219746
-	"${FILESDIR}/${P}-display-security-issue.patch"
-	"${FILESDIR}/${P}-deadkeys.patch"
-	"${FILESDIR}/${P}-dpy.patch"
-	"${FILESDIR}/${P}-remove-streams.patch"
-)
-
-src_prepare() {
-	# 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_with background afterimage-config "${EPREFIX}"/usr/bin) \
-		--with-terminfo="${EPREFIX}"/usr/share/terminfo \
-		--enable-transparency \
-		--with-x \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	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-r6.ebuild b/x11-terms/aterm/aterm-1.0.1-r6.ebuild
index 382b049ea5f1..b714dc1a6c5a 100644
--- a/x11-terms/aterm/aterm-1.0.1-r6.ebuild
+++ b/x11-terms/aterm/aterm-1.0.1-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ 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="