gentoo resync : 25.08.2018

5 files changed, 1 insertions, 109 deletions

diff --git a/net-im/err/Manifest b/net-im/err/Manifest
index 21f5abda208a..a1bb52ddcf8b 100644
--- a/net-im/err/Manifest
+++ b/net-im/err/Manifest
@@ -1,8 +1,5 @@
 AUX errd.confd 167 BLAKE2B b55dc0ba17dfc50d6958ee7a547f1db1dfcedec6d117507b5a7b50070c770f9dccdcf30b40b214492d92a4239c5ec253c630b35c218e315df57e92d700a758af SHA512 0e8f6b86cfe3e57dbae2ecf7a035d084ac753c338871fe51462d522465777f5c8886a9a2fa7d69030ed53797b6ece89a3e3453162d5a9af76a5e1a2ac23db30f
-AUX errd.initd 678 BLAKE2B 76486bbc011676007c36e5b23cd175e3ebb10fde822c9e92191b431ff83737fe07446cbddbc19dadddf6a40f324b889229fccfac15592ad0ed12d60c43d7b8d0 SHA512 c7a32d4d81f7f9bc6a598796b0b219e6c6b3187e0fcb9035824cf183b98e4ac95688c106e594f72ab09260d1c5bdc02e09e976e04674b58549d91e2a801752cb
 AUX errd.initd.2 512 BLAKE2B 48eed9e9e2bd5c1f23c63bbae10750c8e638c4f6ce286dc7e56799a45f986dbdcd359ee9f6c06e9bc33bd249c41ea08f0e6692f47b17229b9e7eb51e52d0f6e5 SHA512 caa47f7252c3ff04c47ed6c3174e4121dd600d1f4601f8a08275d1bc072e25f3b6125ba73d6c9c90af67dcc72da3ffbe875c83f756d75208af916a5d7ef672fb
-DIST err-1.7.1.tar.gz 100716 BLAKE2B 6d47ec4e632210ed313342075f87e1857460b57dc9b32d4487b2980c9c99e2a852d27ae7a5c87ee6d8bc4bcd15577ca11934111f27c81979f8aca9d14223212d SHA512 5be7f6ede6694877e73226de4da58bc47e1230032bc9be8dd3e8fd1448afd1e3ae4c02ecbdb30343b98466bb0d3a8fbfbcb6609c5c50768a9be70b9d22f675a4
 DIST errbot-5.2.0.tar.gz 189305 BLAKE2B 96e275ee2a70fcab217f4a91c855192d8536cc177e0cafe08c8f55e17a09c06913c07e50473f87ea29e4537cd6389907615eba86d44756962ed59a87498be398 SHA512 d879e9da6647d697ead0a5f72fe83cf33614201863a9a62bc62c90d7ac0478e1e0902438c6f053d2ea56c940d68b136bbfa497175fb11647913bd7f139220aec
-EBUILD err-1.7.1-r2.ebuild 1949 BLAKE2B ef9089cfa7d5f25b2f6d40d856f41f6cdb204986094750f499f6e0adfd9d3938ef71f415f5672a718d1b339c1082e8ccbf9e5e742312ffbfa74531a8f8360447 SHA512 e4ac8a7fde302d6b7192cfb17f65f1df3b9aa7ec2508c1b3b0ef1c5c97ae2baa58a25d45c91f10c900167e0ec6774773e4bb145845e057f38140cbacbe6eda46
 EBUILD err-5.2.0.ebuild 2260 BLAKE2B 0fb41b5b311d5e53766543f806128e0154ba69fcb0a60db57d9dc73aff5726532e576c87da1badb343d09e24acbae58ce407a7e779de3f3487daec51e3622edc SHA512 dbd4b95ce2536ef1e0df5ba6ee02f57bf58d06ffac44de51f71364d9659bd103c1f9099dbb8b037ba08559bfbcecf6b04fdae595b4785b61c09adde6464db7f2
