1 |
commit: 96043fa182bc97c901ba3da8149e2b30abb93319 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Aug 16 00:49:23 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 16 00:49:43 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96043fa1 |
7 |
|
8 |
net-misc/rsync: tighten xxhash dep (>= 0.8), add missing slot dep operators |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
.../rsync/{rsync-3.2.5.ebuild => rsync-3.2.5-r1.ebuild} | 15 ++++++++------- |
13 |
net-misc/rsync/rsync-9999.ebuild | 15 ++++++++------- |
14 |
2 files changed, 16 insertions(+), 14 deletions(-) |
15 |
|
16 |
diff --git a/net-misc/rsync/rsync-3.2.5.ebuild b/net-misc/rsync/rsync-3.2.5-r1.ebuild |
17 |
similarity index 95% |
18 |
rename from net-misc/rsync/rsync-3.2.5.ebuild |
19 |
rename to net-misc/rsync/rsync-3.2.5-r1.ebuild |
20 |
index ab9d689fb713..5e5ba3f5fabb 100644 |
21 |
--- a/net-misc/rsync/rsync-3.2.5.ebuild |
22 |
+++ b/net-misc/rsync/rsync-3.2.5-r1.ebuild |
23 |
@@ -4,7 +4,7 @@ |
24 |
EAPI=8 |
25 |
|
26 |
PYTHON_COMPAT=( python3_{8..10} ) |
27 |
-inherit flag-o-matic prefix python-single-r1 systemd |
28 |
+inherit prefix python-single-r1 systemd |
29 |
|
30 |
DESCRIPTION="File transfer program to keep remote files into sync" |
31 |
HOMEPAGE="https://rsync.samba.org/" |
32 |
@@ -34,18 +34,19 @@ SLOT="0" |
33 |
IUSE="acl examples iconv lz4 ssl stunnel system-zlib xattr xxhash zstd" |
34 |
REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )" |
35 |
|
36 |
-RDEPEND="acl? ( virtual/acl ) |
37 |
+RDEPEND=" |
38 |
+ >=dev-libs/popt-1.5 |
39 |
+ acl? ( virtual/acl ) |
40 |
examples? ( |
41 |
${PYTHON_DEPS} |
42 |
dev-lang/perl |
43 |
) |
44 |
- lz4? ( app-arch/lz4 ) |
45 |
- ssl? ( dev-libs/openssl:0= ) |
46 |
+ lz4? ( app-arch/lz4:= ) |
47 |
+ ssl? ( dev-libs/openssl:= ) |
48 |
system-zlib? ( sys-libs/zlib ) |
49 |
xattr? ( kernel_linux? ( sys-apps/attr ) ) |
50 |
- xxhash? ( dev-libs/xxhash ) |
51 |
- zstd? ( >=app-arch/zstd-1.4 ) |
52 |
- >=dev-libs/popt-1.5 |
53 |
+ xxhash? ( >=dev-libs/xxhash-0.8 ) |
54 |
+ zstd? ( >=app-arch/zstd-1.4:= ) |
55 |
iconv? ( virtual/libiconv )" |
56 |
DEPEND="${RDEPEND}" |
57 |
BDEPEND="examples? ( ${PYTHON_DEPS} )" |
58 |
|
59 |
diff --git a/net-misc/rsync/rsync-9999.ebuild b/net-misc/rsync/rsync-9999.ebuild |
60 |
index ab9d689fb713..5e5ba3f5fabb 100644 |
61 |
--- a/net-misc/rsync/rsync-9999.ebuild |
62 |
+++ b/net-misc/rsync/rsync-9999.ebuild |
63 |
@@ -4,7 +4,7 @@ |
64 |
EAPI=8 |
65 |
|
66 |
PYTHON_COMPAT=( python3_{8..10} ) |
67 |
-inherit flag-o-matic prefix python-single-r1 systemd |
68 |
+inherit prefix python-single-r1 systemd |
69 |
|
70 |
DESCRIPTION="File transfer program to keep remote files into sync" |
71 |
HOMEPAGE="https://rsync.samba.org/" |
72 |
@@ -34,18 +34,19 @@ SLOT="0" |
73 |
IUSE="acl examples iconv lz4 ssl stunnel system-zlib xattr xxhash zstd" |
74 |
REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )" |
75 |
|
76 |
-RDEPEND="acl? ( virtual/acl ) |
77 |
+RDEPEND=" |
78 |
+ >=dev-libs/popt-1.5 |
79 |
+ acl? ( virtual/acl ) |
80 |
examples? ( |
81 |
${PYTHON_DEPS} |
82 |
dev-lang/perl |
83 |
) |
84 |
- lz4? ( app-arch/lz4 ) |
85 |
- ssl? ( dev-libs/openssl:0= ) |
86 |
+ lz4? ( app-arch/lz4:= ) |
87 |
+ ssl? ( dev-libs/openssl:= ) |
88 |
system-zlib? ( sys-libs/zlib ) |
89 |
xattr? ( kernel_linux? ( sys-apps/attr ) ) |
90 |
- xxhash? ( dev-libs/xxhash ) |
91 |
- zstd? ( >=app-arch/zstd-1.4 ) |
92 |
- >=dev-libs/popt-1.5 |
93 |
+ xxhash? ( >=dev-libs/xxhash-0.8 ) |
94 |
+ zstd? ( >=app-arch/zstd-1.4:= ) |
95 |
iconv? ( virtual/libiconv )" |
96 |
DEPEND="${RDEPEND}" |
97 |
BDEPEND="examples? ( ${PYTHON_DEPS} )" |