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 284ED1382C5 for ; Sun, 28 Feb 2021 12:26:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 68967E08EC; Sun, 28 Feb 2021 12:26:45 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 54EB2E08EC for ; Sun, 28 Feb 2021 12:26:45 +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 18D5A340F91 for ; Sun, 28 Feb 2021 12:26:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1CE0A592 for ; Sun, 28 Feb 2021 12:26:39 +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: <1614515174.9a1e950a695230c82b4b7bf1117f553b233b3671.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libsfml/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libsfml/libsfml-2.5.1.ebuild X-VCS-Directories: media-libs/libsfml/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 9a1e950a695230c82b4b7bf1117f553b233b3671 X-VCS-Branch: master Date: Sun, 28 Feb 2021 12:26:39 +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: 11b40ced-4fb5-4890-a801-d9a4fa008137 X-Archives-Hash: 6f2d0789bee4f5d5fbe5967cf4e16823 commit: 9a1e950a695230c82b4b7bf1117f553b233b3671 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 28 09:58:23 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 28 12:26:14 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a1e950a media-libs/libsfml: EAPI-7 bump, switch to cmake.eclass Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/libsfml/libsfml-2.5.1.ebuild | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/media-libs/libsfml/libsfml-2.5.1.ebuild b/media-libs/libsfml/libsfml-2.5.1.ebuild index 159102d0049..2b975f17c8f 100644 --- a/media-libs/libsfml/libsfml-2.5.1.ebuild +++ b/media-libs/libsfml/libsfml-2.5.1.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit cmake-utils eapi7-ver +EAPI=7 -MY_P="SFML-${PV}" +inherit cmake DESCRIPTION="Simple and Fast Multimedia Library (SFML)" HOMEPAGE="https://www.sfml-dev.org/ https://github.com/SFML/SFML" @@ -33,21 +32,21 @@ RDEPEND=" x11-libs/xcb-util-image ) " -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" doc? ( app-doc/doxygen ) " DOCS=( changelog.md readme.md ) -S="${WORKDIR}/${MY_P}" +S="${WORKDIR}/SFML-${PV}" src_prepare() { sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \ doc/CMakeLists.txt || die find examples -name CMakeLists.txt -delete || die - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { @@ -59,11 +58,11 @@ src_configure() { if use kernel_Winnt; then mycmakeargs+=( -DSFML_USE_SYSTEM_DEPS=TRUE ) fi - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install insinto /usr/share/cmake/Modules doins cmake/SFMLConfig.cmake.in