gentoo resync : 25.11.2020

4 files changed, 152 insertions, 4 deletions

diff --git a/app-admin/clsync/Manifest b/app-admin/clsync/Manifest
index de316e4e36ae..295e78838889 100644
--- a/app-admin/clsync/Manifest
+++ b/app-admin/clsync/Manifest
@@ -2,6 +2,8 @@ AUX clsync.conf 589 BLAKE2B fb7736b0972c91916770c6cfca693267bdf0cb3f6ad540388967
 AUX clsync.confd 645 BLAKE2B f2e2f70f5a88ea3a416f4151637d63f79cce483b499ee0c1b5005ef8e9d16558f0d1c23ddd182335f7e963172bafaf4b41a37c1288f7fe55e7a57e2868418ae1 SHA512 75dcc49d51f6da94d42eb501f1ad2868f163405dd7aa933f4c8078ec18f5b54eb6c66ff796ee744f7751699162627af843edbe5de5adf99c23712cedaebaddc5
 AUX clsync.initd 555 BLAKE2B 18b3f0e1e8e079eb306709d2b55b99100ce3efa852f285d7ac9acd4269fe41e0fe5d1b7c12fa966dc01f60a598d6178cf5c8b6a2cd21410bdcf0f66c1facf1d2 SHA512 a5ee987466dec0e8ca7ce2502bd71d000419e03f33e1585e47fa5d91fdb5321f949f3d3ca566e68a0aedcc50ab6a84a92210aa866520d1703805958a2bfa270a
 DIST clsync-0.4.4.tar.gz 268276 BLAKE2B 0027760cfdee5c4410c4cea45aae2def6498d812d2f50038993c39a33c6029722ec2dd2cfff20815a3ffd8834eb8c439059e5f1d2cc3d2cf98ecb22ed22f2322 SHA512 cdafbf43fdeafe9cb53c08e0514ef356fb5b4bbd8da2226263180e7441d222c76e6c73f847f484b3688a8672e4a85df0346c0236d8d0ed4506d209189af02dcd
+DIST clsync-0.4.5.tar.gz 276096 BLAKE2B 4fa534b342a806ca691f8a65455cb800800f7a943fa3f0913a26c37d2cd0f9d762630ad01eeb80bdd0d90a0731bed5f2aa60444a654972da9479c116e0e937aa SHA512 6568f3c49ac4fe11e54593ba23eed392d0b7d9b5bf052983c4a5a2befbb807dbd3f9d13412264f8909998702f869d1cd6db77d89bd9491414b1f3213437c5212
 EBUILD clsync-0.4.4.ebuild 2832 BLAKE2B b741cb0c391ae3bf8599d7013cd1a9f0a3680e61474312701775c2a3ef9c998cf547c83311d2d47ea377279aefdec794def5fcdb0d29aac04442da772871fe97 SHA512 239f53bda723da6e72852ef46fba96a30d6c1bf71623df6248ec113ce202b981bd9980deadcc2833c9a3796d16dce2d3f02947d1f07b16d6386d453f2e5b6f34
