{clsync,clsync-docs,libclsync}-0.4.1 are in the tree now

9 files changed, 12 insertions, 205 deletions

diff --git a/app-admin/clsync/ChangeLog b/app-admin/clsync/ChangeLog
index 2064b92..0f4fd77 100644
--- a/app-admin/clsync/ChangeLog
+++ b/app-admin/clsync/ChangeLog
@@ -2,6 +2,9 @@
 # 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,
diff --git a/app-admin/clsync/Manifest b/app-admin/clsync/Manifest
index f5b5b76..1b3d407 100644
--- a/app-admin/clsync/Manifest
+++ b/app-admin/clsync/Manifest
@@ -1,9 +1,6 @@
 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
-DIST clsync-0.4.1-20150524-v2.patch.xz 13632 SHA256 90a1ef820c83629c528e8c6fe4da5183caf60f8079c4de01a6d26945734c92f7 SHA512 d39c3c4f116eff2365668374ef62f4dfd8e5926267cbbf36b430f97ad5306f92cf6be3164c0e1c3d959db55453f5ded00d98d48af62f9eacde39a9f9667cfbf9 WHIRLPOOL d22fc6a1f0a59514506377f26ab7d9c0f4faca0abab044f2ce2e61ffa973ff04b43da561a4dd5c69d99e21108baa71d77bb2ea524313661b3b2440ceddca56aa
-DIST clsync-0.4.1.tar.gz 253890 SHA256 3f14a72d7c3c1747ea908e373f25bd1918ce00450492fbb7094549db6bf21e27 SHA512 875280f706026d44806b92c22fa58d016136b2792f67a6b7e77f932465081da7a1ebaf22c25e538e4b58bfe04cd1cd5450ecab99c3df53ddd2a0fa966442d444 WHIRLPOOL 10ab11821766f7d16d03993069ac4da5fe362a1e5977ea6721e49ada7044d3659e59b507b03be4de09609b0a0ca9d7878407d7b6e1f40df5dbe1d041dac373cb
-EBUILD clsync-0.4.1.ebuild 3063 SHA256 162a9d53a43a113494c56216a391928c9953ac55719f9fa2f63b459f862bb81a SHA512 9db373511211ae9a2cda1c79081327248e556eb824d4d420030efd463443b1b16ac187b8c04a48108bf989857abd4a9f37789c95edacf88c241868de7645df7d WHIRLPOOL 7e6878488329109111acc1419f20aa19bc7527432b5e1388efb38ec21de08abfd7a8c63d938aab0fe8593a91aba66cde4a1b24c17ee7f26bc8169c3db3445c36
 EBUILD clsync-9999.ebuild 2900 SHA256 c242932a47ef051f86fccf4e7b553f5ba0eee03ac35fc533b4fe8d6c6a8d159a SHA512 40a9a1668eb6b2b7b764c737914487e308fea312b2fb28a0162f69998fa5f8605c5538ef9511fcd16b9a1ccba81b25d6de4cb2f27ccb94c38824a8a21836e80b WHIRLPOOL 6ce58efa5aed48578b576485dbc651186dc9400965924ca3f096ba91d5f85f8c3bd4757e4e1b395f70a13c5da1358b58fdf97421643e8867089d4570f8e85849
