| 1 |
commit: 835f0179694d35eec8af5e167eaabfa789d686f7 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 26 16:36:30 2022 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 26 16:36:30 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=835f0179 |
| 7 |
|
| 8 |
net-misc/rsync: sync live ebuild |
| 9 |
|
| 10 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 11 |
|
| 12 |
net-misc/rsync/rsync-9999.ebuild | 32 ++++++++++++++++++++++++++++---- |
| 13 |
1 file changed, 28 insertions(+), 4 deletions(-) |
| 14 |
|
| 15 |
diff --git a/net-misc/rsync/rsync-9999.ebuild b/net-misc/rsync/rsync-9999.ebuild |
| 16 |
index 804909ae11e6..6c31cf7b857f 100644 |
| 17 |
--- a/net-misc/rsync/rsync-9999.ebuild |
| 18 |
+++ b/net-misc/rsync/rsync-9999.ebuild |
| 19 |
@@ -37,8 +37,9 @@ fi |
| 20 |
|
| 21 |
LICENSE="GPL-3" |
| 22 |
SLOT="0" |
| 23 |
-IUSE="acl examples iconv lz4 ssl stunnel system-zlib xattr xxhash zstd" |
| 24 |
+IUSE="acl examples iconv lz4 rrsync ssl stunnel system-zlib xattr xxhash zstd" |
| 25 |
REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )" |
| 26 |
+REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )" |
| 27 |
|
| 28 |
RDEPEND=" |
| 29 |
>=dev-libs/popt-1.5 |
| 30 |
@@ -48,6 +49,12 @@ RDEPEND=" |
| 31 |
dev-lang/perl |
| 32 |
) |
| 33 |
lz4? ( app-arch/lz4:= ) |
| 34 |
+ rrsync? ( |
| 35 |
+ ${PYTHON_DEPS} |
| 36 |
+ $(python_gen_cond_dep ' |
| 37 |
+ dev-python/bracex[${PYTHON_USEDEP}] |
| 38 |
+ ') |
| 39 |
+ ) |
| 40 |
ssl? ( dev-libs/openssl:= ) |
| 41 |
system-zlib? ( sys-libs/zlib ) |
| 42 |
xattr? ( kernel_linux? ( sys-apps/attr ) ) |
| 43 |
@@ -55,7 +62,10 @@ RDEPEND=" |
| 44 |
zstd? ( >=app-arch/zstd-1.4:= ) |
| 45 |
iconv? ( virtual/libiconv )" |
| 46 |
DEPEND="${RDEPEND}" |
| 47 |
-BDEPEND="examples? ( ${PYTHON_DEPS} )" |
| 48 |
+BDEPEND=" |
| 49 |
+ examples? ( ${PYTHON_DEPS} ) |
| 50 |
+ rrsync? ( ${PYTHON_DEPS} ) |
| 51 |
+" |
| 52 |
|
| 53 |
if [[ ${PV} == *9999 ]] ; then |
| 54 |
BDEPEND+=" ${PYTHON_DEPS} |
| 55 |
@@ -69,7 +79,7 @@ fi |
| 56 |
pkg_setup() { |
| 57 |
# - USE=examples needs Python itself at runtime, but nothing else |
| 58 |
# - 9999 needs commonmark at build time |
| 59 |
- if [[ ${PV} == *9999 ]] || use examples ; then |
| 60 |
+ if [[ ${PV} == *9999 ]] || use examples || use rrsync; then |
| 61 |
python-single-r1_pkg_setup |
| 62 |
fi |
| 63 |
} |
| 64 |
@@ -82,6 +92,17 @@ src_prepare() { |
| 65 |
eautoconf -o configure.sh |
| 66 |
eautoheader && touch config.h.in |
| 67 |
fi |
| 68 |
+ |
| 69 |
+ if use examples || use rrsync; then |
| 70 |
+ python_fix_shebang support/ |
| 71 |
+ fi |
| 72 |
+ |
| 73 |
+ if [[ -f rrsync.1 ]]; then |
| 74 |
+ # If the pre-build rrsync.1 man page exists, then link to it |
| 75 |
+ # from support/rrsync.1 to avoid rsync's build system attempting |
| 76 |
+ # re-creating the man page (bug #883049). |
| 77 |
+ ln -s ../rrsync.1 support/rrsync.1 || die |
| 78 |
+ fi |
| 79 |
} |
| 80 |
|
| 81 |
src_configure() { |
| 82 |
@@ -92,6 +113,7 @@ src_configure() { |
| 83 |
$(use_enable acl acl-support) |
| 84 |
$(use_enable iconv) |
| 85 |
$(use_enable lz4) |
| 86 |
+ $(use_with rrsync) |
| 87 |
$(use_enable ssl openssl) |
| 88 |
$(use_with !system-zlib included-zlib) |
| 89 |
$(use_enable xattr xattr-support) |
| 90 |
@@ -126,7 +148,9 @@ src_install() { |
| 91 |
|
| 92 |
# Install the useful contrib scripts |
| 93 |
if use examples ; then |
| 94 |
- python_fix_shebang support/ |
| 95 |
+ # The 'rrsync' script is installed conditionally via the 'rrysnc' |
| 96 |
+ # USE flag, and not via the 'examples' USE flag. |
| 97 |
+ rm support/rrsync* || die |
| 98 |
|
| 99 |
exeinto /usr/share/rsync |
| 100 |
doexe support/* |
Archives