-EBUILD clsync-9999.ebuild 3766 BLAKE2B 23e453aa44654178f9620e76491ac570c4318173ae365903e17ffef52d67c4c1ff478c84c5e00ee77874a93af126e8d3f77f8133fe7e21070508bb05db557e5d SHA512 1ef43cea9877707a8531641ec03e86b491f2313950be8254d19699510bfd21e6b9446b5e2c3282ac2e7ef132f338ede69aba809e242a7401698571a470034e85
-MISC metadata.xml 2069 BLAKE2B d3525ec1686a46a433d0bbf6f18143a8092ea34c33ca2ad58acce1aa378fac27177c709b235ba7a831cf397a0a36e6b3745412d065172925f15ba794e5f2b43f SHA512 ff5d6b0cd92aa78e9eab0d87e05b12b9102c53e367e8965122be5c10a6bcefccc4a6568fea6d16a01fe15bc438d2616445a6ea37655df7f1811d945398b4afc4
+EBUILD clsync-0.4.5.ebuild 3787 BLAKE2B bdbe927f14f77f9ce3a456543226dd60ec5ee77fe995b215453f45efeec59a51a69632466c3fe2150884d1a1a13d4bd31ed3f28c77ae92a4c3c70d5297a29322 SHA512 4c8be692a96362156fbb863cb27ca8ea932bfd8a9a46db27c186b8cf5f178d11171718559d0e8719f1f300a87db11a62602db54652fbb4c6995d047e5d985ee3
+EBUILD clsync-9999.ebuild 3787 BLAKE2B bdbe927f14f77f9ce3a456543226dd60ec5ee77fe995b215453f45efeec59a51a69632466c3fe2150884d1a1a13d4bd31ed3f28c77ae92a4c3c70d5297a29322 SHA512 4c8be692a96362156fbb863cb27ca8ea932bfd8a9a46db27c186b8cf5f178d11171718559d0e8719f1f300a87db11a62602db54652fbb4c6995d047e5d985ee3
+MISC metadata.xml 2138 BLAKE2B 95be20be2bd87c771de6f49269bfa7e54b2a10f6c0166648130198647fcc37b86dab3501c1df8f5ef211dd0ef04f60244fec80907c95e78efd9f7c6b148023bb SHA512 0a70059c2f24248056a5aade206eafb457b39f37ab559d61284941cfcd6b01ff40328049e2edacd9a8f1a8dbbb313aed4add7092629c6bdfca0c1151ab8d69ca
diff --git a/app-admin/clsync/clsync-0.4.5.ebuild b/app-admin/clsync/clsync-0.4.5.ebuild
new file mode 100644
index 000000000000..c17448327bb2
--- /dev/null
+++ b/app-admin/clsync/clsync-0.4.5.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/clsync/clsync.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/clsync/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit autotools linux-info systemd
+
+DESCRIPTION="Live sync tool based on inotify, written in GNU C"
+HOMEPAGE="https://github.com/clsync/clsync http://ut.mephi.ru/oss/clsync"
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="apidoc +caps +clsync cluster control-socket cgroups doc debug
+examples extra-debug extra-hardened gio +hardened +highload-locks
++inotify +lto mhash namespaces seccomp socket-library static-libs"
+
+REQUIRED_USE="
+	|| ( clsync socket-library )
+	|| ( gio inotify )
+	mhash? ( cluster )
+	seccomp? ( caps )
+"
+BDEPEND="
+	virtual/pkgconfig
+	apidoc? ( app-doc/doxygen[dot] )
+"
+DEPEND="
+	caps? ( sys-libs/libcap )
+	cgroups? ( dev-libs/libcgroup )
+	clsync? ( dev-libs/glib:2 )
+	mhash? ( app-crypt/mhash )
+"
+RDEPEND="${DEPEND}
+	!app-doc/clsync-docs
+	!dev-libs/libclsync
+"
+
+pkg_pretend() {
+	if use clsync; then
+		use inotify && CONFIG_CHECK+=" ~INOTIFY_USER"
+		use namespaces && CONFIG_CHECK="~NAMESPACES ~UTS_NS ~IPC_NS ~USER_NS ~PID_NS ~NET_NS"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP"
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	local harden_level=0
+	use hardened && harden_level=1
+	use extra-hardened && harden_level=2
+
+	local debug_level=0
+	use debug && debug_level=1
+	use extra-debug && debug_level=2
+
+	econf \
+		--enable-debug=${debug_level} \
+		--enable-paranoid=${harden_level} \
+		--without-bsm \
+		--without-kqueue \
+		$(use_enable caps capabilities) \
+		$(use_enable clsync) \
+		$(use_enable cluster) \
+		$(use_enable control-socket socket) \
+		$(use_enable highload-locks) \
+		$(use_enable lto) \
+		$(use_enable namespaces unshare) \
+		$(use_enable seccomp) \
+		$(use_enable socket-library) \
+		$(use_with cgroups libcgroup) \
+		$(use_with gio gio lib) \
+		$(use_with inotify inotify native) \
+		$(use_with mhash)
+}
+
+src_compile() {
+	default
+	if use apidoc; then
+		doxygen .doxygen || die "doxygen failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if use socket-library; then
+		find "${ED}" -name "*.la" -delete
+		use static-libs || find "${ED}" -name "*.a" -delete || die "failed to remove static libs"
+	fi
+
+	if use clsync; then
+		newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+		newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+
+		# filter rules and sync scripts are supposed to be here
+		insinto /etc/${PN}
+		newins "${FILESDIR}/${PN}.conf" "${PN}.conf"
+		keepdir /etc/${PN}
+
+		systemd_dounit "examples/clsync@.service"
+	fi
+
+	if use doc; then
+		dodoc -r DEVELOPING NOTES PROTOCOL SHORTHANDS TODO doc/devel/*
+	else
+		rm "${ED}/usr/share/doc/${PF}/"{DEVELOPING,LICENSE,PROTOCOL,TODO}* || die
+	fi
+	use apidoc && dodoc -r doc/doxygen/html
+	if ! use examples; then
+		rm -r "${ED}/usr/share/doc/${PF}/examples" || die
+	fi
+}
+
+pkg_postinst() {
+	einfo "${PN} is just a convenient way to run synchronization tools on live data,"
+	einfo "it doesn't copy data itself, so you need to install software to do actual"
+	einfo "data transfer. Usually net-misc/rsync is a good choise, but ${PN} is"
+	einfo "is flexible enough to use any user tool, see manual page for details."
+	einfo
+	einfo "${PN} init script can be multiplexed, to use symlink init script to"
+	einfo "othername and use conf.d/othername to configure it."
+	einfo
+	einfo "If you're interested in improved security, enable"
+	einfo "USE=\"caps cgroups extra-hardened namespaces seccomp\""
+
+	if use socket-library; then
+		einfo
+		einfo "clsync instances you are going to use _must_ be compiled"
+		einfo "with control-socket support"
+	fi
+}
diff --git a/app-admin/clsync/clsync-9999.ebuild b/app-admin/clsync/clsync-9999.ebuild
index 05e00ff84f2b..c17448327bb2 100644
--- a/app-admin/clsync/clsync-9999.ebuild
+++ b/app-admin/clsync/clsync-9999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	KEYWORDS=""
 else
-	SRC_URI="https://github.com/clsync/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+	SRC_URI="https://github.com/clsync/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -20,7 +20,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 IUSE="apidoc +caps +clsync cluster control-socket cgroups doc debug
 examples extra-debug extra-hardened gio +hardened +highload-locks
-+inotify mhash namespaces seccomp socket-library static-libs"
++inotify +lto mhash namespaces seccomp socket-library static-libs"
 
 REQUIRED_USE="
 	|| ( clsync socket-library )
@@ -76,6 +76,7 @@ src_configure() {
 		$(use_enable cluster) \
 		$(use_enable control-socket socket) \
 		$(use_enable highload-locks) \
+		$(use_enable lto) \
 		$(use_enable namespaces unshare) \
 		$(use_enable seccomp) \
 		$(use_enable socket-library) \
diff --git a/app-admin/clsync/metadata.xml b/app-admin/clsync/metadata.xml
index fd64593a2778..39a9cda50e2d 100644
--- a/app-admin/clsync/metadata.xml
+++ b/app-admin/clsync/metadata.xml
@@ -24,6 +24,7 @@
     <flag name="extra-hardened">Enable extra security checks. This will hurt performance.</flag>
     <flag name="gio">Enable GIO for FS monitoring (glib based alternative to inotify interface, not recommended; if both are compiled, may be selected at runtime).</flag>
     <flag name="highload-locks">Allows to use spinlocks for short delays instead of mutexes, but only on SMP systems.</flag>
+    <flag name="lto">Build with link time optimization (LTO).</flag>
     <flag name="namespaces">Enable namespaces isolation.</flag>
     <flag name="socket-library">Build the control and monitoring socket library: libclsync.</flag>
   </use>