[gentoo-commits] repo/gentoo:master commit in: app-arch/brotli/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     3ea1baf9c8fb2658d7eda7fceccdf0e4f631008b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May  5 18:04:02 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May  8 17:03:32 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ea1baf9

app-arch/brotli: EAPI-7 bump

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-arch/brotli/brotli-1.0.7.ebuild | 5 ++---
 app-arch/brotli/brotli-9999.ebuild  | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app-arch/brotli/brotli-1.0.7.ebuild b/app-arch/brotli/brotli-1.0.7.ebuild
index 60492c59525..6f3e4837617 100644
--- a/app-arch/brotli/brotli-1.0.7.ebuild
+++ b/app-arch/brotli/brotli-1.0.7.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
 DISTUTILS_OPTIONAL="1"
 DISTUTILS_IN_SOURCE_BUILD="1"
 
-inherit cmake-multilib distutils-r1 eapi7-ver
+inherit cmake-multilib distutils-r1
 
 DESCRIPTION="Generic-purpose lossless compression algorithm"
 HOMEPAGE="https://github.com/google/brotli"
@@ -40,7 +40,6 @@ src_prepare() {
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
 		-DBUILD_TESTING="$(usex test)"
 	)
 	cmake-utils_src_configure

diff --git a/app-arch/brotli/brotli-9999.ebuild b/app-arch/brotli/brotli-9999.ebuild
index 554f1fd3ffe..703ecf1488b 100644
--- a/app-arch/brotli/brotli-9999.ebuild
+++ b/app-arch/brotli/brotli-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
 DISTUTILS_OPTIONAL="1"
 DISTUTILS_IN_SOURCE_BUILD="1"
 
-inherit cmake-multilib distutils-r1 eapi7-ver
+inherit cmake-multilib distutils-r1
 
 DESCRIPTION="Generic-purpose lossless compression algorithm"
 HOMEPAGE="https://github.com/google/brotli"
@@ -40,7 +40,6 @@ src_prepare() {
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
 		-DBUILD_TESTING="$(usex test)"
 	)
 	cmake-utils_src_configure