gentoo resync : 14.12.2020

3 files changed, 2 insertions, 94 deletions

diff --git a/x11-wm/ratpoison/Manifest b/x11-wm/ratpoison/Manifest
index d508d9dc21ad..d50a4cbff6fd 100644
--- a/x11-wm/ratpoison/Manifest
+++ b/x11-wm/ratpoison/Manifest
@@ -2,9 +2,7 @@ AUX 50ratpoison-gentoo.el 524 BLAKE2B bdee7d53d024fe1d6be49ff6d3815747448fe8f0c6
 AUX ratpoison.desktop 122 BLAKE2B f72c9cfdb0712eef05037b1fdedbc5806f6f4957d2d549bb1fc33d252feaa39b78478fad4b155a4b5984e1b8fffd7f8df78bfe6ab55849163e08625c1a858f58 SHA512 f94b9557636a130939ab29b440c07c64ebb6d9ab169ae32af87314d147a31c48f5a74721e85a7b7260b6ce1ad5172234958c8af075a2b0b1f308961f4f3fe12f
 AUX ratpoison.el-gentoo.patch 220 BLAKE2B 4c5339912466401efcc6a3a3e23178af24da58e27304a38053eaee7de6a025ae872049e6fc75f7480dba3fe31c89d04e537469ff54dbe421cb26b0e9fd228c20 SHA512 c9e0e322b0c632b6bd7cee0c34269accfd0cf2d12751b9f2a65955f5ae5aa72804f819ca0147da5e0ff571357b34460337668adc07ad77afdf7a50b512f6b36f
 AUX ratpoison.xsession 19 BLAKE2B fa3cca1a3a03b0b6da08f6976cd6436fd2e115961fd1c8b7f5603483b7be6e90a6f3f57e35ae06f9b9c609d3d02765c3e5e5085b10f80bd8abb6e7f51a29913c SHA512 684dbc8aa49355bac63254beaef79ec0d499f5f4d20976fae9daa686102c5120e564fc3a60eb9a770c0c648c998e49b63414fb92b8e5b5af0f5fc23695cd6b8e
-DIST ratpoison-1.4.8.tar.xz 364700 BLAKE2B 0422606cda247cd6c87f7d661b3a09edd51311f8ade6df95ce69be1ffef03fb2837adc4bf9eafa737d14d47e788ad4ff54885f3bb030acf278893a91f099a841 SHA512 10b44489e60d3186ca407a5bd87e23dbd737cdafee22ea7284ac4db8bb4463081af483460d1899161fbae2973f4d25fbd1bfd354e3ffb59735baf69bbd6f94f6
 DIST ratpoison-1.4.9.tar.xz 315584 BLAKE2B 18cff2ed835579b606ea99defda04db6ebaedc8bc71d3f7d12cf859caf908d427f50b345089ca3aae52a407ae763818d91a2dd4026c9b32ead95adfb2d065c25 SHA512 97f705efd2092b8e12528496890c59f613e6fcec010aca94a5a59bd641e22dfc50dd500a4b94af7a07553a8a6359f6bec4eee0db1a7ded29d7f051904b09beef
