commit: 96043fa182bc97c901ba3da8149e2b30abb93319 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Aug 16 00:49:23 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Aug 16 00:49:43 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96043fa1
net-misc/rsync: tighten xxhash dep (>= 0.8), add missing slot dep operators Signed-off-by: Sam James <sam <AT> gentoo.org> .../rsync/{rsync-3.2.5.ebuild => rsync-3.2.5-r1.ebuild} | 15 ++++++++------- net-misc/rsync/rsync-9999.ebuild | 15 ++++++++------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/net-misc/rsync/rsync-3.2.5.ebuild b/net-misc/rsync/rsync-3.2.5-r1.ebuild similarity index 95% rename from net-misc/rsync/rsync-3.2.5.ebuild rename to net-misc/rsync/rsync-3.2.5-r1.ebuild index ab9d689fb713..5e5ba3f5fabb 100644 --- a/net-misc/rsync/rsync-3.2.5.ebuild +++ b/net-misc/rsync/rsync-3.2.5-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) -inherit flag-o-matic prefix python-single-r1 systemd +inherit prefix python-single-r1 systemd DESCRIPTION="File transfer program to keep remote files into sync" HOMEPAGE="https://rsync.samba.org/" @@ -34,18 +34,19 @@ SLOT="0" IUSE="acl examples iconv lz4 ssl stunnel system-zlib xattr xxhash zstd" REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )" -RDEPEND="acl? ( virtual/acl ) +RDEPEND=" + >=dev-libs/popt-1.5 + acl? ( virtual/acl ) examples? ( ${PYTHON_DEPS} dev-lang/perl ) - lz4? ( app-arch/lz4 ) - ssl? ( dev-libs/openssl:0= ) + lz4? ( app-arch/lz4:= ) + ssl? ( dev-libs/openssl:= ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) - xxhash? ( dev-libs/xxhash ) - zstd? ( >=app-arch/zstd-1.4 ) - >=dev-libs/popt-1.5 + xxhash? ( >=dev-libs/xxhash-0.8 ) + zstd? ( >=app-arch/zstd-1.4:= ) iconv? ( virtual/libiconv )" DEPEND="${RDEPEND}" BDEPEND="examples? ( ${PYTHON_DEPS} )" diff --git a/net-misc/rsync/rsync-9999.ebuild b/net-misc/rsync/rsync-9999.ebuild index ab9d689fb713..5e5ba3f5fabb 100644 --- a/net-misc/rsync/rsync-9999.ebuild +++ b/net-misc/rsync/rsync-9999.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) -inherit flag-o-matic prefix python-single-r1 systemd +inherit prefix python-single-r1 systemd DESCRIPTION="File transfer program to keep remote files into sync" HOMEPAGE="https://rsync.samba.org/" @@ -34,18 +34,19 @@ SLOT="0" IUSE="acl examples iconv lz4 ssl stunnel system-zlib xattr xxhash zstd" REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )" -RDEPEND="acl? ( virtual/acl ) +RDEPEND=" + >=dev-libs/popt-1.5 + acl? ( virtual/acl ) examples? ( ${PYTHON_DEPS} dev-lang/perl ) - lz4? ( app-arch/lz4 ) - ssl? ( dev-libs/openssl:0= ) + lz4? ( app-arch/lz4:= ) + ssl? ( dev-libs/openssl:= ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) - xxhash? ( dev-libs/xxhash ) - zstd? ( >=app-arch/zstd-1.4 ) - >=dev-libs/popt-1.5 + xxhash? ( >=dev-libs/xxhash-0.8 ) + zstd? ( >=app-arch/zstd-1.4:= ) iconv? ( virtual/libiconv )" DEPEND="${RDEPEND}" BDEPEND="examples? ( ${PYTHON_DEPS} )"