Merge updates from master

This commit is contained in:
Repository mirror & CI
2022-08-11 14:02:11 +00:00
16 changed files with 20 additions and 631 deletions

View File

@@ -1 +0,0 @@
DIST python-binary-memcached-0.31.1-gh.tar.gz 93809 BLAKE2B 6a7a6921a7ff24427ddb5443acf7a81c43a06baaadaead9caf50a8eb758d05d43430dd581e69d6dd4e83799e52e93949250cbf69309bb860857c63972ad0fc2c SHA512 3fbf0cbf05b42a5e28f01542ff0d190d138104cab97a5b05c17133f245fe37aad97b4daba31c203d854a4228fc9d49fd0306d93a45541a8cf7d173afc81c70ab

View File

@@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<longdescription lang="en">
A pure python module (thread safe) to access memcached via it's binary with SASL auth support.
The main purpose of this module it to be able to communicate with memcached using binary protocol and support authentication, so it can work with Heroku for example.
</longdescription>
<upstream>
<remote-id type="github">jaysonsantos/python-binary-memcached</remote-id>
<remote-id type="pypi">python-binary-memcached</remote-id>
</upstream>
</pkgmetadata>

View File

@@ -1,46 +0,0 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
DESCRIPTION="access memcached via it's binary protocol with SASL auth support"
HOMEPAGE="
https://github.com/jaysonsantos/python-binary-memcached
https://pypi.org/project/python-binary-memcached/
"
SRC_URI="https://github.com/jaysonsantos/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}-gh.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
RDEPEND="
dev-python/six[${PYTHON_USEDEP}]
dev-python/uhashring[${PYTHON_USEDEP}]
"
DEPEND="
${RDEPEND}
>=dev-python/m2r-0.2.1[${PYTHON_USEDEP}]
test? ( net-misc/memcached )
"
BDEPEND="
test? (
dev-python/mistune[${PYTHON_USEDEP}]
>=dev-python/pytest-6.2[${PYTHON_USEDEP}]
>=dev-python/trustme-0.9.0[${PYTHON_USEDEP}]
>=dev-python/mock-4.0[${PYTHON_USEDEP}]
)
"
RESTRICT="test" # tests require a running memcached
distutils_enable_tests pytest
src_prepare() {
rm README.rst || die
default
}

View File

@@ -1,2 +0,0 @@
DIST devscripts_2.21.3.tar.xz 980408 BLAKE2B 99207ed58c0fdc592ce491ddda79a2ecb22a8975ef70828749bf58dff9cc94f63779025b3f0326d0c2c49ca768a7e651b1f9e7843e6da298c25340916334de25 SHA512 84122dd36de7961c26044ac8b8eeee2c0aae1dd4a811b5f0d522fe43488dad2872aa044ad1f38a78e49f9d13d8c19eb583a8082d636caeebb188f1dd4f1caec7
DIST devscripts_2.22.1.tar.xz 989556 BLAKE2B 2a2e3ca9757c710e181e807f0369c137f21070d86b4c51d8b5132ca4add33677edbd26e04a2faae93e9e4586080286888880ce450119579aa40ad205c8e5d857 SHA512 260603e1a655035c5aca3c9734db1bc6aa7e9aa017ece7e9158c57e06a1ee548922ec2defdd9dcb4560743d78aef08d30695b1bc833bd4d77fe1c7497d157c45

View File

@@ -1,120 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_OPTIONAL=true
PYTHON_COMPAT=( python3_9 )
inherit distutils-r1
DESCRIPTION="Scripts to make the life of a Debian Package maintainer easier"
HOMEPAGE="https://salsa.debian.org/debian/devscripts"
SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64"
IUSE="python test"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RESTRICT="!test? ( test )"
CDEPEND="
dev-lang/perl:=
dev-perl/File-DesktopEntry
dev-perl/File-DirList
dev-perl/File-HomeDir
dev-perl/File-Touch
dev-perl/IPC-Run
dev-perl/Moo
dev-perl/libwww-perl
dev-util/distro-info
python? ( ${PYTHON_DEPS} )
"
DEPEND="${CDEPEND}
test? (
app-arch/zip
dev-perl/Git-Wrapper
dev-perl/GitLab-API-v4
dev-perl/List-Compare
dev-perl/Software-License
dev-perl/String-ShellQuote
dev-perl/UNIVERSAL-require
dev-python/pyftpdlib[${PYTHON_USEDEP}]
dev-python/python-debian[${PYTHON_USEDEP}]
dev-util/shunit2
dev-vcs/subversion
sys-libs/libfaketime
virtual/perl-DB_File
)
"
RDEPEND="${CDEPEND}
app-arch/dpkg
app-crypt/gnupg
app-text/wdiff
dev-util/debhelper
dev-util/patchutils
sys-apps/fakeroot
"
BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}/distutils-r1.patch"
"${FILESDIR}/Remove-failing-tests.patch"
"${FILESDIR}/Replace-Debian-xsl-stylesheets-paths-with-Gentoos.patch"
)
DISTUTILS_S="${S}"/scripts
src_prepare() {
default
# Avoid file collision with app-shells/bash-completion
rm "${DISTUTILS_S}"/bts.bash_completion || die
}
src_configure() {
default
if use python; then
pushd "${DISTUTILS_S}" > /dev/null || die
distutils-r1_src_configure
popd > /dev/null || die
fi
}
src_compile() {
default
if use python; then
pushd "${DISTUTILS_S}" > /dev/null || die
distutils-r1_src_compile
popd > /dev/null || die
fi
}
src_install() {
dodir /usr/bin
default
if use python; then
pushd "${DISTUTILS_S}" > /dev/null || die
distutils-r1_src_install
popd > /dev/null || die
fi
mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die
# "incorrect name, no completions for command defined"
rm "${ED}"/usr/share/bash-completion/completions/{debcheckout,pkgnames} || die
}
src_test() {
default
if use python; then
pushd "${DISTUTILS_S}" > /dev/null || die
distutils-r1_src_test
popd > /dev/null || die
fi
}

View File

@@ -1,126 +0,0 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_OPTIONAL=true
PYTHON_COMPAT=( python3_{9..10} )
inherit bash-completion-r1 distutils-r1
DESCRIPTION="Scripts to make the life of a Debian Package maintainer easier"
HOMEPAGE="https://salsa.debian.org/debian/devscripts"
SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64"
IUSE="python test"
CDEPEND="
dev-lang/perl:=
dev-perl/File-DesktopEntry
dev-perl/File-DirList
dev-perl/File-HomeDir
dev-perl/File-Touch
dev-perl/IPC-Run
dev-perl/Moo
dev-perl/libwww-perl
dev-util/distro-info
python? ( ${PYTHON_DEPS} )
"
DEPEND="
${CDEPEND}
app-text/docbook-xsl-stylesheets
test? (
app-arch/zip
dev-perl/Git-Wrapper
dev-perl/GitLab-API-v4
dev-perl/List-Compare
dev-perl/Software-License
dev-perl/String-ShellQuote
dev-perl/UNIVERSAL-require
dev-python/pyftpdlib[${PYTHON_USEDEP}]
dev-python/python-debian[${PYTHON_USEDEP}]
dev-util/shunit2
dev-vcs/subversion
sys-libs/libfaketime
virtual/perl-DB_File
)
"
RDEPEND="
${CDEPEND}
app-arch/dpkg
app-crypt/gnupg
app-text/wdiff
!dev-util/checkbashisms
dev-util/debhelper
dev-util/patchutils
sys-apps/fakeroot
"
BDEPEND="virtual/pkgconfig"
REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
test? ( python )
"
RESTRICT="!test? ( test )"
PATCHES=(
"${FILESDIR}/distutils-r1.patch"
"${FILESDIR}/Remove-failing-tests.patch"
"${FILESDIR}/Replace-Debian-xsl-stylesheets-paths-with-Gentoos.patch"
)
DISTUTILS_S="${S}/scripts"
src_prepare() {
default
# Avoid file collision with app-shells/bash-completion
rm "${DISTUTILS_S}/bts.bash_completion" || die
}
src_configure() {
default
if use python; then
pushd "${DISTUTILS_S}" > /dev/null || die
python_foreach_impl distutils-r1_src_configure
popd > /dev/null || die
fi
}
src_compile() {
default
if use python; then
pushd "${DISTUTILS_S}" > /dev/null || die
python_foreach_impl distutils-r1_src_compile
popd > /dev/null || die
fi
}
src_install() {
dodir /usr/bin
default
if use python; then
pushd "${DISTUTILS_S}" > /dev/null || die
python_foreach_impl distutils-r1_src_install
popd > /dev/null || die
fi
mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${PF}" || die
rm "${ED}/usr/share/bash-completion/completions/debcheckout" || die
mv "${ED}"/usr/share/bash-completion/completions/{pkgnames,debsnap} || die
bashcomp_alias debsnap wnpp-alert wnpp-check mk-build-deps rmadison mass-bug dd-list build-rdeps who-uploads transition-check getbuildlog grep-excuses rc-alert whodepends dget pts-subscribe pts-unsubscribe
}
src_test() {
default
pushd "${DISTUTILS_S}" > /dev/null || die
python_foreach_impl distutils-r1_src_test
popd > /dev/null || die
}

