commit:     c40dbfadecf1fc0adfc8135b2f66aa3ed17fbee4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 25 05:31:23 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 25 05:51:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c40dbfad

net-misc/rsync: drop 3.2.4-r1, 3.2.5-r1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/rsync/Manifest              |   2 -
 net-misc/rsync/rsync-3.2.4-r1.ebuild | 164 ---------------------------------
 net-misc/rsync/rsync-3.2.5-r1.ebuild | 171 -----------------------------------
 3 files changed, 337 deletions(-)

diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 2d98bff9c878..e8abc54f94fc 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -1,7 +1,5 @@
 DIST rsync-3.2.4.tar.gz 1114853 BLAKE2B 
a67fcb9619874f1c5346a876138e59f4bf508a90736f830fb2b4eaf180ab11f15a0a7db9b3b28c3b990b77c2b0973d8e668bf509e4134f464159ed3172f53d80
 SHA512 
96318e2754fbddf84d16df671c721e577766969dfa415925c4dc1be2e4e60a51246623747a8aec0c6e9c0824e6aa7335235ccd07f3d6fd901f8cf28e2d6e91b6
 DIST rsync-3.2.4.tar.gz.asc 195 BLAKE2B 
9bc2fbd59e5396a91de82f27a461367ad2a129820e2d1926c3b1e26dacf93c676a7231f186c341b6dec9c764a9619b504bc9b5f95925982e78de4607eddf6c65
 SHA512 
7e1bbebc777d5710345fdec1efd4c2ef1079d6c0ec90272a1a4a51a59ae3cb619b9d1c0ae2f337ecdd06827bb3536b969b6f21f9108f8d21114713aa1750012b
-DIST rsync-3.2.5.tar.gz 1129957 BLAKE2B 
a0d1c4a2dbebe37bad4f6e2e5e4fae41c53529d96e0ca5a429d29d1dee8c63c8ee1b7dc686b732a88049c547271260e8361ac798673970d5327d08dda01ce811
 SHA512 
6d115acb5bae546cd2b5df2c11390f8609107b7a45aa649158d8daa0c9290ab5f15640fdd4000b21d1ab39f7385b85d77cd8fe4628fa13b2adeea6fcd53d057a
-DIST rsync-3.2.5.tar.gz.asc 195 BLAKE2B 
9ca9034afc39299c2178190412b188f561d274d8e38d58a988487f2db14a8135840acf3413096d26f080358b69779fa3b48e292670ba6b23ae4eb0c05f9df614
 SHA512 
b384f48b2fd459a51715c8ab2a14e540c5fa7f7f12453282db770893d6121b1b3c9809e667ccacaf910fd90548abeb700a2c717d76fbea22fe3d6a22aa6b2c44
 DIST rsync-3.2.6.tar.gz 1138593 BLAKE2B 
fa0c4aa9cdffbc9ffd4f81e8c3cdc1fda7080f80c1923084c6d705e6872caaba31c13de4603c9462f312dbbdae76520c27d3f4f40b327f1e66c7127b1d05ea73
 SHA512 
d141d04732c91e055708e8d1f14b976f9483208a93076bb66dc75cbf87d54f2dcbffc11423f0c9c005d2d4e20cb9c147a7672f7a9c0b987f4e2c39b4c3645cfe
 DIST rsync-3.2.6.tar.gz.asc 195 BLAKE2B 
945c60ca67aa4234bc9d5b38c9228125f3040bccecf60c08892286c1b4fa32878d92bfc78ee664d4f6453ccaaf6d394dbe203f0a8be149e557fabede1c111b07
 SHA512 
1316b358dfa87ad7c35b2b5d11e0be111a182041150cf9c9ae30f73e0af1430a59136250dc853f784e9e80d0ee20cc46e9a34b07cc7c7a48040db168a8c8941b
 DIST rsync-3.2.7.tar.gz 1149787 BLAKE2B 
1b910b321e8d6b49af9f26bef813509f0da12dedd6857897de136d3617c68d38368ce05de13b9b0ef35a5452dca141ebdcdfb6af8456151d0ca0ad546452b504
 SHA512 
c2afba11a352fd88133f9e96e19d6df80eb864450c83eced13a7faa23df947bccf2ef093f2101df6ee30abff4cbbd39ac802e9aa5f726e42c9caff274fad8377