-MISC ChangeLog 6261 SHA256 f439ec51bef7c7132c299a29253ef8470f5fc4f9ea99f0e9e54a9ce697e4e3df SHA512 b270e0c79a27cfbabb365373e3287f560365565531d0b30ea8b55407730649668832c7551d2d3a3c04b7bceee6dae6b31f7d1bd8b12b2ba04f0e06edfc63b009 WHIRLPOOL 3e967953e0b57213cc9911a3bb0686ddff7e40683b298b9a985627e20f73b21bc8ca120f4431c3025cb3b45ff8aa43a49706db4439f2c5dc5a1293622808dc27
+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-0.4.1.ebuild b/app-admin/clsync/clsync-0.4.1.ebuild
deleted file mode 100644
index 1d3772e..0000000
--- a/app-admin/clsync/clsync-0.4.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/xaionaro/${PN}.git"
-else
-	PVER="20150524-v2"
-	SRC_URI="
-		https://github.com/xaionaro/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		http://dev.gentoo.org/~bircoph/patches/${P}-${PVER}.patch.xz
-	"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-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"
-LICENSE="GPL-3+"
-SLOT="0"
-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 )
-"
-RDEPEND="
-	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() {
-	# upstream fixes for 0.4.1
-	epatch "${WORKDIR}/${P}-${PVER}.patch"
-	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 \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--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
-	keepdir "${EPREFIX}/etc/${PN}"
-	insinto "/etc/${PN}"
-	newins "${FILESDIR}/${PN}.conf" "${PN}.conf"
-}
-
-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-doc/clsync-docs/ChangeLog b/app-doc/clsync-docs/ChangeLog
index d84ad80..97b5efa 100644
--- a/app-doc/clsync-docs/ChangeLog
+++ b/app-doc/clsync-docs/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 May 2015; Andrew Savchenko <bircoph@gentoo.org> -clsync-docs-0.4.1.ebuild:
+  Version 0.4.1 is in the tree now
+
 *clsync-docs-0.4.1 (18 May 2015)
 
   18 May 2015; Andrew Savchenko <bircoph@gentoo.org> +clsync-docs-0.4.1.ebuild,
diff --git a/app-doc/clsync-docs/Manifest b/app-doc/clsync-docs/Manifest
index ce52ca4..afc1b6f 100644
--- a/app-doc/clsync-docs/Manifest
+++ b/app-doc/clsync-docs/Manifest
@@ -1,5 +1,3 @@
-DIST clsync-0.4.1.tar.gz 253890 SHA256 3f14a72d7c3c1747ea908e373f25bd1918ce00450492fbb7094549db6bf21e27 SHA512 875280f706026d44806b92c22fa58d016136b2792f67a6b7e77f932465081da7a1ebaf22c25e538e4b58bfe04cd1cd5450ecab99c3df53ddd2a0fa966442d444 WHIRLPOOL 10ab11821766f7d16d03993069ac4da5fe362a1e5977ea6721e49ada7044d3659e59b507b03be4de09609b0a0ca9d7878407d7b6e1f40df5dbe1d041dac373cb
-EBUILD clsync-docs-0.4.1.ebuild 1046 SHA256 ce9b9fdc495a4352f8c4806fb78d7b3bc391d4efe396dc0cda2ebe5569191864 SHA512 06a3605a14a1a73232c12847c1c254d3606fc1ec142e3d2fe898460ddfc3ee97c5118f8c034c4a720f8188e07ce1b4432d6d114375dc17bd5f0f5848c7780572 WHIRLPOOL 26564507bf6954eb8643f593580981c336ddc03bac081cd9e1639481fa30b3c7c8a18b7409ea5cdcd076bfedfe50c61260c9c16927b6a40a8ba974dbc11adeb0
 EBUILD clsync-docs-9999.ebuild 1046 SHA256 ce9b9fdc495a4352f8c4806fb78d7b3bc391d4efe396dc0cda2ebe5569191864 SHA512 06a3605a14a1a73232c12847c1c254d3606fc1ec142e3d2fe898460ddfc3ee97c5118f8c034c4a720f8188e07ce1b4432d6d114375dc17bd5f0f5848c7780572 WHIRLPOOL 26564507bf6954eb8643f593580981c336ddc03bac081cd9e1639481fa30b3c7c8a18b7409ea5cdcd076bfedfe50c61260c9c16927b6a40a8ba974dbc11adeb0
