app-admin/clsync: sync with tree

- backport fixes
- GLEP 67 update

Package-Manager: portage-2.2.28
Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>

5 files changed, 22 insertions, 185 deletions

diff --git a/app-admin/clsync/ChangeLog b/app-admin/clsync/ChangeLog
deleted file mode 100644
index 0f4fd77..0000000
--- a/app-admin/clsync/ChangeLog
+++ /dev/null
@@ -1,159 +0,0 @@
-# ChangeLog for app-admin/clsync
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  25 May 2015; Andrew Savchenko <bircoph@gentoo.org> -clsync-0.4.1.ebuild:
-  Version 0.4.1 is in the tree now
-
-  24 May 2015; Andrew Savchenko <bircoph@gentoo.org> clsync-0.4.1.ebuild,
-  -files/clsync-0.4.1-capabilities.patch,
-  -files/clsync-0.4.1-check-exec-arguments.patch,
-  -files/clsync-0.4.1-splitting.patch:
-  Apply bundled tarball of upstream fixes.
-
-  19 May 2015; Andrew Savchenko <bircoph@gentoo.org> clsync-9999.ebuild,
-  +files/clsync-0.4.1-capabilities.patch,
-  +files/clsync-0.4.1-check-exec-arguments.patch,
-  +files/clsync-0.4.1-splitting.patch:
-  Version bump (0.4.1 testing)
-
-  11 Feb 2015; Andrew Savchenko <bircoph@gentoo.org> -clsync-0.2.1.ebuild,
-  -clsync-0.3.ebuild, -clsync-0.4-r1.ebuild, clsync-9999.ebuild,
-  -files/clsync-0.4-direct_mode.patch, -files/clsync-0.4-gio.patch,
-  -files/clsync-0.4-handler_path.patch, -files/clsync-0.4-hl_locks.patch,
-  -files/clsync-0.4-unset_env.patch, -files/clsync-0.4-unshare-configure.patch,
-  -files/clsync-0.4-unshare-ifdef.patch, -files/clsync-0.4-unused-deps.patch,
-  -files/clsync-0.4-version.patch, -files/clsync.conf-2, -files/clsync.initd-2,
-  files/clsync.conf, files/clsync.initd, metadata.xml:
-  Releases are now in portage, keep live ebuild only.
-
-  10 Feb 2015; Andrew Savchenko <bircoph@gentoo.org> clsync-0.4-r1.ebuild,
-  +files/clsync-0.4-unused-deps.patch:
-  Port unused-depes patch from current HEAD.
-
-  10 Feb 2015; Andrew Savchenko <bircoph@gentoo.org> clsync-9999.ebuild:
-  Adapt new chaneges
-
-  28 Jan 2015; Andrew Savchenko <bircoph@gentoo.org> metadata.xml:
-  capabilities are fully implemented now
-
-  28 Jan 2015; Andrew Savchenko <bircoph@gentoo.org> clsync-0.4-r1.ebuild,
-  clsync-9999.ebuild:
-  Remove libcap dep: kernel interface is used now.
-
-  28 Jan 2015; Andrew Savchenko <bircoph@gentoo.org>
-  +files/clsync-0.4-unset_env.patch:
-  Add missed patch
-
-*clsync-0.4-r1 (28 Jan 2015)
-
-  28 Jan 2015; Andrew Savchenko <bircoph@gentoo.org> -clsync-0.4.ebuild,
-  +clsync-0.4-r1.ebuild, +files/clsync-0.4-direct_mode.patch,
-  +files/clsync-0.4-handler_path.patch, +files/clsync-0.4-hl_locks.patch:
-  Add upstream patches:
-  - fix highload locks segfault on unicore systems;
-  - support handlers without absolute path;
-  - fix direct mode root directory change passing;
-  - fix segfault on unset $HOME.
-
-  28 Jan 2015; Andrew Savchenko <bircoph@gentoo.org> clsync-0.4.ebuild,
-  clsync-9999.ebuild:
-  Fix build with USE=gio
-
-  28 Jan 2015; Andrew Savchenko <bircoph@gentoo.org> clsync-0.4.ebuild,
-  +files/clsync-0.4-gio.patch, +files/clsync-0.4-version.patch:
-  Fix GIO only build. Update version.
-
-  28 Jan 2015; Andrew Savchenko <bircoph@gentoo.org> clsync-0.4.ebuild,
-  clsync-9999.ebuild:
-  Require at least one FS handler to be enabled.
-
-  27 Jan 2015; Andrew Savchenko <bircoph@gentoo.org> metadata.xml:
-  Update gio USE flag description.
-
-  27 Jan 2015; Andrew Savchenko <bircoph@gentoo.org> clsync-0.4.ebuild,
-  clsync-9999.ebuild:
-  Remove empty variables
-
-*clsync-0.4 (27 Jan 2015)
-
-  27 Jan 2015; Andrew Savchenko <bircoph@gentoo.org> +clsync-0.4.ebuild,
-  clsync-9999.ebuild, +files/clsync-0.4-unshare-configure.patch,
-  +files/clsync-0.4-unshare-ifdef.patch, metadata.xml:
-  Version bump.
-
-*clsync-0.3 (15 May 2014)
-
-  15 May 2014; Andrew Savchenko <bircoph@gmail.com> clsync-0.2.1.ebuild,
-  +clsync-0.3.ebuild, clsync-9999.ebuild, files/clsync.conf-2,
-  files/clsync.initd-2, files/clsync.conf, files/clsync.confd,
-  files/clsync.initd, metadata.xml:
-  Version bump. Now package.use.mask is used for flags in
-  development.
-
-*clsync-0.2.1 (15 Oct 2013)
-
-  15 Oct 2013; Andrew Savchenko <bircoph@gmail.com> -clsync-0.1.ebuild,
-  -files/clsync-0.1.confd, -files/clsync-0.1.initd, +clsync-0.2.1.ebuild:
-  Version bump. Remove old.
-
-  27 Sep 2013; Andrew Savchenko <bircoph@gmail.com> files/clsync.initd:
-  Remove tread killer hack, because bug #44 was fixed.
-
-  21 Sep 2013; Andrew Savchenko <bircoph@gmail.com> files/clsync.initd:
-  Terminate clsync offsprings which are still alive after clsync
-  termination. clsync send signals to its childs, but not to further
-  offsprings (grandchildren and so on), so this offsprings may not
-  die properly in childs doesn't handle this. Thus sophisticated
-  measures are required for cleanup.
-
-  20 Sep 2013; Andrew Savchenko <bircoph@gmail.com> clsync-9999.ebuild,
-  files/clsync.confd, files/clsync.initd:
-  Depend mhash on clsync. Inform users about multiplexed init script.
-  Update options names. Add nice, ionice and retry support.
-
-  16 Sep 2013; Andrew Savchenko <bircoph@gmail.com> clsync-9999.ebuild,
-  +files/clsync-0.1.confd, +files/clsync-0.1.initd,  +files/clsync.conf,
-  files/clsync.confd, files/clsync.initd:
-  Add config file support. For v0.1 use old init.d/conf.d because
-  v0.1 doesn't support config files.
-
-  13 Sep 2013; Andrew Savchenko <bircoph@gmail.com> files/clsync.initd:
-  Remove non-standard retry approach, this bug is fixed now.
-  Add syslog support.
-
-  09 Sep 2013; Andrew Savchenko <bircoph@gmail.com> clsync-9999.ebuild:
-  Force 0700 permissions or /etc/clsync. License update. Conf.d
-  recommendations update.
-
-*clsync-0.1 (07 Sep 2013)
-
-  07 Sep 2013; Andrew Savchenko <bircoph@gmail.com> +clsync-0.1.ebuild,
-  clsync-9999.ebuild, +files/clsync.confd, +files/clsync.initd, metadata.xml:
- Version bump for 0.1 release. Add capabilities support. Install
- init script and conf file. Keep config directory: rules are
- supposed to be here. Add rsync hinting information.
-
-  26 Aug 2013; Andrew Savchenko <bircoph@gmail.com> clsync-9999.ebuild,
-  metadata.xml:
-  Add mhash and clustering support.
-
-  21 Aug 2013; Andrew Savchenko <bircoph@gmail.com> clsync-9999.ebuild:
-  Fix typo if docs path.
-
-  21 Aug 2013; Andrew Savchenko <bircoph@gmail.com> clsync-9999.ebuild,
-  metadata.xml:
-  Use new features of clsync build system. Utilize all flags.
-
-  21 Aug 2013; Andrew Savchenko <bircoph@gmail.com> -clsync-0.0.ebuild,
-  clsync-9999.ebuild:
-  Base autotools version. Installation and flags control bugs are
-  still to be fixed in clsync itself.
-
-  20 Aug 2013; Andrew Savchenko <bircoph@gmail.com> -clsync-0.0.ebuild,
-  clsync-9999.ebuild:
-  Fix html and examples installation. Remove buggy v0.0.
-
-  20 Aug 2013; Andrew Savchenko <bircoph@gmail.com> ChangeLog:
-  Initial ebuild.
-
diff --git a/app-admin/clsync/Manifest b/app-admin/clsync/Manifest
deleted file mode 100644
index 1b3d407..0000000
--- a/app-admin/clsync/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX clsync.conf 589 SHA256 1a8689b86cf9475ef72ef42a623a1bb1ae55abff31578dcfdf3537331c681815 SHA512 46d8d786378eed0bfa46195e45f764015258ba55b35a5acf2685967e9fbd1fc7656c6aeba26b06889fa2f7c62cb11ecb84b10b856356ea3c0d463eaa4980c33d WHIRLPOOL cd9a0800b75eab476d7feec079f23538295dca5067f979ce4280c3188b9a24adf7c78e0c2ec5e2e8cadd71d11be181d873bc462d9fe321ada85e4e11690272db
-AUX clsync.confd 645 SHA256 ae7e9cacf618f9a32a4a1580580a901831aaaa0abb9de9e0379fbcc6a7359b0d SHA512 75dcc49d51f6da94d42eb501f1ad2868f163405dd7aa933f4c8078ec18f5b54eb6c66ff796ee744f7751699162627af843edbe5de5adf99c23712cedaebaddc5 WHIRLPOOL 06289c7645430d10b242983daa9cd2d4c2f327b34ede308012354947c64c654a7864586743ae6de7c02770a8b1c22de04b63404a6431b317b328ac6ac1e121ce
-AUX clsync.initd 573 SHA256 1f3306dfeb4c8d8260551ed0edebe842452de2a2b7e85d07aa0fe46b88f10414 SHA512 c944388d5e61cfba73d462d457dbdcfef42c4bfc6f9ba814eea592dd630d64309e8e2b4af1cb621a41151613f28ab4508cc7d26d44def0b5a01938742cfbdd2e WHIRLPOOL c824fd5ed8e45afcd5df737dfea7645fc3460e42c5ab0512c4c462fc646f789e81597fb460126412f2347e0cb9468339b1874a697b65a40a3ff278625241f460
-EBUILD clsync-9999.ebuild 2900 SHA256 c242932a47ef051f86fccf4e7b553f5ba0eee03ac35fc533b4fe8d6c6a8d159a SHA512 40a9a1668eb6b2b7b764c737914487e308fea312b2fb28a0162f69998fa5f8605c5538ef9511fcd16b9a1ccba81b25d6de4cb2f27ccb94c38824a8a21836e80b WHIRLPOOL 6ce58efa5aed48578b576485dbc651186dc9400965924ca3f096ba91d5f85f8c3bd4757e4e1b395f70a13c5da1358b58fdf97421643e8867089d4570f8e85849
-MISC ChangeLog 6372 SHA256 c29f45e0970b8f494b3984e447564fba06b721413fa263689b98f1c1d595f60f SHA512 b8fd4c46c76d92621e332fd402981ab87e3fe2ad77a6ca0d6c92f15f2ff43466bccb1afc153d2aa5aee37006d19a50aaadae03f1903efb554194b552a945154e WHIRLPOOL 9ad79840a4b411491e7cb3aacb8e63e1a4bc61c904f44fce3fb7969ba968c74e8702994fa1c9487f8c3e404fec15b0d264bfabb39c172bf4ebf7926c44e5dd4d
-MISC metadata.xml 1692 SHA256 ca7310d5bf9634ab1a9306bd90f9b756b1c5dcd01a3d12bc7983c42af5567499 SHA512 0a83cc81b23213b9dd6c69310de8aea050140f8b398b18eac1157bdfb1394512c0b291b35c324686ebf7716ee0816e0ad92cd7176d2cb1a8cf363950ad93ece6 WHIRLPOOL 395bf8817d1341b2d21cf98fe2205952bd6009bed4847be478787109b8da60db24b675f36fb294bce5300005087a22b62cf7c3c0912a646ea67ffee92457eeb2
diff --git a/app-admin/clsync/clsync-9999.ebuild b/app-admin/clsync/clsync-9999.ebuild
index 4816a25..617fed4 100644
--- a/app-admin/clsync/clsync-9999.ebuild
+++ b/app-admin/clsync/clsync-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5
 