View File

@@ -1,125 +0,0 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_OPTIONAL=true
PYTHON_COMPAT=( python3_{9..10} )
inherit bash-completion-r1 distutils-r1
DESCRIPTION="Scripts to make the life of a Debian Package maintainer easier"
HOMEPAGE="https://salsa.debian.org/debian/devscripts"
SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64"
IUSE="python test"
CDEPEND="
dev-lang/perl:=
dev-perl/File-DesktopEntry
dev-perl/File-DirList
dev-perl/File-HomeDir
dev-perl/File-Touch
dev-perl/IPC-Run
dev-perl/Moo
dev-perl/libwww-perl
dev-util/distro-info
python? ( ${PYTHON_DEPS} )
"
DEPEND="
${CDEPEND}
app-text/docbook-xsl-stylesheets
test? (
app-arch/zip
dev-perl/Git-Wrapper
dev-perl/GitLab-API-v4
dev-perl/List-Compare
dev-perl/Software-License
dev-perl/String-ShellQuote
dev-perl/UNIVERSAL-require
dev-python/pyftpdlib[${PYTHON_USEDEP}]
dev-python/python-debian[${PYTHON_USEDEP}]
dev-util/shunit2
dev-vcs/subversion
sys-libs/libfaketime
virtual/perl-DB_File
)
"
RDEPEND="
${CDEPEND}
app-arch/dpkg
app-crypt/gnupg
app-text/wdiff
dev-util/debhelper
dev-util/patchutils
sys-apps/fakeroot
"
BDEPEND="virtual/pkgconfig"
REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
test? ( python )
"
RESTRICT="!test? ( test )"
PATCHES=(
"${FILESDIR}/distutils-r1.patch"
"${FILESDIR}/Remove-failing-tests.patch"
"${FILESDIR}/Replace-Debian-xsl-stylesheets-paths-with-Gentoos.patch"
)
DISTUTILS_S="${S}/scripts"
src_prepare() {
default
# Avoid file collision with app-shells/bash-completion
rm "${DISTUTILS_S}/bts.bash_completion" || die
}
src_configure() {
default
if use python; then
pushd "${DISTUTILS_S}" > /dev/null || die
python_foreach_impl distutils-r1_src_configure
popd > /dev/null || die
fi
}
src_compile() {
default
if use python; then
pushd "${DISTUTILS_S}" > /dev/null || die
python_foreach_impl distutils-r1_src_compile
popd > /dev/null || die
fi
}
src_install() {
dodir /usr/bin
default
if use python; then
pushd "${DISTUTILS_S}" > /dev/null || die
python_foreach_impl distutils-r1_src_install
popd > /dev/null || die
fi
mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${PF}" || die
rm "${ED}/usr/share/bash-completion/completions/debcheckout" || die
mv "${ED}"/usr/share/bash-completion/completions/{pkgnames,debsnap} || die
bashcomp_alias debsnap wnpp-alert wnpp-check mk-build-deps rmadison mass-bug dd-list build-rdeps who-uploads transition-check getbuildlog grep-excuses rc-alert whodepends dget pts-subscribe pts-unsubscribe
}
src_test() {
default
pushd "${DISTUTILS_S}" > /dev/null || die
python_foreach_impl distutils-r1_src_test
popd > /dev/null || die
}

