1 |
commit: 2cc83c5270b66f29885263377cbd0f712480a2ac |
2 |
Author: Florian Schmaus <flo <AT> geekplace <DOT> eu> |
3 |
AuthorDate: Thu Jun 17 19:09:45 2021 +0000 |
4 |
Commit: Florian Schmaus <flo <AT> geekplace <DOT> eu> |
5 |
CommitDate: Thu Jun 17 19:09:54 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2cc83c52 |
7 |
|
8 |
app-arch/tarlz: add 0.21, drop 0.19-r3 |
9 |
|
10 |
Signed-off-by: Florian Schmaus <flo <AT> geekplace.eu> |
11 |
|
12 |
app-arch/tarlz/Manifest | 2 +- |
13 |
app-arch/tarlz/files/skip-broken-testcase.patch | 14 -------------- |
14 |
app-arch/tarlz/{tarlz-0.19-r3.ebuild => tarlz-0.21.ebuild} | 6 +----- |
15 |
3 files changed, 2 insertions(+), 20 deletions(-) |
16 |
|
17 |
diff --git a/app-arch/tarlz/Manifest b/app-arch/tarlz/Manifest |
18 |
index 4dc7b2b29..b24b7840d 100644 |
19 |
--- a/app-arch/tarlz/Manifest |
20 |
+++ b/app-arch/tarlz/Manifest |
21 |
@@ -1 +1 @@ |
22 |
-DIST tarlz-0.19.tar.lz 100271 BLAKE2B 077763ffe98e1e06e42cc8b2ba0d2c178a22927dfaede8f909744cad6d57aa7b64b397d22620e1a42e5c45e358c9b90bea02914506a353396e525d0eb8b1dd59 SHA512 f50ac799041d769772964f040ba32059a938b64f5b8570edd7ad3288603e81ae09900a846cc0d9c64a6bd131bdfa8fecb96eeddf02a57209ff8605bb9cd39226 |
23 |
+DIST tarlz-0.21.tar.lz 104780 BLAKE2B c3aacda3e8ab25757758d811d9cdc153777835950436dbb4827cf75d801f6c3035475330512a2657a8c9733f6afdf452d9689d7d72d11ba8ef968fceab671ed4 SHA512 1ad671da7ee115762163af57aad69ec754753e68a99ef8c4f38e880ecbb75a5b021f38794390eabcdbef4963cbc0c0e2abe36011da4135baf2c21dc22f020f4a |
24 |
|
25 |
diff --git a/app-arch/tarlz/files/skip-broken-testcase.patch b/app-arch/tarlz/files/skip-broken-testcase.patch |
26 |
deleted file mode 100644 |
27 |
index 949e4df5a..000000000 |
28 |
--- a/app-arch/tarlz/files/skip-broken-testcase.patch |
29 |
+++ /dev/null |
30 |
@@ -1,14 +0,0 @@ |
31 |
---- a/testsuite/check.sh 2021-04-19 20:57:33.141266611 +0200 |
32 |
-+++ b/testsuite/check.sh 2021-04-19 20:58:18.465330536 +0200 |
33 |
-@@ -1102,6 +1102,11 @@ |
34 |
- [ $? = 2 ] || test_failed $LINENO $i |
35 |
- "${TARLZ}" -q -tf "${testdir}"/t155_fv${i}.tar.lz --permissive || |
36 |
- test_failed $LINENO $i |
37 |
-+ if [ "${i}" = 5 ] ; then |
38 |
-+ # Skip broken test case. See gentoo bug #783846 and |
39 |
-+ # https://lists.nongnu.org/archive/html/lzip-bug/2021-04/msg00001.html |
40 |
-+ continue |
41 |
-+ fi |
42 |
- if [ "${ln_works}" = yes ] ; then |
43 |
- mkdir dir2 || framework_failure |
44 |
- "${TARLZ}" -C dir2 -xf "${testdir}"/t155_fv${i}.tar.lz --permissive || |
45 |
|
46 |
diff --git a/app-arch/tarlz/tarlz-0.19-r3.ebuild b/app-arch/tarlz/tarlz-0.21.ebuild |
47 |
similarity index 87% |
48 |
rename from app-arch/tarlz/tarlz-0.19-r3.ebuild |
49 |
rename to app-arch/tarlz/tarlz-0.21.ebuild |
50 |
index ac53651c5..f1c0ce855 100644 |
51 |
--- a/app-arch/tarlz/tarlz-0.19-r3.ebuild |
52 |
+++ b/app-arch/tarlz/tarlz-0.21.ebuild |
53 |
@@ -14,16 +14,12 @@ SLOT="0" |
54 |
|
55 |
KEYWORDS="~amd64" |
56 |
|
57 |
-RDEPEND="app-arch/lzlib:0=" |
58 |
+RDEPEND=">=app-arch/lzlib-1.12:0=" |
59 |
DEPEND=" |
60 |
${RDEPEND} |
61 |
$(unpacker_src_uri_depends) |
62 |
" |
63 |
|
64 |
-PATCHES=( |
65 |
- "${FILESDIR}/skip-broken-testcase.patch" |
66 |
-) |
67 |
- |
68 |
src_configure() { |
69 |
econf \ |
70 |
CXX="$(tc-getCXX)" \ |