public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Yixun Lan" <dlan@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libcorkipset/
Date: Mon, 28 Feb 2022 13:48:16 +0000 (UTC)	[thread overview]
Message-ID: <1646056035.8353dfd2a0340e791aef7807f2cb062a33d3c4a8.dlan@gentoo> (raw)

commit:     8353dfd2a0340e791aef7807f2cb062a33d3c4a8
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 28 13:46:07 2022 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Mon Feb 28 13:47:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8353dfd2

net-libs/libcorkipset: port to cmake eclass

* fix git command not found issue
* update to EAPI=8
* port to cmake eclass

Closes: https://bugs.gentoo.org/721244
Closes: https://bugs.gentoo.org/834315
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 .../libcorkipset/libcorkipset-1.1.1.20150311_p8.ebuild | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/net-libs/libcorkipset/libcorkipset-1.1.1.20150311_p8.ebuild b/net-libs/libcorkipset/libcorkipset-1.1.1.20150311_p8.ebuild
index d6114f0e9bfb..0d69d8f7b40d 100644
--- a/net-libs/libcorkipset/libcorkipset-1.1.1.20150311_p8.ebuild
+++ b/net-libs/libcorkipset/libcorkipset-1.1.1.20150311_p8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit cmake-utils
+EAPI=8
+inherit cmake
 
 DATE=20150311
 MY_PV="${PV/.${DATE}_p/+${DATE}-}"
@@ -22,19 +22,21 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-debian-${MY_PX}"
 
+PATCHES=( "${S}"/debian/patches/ )
+
 src_prepare() {
-	rm -f "${S}"/debian/patches/0001*.patch || die
-	eapply "${S}"/debian/patches/*.patch
+	cmake_src_prepare
 
+	sed -i -e "/^version=/s/=.*$/=${MY_PX}/" version.sh || die
 	sed -e 's%#include <ipset%#include <libcorkipset%' \
 		-e 's%#include "ipset%#include "libcorkipset%' \
 		-i include/ipset/*.h \
 			*/*/*/*.c \
 			*/*/*/*.c.in \
 			*/*/*.c */*.c || die
-	sed -i -e "s/-Werror/-Wextra/" CMakeLists.txt || die
+	sed -e "s/-Werror/-Wextra/" \
+		-e "/^add_subdirectory(docs)/d" \
+		-i CMakeLists.txt || die
 
 	mv include/{,libcork}ipset || die
-
-	cmake-utils_src_prepare
 }


             reply	other threads:[~2022-02-28 13:48 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-28 13:48 Yixun Lan [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-12-03  1:23 [gentoo-commits] repo/gentoo:master commit in: net-libs/libcorkipset/ Yixun Lan
2020-12-23 12:47 Yixun Lan
2019-06-24 22:06 Yixun Lan
2018-03-01 10:40 Yixun Lan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1646056035.8353dfd2a0340e791aef7807f2cb062a33d3c4a8.dlan@gentoo \
    --to=dlan@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox