4 files changed, 54 insertions, 46 deletions
diff --git a/net-libs/canlock/Manifest b/net-libs/canlock/Manifest
index 7f5af186a14b..a7f17c9405cd 100644
--- a/net-libs/canlock/Manifest
+++ b/net-libs/canlock/Manifest
@@ -1,7 +1,6 @@
 AUX canlock-2b-make.patch 3370 BLAKE2B be7d14d664284886b2f798e8a46df4b4d9fdd2e2f098487391b51291c87dcd7055b7b31f59fb5a62ff1ca7bf09acc5cc3b1c90834bf309e3f6c4b9779b49fd93 SHA512 3040988dde4d7a79d1a73ebd90f8c7eadcb01489129ce47641e49c08ee38ff94d055f3da936c6ef1bf19fbff4f6be5ea41dc80356cec141b278c502dcabdc7ba
-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
-EBUILD canlock-2b.ebuild 848 BLAKE2B 68ee1efa0605d19ef8ad449bb8e57113b27d2b17c7e11cbf85789e6c9bf2de4a984143b3872737a76193d8463e90a592f2fa84948e24ed3f2f14c236ed205b65 SHA512 e7348d495c1b7bef6f786b82e71b8097300125cb45c0061a0d9a63f3657abc763f54856fe55de051a6d38dd40306ab9580c4c16d7a2cd2414e1cad6300eb93cc
+DIST libcanlock-3.3.0.tar.bz2 625796 BLAKE2B 001512a6d2d226aed93882de8d8f4f02a066cc67e6f21b411b8e1ee2ff0d4580732c90a6fc2756a79f992629cd18fbc319510960c39f33284c86bebfed3d4216 SHA512 100d2b4bf3eadedb7da230317cd37b2c1b259bbd783099a74e0d75fdc6ecddb8a6fd854a2b272bda3629bcf1ac1ae2b3d5657fca9137c17e38aad88f30e4c81c
 EBUILD canlock-3.2.2.ebuild 1095 BLAKE2B 443bf0268fe3e64dc00ef605d2b0e79655fed89a51b8f3620606271f77b541195b69c8b3013356bcad09263af0fd39083df6f10d8355af00146ddc8f24be7694 SHA512 1507129d5a94ff1269e417e9cd4e7b83443b12cbfbdb14e9047be6d530e6341eea96b9603c6c34abf3e900deee5a0d11234ae27188a1a2b37db558eee3dc36c6
-MISC metadata.xml 431 BLAKE2B cd7cbf3191ed305dd69b9cb360da7f45d7e5e7656080328c8c152c0b1761e390d2657265bc83093758e3f6628a6a1570080d42b9e432e4b2a900a354448194fb SHA512 e6317ceb5e1fba639fa9c095e726267cfcda9284c0b075a66eca95991bc01a54e7d2891b238e00924127988be5280a6467ddb64fb386e959966d43b5a05f0542
+EBUILD canlock-3.3.0.ebuild 1136 BLAKE2B 143814ccf631e0145c75762e68efc1c165d79e70d697750ed14a756bb611cd72ea1b477623b7cb2fbc3959cd908e39011d32b5deb7b54c9e4f48800e954ab438 SHA512 7cf58b4919e83fa6051b92388bbbabf6b34fa7ef3da38b2b9c42405eca1f070c129ae902563cd0c68b35135fad0ff0960c72095cafd5e4440182b2cd783e2e25
+MISC metadata.xml 431 BLAKE2B 970ec8fdb542889d3df72c7520f3b9f1c1c46e75b9cecb85c383c1abaaff42bf5bba5eb3fd1601449355c248c88215420cd799a7c5d53f2f4c5cc22facf1b4e6 SHA512 b53c2d9d53d5b045018923898fe93c181e178f4184beec546919b5d9ce0ba9ae8807d11d26f6291457b75ac96793566a985ee1876c8900518f776ccdf6aa91ab
diff --git a/net-libs/canlock/canlock-2b.ebuild b/net-libs/canlock/canlock-2b.ebuild
deleted file mode 100644
index d54ed58f3701..000000000000
--- 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 000000000000..5227e822e8c8
--- /dev/null
+++ b/net-libs/canlock/canlock-3.3.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 84c5f5b30769..74e1f5c9b3cb 100644
--- a/net-libs/canlock/metadata.xml
+++ b/net-libs/canlock/metadata.xml
@@ -9,8 +9,7 @@
 	</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>