Gentoo Archives: gentoo-commits

From: Yixun Lan <dlan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libcorkipset/
Date: Mon, 28 Feb 2022 13:48:21
Message-Id: 1646056035.8353dfd2a0340e791aef7807f2cb062a33d3c4a8.dlan@gentoo
1 commit: 8353dfd2a0340e791aef7807f2cb062a33d3c4a8
2 Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 28 13:46:07 2022 +0000
4 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 28 13:47:15 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8353dfd2
7
8 net-libs/libcorkipset: port to cmake eclass
9
10 * fix git command not found issue
11 * update to EAPI=8
12 * port to cmake eclass
13
14 Closes: https://bugs.gentoo.org/721244
15 Closes: https://bugs.gentoo.org/834315
16 Package-Manager: Portage-3.0.30, Repoman-3.0.3
17 Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
18
19 .../libcorkipset/libcorkipset-1.1.1.20150311_p8.ebuild | 18 ++++++++++--------
20 1 file changed, 10 insertions(+), 8 deletions(-)
21
22 diff --git a/net-libs/libcorkipset/libcorkipset-1.1.1.20150311_p8.ebuild b/net-libs/libcorkipset/libcorkipset-1.1.1.20150311_p8.ebuild
23 index d6114f0e9bfb..0d69d8f7b40d 100644
24 --- a/net-libs/libcorkipset/libcorkipset-1.1.1.20150311_p8.ebuild
25 +++ b/net-libs/libcorkipset/libcorkipset-1.1.1.20150311_p8.ebuild
26 @@ -1,8 +1,8 @@
27 -# Copyright 1999-2021 Gentoo Authors
28 +# Copyright 1999-2022 Gentoo Authors
29 # Distributed under the terms of the GNU General Public License v2
30
31 -EAPI=6
32 -inherit cmake-utils
33 +EAPI=8
34 +inherit cmake
35
36 DATE=20150311
37 MY_PV="${PV/.${DATE}_p/+${DATE}-}"
38 @@ -22,19 +22,21 @@ RDEPEND="${DEPEND}"
39
40 S="${WORKDIR}/${PN}-debian-${MY_PX}"
41
42 +PATCHES=( "${S}"/debian/patches/ )
43 +
44 src_prepare() {
45 - rm -f "${S}"/debian/patches/0001*.patch || die
46 - eapply "${S}"/debian/patches/*.patch
47 + cmake_src_prepare
48
49 + sed -i -e "/^version=/s/=.*$/=${MY_PX}/" version.sh || die
50 sed -e 's%#include <ipset%#include <libcorkipset%' \
51 -e 's%#include "ipset%#include "libcorkipset%' \
52 -i include/ipset/*.h \
53 */*/*/*.c \
54 */*/*/*.c.in \
55 */*/*.c */*.c || die
56 - sed -i -e "s/-Werror/-Wextra/" CMakeLists.txt || die
57 + sed -e "s/-Werror/-Wextra/" \
58 + -e "/^add_subdirectory(docs)/d" \
59 + -i CMakeLists.txt || die
60
61 mv include/{,libcork}ipset || die
62 -
63 - cmake-utils_src_prepare
64 }