--- a/net-im/xib-bot/xib-bot-9999.ebuild	Fri Nov 08 15:27:28 2013 +0100
+++ b/net-im/xib-bot/xib-bot-9999.ebuild	Sat Nov 16 23:18:08 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
 }