gentoo resync : 13.11.2021

3 files changed, 54 insertions, 11 deletions

diff --git a/net-misc/csync/Manifest b/net-misc/csync/Manifest
index 2e75ec01daf8..bc147565a4e6 100644
--- a/net-misc/csync/Manifest
+++ b/net-misc/csync/Manifest
@@ -1,4 +1,5 @@
 AUX csync-0.50.0-gcc_5_and_8.patch 1346 BLAKE2B 55c78622122e429b5a72790c5db3b0e2e063f419ab85dac460541aac121bf8d957a2be443837023e745c71debfe908a8fd5f75d041b16f7c22610da9e049532b SHA512 fb739031b2eca4f69f1384262214b13d5ccfd0abc64d889bb1b69f3a04473a43129ed26990aebcfd51e5b98b70649d9fac36a7eb116d162631f074d60ea82a41
+AUX csync-0.50.0-libssh-version.patch 2107 BLAKE2B 1525fe1c9d9ac6d19c2b5dd6c7119795bddf2820e986b151b24f6dfc8afd61f39384da833be5936793bb312145a6db5eb81f4965e4f00fd221ea28e7a49b9404 SHA512 709456c8b162d994afb972b4712d30e6107eebdd356a99689335f1edffd1b07bd76de95186ffe5f9538899f9b6095da158973711e67ffffe4a601a7b2b422d5c
 DIST csync-0.50.0.tar.xz 2705992 BLAKE2B b59ee573eea9bd7c46302d3db782b46f978d62219e3a3e70e97a012d1ea32681a1aa3133505c3833c5d1e6d0fcb90cc985d21553086ed8de28c7ca9fc8aa0099 SHA512 babe44af3a4f0bf58e011f1c33c7a6df9bc7751e03714dd64d8269c7c51bcc7f2ab32c4d286e5a11465c9498c988d1812c426a4f415f1138a4fb9fa341e1e29a
-EBUILD csync-0.50.0-r1.ebuild 1157 BLAKE2B f33db5654367764c3ea7b38ea00f80551daaf36df59288fd1dfde135fe8dca52ecb836c3171bb85fca5d478b1f73f2a7f2ca7188632f251d81b304498cfabce0 SHA512 86a5f1eef0f446f6def4c2fcbbe38ff74d73ea15c5a4de65e88b33c919475a90b5dc26206de030dd3a108f64f01fc89ddace5514579915ca86f8ee4db5635939
+EBUILD csync-0.50.0-r2.ebuild 1170 BLAKE2B 6821df4617e8bc37106225e51ec1fe2faffcb62e609b8f77d42d5809e6071b3e25a713a069dba8996fac838494fbb1f08d6aefb821020b4736352d97a6c8a73f SHA512 3d3cf9573351a815c5bb548f04967b1ab8f9cfa98e3772cfabe5c348c97f2c0b7e03249ced17e67fd695a841d3a6dff9d797377adba0474beb40b4c8d4c891e0
 MISC metadata.xml 355 BLAKE2B 8340e48d7539b41e478209aebef5f25d42aa08936e109a848dacb7c3ca1ca208e4f23b113b0a6398065c90167bfc60cf6c53dad794d426d78c0cb3ecf2761453 SHA512 f9c45dd11f297f2851bf85aa2b694ba866936841e7b1f783e8920dfeb8cb5ef7587891bc490065788012bb506500f35371e38ca012afc79d5f9c01c5eeddec97
diff --git a/net-misc/csync/csync-0.50.0-r1.ebuild b/net-misc/csync/csync-0.50.0-r2.ebuild
index 4439f480f684..d749dab20f3e 100644
--- a/net-misc/csync/csync-0.50.0-r1.ebuild
+++ b/net-misc/csync/csync-0.50.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="lightweight file synchronizer utility"
 HOMEPAGE="https://www.csync.org/"
@@ -19,16 +19,17 @@ RDEPEND=">=dev-db/sqlite-3.4:3
 	net-libs/neon[ssl]
 	iconv? ( virtual/libiconv )
 	samba? ( >=net-fs/samba-3.5 )
