diff options
Diffstat (limited to 'app-backup/rdiff-backup')
| -rw-r--r-- | app-backup/rdiff-backup/Manifest | 2 | ||||
| -rw-r--r-- | app-backup/rdiff-backup/files/rdiff-backup-2.0.0-no-docs.patch | 23 | ||||
| -rw-r--r-- | app-backup/rdiff-backup/files/rdiff-backup-2.0.5-py311.patch | 42 | ||||
| -rw-r--r-- | app-backup/rdiff-backup/metadata.xml | 1 | ||||
| -rw-r--r-- | app-backup/rdiff-backup/rdiff-backup-2.0.0.ebuild | 32 | ||||
| -rw-r--r-- | app-backup/rdiff-backup/rdiff-backup-2.0.5-r1.ebuild | 9 | ||||
| -rw-r--r-- | app-backup/rdiff-backup/rdiff-backup-2.2.6.ebuild | 31 |
7 files changed, 81 insertions, 59 deletions
diff --git a/app-backup/rdiff-backup/Manifest b/app-backup/rdiff-backup/Manifest index 4f0623a73b85..91a605ee5688 100644 --- a/app-backup/rdiff-backup/Manifest +++ b/app-backup/rdiff-backup/Manifest @@ -1,2 +1,2 @@ -DIST rdiff-backup-2.0.0.tar.gz 408352 BLAKE2B c2a7ae90ea147398d648142e20761e3caf4f08948dcd0a3de22254a13857d3e99cb2801c83084dd13dd84764cebc7651b42a70a788553c67925521e2ed123953 SHA512 0bf06d4eefffd41e86224d798e6ac6852ca0fd356be73d651ffaf63c37aaa043a6d22f8025619ab4a86e54f6e98e61f445ab68a6f87f4f2f48e635507ea110ec DIST rdiff-backup-2.0.5.tar.gz 456115 BLAKE2B 9cd51644e11af3320fa5aca7864388da4b1165a1fc9e660265445d861eb356ba32e3b148a1d8de8e702bd9a6f0276ec3a4453c85ec702d80be5839661a1a679f SHA512 59482e6d78bc887fc99efd4b4779e9b41c7e4b0427e51b80b18a550d0051e4213a0c200296154759d1734f511f7abe3175d171f018c59c55e5abdfd0a890cfbd +DIST rdiff-backup-2.2.6.tar.gz 944414 BLAKE2B f30bc570f8e20d950e87654d195f29848b6ca39953fc418b9ff391da649fdd308bebcd0379b047a1875eb1fa9b85c294df6a0528f06d4ba27627df4e12a771a4 SHA512 7370dcbb71f087252f8c599b0fbf58260ec7e026e023648bfab63c39b062120862ab8b60173e2bf2352e16d404bb561c72fe19aa9aed9d49cff56225b91f5c63 diff --git a/app-backup/rdiff-backup/files/rdiff-backup-2.0.0-no-docs.patch b/app-backup/rdiff-backup/files/rdiff-backup-2.0.0-no-docs.patch deleted file mode 100644 index bbac52538303..000000000000 --- a/app-backup/rdiff-backup/files/rdiff-backup-2.0.0-no-docs.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur rdiff-backup-2.0.0.orig/setup.py rdiff-backup-2.0.0/setup.py ---- rdiff-backup-2.0.0.orig/setup.py 2020-03-15 08:25:32.000000000 +0100 -+++ rdiff-backup-2.0.0/setup.py 2020-03-18 20:36:48.579570457 +0100 -@@ -194,19 +194,6 @@ - scripts=["src/rdiff-backup", "src/rdiff-backup-statistics"], - data_files=[ - ("share/man/man1", ["build/rdiff-backup.1", "build/rdiff-backup-statistics.1"]), -- ( -- "share/doc/rdiff-backup", -- [ -- "CHANGELOG", -- "COPYING", -- "README.md", -- "docs/FAQ.md", -- "docs/examples.md", -- "docs/DEVELOP.md", -- "docs/Windows-README.md", -- "docs/Windows-DEVELOP.md", -- ], -- ), - ("share/bash-completion/completions", ["tools/bash-completion/rdiff-backup"]), - ], - # options is a hash of hash with command -> option -> value diff --git a/app-backup/rdiff-backup/files/rdiff-backup-2.0.5-py311.patch b/app-backup/rdiff-backup/files/rdiff-backup-2.0.5-py311.patch new file mode 100644 index 000000000000..87531ca7c4a6 --- /dev/null +++ b/app-backup/rdiff-backup/files/rdiff-backup-2.0.5-py311.patch @@ -0,0 +1,42 @@ +From 5e5cc54b5a633d3c6c0469283b2f26dbdde7908f Mon Sep 17 00:00:00 2001 +From: Frank Crawford <frank@crawford.emu.id.au> +Date: Sun, 2 Jan 2022 18:44:57 +1100 +Subject: [PATCH] Added patch for Python3.11 as per bpo-39573. + +--- + src/_librsyncmodule.c | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +diff --git a/src/_librsyncmodule.c b/src/_librsyncmodule.c +index a46567fc4..158104d2e 100644 +--- a/src/_librsyncmodule.c ++++ b/src/_librsyncmodule.c +@@ -25,6 +25,16 @@ + #include <librsync.h> + #define RSM_JOB_BLOCKSIZE 65536 + ++/* ----------------------------------------------------------------------- * ++ * Update for Python 3.11 - Contributed by Victor Stinner in bpo-39573. ++ * Compatibility macro for older Python versions. ++ * ----------------------------------------------------------------------- */ ++#if PY_VERSION_HEX < 0x030900A4 && !defined(Py_SET_TYPE) ++static inline void _Py_SET_TYPE(PyObject *ob, PyTypeObject *type) ++{ ob->ob_type = type; } ++#define Py_SET_TYPE(ob, type) _Py_SET_TYPE((PyObject*)(ob), type) ++#endif ++ + static PyObject *librsyncError; + + /* Sets python error string from result */ +@@ -540,8 +550,9 @@ PyMODINIT_FUNC PyInit__librsync(void) + { + PyObject *m, *d; + +- Py_TYPE(&_librsync_SigMakerType) = &PyType_Type; +- Py_TYPE(&_librsync_DeltaMakerType) = &PyType_Type; ++ /* Update for Python 3.11 - bpo-39573. */ ++ Py_SET_TYPE(&_librsync_SigMakerType, &PyType_Type); ++ Py_SET_TYPE(&_librsync_DeltaMakerType, &PyType_Type); + static struct PyModuleDef librsync_def = { + PyModuleDef_HEAD_INIT, "_librsync", "RSync Lib", -1, _librsyncMethods, }; + m = PyModule_Create(&librsync_def); diff --git a/app-backup/rdiff-backup/metadata.xml b/app-backup/rdiff-backup/metadata.xml index 48db65ba4e09..2da39cb8a8f0 100644 --- a/app-backup/rdiff-backup/metadata.xml +++ b/app-backup/rdiff-backup/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <remote-id type="github">rdiff-backup/rdiff-backup</remote-id> + <remote-id type="pypi">rdiff-backup</remote-id> </upstream> </pkgmetadata> diff --git a/app-backup/rdiff-backup/rdiff-backup-2.0.0.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.0.0.ebuild deleted file mode 100644 index cb96d6900ad8..000000000000 --- a/app-backup/rdiff-backup/rdiff-backup-2.0.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) -inherit distutils-r1 - -DESCRIPTION="Local/remote mirroring+incremental backup" -HOMEPAGE="https://github.com/rdiff-backup/rdiff-backup" -SRC_URI="https://github.com/rdiff-backup/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="examples" - -DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}] - >=net-libs/librsync-1.0:0=" -RDEPEND="dev-python/pylibacl[${PYTHON_USEDEP}] - dev-python/pyxattr[${PYTHON_USEDEP}] - >=net-libs/librsync-1.0:0=" - -PATCHES=( - "${FILESDIR}/${PN}-2.0.0-no-docs.patch" -) - -python_install_all() { - local DOCS=( docs/FAQ.md ) - use examples && DOCS+=( docs/examples.md ) - distutils-r1_python_install_all -} diff --git a/app-backup/rdiff-backup/rdiff-backup-2.0.5-r1.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.0.5-r1.ebuild index 63dde15c5ccd..735bab8e418e 100644 --- a/app-backup/rdiff-backup/rdiff-backup-2.0.5-r1.ebuild +++ b/app-backup/rdiff-backup/rdiff-backup-2.0.5-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{9..12} ) DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 @@ -15,8 +15,10 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="examples" +# Tests use a tox environment and separate steps for test env preparation +RESTRICT="test" -DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}] +DEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}] >=net-libs/librsync-1.0:0=" RDEPEND="dev-python/pylibacl[${PYTHON_USEDEP}] dev-python/pyxattr[${PYTHON_USEDEP}] @@ -24,6 +26,7 @@ RDEPEND="dev-python/pylibacl[${PYTHON_USEDEP}] PATCHES=( "${FILESDIR}/${PN}-2.0.3-no-docs.patch" + "${FILESDIR}/${P}-py311.patch" ) python_install_all() { diff --git a/app-backup/rdiff-backup/rdiff-backup-2.2.6.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.2.6.ebuild new file mode 100644 index 000000000000..259082ffc737 --- /dev/null +++ b/app-backup/rdiff-backup/rdiff-backup-2.2.6.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) +PYPI_NO_NORMALIZE=1 +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 pypi + +DESCRIPTION="Local/remote mirroring+incremental backup" +HOMEPAGE="https://github.com/rdiff-backup/rdiff-backup" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +# Tests use a tox environment and separate steps for test env preparation +RESTRICT="test" + +RDEPEND="dev-python/pylibacl[${PYTHON_USEDEP}] + dev-python/pyxattr[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + >=net-libs/librsync-1.0:0=" +DEPEND="${RDEPEND} + dev-python/setuptools-scm[${PYTHON_USEDEP}]" + +src_prepare() { + sed -e "s#share/doc/${PN}#share/doc/${PF}#" -i setup.py || die + default +} |