Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libsfml/
Date: Sun, 28 Feb 2021 12:26:46
Message-Id: 1614515174.9a1e950a695230c82b4b7bf1117f553b233b3671.asturm@gentoo
1 commit: 9a1e950a695230c82b4b7bf1117f553b233b3671
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 28 09:58:23 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 28 12:26:14 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a1e950a
7
8 media-libs/libsfml: EAPI-7 bump, switch to cmake.eclass
9
10 Package-Manager: Portage-3.0.16, Repoman-3.0.2
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 media-libs/libsfml/libsfml-2.5.1.ebuild | 19 +++++++++----------
14 1 file changed, 9 insertions(+), 10 deletions(-)
15
16 diff --git a/media-libs/libsfml/libsfml-2.5.1.ebuild b/media-libs/libsfml/libsfml-2.5.1.ebuild
17 index 159102d0049..2b975f17c8f 100644
18 --- a/media-libs/libsfml/libsfml-2.5.1.ebuild
19 +++ b/media-libs/libsfml/libsfml-2.5.1.ebuild
20 @@ -1,10 +1,9 @@
21 -# Copyright 1999-2020 Gentoo Authors
22 +# Copyright 1999-2021 Gentoo Authors
23 # Distributed under the terms of the GNU General Public License v2
24
25 -EAPI=6
26 -inherit cmake-utils eapi7-ver
27 +EAPI=7
28
29 -MY_P="SFML-${PV}"
30 +inherit cmake
31
32 DESCRIPTION="Simple and Fast Multimedia Library (SFML)"
33 HOMEPAGE="https://www.sfml-dev.org/ https://github.com/SFML/SFML"
34 @@ -33,21 +32,21 @@ RDEPEND="
35 x11-libs/xcb-util-image
36 )
37 "
38 -DEPEND="
39 - ${RDEPEND}
40 +DEPEND="${RDEPEND}"
41 +BDEPEND="
42 doc? ( app-doc/doxygen )
43 "
44
45 DOCS=( changelog.md readme.md )
46
47 -S="${WORKDIR}/${MY_P}"
48 +S="${WORKDIR}/SFML-${PV}"
49
50 src_prepare() {
51 sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \
52 doc/CMakeLists.txt || die
53
54 find examples -name CMakeLists.txt -delete || die
55 - cmake-utils_src_prepare
56 + cmake_src_prepare
57 }
58
59 src_configure() {
60 @@ -59,11 +58,11 @@ src_configure() {
61 if use kernel_Winnt; then
62 mycmakeargs+=( -DSFML_USE_SYSTEM_DEPS=TRUE )
63 fi
64 - cmake-utils_src_configure
65 + cmake_src_configure
66 }
67
68 src_install() {
69 - cmake-utils_src_install
70 + cmake_src_install
71
72 insinto /usr/share/cmake/Modules
73 doins cmake/SFMLConfig.cmake.in