@@ -29,7 +29,7 @@ REQUIRED_USE="
 	mhash? ( cluster )
 	seccomp? ( caps )
 "
-RDEPEND="
+CDEPEND="
 	dev-libs/glib:2
 	cgroups? ( dev-libs/libcgroup )
 	mhash? ( app-crypt/mhash )
diff --git a/app-admin/clsync/files/clsync.initd b/app-admin/clsync/files/clsync.initd
index e37e9db..d350f3d 100644
--- a/app-admin/clsync/files/clsync.initd
+++ b/app-admin/clsync/files/clsync.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 [[ -n "${CLSYNC_CONF}" ]] && conffile="--config-file ${CLSYNC_CONF}"
 [[ -n "${CLSYNC_NICE}" ]] && cmd_nice="--nice ${CLSYNC_NICE}"
diff --git a/app-admin/clsync/metadata.xml b/app-admin/clsync/metadata.xml
index a88923a..9cbe60e 100644
--- a/app-admin/clsync/metadata.xml
+++ b/app-admin/clsync/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>bircoph@gentoo.org</email>
-  <name>Andrew Savchenko</name>
-</maintainer>
-<longdescription>
+  <maintainer type="person">
+    <email>bircoph@gentoo.org</email>
+    <name>Andrew Savchenko</name>
+  </maintainer>
+  <longdescription>
   Clsync recursively watches for source directory and executes external
   program to sync the changes. Clsync is adapted to be used together with rsync.
   This utility is much more lightweight than competitors and supports such
@@ -14,15 +14,17 @@
   syncing. Clsync can use advanced features for isolation: capabilities, cgroups,
   namespaces, seccomp, code hardening.
 </longdescription>
-<use>
-	<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>
-	<flag name="extra-debug">Enable extra debugging. This will hurt performance badly. Be ready for tons of output.</flag>
-	<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="namespaces">Enable namespaces isolation.</flag>
-	<flag name="seccomp">Enable seccomp for system call filtering.</flag>
-</use>
+  <use>
+    <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>
+    <flag name="extra-debug">Enable extra debugging. This will hurt performance badly. Be ready for tons of output.</flag>
+    <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="namespaces">Enable namespaces isolation.</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">xaionaro/clsync</remote-id>
+  </upstream>
 </pkgmetadata>