-	sftp? ( >=net-libs/libssh-0.5 )
+	sftp? ( >=net-libs/libssh-0.5[sftp] )
 	!net-misc/ocsync"
 DEPEND="${RDEPEND}
 	app-text/asciidoc
 	doc? ( app-doc/doxygen )
 	test? ( dev-util/cmocka )"
 
-PATCHES=( "${FILESDIR}"/${P}-gcc_5_and_8.patch )
+PATCHES=( "${FILESDIR}"/${P}-gcc_5_and_8.patch
+	  "${FILESDIR}"/${P}-libssh-version.patch )
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# proper docdir
 	sed -e "s:/doc/${PN}:/doc/${PF}:" \
@@ -40,9 +41,9 @@ src_configure() {
 		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
 		-DWITH_ICONV="$(usex iconv)"
 		-DUNIT_TESTING="$(usex test)"
-		$(cmake-utils_use_find_package doc Doxygen)
-		$(cmake-utils_use_find_package samba SMBClient)
-		$(cmake-utils_use_find_package sftp LibSSH)
+		$(cmake_use_find_package doc Doxygen)
+		$(cmake_use_find_package samba SMBClient)
+		$(cmake_use_find_package sftp LibSSH)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/net-misc/csync/files/csync-0.50.0-libssh-version.patch b/net-misc/csync/files/csync-0.50.0-libssh-version.patch
new file mode 100644
index 000000000000..77ce1cdafa14
--- /dev/null
+++ b/net-misc/csync/files/csync-0.50.0-libssh-version.patch
@@ -0,0 +1,41 @@
+Index: csync-0.50.0/cmake/Modules/FindLibSSH.cmake
+===================================================================
+--- csync-0.50.0.orig/cmake/Modules/FindLibSSH.cmake
++++ csync-0.50.0/cmake/Modules/FindLibSSH.cmake
+@@ -20,7 +20,7 @@ else (LIBSSH_LIBRARIES AND LIBSSH_INCLUD
+ 
+   find_path(LIBSSH_INCLUDE_DIR
+     NAMES
+-      libssh/libssh.h
++      libssh/libssh_version.h
+     PATHS
+       /usr/include
+       /usr/local/include
+@@ -58,15 +58,15 @@ else (LIBSSH_LIBRARIES AND LIBSSH_INCLUD
+     )
+ 
+     if (LibSSH_FIND_VERSION)
+-      file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_MAJOR
++      file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h LIBSSH_VERSION_MAJOR
+         REGEX "#define[ ]+LIBSSH_VERSION_MAJOR[ ]+[0-9]+")
+       # Older versions of libssh like libssh-0.2 have LIBSSH_VERSION but not LIBSSH_VERSION_MAJOR
+       if (LIBSSH_VERSION_MAJOR)
+         string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_MAJOR ${LIBSSH_VERSION_MAJOR})
+-	file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_MINOR
++	file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h LIBSSH_VERSION_MINOR
+           REGEX "#define[ ]+LIBSSH_VERSION_MINOR[ ]+[0-9]+")
+ 	string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_MINOR ${LIBSSH_VERSION_MINOR})
+-	file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_PATCH
++	file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h LIBSSH_VERSION_PATCH
+           REGEX "#define[ ]+LIBSSH_VERSION_MICRO[ ]+[0-9]+")
+ 	string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_PATCH ${LIBSSH_VERSION_PATCH})
+ 
+@@ -75,7 +75,7 @@ else (LIBSSH_LIBRARIES AND LIBSSH_INCLUD
+ 	include(FindPackageVersionCheck)
+ 	find_package_version_check(LibSSH DEFAULT_MSG)
+       else (LIBSSH_VERSION_MAJOR)
+-        message(STATUS "LIBSSH_VERSION_MAJOR not found in ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h, assuming libssh is too old")
++        message(STATUS "LIBSSH_VERSION_MAJOR not found in ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h, assuming libssh is too old")
+         set(LIBSSH_FOUND FALSE)
+       endif (LIBSSH_VERSION_MAJOR)
+     endif (LibSSH_FIND_VERSION)
\ No newline at end of file