7 files changed, 96 insertions, 16 deletions
diff --git a/app-emulation/gxemul/Manifest b/app-emulation/gxemul/Manifest
index 841d402234fe..7b487db67bdc 100644
--- a/app-emulation/gxemul/Manifest
+++ b/app-emulation/gxemul/Manifest
@@ -1,6 +1,9 @@
-AUX 0.6.0-fix-mkstemp-test.patch 384 BLAKE2B d7a5f2f222bf4875cdcc695645ea9a042446e9f1874fad978da04a5c78fe6f1e0dbc89eb843b4c73d79d8f5f6aefe6141a6e179d004aa9d6d4aaac772b741493 SHA512 f4f1283c116d155af14dbb2f6f4a0f25300ce68593ec4ddc7f4841c38b34cdc8519e34d76a43032d31e5166cb514a66943e3e982852197de2bd3607ff5be1c9b
-AUX 0.6.0-fix-mymkstemp.patch 253 BLAKE2B 583b6717f5d15bc235fd1933be9c7ba70e560aaa8be84f5bc63caea28d00e715e1062a98d9af9a30259974e540c7abc9587ae46e9baa4bbd021646d0c319481e SHA512 e7117b95fc2559442ef444417f8b6e59246a4e1476674de70926d9a9e589b5d9d45ad82ec52fac9873e4f052e9c00087a18ad36c0caf4ae93ffa0852073d2e4b
-AUX 0.6.0-gcc46.patch 418 BLAKE2B e098bc1d64a911e9f9c67dda43bf4a1249ac450d88217f92938b9662b72d5f33b75f419ad12630bb9c8638b6e6aed5bdb487eb9e861f9d6563ed3a2d0d98f6a6 SHA512 0652b82645c75a56b24ed88e3cd9d68bdbbd927e64819aae22d61614db520dcb4fa8b9eab06b2ccd5c01f78d20008c587f3245c520b9bde0cafbc5cfdf3083c1
+AUX gxemul-0.6.0-fix-mkstemp-test.patch 384 BLAKE2B 35dd0ac35c1084f0abbff566ddf3233fd9b9fcb0c1224c5e70fc3df780102e5a1de3978893ed34ffc336d9d0e7eeacf590a9229d25c65fe257174adc706e42de SHA512 100c394683bfe340360a9c660aeccb39c40eba8c80511ef9929d0342fc7425a2bc1d8e001d8d9da5a16c439ad766fb7166c04662828e485520d501545c38bd54
+AUX gxemul-0.6.0-fix-mymkstemp.patch 253 BLAKE2B f25e1cace6f1c810b902f1d64a37bab72f6a108c6b5e9b1b49e200b6a4b454b5f42a4673e3544124b791036718bcb90e6da56d487b4f8c3cb81bd525b1afc26e SHA512 1f9093e61a0902651e67c1e6144191ca4eb33f28edccafb8f83f12b5a702aa56711165ac19c8e45192a47f393facfa60bcbfdd0014e911722d80953c16e83f7c
+AUX gxemul-0.6.0-gcc46.patch 418 BLAKE2B e098bc1d64a911e9f9c67dda43bf4a1249ac450d88217f92938b9662b72d5f33b75f419ad12630bb9c8638b6e6aed5bdb487eb9e861f9d6563ed3a2d0d98f6a6 SHA512 0652b82645c75a56b24ed88e3cd9d68bdbbd927e64819aae22d61614db520dcb4fa8b9eab06b2ccd5c01f78d20008c587f3245c520b9bde0cafbc5cfdf3083c1
+AUX gxemul-0.6.0-no-doxygen.patch 516 BLAKE2B 31a6fd2037bb2d69be439adbb6a907bc143f39cb682c33d355f5a43ab77e5636ab6c534ae06e303463166099ef22747e2cb54dc74ddef2a1b0876236571c84bd SHA512 f8672505817e9634dc574ed9eb5bfe738c3ada0e86d29b67dd03ba0458b49f7af9d10511882e5473713ec77e43b94c3c55ac4962e7335179ffb3e567ba41681c
 DIST gxemul-0.6.0.tar.gz 3598795 BLAKE2B 01bab252b8497379cc819899d9030fd267cf7679a90a421f435c6cb9ce84fedbdbd0ff23a11e0c91a17e41e166488562b4e173b3793cdbc2dd53b70701351429 SHA512 38108c7e4f1332bf80046a63e4a7c5e0fbce7f83a62fdeaa4518ef02947d7de83aac20b0307d286b7eb5d9c721b8400d449d4f244b2bc9358a2502fa21f56b73
