Merge with update of xib-bot
authorDa Risk <da_risk@geekorum.com>
Mon, 09 Dec 2013 14:52:24 +0100
changeset 120 c5e64d076826
parent 119 02a68ec7a075 (current diff)
parent 117 0cb2ee2d7365 (diff)
child 121 0f3da1aaeea1
Merge with update of xib-bot
net-im/xib-bot/Manifest
--- a/net-im/xib-bot/Manifest	Mon Dec 09 14:41:26 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-AUX xib-bot.initd 654 RMD160 fc4a1b83358a1a703f351624cf892ed274dabb30 SHA1 8ea27c69bd3ee97edd26367b7ad8b26721e92262 SHA256 8052481c7e7f20d64fe95124906a2db5f292a1301ca1d3fd4bdccbecf0d4773f
-EBUILD xib-bot-9999.ebuild 593 RMD160 a81a69fd97e46e2ac34115e396a6c63b06aa6c48 SHA1 e6e167f68b53037dd25864ca96a5478bfdd047d9 SHA256 6544d3907956d4e949290fcbe7373928675a5ba57ed3e58d1f2dd5ec189a983c
-MISC xib-bot-9999.ebuild~ 593 RMD160 d98a8a9981312bfc498e7a590571adc09b961045 SHA1 f4ec5b27c13bd263230439e1fc53243ece06eae7 SHA256 f011d438313ef32c2a71375ff1d38015239c7b3d663a9a3dc08470da31243149
--- a/net-im/xib-bot/files/xib-bot.initd	Mon Dec 09 14:41:26 2013 +0100
+++ b/net-im/xib-bot/files/xib-bot.initd	Mon Dec 09 14:52:24 2013 +0100
@@ -4,8 +4,9 @@
 # $Header: $
 
 PIDFILE=${PIDFILE:=/var/run/xib-bot.pid}
-CONF=${CONF:=/usr/share/xib-bot/config.xml}
+CONF=${CONF:=/etc/xib-bot/config.xml}
 LOGFILE=${LOGFILE:=/var/log/xib-bot.log}
+STARTFILE={STARTFILE:=/usr/lib/python2.7/site-package/xib-bot/start_bots_from_xml_config.py}
 
 depend() {
 	need net
@@ -13,7 +14,7 @@
 
 start() {
 	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --exec /usr/share/xib-bot/start_bots_from_xml_config.py \
+	start-stop-daemon --start --exec "$STARTFILE" \
 		-1 ${LOGFILE} -2 ${LOGFILE} \
 		-m --pidfile "${PIDFILE}" -b -- "${CONF}"
 	eend $?
@@ -21,7 +22,7 @@
 
 stop() {
 	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec /usr/share/xib-bot/start_bots_from_xml_config.py \
+	start-stop-daemon --stop --exec  "$STARTFILE" \
 		--pidfile "${PIDFILE}"
 }
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-im/xib-bot/metadata.xml	Mon Dec 09 14:52:24 2013 +0100
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer><email>da_risk@elyzion.net</email></maintainer>
+</pkgmetadata>
--- a/net-im/xib-bot/xib-bot-9999.ebuild	Mon Dec 09 14:41:26 2013 +0100
+++ b/net-im/xib-bot/xib-bot-9999.ebuild	Mon Dec 09 14:52:24 2013 +0100
@@ -1,29 +1,29 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=5
 
-inherit python git
+PYTHON_COMPAT=( python2_6 python2_7 )
+
+inherit python-single-r1 git-2
 
 DESCRIPTION="xib-bot is an XMPP-IRC bridge bot written in python."
 HOMEPAGE="http://changaco.net/code/xib/"
-EGIT_REPO_URI="git://changaco.net/xib.git"
+EGIT_REPO_URI="git://github.com/Changaco/xib.git"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-PYTHON_DEPEND="2:6"
-
 RDEPEND="dev-python/xmppony
 		dev-python/argparse"
 
 src_install() {
-	cd $S
-	dodir "/usr/share/xib-bot"
-	cp *.py "${D}/usr/share/xib-bot/"
-	dodoc README example_config.xml
+	python_fix_shebang start_bots_from_xml_config.py
+	python_moduleroot=xib-bot
+	python_domodule *.py
+	dodoc README.md example_config.xml
 	newinitd "${FILESDIR}/xib-bot.initd" xib-bot
 }