gentoo resync : 04.08.2018

4 files changed, 127 insertions, 17 deletions

diff --git a/net-im/err/Manifest b/net-im/err/Manifest
index c537865d6855..21f5abda208a 100644
--- a/net-im/err/Manifest
+++ b/net-im/err/Manifest
@@ -1,5 +1,8 @@
 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
-MISC metadata.xml 689 BLAKE2B 095d0e9a4e0da1798fa3fc707bccd9e38a238e8658da288005f665e05f3f7e386beedeec95dabaeed0f7d2980f11b26549785a615ddf63cd4c757ecd41759954 SHA512 dfc61dbf4405fee8f0494a7872d1fc86e9b34cf5e12e133b88a9041301cca69606b1e26ba8249c0341fb148890b70058f9bcb1a875c1cd742e9559e3bcc1df36
+EBUILD err-5.2.0.ebuild 2260 BLAKE2B 0fb41b5b311d5e53766543f806128e0154ba69fcb0a60db57d9dc73aff5726532e576c87da1badb343d09e24acbae58ce407a7e779de3f3487daec51e3622edc SHA512 dbd4b95ce2536ef1e0df5ba6ee02f57bf58d06ffac44de51f71364d9659bd103c1f9099dbb8b037ba08559bfbcecf6b04fdae595b4785b61c09adde6464db7f2
+MISC metadata.xml 661 BLAKE2B a381883c6d8d05f2baee14c9babde38553e7a28c9e88a46ccba3e03015f7de847c8f76fbb45997462eba11b8f0d3d81fcbb98ac7fca4e84b193e4a6b1dbb0cf6 SHA512 7ad90d101045ca2175dd6af80209341b34ac46aae952150a0efe43ed34b1bd96032c3fd62660b185987f49e6b3a66d4411b1ffbb4b56ab6035c21cf8e290c00a
diff --git a/net-im/err/err-5.2.0.ebuild b/net-im/err/err-5.2.0.ebuild
new file mode 100644
index 000000000000..56e859063a4d
--- /dev/null
+++ b/net-im/err/err-5.2.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_5,3_6} )
+
+MY_PN="errbot"
+MY_P="${MY_PN}-${PV}"
+
+inherit distutils-r1 user
+
+DESCRIPTION="Multiprotocol chatbot designed to be easily deployable and maintainable"
+HOMEPAGE="http://errbot.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="irc +xmpp"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/ansi[${PYTHON_USEDEP}]
+	dev-python/bottle[${PYTHON_USEDEP}]
+	dev-python/colorlog[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/daemonize[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/webtest[${PYTHON_USEDEP}]
+	dev-python/yapsy[${PYTHON_USEDEP}]
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	irc? (
+		dev-python/irc[${PYTHON_USEDEP}]
+	)
+	xmpp? (
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		dev-python/sleekxmpp[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+# NOTES:
+# 1. Support for BOT_SENTRY option is missing, cause
+#    we do not have apropriate packages in portage yet
+# 2. Currently only XMPP is supported(IRC still untested)
+# 3. Internal web server is temporarily removed (rocket-err from requires.txt)
+# 4. pygments-markdown-lexer dependency(needed only for debugging?) is temporarily removed (pygments-markdown-lexer from requires.txt)
+
+pkg_setup() {
+	ebegin "Creating err group and user"
+	enewgroup 'err'
+	enewuser 'err' -1 -1 -1 'err'
+	eend ${?}
+}
+
+python_prepare_all() {
+	sed -i \
+		-e '/rocket-errbot/d' \
+		-e 's/dnspython3/dnspython/' \
+		-e '/pygments-markdown-lexer/d' \
+		setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newinitd "${FILESDIR}"/errd.initd.2 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.2 b/net-im/err/files/errd.initd.2
new file mode 100755
index 000000000000..460cd070f54d
--- /dev/null
+++ b/net-im/err/files/errd.initd.2
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/errbot -u ${ERR_USER}:${ERR_GROUP}"
+command_args="-d -p ${ERR_PID_FILE} -c ${ERR_CONFIG_PATH}/config.py"
+pidfile="${ERR_PID_FILE}"
+
+depend() {
+	need net
+}
+
+start_pre() {
+	# 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
+        }
+}
diff --git a/net-im/err/metadata.xml b/net-im/err/metadata.xml
index e6e55f5a3b8c..93446d15f5a7 100644
--- a/net-im/err/metadata.xml
+++ b/net-im/err/metadata.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>pinkbyte@gentoo.org</email>
-    <name>Sergey Popov</name>
-  </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>
-    <maintainer status="active">
-      <email>gbin@gootz.net</email>
-      <name>Guillaume BINET</name>
-    </maintainer>
-    <remote-id type="pypi">err</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</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>
+		<maintainer status="active">
+			<email>gbin@gootz.net</email>
+			<name>Guillaume BINET</name>
+		</maintainer>
+		<remote-id type="pypi">err</remote-id>
+	</upstream>
 </pkgmetadata>