diff --git a/dev-embedded/gpsim/Manifest b/dev-embedded/gpsim/Manifest
index 3d9d4b8..f669f8c 100644
--- a/dev-embedded/gpsim/Manifest
+++ b/dev-embedded/gpsim/Manifest
@@ -1,3 +1,3 @@
 DIST gpsim-0.31.0.tar.gz 3454179 BLAKE2B 449f891c7a765ce06da87c8de1a8adc0d7e15c9af175fc2988d604660108c14cc816247358a71bbb55813c5144f6973c01d3c9c27c44f2a45820b85cedc97d2c SHA512 a6af7e9170cee11c35f0e4731d39876e563edd8ca9cbd0f4b3017f224e5317b4c8bcc8aa4468102fa5c11157f487b6c7354e3aba8778842ed0b5be9bbb9ef45f
 EBUILD gpsim-0.31.0.ebuild 955 BLAKE2B 7ae00791751b242603a8ef1ad765c546c0bbd77c7b8abc1a4b49df856095a7aac7b24aecb574482a226ce3905cda27ef2d2c7e20caa2c778d8f16ff3775eb58f SHA512 ca2483aa7c51f84bb7fb0bc1a5ec717eee4dfaba7dd3b9c12b35bedd1415210cb87a2b9d15bfa0327b50ca9b3cb8180f1848c8b01a7b32dbabae20fb9c932c0b
-EBUILD gpsim-9999.ebuild 1134 BLAKE2B 1cf20deca03cfdf1cd52b748be12b895970ac6352b3a59e1ecdf715d10f811540980a963c46292c1a14a70a21ddc75aa364408a39d50a4eccd47f905606dcb11 SHA512 b5f9108f282050476373e3ef00d6d3c868f8dbcbc3513934f63c35e436de4e366a4ad1d09b0639b60a2e81560560bad0f61a1f47ad509f001da129ddadea6e63
+EBUILD gpsim-9999.ebuild 1549 BLAKE2B 79f20565a2ec36e43d3d8580882fec5d7d87a5d8a6f65d9e80334cf9d83baf12e38996f73204826305e56c281dea827d877d28bb455c7591cce14ab1163f842c SHA512 268dc1964ac8cf2ba122b8bae0716a8778185f50be64957fa505b3a776f631f6b1a082ef93bf978a2e803322a4b480c1da026f1425213afce2b3c90e2b215974
diff --git a/dev-embedded/gpsim/gpsim-9999.ebuild b/dev-embedded/gpsim/gpsim-9999.ebuild
index 74c0650..7605ad1 100644
--- a/dev-embedded/gpsim/gpsim-9999.ebuild
+++ b/dev-embedded/gpsim/gpsim-9999.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2020 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit ltprune
+EAPI=7
 
 if [[ ${PV} == "9999" ]] ; then
         inherit autotools subversion
@@ -18,7 +17,7 @@ HOMEPAGE="http://gpsim.sourceforge.net"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="doc gtk static-libs"
+IUSE="+doc +gtk static-libs"
 
 RDEPEND=">=dev-embedded/gputils-0.12
 	dev-libs/glib:2
@@ -28,13 +27,17 @@ RDEPEND=">=dev-embedded/gputils-0.12
 DEPEND="${RDEPEND}
 	sys-devel/flex
 	virtual/pkgconfig
-	virtual/yacc"
+	virtual/yacc
+	doc? ( app-office/lyx )"
 
 DOCS=( ANNOUNCE AUTHORS ChangeLog HISTORY PROCESSORS README README.MODULES TODO )
 
 src_prepare() {
 	default
 
+	sed -i "${S}/doc/Makefile.am" \
+		-e "s|lyx -e|lyx -userdir $WORKDIR -e|" || die
+
 	if [[ ${PV} == "9999" ]] ; then
 		eautoreconf
 	fi
@@ -47,10 +50,22 @@ src_configure() {
 		--enable-undefined-sanitize \
 		$(use_enable gtk gui) \
 		$(use_enable static-libs static)
+
+	use doc || sed -i "${S}/Makefile" \
+		-e "s/SUBDIRS = \(.*\)doc/SUBDIRS = \1/" || die
+}
+
+src_compile() {
+	emake config.h
+	cd "${S}/extras" && emake libgpsim_extras.la
+	cd "${S}/eXdbm" && emake
+	cd "${S}/src" && emake
+	cd "${S}/modules" && emake libgpsim_modules.la
+	cd "${S}" && emake all-recursive
 }
 
 src_install() {
 	default
 	use doc && dodoc doc/gpsim.pdf
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }