www-servers/boa: Bump to EAPI 7

Signed-off-by: Michał Górny <mgorny@gentoo.org>

diff --git a/www-servers/boa/boa-0.94.14_rc21-r2.ebuild b/www-servers/boa/boa-0.94.14_rc21-r2.ebuild
index bde46ceae8730be45346035297ff0cec8f79c7f7..0795392e1bded0a7802ad787b8359b416efe855f 100644 (file)
--- a/www-servers/boa/boa-0.94.14_rc21-r2.ebuild
+++ b/www-servers/boa/boa-0.94.14_rc21-r2.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils systemd
+EAPI=7
+inherit systemd
 
 MY_P=${P/_/}
 DESCRIPTION="A very small and very fast http daemon"
 SRC_URI="http://www.boa.org/${MY_P}.tar.gz"
 HOMEPAGE="http://www.boa.org/"
+S=${WORKDIR}/${MY_P}
 
 KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
 LICENSE="GPL-2"
@@ -15,21 +16,21 @@ SLOT="0"
 IUSE="doc"
 
 RDEPEND=""
-DEPEND="sys-devel/bison
+BDEPEND="sys-devel/bison
        sys-devel/flex
        doc? ( virtual/latex-base )"
 
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-       epatch "${FILESDIR}"/${P}-texi.patch
-       epatch "${FILESDIR}"/${P}-ENOSYS.patch
-}
+PATCHES=(
+       "${FILESDIR}"/${P}-texi.patch
+       "${FILESDIR}"/${P}-ENOSYS.patch
+)
 
 src_compile() {
        default
 
-       use doc || sed -i -e '/^all:/s/boa.dvi //' docs/Makefile
+       if ! use doc; then
+               sed -i -e '/^all:/s/boa.dvi //' docs/Makefile || die
+       fi
        emake docs
 }
 

diff --git a/www-servers/boa/files/boa-0.94.14_rc21-texi.patch b/www-servers/boa/files/boa-0.94.14_rc21-texi.patch
index 68fcdfbe08e3eccec905fec258f828139519c19f..7853433efb1b87ea0940948161597073b1fab52b 100644 (file)
--- a/www-servers/boa/files/boa-0.94.14_rc21-texi.patch
+++ b/www-servers/boa/files/boa-0.94.14_rc21-texi.patch
@@ -1,5 +1,5 @@
---- docs/boa.texi.org  2003-02-02 06:02:22.000000000 +0100
-+++ docs/boa.texi      2007-05-21 01:22:27.997819260 +0200
+--- a/docs/boa.texi    2003-02-02 06:02:22.000000000 +0100
++++ b/docs/boa.texi    2007-05-21 01:22:27.997819260 +0200
 @@ -33,10 +33,10 @@
  @direntry
  * Boa: (boa).           The Boa Webserver