View File

@@ -1,22 +0,0 @@
--- a/test/Makefile
+++ b/test/Makefile
@@ -3,14 +3,14 @@
perl \
annotate-output \
checkbashisms \
- dd-list \
+ \
debchange \
debdiff \
- debrepro \
+ \
debsign \
mergechanges \
- mk-origtargz \
+ \
- package_lifecycle \
+ \
- sadt \
+ \
uscan \
uscan_ftp \

View File

@@ -1,42 +0,0 @@
--- a/po4a/Makefile
+++ b/po4a/Makefile
@@ -34,8 +34,8 @@
pod2man --utf8 --center=" " --release="$(DESC_$(dir $@))" $< > $@
%.1:: %.dbk translate
xsltproc --nonet \
- /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $<
- # /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/other.xsl
+ /usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl $<
+ # /usr/share/sgml/docbook/xsl-stylesheets/manpages/other.xsl
# (which is imported by the above stylesheet) insists in writing the output
# to where it wants to. we can only move the file ourselves.
# ($* → de/deb-reversion.de)
--- a/scripts/deb-reversion.dbk
+++ b/scripts/deb-reversion.dbk
@@ -5,13 +5,13 @@
<!--
Process this file with an XSLT processor: `xsltproc \
--''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
+-''-nonet /usr/share/sgml/docbook/xsl-stylesheets/\
manpages/docbook.xsl manpage.dbk'. A manual page
<package>.<section> will be generated. You may view the
manual page with: nroff -man <package>.<section> | less'. A
typical entry in a Makefile or Makefile.am is:
-DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
+DB2MAN=/usr/share/sgml/docbook/xsl-stylesheets/\
manpages/docbook.xsl
XP=xsltproc -''-nonet
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -87,7 +87,7 @@
pod2man --utf8 --center=" " --release="Debian Utilities" $< > $@
%.1: %.dbk
xsltproc --nonet -o $@ \
- /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $<
+ /usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl $<
# Syntax checker
test_sh: $(SH_CHECKS)

View File

@@ -1,26 +0,0 @@
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -99,7 +99,6 @@
perl -I ../lib -c $<; \
test_py: $(VERSION_FILE)
- $(foreach python,$(shell py3versions -r ../debian/control),$(python) setup.py test$(\n))
debbisect.1: debbisect
help2man \
@@ -131,7 +130,6 @@
cp $< $@
clean:
- python3 setup.py clean -a
find -name '*.pyc' -delete
find -name __pycache__ -delete
rm -rf devscripts.egg-info $(BC_BUILD_DIR) .pylint.d
@@ -142,7 +140,6 @@
test: test_pl test_sh test_py
install: all
- python3 setup.py install --root="$(DESTDIR)" --no-compile --install-layout=deb
cp $(SCRIPTS) $(DESTDIR)$(BINDIR)
ln -sf edit-patch $(DESTDIR)$(BINDIR)/add-patch
install -d $(DESTDIR)$(COMPL_DIR)

View File

@@ -1,9 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
</pkgmetadata>

View File

@@ -1 +0,0 @@
DIST rpmlint-2.3.0.tar.gz 5738210 BLAKE2B ae6e2f494009e5f7d2235d4a6e0bbc54bc992f890285d713b50e73131d2926e6db5f230a03c07cef6c314e33e418d8a8522721b0896a78cf4a3c6dbc6ea7e2ac SHA512 8c10a58315695a5768a8f95de9bcae2cca264d48e1a672ff515a2696eee3664dc97c1653ef6e3e18e46f2286cb99430fb3eaa3b0dc6ac069a6b4b94d13584903

View File

@@ -1,8 +0,0 @@
--- a/setup.cfg
+++ b/setup.cfg
@@ -10,4 +10,4 @@
application-import-names = Testing
[tool:pytest]
-addopts = -vv --cov=rpmlint -n auto --flake8
+addopts = -vv

View File

@@ -1,20 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<longdescription lang="en">
rpmlint is a tool for checking common errors in rpm packages. It can be
used to test individual packages and spec files before uploading or to
check an entire distribution. By default all applicable checks are
processed but specific checks can be performed by using command line
parameters.
</longdescription>
<upstream>
<bugs-to>https://github.com/rpm-software-management/rpmlint/issues</bugs-to>
<remote-id type="github">rpm-software-management/rpmlint</remote-id>
</upstream>
</pkgmetadata>

View File

@@ -1,57 +0,0 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_SINGLE_IMPL=1
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
DESCRIPTION="Tool for checking common errors in RPM packages"
HOMEPAGE="https://github.com/rpm-software-management/rpmlint"
SRC_URI="https://github.com/rpm-software-management/rpmlint/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64"
RDEPEND="
${PYTHON_DEPS}
app-arch/bzip2
app-arch/cpio
app-arch/gzip
app-arch/xz-utils
app-arch/zstd
sys-devel/binutils:*
$(python_gen_cond_dep '
app-arch/rpm[python,${PYTHON_SINGLE_USEDEP}]
dev-python/pybeam[${PYTHON_USEDEP}]
dev-python/pyxdg[${PYTHON_USEDEP}]
dev-python/toml[${PYTHON_USEDEP}]
dev-python/zstandard[${PYTHON_USEDEP}]
dev-python/pyenchant[${PYTHON_USEDEP}]
dev-python/python-magic[${PYTHON_USEDEP}]
')
"
DEPEND="
${RDEPEND}
test? (
app-shells/dash
dev-libs/appstream-glib
dev-util/desktop-file-utils
dev-util/devscripts
|| (
( app-text/hunspell[l10n_cs,l10n_en] app-text/enchant[hunspell] )
( app-text/aspell[l10n_cs,l10n_en] app-text/enchant[aspell] )
)
$(python_gen_cond_dep 'dev-python/pytest-xdist[${PYTHON_USEDEP}]')
)
"
PATCHES=( "${FILESDIR}/no-coverage.patch" )
distutils_enable_tests pytest

View File

@@ -14,6 +14,26 @@
# New entries go on top.
# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2022-08-11)
# depends on removed ~app-crypt/certbot-1.27.0
app-crypt/certbot-dns-digitalocean
# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2022-08-11)
# depends on removed <dev-python/testfixtures-7
dev-python/prawcore
# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2022-08-11)
# depends on removed dev-python/pydispatcher
dev-python/scrapy
# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2022-08-11)
# depends on removed net-p2p/go-ipfs
net-p2p/ipfs-cluster
# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2022-08-11)
# depends on removed <dev-lang/go-1.18
net-proxy/toxiproxy
# Viorel Munteanu <ceamac.paragon@gmail.com>
# depends on dev-python/PyQt6, which is currently masked with all of qt6
>=net-misc/maestral-qt-1.6.0
@@ -28,16 +48,6 @@ app-emulation/dxvk-bin
app-editors/imhex
dev-vcs/mergestat
# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2022-07-03)
# unavailable dependency dev-util/distro-info
dev-util/devscripts
dev-util/rpmlint
# Alessandro Barbieri <lssndrbarbieri@gmail.com> (2022-06-26)
# depends on non-existent dev-python/m2r
# https://github.com/jaysonsantos/python-binary-memcached/issues/249
dev-python/python-binary-memcached
# Christopher Byrne <salah.coronya@gmail.com> (2022-04-15)
# Depends on masked dev-libs/openssl-3.0.*
app-crypt/tpm2-openssl