root
2 years ago
parent
f51d7fb036
commit
d53af5fe08
Binary file not shown.
Binary file not shown.
@ -1,8 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>polynomial-c@gentoo.org</email>
|
||||
<name>Lars Wendler</name>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>base-system@gentoo.org</email>
|
||||
<name>Gentoo Base System</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>polynomial-c@gentoo.org</email>
|
||||
<name>Lars Wendler</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>polynomial-c@gentoo.org</email>
|
||||
<name>Lars Wendler</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>polynomial-c@gentoo.org</email>
|
||||
<name>Lars Wendler</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>polynomial-c@gentoo.org</email>
|
||||
<name>Lars Wendler</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>polynomial-c@gentoo.org</email>
|
||||
<name>Lars Wendler</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>polynomial-c@gentoo.org</email>
|
||||
<name>Lars Wendler</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>polynomial-c@gentoo.org</email>
|
||||
<name>Lars Wendler</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>polynomial-c@gentoo.org</email>
|
||||
<name>Lars Wendler</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>polynomial-c@gentoo.org</email>
|
||||
<name>Lars Wendler</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>polynomial-c@gentoo.org</email>
|
||||
<name>Lars Wendler</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>polynomial-c@gentoo.org</email>
|
||||
<name>Lars Wendler</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>polynomial-c@gentoo.org</email>
|
||||
<name>Lars Wendler</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
||||
Binary file not shown.
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>polynomial-c@gentoo.org</email>
|
||||
<name>Lars Wendler</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>polynomial-c@gentoo.org</email>
|
||||
<name>Lars Wendler</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>polynomial-c@gentoo.org</email>
|
||||
<name>Lars Wendler</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>polynomial-c@gentoo.org</email>
|
||||
<name>Lars Wendler</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>polynomial-c@gentoo.org</email>
|
||||
<name>Lars Wendler</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>polynomial-c@gentoo.org</email>
|
||||
<name>Lars Wendler</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>polynomial-c@gentoo.org</email>
|
||||
<name>Lars Wendler</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>polynomial-c@gentoo.org</email>
|
||||
<name>Lars Wendler</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
||||
Binary file not shown.
@ -0,0 +1,108 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit autotools toolchain-funcs
|
||||
|
||||
DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
|
||||
HOMEPAGE="https://httpd.apache.org/"
|
||||
SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
|
||||
IUSE="ssl"
|
||||
RESTRICT="test"
|
||||
|
||||
RDEPEND=">=dev-libs/apr-1.5.0:1=
|
||||
dev-libs/apr-util:1=
|
||||
dev-libs/expat
|
||||
dev-libs/libpcre
|
||||
virtual/libcrypt:=
|
||||
kernel_linux? ( sys-apps/util-linux )
|
||||
ssl? ( dev-libs/openssl:0= )"
|
||||
DEPEND="${RDEPEND}
|
||||
sys-devel/libtool"
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
S="${WORKDIR}/httpd-${PV}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
|
||||
"${FILESDIR}/${PN}-2.4.54-no-which.patch" #844868
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# This package really should upgrade to using pcre's .pc file.
|
||||
cat <<-\EOF >"${T}"/pcre-config
|
||||
#!/bin/bash
|
||||
flags=()
|
||||
for flag; do
|
||||
if [[ ${flag} == "--version" ]]; then
|
||||
flags+=( --modversion )
|
||||
else
|
||||
flags+=( "${flag}" )
|
||||
fi
|
||||
done
|
||||
exec ${PKG_CONFIG} libpcre "${flags[@]}"
|
||||
EOF
|
||||
chmod a+x "${T}"/pcre-config || die
|
||||
|
||||
# Only here for which patch
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Brain dead check.
|
||||
tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
|
||||
|
||||
tc-export PKG_CONFIG
|
||||
|
||||
local myeconfargs=(
|
||||
--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
|
||||
--sbindir="${EPREFIX}"/usr/sbin
|
||||
--with-z="${EPREFIX}"/usr
|
||||
--with-apr="${ESYSROOT}"/usr
|
||||
--with-apr-util="${ESYSROOT}"/usr
|
||||
--with-pcre="${T}"/pcre-config
|
||||
$(use_enable ssl)
|
||||
$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
|
||||
)
|
||||
# econf overwrites the stuff from config.layout.
|
||||
ac_cv_path_PKGCONFIG="${PKG_CONFIG}" \
|
||||
econf "${myeconfargs[@]}"
|
||||
sed -i \
|
||||
-e '/^LTFLAGS/s:--silent::' \
|
||||
build/rules.mk build/config_vars.mk || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake -C support
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake -C support DESTDIR="${D}" install
|
||||
dodoc CHANGES
|
||||
doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
|
||||
docs/man/{htcacheclean,rotatelogs}.8
|
||||
|
||||
# Providing compatiblity symlinks for #177697 (which we'll stop to install
|
||||
# at some point).
|
||||
pushd "${ED}"/usr/sbin >/dev/null || die
|
||||
local i
|
||||
for i in *; do
|
||||
dosym ${i} /usr/sbin/${i}2
|
||||
done
|
||||
popd >/dev/null || die
|
||||
|
||||
# Provide a symlink for ab-ssl
|
||||
if use ssl ; then
|
||||
dosym ab /usr/bin/ab-ssl
|
||||
dosym ab /usr/bin/ab2-ssl
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,54 @@
|
||||
https://bugs.gentoo.org/844868
|
||||
https://bz.apache.org/bugzilla/show_bug.cgi?id=66130
|
||||
--- a/build/aix/buildaix.ksh
|
||||
+++ b/build/aix/buildaix.ksh
|
||||
@@ -26,14 +26,14 @@ export CFLAGS='-O2 -qlanglvl=extc99'
|
||||
lslpp -L bos.adt.insttools >/dev/null
|
||||
[[ $? -ne 0 ]] && echo "must have bos.adt.insttools installed" && exit -1
|
||||
|
||||
-apr_config=`which apr-1-config`
|
||||
-apu_config=`which apu-1-config`
|
||||
+apr_config=`command -v apr-1-config 2>/dev/null`
|
||||
+apu_config=`command -v apu-1-config 2>/dev/null`
|
||||
|
||||
if [[ -z ${apr_config} && -z ${apu_config} ]]
|
||||
then
|
||||
export PATH=/opt/bin:${PATH}
|
||||
- apr_config=`which apr-1-config`
|
||||
- apu_config=`which apu-1-config`
|
||||
+ apr_config=`command -v apr-1-config 2>/dev/null`
|
||||
+ apu_config=`command -v apu-1-config 2>/dev/null`
|
||||
fi
|
||||
|
||||
while test $# -gt 0
|
||||
--- a/build/pkg/buildpkg.sh
|
||||
+++ b/build/pkg/buildpkg.sh
|
||||
@@ -24,8 +24,8 @@ PREFIX=/usr/local/apache2
|
||||
TEMPDIR=/var/tmp/$USER/httpd-root
|
||||
rm -rf $TEMPDIR
|
||||
|
||||
-apr_config=`which apr-1-config`
|
||||
-apu_config=`which apu-1-config`
|
||||
+apr_config=`command -v apr-1-config 2>/dev/null`
|
||||
+apu_config=`command -v apu-1-config 2>/dev/null`
|
||||
|
||||
while test $# -gt 0
|
||||
do
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -216,13 +216,13 @@ AC_ARG_WITH(pcre,
|
||||
APACHE_HELP_STRING(--with-pcre=PATH,Use external PCRE library))
|
||||
if test "x$with_pcre" = "x" || test "$with_pcre" = "yes"; then
|
||||
with_pcre="$PATH"
|
||||
-else if which $with_pcre 2>/dev/null; then :; else
|
||||
+else if command -v $with_pcre 2>/dev/null; then :; else
|
||||
with_pcre="$with_pcre/bin:$with_pcre"
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_CHECK_TARGET_TOOLS(PCRE_CONFIG, [pcre2-config pcre-config],
|
||||
- [`which $with_pcre 2>/dev/null`], $with_pcre)
|
||||
+ [`command -v $with_pcre 2>/dev/null`], $with_pcre)
|
||||
|
||||
if test "x$PCRE_CONFIG" != "x"; then
|
||||
if $PCRE_CONFIG --version >/dev/null 2>&1; then :; else
|
||||
@ -0,0 +1,71 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
DISTUTILS_USE_PEP517=setuptools
|
||||
PYTHON_COMPAT=( python3_{8..10} )
|
||||
|
||||
inherit bash-completion-r1 distutils-r1 multiprocessing
|
||||
|
||||
MY_P=aws-cli-${PV}
|
||||
DESCRIPTION="Universal Command Line Environment for AWS"
|
||||
HOMEPAGE="
|
||||
https://github.com/aws/aws-cli/
|
||||
https://pypi.org/project/awscli/
|
||||
"
|
||||
SRC_URI="
|
||||
https://github.com/aws/aws-cli/archive/${PV}.tar.gz
|
||||
-> ${MY_P}.gh.tar.gz
|
||||
"
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm64 ~x86"
|
||||
|
||||
# botocore is x.(y+2).z
|
||||
BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
|
||||
RDEPEND="
|
||||
>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
|
||||
dev-python/colorama[${PYTHON_USEDEP}]
|
||||
dev-python/docutils[${PYTHON_USEDEP}]
|
||||
dev-python/rsa[${PYTHON_USEDEP}]
|
||||
>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
|
||||
dev-python/pyyaml[${PYTHON_USEDEP}]
|
||||
"
|
||||
BDEPEND="
|
||||
test? (
|
||||
dev-python/pytest-forked[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-xdist[${PYTHON_USEDEP}]
|
||||
)
|
||||
"
|
||||
|
||||
distutils_enable_tests pytest
|
||||
|
||||
src_prepare() {
|
||||
# do not rely on bundled deps in botocore (sic!)
|
||||
find -name '*.py' -exec sed -i \
|
||||
-e 's:from botocore[.]vendored import:import:' \
|
||||
-e 's:from botocore[.]vendored[.]:from :' \
|
||||
{} + || die
|
||||
# strip overzealous upper bounds on requirements
|
||||
sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
|
||||
distutils-r1_src_prepare
|
||||
}
|
||||
|
||||
python_test() {
|
||||
# integration tests require AWS credentials and Internet access
|
||||
epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
newbashcomp bin/aws_bash_completer aws
|
||||
|
||||
insinto /usr/share/zsh/site-functions
|
||||
newins bin/aws_zsh_completer.sh _aws
|
||||
|
||||
distutils-r1_python_install_all
|
||||
|
||||
rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
|
||||
}
|
||||
@ -0,0 +1,71 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
DISTUTILS_USE_PEP517=setuptools
|
||||
PYTHON_COMPAT=( python3_{8..10} )
|
||||
|
||||
inherit bash-completion-r1 distutils-r1 multiprocessing
|
||||
|
||||
MY_P=aws-cli-${PV}
|
||||
DESCRIPTION="Universal Command Line Environment for AWS"
|
||||
HOMEPAGE="
|
||||
https://github.com/aws/aws-cli/
|
||||
https://pypi.org/project/awscli/
|
||||
"
|
||||
SRC_URI="
|
||||
https://github.com/aws/aws-cli/archive/${PV}.tar.gz
|
||||
-> ${MY_P}.gh.tar.gz
|
||||
"
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm64 ~x86"
|
||||
|
||||
# botocore is x.(y+2).z
|
||||
BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
|
||||
RDEPEND="
|
||||
>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
|
||||
dev-python/colorama[${PYTHON_USEDEP}]
|
||||
dev-python/docutils[${PYTHON_USEDEP}]
|
||||
dev-python/rsa[${PYTHON_USEDEP}]
|
||||
>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
|
||||
dev-python/pyyaml[${PYTHON_USEDEP}]
|
||||
"
|
||||
BDEPEND="
|
||||
test? (
|
||||
dev-python/pytest-forked[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-xdist[${PYTHON_USEDEP}]
|
||||
)
|
||||
"
|
||||
|
||||
distutils_enable_tests pytest
|
||||
|
||||
src_prepare() {
|
||||
# do not rely on bundled deps in botocore (sic!)
|
||||
find -name '*.py' -exec sed -i \
|
||||
-e 's:from botocore[.]vendored import:import:' \
|
||||
-e 's:from botocore[.]vendored[.]:from :' \
|
||||
{} + || die
|
||||
# strip overzealous upper bounds on requirements
|
||||
sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
|
||||
distutils-r1_src_prepare
|
||||
}
|
||||
|
||||
python_test() {
|
||||
# integration tests require AWS credentials and Internet access
|
||||
epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
newbashcomp bin/aws_bash_completer aws
|
||||
|
||||
insinto /usr/share/zsh/site-functions
|
||||
newins bin/aws_zsh_completer.sh _aws
|
||||
|
||||
distutils-r1_python_install_all
|
||||
|
||||
rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST hcloud-1.29.5.tar.xz 1416952 BLAKE2B 4b1c9e1df9bb3fdb63c28890e7f9cfb8c4c628fd22b765d8265e63415b8feee0466f32fd6a87a5cd981d231f93a60c28c140c1efa7ea33c327b234f1a4d6b0cf SHA512 fbe395c47cf1bef800c162b8c44359dab173c636ec4d7e8e4629fa95b323731c7c3d8a9045dd77692b7beb8a3554cdce567f2285640a5b410262be69442fe99e
|
||||
DIST hcloud-1.30.0.tar.xz 1650212 BLAKE2B 5fe33e0e782524822bcd7f199d826009ef6c68e9759281613eda1c8481f962b220956fa24515a6f93bf246f43bd0198ddd180a299ddbe2e91327c83f9685ac26 SHA512 9a1160d03f30ac939b5e8eab466f1496476efdcca6b138bc89ca7c0ac5be211ca570eadb050948d1c8bdeeb13b392c6ac0c2a1726c4c53ffca2689e389a3f64f
|
||||
|
||||
@ -0,0 +1,34 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
DESCRIPTION="A command-line interface for Hetzner Cloud"
|
||||
HOMEPAGE="https://github.com/hetznercloud/cli"
|
||||
SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
IUSE=""
|
||||
DEPEND="dev-lang/go:="
|
||||
RESTRICT="strip"
|
||||
QA_FLAGS_IGNORED=".*"
|
||||
|
||||
src_compile() {
|
||||
go build -mod vendor -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/internal/version.Version=${PV}-gentoo" ./cmd/${PN} || die "build failed"
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# For upstream a simple test is run 'hcloud version'
|
||||
./hcloud version
|
||||
if [[ $? -ne 0 ]]
|
||||
then
|
||||
die "Test failed"
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin ${PN}
|
||||
}
|
||||
@ -1,7 +1,5 @@
|
||||
DIST salt-3001.8.tar.gz 15740488 BLAKE2B 77875a670b81438280becd1f29b64fbc766379192a9ca041568cd9360a3c4213bb3018063e88a297e9d1f637fb7ca3ef049a73a258022ec07e42f01a40bdf09a SHA512 8e90b2a1f82f951ab40a53a8af2ab421758ed8244f1881cc7aa71a8d9c2e2e6d892166ec8f8f6182966e56eb28c9aee6a060ee54b559b1d073fba97ad0afb013
|
||||
DIST salt-3002.7.tar.gz 15792124 BLAKE2B b4cb4a6d73c45f3c2183a7adfe8196bbc5788dce1995bd5c640cd9957bdfdba2e96deebaba927d6103fc50f4eaab86d51f4dd4594d25b7357db79ed67b39258e SHA512 c1e7bbcd39b5c2bef351bd74026346bf729839c4161f6eff8162620e9cb08a63073abeeb8af6bab635070386a883df494ef08cc07a84efa9aa7f2160b357a938
|
||||
DIST salt-3002.8.tar.gz 15798643 BLAKE2B 12280dfd29f46f9bb8b2df6fcef474c2c2237d6f9c71e1474caae58893605dd6f9fb4c4573f52765cb950cd15e31fc0fda2fa8dd1c87d48c1951d2812c1a3a81 SHA512 a88a6f77d2af2cff5d5244f38b16a1904da05bdfd45b2087691e41b07f21785b1838151314d7c80d3a33eebefe480c8f3678fa161e9ceaaa50c997022463c472
|
||||
DIST salt-3003.3.tar.gz 16017984 BLAKE2B 9cd1e33a7b6dff4d3c6c5a87e1204f7f113b6190da8301061e26fcec178aba597a9e17ab60a54a67b52a895a9a8aef58bec70e9fdd8d8edc5a42945f6de21a58 SHA512 4fe50922833fce48fcc679adb16a0e1fe893531b2feb08b235a1461c58b8d9a72af2acd89fc0f712207fb0cd215d6b446e31a40001b46c43d0cc4ac827ce29e3
|
||||
DIST salt-3002.9.tar.gz 15817470 BLAKE2B 31fb6dbb61a9f0ab22ca761810a934792e9fa9c78628f925e63d3d54d00fa4ea0b4aa806ba3ea92f7397ba3291281bf8989d9a288fb3114c7911cdebfc9acd6a SHA512 f34fd05960a68cba51f34cf8b7c737bd84d00472cec80628f082d16e54cf70705e191ac4b6690bf406a8a11e26c8155e4bdbdec34ede5f0721fd9b5e637a0ed1
|
||||
DIST salt-3003.4.tar.gz 16031515 BLAKE2B 34902aba7ab64f4ddbacbad1b776b9b2218caf22fb843879a80bd5c30b6c28f4c22a050bbaf0e9735507a78c887f52bcae7d1833ffeb51a543ec22fda79252e6 SHA512 35419fbb3f9a0f3e87579f740b717d6902cab0d85397b16d1e94d9516bf5f5d269b4f8bca370fd376abd9b7c8a6ad7ef4c8e8a8fdd31655fd17c810989e79693
|
||||
DIST salt-3003.tar.gz 15830910 BLAKE2B ea4f02eece951c3fb4fcc480d00f7b531ac549b2e23ff9a210b73f749f9ba83e0402e02a59028f41f94958d17512e417b7c1b7015e8ee3aeac55be9b1374fe6f SHA512 7f631466372f303c03f2852a5cfba1ee5c6ba1636a6fe1e1622e90d0b1376ef9f670aa1b4754f3d9c8c7fe1b99fe1b4c49e140dc86d90d157a1ec1e73ba43c38
|
||||
DIST salt-3003.5.tar.gz 16056545 BLAKE2B ede3f0c63175f093dca07bee1bfb659cc608336ae92f532fc45868bd7eca659498c42e5d44324492744b802ade088adac869277679989550e217c1a135d6566d SHA512 ebda2056b4d6d216a0689b919d00aa78f615c355d21703d1939dbb6b00e9ad9347be4ee5b861282521f2d337bf7bf2fdc85e6942016358088a094d854fb33be9
|
||||
DIST salt-3004.1.tar.gz 17685649 BLAKE2B 64950cdc8420228f935d4a21fc20872da9ecf7c51b866ec3c59b46486b84a739b002acc44fa909eed93ce3dc6bedc9804df05d3d9ee5a9a13cd9d041ba70f876 SHA512 9353a8dc2a1c6e272318c6f35059236c5d78b6c8930f715275b701c12fca3be1fe930eb533f3f0c22933ba60967b0980300b922fe486cee9a62e6cdb568bdf91
|
||||
DIST salt-3004.2.tar.gz 17685127 BLAKE2B a42e31d8a006488b3a6f341f817cde21ff86248d2b548d9914c429c62d7570cdf46cf2b41311cbb08ced7f9518e68156c6df3eb78e55cacfd4d40a4e7a54f52b SHA512 b2fa434f1d25eabac51d65d75bb020943eb71aff113d683e6f436a0f205bd3c7682b1b7acd4d9a62bf37a47eb0561293d263f3174d5e266f0998a1652fcae2ef
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff --git a/tests/unit/modules/test_cmdmod.py b/tests/unit/modules/test_cmdmod.py
|
||||
index 2d88706b49..ec8b623f5b 100644
|
||||
--- a/tests/unit/modules/test_cmdmod.py
|
||||
+++ b/tests/unit/modules/test_cmdmod.py
|
||||
@@ -509,6 +509,7 @@ class CMDMODTestCase(TestCase, LoaderModuleMockMixin):
|
||||
self.assertEqual(ret['stdout'],
|
||||
salt.utils.stringutils.to_unicode(stdout))
|
||||
|
||||
+ @skipIf(True, "Not happy in sandbox")
|
||||
def test_run_all_output_loglevel_debug(self):
|
||||
'''
|
||||
Test that specifying debug for loglevel
|
||||
@ -1,151 +0,0 @@
|
||||
diff --git a/tests/integration/master/test_event_return.py b/tests/integration/master/test_event_return.py
|
||||
index 1a97be0e5f..93c57f08ff 100644
|
||||
--- a/tests/integration/master/test_event_return.py
|
||||
+++ b/tests/integration/master/test_event_return.py
|
||||
@@ -18,7 +18,7 @@ import time
|
||||
import salt.ext.six as six
|
||||
from salt.utils.nb_popen import NonBlockingPopen
|
||||
from saltfactories.utils.ports import get_unused_localhost_port
|
||||
-from saltfactories.utils.processes.helpers import terminate_process
|
||||
+from saltfactories.utils.processes import terminate_process
|
||||
from tests.support.cli_scripts import ScriptPathMixin
|
||||
from tests.support.mixins import AdaptedConfigurationTestCaseMixin
|
||||
from tests.support.runtests import RUNTIME_VARS
|
||||
diff --git a/tests/integration/utils/testprogram.py b/tests/integration/utils/testprogram.py
|
||||
index 74bbc1cd90..be651591d1 100644
|
||||
--- a/tests/integration/utils/testprogram.py
|
||||
+++ b/tests/integration/utils/testprogram.py
|
||||
@@ -30,7 +30,7 @@ import salt.utils.psutil_compat as psutils
|
||||
import salt.utils.yaml
|
||||
from salt.ext import six
|
||||
from salt.ext.six.moves import range
|
||||
-from saltfactories.utils.processes.helpers import (
|
||||
+from saltfactories.utils.processes import (
|
||||
terminate_process,
|
||||
terminate_process_list,
|
||||
)
|
||||
diff --git a/tests/support/case.py b/tests/support/case.py
|
||||
index 9017027ae3..517cefb64a 100644
|
||||
--- a/tests/support/case.py
|
||||
+++ b/tests/support/case.py
|
||||
@@ -25,7 +25,7 @@ import time
|
||||
from datetime import datetime, timedelta
|
||||
|
||||
import salt.utils.files
|
||||
-from saltfactories.utils.processes.helpers import terminate_process
|
||||
+from saltfactories.utils.processes import terminate_process
|
||||
from tests.support.cli_scripts import ScriptPathMixin
|
||||
from tests.support.helpers import RedirectStdStreams, requires_sshd_server
|
||||
from tests.support.mixins import ( # pylint: disable=unused-import
|
||||
diff --git a/tests/support/helpers.py b/tests/support/helpers.py
|
||||
index bae2dceff4..93fbb66742 100644
|
||||
--- a/tests/support/helpers.py
|
||||
+++ b/tests/support/helpers.py
|
||||
@@ -42,7 +42,7 @@ import salt.utils.versions
|
||||
from salt.ext import six
|
||||
from salt.ext.six.moves import builtins, range
|
||||
from saltfactories.utils.ports import get_unused_localhost_port
|
||||
-from saltfactories.utils.processes.bases import ProcessResult
|
||||
+from saltfactories.utils.processes import ProcessResult
|
||||
from tests.support.mock import patch
|
||||
from tests.support.runtests import RUNTIME_VARS
|
||||
from tests.support.sminion import create_sminion
|
||||
@@ -1674,7 +1674,7 @@ class VirtualEnv(object):
|
||||
kwargs.setdefault("stderr", subprocess.PIPE)
|
||||
kwargs.setdefault("universal_newlines", True)
|
||||
proc = subprocess.run(args, check=False, **kwargs)
|
||||
- ret = ProcessResult(proc.returncode, proc.stdout, proc.stderr, proc.args)
|
||||
+ ret = ProcessResult(proc.returncode, proc.stdout, proc.stderr, cmdline=proc.args)
|
||||
log.debug(ret)
|
||||
if check is True:
|
||||
proc.check_returncode()
|
||||
diff --git a/tests/support/paths.py b/tests/support/paths.py
|
||||
index 1e1e081dc4..981aa54eb7 100644
|
||||
--- a/tests/support/paths.py
|
||||
+++ b/tests/support/paths.py
|
||||
@@ -49,14 +49,12 @@ if TESTS_DIR not in sys.path:
|
||||
sys.path.insert(1, TESTS_DIR)
|
||||
|
||||
SYS_TMP_DIR = os.path.abspath(
|
||||
- os.path.realpath(
|
||||
- # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long
|
||||
- # for unix sockets: ``error: AF_UNIX path too long``
|
||||
- # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR}
|
||||
- os.environ.get("TMPDIR", tempfile.gettempdir())
|
||||
- if not sys.platform.startswith("darwin")
|
||||
- else "/tmp"
|
||||
- )
|
||||
+ # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long
|
||||
+ # for unix sockets: ``error: AF_UNIX path too long``
|
||||
+ # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR}
|
||||
+ os.environ.get("TMPDIR", tempfile.gettempdir())
|
||||
+ if not sys.platform.startswith("darwin")
|
||||
+ else "/tmp"
|
||||
)
|
||||
TMP = os.path.join(SYS_TMP_DIR, "salt-tests-tmpdir")
|
||||
TMP_ROOT_DIR = os.path.join(TMP, "rootdir")
|
||||
diff --git a/tests/support/processes.py b/tests/support/processes.py
|
||||
index 4f264862a4..7c93e48368 100644
|
||||
--- a/tests/support/processes.py
|
||||
+++ b/tests/support/processes.py
|
||||
@@ -14,7 +14,7 @@ from __future__ import absolute_import
|
||||
|
||||
import logging
|
||||
|
||||
-from saltfactories.utils.processes.helpers import ( # pylint: disable=unused-import
|
||||
+from saltfactories.utils.processes import ( # pylint: disable=unused-import
|
||||
collect_child_processes,
|
||||
terminate_process,
|
||||
terminate_process_list,
|
||||
diff --git a/tests/unit/utils/scheduler/base.py b/tests/unit/utils/scheduler/base.py
|
||||
index 5d7f161eb5..286e047e40 100644
|
||||
--- a/tests/unit/utils/scheduler/base.py
|
||||
+++ b/tests/unit/utils/scheduler/base.py
|
||||
@@ -14,7 +14,7 @@ import salt.utils.platform
|
||||
import salt.utils.schedule
|
||||
from salt.modules.test import ping
|
||||
from salt.utils.process import SubprocessList
|
||||
-from saltfactories.utils.processes.helpers import terminate_process
|
||||
+from saltfactories.utils.processes import terminate_process
|
||||
from tests.support.mixins import SaltReturnAssertsMixin
|
||||
from tests.support.mock import MagicMock, patch
|
||||
from tests.support.runtests import RUNTIME_VARS
|
||||
diff --git a/tests/unit/utils/test_event.py b/tests/unit/utils/test_event.py
|
||||
index 9a3b1c428d..dfcf1c5275 100644
|
||||
--- a/tests/unit/utils/test_event.py
|
||||
+++ b/tests/unit/utils/test_event.py
|
||||
@@ -21,7 +21,7 @@ import zmq
|
||||
import zmq.eventloop.ioloop
|
||||
from salt.ext.six.moves import range
|
||||
from salt.ext.tornado.testing import AsyncTestCase
|
||||
-from saltfactories.utils.processes.helpers import terminate_process
|
||||
+from saltfactories.utils.processes import terminate_process
|
||||
from tests.support.events import eventpublisher_process, eventsender_process
|
||||
from tests.support.helpers import slowTest
|
||||
from tests.support.runtests import RUNTIME_VARS
|
||||
diff --git a/tests/unit/utils/test_verify.py b/tests/unit/utils/test_verify.py
|
||||
index 5662cf621b..0339c353dc 100644
|
||||
--- a/tests/unit/utils/test_verify.py
|
||||
+++ b/tests/unit/utils/test_verify.py
|
||||
@@ -343,7 +343,7 @@ class TestCleanPath(TestCase):
|
||||
def test_clean_path_valid(self):
|
||||
path_a = os.path.join(self.tmpdir, "foo")
|
||||
path_b = os.path.join(self.tmpdir, "foo", "bar")
|
||||
- assert clean_path(path_a, path_b) == path_b
|
||||
+ assert clean_path(path_a, path_b) == os.path.realpath(path_b)
|
||||
|
||||
def test_clean_path_invalid(self):
|
||||
path_a = os.path.join(self.tmpdir, "foo")
|
||||
@@ -398,10 +398,10 @@ class TestCleanPathLink(TestCase):
|
||||
test_path = os.path.join(self.from_path, "test")
|
||||
expect_path = os.path.join(self.to_path, "test")
|
||||
ret = clean_path(self.from_path, test_path)
|
||||
- assert ret == expect_path, "{} is not {}".format(ret, expect_path)
|
||||
+ assert ret == os.path.realpath(expect_path), "{} is not {}".format(ret, expect_path)
|
||||
|
||||
def test_clean_path_symlinked_tgt(self):
|
||||
test_path = os.path.join(self.to_path, "test")
|
||||
expect_path = os.path.join(self.to_path, "test")
|
||||
ret = clean_path(self.from_path, test_path)
|
||||
- assert ret == expect_path, "{} is not {}".format(ret, expect_path)
|
||||
+ assert ret == os.path.realpath(expect_path), "{} is not {}".format(ret, expect_path)
|
||||
@ -1,18 +0,0 @@
|
||||
--- salt-3001.6-python3_7/tests/unit/modules/test_cmdmod.py 2021-02-26 16:13:26.386553301 -0800
|
||||
+++ salt-3001.6/tests/unit/modules/test_cmdmod.py 2021-02-26 16:14:25.858150910 -0800
|
||||
@@ -437,6 +437,7 @@
|
||||
else:
|
||||
raise RuntimeError
|
||||
|
||||
+ @skipIf(True, "does not work with sandbox")
|
||||
@skipIf(salt.utils.platform.is_windows(), "Do not run on Windows")
|
||||
@skipIf(salt.utils.platform.is_darwin(), "Do not run on MacOS")
|
||||
def test_run_cwd_in_combination_with_runas(self):
|
||||
@@ -560,6 +561,7 @@
|
||||
|
||||
self.assertEqual(ret["stdout"], salt.utils.stringutils.to_unicode(stdout))
|
||||
|
||||
+ @skipIf(True, "does not work with sandbox")
|
||||
def test_run_all_output_loglevel_debug(self):
|
||||
"""
|
||||
Test that specifying debug for loglevel
|
||||
@ -0,0 +1,11 @@
|
||||
--- a/salt/_compat.py 2022-06-28 01:50:45.630746476 -0000
|
||||
+++ b/salt/_compat.py 2022-06-28 01:51:52.970217848 -0000
|
||||
@@ -14,7 +14,7 @@
|
||||
if sys.version_info >= (3, 10):
|
||||
# Python 3.10 will include a fix in importlib.metadata which allows us to
|
||||
# get the distribution of a loaded entry-point
|
||||
- import importlib.metadata # pylint: disable=no-member,no-name-in-module
|
||||
+ import importlib.metadata as importlib_metadata # pylint: disable=no-member,no-name-in-module
|
||||
else:
|
||||
# importlib_metadata before version 3.3.0 does not include the functionality we need.
|
||||
try:
|
||||
@ -0,0 +1,14 @@
|
||||
diff --git a/tests/unit/utils/test_jinja.py b/tests/unit/utils/test_jinja.py
|
||||
index 6502831aff..dec847364a 100644
|
||||
--- a/tests/unit/utils/test_jinja.py
|
||||
+++ b/tests/unit/utils/test_jinja.py
|
||||
@@ -22,7 +22,8 @@ import salt.utils.files
|
||||
import salt.utils.json
|
||||
import salt.utils.stringutils
|
||||
import salt.utils.yaml
|
||||
-from jinja2 import DictLoader, Environment, Markup, exceptions
|
||||
+from jinja2 import DictLoader, Environment, exceptions
|
||||
+from markupsafe import Markup
|
||||
from salt.exceptions import SaltRenderError
|
||||
from salt.utils.decorators.jinja import JinjaFilter
|
||||
from salt.utils.jinja import (
|
||||
@ -1,188 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=( python3_{7..8} )
|
||||
|
||||
inherit systemd distutils-r1
|
||||
|
||||
DESCRIPTION="Salt is a remote execution and configuration manager"
|
||||
HOMEPAGE="https://www.saltstack.com/resources/community/
|
||||
https://github.com/saltstack"
|
||||
|
||||
if [[ ${PV} == 9999* ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
|
||||
EGIT_BRANCH="develop"
|
||||
SRC_URI=""
|
||||
else
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
|
||||
fi
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
|
||||
mongodb neutron nova openssl portage profile redis selinux test raet
|
||||
+zeromq vim-syntax"
|
||||
|
||||
RDEPEND="
|
||||
sys-apps/pciutils
|
||||
dev-python/distro[${PYTHON_USEDEP}]
|
||||
dev-python/jinja[${PYTHON_USEDEP}]
|
||||
dev-python/libnacl[${PYTHON_USEDEP}]
|
||||
>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/pycryptodome-3.9.7[${PYTHON_USEDEP}]
|
||||
dev-python/pyyaml[${PYTHON_USEDEP}]
|
||||
dev-python/markupsafe[${PYTHON_USEDEP}]
|
||||
>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
dev-python/toml[${PYTHON_USEDEP}]
|
||||
dev-python/watchdog[${PYTHON_USEDEP}]
|
||||
libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
|
||||
mako? ( dev-python/mako[${PYTHON_USEDEP}] )
|
||||
ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
|
||||
libvirt? (
|
||||
$(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8)
|
||||
)
|
||||
openssl? (
|
||||
dev-libs/openssl:0=[-bindist(-)]
|
||||
dev-python/pyopenssl[${PYTHON_USEDEP}]
|
||||
)
|
||||
raet? (
|
||||
>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
|
||||
>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
|
||||
)
|
||||
cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
|
||||
cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] )
|
||||
mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
|
||||
portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
|
||||
keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
|
||||
redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
|
||||
selinux? ( sec-policy/selinux-salt )
|
||||
nova? (
|
||||
$(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8)
|
||||
)
|
||||
neutron? (
|
||||
$(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8)
|
||||
)
|
||||
gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
|
||||
profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
|
||||
vim-syntax? ( app-vim/salt-vim )
|
||||
zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] )
|
||||
"
|
||||
BDEPEND="
|
||||
test? (
|
||||
${RDEPEND}
|
||||
>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
|
||||
dev-python/pip[${PYTHON_USEDEP}]
|
||||
dev-python/psutil[${PYTHON_USEDEP}]
|
||||
dev-python/pytest[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
|
||||
>=dev-python/pytest-salt-2020.1.27[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-salt-factories[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-tempdir[${PYTHON_USEDEP}]
|
||||
>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
|
||||
>=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}]
|
||||
net-dns/bind-tools
|
||||
!x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] )
|
||||
)"
|
||||
|
||||
DOCS=( README.rst AUTHORS )
|
||||
|
||||
REQUIRED_USE="|| ( raet zeromq )
|
||||
test? ( cheetah genshi )"
|
||||
RESTRICT="!test? ( test ) x86? ( test )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch"
|
||||
"${FILESDIR}/salt-3001.1-tests.patch"
|
||||
"${FILESDIR}/salt-3001.6-tests.patch"
|
||||
)
|
||||
|
||||
python_prepare_all() {
|
||||
# remove tests with external dependencies that may not be available, and
|
||||
# tests that don't work in sandbox
|
||||
rm tests/unit/{test_{zypp_plugins,module_names},utils/test_{extend,cache}}.py || die
|
||||
rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
|
||||
rm tests/unit/states/test_boto_vpc.py || die
|
||||
rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die
|
||||
|
||||
# tests that require network access
|
||||
rm tests/unit/{states,modules}/test_zcbuildout.py || die
|
||||
|
||||
# make sure pkg_resources doesn't bomb because pycrypto isn't installed
|
||||
find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die
|
||||
# pycryptodome rather than pycryptodomex
|
||||
find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die
|
||||
|
||||
distutils-r1_python_prepare_all
|
||||
}
|
||||
|
||||
python_prepare() {
|
||||
einfo "Fixing collections.abc warnings for ${EPYTHON}"
|
||||
local abc
|
||||
abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die
|
||||
find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
local svc
|
||||
USE_SETUPTOOLS=1 distutils-r1_python_install_all
|
||||
|
||||
for svc in minion master syndic api; do
|
||||
newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc}
|
||||
newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
|
||||
systemd_dounit "${FILESDIR}"/salt-${svc}.service
|
||||
done
|
||||
|
||||
insinto /etc/${PN}
|
||||
doins -r conf/*
|
||||
}
|
||||
|
||||
python_test() {
|
||||
local tempdir
|
||||
# testsuite likes lots of files
|
||||
ulimit -n 3072 || die
|
||||
|
||||
# ${T} is too long a path for the tests to work
|
||||
tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
|
||||
mkdir "${T}/$(basename "${tempdir}")"
|
||||
|
||||
(
|
||||
cleanup() { rm -f "${tempdir}" || die; }
|
||||
|
||||
trap cleanup EXIT
|
||||
|
||||
addwrite "${tempdir}"
|
||||
ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die
|
||||
|
||||
USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
|
||||
TMPDIR="${tempdir}" \
|
||||
${EPYTHON} tests/runtests.py \
|
||||
--unit-tests --no-report --verbose \
|
||||
|| die "testing failed with ${EPYTHON}"
|
||||
)
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if use python_targets_python3_8; then
|
||||
if use nova; then
|
||||
ewarn "Salt's nova functionality will not work with python3.8 since"
|
||||
ewarn "dev-python/python-novaclient does not support it yet"
|
||||
fi
|
||||
if use neutron; then
|
||||
ewarn "Salt's neutron functionality will not work with python3.8 since"
|
||||
ewarn "dev-python/python-neutronclient does not support it yet"
|
||||
fi
|
||||
if use libvirt; then
|
||||
ewarn "Salt's libvirt functionality will not work with python3.8 since"
|
||||
ewarn "dev-python/libvirt-python does not support it yet"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
@ -1,196 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=( python3_{7..9} )
|
||||
|
||||
inherit systemd distutils-r1
|
||||
|
||||
DESCRIPTION="Salt is a remote execution and configuration manager"
|
||||
HOMEPAGE="https://www.saltstack.com/resources/community/
|
||||
https://github.com/saltstack"
|
||||
|
||||
if [[ ${PV} == 9999* ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
|
||||
EGIT_BRANCH="develop"
|
||||
SRC_URI=""
|
||||
else
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
|
||||
fi
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
|
||||
mongodb neutron nova openssl portage profile redis selinux test raet
|
||||
+zeromq vim-syntax"
|
||||
|
||||
RDEPEND="
|
||||
sys-apps/pciutils
|
||||
>=dev-python/distro-1.5[${PYTHON_USEDEP}]
|
||||
dev-python/jinja[${PYTHON_USEDEP}]
|
||||
dev-python/libnacl[${PYTHON_USEDEP}]
|
||||
>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
|
||||
dev-python/pyyaml[${PYTHON_USEDEP}]
|
||||
dev-python/markupsafe[${PYTHON_USEDEP}]
|
||||
>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
dev-python/toml[${PYTHON_USEDEP}]
|
||||
dev-python/watchdog[${PYTHON_USEDEP}]
|
||||
libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
|
||||
mako? ( dev-python/mako[${PYTHON_USEDEP}] )
|
||||
ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
|
||||
libvirt? (
|
||||
$(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8)
|
||||
)
|
||||
openssl? (
|
||||
dev-libs/openssl:0=[-bindist(-)]
|
||||
dev-python/pyopenssl[${PYTHON_USEDEP}]
|
||||
)
|
||||
raet? (
|
||||
>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
|
||||
>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
|
||||
)
|
||||
cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
|
||||
cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] )
|
||||
genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
|
||||
mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
|
||||
portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
|
||||
keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
|
||||
redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
|
||||
selinux? ( sec-policy/selinux-salt )
|
||||
nova? (
|
||||
$(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8)
|
||||
)
|
||||
neutron? (
|
||||
$(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8)
|
||||
)
|
||||
gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
|
||||
profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
|
||||
vim-syntax? ( app-vim/salt-vim )
|
||||
zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] )
|
||||
"
|
||||
BDEPEND="
|
||||
test? (
|
||||
${RDEPEND}
|
||||
>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
|
||||
dev-python/mako[${PYTHON_USEDEP}]
|
||||
>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
|
||||
dev-python/pip[${PYTHON_USEDEP}]
|
||||
dev-python/psutil[${PYTHON_USEDEP}]
|
||||
dev-python/pytest[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
|
||||
>=dev-python/pytest-salt-factories-0.93.0[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-tempdir[${PYTHON_USEDEP}]
|
||||
>=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}]
|
||||
net-dns/bind-tools
|
||||
!x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] )
|
||||
)"
|
||||
|
||||
DOCS=( README.rst AUTHORS )
|
||||
|
||||
REQUIRED_USE="
|
||||
|| ( raet zeromq )
|
||||
test? ( cheetah genshi )
|
||||
"
|
||||
RESTRICT="!test? ( test ) x86? ( test )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch"
|
||||
"${FILESDIR}/salt-3002-dont-realpath-on-tmpdir.patch"
|
||||
"${FILESDIR}/salt-3002-tests.patch"
|
||||
"${FILESDIR}/salt-3002.5-tests.patch"
|
||||
"${FILESDIR}/salt-3002.7-tests.patch"
|
||||
)
|
||||
|
||||
python_prepare_all() {
|
||||
# remove tests with external dependencies that may not be available, and
|
||||
# tests that don't work in sandbox
|
||||
rm tests/unit/{test_{zypp_plugins,module_names},utils/test_{extend,cache}}.py || die
|
||||
rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
|
||||
rm tests/unit/states/test_boto_vpc.py || die
|
||||
rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die
|
||||
|
||||
# tests that require network access
|
||||
rm tests/unit/{states,modules}/test_zcbuildout.py || die
|
||||
|
||||
sed -i 's:log.trace(:log.debug(:' \
|
||||
salt/fileserver/roots.py salt/grains/core.py salt/states/saltmod.py || die
|
||||
|
||||
# make sure pkg_resources doesn't bomb because pycrypto isn't installed
|
||||
# make sure pkg_resources doesn't bomb because pycrypto isn't installed
|
||||
find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die
|
||||
# pycryptodome rather than pycryptodomex
|
||||
find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die
|
||||
|
||||
distutils-r1_python_prepare_all
|
||||
}
|
||||
|
||||
python_prepare() {
|
||||
einfo "Fixing collections.abc warnings for ${EPYTHON}"
|
||||
local abc
|
||||
abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die
|
||||
find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
local svc
|
||||
USE_SETUPTOOLS=1 distutils-r1_python_install_all
|
||||
|
||||
for svc in minion master syndic api; do
|
||||
newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc}
|
||||
newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
|
||||
systemd_dounit "${FILESDIR}"/salt-${svc}.service
|
||||
done
|
||||
|
||||
insinto /etc/${PN}
|
||||
doins -r conf/*
|
||||
}
|
||||
|
||||
python_test() {
|
||||
local tempdir
|
||||
# testsuite likes lots of files
|
||||
ulimit -n 3072 || die
|
||||
|
||||
# ${T} is too long a path for the tests to work
|
||||
tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
|
||||
mkdir "${T}/$(basename "${tempdir}")"
|
||||
|
||||
(
|
||||
cleanup() { rm -f "${tempdir}" || die; }
|
||||
|
||||
trap cleanup EXIT
|
||||
|
||||
addwrite "${tempdir}"
|
||||
ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die
|
||||
|
||||
USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
|
||||
TMPDIR="${tempdir}" \
|
||||
${EPYTHON} tests/runtests.py \
|
||||
--unit-tests --no-report --verbose \
|
||||
|| die "testing failed with ${EPYTHON}"
|
||||
)
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if use python_targets_python3_8; then
|
||||
if use nova; then
|
||||
ewarn "Salt's nova functionality will not work with python3.8 since"
|
||||
ewarn "dev-python/python-novaclient does not support it yet"
|
||||
fi
|
||||
if use neutron; then
|
||||
ewarn "Salt's neutron functionality will not work with python3.8 since"
|
||||
ewarn "dev-python/python-neutronclient does not support it yet"
|
||||
fi
|
||||
if use libvirt; then
|
||||
ewarn "Salt's libvirt functionality will not work with python3.8 since"
|
||||
ewarn "dev-python/libvirt-python does not support it yet"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
@ -1,195 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=( python3_{7..9} )
|
||||
DISTUTILS_USE_SETUPTOOLS=rdepend
|
||||
inherit systemd distutils-r1
|
||||
|
||||
DESCRIPTION="Salt is a remote execution and configuration manager"
|
||||
HOMEPAGE="https://www.saltstack.com/resources/community/
|
||||
https://github.com/saltstack"
|
||||
|
||||
if [[ ${PV} == 9999* ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
|
||||
EGIT_BRANCH="develop"
|
||||
SRC_URI=""
|
||||
else
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
KEYWORDS="amd64 ~arm ~arm64 x86"
|
||||
fi
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
|
||||
mongodb neutron nova openssl portage profile redis selinux test raet
|
||||
+zeromq vim-syntax"
|
||||
|
||||
RDEPEND="
|
||||
sys-apps/pciutils
|
||||
>=dev-python/distro-1.5[${PYTHON_USEDEP}]
|
||||
dev-python/jinja[${PYTHON_USEDEP}]
|
||||
dev-python/libnacl[${PYTHON_USEDEP}]
|
||||
>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
|
||||
dev-python/pyyaml[${PYTHON_USEDEP}]
|
||||
dev-python/markupsafe[${PYTHON_USEDEP}]
|
||||
>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
>=dev-python/toml-0.10.2[${PYTHON_USEDEP}]
|
||||
dev-python/watchdog[${PYTHON_USEDEP}]
|
||||
libcloud? ( >=dev-python/libcloud-2.5.0[${PYTHON_USEDEP}] )
|
||||
mako? ( dev-python/mako[${PYTHON_USEDEP}] )
|
||||
ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
|
||||
libvirt? (
|
||||
$(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8)
|
||||
)
|
||||
openssl? (
|
||||
dev-libs/openssl:0=[-bindist(-)]
|
||||
dev-python/pyopenssl[${PYTHON_USEDEP}]
|
||||
)
|
||||
raet? (
|
||||
>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
|
||||
>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
|
||||
)
|
||||
cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
|
||||
cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] )
|
||||
genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
|
||||
mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
|
||||
portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
|
||||
keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
|
||||
redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
|
||||
selinux? ( sec-policy/selinux-salt )
|
||||
nova? (
|
||||
$(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8)
|
||||
)
|
||||
neutron? (
|
||||
$(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8)
|
||||
)
|
||||
gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
|
||||
profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
|
||||
vim-syntax? ( app-vim/salt-vim )
|
||||
zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] )
|
||||
"
|
||||
BDEPEND="
|
||||
test? (
|
||||
${RDEPEND}
|
||||
>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
|
||||
dev-python/pip[${PYTHON_USEDEP}]
|
||||
dev-python/psutil[${PYTHON_USEDEP}]
|
||||
dev-python/pytest[${PYTHON_USEDEP}]
|
||||
>=dev-python/pytest-salt-factories-0.121.1[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-tempdir[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-subtests[${PYTHON_USEDEP}]
|
||||
dev-python/flaky[${PYTHON_USEDEP}]
|
||||
dev-python/libcloud[${PYTHON_USEDEP}]
|
||||
>=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}]
|
||||
!x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] )
|
||||
)"
|
||||
|
||||
DOCS=( README.rst AUTHORS )
|
||||
|
||||
REQUIRED_USE="|| ( raet zeromq )
|
||||
test? ( cheetah genshi )"
|
||||
RESTRICT="!test? ( test ) x86? ( test )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/salt-3003-skip-tests-that-oom-machine.patch"
|
||||
"${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
|
||||
"${FILESDIR}/salt-3002-tests.patch"
|
||||
"${FILESDIR}/salt-3003-tests.patch"
|
||||
)
|
||||
|
||||
python_prepare_all() {
|
||||
# remove tests with external dependencies that may not be available, and
|
||||
# tests that don't work in sandbox
|
||||
rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die
|
||||
rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
|
||||
rm tests/unit/states/test_boto_vpc.py || die
|
||||
rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die
|
||||
rm tests/pytests/functional/transport/server/test_req_channel.py || die
|
||||
|
||||
# tests that require network access
|
||||
rm tests/unit/{states,modules}/test_zcbuildout.py || die
|
||||
rm -r tests/integration/cloud || die
|
||||
rm -r tests/kitchen/tests/wordpress/tests || die
|
||||
rm tests/kitchen/test_kitchen.py || die
|
||||
rm tests/unit/modules/test_network.py || die
|
||||
|
||||
# tests require root access
|
||||
rm tests/integration/pillar/test_git_pillar.py || die
|
||||
rm tests/integration/states/test_supervisord.py || die
|
||||
rm tests/pytests/unit/client/test_ssh.py || die
|
||||
|
||||
# make sure pkg_resources doesn't bomb because pycrypto isn't installed
|
||||
find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die
|
||||
# pycryptodome rather than pycryptodomex
|
||||
find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die
|
||||
|
||||
distutils-r1_python_prepare_all
|
||||
}
|
||||
|
||||
python_prepare() {
|
||||
einfo "Fixing collections.abc warnings for ${EPYTHON}"
|
||||
local abc
|
||||
abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die
|
||||
find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
local svc
|
||||
USE_SETUPTOOLS=1 distutils-r1_python_install_all
|
||||
|
||||
for svc in minion master syndic api; do
|
||||
newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc}
|
||||
newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
|
||||
systemd_dounit "${FILESDIR}"/salt-${svc}.service
|
||||
done
|
||||
|
||||
insinto /etc/${PN}
|
||||
doins -r conf/*
|
||||
}
|
||||
|
||||
python_test() {
|
||||
# testsuite likes lots of files
|
||||
ulimit -n 4096 || die
|
||||
|
||||
# ${T} is too long a path for the tests to work
|
||||
local TMPDIR
|
||||
TMPDIR="$(mktemp --directory --tmpdir=/tmp ${P}-tests-XXXXX)"
|
||||
(
|
||||
export TMPDIR
|
||||
cleanup() { rm -rf "${TMPDIR}" || die; }
|
||||
|
||||
trap cleanup EXIT
|
||||
|
||||
addwrite "${TMPDIR}"
|
||||
|
||||
USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
|
||||
"${EPYTHON}" -m pytest -vv \
|
||||
|| die "testing failed with ${EPYTHON}"
|
||||
)
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if use python_targets_python3_8; then
|
||||
if use nova; then
|
||||
ewarn "Salt's nova functionality will not work with python3.8 since"
|
||||
ewarn "dev-python/python-novaclient does not support it yet"
|
||||
fi
|
||||
if use neutron; then
|
||||
ewarn "Salt's neutron functionality will not work with python3.8 since"
|
||||
ewarn "dev-python/python-neutronclient does not support it yet"
|
||||
fi
|
||||
if use libvirt; then
|
||||
ewarn "Salt's libvirt functionality will not work with python3.8 since"
|
||||
ewarn "dev-python/libvirt-python does not support it yet"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -3939,13 +3939,6 @@
|
||||
|
||||
|
||||
if test "$GCC" = "yes"; then
|
||||
-
|
||||
- # Check whether --enable-static was given.
|
||||
-if test "${enable_static+set}" = set; then
|
||||
- enableval=$enable_static; LDFLAGS="--static ${LDFLAGS}"
|
||||
-fi
|
||||
-
|
||||
-
|
||||
if test "$IN_CFLAGS" = ""; then
|
||||
CFLAGS="-Wall -O2"
|
||||
fi
|
||||
Binary file not shown.
Binary file not shown.
@ -1,3 +1,4 @@
|
||||
DIST borgmatic-1.5.24.tar.gz 291853 BLAKE2B d8c695c8faf713cd75e994d8ae7633674d01981047ce79d35d392b9db5a2dfb47c2be4a91e0f183ab2ead5877ee68983d0fdfd88ae7d28355d8029d39cbfdc04 SHA512 cfa1bd1dc6119497fba99d02e4f53322aede907ba8b30068b6c1dadc67f5e30466d2f1f0d83f1f15f71dfac08ef5b0adb376d24d62f1cd44992e7a45f99fde34
|
||||
DIST borgmatic-1.6.1.tar.gz 300375 BLAKE2B b56c31da62591b8bfd3c0146e77cab7ab28f942c59ca0f6cf7342d80bc31249dfcbd59fae13025a0fe464de326b6758169be983d2b741ecc37062961541fb892 SHA512 c48fb89167ce188feeb9d51ae9caabf985f9c583d09840d3dd4aaf772a4acbd3c22399958740820b9fbf61603769a604dc92b72448e2c7196fae855549f3c6d5
|
||||
DIST borgmatic-1.6.3.tar.gz 320186 BLAKE2B 232c2878b0778f039b0c2fa7e6b4de37477b81c13082772752a78e8de0fff0b52fb6976a02ae6f13d9a33a74d96c2689ceee48f97d85381a2d06d0b61f6bb658 SHA512 eadca728680d86dc16c8444ac653c46e9c61e49f3eced1228d46ff77138e44985ee794dd21921f829db063106cdd697c997677bd983bf000aedb89c6c00c8f5d
|
||||
DIST borgmatic-1.6.4.tar.gz 322306 BLAKE2B 48d01b56065f08db464ffab71cfdc6c2924ed899e07a6788f37217448d19d15d59ee3771ad545bf1c576da6a26d754f8c24eea82361d77fa616bebb54a6dd878 SHA512 8d0d4b1b6bbb562fcab49a8ba2cfd1d33f6e5053566096a6f01b83b2f69c37a437836d78d3547100f66bb1320c1e028a2223fcc2285ed0fb8d463c8d6eae5819
|
||||
|
||||
@ -0,0 +1,65 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{8..10} )
|
||||
DISTUTILS_SINGLE_IMPL=1
|
||||
DISTUTILS_USE_PEP517=setuptools
|
||||
|
||||
inherit distutils-r1 systemd
|
||||
|
||||
DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
|
||||
HOMEPAGE="https://torsion.org/borgmatic/"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
|
||||
|
||||
# borg is called as an external tool, hence no pythonic stuff
|
||||
RDEPEND="app-backup/borgbackup
|
||||
$(python_gen_cond_dep '
|
||||
<dev-python/colorama-0.5[${PYTHON_USEDEP}]
|
||||
dev-python/jsonschema[${PYTHON_USEDEP}]
|
||||
dev-python/requests[${PYTHON_USEDEP}]
|
||||
<dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
')"
|
||||
BDEPEND="
|
||||
test? (
|
||||
$(python_gen_cond_dep '
|
||||
>=dev-python/flexmock-0.10.10[${PYTHON_USEDEP}]
|
||||
')
|
||||
)"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
|
||||
"${FILESDIR}"/${PN}-1.5.16-systemd_service_bin_path.patch
|
||||
)
|
||||
|
||||
# test_borgmatic_version_matches_news_version tries to run the 'borgmatic'
|
||||
# executable so making it work would require passing --install
|
||||
# to distutils_enable_tests. Given that this is the only test requiring
|
||||
# this and that all it does is make sure the NEWS file has been updated
|
||||
# for the current version, just skip it.
|
||||
EPYTEST_DESELECT=(
|
||||
tests/integration/commands/test_borgmatic.py::test_borgmatic_version_matches_news_version
|
||||
)
|
||||
|
||||
distutils_enable_tests pytest
|
||||
|
||||
src_install() {
|
||||
distutils-r1_src_install
|
||||
systemd_dounit sample/systemd/borgmatic.{service,timer}
|
||||
keepdir /etc/borgmatic
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ -z "${REPLACING_VERSIONS}" ]]; then
|
||||
elog "To generate a sample configuration file, run:"
|
||||
elog " generate-borgmatic-config"
|
||||
fi
|
||||
elog
|
||||
elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
|
||||
}
|
||||
@ -0,0 +1,77 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit systemd
|
||||
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/digint/btrbk.git"
|
||||
inherit git-r3
|
||||
SRC_URI=""
|
||||
else
|
||||
SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
|
||||
HOMEPAGE="https://digint.ch/btrbk/"
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
IUSE="+mbuffer +doc +lsbtr"
|
||||
|
||||
DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
|
||||
|
||||
RDEPEND="dev-lang/perl
|
||||
net-misc/openssh
|
||||
mbuffer? ( >=sys-block/mbuffer-20180505 )
|
||||
>=sys-fs/btrfs-progs-4.12"
|
||||
|
||||
src_compile() {
|
||||
emake clean
|
||||
use doc && emake -C doc
|
||||
}
|
||||
src_install() {
|
||||
local targets="install-bin install-etc install-share install-systemd"
|
||||
use doc && targets="${targets} install-man install-doc"
|
||||
use lsbtr && targets="${targets} install-bin-links"
|
||||
emake \
|
||||
DESTDIR="${D}" \
|
||||
DOCDIR="/usr/share/doc/${PF}" \
|
||||
SYSTEMDDIR="$(systemd_get_systemunitdir)" \
|
||||
${targets}
|
||||
}
|
||||
pkg_preinst() {
|
||||
if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
|
||||
upgrade_0_26_0_warning="1"
|
||||
fi
|
||||
if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
|
||||
upgrade_0_27_0_warning="1"
|
||||
fi
|
||||
}
|
||||
pkg_postinst() {
|
||||
if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
|
||||
ewarn "If you are using raw targets, make sure to run the"
|
||||
ewarn "\"raw_suffix2sidecar\" utility in each target directory."
|
||||
fi
|
||||
if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
|
||||
ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
|
||||
ewarn 'monthly/yearly backups could get deleted when upgrading to'
|
||||
ewarn 'btrbk-0.27.0.'
|
||||
ewarn ''
|
||||
ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
|
||||
ewarn 'or systemd timers calling btrbk.'
|
||||
ewarn ''
|
||||
ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
|
||||
ewarn 'check if any snapshots/backups would get deleted. If you want to'
|
||||
ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
|
||||
ewarn ''
|
||||
ewarn ' mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
|
||||
ewarn ''
|
||||
ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
|
||||
ewarn '(".keep_forever" suffix in the example above).'
|
||||
ewarn ''
|
||||
ewarn ' [1] https://github.com/digint/btrbk/issues/217'
|
||||
ewarn ' [2] https://github.com/digint/btrbk/commit/719fb5f'
|
||||
fi
|
||||
}
|
||||
Binary file not shown.
@ -1,8 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<name>Lars Wendler</name>
|
||||
<email>polynomial-c@gentoo.org</email>
|
||||
<maintainer type="project">
|
||||
<email>base-system@gentoo.org</email>
|
||||
<name>Gentoo Base System</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,3 +1 @@
|
||||
DIST tpm2-tss-3.1.0.tar.gz 1584690 BLAKE2B cee2807a030b8bab653045cb11dfc7a6a3f7b1e60c1ce4650ba5f0549f29f36ff307e7d53fb5ef9c950b4dae720bdaf35f7cd1e59ebc07b3f16740035e1d5738 SHA512 8967f172c92f1e3e5ba324dbe8afe07bf1bc7179dd755cef9812105f32634f312ee7cc7dfe8e13af69dc219432463f5dc9b93477743de47aba6af1d70b252405
|
||||
DIST tpm2-tss-3.1.1.tar.gz 1592495 BLAKE2B 0f021516700ca14a1c987d7078f1402eb2a6e2f7fc325df3ace3bd9104fe5a2211aa335af0b7f05f5e0d8c2038e0033ba498551021fa2fb5947c213813ef8796 SHA512 3010a32be2d41c2f2e06c2b745a18b3f36aaa0aec7568361902deed26779e8f76c84076ceb2a9447df8194cfc9d3b50116b7311d51d83d63037dbdca60c1384e
|
||||
DIST tpm2-tss-3.2.0.tar.gz 1629211 BLAKE2B a89aa4d89a50bdfb5a9652874d30e2138747bd022049f2be2d0b56e296329d0c41254033ec3a062dbd64fde54a62e952f54446c551e5788231827cd53fae045a SHA512 cabb411f074dfa94919ba914849aac77a0ac2f50622e28a1406cf575369148774748e0e2b7a7c566ec83561a96d4b883bac5a3b1763f4cf48668a0c5d68c0a23
|
||||
|
||||
@ -1,76 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit autotools linux-info tmpfiles udev
|
||||
|
||||
DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
|
||||
HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
|
||||
SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
|
||||
IUSE="doc +fapi +openssl mbedtls static-libs test"
|
||||
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
REQUIRED_USE="^^ ( mbedtls openssl )
|
||||
fapi? ( openssl !mbedtls )"
|
||||
|
||||
RDEPEND="acct-group/tss
|
||||
acct-user/tss
|
||||
fapi? ( dev-libs/json-c
|
||||
net-misc/curl )
|
||||
mbedtls? ( net-libs/mbedtls:= )
|
||||
openssl? ( dev-libs/openssl:= )"
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( dev-util/cmocka )"
|
||||
BDEPEND="sys-apps/acl
|
||||
virtual/pkgconfig
|
||||
doc? ( app-doc/doxygen )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-3.1.0-Dont-run-systemd-sysusers-in-Makefile.patch"
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
local CONFIG_CHECK=" \
|
||||
~TCG_TPM
|
||||
"
|
||||
linux-info_pkg_setup
|
||||
kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--localstatedir=/var \
|
||||
$(use_enable doc doxygen-doc) \
|
||||
$(use_enable fapi) \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_enable test unit) \
|
||||
--disable-tcti-mssim \
|
||||
--disable-defaultflags \
|
||||
--disable-weakcrypto \
|
||||
--with-crypto="$(usex mbedtls mbed ossl)" \
|
||||
--with-runstatedir=/run \
|
||||
--with-udevrulesdir="$(get_udevdir)/rules.d" \
|
||||
--with-udevrulesprefix=60- \
|
||||
--with-sysusersdir="/usr/lib/sysusers.d" \
|
||||
--with-tmpfilesdir="/usr/lib/tmpfiles.d"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
find "${D}" -name '*.la' -delete || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
tmpfiles_process tpm2-tss-fapi.conf
|
||||
}
|
||||
@ -1,94 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit autotools linux-info multilib-minimal tmpfiles udev
|
||||
|
||||
DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
|
||||
HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
|
||||
SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD-2"
|
||||
SLOT="0/3"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
|
||||
IUSE="doc +fapi +openssl mbedtls static-libs test"
|
||||
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
REQUIRED_USE="^^ ( mbedtls openssl )
|
||||
fapi? ( openssl !mbedtls )"
|
||||
|
||||
RDEPEND="acct-group/tss
|
||||
acct-user/tss
|
||||
fapi? ( dev-libs/json-c:=[${MULTILIB_USEDEP}]
|
||||
net-misc/curl[${MULTILIB_USEDEP}] )
|
||||
mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
|
||||
openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( app-crypt/swtpm
|
||||
dev-libs/uthash
|
||||
dev-util/cmocka
|
||||
fapi? ( net-misc/curl ) )"
|
||||
BDEPEND="sys-apps/acl
|
||||
virtual/pkgconfig
|
||||
doc? ( app-doc/doxygen )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-3.1.0-Dont-run-systemd-sysusers-in-Makefile.patch"
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
local CONFIG_CHECK=" \
|
||||
~TCG_TPM
|
||||
"
|
||||
linux-info_pkg_setup
|
||||
kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# See bug #833887 (and similar); eautoreconf means .pc file gets wrong version.
|
||||
sed -i \
|
||||
"s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
|
||||
"configure.ac" || die
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
ECONF_SOURCE=${S} econf \
|
||||
--localstatedir=/var \
|
||||
$(use_enable doc doxygen-doc) \
|
||||
$(use_enable fapi) \
|
||||
$(use_enable static-libs static) \
|
||||
$(multilib_native_use_enable test unit) \
|
||||
$(multilib_native_use_enable test integration) \
|
||||
$(multilib_native_use_enable test self-generated-certificate) \
|
||||
--disable-defaultflags \
|
||||
--disable-weakcrypto \
|
||||
--with-crypto="$(usex mbedtls mbed ossl)" \
|
||||
--with-runstatedir=/run \
|
||||
--with-udevrulesdir="$(get_udevdir)/rules.d" \
|
||||
--with-udevrulesprefix=60- \
|
||||
--with-sysusersdir="/usr/lib/sysusers.d" \
|
||||
--with-tmpfilesdir="/usr/lib/tmpfiles.d"
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
default
|
||||
|
||||
if [[ ${PV} != $(sed -n -e 's/^Version: //p' "${ED}/usr/$(get_libdir)/pkgconfig/tss2-sys.pc" || die) ]] ; then
|
||||
# Safeguard for bug #833887
|
||||
die "pkg-config file version doesn't match ${PV}! Please report a bug!"
|
||||
fi
|
||||
|
||||
find "${D}" -name '*.la' -delete || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
tmpfiles_process tpm2-tss-fapi.conf
|
||||
udev_reload
|
||||
}
|
||||
@ -1,94 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit autotools linux-info multilib-minimal tmpfiles udev
|
||||
|
||||
DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
|
||||
HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
|
||||
SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
|
||||
IUSE="doc +fapi +openssl mbedtls static-libs test"
|
||||
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
REQUIRED_USE="^^ ( mbedtls openssl )
|
||||
fapi? ( openssl !mbedtls )"
|
||||
|
||||
RDEPEND="acct-group/tss
|
||||
acct-user/tss
|
||||
fapi? ( dev-libs/json-c:=[${MULTILIB_USEDEP}]
|
||||
>=net-misc/curl-7.80.0[${MULTILIB_USEDEP}] )
|
||||
mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
|
||||
openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( app-crypt/swtpm
|
||||
dev-libs/uthash
|
||||
dev-util/cmocka
|
||||
fapi? ( >=net-misc/curl-7.80.0 ) )"
|
||||
BDEPEND="sys-apps/acl
|
||||
virtual/pkgconfig
|
||||
doc? ( app-doc/doxygen )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-3.1.0-Dont-run-systemd-sysusers-in-Makefile.patch"
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
local CONFIG_CHECK=" \
|
||||
~TCG_TPM
|
||||
"
|
||||
linux-info_pkg_setup
|
||||
kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# See bug #833887 (and similar); eautoreconf means .pc file gets wrong version.
|
||||
sed -i \
|
||||
"s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
|
||||
"configure.ac" || die
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
ECONF_SOURCE=${S} econf \
|
||||
--localstatedir=/var \
|
||||
$(use_enable doc doxygen-doc) \
|
||||
$(use_enable fapi) \
|
||||
$(use_enable static-libs static) \
|
||||
$(multilib_native_use_enable test unit) \
|
||||
$(multilib_native_use_enable test integration) \
|
||||
$(multilib_native_use_enable test self-generated-certificate) \
|
||||
--disable-tcti-libtpms \
|
||||
--disable-defaultflags \
|
||||
--disable-weakcrypto \
|
||||
--with-crypto="$(usex mbedtls mbed ossl)" \
|
||||
--with-runstatedir=/run \
|
||||
--with-udevrulesdir="$(get_udevdir)/rules.d" \
|
||||
--with-udevrulesprefix=60- \
|
||||
--with-sysusersdir="/usr/lib/sysusers.d" \
|
||||
--with-tmpfilesdir="/usr/lib/tmpfiles.d"
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
default
|
||||
|
||||
if [[ ${PV} != $(sed -n -e 's/^Version: //p' "${ED}/usr/$(get_libdir)/pkgconfig/tss2-sys.pc" || die) ]] ; then
|
||||
# Safeguard for bug #833887
|
||||
die "pkg-config file version doesn't match ${PV}! Please report a bug!"
|
||||
fi
|
||||
|
||||
find "${D}" -name '*.la' -delete || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
tmpfiles_process tpm2-tss-fapi.conf
|
||||
}
|
||||
Binary file not shown.
@ -1 +1,2 @@
|
||||
DIST neovim-0.7.0.tar.gz 10925354 BLAKE2B 0524d008ba1ebbe823406e94cfb048014b26bc394c686b2dd84bb7fae5a1f7f3acd42764b03b6efec10c0f25045c5838f624542b5125947e5f42d3b0d2ad1f84 SHA512 3597c54fb925a4d607bca9ba0fdb37df90ecb816da99f52baf46cc2ec79727a55048ba1d8d22c8e7d61f0e8e35546326b1d0d15c0a91de8bf5bc529c45fb1ce0
|
||||
DIST neovim-0.7.2.tar.gz 10933623 BLAKE2B c2db449a91f1685233da7125e3d4b49cb8fe26db5e498fd3a83340bd14842399474fcc7f2c78b88783195c6f7b0b8df196985b70387ed88972372a8866e2c721 SHA512 04d0fa5b23018531b70b53271821bf6944cde1bcec2210b99f5888e1339cd38f57feaa8e40874a3a504930e6614980947f31852185cbcd2ce106a0867896dd79
|
||||
|
||||
@ -0,0 +1,119 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
LUA_COMPAT=( lua5-{1..2} luajit )
|
||||
|
||||
inherit cmake lua-single optfeature xdg
|
||||
|
||||
DESCRIPTION="Vim-fork focused on extensibility and agility"
|
||||
HOMEPAGE="https://neovim.io"
|
||||
|
||||
if [[ ${PV} == 9999 ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/neovim/neovim.git"
|
||||
else
|
||||
SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
|
||||
fi
|
||||
|
||||
LICENSE="Apache-2.0 vim"
|
||||
SLOT="0"
|
||||
IUSE="+lto +nvimpager test +tui"
|
||||
|
||||
REQUIRED_USE="${LUA_REQUIRED_USE}"
|
||||
# Upstream say the test library needs LuaJIT
|
||||
# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377
|
||||
REQUIRED_USE="test? ( lua_single_target_luajit )"
|
||||
# TODO: Get tests running
|
||||
RESTRICT="!test? ( test ) test"
|
||||
|
||||
# Upstream build scripts invoke the Lua interpreter
|
||||
BDEPEND="${LUA_DEPS}
|
||||
>=dev-util/gperf-3.1
|
||||
virtual/libiconv
|
||||
virtual/libintl
|
||||
virtual/pkgconfig
|
||||
"
|
||||
# Check https://github.com/neovim/neovim/blob/master/third-party/CMakeLists.txt for
|
||||
# new dependency bounds and so on on bumps (obviously adjust for right branch/tag).
|
||||
DEPEND="${LUA_DEPS}
|
||||
>=dev-lua/luv-1.43.0[${LUA_SINGLE_USEDEP}]
|
||||
$(lua_gen_cond_dep '
|
||||
dev-lua/lpeg[${LUA_USEDEP}]
|
||||
dev-lua/mpack[${LUA_USEDEP}]
|
||||
')
|
||||
$(lua_gen_cond_dep '
|
||||
dev-lua/LuaBitOp[${LUA_USEDEP}]
|
||||
' lua5-{1,2})
|
||||
>=dev-libs/libuv-1.44.1:=
|
||||
>=dev-libs/libvterm-0.1.4
|
||||
>=dev-libs/msgpack-3.0.0:=
|
||||
>=dev-libs/tree-sitter-0.20.6:=
|
||||
tui? (
|
||||
>=dev-libs/libtermkey-0.22
|
||||
>=dev-libs/unibilium-2.0.0:0=
|
||||
)
|
||||
"
|
||||
RDEPEND="
|
||||
${DEPEND}
|
||||
app-eselect/eselect-vi
|
||||
"
|
||||
BDEPEND="
|
||||
test? (
|
||||
$(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]')
|
||||
)
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch"
|
||||
"${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
# Use our system vim dir
|
||||
sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
|
||||
-i src/nvim/globals.h || die
|
||||
|
||||
cmake_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Upstream default to LTO on non-debug builds
|
||||
# Let's expose it as a USE flag because upstream
|
||||
# have preferences for how we should use LTO
|
||||
# if we want it on (not just -flto)
|
||||
# ... but allow turning it off.
|
||||
# TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now
|
||||
local mycmakeargs=(
|
||||
-DENABLE_LTO=$(usex lto)
|
||||
-DFEAT_TUI=$(usex tui)
|
||||
-DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)")
|
||||
-DLUA_PRG="${ELUA}"
|
||||
-DMIN_LOG_LEVEL=3
|
||||
)
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake_src_install
|
||||
|
||||
# install a default configuration file
|
||||
insinto /etc/vim
|
||||
doins "${FILESDIR}"/sysinit.vim
|
||||
|
||||
# conditionally install a symlink for nvimpager
|
||||
if use nvimpager; then
|
||||
dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_pkg_postinst
|
||||
|
||||
optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard
|
||||
optfeature "Python plugin support" dev-python/pynvim
|
||||
optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client
|
||||
optfeature "remote/nvr support" dev-python/neovim-remote
|
||||
}
|
||||
@ -0,0 +1,99 @@
|
||||
# HG changeset patch
|
||||
# User Aidan Kehoe <kehoea@parhasard.net>
|
||||
# Date 1656333099 -3600
|
||||
# Mon Jun 27 13:31:39 2022 +0100
|
||||
# Node ID c6966a009d0dc3b546c9d843141c1fb5daa89b9e
|
||||
# Parent 16e37125d7ea85048e89197ce8fe83f44b00ccc5
|
||||
Don't create a lock file when generating finder-inf.el
|
||||
|
||||
lisp/ChangeLog addition:
|
||||
|
||||
2022-06-27 Aidan Kehoe <kehoea@parhasard.net>
|
||||
|
||||
* finder.el (finder-compile-keywords):
|
||||
Don't use the save-buffer infrastructure when generating
|
||||
finder-inf.el, since that leads to lock files, making parallel
|
||||
builds less likely to work. Thank you Mats Lidell and the Gentoo
|
||||
users!
|
||||
|
||||
src/ChangeLog addition:
|
||||
|
||||
2022-06-27 Aidan Kehoe <kehoea@parhasard.net>
|
||||
|
||||
* Makefile.in.in ($(LISP)/finder-inf.el):
|
||||
Don't remove finder-inf.el before regenerating it, Lisp will
|
||||
overwrite it.
|
||||
|
||||
diff -r 16e37125d7ea -r c6966a009d0d lisp/finder.el
|
||||
--- a/lisp/finder.el Sun Jun 26 19:14:02 2022 +0300
|
||||
+++ b/lisp/finder.el Mon Jun 27 13:31:39 2022 +0100
|
||||
@@ -151,7 +151,7 @@
|
||||
arguments compiles from `load-path'."
|
||||
(save-excursion
|
||||
;; XEmacs change
|
||||
- (find-file (expand-file-name "finder-inf.el" lisp-directory))
|
||||
+ (set-buffer (generate-new-buffer "finder-inf.el"))
|
||||
(let ((processed nil)
|
||||
(directory-abbrev-alist
|
||||
(append
|
||||
@@ -160,11 +160,12 @@
|
||||
"")))
|
||||
finder-abbreviate-directory-list)
|
||||
directory-abbrev-alist))
|
||||
- (using-load-path))
|
||||
+ using-load-path second-line-marker finder-scratch)
|
||||
(or dirs (setq dirs load-path))
|
||||
(setq using-load-path (equal dirs load-path))
|
||||
(erase-buffer)
|
||||
(insert ";;; finder-inf.el --- keyword-to-package mapping\n")
|
||||
+ (setq second-line-marker (point-marker))
|
||||
(insert ";; Keywords: help\n")
|
||||
(insert ";;; Commentary:\n")
|
||||
(insert ";; Don't edit this file. It's generated by finder.el\n\n")
|
||||
@@ -180,7 +181,8 @@
|
||||
(if (not finder-compile-keywords-quiet)
|
||||
(message "Processing %s ..." f))
|
||||
(save-excursion
|
||||
- (set-buffer (get-buffer-create "*finder-scratch*"))
|
||||
+ (set-buffer (setq finder-scratch
|
||||
+ (get-buffer-create "*finder-scratch*")))
|
||||
(buffer-disable-undo (current-buffer))
|
||||
(erase-buffer)
|
||||
(insert-file-contents (expand-file-name f d))
|
||||
@@ -210,10 +212,23 @@
|
||||
(directory-files d nil "^[^=].*\\.el$"))))
|
||||
dirs)
|
||||
(insert "))\n\n(provide 'finder-inf)\n\n;;; finder-inf.el ends here\n")
|
||||
- (kill-buffer "*finder-scratch*")
|
||||
+ (if finder-scratch (kill-buffer finder-scratch))
|
||||
(unless noninteractive
|
||||
(eval-current-buffer)) ; So we get the new keyword list immediately
|
||||
- (basic-save-buffer))))
|
||||
+ (goto-char (point-min))
|
||||
+ (if (re-search-forward "[^\x00-\x7f]" nil t)
|
||||
+ (progn
|
||||
+ (goto-char (point-min))
|
||||
+ (if (re-search-forward "[^\x00-\xff]" nil t)
|
||||
+ (progn (goto-char second-line-marker)
|
||||
+ (insert ";;; -*- coding: escape-quoted -*-\n")
|
||||
+ (setq buffer-file-coding-system 'iso-8859-1-unix))
|
||||
+ (goto-char second-line-marker)
|
||||
+ (insert ";;; -*- coding: iso-8859-1 -*-\n")
|
||||
+ (setq buffer-file-coding-system 'escape-quoted-unix)))
|
||||
+ (setq buffer-file-coding-system 'no-conversion-unix))
|
||||
+ (write-region (point-min) (point-max)
|
||||
+ (expand-file-name "finder-inf.el" lisp-directory)))))
|
||||
|
||||
(defun finder-compile-keywords-make-dist ()
|
||||
"Regenerate `finder-inf.el' for the Emacs distribution."
|
||||
diff -r 16e37125d7ea -r c6966a009d0d src/Makefile.in.in
|
||||
--- a/src/Makefile.in.in Sun Jun 26 19:14:02 2022 +0300
|
||||
+++ b/src/Makefile.in.in Mon Jun 27 13:31:39 2022 +0100
|
||||
@@ -590,7 +590,6 @@
|
||||
|
||||
$(LISP)/finder-inf.el: update-elc-2
|
||||
@echo "Building finder database ..."
|
||||
- $(RM) $(LISP)/finder-inf.el
|
||||
$(XEMACS_BATCH) -eval "(setq finder-compile-keywords-quiet t)" \
|
||||
-eval "(setq lisp-directory \"$(LISP)\")" \
|
||||
-l finder -f finder-compile-keywords
|
||||
Binary file not shown.
@ -1,3 +1,3 @@
|
||||
DIST rust-mode-0.3.0_p20190125.tar.xz 37580 BLAKE2B d4d3ae9dac452ba3e2966d5036bd5f4edb4066ca65954b7f18a99c56ad6a8848fd80ef799c7c266c77a844839d87ab9641c77afc089a17e4e459fea27b6af982 SHA512 303d7f183006769b3fdf7a7118b36d29d785c2a29cf88ae286cb86180f84a4e50e66597d3bc984979e2509b872632d750fba96ff522081df5351d8d9511a3272
|
||||
DIST rust-mode-0.4.0.tar.gz 41774 BLAKE2B c0263f9fa839dcf5ee74706d8d13c10161d024114fda161dbd5235036eb322d273e8624a23f5e848e9246500d1da0c272420cb89f250f8d1852c7552eb7d0939 SHA512 fe0e1d667ba9595f9cbed22e0f88096508e49ffe8e3c86349cb3319eefea38a1dd86c2b55aef1415ae0cfc3b65ac6807f1863eb0e6eaa9ff49aea989a46e5edc
|
||||
DIST rust-mode-1.0.4.tar.gz 52123 BLAKE2B 3b7535d8906da6a477b029991c21520114c516a194f5f627ad544953f5f04c380e9481858e8045db4d96ef42f620c23d4b6002c76464216908c4ecf94c9de650 SHA512 8318c96280760a66841a4549407cb749cf0da15979d92e41d0c4f9ddd9d6a4d4fd22a4292b22fc69107ea6afa729f4c7516a10ceee044211829435078bd2814c
|
||||
DIST rust-mode-1.0.5.tar.gz 52665 BLAKE2B 3b61372223637b7950ec7a15a80abd3b74972ecda0677f730f3ebc8e574b50985a7427b4531766b1dfd20225f7b718497aa4437dadfa041c5a9cde9413d3cb5c SHA512 7b76384adf7281866fbef0ab507098084a96fe562d1dbd5dd99e03fda2a91c23392c8667c21aa5800b188cd09f5349a7394b0a7215826b9bc668cc36ac902999
|
||||
|
||||
Binary file not shown.
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>polynomial-c@gentoo.org</email>
|
||||
<name>Lars Wendler</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>polynomial-c@gentoo.org</email>
|
||||
<name>Lars Wendler</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>polynomial-c@gentoo.org</email>
|
||||
<name>Lars Wendler</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue