gentoo resync : 13.06.2020

5 files changed, 151 insertions, 107 deletions

diff --git a/app-admin/clsync/Manifest b/app-admin/clsync/Manifest
index ab8c93f1c77c..de316e4e36ae 100644
--- a/app-admin/clsync/Manifest
+++ b/app-admin/clsync/Manifest
@@ -1,8 +1,7 @@
 AUX clsync.conf 589 BLAKE2B fb7736b0972c91916770c6cfca693267bdf0cb3f6ad540388967c80fe609579fe458c40d71622fde0c2a3709530419536d1c358035637b2309ecde71892ee448 SHA512 46d8d786378eed0bfa46195e45f764015258ba55b35a5acf2685967e9fbd1fc7656c6aeba26b06889fa2f7c62cb11ecb84b10b856356ea3c0d463eaa4980c33d
 AUX clsync.confd 645 BLAKE2B f2e2f70f5a88ea3a416f4151637d63f79cce483b499ee0c1b5005ef8e9d16558f0d1c23ddd182335f7e963172bafaf4b41a37c1288f7fe55e7a57e2868418ae1 SHA512 75dcc49d51f6da94d42eb501f1ad2868f163405dd7aa933f4c8078ec18f5b54eb6c66ff796ee744f7751699162627af843edbe5de5adf99c23712cedaebaddc5
 AUX clsync.initd 555 BLAKE2B 18b3f0e1e8e079eb306709d2b55b99100ce3efa852f285d7ac9acd4269fe41e0fe5d1b7c12fa966dc01f60a598d6178cf5c8b6a2cd21410bdcf0f66c1facf1d2 SHA512 a5ee987466dec0e8ca7ce2502bd71d000419e03f33e1585e47fa5d91fdb5321f949f3d3ca566e68a0aedcc50ab6a84a92210aa866520d1703805958a2bfa270a
-DIST clsync-0.4.2.tar.gz 256042 BLAKE2B 28474fc66341b93705a502fcff390e3affcd89a9e1eb272dce9b28be709562e09c03e9c300cfeb5371e2e618a2239468a58c46212a39d751fbbfddeaab12bcf6 SHA512 d14a2efc4bf58d9d5c7a3fe5634cacdd182cd7cd814b0e9ebd99024a7282b056d1f7ceeec6903666391c3572d599a18e205af818b098ed7768d5c0e0f4cd1200
 DIST clsync-0.4.4.tar.gz 268276 BLAKE2B 0027760cfdee5c4410c4cea45aae2def6498d812d2f50038993c39a33c6029722ec2dd2cfff20815a3ffd8834eb8c439059e5f1d2cc3d2cf98ecb22ed22f2322 SHA512 cdafbf43fdeafe9cb53c08e0514ef356fb5b4bbd8da2226263180e7441d222c76e6c73f847f484b3688a8672e4a85df0346c0236d8d0ed4506d209189af02dcd
-EBUILD clsync-0.4.2.ebuild 2728 BLAKE2B 164359485c64116501a2b5c43252003846c103ee8489664c6a88bbdd55e99f8fe2df3fd913906cbc1e7d54fdedca4f0e6fe28b55ba9e5b69629707f955d96f21 SHA512 1ff01617f74e030d1ad48c5177550272e56d633ad22493e774a7937f8172ffab51316e8872f74da4266dd02eea93758d00319fdd408d902519717e9fce4260f4
-EBUILD clsync-0.4.4.ebuild 2787 BLAKE2B f81207ffd1e0b6b77bffc024ca078a0d1ed09e86432af9784118933e927345e1b42b7f640643ea95bcd7e2af20eeb26d1bd31cd2863fb04332c72b2c67fa3eaf SHA512 254689abc5d84a395db6a7058e4f2ca2c33caed9a6e9e44310c8490f6992794ae44e1509a9a7c0799b8cce0a8605278ba457bd27974986e1cd7372fb91580402
-MISC metadata.xml 1755 BLAKE2B 78e3d8a08fe1bea85b4b9944ab339d36ea1a751d88b788b959fafdb151bfdc616fa892df6df526d42ea2c52478d7b5bbdd8606b87f063740686095a74f209004 SHA512 9db85a84fb53806ba1062790bbb16ac37b9942e33bb294ce844cb7d72b8afcd0ded045134c7cb541f5f1c2678b0fa75292aaa91244c05c44db05151e7d5c51ee
+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
diff --git a/app-admin/clsync/clsync-0.4.2.ebuild b/app-admin/clsync/clsync-0.4.2.ebuild
deleted file mode 100644
index d40e8568b97d..000000000000
--- a/app-admin/clsync/clsync-0.4.2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils linux-info
-
-DESCRIPTION="Live sync tool based on inotify, written in GNU C"
-HOMEPAGE="https://github.com/xaionaro/clsync http://ut.mephi.ru/oss/clsync"
-SRC_URI="https://github.com/xaionaro/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+caps cluster control-socket cgroups debug extra-debug
-extra-hardened gio hardened +highload-locks +inotify mhash
-namespaces seccomp"
-
-REQUIRED_USE="
-	|| ( gio inotify )
-	extra-debug? ( debug )
-	extra-hardened? ( hardened )
-	mhash? ( cluster )
-	seccomp? ( caps )
-"
-CDEPEND="
-	dev-libs/glib:2
-	cgroups? ( dev-libs/libcgroup )
-	mhash? ( app-crypt/mhash )
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-	~app-doc/clsync-docs-${PV}
-"
-
-pkg_pretend() {
-	use namespaces && CONFIG_CHECK="~NAMESPACES ~UTS_NS ~IPC_NS ~USER_NS ~PID_NS ~NET_NS"
-	use seccomp && CONFIG_CHECK+=" ~SECCOMP"
-	check_extra_config
-}
-
-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 \
-		--disable-socket-library \
-		--enable-clsync \
-		--enable-debug=${debug_level} \
-		--enable-paranoid=${harden_level} \
-		--without-bsm \
-		--without-kqueue \
-		$(use_enable caps capabilities) \
-		$(use_enable cluster) \
-		$(use_enable control-socket socket) \
-		$(use_enable highload-locks) \
-		$(use_enable namespaces unshare) \
-		$(use_enable seccomp) \
-		$(use_with cgroups libcgroup) \
-		$(use_with gio gio lib) \
-		$(use_with inotify inotify native) \
-		$(use_with mhash)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# docs go into clsync-docs
-	rm -rf "${ED}/usr/share/doc" || die
-
-	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}
-}
-
-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 hardened namespaces seccomp\""
-}
diff --git a/app-admin/clsync/clsync-0.4.4.ebuild b/app-admin/clsync/clsync-0.4.4.ebuild
index ee8baf2da676..0bb2ccba5d57 100644
--- a/app-admin/clsync/clsync-0.4.4.ebuild
+++ b/app-admin/clsync/clsync-0.4.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/clsync/clsync http://ut.mephi.ru/oss/clsync"
 SRC_URI="https://github.com/clsync/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+caps cluster control-socket cgroups debug extra-debug
 extra-hardened gio hardened +highload-locks +inotify mhash
 namespaces seccomp"
@@ -36,6 +36,7 @@ RDEPEND="${DEPEND}
 "
 
 pkg_pretend() {
+	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
diff --git a/app-admin/clsync/clsync-9999.ebuild b/app-admin/clsync/clsync-9999.ebuild
new file mode 100644
index 000000000000..05e00ff84f2b
--- /dev/null
+++ b/app-admin/clsync/clsync-9999.ebuild
@@ -0,0 +1,143 @@
+# 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/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_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 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 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/metadata.xml b/app-admin/clsync/metadata.xml
index 824f11d2a130..fd64593a2778 100644
--- a/app-admin/clsync/metadata.xml
+++ b/app-admin/clsync/metadata.xml
@@ -15,6 +15,8 @@
   namespaces, seccomp, code hardening.
 </longdescription>
   <use>
+    <flag name="apidoc">Provide doxygen generated API docs.</flag>
+    <flag name="clsync">Build clsync binary. Most likely you want it. However it is possible to build only libclsync without clsync itself. </flag>
     <flag name="cluster">Enable clustering support (allows master-master clsync on multiple hosts). Not fully implemented yet.</flag>
     <flag name="control-socket">Enable AF_UNIX control socket support.</flag>
     <flag name="cgroups">Use cgroups to limit /dev access.</flag>
@@ -23,6 +25,7 @@
     <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="namespaces">Enable namespaces isolation.</flag>
+    <flag name="socket-library">Build the control and monitoring socket library: libclsync.</flag>
   </use>
   <upstream>
     <remote-id type="github">clsync/clsync</remote-id>