From 00130101a7fb88f14b3685dbcdb8dc3c56a04fdf Mon Sep 17 00:00:00 2001 From: Sam James Date: Tue, 15 Sep 2020 03:09:33 +0000 Subject: app-emulation/gxemul: bump to EAPI 7 Closes: https://bugs.gentoo.org/742050 Closes: https://bugs.gentoo.org/734226 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Sam James --- .../gxemul/files/0.6.0-fix-mkstemp-test.patch | 10 --------- .../gxemul/files/0.6.0-fix-mymkstemp.patch | 11 ---------- app-emulation/gxemul/files/0.6.0-gcc46.patch | 16 --------------- .../files/gxemul-0.6.0-fix-mkstemp-test.patch | 10 +++++++++ .../gxemul/files/gxemul-0.6.0-fix-mymkstemp.patch | 11 ++++++++++ .../gxemul/files/gxemul-0.6.0-gcc46.patch | 16 +++++++++++++++ .../gxemul/files/gxemul-0.6.0-no-doxygen.patch | 21 +++++++++++++++++++ app-emulation/gxemul/gxemul-0.6.0-r1.ebuild | 24 ++++++++++++++-------- 8 files changed, 74 insertions(+), 45 deletions(-) delete mode 100644 app-emulation/gxemul/files/0.6.0-fix-mkstemp-test.patch delete mode 100644 app-emulation/gxemul/files/0.6.0-fix-mymkstemp.patch delete mode 100644 app-emulation/gxemul/files/0.6.0-gcc46.patch create mode 100644 app-emulation/gxemul/files/gxemul-0.6.0-fix-mkstemp-test.patch create mode 100644 app-emulation/gxemul/files/gxemul-0.6.0-fix-mymkstemp.patch create mode 100644 app-emulation/gxemul/files/gxemul-0.6.0-gcc46.patch create mode 100644 app-emulation/gxemul/files/gxemul-0.6.0-no-doxygen.patch diff --git a/app-emulation/gxemul/files/0.6.0-fix-mkstemp-test.patch b/app-emulation/gxemul/files/0.6.0-fix-mkstemp-test.patch deleted file mode 100644 index 88883309b909..000000000000 --- a/app-emulation/gxemul/files/0.6.0-fix-mkstemp-test.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure 2012-11-03 09:08:09.373041529 +0000 -+++ configure.new 2012-11-03 09:08:31.999585979 +0000 -@@ -705,6 +705,7 @@ - # mkstemp missing? - printf "checking for mkstemp... " - printf "#include -+#include - int main(int argc, char *argv[]) { int x; char *y = \"abc\"; - x = mkstemp(y); return 0;}\n" > _tests.cc - $CXX $CXXFLAGS _tests.cc -o _tests 2> /dev/null diff --git a/app-emulation/gxemul/files/0.6.0-fix-mymkstemp.patch b/app-emulation/gxemul/files/0.6.0-fix-mymkstemp.patch deleted file mode 100644 index 80d69f92c827..000000000000 --- a/app-emulation/gxemul/files/0.6.0-fix-mymkstemp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 -@@ -122,7 +122,7 @@ - p++; - } - -- h = open(templ, O_RDWR, 0600); -+ h = open(templ, O_CREAT | O_RDWR, 0600); - return h; - } - diff --git a/app-emulation/gxemul/files/0.6.0-gcc46.patch b/app-emulation/gxemul/files/0.6.0-gcc46.patch deleted file mode 100644 index eb0ce26b6e1c..000000000000 --- a/app-emulation/gxemul/files/0.6.0-gcc46.patch +++ /dev/null @@ -1,16 +0,0 @@ - src/include/refcount_ptr.h | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/src/include/refcount_ptr.h b/src/include/refcount_ptr.h -index 4645769..ebabd58 100644 ---- a/src/include/refcount_ptr.h -+++ b/src/include/refcount_ptr.h -@@ -1,6 +1,8 @@ - #ifndef REFCOUNT_PTR_H - #define REFCOUNT_PTR_H - -+#include -+ - /* - * Copyright (C) 2007-2010 Anders Gavare. All rights reserved. - * diff --git a/app-emulation/gxemul/files/gxemul-0.6.0-fix-mkstemp-test.patch b/app-emulation/gxemul/files/gxemul-0.6.0-fix-mkstemp-test.patch new file mode 100644 index 000000000000..cf8b18379cd4 --- /dev/null +++ b/app-emulation/gxemul/files/gxemul-0.6.0-fix-mkstemp-test.patch @@ -0,0 +1,10 @@ +--- 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... " + printf "#include ++#include + int main(int argc, char *argv[]) { int x; char *y = \"abc\"; + x = mkstemp(y); return 0;}\n" > _tests.cc + $CXX $CXXFLAGS _tests.cc -o _tests 2> /dev/null diff --git a/app-emulation/gxemul/files/gxemul-0.6.0-fix-mymkstemp.patch b/app-emulation/gxemul/files/gxemul-0.6.0-fix-mymkstemp.patch new file mode 100644 index 000000000000..c9e21bcc4b33 --- /dev/null +++ b/app-emulation/gxemul/files/gxemul-0.6.0-fix-mymkstemp.patch @@ -0,0 +1,11 @@ +--- 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++; + } + +- h = open(templ, O_RDWR, 0600); ++ h = open(templ, O_CREAT | O_RDWR, 0600); + return h; + } + diff --git a/app-emulation/gxemul/files/gxemul-0.6.0-gcc46.patch b/app-emulation/gxemul/files/gxemul-0.6.0-gcc46.patch new file mode 100644 index 000000000000..eb0ce26b6e1c --- /dev/null +++ b/app-emulation/gxemul/files/gxemul-0.6.0-gcc46.patch @@ -0,0 +1,16 @@ + src/include/refcount_ptr.h | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/src/include/refcount_ptr.h b/src/include/refcount_ptr.h +index 4645769..ebabd58 100644 +--- a/src/include/refcount_ptr.h ++++ b/src/include/refcount_ptr.h +@@ -1,6 +1,8 @@ + #ifndef REFCOUNT_PTR_H + #define REFCOUNT_PTR_H + ++#include ++ + /* + * Copyright (C) 2007-2010 Anders Gavare. All rights reserved. + * 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/. } -- cgit v1.2.3-65-gdbad