-MISC ChangeLog 978 SHA256 7084c476cce619e1066cbca90cd9f320374665fe957d2dbc1499be19a1e7015d SHA512 9c15e49d390b6788bf3477ad9266822effa9ec758fbf6fd291e8fbebb335f49791d0c4f3e92e79c1a99ccdaf11ec7e8c74703dd023667ea41fa099f13c195f22 WHIRLPOOL 7ab4c806fd69b18fd492decbe187a823d1c7bc0fbdddb17e5b5afad88287699629e36b7b23939d0b558d99572be902fd01980ba2b81b04f5e8e4718fe9d11725
+MISC ChangeLog 1094 SHA256 e561f271f44d5e45991d2492ea465b363674a6fe9599a7d58f6e41d82a63c794 SHA512 8cdc7c9caf8b76c0d1deef4ea0cc889082c1f44b4bbfb2d9fe29f2359d9f7ad3fb246e489b60ead7ceddd230cc9ea175772fb89980e5b192a3c641032d9fc458 WHIRLPOOL 9e86ccbf70f4edbc8774fbe42a55d5ffee5c24352e468fabc1fdde9d5c5ab4bd38c009de716ca2927de534573c275db1e2b4bd008fe59bbc9d6a12624f12a7dd
 MISC metadata.xml 455 SHA256 0cb08fae8dfb45024854fe69cd8e5c94c9e098213ca05d2c389a83bde9dc426a SHA512 f0fc492d199e0baf0bf39cc30068a596fdeae8cc15e96e35bdb55f13a9a28b7c53b6363be6eb96ec1b22714df61aded246e450a6363b4e65a9c546f15b0c4b3b WHIRLPOOL 94bcd4f73ad6f5aaa49a82378b7e7459c593bc3cb1e8474a8de8bf8a6deeed5911eb9ebe351386e01b7395516606c2375e116f7faedc11c286801159ab122dba
diff --git a/app-doc/clsync-docs/clsync-docs-0.4.1.ebuild b/app-doc/clsync-docs/clsync-docs-0.4.1.ebuild
deleted file mode 120000
index fd9a2cd..0000000
--- a/app-doc/clsync-docs/clsync-docs-0.4.1.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-clsync-docs-9999.ebuild
\ No newline at end of file
diff --git a/dev-libs/libclsync/ChangeLog b/dev-libs/libclsync/ChangeLog
index aa93f9c..c29d458 100644
--- a/dev-libs/libclsync/ChangeLog
+++ b/dev-libs/libclsync/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 May 2015; Andrew Savchenko <bircoph@gentoo.org> -libclsync-0.4.1.ebuild:
+  Version 0.4.1 is in the tree now
+
   24 May 2015; Andrew Savchenko <bircoph@gentoo.org> libclsync-0.4.1.ebuild,
   libclsync-9999.ebuild, metadata.xml:
   Add extra debugging support.
diff --git a/dev-libs/libclsync/Manifest b/dev-libs/libclsync/Manifest
index 92bc25d..b9853d0 100644
--- a/dev-libs/libclsync/Manifest
+++ b/dev-libs/libclsync/Manifest
@@ -1,5 +1,3 @@
-DIST clsync-0.4.1.tar.gz 253890 SHA256 3f14a72d7c3c1747ea908e373f25bd1918ce00450492fbb7094549db6bf21e27 SHA512 875280f706026d44806b92c22fa58d016136b2792f67a6b7e77f932465081da7a1ebaf22c25e538e4b58bfe04cd1cd5450ecab99c3df53ddd2a0fa966442d444 WHIRLPOOL 10ab11821766f7d16d03993069ac4da5fe362a1e5977ea6721e49ada7044d3659e59b507b03be4de09609b0a0ca9d7878407d7b6e1f40df5dbe1d041dac373cb
-EBUILD libclsync-0.4.1.ebuild 1823 SHA256 a3a1936bffae4b2d70901dd018eed9fd3dd649b471dfb381179e810a30a20bc1 SHA512 c4c8fa5ac4e36ab326ed56606b96ab80124ab6723e64acb0166965925b53c10e8964a2d7ff791518b35c20b38f0a842d8130d88c7540c9e17cee053e22149ffe WHIRLPOOL cd67d0c1b4171158ee9facbbc0ed7df22f57dec3d98cb36a9c4cc5a2c2ac1bf99a399e70f84c9709737b2f75893723f26adc7561cba32fc413e363b260a133b5
 EBUILD libclsync-9999.ebuild 1824 SHA256 f85114f8818f2bf0fe56977e79fca9567bf419295b38853d507129387d9849a0 SHA512 9716932026adf5a5030d43dcab0c69ea5001fac7d36e150f934e21ddff4a5fe7fa6ee0c1718f2006e997294400a15f1227a5b65396ee58da873e474315fd45dc WHIRLPOOL 3c2fb5b0f81f94bd0f775edbcf385ec4b5b8d305de945826a32fe181f0127ea1e94e9b9caaaa821248a94a56fb91300a0beb6e327a515b0f9a0b0f65f9cb5dc8
