From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5901413835A for ; Thu, 25 Feb 2021 15:38:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9A31EE0960; Thu, 25 Feb 2021 15:38:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 82630E0960 for ; Thu, 25 Feb 2021 15:38:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7524B33F6A5 for ; Thu, 25 Feb 2021 15:38:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F1C03B9 for ; Thu, 25 Feb 2021 15:38:23 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1614267485.0a518ca277805005ec066b8de589147cc0482b97.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/freeglut/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/freeglut/freeglut-3.2.1.ebuild X-VCS-Directories: media-libs/freeglut/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0a518ca277805005ec066b8de589147cc0482b97 X-VCS-Branch: master Date: Thu, 25 Feb 2021 15:38:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 83143da2-3c59-47dd-bca0-a00ede3c3912 X-Archives-Hash: ab537a91a7017c83dea5c2fbf7c40517 commit: 0a518ca277805005ec066b8de589147cc0482b97 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Feb 25 10:05:49 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Feb 25 15:38:05 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a518ca2 media-libs/freeglut: Switch to cmake.eclass, silence cmake warning Add missing || die. Closes: https://bugs.gentoo.org/721006 Closes: https://bugs.gentoo.org/770547 Package-Manager: Portage-3.0.15, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/freeglut/freeglut-3.2.1.ebuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/media-libs/freeglut/freeglut-3.2.1.ebuild b/media-libs/freeglut/freeglut-3.2.1.ebuild index 3ea22fc54f7..af9972f1c09 100644 --- a/media-libs/freeglut/freeglut-3.2.1.ebuild +++ b/media-libs/freeglut/freeglut-3.2.1.ebuild @@ -3,6 +3,7 @@ EAPI=7 +CMAKE_ECLASS=cmake inherit cmake-multilib DESCRIPTION="A free OpenGL utility toolkit, the open-sourced alternative to the GLUT library" @@ -32,6 +33,7 @@ HTML_DOCS=( doc/. ) src_configure() { local mycmakeargs=( + "-DOpenGL_GL_PREFERENCE=GLVND" # bug 721006 "-DFREEGLUT_GLES=OFF" "-DFREEGLUT_BUILD_DEMOS=OFF" "-DFREEGLUT_BUILD_STATIC_LIBS=$(usex static-libs ON OFF)" @@ -41,6 +43,6 @@ src_configure() { } multilib_src_install() { - cmake-utils_src_install - cp "${D}"/usr/$(get_libdir)/pkgconfig/{,free}glut.pc + cmake_src_install + cp "${D}"/usr/$(get_libdir)/pkgconfig/{,free}glut.pc || die }