gentoo resync : 22.05.2021

3 files changed, 2 insertions, 102 deletions

diff --git a/sys-libs/gpm/Manifest b/sys-libs/gpm/Manifest
index d1c522b4e223..2368db65fd64 100644
--- a/sys-libs/gpm/Manifest
+++ b/sys-libs/gpm/Manifest
@@ -6,6 +6,5 @@ AUX gpm.rc6-2 553 BLAKE2B 609a2fe28fc0539e50eed703e2ed6c5a37d98737add953fe4f7d7a
 AUX gpm.service 218 BLAKE2B 728726976390bb394d479e424d5c1fafb9bc17d00e23a90218991527326c3fe88eb8d37b84707febbf28017ecaf5ec3559534e9d0571bfd100beec8c60ac25c0 SHA512 b3b258a2b0ed42256b16ae05e9c13baa3bca0d6d9d5d1ef489e2f8fbfc2a6a4d8f570a595f50f79fba9ad94ad3acbf0dfe098887f0ce799006916a08101f5bc2
 DIST gpm-1.20.7-docs.patch.xz 41668 BLAKE2B cab4649d0eda83c37474b68ac141fab84cbfaac4e18f0f42ad7c0a90d14bc39697b17c450e8a8dc8b1c960f6d9e7ff344ec15791df240f61a27ccfcd7d0a9171 SHA512 6cdcad70d0a77a56cb507330ff8409155de11255b5e61fb92ee439c1e117932c346df475f4187abb0e348ee4c28fa235a9693883b1c36913e91404662df272f4
 DIST gpm-1.20.7.tar.lzma 789691 BLAKE2B 5dbceedaa330d5f1ead8b2267fb5844cfd284627e085edd784a72365830a700f9a6a97f96afb4aa00a44ddbae735ef23be7eafc97a65f6250d72e15b359486c7 SHA512 a502741e2f457b47e41c6d155b1f7ef7c95384fd394503f82ddacf80cde9cdc286c906c77be12b6af8565ef1c3ab24d226379c1dcebcfcd15d64bcf3e94b63b9
-EBUILD gpm-1.20.7-r2.ebuild 2263 BLAKE2B f45fabd30bdeb35161285283c74ff002e8fb53d45ad58823e428aa189b9591285f725a9c5a15748a54cb847b64498011fa151b4683aacfebffe22dd687cf5fc4 SHA512 192f200125c573faf7cc717ddf4bdd57c08b0d915a3858f4f7c431e2ca73e23fd78efb01df470811d72a562f133b2fa7b89294a0bbd91bf672b8de9b842c4791
-EBUILD gpm-1.20.7-r3.ebuild 2392 BLAKE2B ecac18d99e78814e945312f5ae6a22f1b1e434274bca189b9ef0de1ccb130796b6f1bb48b0b67e5de7634e48eb3a02e1404ed0bf5685258f6934bf7eca9bb05f SHA512 6a94c4386189e40c86c2aaaa4ed80f7a372f5a0786ca17e4cde80346ade3a2b28e50d7fd2727285a909c300b5af03c5d65b6c97d6694d3fa906f732668aed85a
+EBUILD gpm-1.20.7-r3.ebuild 2384 BLAKE2B b54374cfe57825cac1cd3dbea8994b9087333316bcd858d6d0e94af55cdb7d840adb7884824a87b10b1e7714f43cdb61a41bc61af6136265f9de6cb7ab9c6083 SHA512 ff917fae60b9398a205ca3cefb477f4f872867192ca540abc69cf21d59b25af2b51b01d0255d73838a7ceb6630f885e2a6140a1d1ea72357fe82af248c1deb2e
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-libs/gpm/gpm-1.20.7-r2.ebuild b/sys-libs/gpm/gpm-1.20.7-r2.ebuild
deleted file mode 100644
index 15121136759d..000000000000
--- a/sys-libs/gpm/gpm-1.20.7-r2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# emacs support disabled due to #99533 #335900
-
-EAPI=5
-
-inherit epatch systemd autotools multilib-minimal usr-ldscript
-
-DESCRIPTION="Console-based mouse driver"
-HOMEPAGE="https://www.nico.schottelius.org/software/gpm/"
-SRC_URI="https://www.nico.schottelius.org/software/${PN}/archives/${P}.tar.lzma
-	mirror://gentoo/${P}-docs.patch.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="selinux static-libs"
-
-RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
-	selinux? ( sec-policy/selinux-gpm )"
-DEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
-	app-arch/xz-utils
-	sys-apps/texinfo
-	virtual/yacc"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-sysmacros.patch
-
-	# Hack up the docs until we get this sorted upstream.
-	# https://github.com/telmich/gpm/issues/8
-	epatch "${WORKDIR}"/${P}-docs.patch
-	touch -r . doc/* || die
-
-	# bug #629774
-	epatch "${FILESDIR}"/${P}-glibc-2.26.patch
-
-	# bug #705878
-	epatch "${FILESDIR}"/${P}-gcc-10.patch
-
-	epatch_user
-
-	# fix ABI values
-	sed -i \
-		-e '/^abi_lev=/s:=.*:=1:' \
-		-e '/^abi_age=/s:=.*:=20:' \
-		configure.ac.footer || die
-	# Rebuild autotools since release doesn't include them.
-	# Should be fixed with the next release though.
-	# https://github.com/telmich/gpm/pull/15
-	sed -i -e '/ACLOCAL/,$d' autogen.sh || die
-	./autogen.sh
-	eautoreconf
-
-	# Out-of-tree builds are broken.
-	# https://github.com/telmich/gpm/issues/16
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		--sysconfdir=/etc/gpm \
-		$(use_enable static-libs static) \
-		emacs=/bin/false
-}
-
-_emake() {
-	emake \
-		EMACS=: ELISP="" \
-		$(multilib_is_native_abi || echo "PROG= ") \
-		"$@"
-}
-
-multilib_src_compile() {
-	_emake
-}
-
-multilib_src_test() {
-	_emake check
-}
-
-multilib_src_install() {
-	_emake DESTDIR="${D}" install
-
-	dosym libgpm.so.1 /usr/$(get_libdir)/libgpm.so
-	gen_usr_ldscript -a gpm
-}
-
-multilib_src_install_all() {
-	insinto /etc/gpm
-	doins conf/gpm-*.conf
-
-	dodoc README TODO
-	dodoc doc/Announce doc/FAQ doc/README*
-
-	newinitd "${FILESDIR}"/gpm.rc6-2 gpm
-	newconfd "${FILESDIR}"/gpm.conf.d gpm
-	systemd_dounit "${FILESDIR}"/gpm.service
-}
diff --git a/sys-libs/gpm/gpm-1.20.7-r3.ebuild b/sys-libs/gpm/gpm-1.20.7-r3.ebuild
index 22f9f5d1a4aa..7554d790cd56 100644
--- a/sys-libs/gpm/gpm-1.20.7-r3.ebuild
+++ b/sys-libs/gpm/gpm-1.20.7-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="selinux"
 
 RDEPEND="