diff --git a/net-misc/rsync/rsync-3.2.4-r1.ebuild 
b/net-misc/rsync/rsync-3.2.4-r1.ebuild
deleted file mode 100644
index d569ca909ecd..000000000000
--- a/net-misc/rsync/rsync-3.2.4-r1.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-inherit flag-o-matic prefix python-single-r1 systemd
-
-DESCRIPTION="File transfer program to keep remote files into sync"
-HOMEPAGE="https://rsync.samba.org/";
-if [[ ${PV} == *9999 ]] ; then
-       EGIT_REPO_URI="https://github.com/WayneD/rsync.git";
-       inherit autotools git-r3
-
-       REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-else
-       
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/waynedavison.asc
-       inherit verify-sig
-
-       if [[ ${PV} == *_pre* ]] ; then
-               SRC_DIR="src-previews"
-       else
-               SRC_DIR="src"
-               KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-       fi
-
-       SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
-               verify-sig? ( 
https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz.asc )"
-       S="${WORKDIR}"/${P/_/}
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl examples iconv ipv6 lz4 ssl stunnel system-zlib xattr xxhash zstd"
-REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="acl? ( virtual/acl )
-       examples? (
-               ${PYTHON_DEPS}
-               dev-lang/perl
-       )
-       lz4? ( app-arch/lz4 )
-       ssl? ( dev-libs/openssl:0= )
-       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
-       iconv? ( virtual/libiconv )"
-DEPEND="${RDEPEND}"
-BDEPEND="examples? ( ${PYTHON_DEPS} )"
-
-if [[ ${PV} == *9999 ]] ; then
-       BDEPEND+=" ${PYTHON_DEPS}
-               $(python_gen_cond_dep '
-                       dev-python/commonmark[${PYTHON_USEDEP}]
-               ')"
-else
-       BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )"
-fi
-
-pkg_setup() {
-       # - USE=examples needs Python itself at runtime, but nothing else
-       # - 9999 needs commonmark at build time
-       if [[ ${PV} == *9999 ]] || use examples ; then
-               python-single-r1_pkg_setup
-       fi
-}
-
-src_prepare() {
-       default
-
-       if [[ ${PV} == *9999 ]] ; then
-               eaclocal -I m4
-               eautoconf -o configure.sh
-               eautoheader && touch config.h.in
-       fi
-}
-
-src_configure() {
-       # Force enable IPv6 on musl - upstream bug:
-       # https://bugzilla.samba.org/show_bug.cgi?id=10715
-       use elibc_musl && use ipv6 && append-cppflags -DINET6
-
-       local myeconfargs=(
-               --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
-               --without-included-popt
-               $(use_enable acl acl-support)
-               $(use_enable iconv)
-               $(use_enable ipv6)
-               $(use_enable lz4)
-               $(use_enable ssl openssl)
-               $(use_with !system-zlib included-zlib)
-               $(use_enable xattr xattr-support)
-               $(use_enable xxhash)
-               $(use_enable zstd)
-       )
-
-       econf "${myeconfargs[@]}"
-}
-
-src_install() {
-       emake DESTDIR="${D}" install
-
-       newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
-       newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
-
-       dodoc NEWS.md README.md TODO tech_report.tex
-
-       insinto /etc
-       newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
-
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}"/rsyncd.logrotate rsyncd
-
-       insinto /etc/xinetd.d
-       newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
-
-       # Install stunnel helpers
-       if use stunnel ; then
-               emake DESTDIR="${D}" install-ssl-daemon
-       fi
-
-       # Install the useful contrib scripts
-       if use examples ; then
-               python_fix_shebang support/
-
-               exeinto /usr/share/rsync
-               doexe support/*
-
-               rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
-       fi
-
-       eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
-
-       systemd_newunit packaging/systemd/rsync.service rsyncd.service
-}
-
-pkg_postinst() {
-       if grep -Eqis '^[[:space:]]use 
chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
-               "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; 
then
-               ewarn "You have disabled chroot support in your rsyncd.conf.  
This"
-               ewarn "is a security risk which you should fix.  Please check 
your"
-               ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
-       fi
-
-       if use stunnel ; then
-               einfo "Please install \">=net-misc/stunnel-4\" in order to use 
stunnel feature."
-               einfo
-               einfo "You maybe have to update the certificates configured in"
-               einfo "${EROOT}/etc/stunnel/rsync.conf"
-       fi
-
-       if use system-zlib ; then
-               ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when"
-               ewarn "using the --compress option."
-               ewarn
-               ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib,"
-               ewarn "and the --compress option, add --new-compress (-zz)."
-               ewarn
-               ewarn "For syncing the portage tree, add:"
-               ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf"
-       fi
-}

diff --git a/net-misc/rsync/rsync-3.2.5-r1.ebuild 
b/net-misc/rsync/rsync-3.2.5-r1.ebuild
deleted file mode 100644
index 6e6e4bd34c3e..000000000000
--- a/net-misc/rsync/rsync-3.2.5-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Uncomment when introducing a patch which touches configure
-RSYNC_NEEDS_AUTOCONF=1
-PYTHON_COMPAT=( python3_{8..10} )
-inherit prefix python-single-r1 systemd
-
-DESCRIPTION="File transfer program to keep remote files into sync"
-HOMEPAGE="https://rsync.samba.org/";
-if [[ ${PV} == *9999 ]] ; then
-       EGIT_REPO_URI="https://github.com/WayneD/rsync.git";
-       inherit autotools git-r3
-
-       REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-else
-       
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/waynedavison.asc
-       inherit verify-sig
-
-       if [[ -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then
-               inherit autotools
-       fi
-
-       if [[ ${PV} == *_pre* ]] ; then
-               SRC_DIR="src-previews"
-       else
-               SRC_DIR="src"
-               KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-       fi
-
-       SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
-               verify-sig? ( 
https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz.asc )"
-       S="${WORKDIR}"/${P/_/}
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl examples iconv lz4 ssl stunnel system-zlib xattr xxhash zstd"
-REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-       >=dev-libs/popt-1.5
-       acl? ( virtual/acl )
-       examples? (
-               ${PYTHON_DEPS}
-               dev-lang/perl
-       )
-       lz4? ( app-arch/lz4:= )
-       ssl? ( dev-libs/openssl:= )
-       system-zlib? ( sys-libs/zlib )
-       xattr? ( kernel_linux? ( sys-apps/attr ) )
-       xxhash? ( >=dev-libs/xxhash-0.8 )
-       zstd? ( >=app-arch/zstd-1.4:= )
-       iconv? ( virtual/libiconv )"
-DEPEND="${RDEPEND}"
-BDEPEND="examples? ( ${PYTHON_DEPS} )"
-
-if [[ ${PV} == *9999 ]] ; then
-       BDEPEND+=" ${PYTHON_DEPS}
-               $(python_gen_cond_dep '
-                       dev-python/commonmark[${PYTHON_USEDEP}]
-               ')"
-else
-       BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )"
-fi
-
-PATCHES=(
-       "${FILESDIR}"/${P}-pedantic-errors.patch
-)
-
-pkg_setup() {
-       # - USE=examples needs Python itself at runtime, but nothing else
-       # - 9999 needs commonmark at build time
-       if [[ ${PV} == *9999 ]] || use examples ; then
-               python-single-r1_pkg_setup
-       fi
-}
-
-src_prepare() {
-       default
-
-       if [[ ${PV} == *9999 || -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then
-               eaclocal -I m4
-               eautoconf -o configure.sh
-               eautoheader && touch config.h.in
-       fi
-}
-
-src_configure() {
-       local myeconfargs=(
-               --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
-               --without-included-popt
-               --enable-ipv6
-               $(use_enable acl acl-support)
-               $(use_enable iconv)
-               $(use_enable lz4)
-               $(use_enable ssl openssl)
-               $(use_with !system-zlib included-zlib)
-               $(use_enable xattr xattr-support)
-               $(use_enable xxhash)
-               $(use_enable zstd)
-       )
-
-       econf "${myeconfargs[@]}"
-}
-
-src_install() {
-       emake DESTDIR="${D}" install
-
-       newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
-       newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
-
-       dodoc NEWS.md README.md TODO tech_report.tex
-
-       insinto /etc
-       newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
-
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}"/rsyncd.logrotate rsyncd
-
-       insinto /etc/xinetd.d
-       newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
-
-       # Install stunnel helpers
-       if use stunnel ; then
-               emake DESTDIR="${D}" install-ssl-daemon
-       fi
-
-       # Install the useful contrib scripts
-       if use examples ; then
-               python_fix_shebang support/
-
-               exeinto /usr/share/rsync
-               doexe support/*
-
-               rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
-       fi
-
-       eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
-
-       systemd_newunit packaging/systemd/rsync.service rsyncd.service
-}
-
-pkg_postinst() {
-       if grep -Eqis '^[[:space:]]use 
chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
-               "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; 
then
-               ewarn "You have disabled chroot support in your rsyncd.conf.  
This"
-               ewarn "is a security risk which you should fix.  Please check 
your"
-               ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
-       fi
-
-       if use stunnel ; then
-               einfo "Please install \">=net-misc/stunnel-4\" in order to use 
stunnel feature."
-               einfo
-               einfo "You maybe have to update the certificates configured in"
-               einfo "${EROOT}/etc/stunnel/rsync.conf"
-       fi
-
-       if use system-zlib ; then
-               ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when"
-               ewarn "using the --compress option."
-               ewarn
-               ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib,"
-               ewarn "and the --compress option, add --new-compress (-zz)."
-               ewarn
-               ewarn "For syncing the portage tree, add:"
-               ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf"
-       fi
-}

Reply via email to