From: Andreas Sturmlechner Date: Sat, 15 Sep 2018 22:08:05 +0000 (+0200) Subject: media-libs/glpng: EAPI-6 bump X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=cbacc2b301678cbd27982a04c88b4b8c636db817;p=gentoo.git media-libs/glpng: EAPI-6 bump Package-Manager: Portage-2.3.49, Repoman-2.3.10 --- diff --git a/media-libs/glpng/glpng-1.46-r1.ebuild b/media-libs/glpng/glpng-1.46-r1.ebuild index 62312ed6df62..2753b6ec6853 100644 --- a/media-libs/glpng/glpng-1.46-r1.ebuild +++ b/media-libs/glpng/glpng-1.46-r1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 + inherit cmake-multilib DESCRIPTION="An OpenGL PNG image library" @@ -13,15 +14,17 @@ SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="static-libs" -RDEPEND="virtual/opengl[${MULTILIB_USEDEP}] - virtual/glu[${MULTILIB_USEDEP}] +RDEPEND=" media-libs/libpng:0=[${MULTILIB_USEDEP}] - sys-libs/zlib:=[${MULTILIB_USEDEP}]" + sys-libs/zlib:=[${MULTILIB_USEDEP}] + virtual/glu[${MULTILIB_USEDEP}] + virtual/opengl[${MULTILIB_USEDEP}] +" DEPEND=${RDEPEND} S=${WORKDIR}/${PN} src_configure() { - local mycmakeargs=( "$(cmake-utils_use_build static-libs STATIC_LIBS)" ) + local mycmakeargs=( -DBUILD_STATIC_LIBS=$(usex static-libs) ) cmake-multilib_src_configure }