[gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/files/, net-misc/rsync/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     e25457c673c2e20cf9e6f4061f6d87a3278a1444
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 18 07:31:17 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jun 18 07:31:37 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e25457c6

net-misc/rsync: Bump to version 3.2.0_pre3. Removed old

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 +-
 .../rsync/files/rsync-3.2.0_pre3-simd_check.patch  | 24 ++++++++++++++++++++++
 ...c-3.2.0_pre2.ebuild => rsync-3.2.0_pre3.ebuild} |  8 ++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 8bcd788e14c..7ef8c17e978 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.0pre2.tar.gz 1044334 BLAKE2B 5069a09d6a24c4c4adfc2202a0845f156270c23e2c236a8a9d490d0156ece4e81ccca6aa9eefd552cd1512e60fff38fd79d3b4ba4e06b11a22ca591daaaae7b0 SHA512 e88093a44d5ac8ff235429aea6a7f93cd8b5a1de42eeee1b7d6d0ce2c23234ac670a775028e2eca22cbf1144b9bac827c0393c22eaf11fa5ec47dc64129462e7
+DIST rsync-3.2.0pre3.tar.gz 1046601 BLAKE2B bfa9345dd387b8e729686c4a3a1d203336f18c14d0bf3b1aa28b6792ba0fc5f07513256f774bdf6ba4af72730a88e9e3bafb5060cdc8b2ae0fe0314e0e79cde1 SHA512 2b8dee4e4c759165ace5bf1bf3f79e88ad25d5dd2eeed89e0ae699ef0956758c6428488fa5e842b59267c315cf38fde9449d0aee1b5db9abd79d90cf4f108992

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
new file mode 100644
index 00000000000..1d50c95b00d
--- /dev/null
+++ b/net-misc/rsync/files/rsync-3.2.0_pre3-simd_check.patch
@@ -0,0 +1,24 @@
+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_pre2.ebuild b/net-misc/rsync/rsync-3.2.0_pre3.ebuild
similarity index 95%
rename from net-misc/rsync/rsync-3.2.0_pre2.ebuild
rename to net-misc/rsync/rsync-3.2.0_pre3.ebuild
index 485c7b0379a..0b2230194eb 100644
--- a/net-misc/rsync/rsync-3.2.0_pre2.ebuild
+++ b/net-misc/rsync/rsync-3.2.0_pre3.ebuild
@@ -16,7 +16,9 @@ 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"
+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_}"
 
 LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
 	lz4? ( app-arch/lz4[static-libs(+)] )
@@ -45,12 +47,18 @@ python_check_deps() {
 	has_version "dev-python/commonmark[${PYTHON_USEDEP}]"
 }
 
+src_prepare() {
+	default
+	eapply -Z "${FILESDIR}/${PN}-3.2.0_pre3-simd_check.patch"
+}
+
 src_configure() {
 	use static && append-ldflags -static
 	local myeconfargs=(
 		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
 		--without-included-popt
 		$(use_enable acl acl-support)
+		$(use_enable cpu_flags_x86_sse2 simd)
 		$(use_enable iconv)
 		$(use_enable ipv6)
 		$(use_enable lz4)