-EBUILD ratpoison-1.4.8-r1.ebuild 1806 BLAKE2B 0f89cf825b9e89482f2f78174a48a74bb082c81dd0a0f449b0355b98037f4f3369ee9025dd864b0f87c36ca867e0fe84042a3b5c3be7de04060081341c170e7f SHA512 ea3bdca5248dc8e71841717dc7af88b8b5342278aad37e64456cdf15b8036cc782df894ec7c1d537d9805cf23bdc633a41833bc1ad10b1582a631d46164b9f77
-EBUILD ratpoison-1.4.9.ebuild 1848 BLAKE2B 435bacde6d01720216be440df1ebe9aa933e9f546a33a5c7cb72f30399b1f6e6165ff99fdc44b0321f9a93807a17cac848a7963c42b2c8080424018adb363b3f SHA512 9ccb71e717e2e43b42cbdba32f475a837928fc5b7dc4066d9ee3aad1d9b613bc84806e5e0f505824b8cb398ed9365161a690290783305497e3fb213aefcb7866
+EBUILD ratpoison-1.4.9.ebuild 1847 BLAKE2B 8c538d24ea9856bdfc52706aae08a4e939f6530616e68f4d5f81caa458af013756a81d069f26e7d96cce11d0a9ad1d152784b5b4b5f3a759f783499f1b7bc197 SHA512 d73892acb71766c28d94c3771f0853b9fc586727ce747633a47f57595e5c075f74d3ff962670cb0cf1a7ddbc5a6f02aeabfcd8d732707865708beb83b36377ee
 EBUILD ratpoison-9999.ebuild 1849 BLAKE2B 980bdfe6a063c8fd949f123cadb2086684b06a708fe0aa0df8fc811121f4108ef68454f52405a0bec625c531900cd146a546104242b95240b56ddeb2df5ac1c9 SHA512 3a764c4fa0cc0e7a48d6f079c618faceb00fd0a5755e28f061811802e052683e9d4c304ae263d09af43f7d591a8d226ca0f8b5b5e26c782a8694883d908d3335
 MISC metadata.xml 994 BLAKE2B da7a977d643d540812fffa082f5cba76cd79728302533e77627825a08fb0bace3a2b3bb917cd8b6cd3cecd2c03182b72ac902909a4c7d575f8e2ea936a510953 SHA512 f64106b49cfcfb17e08d3c897be4de0ef3df083fded72804d9b0e0f4e2eedcc2c8c679dea96c59dcb41937b547497ac1445102c0a63ef965f92b450dda0edec4
diff --git a/x11-wm/ratpoison/ratpoison-1.4.8-r1.ebuild b/x11-wm/ratpoison/ratpoison-1.4.8-r1.ebuild
deleted file mode 100644
index 96f03c5961ba..000000000000
--- a/x11-wm/ratpoison/ratpoison-1.4.8-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit elisp-common eutils toolchain-funcs
-
-DESCRIPTION="window manager without mouse dependency"
-HOMEPAGE="http://www.nongnu.org/ratpoison/"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux"
-IUSE="debug emacs +history sloppy +xft"
-
-RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-	history? ( sys-libs/readline:= )
-	xft? ( x11-libs/libXft )
-	virtual/perl-Pod-Parser
-	x11-libs/libXinerama
-	x11-libs/libXtst
-"
-DEPEND="
-	${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-"
-
-SITEFILE=50ratpoison-gentoo.el
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_prepare() {
-	epatch "${FILESDIR}"/ratpoison.el-gentoo.patch
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable history) \
-		$(use_with xft)
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}"
-	if use emacs; then
-		elisp-compile contrib/ratpoison.el || die "elisp-compile failed"
-	fi
-
-	if use sloppy; then
-		pushd contrib
-		$(tc-getCC) \
-			${CFLAGS} \
-			${LDFLAGS} \
-			-o sloppy{,.c} \
-			$( $(tc-getPKG_CONFIG) --libs x11) \
-			|| die
-	fi
-}
-
-src_install() {
-	default
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/ratpoison.xsession ratpoison
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/${PN}.desktop
-
-	use sloppy && dobin contrib/sloppy
-
-	docinto example
-	dodoc contrib/{genrpbindings,split.sh} \
-		doc/{ipaq.ratpoisonrc,sample.ratpoisonrc}
-
-	rm -rf "${ED}/usr/share/"{doc/ratpoison,ratpoison}
-
-	if use emacs; then
-		elisp-install ${PN} contrib/ratpoison.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/x11-wm/ratpoison/ratpoison-1.4.9.ebuild b/x11-wm/ratpoison/ratpoison-1.4.9.ebuild
index 4c8158573b9c..2b0a855b17c6 100644
--- a/x11-wm/ratpoison/ratpoison-1.4.9.ebuild
+++ b/x11-wm/ratpoison/ratpoison-1.4.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux"
 IUSE="debug emacs +history sloppy +xft +xrandr"
 
 RDEPEND="