gentoo resync : 15.01.2020

3 files changed, 16 insertions, 15 deletions

diff --git a/www-servers/boa/Manifest b/www-servers/boa/Manifest
index 06d834b484bd..e00811d8c804 100644
--- a/www-servers/boa/Manifest
+++ b/www-servers/boa/Manifest
@@ -1,10 +1,10 @@
 AUX boa-0.94.14_rc21-ENOSYS.patch 800 BLAKE2B 30ec3eb9ce83e32d4e04034d7f6810360ee27922b64972b7bf5469a70531f4c98ce917496c989501f427adce3ce285ca50d1ef87c5d887333e2044cbe7d29738 SHA512 2f3131f32fc748ff9ad1dca746597939662ebbcde086df1f21de4e6e84afda26309bee32de86ebce650070ce1020b7edaecdf3e096e3ed124739193cc479adb6
-AUX boa-0.94.14_rc21-texi.patch 431 BLAKE2B 8b415c754e092d1802856841bada8cc2ccba9783babc0ddcff50f2e3a934cfbc7cc97f2757dc587515e901d1a624a2de3fabd740659480534e053d0a0e547ea3 SHA512 f1abf52b7257dc590b58c6264f06710cb0163c1d2762fd6bb9cf0f086a72bbfc6b627aac04d187827660d1eb899850549849f6c713feaf47a802db56c39d5b23
+AUX boa-0.94.14_rc21-texi.patch 431 BLAKE2B 41e647b4a412ba0b06319d3360383d6d999d59d9beb68ff3311b96e8a0514aa78e23d2f4df738080684f2cdda8367493ee488ebc42ee94c931e14d79e57eeeb2 SHA512 da7c2f362331b4d1684bd134b5bef2cc49316c7abeafec2bdbcb6c1e49d62eddc36ac47a4dc282285e0b0dc625dc46c30c910d819cfd97a970cffd92e0c90800
 AUX boa.conf 7339 BLAKE2B 59211052cd07561f765afcf5897fae5a79b7bdcf044c950e4e6cfb9a775e03cd5eeb2a2e3e56e9d75cc99d907b72b3a283d4f296e987a86b65aa606710a54a12 SHA512 28a4d171aa31cdc961d93df0076f520d1c3d8d502027c7ade2acdd63a154c5c1efbda63a94a1569cc23a824f2637cec134201e2994ace5d0ae65d60134e7322c
 AUX boa.conf.d 104 BLAKE2B 2153bf930ea1994ee5d9311c39f154c52c366b60cba60b63e89f2fee3f08159c95a4ab3642360e518ea62162a37f97be26d473786f7347291325177fd2605859 SHA512 334e6699d2a8e83fd81c08df5d140658a8cfcc10538c3496752c5eb37a4ce89ed604a9c094c767dc3d8d88053176f88dc8b9ec9b85ac134f09bf0fc15df994fe
 AUX boa.initd 639 BLAKE2B 10155fd3f9ccd0c47155820985d00fbd45b5e95399634cfa95ee865b9d6c6a6b3ae91775f7f5d084054f984bec185ca6743a59da13a432fd59852d4c979d33fe SHA512 41c242e17c5cc21c7834a4b7c2123fe47b00b3a107dd11c003bbb21d6ff599df1adfe0c58d7451a3326662d9c802af78996a6c4434ee0407f26eedeb45559305
 AUX boa.service 131 BLAKE2B a77133453d32a7798704019470156e54842878f125f3bdab28f71ed804aa4b910621328b7b486a4b24dceaf1e82012a09de59977a460263c57e0e8aaa13f5329 SHA512 62628a38bd679e10b0f5d3712d206fe292d4adf0ed4af9387b7e923ce0c2efad060f139a8cf5d0aad89485ee4ba94565387e6cf0858e779538d24705aa01ee99
 AUX mime.types 5488 BLAKE2B c87384f25be47bc2640029ff51b7e10b830a3544c89072f8033bb23018920ef9d98b2db7f8c6d71e4bb5157f3858c49d682d0eb8708273a4ede0afffa7f86239 SHA512 5498bc2cf93640f04240b96ff6ac297d9900d44180a9fc6d4a763f5c97c140f46e0a16efb736be6e295b9448915c80830854eb2c705f37b04633fed6352262bd
 DIST boa-0.94.14rc21.tar.gz 199950 BLAKE2B 763c3f9d3b4a0442d16372121b9d1a584dbfc43848c3cd89a8f33e4728dc2924fc32161dd8b756d74fcaa6ddbc5839b59a3cc4b88353892d79eb455a09687700 SHA512 ca8e5c2c29f0b6cd4fd2f7268682dc345c1d37f4de099319e22d63d822a72195659d707e148f2e2725edec88d90208fc40702f15ab2cacadc9957f1a0437d798
-EBUILD boa-0.94.14_rc21-r2.ebuild 1202 BLAKE2B 7b22623c7d6aab6b5a5accbf2f845dc6b66e5494dfabc8a7542220b47fbf58017c1f183df62ca6f9d4cb7072ac289725c8787efd1a2b7129ff461d62c28abca7 SHA512 8251a496b079e459a3e00f333f6b75d3a35b1c94e980a33e777411320e7d0bd001f46dde3abf2ab377f6f5cfa041db0f226a75b438d38107224a8494a34293fc
+EBUILD boa-0.94.14_rc21-r2.ebuild 1193 BLAKE2B 6e70362c809163c35107d465d489fa3f54c775f282d4ebdcf37824a3687f12c01fd928f268742a1ff9f8d56ee7dc6a630f62e0fadf2fc946331300d202829f9c SHA512 8a30624e10463034bc810429ebadab2b03e57aa6749ce35b5c5b7930073b1de23014afef8b89af9a42ad14084c42bd2a5d4ebc33410ae967d81756b20575607d
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
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 bde46ceae873..0795392e1bde 100644
--- 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 68fcdfbe08e3..7853433efb1b 100644
--- 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