-EBUILD gxemul-0.6.0-r1.ebuild 1024 BLAKE2B 9f2b58434d6eec76f7d2ec673f1e41236eac4689220b43e3d955f838c9fe8c7e8d458ba6278fe715a4f9d874c618a1e3b0cfc1f291ba0159d24331335d0ed0b0 SHA512 1b3afdca43d976dd370f6128269043da98b69356697085b8434d6b120b225e05f63588729b87f61100185dcca024543b830bd1b6f37792488da0e275ce5f7610
+DIST gxemul-0.6.2.tar.gz 5897883 BLAKE2B 9f5b76d955dc3e1a5b1623aaf491f18376456f33cfaa6a4c1633480980c35bb99172075135cfc1ca942ae3b0f34c4eb11c4aec4bc00272da8bb905176ddcea4a SHA512 4f389c509f9ecf39603ceed50e899e2bee285d3fefac9b3214076115ee71b5a7a68d1d92690b6debc8de5cf5f0303da83b3cc921a5c0b5eb4c7ad89baa730b59
+EBUILD gxemul-0.6.0-r1.ebuild 1078 BLAKE2B b136ac099a9a890b406f79234ab7899f567f2f0170cd377716323f3bd26a84ef422b7310df8495934143ab80af29992dc586f03c868727a265a4aa98fbab64be SHA512 a71fdf46aaa05a4727a374806a0f851b499bd41a7a2ca8a38fb31f57445dccd1acdaf7064b1f3d0d6935b8a1f5fb915ce0a9754d06da956b4cf0ff6077793495
+EBUILD gxemul-0.6.2.ebuild 969 BLAKE2B 4e47fea1b32b6c22e9b32e3ce03bfac77ae50db7b791c70b43c5b2d5c4bda7d7f5d24f95b0236cc3912676fd81c410255e1fc31ac95c653d67206f74e1a85db7 SHA512 4be52a5a04d8824dfb12e5e962a2c3c9d46417460d7c747f9417fec8ba284ebf654d343ff61d1206e17aef70bc09f7b6322eef70b078a251580187c323bfd38f
 MISC metadata.xml 422 BLAKE2B fafd4fe4407522b0d25cdd546c636eba02a245ccb86ec2affa49f479c069cd73aa677f524fd73e41c441f10fd759d96c82157b9a1f8d7fc3ff715fe35e1dc637 SHA512 78942cda34c7b5fe85d937f517846730a76c2b52688a871c683630c122db7fb4ae8db2fbc8a03fa06218e2c3d18ffc406692f81b021ae5613a818feefa54513a
diff --git a/app-emulation/gxemul/files/0.6.0-fix-mkstemp-test.patch b/app-emulation/gxemul/files/gxemul-0.6.0-fix-mkstemp-test.patch
index 88883309b909..cf8b18379cd4 100644
--- a/app-emulation/gxemul/files/0.6.0-fix-mkstemp-test.patch
+++ b/app-emulation/gxemul/files/gxemul-0.6.0-fix-mkstemp-test.patch
@@ -1,5 +1,5 @@
---- configure	2012-11-03 09:08:09.373041529 +0000
-+++ configure.new	2012-11-03 09:08:31.999585979 +0000
+--- a/configure	2012-11-03 09:08:09.373041529 +0000
++++ b/configure	2012-11-03 09:08:31.999585979 +0000
 @@ -705,6 +705,7 @@
  #  mkstemp missing?
  printf "checking for mkstemp... "
diff --git a/app-emulation/gxemul/files/0.6.0-fix-mymkstemp.patch b/app-emulation/gxemul/files/gxemul-0.6.0-fix-mymkstemp.patch
index 80d69f92c827..c9e21bcc4b33 100644
--- a/app-emulation/gxemul/files/0.6.0-fix-mymkstemp.patch
+++ b/app-emulation/gxemul/files/gxemul-0.6.0-fix-mymkstemp.patch
@@ -1,5 +1,5 @@
---- src/old_main/misc.cc	2012-11-03 08:47:34.309732354 +0000
-+++ src/old_main/misc.cc.new	2012-11-03 08:47:02.096573614 +0000
+--- a/src/old_main/misc.cc	2012-11-03 08:47:34.309732354 +0000
++++ b/src/old_main/misc.cc	2012-11-03 08:47:02.096573614 +0000
 @@ -122,7 +122,7 @@
  		p++;
  	}
