gentoo resync : 21.07.2018

3 files changed, 3 insertions, 120 deletions

diff --git a/app-admin/clsync/Manifest b/app-admin/clsync/Manifest
index 4f5a18638f12..5d7ba8acebe0 100644
--- a/app-admin/clsync/Manifest
+++ b/app-admin/clsync/Manifest
@@ -1,9 +1,6 @@
 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.1-20150524-v2.patch.xz 13632 BLAKE2B 422ec7dc05c2f21aa96c397efa7ce1079b882d5ec4ce14beb8ce5e308e134142dcc557857ff8162b5fba84d8eaa078016794ed26433427d6a80e4e4f81fd90a8 SHA512 d39c3c4f116eff2365668374ef62f4dfd8e5926267cbbf36b430f97ad5306f92cf6be3164c0e1c3d959db55453f5ded00d98d48af62f9eacde39a9f9667cfbf9
-DIST clsync-0.4.1.tar.gz 253890 BLAKE2B c8aada690635f1cac355a1eaa51f4379688b0005869c5dcd6edccf5ae8e86abddf9ff99ccfcffeb165ccc80f407087a3f0863d1b78279894ff410daf25467740 SHA512 875280f706026d44806b92c22fa58d016136b2792f67a6b7e77f932465081da7a1ebaf22c25e538e4b58bfe04cd1cd5450ecab99c3df53ddd2a0fa966442d444
 DIST clsync-0.4.2.tar.gz 256042 BLAKE2B 28474fc66341b93705a502fcff390e3affcd89a9e1eb272dce9b28be709562e09c03e9c300cfeb5371e2e618a2239468a58c46212a39d751fbbfddeaab12bcf6 SHA512 d14a2efc4bf58d9d5c7a3fe5634cacdd182cd7cd814b0e9ebd99024a7282b056d1f7ceeec6903666391c3572d599a18e205af818b098ed7768d5c0e0f4cd1200
-EBUILD clsync-0.4.1.ebuild 3051 BLAKE2B c70ff1c28fe6e5ad077d00e004894e20f9a683da431191484bb9b6c6671637940a76255f2bb64382aeb08b67364f8b203159b5f51b6f622e965ce12722129656 SHA512 db6893a5290741d7d42225875c145cc9b783fb722f7484b5393752c43e64f65b53287c3e4a3156f46013a3045514df997e3f49501f82795715f71601e2a49ca2
-EBUILD clsync-0.4.2.ebuild 2793 BLAKE2B 4b72e721e319ec0187a6ca38b3d90cdbec4385a654ad97bbf26a55ebfa433650ac212cc33ca41481b434ce9dcb20245ce58ca2d47faf7a03cb9ffb1372c77a2e SHA512 380171a754b0d590a14c4977f811198168dbd7f47d735692d3df5766ebabbcf746126a54cb7b0181628ef787777db250f909230d662ab3badaa672c49236e191
+EBUILD clsync-0.4.2.ebuild 2791 BLAKE2B 120160db12c85a65bc7e3dc646a4bc12d74ae9f596d57f749881d987c7626bb3d21aa9e789a6e920fef2d897570f8064601c629d30b673eec231ca95cc2d885e SHA512 fd60dc4d3828c76a68d330cd79dd96233b4915809d1f6a2d9ab5113f82e6a6cb17c4c18bfea86b51bcf8a534adb914a00c8fd2371148a610c16465e35b36ac8a
 MISC metadata.xml 1757 BLAKE2B e907cb32524743bc5571eddc4d0c7a30b51b82f49f72405939110e3085a8561b55e5927950be83ae3a647418479183aeae8491092ba8e5432a7633365f769e2a SHA512 6f853983a4886bbacb2fe1e26b728ba5d86b05f348b6df2cf0779725ef11623f73274829605b88aacd4300b4cb28ff6fbeead916c8dd01f4a07c9780218f1bfa
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 c037951819d2..000000000000
--- a/app-admin/clsync/clsync-0.4.1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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
-		https://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 )
-"
-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() {
-	# 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-admin/clsync/clsync-0.4.2.ebuild b/app-admin/clsync/clsync-0.4.2.ebuild
index d0e9c3ece979..dc27fddf71f5 100644
--- a/app-admin/clsync/clsync-0.4.2.ebuild
+++ b/app-admin/clsync/clsync-0.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE="+caps cluster control-socket cgroups debug extra-debug
 extra-hardened gio hardened +highload-locks +inotify mhash
 namespaces seccomp"