[gentoo-commits] repo/proj/guru:dev commit in: app-arch/tarlz/files/, app-arch/tarlz/

[gentoo-commits] repo/proj/guru:dev commit in: app-arch/tarlz/files/, app-arch/tarlz/

[Florian Schmaus]

commit:     10cc6ae8d05d268607e7368374fe3740b2815299
Author:     Florian Schmaus <flo <AT> geekplace <DOT> eu>
AuthorDate: Mon Apr 19 19:04:24 2021 +0000
Commit:     Florian Schmaus <flo <AT> geekplace <DOT> eu>
CommitDate: Mon Apr 19 19:05:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=10cc6ae8

app-arch/tarlz: skip broken test case

Closes: https://bugs.gentoo.org/783846
Signed-off-by: Florian Schmaus <flo <AT> geekplace.eu>

 app-arch/tarlz/files/skip-broken-testcase.patch | 14 ++++++++++++++
 app-arch/tarlz/tarlz-0.19-r2.ebuild             |  4 ++++
 2 files changed, 18 insertions(+)

diff --git a/app-arch/tarlz/files/skip-broken-testcase.patch b/app-arch/tarlz/files/skip-broken-testcase.patch
new file mode 100644
index 000000000..949e4df5a
--- /dev/null
+++ b/app-arch/tarlz/files/skip-broken-testcase.patch
@@ -0,0 +1,14 @@
+--- a/testsuite/check.sh	2021-04-19 20:57:33.141266611 +0200
++++ b/testsuite/check.sh	2021-04-19 20:58:18.465330536 +0200
+@@ -1102,6 +1102,11 @@
+ 	[ $? = 2 ] || test_failed $LINENO $i
+ 	"${TARLZ}" -q -tf "${testdir}"/t155_fv${i}.tar.lz --permissive ||
+ 		test_failed $LINENO $i
++	if [ "${i}" = 5 ] ; then
++		# Skip broken test case. See gentoo bug #783846 and
++		# https://lists.nongnu.org/archive/html/lzip-bug/2021-04/msg00001.html
++		continue
++	fi
+ 	if [ "${ln_works}" = yes ] ; then
+ 		mkdir dir2 || framework_failure
+ 		"${TARLZ}" -C dir2 -xf "${testdir}"/t155_fv${i}.tar.lz --permissive ||

diff --git a/app-arch/tarlz/tarlz-0.19-r2.ebuild b/app-arch/tarlz/tarlz-0.19-r2.ebuild
index 5ecb5d3fe..86091b0f2 100644
--- a/app-arch/tarlz/tarlz-0.19-r2.ebuild
+++ b/app-arch/tarlz/tarlz-0.19-r2.ebuild
@@ -20,6 +20,10 @@ DEPEND="
 	$(unpacker_src_uri_depends)
 "
 
+PATCHES=(
+	"${FILESDIR}/skip-broken-testcase.patch"
+)
+
 src_configure() {
 	econf LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}"
 }

[gentoo-commits] repo/proj/guru:dev commit in: app-arch/tarlz/files/, app-arch/tarlz/

[Florian Schmaus]

commit:     2cc83c5270b66f29885263377cbd0f712480a2ac
Author:     Florian Schmaus <flo <AT> geekplace <DOT> eu>
AuthorDate: Thu Jun 17 19:09:45 2021 +0000
Commit:     Florian Schmaus <flo <AT> geekplace <DOT> eu>
CommitDate: Thu Jun 17 19:09:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2cc83c52

app-arch/tarlz: add 0.21, drop 0.19-r3

Signed-off-by: Florian Schmaus <flo <AT> geekplace.eu>

 app-arch/tarlz/Manifest                                    |  2 +-
 app-arch/tarlz/files/skip-broken-testcase.patch            | 14 --------------
 app-arch/tarlz/{tarlz-0.19-r3.ebuild => tarlz-0.21.ebuild} |  6 +-----
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/app-arch/tarlz/Manifest b/app-arch/tarlz/Manifest
index 4dc7b2b29..b24b7840d 100644
--- a/app-arch/tarlz/Manifest
+++ b/app-arch/tarlz/Manifest
@@ -1 +1 @@
-DIST tarlz-0.19.tar.lz 100271 BLAKE2B 077763ffe98e1e06e42cc8b2ba0d2c178a22927dfaede8f909744cad6d57aa7b64b397d22620e1a42e5c45e358c9b90bea02914506a353396e525d0eb8b1dd59 SHA512 f50ac799041d769772964f040ba32059a938b64f5b8570edd7ad3288603e81ae09900a846cc0d9c64a6bd131bdfa8fecb96eeddf02a57209ff8605bb9cd39226
+DIST tarlz-0.21.tar.lz 104780 BLAKE2B c3aacda3e8ab25757758d811d9cdc153777835950436dbb4827cf75d801f6c3035475330512a2657a8c9733f6afdf452d9689d7d72d11ba8ef968fceab671ed4 SHA512 1ad671da7ee115762163af57aad69ec754753e68a99ef8c4f38e880ecbb75a5b021f38794390eabcdbef4963cbc0c0e2abe36011da4135baf2c21dc22f020f4a

diff --git a/app-arch/tarlz/files/skip-broken-testcase.patch b/app-arch/tarlz/files/skip-broken-testcase.patch
deleted file mode 100644
index 949e4df5a..000000000
--- a/app-arch/tarlz/files/skip-broken-testcase.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/testsuite/check.sh	2021-04-19 20:57:33.141266611 +0200
-+++ b/testsuite/check.sh	2021-04-19 20:58:18.465330536 +0200
-@@ -1102,6 +1102,11 @@
- 	[ $? = 2 ] || test_failed $LINENO $i
- 	"${TARLZ}" -q -tf "${testdir}"/t155_fv${i}.tar.lz --permissive ||
- 		test_failed $LINENO $i
-+	if [ "${i}" = 5 ] ; then
-+		# Skip broken test case. See gentoo bug #783846 and
-+		# https://lists.nongnu.org/archive/html/lzip-bug/2021-04/msg00001.html
-+		continue
-+	fi
- 	if [ "${ln_works}" = yes ] ; then
- 		mkdir dir2 || framework_failure
- 		"${TARLZ}" -C dir2 -xf "${testdir}"/t155_fv${i}.tar.lz --permissive ||

diff --git a/app-arch/tarlz/tarlz-0.19-r3.ebuild b/app-arch/tarlz/tarlz-0.21.ebuild
similarity index 87%
rename from app-arch/tarlz/tarlz-0.19-r3.ebuild
rename to app-arch/tarlz/tarlz-0.21.ebuild
index ac53651c5..f1c0ce855 100644
--- a/app-arch/tarlz/tarlz-0.19-r3.ebuild
+++ b/app-arch/tarlz/tarlz-0.21.ebuild
@@ -14,16 +14,12 @@ SLOT="0"
 
 KEYWORDS="~amd64"
 
-RDEPEND="app-arch/lzlib:0="
+RDEPEND=">=app-arch/lzlib-1.12:0="
 DEPEND="
 	${RDEPEND}
 	$(unpacker_src_uri_depends)
 "
 
-PATCHES=(
-	"${FILESDIR}/skip-broken-testcase.patch"
-)
-
 src_configure() {
 	econf \
 		CXX="$(tc-getCXX)" \