[gentoo-proxy-maint] [PATCH] net-libs/canlock: add 3.3.0, drop 2b

[Anna Vyalkova]

Signed-off-by: Anna Vyalkova <cyber+gentoo@×××××.in>
---
 net-libs/canlock/Manifest             |  3 +-
 net-libs/canlock/canlock-2b.ebuild    | 39 --------------------
 net-libs/canlock/canlock-3.3.0.ebuild | 51 +++++++++++++++++++++++++++
 net-libs/canlock/metadata.xml         |  5 ++-
 4 files changed, 54 insertions(+), 44 deletions(-)
 delete mode 100644 net-libs/canlock/canlock-2b.ebuild
 create mode 100644 net-libs/canlock/canlock-3.3.0.ebuild

diff --git a/net-libs/canlock/Manifest b/net-libs/canlock/Manifest
index de690807ad1..c8799420093 100644
--- a/net-libs/canlock/Manifest
+++ b/net-libs/canlock/Manifest
@@ -1,3 +1,2 @@
-DIST canlock_2b-6.diff.gz 7946 BLAKE2B 489161a24f832d978fae49f7349e9ddd3518cfc0b3c02a8e614bffbefafd2fd3ff9f5720b2df0dead30e6d70dcd510380fee8cc2b535268266408719ca030e35 SHA512 fa89d638d87e5cb18bd6c270200cd5d962c5a263855e5cbbd8e944dea633a61d6f0c271da04d56096ef23e0a9f252e3bdead496e9aa9afe31d3f8e7ef679020f
-DIST canlock_2b.orig.tar.gz 14099 BLAKE2B 93c991298ed7bf7ab57b290edf6e6b7bcd86ab452002cd61acbff17ec60eed2e15983b3f1cbe8d54acf4f0cfa11480822c7d7ed474e4c51dea018f73933308f2 SHA512 3ceeac6a17fc3bb3330626d22145371ed5f53ad2a33c6a60b639dab0dbc8ff85623839a9d1e1d4cb78580a9060b0ec9fd3489d1374feecf587b2ec5c7963f58e
 DIST libcanlock-3.2.2.tar.bz2 467561 BLAKE2B e332c379647c7ad3fbf5f0a8051b888be65674bcb2c9be1b689f009fd35eecbb29644d9f17aaa3812c9405283708207c6f220f630e0dd1c6a5508d41b85a6070 SHA512 3d194a37bdbdf640bb6996383ce988c9177573b6f84c29569d759308564c7636d98d5c267988bd034b33681f814400eb7fbecf78d90f54b126edb3bf384f928f
+DIST libcanlock-3.3.0.tar.bz2 625796 BLAKE2B 001512a6d2d226aed93882de8d8f4f02a066cc67e6f21b411b8e1ee2ff0d4580732c90a6fc2756a79f992629cd18fbc319510960c39f33284c86bebfed3d4216 SHA512 100d2b4bf3eadedb7da230317cd37b2c1b259bbd783099a74e0d75fdc6ecddb8a6fd854a2b272bda3629bcf1ac1ae2b3d5657fca9137c17e38aad88f30e4c81c
diff --git a/net-libs/canlock/canlock-2b.ebuild b/net-libs/canlock/canlock-2b.ebuild
deleted file mode 100644
index d54ed58f370..00000000000
--- a/net-libs/canlock/canlock-2b.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_P="${P/-/_}"
-
-DESCRIPTION="A library for creating and verifying Usenet cancel locks"
-HOMEPAGE="https://packages.qa.debian.org/c/canlock.html"
-SRC_URI="
-	mirror://debian/pool/main/c/${PN}/${MY_P}.orig.tar.gz
-	mirror://debian/pool/main/c/${PN}/${MY_P}-6.diff.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-
-S="${WORKDIR}/${P/-/}"
-
-PATCHES=(
-	"${WORKDIR}"/${MY_P}-6.diff
-	"${FILESDIR}"/${P}-make.patch
-)
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	dolib.so src/libcanlock.so.2.0.0
-	dosym libcanlock.so.2.0.0 /usr/$(get_libdir)/libcanlock.so.2
-	dosym libcanlock.so.2.0.0 /usr/$(get_libdir)/libcanlock.so
-
-	doheader include/canlock.h
-
-	dodoc CHANGES README doc/HOWTO
-}
diff --git a/net-libs/canlock/canlock-3.3.0.ebuild b/net-libs/canlock/canlock-3.3.0.ebuild
new file mode 100644
index 00000000000..2c748b1fe6e
--- /dev/null
+++ b/net-libs/canlock/canlock-3.3.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A library for creating and verifying Usenet cancel locks"
+HOMEPAGE="https://micha.freeshell.org/libcanlock/"
+SRC_URI="https://micha.freeshell.org/lib${PN}/src/lib${P}.tar.bz2"
+S="${WORKDIR}/lib${P}"
+
+LICENSE="BSD MIT"
+SLOT="0/3"
+KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux"
+IUSE="header-parser +legacy"
+
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc
+"
+
+DOCS=( ChangeLog{,_V{0..2}} README TODO doc/sec_review.txt )
+
+src_prepare() {
+	default
+
+	# shatest fails to build with slibtool
+	sed 's/shatest$(EXEEXT) //g' -i test/Makefile.in || die
+}
+
+src_configure() {
+	local econf_args=(
+		--enable-pc-files
+		$(use_enable header-parser hp)
+		$(use_enable legacy legacy-api)
+	)
+
+	econf "${econf_args[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	# keep old header location for compability with canlock v2
+	use legacy && dosym ./libcanlock-3/canlock.h /usr/include/canlock.h
+
+	# required for =net-nntp/tin-2.6.0
+	dosym ./libcanlock-3.pc /usr/$(get_libdir)/pkgconfig/libcanlock3.pc
+}
diff --git a/net-libs/canlock/metadata.xml b/net-libs/canlock/metadata.xml
index 84c5f5b3076..74e1f5c9b3c 100644
--- a/net-libs/canlock/metadata.xml
+++ b/net-libs/canlock/metadata.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
 <upstream>
 	<maintainer>
 		<name>Michael Baeuerle</name>
 		<email>michael.baeuerle@×××.net</email>
 	</maintainer>
 </upstream>
 <use>
-	<flag name="legacy" restrict="&gt;=net-libs/canlock-3.0">
-		Enable or disable building legacy code (v2 compatible)
-	</flag>
+	<flag name="header-parser">Build article header parsers</flag>
+	<flag name="legacy">Build legacy API (v2 compatible)</flag>
 </use>
 </pkgmetadata>
-- 
2.34.1