[gentoo-commits] repo/gentoo:master commit in: dev-libs/tvmet/, dev-libs/tvmet/files/

[Sam James]

commit:     292fe10e63f2190148344dfda03be5395466f924
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 20 00:26:35 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 20 01:20:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=292fe10e

dev-libs/tvmet: port to EAPI 7

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../tvmet/files/tvmet-1.7.2-respect-cxxflags.patch |  5 ++---
 dev-libs/tvmet/tvmet-1.7.2-r2.ebuild               | 23 ++++++++++++++--------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/dev-libs/tvmet/files/tvmet-1.7.2-respect-cxxflags.patch 
b/dev-libs/tvmet/files/tvmet-1.7.2-respect-cxxflags.patch
index 2749c913134..f2116434bca 100644
--- a/dev-libs/tvmet/files/tvmet-1.7.2-respect-cxxflags.patch
+++ b/dev-libs/tvmet/files/tvmet-1.7.2-respect-cxxflags.patch
@@ -1,6 +1,5 @@
-diff -ur tvmet-1.7.2-orig/configure tvmet-1.7.2/configure
---- tvmet-1.7.2-orig/configure 2009-04-19 16:27:20.000000000 -0400
-+++ tvmet-1.7.2/configure      2009-04-19 16:48:52.000000000 -0400
+--- a/configure
++++ b/configure
 @@ -2659,11 +2659,9 @@
       ;;
       *:*)                   # Simple initialization syntax

diff --git a/dev-libs/tvmet/tvmet-1.7.2-r2.ebuild 
b/dev-libs/tvmet/tvmet-1.7.2-r2.ebuild
index f382b9c7e94..17b51a76512 100644
--- a/dev-libs/tvmet/tvmet-1.7.2-r2.ebuild
+++ b/dev-libs/tvmet/tvmet-1.7.2-r2.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-
-inherit epatch
+EAPI=7
 
 DESCRIPTION="Tiny Vector Matrix library using Expression Templates"
 HOMEPAGE="http://tvmet.sourceforge.net/";
@@ -15,11 +13,15 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc test"
 RESTRICT="!test? ( test )"
 
-DEPEND="doc? ( app-doc/doxygen )
-       test? ( dev-util/cppunit )"
+BDEPEND="doc? ( app-doc/doxygen )"
+DEPEND="test? ( dev-util/cppunit )"
+
+PATCHES=(
+       "${FILESDIR}"/${P}-respect-cxxflags.patch
+)
 
 src_prepare() {
-       epatch "${FILESDIR}/${P}-respect-cxxflags.patch"
+       default
 
        sed -i \
                -e 's|^GENERATE_LATEX.*|GENERATE_LATEX = NO|' \
@@ -41,13 +43,18 @@ src_configure() {
 
 src_compile() {
        default
+
        if use doc ; then
-               cd doc
+               cd doc || die
                doxygen Doxyfile || die "doxygen failed"
        fi
 }
 
 src_install() {
        default
-       use doc && dohtml -r doc/html/*
+
+       if use doc ; then
+               docinto html
+               dodoc -r doc/html/*
+       fi
 }