-MISC metadata.xml 661 BLAKE2B a381883c6d8d05f2baee14c9babde38553e7a28c9e88a46ccba3e03015f7de847c8f76fbb45997462eba11b8f0d3d81fcbb98ac7fca4e84b193e4a6b1dbb0cf6 SHA512 7ad90d101045ca2175dd6af80209341b34ac46aae952150a0efe43ed34b1bd96032c3fd62660b185987f49e6b3a66d4411b1ffbb4b56ab6035c21cf8e290c00a
+MISC metadata.xml 565 BLAKE2B 0f8c06a4387ace540e55b6c2411b11729246cdbf13b5a0cd2a3d6db52390953e41d4e3c44755b231069cea099acb7c0c54db110d596a0bc00fd148e49bad5b19 SHA512 b7181c500317c3b91a747e707dff966f42744a85b97f7b51b8aad30814b5464e092405bc3868900968cca1670637150ea259281463fa769cb1c3e39783d87285
diff --git a/net-im/err/err-1.7.1-r2.ebuild b/net-im/err/err-1.7.1-r2.ebuild
deleted file mode 100644
index 6ed14b926aec..000000000000
--- a/net-im/err/err-1.7.1-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils user
-
-DESCRIPTION="Plugin based chatbot designed to be easily deployable, extensible and maintainable"
-HOMEPAGE="https://errbot.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="irc +plugins"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyfire[${PYTHON_USEDEP}]
-	dev-python/python-daemon[${PYTHON_USEDEP}]
-	dev-python/xmpppy[${PYTHON_USEDEP}]
-	dev-python/yapsy[${PYTHON_USEDEP}]
-	virtual/python-dnspython[${PYTHON_USEDEP}]
-	irc? (
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-	)
-	plugins? ( dev-vcs/git )"
-
-# Testsuite is broken since 1.6.3
-RESTRICT="test"
-
-# NOTES:
-# 1. It has bundled libs - for example exrex(see 'errbot/bundled' subfolder)
-# 2. Support for BOT_SENTRY option is missing, cause
-#    we do not have apropriate packages in portage yet
-# 3. Internal web server is broken(dunno why :-()
-
-pkg_setup() {
-	ebegin "Creating err group and user"
-	enewgroup 'err'
-	enewuser 'err' -1 -1 -1 'err'
-	eend ${?}
-}
-
-python_prepare_all() {
-	# Remove configparser and config from requirements as they are NOT needed
-	sed -i \
-		-e "/install_requires/s/'configparser', //" \
-		-e "/install_requires/s/, 'config'//" \
-		setup.py || die
-
-	# Tests are broken and should not be installed
-	rm -r tests || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newinitd "${FILESDIR}"/errd.initd errd
-	newconfd "${FILESDIR}"/errd.confd errd
-
-	dodir /etc/${PN}
-	keepdir /var/lib/${PN}
-	keepdir /var/log/${PN}
-	fowners -R err:err /var/lib/${PN}
-	fowners -R err:err /var/log/${PN}
-
-	insinto /etc/${PN}
-	newins errbot/config-template.py config.py
-}
diff --git a/net-im/err/files/errd.initd b/net-im/err/files/errd.initd
deleted file mode 100644
index 438d3dcc4501..000000000000
--- a/net-im/err/files/errd.initd
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start() {
-	# create piddir if necessary, bug #448498
-	local piddir=$(dirname ${ERR_PID_FILE})
-	checkpath -q -d -o err:err -m 0770 "${piddir}" || {
-                eend 1
-                return 1
-        }
-
-	ebegin "Starting errd"
-		start-stop-daemon --start --make-pidfile --pidfile ${ERR_PID_FILE} --background --quiet -u ${ERR_USER}:${ERR_GROUP} \
-			--exec /usr/bin/python2 -- /usr/bin/err.py -c ${ERR_CONFIG_PATH}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping errd"
-		start-stop-daemon --stop --pidfile ${ERR_PID_FILE}
-	eend $?
-}
diff --git a/net-im/err/files/errd.initd.2 b/net-im/err/files/errd.initd.2
index 460cd070f54d..460cd070f54d 100755..100644
--- a/net-im/err/files/errd.initd.2
+++ b/net-im/err/files/errd.initd.2
diff --git a/net-im/err/metadata.xml b/net-im/err/metadata.xml
index 93446d15f5a7..21914ed5cfe5 100644
--- a/net-im/err/metadata.xml
+++ b/net-im/err/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="irc">Pull optional dependencies, needed for IRC backend</flag>
-		<flag name="plugins">Enable support for installing plugins with <pkg>dev-vcs/git</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">gbin/err</remote-id>