mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-29 09:31:06 +02:00
dev-python/pydecomp: Sync with Gentoo
It's from Gentoo commit ed468028e725c9580a7b2ee02d6b7b9375f7a0b2.
This commit is contained in:
Krzesimir Nowak
parent
c0930d4e31
commit
3b24fa853c
55
sdk_container/src/third_party/portage-stable/dev-python/pydecomp/files/0.3-no-pixz-index.patch
vendored
Normal file
55
sdk_container/src/third_party/portage-stable/dev-python/pydecomp/files/0.3-no-pixz-index.patch
vendored
Normal file
@ -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"},
|
||||
@ -11,7 +11,9 @@
|
||||
routines. It can easily be extended with custom compression,
|
||||
decompression, and contents definitions.
|
||||
</longdescription>
|
||||
<stabilize-allarches/>
|
||||
<upstream>
|
||||
<remote-id type="github">dol-sen/pyDeComp</remote-id>
|
||||
<bugs-to>https://github.com/dol-sen/pyDeComp/issues</bugs-to>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python3_{7,8,9} )
|
||||
DISTUTILS_USE_SETUPTOOLS=no
|
||||
|
||||
inherit distutils-r1 python-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"
|
||||
IUSE=""
|
||||
|
||||
python_install_all() {
|
||||
distutils-r1_python_install_all
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo
|
||||
einfo "Please file any enhancement requests, or bugs"
|
||||
einfo "at https://github.com/dol-sen/pyDeComp/issues"
|
||||
einfo "I am also on IRC @ #gentoo-ci of the Libera.Chat network"
|
||||
}
|
||||
27
sdk_container/src/third_party/portage-stable/dev-python/pydecomp/pydecomp-0.3-r3.ebuild
vendored
Normal file
27
sdk_container/src/third_party/portage-stable/dev-python/pydecomp/pydecomp-0.3-r3.ebuild
vendored
Normal file
@ -0,0 +1,27 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
DISTUTILS_USE_PEP517=setuptools
|
||||
PYTHON_COMPAT=( python3_{9..11} )
|
||||
|
||||
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 ~loong ~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" )
|
||||
@ -1,12 +1,12 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{7,8,9} )
|
||||
DISTUTILS_USE_SETUPTOOLS=no
|
||||
DISTUTILS_USE_PEP517=setuptools
|
||||
PYTHON_COMPAT=( python3_{9..11} )
|
||||
|
||||
inherit distutils-r1 python-r1
|
||||
inherit distutils-r1
|
||||
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
EGIT_BRANCH="master"
|
||||
@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
|
||||
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 ~s390 ~sparc ~x86"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
|
||||
S="${WORKDIR}/pyDeComp-${PV}"
|
||||
fi
|
||||
|
||||
@ -23,22 +23,3 @@ HOMEPAGE="https://github.com/dol-sen/pyDeComp"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
python_install_all() {
|
||||
distutils-r1_python_install_all
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo
|
||||
einfo "This is new software."
|
||||
einfo "The API's it installs should be considered unstable"
|
||||
einfo "and are subject to change."
|
||||
einfo
|
||||
einfo "Please file any enhancement requests, or bugs"
|
||||
einfo "at https://github.com/dol-sen/pyDeComp/issues"
|
||||
einfo "I am also on IRC @ #gentoo-ci of the Libera.Chat network"
|
||||
einfo
|
||||
ewarn "There may be some python 3 compatibility issues still."
|
||||
ewarn "Please help debug/fix/report them in github or bugzilla."
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user