From 265dbe5dbc14c199299496c6db8fce3f76647015 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 21 Sep 2018 18:00:10 +0100 Subject: gentoo resync : 21.09.2018 --- media-libs/glpng/Manifest | 2 +- media-libs/glpng/glpng-1.46-r1.ebuild | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) (limited to 'media-libs/glpng') diff --git a/media-libs/glpng/Manifest b/media-libs/glpng/Manifest index d310630ce944..b103213a0ab9 100644 --- a/media-libs/glpng/Manifest +++ b/media-libs/glpng/Manifest @@ -1,3 +1,3 @@ DIST glpng-1.46.tar.gz 41024 BLAKE2B a0e521ec5ebd3d6b9d62e64b001dfa0aac97be6a72f44222816f5cb2dda3949d33261f66e96ecaa1fc6feaf7ece67721d3606440d760b305fbb7cb57462b24b3 SHA512 82fbd6154a0ca16102b4c31f7fbd907cf8c18b20c1693c60f8dcdd1fe42ebe579f98da2b36c00fc080b2880c720e8099dac0d460a8de1b2bf1145abbf05a20ae -EBUILD glpng-1.46-r1.ebuild 690 BLAKE2B 4b4ebf5dcbf8c42093f08d6f16a6b34aca41862f89e902b6f1299fbf7c2a2eadc58842cca7a39082701c42c48a0bd8971182a56bfddc7f999159cf65e9cc590c SHA512 a44ab231ef634cba52d7982badf8774e014385ac49c4cfd9264409a92b01f5a2681ed9f7202dc18fd73352d280e77467d3a57aa727eb3340a431e36ba3da57a7 +EBUILD glpng-1.46-r1.ebuild 683 BLAKE2B 612011a97c4cbd80cf2238a0e164e8f8eb020f0cf658ebb72eb37b02f0ded0bed1019c6b164592335e059bc045019cbfd6ad960bc146f56a72a73bc03ec95ac4 SHA512 375c315de0723fd5568d3180317f739ac89175611c987a61228f4c94bc20d8f1d69d831cc356bdcf9802e1facff1bc47c625a4508126ebd71c3b3f458971e80c MISC metadata.xml 461 BLAKE2B e5bc7b8a1b80dd383a5187799bb3e43540ec0b26694fcc62c289e2df08544484b8aba3ef9e396512ffed6dfc9457358d4eb683dd27484b13d5c44def8a68063e SHA512 bc6e0802c3ca98c29fcef3b36d34d688b5249c0e9103fbe336653003c2142821a732d26a48a6052003fc2e6f82f42694fe8ba9a4b32e896f689b10ef186c30e1 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 } -- cgit v1.2.3