[gentoo-commits] repo/gentoo:master commit in: media-libs/glew/

[Andreas Sturmlechner]

commit:     ef8b31297da03a44f8ee548c7928f7f162abc09d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  1 22:31:12 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr  1 22:42:41 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef8b3129

media-libs/glew: Bump to EAPI 6

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-libs/glew/glew-1.13.0.ebuild | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/media-libs/glew/glew-1.13.0.ebuild b/media-libs/glew/glew-1.13.0.ebuild
index 7584497d1f8..1f036e13255 100644
--- a/media-libs/glew/glew-1.13.0.ebuild
+++ b/media-libs/glew/glew-1.13.0.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit multilib multilib-minimal toolchain-funcs versionator
+EAPI=6
+
+inherit multilib-minimal toolchain-funcs versionator
 
 DESCRIPTION="The OpenGL Extension Wrangler Library"
 HOMEPAGE="http://glew.sourceforge.net/"
@@ -13,14 +14,17 @@ SLOT="0/$(get_version_component_range 1-2)"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
-RDEPEND=">=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+DEPEND="
+	>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
 	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
-DEPEND=${RDEPEND}
+"
+RDEPEND="${DEPEND}
+	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
+"
 
 src_prepare() {
 	sed -i \
@@ -42,6 +46,7 @@ src_prepare() {
 	# and let freebsd be built as on linux too
 	cp config/Makefile.linux config/Makefile.freebsd || die
 
+	default
 	multilib_copy_sources
 }
 
@@ -72,7 +77,10 @@ set_opts() {
 
 multilib_src_compile() {
 	set_opts
-	emake GLEW_DEST="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" "${myglewopts[@]}"
+	emake \
+		GLEW_DEST="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		"${myglewopts[@]}"
 }
 
 multilib_src_install() {
@@ -84,5 +92,8 @@ multilib_src_install() {
 		install.all
 
 	dodoc TODO.txt
-	use doc && dohtml doc/*
+	if use doc; then
+		docinto html
+		dodoc doc/*
+	fi
 }