gentoo resync : 13.11.2021

3 files changed, 84 insertions, 0 deletions

diff --git a/dev-python/pydecomp/Manifest b/dev-python/pydecomp/Manifest
index dea00ac18351..6898c71cdd68 100644
--- a/dev-python/pydecomp/Manifest
+++ b/dev-python/pydecomp/Manifest
@@ -1,4 +1,6 @@
+AUX 0.3-no-pixz-index.patch 2089 BLAKE2B fec4eb3bbef769d43c7ef42bc2314252df6379c1d973e319ddc6377c870793b83eba63325f9531cbb46a35e7e13011353dc689438479bb3c42d67f52b4b7799b SHA512 1d051e0d2e829d91a5de704273dde1ed91c7c3bbedd5744fd24d54ec21418ed67db73d866ca1943e36299824214e677058fbfce9e61233aa7c1ecd90152e8fde
 DIST pydecomp-0.3.tar.gz 10009 BLAKE2B 2741dc776ac265a84daf4c68542e652c7e2663dff1561297057f3ac219805136ece32af3f33e0b03df0a9883663692fc3855490478c538a0edec838c90c1c4b6 SHA512 7935111f9d0629eb74f529a6427b9db3cac4c9c205f80b28380ab9c323ca9ad7b78b40f69a7760a5a69ed065e9d6ddd42d08fb8f2cb787f15d2ec6e88e20221a
 EBUILD pydecomp-0.3-r1.ebuild 695 BLAKE2B ea110154e01f9590d12dcc0f9ff1c8d5de2c0a0da019f06a2c7b383ef0199b93485af8864f619cebc2562b91c3555b6e6b8f11a751fe9471b15ea2661480599c SHA512 b6f3e3d5047d5e98a3b2978e3a742e0a9bd9069444c64a06504a31a67b244a0465e1a9715b98ec77a442367a914336ed3221d8b6bacb3f850cc80482436077bb
+EBUILD pydecomp-0.3-r2.ebuild 755 BLAKE2B cc6203fc701196a984ebe46a5050cb8779ea75824d372ca16f5e31128800b9b4d23a50c74c0a55a05c472cee39dd73ea42419df4f03012b430a41e665d621d9c SHA512 64bf938eea56533c7ffd5e78cdbae1cb37ab3f09903b0c2fcf3546ce73001358f57e8135a7489587744f52b2330db18cbd725ad384d1a0e423c8d3a9b11a61a3
 EBUILD pydecomp-9999.ebuild 702 BLAKE2B bd2c7ea91380f809fb3fbc568942e6a66769e03b83b543903a2665454aa99aa4ef01aad074c638bc15bc23b8ed0d7775c05abbe9f28f3d1889b964bc8b50cfb9 SHA512 8a0d5891bcba858b97e36cd22b1d9b6a7ecf46e88006f22e82e368b15d6032ecc3804ff9e967e6d3a558a86ed1da4405fa96ba03ecc2a49380786ad73a4ba742
 MISC metadata.xml 755 BLAKE2B 3978b4b2bbb09544898f6e07820857f8ed8411b6b2ba665b2353282fff1df47102dc09d3f3ee025db2b5edf6b36a14184aa245abe08cae435ec126f251cdd3dc SHA512 da83a64a40ca4140de6907734243de082db074e8c833f09fd92d811073d032531276292d6f6d359405250ce310933879dd373f39df56320ab48378ccae91d486
diff --git a/dev-python/pydecomp/files/0.3-no-pixz-index.patch b/dev-python/pydecomp/files/0.3-no-pixz-index.patch
new file mode 100644
index 000000000000..0683cb12bae9
--- /dev/null
+++ b/dev-python/pydecomp/files/0.3-no-pixz-index.patch
@@ -0,0 +1,55 @@
+From 79688adff9d494e6ff412210c813d19744dbb8cd Mon Sep 17 00:00:00 2001
+From: Daniel Cordero <pydecomp@0xdc.io>
+Date: Mon, 3 May 2021 12:07:46 +0000
+Subject: [PATCH 1/2] pixz_i: copy definition from pixz
+
+---
+ DeComp/definitions.py | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/DeComp/definitions.py b/DeComp/definitions.py
+index 16114b2..14fa226 100644
+--- a/DeComp/definitions.py
++++ b/DeComp/definitions.py
+@@ -200,6 +200,14 @@ class functions do.
+                 ],
+                 "PIXZ", ["tar.xz", "tpxz", "xz"], {"tar", "pixz"},
+             ],
++    "pixz_i": [
++                "_common", "tar",
++                [
++                    "other_options", "%(comp_prog)s", "pixz", "-cpf",
++                    "%(filename)s", "-C", "%(basedir)s", "%(source)s"
++                ],
++                "PIXZ", ["tar.xz", "tpxz", "xz"], {"tar", "pixz"},
++            ],
+     "pixz_x": [
+                 "_common", "tar",
+                 [
+
+From f98d90a522b6d0e5331f7254bb95b057fafe44da Mon Sep 17 00:00:00 2001
+From: Daniel Cordero <pydecomp@0xdc.io>
+Date: Mon, 3 May 2021 12:12:51 +0000
+Subject: [PATCH 2/2] pixz: don't add trailing index to tarballs
+
+If pixz detects the input file is a tarball, it adds a trailing file index to help in seeking the file.
+However, this trailing index is causes decompression errors with xz -d and systemd-importd.
+
+For compatibility with these tools, force pixz to never add this tarball index.
+---
+ DeComp/definitions.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/DeComp/definitions.py b/DeComp/definitions.py
+index 14fa226..0025c07 100644
+--- a/DeComp/definitions.py
++++ b/DeComp/definitions.py
+@@ -195,7 +195,7 @@ class functions do.
+     "pixz": [
+                 "_common", "tar",
+                 [
+-                    "other_options", "%(comp_prog)s", "pixz", "-cpf",
++                    "other_options", "%(comp_prog)s", "'pixz -t'", "-cpf",
+                     "%(filename)s", "-C", "%(basedir)s", "%(source)s"
+                 ],
+                 "PIXZ", ["tar.xz", "tpxz", "xz"], {"tar", "pixz"},
diff --git a/dev-python/pydecomp/pydecomp-0.3-r2.ebuild b/dev-python/pydecomp/pydecomp-0.3-r2.ebuild
new file mode 100644
index 000000000000..8a9c3672f84a
--- /dev/null
+++ b/dev-python/pydecomp/pydecomp-0.3-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_BRANCH="master"
+	EGIT_REPO_URI="https://github.com/dol-sen/pyDeComp.git"
+	inherit git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/pyDeComp-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	S="${WORKDIR}/pyDeComp-${PV}"
+fi
+
+DESCRIPTION="A python library of common (de)compression and contents handling"
+HOMEPAGE="https://github.com/dol-sen/pyDeComp"
+
+LICENSE="BSD"
+SLOT="0"
+
+PATCHES=( "${FILESDIR}/${PV}-no-pixz-index.patch" )