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

[Jakov Smolić]

commit:     3a66bca5c747815b8f8def08e5ea353242275e9e
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 16 08:09:07 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Tue Aug 16 08:09:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a66bca5

net-misc/csync: treeclean

Closes: https://bugs.gentoo.org/791103
Closes: https://bugs.gentoo.org/833416
Closes: https://bugs.gentoo.org/836715
Closes: https://bugs.gentoo.org/857948
Closes: https://bugs.gentoo.org/527660
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 net-misc/csync/Manifest                            |  1 -
 net-misc/csync/csync-0.50.0-r2.ebuild              | 49 ----------------------
 .../csync/files/csync-0.50.0-gcc_5_and_8.patch     | 36 ----------------
 .../csync/files/csync-0.50.0-libssh-version.patch  | 41 ------------------
 net-misc/csync/metadata.xml                        | 11 -----
 profiles/package.mask                              |  6 ---
 6 files changed, 144 deletions(-)

diff --git a/net-misc/csync/Manifest b/net-misc/csync/Manifest
deleted file mode 100644
index d9dc7b493031..000000000000
--- a/net-misc/csync/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST csync-0.50.0.tar.xz 2705992 BLAKE2B b59ee573eea9bd7c46302d3db782b46f978d62219e3a3e70e97a012d1ea32681a1aa3133505c3833c5d1e6d0fcb90cc985d21553086ed8de28c7ca9fc8aa0099 SHA512 babe44af3a4f0bf58e011f1c33c7a6df9bc7751e03714dd64d8269c7c51bcc7f2ab32c4d286e5a11465c9498c988d1812c426a4f415f1138a4fb9fa341e1e29a

diff --git a/net-misc/csync/csync-0.50.0-r2.ebuild b/net-misc/csync/csync-0.50.0-r2.ebuild
deleted file mode 100644
index d749dab20f3e..000000000000
--- a/net-misc/csync/csync-0.50.0-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="lightweight file synchronizer utility"
-HOMEPAGE="https://www.csync.org/"
-SRC_URI="https://open.cryptomilk.org/attachments/download/27/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc iconv samba +sftp test"
-RESTRICT="!test? ( test )"
-
-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-misc/ocsync"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cmocka )"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc_5_and_8.patch
-	  "${FILESDIR}"/${P}-libssh-version.patch )
-src_prepare() {
-	cmake_src_prepare
-
-	# proper docdir
-	sed -e "s:/doc/${PN}:/doc/${PF}:" \
-		-i doc/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DWITH_ICONV="$(usex iconv)"
-		-DUNIT_TESTING="$(usex test)"
-		$(cmake_use_find_package doc Doxygen)
-		$(cmake_use_find_package samba SMBClient)
-		$(cmake_use_find_package sftp LibSSH)
-	)
-	cmake_src_configure
-}

diff --git a/net-misc/csync/files/csync-0.50.0-gcc_5_and_8.patch b/net-misc/csync/files/csync-0.50.0-gcc_5_and_8.patch
deleted file mode 100644
index 44bcc3ed6819..000000000000
--- a/net-misc/csync/files/csync-0.50.0-gcc_5_and_8.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur csync-0.50.0.orig/modules/csync_smb.c csync-0.50.0/modules/csync_smb.c
---- csync-0.50.0.orig/modules/csync_smb.c	2013-07-29 14:04:37.000000000 +0200
-+++ csync-0.50.0/modules/csync_smb.c	2018-12-06 23:08:05.320992985 +0100
-@@ -49,7 +49,7 @@
-     char *pw, int pwlen)
- {
-   static int try_krb5 = 1;
--  char *h;
-+  const char *h;
- 
-   (void) smb_ctx;
-   (void) shr;
-diff -Naur csync-0.50.0.orig/src/csync_log.h csync-0.50.0/src/csync_log.h
---- csync-0.50.0.orig/src/csync_log.h	2013-07-29 14:04:37.000000000 +0200
-+++ csync-0.50.0/src/csync_log.h	2018-12-06 23:11:34.280239832 +0100
-@@ -55,7 +55,7 @@
- };
- 
- #define CSYNC_LOG(priority, ...) \
--  csync_log(priority, __FUNCTION__, __VA_ARGS__)
-+  csync_log(priority, __func__, __VA_ARGS__)
- 
- void csync_log(int verbosity,
-                const char *function,
-diff -Naur csync-0.50.0.orig/tests/csync_tests/check_csync_log.c csync-0.50.0/tests/csync_tests/check_csync_log.c
---- csync-0.50.0.orig/tests/csync_tests/check_csync_log.c	2013-04-22 13:00:35.000000000 +0200
-+++ csync-0.50.0/tests/csync_tests/check_csync_log.c	2018-12-06 23:11:34.280239832 +0100
-@@ -115,7 +115,7 @@
-     rc = csync_set_log_callback(check_log_callback);
-     assert_int_equal(rc, 0);
- 
--    csync_log(1, __FUNCTION__, "rc = %d", rc);
-+    csync_log(1, __func__, "rc = %d", rc);
- 
-     rc = _tstat(path, &sb);
- 

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
deleted file mode 100644
index 77ce1cdafa14..000000000000
--- a/net-misc/csync/files/csync-0.50.0-libssh-version.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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

diff --git a/net-misc/csync/metadata.xml b/net-misc/csync/metadata.xml
deleted file mode 100644
index 634008a187ee..000000000000
--- a/net-misc/csync/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>voyageur@g.o</email>
-		<name>Bernard Cafarelli</name>
-	</maintainer>
-	<use>
-		<flag name="sftp">Enable sftp transfer support via <pkg>net-libs/libssh</pkg></flag>
-	</use>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index 46f9088315d8..165e3cd8e1b2 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -507,12 +507,6 @@ dev-lang/ruby:2.6
 # open bugs: bug #680358, bug #844694. Removal on 2022-08-15.
 dev-util/docker-ls
 
-# Bernard Cafarelli <voyageur@g.o> (2022-07-14)
-# Dead upstream (last release in 2013, no tarballs or git download)
-# No reverse dependencies for a long time, several test and build failures
-# Bug #857948, removal on 2022-08-13.
-net-misc/csync
-
 # Marek Szuba <marecki@g.o> (2022-07-13)
 # Upstream has switched from CMake to hand-crafted Makefiles (yes, TO them),
 # which have seriously messed up dependency handling and trigger several