commit: 9f8b0a10cde068cb69c2714a61b5f8d00e96ea99 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Sat Jun 20 01:20:59 2020 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Sat Jun 20 01:28:09 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f8b0a10
net-misc/rsync: Bump to version 3.2.0. Removed old Bug: https://bugs.gentoo.org/728852 Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> net-misc/rsync/Manifest | 2 +- net-misc/rsync/files/rsync-3.2.0-simd_check.patch | 24 ++++++++++++++++++++++ .../rsync/files/rsync-3.2.0_pre3-simd_check.patch | 24 ---------------------- ...{rsync-3.2.0_pre3.ebuild => rsync-3.2.0.ebuild} | 4 ++-- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest index 7ef8c17e978..12fd2dd6f35 100644 --- a/net-misc/rsync/Manifest +++ b/net-misc/rsync/Manifest @@ -1,2 +1,2 @@ DIST rsync-3.1.3.tar.gz 905908 BLAKE2B 616a1f3239327a28b881310f5f249c90b8bcdb05091279cd62f9cb4e35a8428c7cdd9b89e711ba124601a738f0deb9bfbebafba7fd88b72866476138a9f8c75a SHA512 8385f4c0ea37e7a1da3cf45794154f5bc4d1c49bc625ba3b5f85adaf3eafe6d71c15bdcb1410bde731e5d4c19aff3331606637462fa27a68dc3e13192dd78f99 -DIST rsync-3.2.0pre3.tar.gz 1046601 BLAKE2B bfa9345dd387b8e729686c4a3a1d203336f18c14d0bf3b1aa28b6792ba0fc5f07513256f774bdf6ba4af72730a88e9e3bafb5060cdc8b2ae0fe0314e0e79cde1 SHA512 2b8dee4e4c759165ace5bf1bf3f79e88ad25d5dd2eeed89e0ae699ef0956758c6428488fa5e842b59267c315cf38fde9449d0aee1b5db9abd79d90cf4f108992 +DIST rsync-3.2.0.tar.gz 1048009 BLAKE2B 641be077a88958a09b083fd9658ae7f40ce3565bee1959f0c7ef82c61356a070e7ca1e0ceeb96b7a1b31a5ee031a84733ade3965aaa93f9e18795df16a6c1460 SHA512 01a109e1e061bb7f4734b694e1f15a83efdd8fcb1995e5eeea75a8d245eead4412c09b37b0fcdfe522e368673768e4fa5ed8891ccf3ae42f60293e4e68d506c2 diff --git a/net-misc/rsync/files/rsync-3.2.0-simd_check.patch b/net-misc/rsync/files/rsync-3.2.0-simd_check.patch new file mode 100644 index 00000000000..db3ee83dc0d --- /dev/null +++ b/net-misc/rsync/files/rsync-3.2.0-simd_check.patch @@ -0,0 +1,24 @@ +https://github.com/WayneD/rsync/pull/24 + +--- rsync-3.2.0/configure.ac 2020-06-19 23:11:01.000000000 +0200 ++++ rsync-3.2.0/configure.ac 2020-06-19 23:11:01.000000000 +0200 +@@ -207,7 +207,7 @@ + if test x"$CXX" != x""; then + CXX_VERSION=`$CXX --version 2>/dev/null | head -n 1` + case "$CXX_VERSION" in +- g++*) ++ *g++*) + CXX_VERSION=`$CXX -dumpversion | sed 's/\..*//g'` + if test "$CXX_VERSION" -ge "5"; then + CXX_OK=yes +--- rsync-3.2.0/configure.sh 2020-06-19 23:11:01.000000000 +0200 ++++ rsync-3.2.0/configure.sh 2020-06-19 23:11:01.000000000 +0200 +@@ -4889,7 +4889,7 @@ + if test x"$CXX" != x""; then + CXX_VERSION=`$CXX --version 2>/dev/null | head -n 1` + case "$CXX_VERSION" in +- g++*) ++ *g++*) + CXX_VERSION=`$CXX -dumpversion | sed 's/\..*//g'` + if test "$CXX_VERSION" -ge "5"; then + CXX_OK=yes diff --git a/net-misc/rsync/files/rsync-3.2.0_pre3-simd_check.patch b/net-misc/rsync/files/rsync-3.2.0_pre3-simd_check.patch deleted file mode 100644 index 1d50c95b00d..00000000000 --- a/net-misc/rsync/files/rsync-3.2.0_pre3-simd_check.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://github.com/WayneD/rsync/issues/19 - ---- rsync-3.2.0pre3/configure.ac 2020-06-17 19:12:09.000000000 +0200 -+++ rsync-3.2.0pre3/configure.ac 2020-06-17 19:12:09.000000000 +0200 -@@ -202,7 +202,7 @@ - if test x"$enable_simd" = x"yes"; then - # For x86-64 SIMD, g++ is also required - if test x"$build_cpu" = x"x86_64"; then -- if test x"$CXX" = x"g++"; then -+ if echo "$CXX" | grep -q 'g++$'; then - # AC_MSG_RESULT() called below - SIMD="$SIMD x86_64" - else ---- rsync-3.2.0pre3/configure.sh 2020-06-17 19:12:09.000000000 +0200 -+++ rsync-3.2.0pre3/configure.sh 2020-06-17 19:12:09.000000000 +0200 -@@ -4842,7 +4842,7 @@ - if test x"$enable_simd" = x"yes"; then - # For x86-64 SIMD, g++ is also required - if test x"$build_cpu" = x"x86_64"; then -- if test x"$CXX" = x"g++"; then -+ if echo "$CXX" | grep -q 'g++$'; then - # AC_MSG_RESULT() called below - SIMD="$SIMD x86_64" - else diff --git a/net-misc/rsync/rsync-3.2.0_pre3.ebuild b/net-misc/rsync/rsync-3.2.0.ebuild similarity index 94% rename from net-misc/rsync/rsync-3.2.0_pre3.ebuild rename to net-misc/rsync/rsync-3.2.0.ebuild index 0b2230194eb..007adedc277 100644 --- a/net-misc/rsync/rsync-3.2.0_pre3.ebuild +++ b/net-misc/rsync/rsync-3.2.0.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"; LICENSE="GPL-3" SLOT="0" [[ ${PV} = *_pre* ]] || \ -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE_CPU_FLAGS_X86=" sse2" IUSE="acl examples iconv ipv6 libressl lz4 ssl static stunnel system-zlib xattr xxhash zstd" IUSE+=" ${IUSE_CPU_FLAGS_X86// / cpu_flags_x86_}" @@ -49,7 +49,7 @@ python_check_deps() { src_prepare() { default - eapply -Z "${FILESDIR}/${PN}-3.2.0_pre3-simd_check.patch" + eapply -Z "${FILESDIR}/${PN}-3.2.0-simd_check.patch" } src_configure() {