-MISC ChangeLog 1530 SHA256 bec1250a127c9a4755f9e1074d6ce1be5371aaf9cc4c9a88b4b4c18ff9a0ccfa SHA512 11b76e5ec0027cc35d63c73d7709e45d4e153d3200ef01210098e19eded6cba55d1b2e4ae1d27eff36b47c385b0221f32a3c5fc8853fd81d9bcff4ef453779e5 WHIRLPOOL b1bc9d16a2377c2476451144286c3d617f73e91eed6a93f1f481e4d7197067ad0ef9042359ed604ee61b66b88880623601c4dfcc6c86e50cbac244497056308b
+MISC ChangeLog 1644 SHA256 b12711c556455a94940f64d50ca0ebaf83577b6ea4ab3bd8cec548d8c8dbff9d SHA512 ca3c342c672d8867b933c6e0ca5f6edfe1e456ebcb8c30fcd95fc91c966daacfb95ddd527ff078bee09c1db9b8b9818a7982c1ae3e9f22fdb43e7d7ea91113fa WHIRLPOOL b09ecb7d8dd1aec6949f175ee1ad6be92910912de58b38925163f845eab448b9974d934cd889b98a438acb0f57501cdab8f424d0343cb8f5f79fd8c5a8bf903f
 MISC metadata.xml 600 SHA256 3bd10a7ec53ceadfdff25cd15bb7d474e7e6d46ff5057d98e880d823fbc53bd7 SHA512 f182046e4508569ffd61a219d837d94766dd54d7753c122eb0b274ddc4db01326641665c65f044f75033ddf513d351629bb69379fcac6b2b7c86d770f52109bf WHIRLPOOL 2f20facefc6f4e64640fa3162b5223b190b8d095d74924c41343df8462ee47fdd1986a763198e6b2032bffbf44ce424f1b5ed405f8939d267ed901ab28c32aa7
diff --git a/dev-libs/libclsync/libclsync-0.4.1.ebuild b/dev-libs/libclsync/libclsync-0.4.1.ebuild
deleted file mode 100644
index 5a0970f..0000000
--- a/dev-libs/libclsync/libclsync-0.4.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-MY_PN=${PN#lib}
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/xaionaro/${MY_PN}.git"
-else
-	SRC_URI="https://github.com/xaionaro/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-inherit autotools eutils
-
-DESCRIPTION="Control and monitoring library for clsync"
-HOMEPAGE="http://ut.mephi.ru/oss/clsync https://github.com/xaionaro/clsync"
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="debug extra-debug extra-hardened hardened static-libs"
-REQUIRED_USE="
-	extra-debug? ( debug )
-	extra-hardened? ( hardened )
-"
-
-DEPEND="virtual/pkgconfig "
-RDEPEND="=app-doc/clsync-docs-0.4*"
-
-src_prepare() {
-	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 \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--enable-socket-library \
-		--disable-clsync \
-		--enable-debug=${debug_level} \
-		--enable-paranoid=${harden_level} \
-		--without-bsm \
-		--without-kqueue \
-		--disable-capabilities \
-		--disable-cluster \
-		--enable-socket \
-		--disable-highload-locks \
-		--disable-unshare \
-		--disable-seccomp \
-		--without-libcgroup \
-		--without-gio \
-		--with-inotify=native \
-		--without-mhash
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	prune_libtool_files
-	use static-libs || find "${ED}" -name "*.a" -delete || die "failed to remove static libs"
-
-	# docs go into clsync-docs
-	rm -rf "${ED}/usr/share/doc" || die
-}
-
-pkg_postinst() {
-	einfo "clsync instances you are going to use _must_ be compiled"
-	einfo "with control-socket support"
-}