From 8409e70e95298cb404eeb79688aac4a9eeeaaba6 Mon Sep 17 00:00:00 2001 From: Maxim Koltsov Date: Tue, 26 Jun 2012 16:51:35 +0000 Subject: Bump to 1.3.0, fix some errors in ebuild and initscript. Thanks to Pinkbyte. (Portage version: 2.1.11.2/cvs/Linux x86_64) --- net-im/err/ChangeLog | 9 ++++++-- net-im/err/err-1.3.0.ebuild | 54 +++++++++++++++++++++++++++++++++++++++++++++ net-im/err/err-9999.ebuild | 10 ++++++--- net-im/err/files/errd.initd | 4 ++-- net-im/err/metadata.xml | 3 +++ 5 files changed, 73 insertions(+), 7 deletions(-) create mode 100644 net-im/err/err-1.3.0.ebuild diff --git a/net-im/err/ChangeLog b/net-im/err/ChangeLog index b00c58cac981..d926b2cc1abe 100644 --- a/net-im/err/ChangeLog +++ b/net-im/err/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-im/err # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/err/ChangeLog,v 1.1 2012/06/21 11:27:53 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/err/ChangeLog,v 1.2 2012/06/26 16:51:35 maksbotan Exp $ + +*err-1.3.0 (26 Jun 2012) + + 26 Jun 2012; Maxim Koltsov +err-1.3.0.ebuild, + err-9999.ebuild, files/errd.initd, metadata.xml: + Bump to 1.3.0, fix some errors in ebuild and initscript. Thanks to Pinkbyte. *err-9999 (21 Jun 2012) *err-1.2.1 (21 Jun 2012) @@ -8,4 +14,3 @@ 21 Jun 2012; Maxim Koltsov +err-1.2.1.ebuild, +err-9999.ebuild, +files/errd.confd, +files/errd.initd, +metadata.xml: Add net-im/err, bug 421373. Thanks to Pinkbyte - diff --git a/net-im/err/err-1.3.0.ebuild b/net-im/err/err-1.3.0.ebuild new file mode 100644 index 000000000000..026bfa853c68 --- /dev/null +++ b/net-im/err/err-1.3.0.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/err/err-1.3.0.ebuild,v 1.1 2012/06/26 16:51:34 maksbotan Exp $ + +EAPI=4 + +DISTUTILS_SRC_TEST="setup.py" + +SUPPORT_PYTHON_ABIS="1" +PYTHON_DEPEND="2:2.7" +RESTRICT_PYTHON_ABIS="3.*" + +inherit distutils eutils user + +DESCRIPTION="err is a plugin based XMPP chatbot designed to be easily deployable, extensible and maintainable." +HOMEPAGE="http://gbin.github.com/err/" + +SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz" +KEYWORDS="~amd64 ~x86" +LICENSE="GPL-3" +SLOT="0" +IUSE="+plugins" + +DEPEND="dev-python/setuptools" +RDEPEND="dev-python/xmpppy + dev-python/python-daemon + dev-python/yapsy + plugins? ( dev-vcs/git )" + +pkg_setup() { + python_pkg_setup + ebegin "Creating err group and user" + enewgroup 'err' + enewuser 'err' -1 -1 -1 'err' + eend ${?} +} + +src_install() { + distutils_src_install + newinitd "${FILESDIR}"/errd.initd errd + newconfd "${FILESDIR}"/errd.confd errd + dodir /etc/${PN} + dodir /var/lib/${PN} + # Create plugins directory here because of err creates it itself with 0777 rights + dodir /var/lib/${PN}/plugins + + keepdir /var/log/${PN} + keepdir /var/run/${PN} + fowners -R err:err /var/lib/${PN} + fowners -R err:err /var/log/${PN} + fowners -R err:err /var/run/${PN} + insinto /etc/${PN} + newins errbot/config-template.py config.py +} diff --git a/net-im/err/err-9999.ebuild b/net-im/err/err-9999.ebuild index fff0290dae82..b37cc2d9ad4f 100644 --- a/net-im/err/err-9999.ebuild +++ b/net-im/err/err-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/err/err-9999.ebuild,v 1.1 2012/06/21 11:27:53 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/err/err-9999.ebuild,v 1.2 2012/06/26 16:51:34 maksbotan Exp $ EAPI=4 @@ -21,12 +21,13 @@ SRC_URI="" KEYWORDS="" LICENSE="GPL-3" SLOT="0" -IUSE="" +IUSE="+plugins" DEPEND="dev-python/setuptools" RDEPEND="dev-python/xmpppy dev-python/python-daemon - dev-python/yapsy" + dev-python/yapsy + plugins? ( dev-vcs/git )" pkg_setup() { python_pkg_setup @@ -42,6 +43,9 @@ src_install() { newconfd "${FILESDIR}"/errd.confd errd dodir /etc/${PN} dodir /var/lib/${PN} + # Create plugins directory here because of err creates it itself with 0777 rights + dodir /var/lib/${PN}/plugins + keepdir /var/log/${PN} keepdir /var/run/${PN} fowners -R err:err /var/lib/${PN} diff --git a/net-im/err/files/errd.initd b/net-im/err/files/errd.initd index 7e3001a696d6..55752a5255d1 100644 --- a/net-im/err/files/errd.initd +++ b/net-im/err/files/errd.initd @@ -8,8 +8,8 @@ depend() { start() { ebegin "Starting errd" - start-stop-daemon --start --make-pidfile --pidfile ${ERR_PID_FILE} --background --quiet \ - --exec /usr/bin/python2 -- /usr/bin/err.py -c ${ERR_CONFIG_PATH} -u ${ERR_USER} -g ${ERR_GROUP} + 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 $? } diff --git a/net-im/err/metadata.xml b/net-im/err/metadata.xml index 9e46a1581b1b..f658ba4e421a 100644 --- a/net-im/err/metadata.xml +++ b/net-im/err/metadata.xml @@ -10,4 +10,7 @@ maksbotan@gentoo.org Maxim Koltsov + + Enable support for installing plugins with dev-vcs/git + -- cgit v1.2.3-65-gdbad