diff --git a/app-emulation/gxemul/files/0.6.0-gcc46.patch b/app-emulation/gxemul/files/gxemul-0.6.0-gcc46.patch
index eb0ce26b6e1c..eb0ce26b6e1c 100644
--- a/app-emulation/gxemul/files/0.6.0-gcc46.patch
+++ b/app-emulation/gxemul/files/gxemul-0.6.0-gcc46.patch
diff --git a/app-emulation/gxemul/files/gxemul-0.6.0-no-doxygen.patch b/app-emulation/gxemul/files/gxemul-0.6.0-no-doxygen.patch
new file mode 100644
index 000000000000..ea0a20cba061
--- /dev/null
+++ b/app-emulation/gxemul/files/gxemul-0.6.0-no-doxygen.patch
@@ -0,0 +1,21 @@
+We already have pre-generated docs. Don't bother looking for Doxygen.
+----
+diff --git a/configure b/configure
+index c366701..3895d4f 100755
+--- a/configure
++++ b/configure
+@@ -1106,13 +1106,7 @@ rm -f _test_end*
+ 
+ printf "checking for Doxygen... "
+ 
+-if (doxygen --version); then
+-	# Version is printed, if found.
+-	DOXYGEN=doxygen
+-else
+-	# Not found is already printed, if doxygen is not found.
+-	DOXYGEN="\#"
+-fi
++DOXYGEN="\#"
+ 
+ 
+ ###############################################################################
diff --git a/app-emulation/gxemul/gxemul-0.6.0-r1.ebuild b/app-emulation/gxemul/gxemul-0.6.0-r1.ebuild
index c928aefaf117..2dd8d8087fa6 100644
--- a/app-emulation/gxemul/gxemul-0.6.0-r1.ebuild
+++ b/app-emulation/gxemul/gxemul-0.6.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A Machine Emulator, Mainly emulates MIPS, but supports other CPU types"
 HOMEPAGE="http://gxemul.sourceforge.net/"
@@ -18,10 +18,16 @@ RDEPEND="X? ( x11-libs/libX11 )"
 DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.0-gcc46.patch
+	"${FILESDIR}"/${P}-fix-mymkstemp.patch # Bug 441558
+	"${FILESDIR}"/${P}-fix-mkstemp-test.patch # Bug 441558
+	"${FILESDIR}"/${PN}-0.6.0-no-doxygen.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PV}-gcc46.patch
-	epatch "${FILESDIR}"/${PV}-fix-mymkstemp.patch # Bug 441558
-	epatch "${FILESDIR}"/${PV}-fix-mkstemp-test.patch # Bug 441558
+	default
+
 	sed -i configure -e 's|-O3||g' || die "sed configure"
 	tc-export CC CXX
 }
@@ -31,12 +37,14 @@ src_configure() {
 	./configure \
 		--disable-valgrind \
 		$(use debug && echo --debug) \
-		$(use X || echo --disable-x) || die "configure failed"
+		$(use X || echo --disable-x) \
+	|| die "configure failed"
 }
 
 src_install() {
 	dobin gxemul
 	doman man/gxemul.1
 	dodoc HISTORY README
-	dohtml -r doc/*
+	docinto html
+	dodoc -r doc/.
 }
diff --git a/app-emulation/gxemul/gxemul-0.6.2.ebuild b/app-emulation/gxemul/gxemul-0.6.2.ebuild
new file mode 100644
index 000000000000..4f73577a5ce6
--- /dev/null
+++ b/app-emulation/gxemul/gxemul-0.6.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A Machine Emulator, Mainly emulates MIPS, but supports other CPU types"
+HOMEPAGE="http://gxemul.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/gxemul/GXemul/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
+IUSE="debug X"
+
+RDEPEND="X? ( x11-libs/libX11 )"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.0-gcc46.patch
+	"${FILESDIR}"/${PN}-0.6.0-no-doxygen.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i configure -e 's|-O3||g' || die "sed configure"
+	tc-export CC CXX
+}
+
+src_configure() {
+	# no autotools
+	./configure \
+		--disable-valgrind \
+		$(use debug && echo --debug) \
+		$(use X || echo --disable-x) \
+	|| die "configure failed"
+}
+
+src_install() {
+	dobin gxemul
+	doman man/gxemul.1
+	dodoc HISTORY README
+	docinto html
+	dodoc -r doc/.
+}