1 |
commit: f025d17a951e57e8340386e1ba3760eea17ba428 |
2 |
Author: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
3 |
AuthorDate: Wed Jan 19 16:25:13 2022 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 19 16:28:33 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f025d17a |
7 |
|
8 |
net-libs/canlock: add 3.3.0, drop 2b |
9 |
|
10 |
Signed-off-by: Anna Vyalkova <cyber+gentoo <AT> sysrq.in> |
11 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
12 |
|
13 |
net-libs/canlock/Manifest | 3 +-- |
14 |
net-libs/canlock/canlock-2b.ebuild | 39 --------------------------- |
15 |
net-libs/canlock/canlock-3.3.0.ebuild | 51 +++++++++++++++++++++++++++++++++++ |
16 |
net-libs/canlock/metadata.xml | 5 ++-- |
17 |
4 files changed, 54 insertions(+), 44 deletions(-) |
18 |
|
19 |
diff --git a/net-libs/canlock/Manifest b/net-libs/canlock/Manifest |
20 |
index de690807ad1b..c8799420093d 100644 |
21 |
--- a/net-libs/canlock/Manifest |
22 |
+++ b/net-libs/canlock/Manifest |
23 |
@@ -1,3 +1,2 @@ |
24 |
-DIST canlock_2b-6.diff.gz 7946 BLAKE2B 489161a24f832d978fae49f7349e9ddd3518cfc0b3c02a8e614bffbefafd2fd3ff9f5720b2df0dead30e6d70dcd510380fee8cc2b535268266408719ca030e35 SHA512 fa89d638d87e5cb18bd6c270200cd5d962c5a263855e5cbbd8e944dea633a61d6f0c271da04d56096ef23e0a9f252e3bdead496e9aa9afe31d3f8e7ef679020f |
25 |
-DIST canlock_2b.orig.tar.gz 14099 BLAKE2B 93c991298ed7bf7ab57b290edf6e6b7bcd86ab452002cd61acbff17ec60eed2e15983b3f1cbe8d54acf4f0cfa11480822c7d7ed474e4c51dea018f73933308f2 SHA512 3ceeac6a17fc3bb3330626d22145371ed5f53ad2a33c6a60b639dab0dbc8ff85623839a9d1e1d4cb78580a9060b0ec9fd3489d1374feecf587b2ec5c7963f58e |
26 |
DIST libcanlock-3.2.2.tar.bz2 467561 BLAKE2B e332c379647c7ad3fbf5f0a8051b888be65674bcb2c9be1b689f009fd35eecbb29644d9f17aaa3812c9405283708207c6f220f630e0dd1c6a5508d41b85a6070 SHA512 3d194a37bdbdf640bb6996383ce988c9177573b6f84c29569d759308564c7636d98d5c267988bd034b33681f814400eb7fbecf78d90f54b126edb3bf384f928f |
27 |
+DIST libcanlock-3.3.0.tar.bz2 625796 BLAKE2B 001512a6d2d226aed93882de8d8f4f02a066cc67e6f21b411b8e1ee2ff0d4580732c90a6fc2756a79f992629cd18fbc319510960c39f33284c86bebfed3d4216 SHA512 100d2b4bf3eadedb7da230317cd37b2c1b259bbd783099a74e0d75fdc6ecddb8a6fd854a2b272bda3629bcf1ac1ae2b3d5657fca9137c17e38aad88f30e4c81c |
28 |
|
29 |
diff --git a/net-libs/canlock/canlock-2b.ebuild b/net-libs/canlock/canlock-2b.ebuild |
30 |
deleted file mode 100644 |
31 |
index d54ed58f3701..000000000000 |
32 |
--- a/net-libs/canlock/canlock-2b.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,39 +0,0 @@ |
35 |
-# Copyright 1999-2020 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=7 |
39 |
- |
40 |
-inherit toolchain-funcs |
41 |
- |
42 |
-MY_P="${P/-/_}" |
43 |
- |
44 |
-DESCRIPTION="A library for creating and verifying Usenet cancel locks" |
45 |
-HOMEPAGE="https://packages.qa.debian.org/c/canlock.html" |
46 |
-SRC_URI=" |
47 |
- mirror://debian/pool/main/c/${PN}/${MY_P}.orig.tar.gz |
48 |
- mirror://debian/pool/main/c/${PN}/${MY_P}-6.diff.gz" |
49 |
- |
50 |
-LICENSE="BSD MIT" |
51 |
-SLOT="0" |
52 |
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" |
53 |
- |
54 |
-S="${WORKDIR}/${P/-/}" |
55 |
- |
56 |
-PATCHES=( |
57 |
- "${WORKDIR}"/${MY_P}-6.diff |
58 |
- "${FILESDIR}"/${P}-make.patch |
59 |
-) |
60 |
- |
61 |
-src_configure() { |
62 |
- tc-export CC |
63 |
-} |
64 |
- |
65 |
-src_install() { |
66 |
- dolib.so src/libcanlock.so.2.0.0 |
67 |
- dosym libcanlock.so.2.0.0 /usr/$(get_libdir)/libcanlock.so.2 |
68 |
- dosym libcanlock.so.2.0.0 /usr/$(get_libdir)/libcanlock.so |
69 |
- |
70 |
- doheader include/canlock.h |
71 |
- |
72 |
- dodoc CHANGES README doc/HOWTO |
73 |
-} |
74 |
|
75 |
diff --git a/net-libs/canlock/canlock-3.3.0.ebuild b/net-libs/canlock/canlock-3.3.0.ebuild |
76 |
new file mode 100644 |
77 |
index 000000000000..2c748b1fe6e9 |
78 |
--- /dev/null |
79 |
+++ b/net-libs/canlock/canlock-3.3.0.ebuild |
80 |
@@ -0,0 +1,51 @@ |
81 |
+# Copyright 1999-2022 Gentoo Authors |
82 |
+# Distributed under the terms of the GNU General Public License v2 |
83 |
+ |
84 |
+EAPI=8 |
85 |
+ |
86 |
+inherit toolchain-funcs |
87 |
+ |
88 |
+DESCRIPTION="A library for creating and verifying Usenet cancel locks" |
89 |
+HOMEPAGE="https://micha.freeshell.org/libcanlock/" |
90 |
+SRC_URI="https://micha.freeshell.org/lib${PN}/src/lib${P}.tar.bz2" |
91 |
+S="${WORKDIR}/lib${P}" |
92 |
+ |
93 |
+LICENSE="BSD MIT" |
94 |
+SLOT="0/3" |
95 |
+KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux" |
96 |
+IUSE="header-parser +legacy" |
97 |
+ |
98 |
+BDEPEND=" |
99 |
+ sys-devel/flex |
100 |
+ virtual/yacc |
101 |
+" |
102 |
+ |
103 |
+DOCS=( ChangeLog{,_V{0..2}} README TODO doc/sec_review.txt ) |
104 |
+ |
105 |
+src_prepare() { |
106 |
+ default |
107 |
+ |
108 |
+ # shatest fails to build with slibtool |
109 |
+ sed 's/shatest$(EXEEXT) //g' -i test/Makefile.in || die |
110 |
+} |
111 |
+ |
112 |
+src_configure() { |
113 |
+ local econf_args=( |
114 |
+ --enable-pc-files |
115 |
+ $(use_enable header-parser hp) |
116 |
+ $(use_enable legacy legacy-api) |
117 |
+ ) |
118 |
+ |
119 |
+ econf "${econf_args[@]}" |
120 |
+} |
121 |
+ |
122 |
+src_install() { |
123 |
+ default |
124 |
+ find "${ED}" -name '*.la' -delete || die |
125 |
+ |
126 |
+ # keep old header location for compability with canlock v2 |
127 |
+ use legacy && dosym ./libcanlock-3/canlock.h /usr/include/canlock.h |
128 |
+ |
129 |
+ # required for =net-nntp/tin-2.6.0 |
130 |
+ dosym ./libcanlock-3.pc /usr/$(get_libdir)/pkgconfig/libcanlock3.pc |
131 |
+} |
132 |
|
133 |
diff --git a/net-libs/canlock/metadata.xml b/net-libs/canlock/metadata.xml |
134 |
index 84c5f5b30769..74e1f5c9b3cb 100644 |
135 |
--- a/net-libs/canlock/metadata.xml |
136 |
+++ b/net-libs/canlock/metadata.xml |
137 |
@@ -9,8 +9,7 @@ |
138 |
</maintainer> |
139 |
</upstream> |
140 |
<use> |
141 |
- <flag name="legacy" restrict=">=net-libs/canlock-3.0"> |
142 |
- Enable or disable building legacy code (v2 compatible) |
143 |
- </flag> |
144 |
+ <flag name="header-parser">Build article header parsers</flag> |
145 |
+ <flag name="legacy">Build legacy API (v2 compatible)</flag> |
146 |
</use> |
147 |
</pkgmetadata> |