sys-libs/gpm: fix manifest

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>

2 files changed, 36 insertions, 15 deletions

diff --git a/sys-libs/gpm/Manifest b/sys-libs/gpm/Manifest
index 6544be5a..971a21ae 100644
--- a/sys-libs/gpm/Manifest
+++ b/sys-libs/gpm/Manifest
@@ -3,6 +3,7 @@ AUX gpm-1.20.7-musl-portable-sigaction.patch 649 SHA256 c129eebf3a6c21902e28262e
 AUX gpm.conf.d 580 SHA256 73e7483fdc4b12ab4225a4cb13bbe7da71b07b9e69b17e3a6a4c63cb5e2287c8 SHA512 14a4306a7454d1a12fda29973b51aadd6d1a5cf4833b1be5298cfe0c1ebc63a479cc79490007ae92c6ae24368e19215dfc4bd50ef5b0cfa0fef88cf69db67065 WHIRLPOOL 61039423b5749f65505db3d0c3355599f5776b8807b7e79720d9498916f1dc1312070209ec470375d0bcb9a36919ad0dbde1f5c6a283454c7ea9be3cc3e33c43
 AUX gpm.rc6-2 559 SHA256 a342f0d17362b193e4aca3b9f947c6248f2da410707fc8e81f85ef98dc816411 SHA512 76551425be39b01311c262435a1bb92cad5cbb7ac33b118a98d88d14f564aa225d6ba6c5caae40b83a70c35a3bd75506ad6521a2d62399300fbcb544c79063ab WHIRLPOOL 18655b40ec4e4be1ae273c1c5b0be43b5af7e63d44cb9ecd8a785e91fab2c7c9756ffc77e11775373938c4695e7c966b5b2e7f80389a62cfb3e012043d1a0304
 AUX gpm.service 222 SHA256 85f7d7144de8b2b941ba118ff1e6c0579ed825bbb34b576814b05cc45c5a067d SHA512 d710169f06a17aa372e88952bc67d1fb91c795349e9edc37f9c0bebf3bbd6502646ac9aac12ccbb5630b1b39143976e0780b9c7325d3610c3ac1683ffda7f05b WHIRLPOOL 6a7df1311c6f742168bd6aca9ec3c2def2f9755c9fa9f24b60e22a158f366636cefa2d430c5ee30d05dfccd2a576d981c32134052d207608dcf8fa0a8b292b0a
+DIST gpm-1.20.7-docs.patch.xz 41668 SHA256 a1b73e8916d1ae5e336a6c366c2be51b668176d743bb137a53c623f5a634faf6 SHA512 6cdcad70d0a77a56cb507330ff8409155de11255b5e61fb92ee439c1e117932c346df475f4187abb0e348ee4c28fa235a9693883b1c36913e91404662df272f4 WHIRLPOOL f6832979bc5b3ca1c61f150ab8795f744dc3d44fa404038dd5de97c4fd939e2e1fb4b40bcb27daf5cb81846a0841954dbfa5b8d6e37e341b834d9dce6382dcf1
 DIST gpm-1.20.7.tar.lzma 789691 SHA256 a955053b36556ffa7c628ce18fd6de7d625966573fa412fb08869533d8f7385c SHA512 a502741e2f457b47e41c6d155b1f7ef7c95384fd394503f82ddacf80cde9cdc286c906c77be12b6af8565ef1c3ab24d226379c1dcebcfcd15d64bcf3e94b63b9 WHIRLPOOL d3d142c3aa385e2ef4b16c96e0f94c04b3666376d893c516d439737c2f3016a12fff7884a8f18b5e6b58e4ba21d82379204b18621a2f338d8ab6d478e4e1ec1a
-EBUILD gpm-1.20.7-r99.ebuild 1918 SHA256 a4050c05984cf8987cf7da47f755a15cea8c108922c1959e4f65587f367bf5e4 SHA512 d753d2df145d1a607bee44a7d8cb08ec5d385b68158f9a4ea1bca7cd6329009f0fda9ac405cbb1933dbb3955d3571616372583185d63bb37462382f285a3e29d WHIRLPOOL d7a1905b004170e5b263dcb8e57ac74fc3aec6276f548dbce010ab2abfcc5d7aaac1aa702bbd3e15d9dc34725deffae55de883a47791d997ff5596d56d508ba9
+EBUILD gpm-1.20.7-r2.ebuild 2373 SHA256 2b78296ef3694eb6edbb9685511fed61fb56998679e868ff48819808d99a916b SHA512 2c1e09c90d0e1b64b27fc55f005604c66255e2f9186d924a2d57d04504d4b95b3abb248c9bb57c371c658e610756fc45f3da93ac5fee43d5bfb1fbe3c0531b35 WHIRLPOOL 7c0cd44c509787fefeeb39b36aaaeb845366944d0b4d6c8f79668a27b7f031ffdd4aac17db47beea93aa6cb2ebd7b25eba00af521f3636610a68685e73673d81
 MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
diff --git a/sys-libs/gpm/gpm-1.20.7-r2.ebuild b/sys-libs/gpm/gpm-1.20.7-r2.ebuild
index 16d7ff4b..6ce2d72f 100644
--- a/sys-libs/gpm/gpm-1.20.7-r2.ebuild
+++ b/sys-libs/gpm/gpm-1.20.7-r2.ebuild
@@ -3,42 +3,57 @@
 
 # emacs support disabled due to #99533 #335900
 
-EAPI="4"
+EAPI=5
 
 inherit eutils systemd toolchain-funcs autotools multilib-minimal
 
 DESCRIPTION="Console-based mouse driver"
 HOMEPAGE="http://www.nico.schottelius.org/software/gpm/"
-SRC_URI="http://www.nico.schottelius.org/software/${PN}/archives/${P}.tar.lzma"
+SRC_URI="http://www.nico.schottelius.org/software/${PN}/archives/${P}.tar.lzma
+	mirror://gentoo/${P}-docs.patch.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="selinux static-libs"
 
-RDEPEND=">=sys-libs/ncurses-5.9-r3[${MULTILIB_USEDEP}]
+RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
 	selinux? ( sec-policy/selinux-gpm )
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-baselibs-20130224-r12
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
 	)"
-DEPEND=">=sys-libs/ncurses-5.9-r3[${MULTILIB_USEDEP}]
+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
+
 	# 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
+
 	epatch "${FILESDIR}"/${P}-musl-missing-headers.patch
 	epatch "${FILESDIR}"/${P}-musl-portable-sigaction.patch
 
 	./autogen.sh
 	eautoreconf
+
+	# Out-of-tree builds are broken.
+	# https://github.com/telmich/gpm/issues/16
 	multilib_copy_sources
 }
 
@@ -49,21 +64,26 @@ multilib_src_configure() {
 		emacs=/bin/false
 }
 
+_emake() {
+	emake \
+		EMACS=: ELISP="" \
+		$(multilib_is_native_abi || echo "PROG= ") \
+		"$@"
+}
+
 multilib_src_compile() {
-	# make sure nothing compiled is left
-	emake clean
-	emake EMACS=: $(multilib_is_native_abi || echo "PROG= ")
+	_emake
+}
+
+multilib_src_test() {
+	_emake check
 }
 
 multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		EMACS=: ELISP="" \
-		$(multilib_is_native_abi || echo "PROG= ") \
-		install
+	_emake DESTDIR="${D}" install
 
 	dosym libgpm.so.1 /usr/$(get_libdir)/libgpm.so
-	multilib_is_native_abi && gen_usr_ldscript -a gpm
+	gen_usr_ldscript -a gpm
 }
 
 multilib_src_install_all() {