Version bump: EAPI 5, migrate to distutils-r1, optional dependencies for IRC backend. Drop old versions

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

7 files changed, 111 insertions, 202 deletions

diff --git a/net-im/err/ChangeLog b/net-im/err/ChangeLog
index 0ff03c815b66..99c2276f5377 100644
--- a/net-im/err/ChangeLog
+++ b/net-im/err/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/err
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/err/ChangeLog,v 1.13 2013/04/17 07:24:39 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/err/ChangeLog,v 1.14 2013/10/05 16:24:15 pinkbyte Exp $
+
+*err-1.7.1 (05 Oct 2013)
+
+  05 Oct 2013; Sergey Popov <pinkbyte@gentoo.org> -err-1.3.1-r1.ebuild,
+  -err-1.5.1-r1.ebuild, -err-1.6.1.ebuild, +err-1.7.1.ebuild, metadata.xml:
+  Version bump: EAPI 5, migrate to distutils-r1, optional dependencies for IRC
+  backend. Drop old versions
 
   17 Apr 2013; Sergey Popov <pinkbyte@gentoo.org> err-1.3.1-r1.ebuild,
   err-1.5.1-r1.ebuild, err-1.6.1.ebuild:
diff --git a/net-im/err/Manifest b/net-im/err/Manifest
index d4f4e0238bc4..7f4a724dd67c 100644
--- a/net-im/err/Manifest
+++ b/net-im/err/Manifest
@@ -3,22 +3,18 @@ Hash: SHA256
 
 AUX errd.confd 167 SHA256 6475348ec29b582c3542be04b01db457731c4d9f4d998a41fefb17f757321235 SHA512 0e8f6b86cfe3e57dbae2ecf7a035d084ac753c338871fe51462d522465777f5c8886a9a2fa7d69030ed53797b6ece89a3e3453162d5a9af76a5e1a2ac23db30f WHIRLPOOL 1f3ffec6d4e72d21c107326586d5d39bf0bcc9177d9b4b38361dd9b31d816bef70be471b02c5121df31b87a3460a62fa2633e83048cb6f539d55e9d323261d5a
 AUX errd.initd 677 SHA256 3d8f4f2ec5db9c9e3ad0673a52e63905b70c856165b96477cfd8e3a2a8cb2912 SHA512 d9ba4bc36f667f4816e0dff87a214e95dcd5d39810e6080fe0951923b4fa2b7f88237342c060de75b390cb28bc35ec201c6f6110567e5dcbd95177050f1f5e39 WHIRLPOOL 0ffa61dee66243b1cefa04a467de4f840c371bebeb9207ca8c0bd08bc1a17359734ebea7b18238ee764f543e18b94d3dd2ceb4078a9df10ebc67afcfcf9ed222
-DIST err-1.3.1.tar.gz 29373 SHA256 4d51be3973cd0e638f03b9f7813f480bb06685eb431aeddf8eb89dfc955c9c33 SHA512 6bb24b7607c660e54efae5c2d34e5660ac0c9a0677bc16d529c218b28692b296056bb309d0d87f706b86e1ee5822fcb34f7a64a15381b09b5762ab1379dde9be WHIRLPOOL d30788ee1ff2ffd8c94539ce55ff443d79d8fc28da8a4f9960f89ecdd89daa3e7cfe76a7b8d4d319553d1c566199bbf6ca3c9caa2fec24ad9ac5e0aaed29caed
-DIST err-1.5.1.tar.gz 47129 SHA256 3744b804d06086c7decf200626744b47cba8f4aa05cfc6026c2bf1caf0b86d93 SHA512 f990d9e5663b3c79f85d598e419827387b997bf7e1ce3b62811be56e8a48f94182bee57bb29f776f4464dee3419073fa1e245bcfd7c28f6ac73f35f81985aeef WHIRLPOOL 464df53c9f0953ad59a490b17f4171ffffcdcb864a1efb4bd7e2b9ce45b8bb8517f85660de63074dbf462007994f1b5ec9ae2a69f852f295ebff2dce98a8998e
-DIST err-1.6.1.tar.gz 55983 SHA256 6bf0dfcc5427efef6ce5744cf999d7269c3928bdfa169fee08b5525905b9d1aa SHA512 06b8da6e337864fa8b1afe799b1e0029834ffe45984c121734406b76867ce925874f4490707dc307222a807cf5b2425e920272dd5a58122e24482c0abebbd06e WHIRLPOOL 4a6f63f781ca3ab9ce143a8c23a1deceeb24d37d26452efabf5033c3c6d6125425c636231c3b2d64976bd00924bf3ba1ba8efd6e268914d2d90d55e408775959
-EBUILD err-1.3.1-r1.ebuild 1311 SHA256 f0d42589266561e3d5223fc6216d75738ca20bc748a43a44791ebee28504c017 SHA512 8bbb43326d68c3991ae549904471021c90272801cae0d3022f53d2b246fc71931a9e4e28d2daad8ea04e88e64516c10532b875571c9b18170241d9fcd235f3d5 WHIRLPOOL fec2dc07f34e9a1dfde11ee3549822acf9a0444ff07def43377790773bc21abc498d48de7316d0f252acaeaff191edf5bd5395e56213132f7a7547f5c236bd01
-EBUILD err-1.5.1-r1.ebuild 1509 SHA256 e5b6e110462f362abeb018dc53c6e7d0b709c66c8dac45c9450f82f2b97f98d7 SHA512 c32dda5766b7a4d87396b8d93bf660eb2adb18c66a3102063c2a4cb761c653d5b8f98b54a82d8ced09212008cb6d9e1cc9ccce1278086b4833488a005e1b02a4 WHIRLPOOL 0f4dcbfe32e3cf65543aaf9617a7c14dc3aaa4122115994b8d800145f84057de02c3893b523e5d8abc3efc05304f423824d0921ef9cd753c78c6d90cba72feff
-EBUILD err-1.6.1.ebuild 1829 SHA256 3d388a18d36080e870f7367acb28b2e652f3e63db7cb816e0aeb00d43d168c51 SHA512 233a79ef9c910820579ab64ae8ede6ed9fcca38bba5e5e86a6e1d825f5b5c3fb82d6d2f1978ba847656f1e017681e87266e1388ccb4aca2e2b20f22da98c64ee WHIRLPOOL fd1179a983adbb0d1b23d7ee57b41c1ee225b9e96b13d19a7cbcadddba0ee21763cf9a2b4553aabd39d8c37388fcdb48223933b87c4f1a642de5d6a2a1c0981f
-MISC ChangeLog 2554 SHA256 9db5b70c6c25132705bae3d86b187a8c76b4b977a4fa4343a96bf167e30348f9 SHA512 f511df5729d79d5b1ea47e4dd55e4ac0d634f8990b78a50e9cb3a3bf59d3393fb9455d474c660502c1c83bad80076c4b22c543044b0c7b71a78caef7a4a92120 WHIRLPOOL ae8d25c7a1c07f57edb7deb8436b93c96c3217258949335224e28f9dd6d3b419e0729018708bb6ea674c1de7ee20308d5ccd9d7e6c657612c4ae9d2063c28437
-MISC metadata.xml 529 SHA256 68ed0186a2b358191519df4803118281a56ccd9245c826cff386ca17be4a6942 SHA512 365d0214f3867293a4b0fe568a7c6e5f89cf2861ff92786ca4d8ea95a1ba0428d6980f559bb151d09bd5d31b2b8fd7867d1057ae5546d73349d0db13790a8ad0 WHIRLPOOL fe0b679b756c56fc867d0201022a4091d50563c25fb0749be93b9024bc634632bc0f98731395dbf799c2d42e594ece350ab8a44a8317267e8812ac3296500228
+DIST err-1.7.1.tar.gz 100716 SHA256 a116df7fb4489274b0074c960eebfd7bb938cc777dfc43c773f828aaf9cb5406 SHA512 5be7f6ede6694877e73226de4da58bc47e1230032bc9be8dd3e8fd1448afd1e3ae4c02ecbdb30343b98466bb0d3a8fbfbcb6609c5c50768a9be70b9d22f675a4 WHIRLPOOL a79fd02db047ccfdf25201ade924ed3382d8b729b69bcdebf911d806c167751ec011e62728d9342a4f7c0d8cc6e4b07a40bd5f275ed042ff2451fc17066800e8
+EBUILD err-1.7.1.ebuild 2439 SHA256 cff1e6f8bd8e2a1b463d306cedc7e16ea3d432bc8bfb12d09b4fe2d0d8d3f7cf SHA512 8dd8ef844467ffa03c0276157b43445153353b780ba24e312f7958a04eae1e79c89d947ab44d1748689324ce187ac5189d00cc4a5f3ab53b8cf46e6ba637c803 WHIRLPOOL 6eb5fbee468e45403d7f09b613dc99f858eb00a9d7d875746b74f2f62affa482253f424676f5874dcb587c808bb8b2568dad79b41ba0617729ed382f03ce31d8
+MISC ChangeLog 2837 SHA256 e397679183d024ef424b2786066a54f9aa2aadd135bc49f50f181ff1548f0b30 SHA512 49433f4a966ffaa975503a232444d120760741d6a37a15fc9b459eb23770e8cbda2aa6aa992df7459fa2139b844da47bf1b1a1662aff4623f3a186fb678142e1 WHIRLPOOL df8d7b9de22efdb3f3fe5ba64b94db87ff1e49edc69c618894f2ba9116c54db974d1dc1d01b3e2c746bb3c8ea0d50c3fdd8f40d61707e872a600b4b77ccefa78
+MISC metadata.xml 606 SHA256 7d042ba4d09adc22bd124902875bdc2bd90554d35837552c28c313583fffbfbe SHA512 881f55eff367af9e54cdcfc68fa91a48f0ad4ba7ceb3cdddc4eaf8e57135a26ad83e220ca368aab7aedd1a008a47c0555fcd1677c503dbe3154f3ff838cadf2e WHIRLPOOL 83497537f46ca7c39e32e3e405ea5d01f1d99adb6a15d1539010a0e70da4d753a08df1706d5561f9ec6e3df8408e59ed92b35e8e89741f7f8b0277f4f894c242
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRbk4sAAoJECo/aRed9267GUoH/3e2gZpRlGuZuZ9vWpaHjubc
-qd5N9p+IwOebxPY/Ah6VF1xNo5n2femNOmm9ocP8HyH75FTnBbs+SlLP9LBSBoXy
-PQrTINbpISa11HjW9a/SM1xJZ+7HC1tFWAv95Cu4X9in0p0/b85eXmu5anVbwnV5
-hqEo2p6G4iAAj9cOOJFUbRe7hA8G6qLdls2AIHkKVf7gEl0KqYL83+xE95sAdgGA
-x7ovZn8f96pibhOjPFokHofFOxPCoO0HO2Y3+EzJOsDtJQ0legiZTDfDucYm2d5G
-Omyw2HzOQmwVH16lKAvhDaK6B/SJR0f1ixJAlxlu5M5MAH65NqCMMlgz1Q3c3dc=
-=j6US
+iQEcBAEBCAAGBQJSUD0tAAoJECo/aRed9267xZ0H/1+JZVqp5yupuvXpJTHXpUSj
+Pwq0ysH1Y6lVY/+KPuSuhtFd+vVxfkWvZZftKwr4nXvFg/acOSoMbU+r/m0CtZe3
+YYsXkYUL6r3n+9meny8wOnmjlwONVtHSh0p4u76UAAIu63E9L6/G6Ri9zFCVE83A
+qkjBqGRW6XklDIEcIW+gzRex6qjQ84ApWIjY9czecXPoDsVEkpn2vb8n5+2sJcrI
+XNnub9pBdq1j2ecnLrhsNNYNOhTeOA7PDIfsVqU1E+SshHKwF3BhJM3anr0uSMw7
+h1EATO64VCA4hw/7cOuGB3zJ+kYswE7ZFOWSHVjhe1N9N53OhplzO0Jr0CQ5GnE=
+=ehws
 -----END PGP SIGNATURE-----
diff --git a/net-im/err/err-1.3.1-r1.ebuild b/net-im/err/err-1.3.1-r1.ebuild
deleted file mode 100644
index 822e0833f926..000000000000
--- a/net-im/err/err-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/err/err-1.3.1-r1.ebuild,v 1.2 2013/04/17 07:24:39 pinkbyte 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="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-1.10
-	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}
-	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/err-1.5.1-r1.ebuild b/net-im/err/err-1.5.1-r1.ebuild
deleted file mode 100644
index df40a5c9e3e1..000000000000
--- a/net-im/err/err-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/err/err-1.5.1-r1.ebuild,v 1.2 2013/04/17 07:24:39 pinkbyte 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="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="qt4 +plugins"
-
-DEPEND="dev-python/setuptools"
-RDEPEND="dev-python/dnspython
-	dev-python/jinja
-	dev-python/python-daemon
-	dev-python/xmpppy
-	<dev-python/yapsy-1.10
-	qt4? ( dev-python/pyside[X,webkit] )
-	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() {
-	# Upstream requires images to be in site-packages directory,
-	# butdoes not install them at all!
-	install_svgs() {
-		insinto "$(python_get_sitedir)"/errbot
-		doins errbot/*.svg
-	}
-	distutils_src_install
-	newinitd "${FILESDIR}"/errd.initd errd
-	newconfd "${FILESDIR}"/errd.confd errd
-	dodir /etc/${PN}
-	dodir /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
-	use qt4 && python_execute_function install_svgs
-}
diff --git a/net-im/err/err-1.6.1.ebuild b/net-im/err/err-1.6.1.ebuild
deleted file mode 100644
index 6b6b2a31a3ff..000000000000
--- a/net-im/err/err-1.6.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/err/err-1.6.1.ebuild,v 1.2 2013/04/17 07:24:39 pinkbyte Exp $
-
-EAPI=5
-
-DISTUTILS_SRC_TEST="setup.py"
-
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_DEPEND="2:2.7"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils eutils user
-
-DESCRIPTION="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="qt4 +plugins"
-
-DEPEND="dev-python/setuptools"
-# NOTES:
-# 1. It has bundled libs - for example exrex(see 'errbot/bundled' subfolder)
-RDEPEND="dev-python/dnspython
-	dev-python/flask
-	dev-python/jinja
-	dev-python/pyfire
-	dev-python/python-daemon
-	dev-python/simplejson
-	dev-python/xmpppy
-	<dev-python/yapsy-1.10
-	qt4? ( dev-python/pyside[X,webkit] )
-	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_prepare() {
-	# Remove configparser from requirements
-	sed -i "s/'configparser', //" setup.py || die "remove configparser from setup.py failed"
-	distutils_src_prepare
-}
-
-src_install() {
-	# Upstream requires images to be in site-packages directory,
-	# butdoes not install them at all!
-	install_svgs() {
-		insinto "$(python_get_sitedir)"/errbot
-		doins errbot/*.svg
-	}
-	distutils_src_install
-
-	newinitd "${FILESDIR}"/errd.initd errd
-	newconfd "${FILESDIR}"/errd.confd errd
-
-	dodir /etc/${PN}
-	dodir /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
-
-	use qt4 && python_execute_function install_svgs
-}
diff --git a/net-im/err/err-1.7.1.ebuild b/net-im/err/err-1.7.1.ebuild
new file mode 100644
index 000000000000..db969b2ba50f
--- /dev/null
+++ b/net-im/err/err-1.7.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/err/err-1.7.1.ebuild,v 1.1 2013/10/05 16:24:15 pinkbyte Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1 eutils user
+
+DESCRIPTION="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="irc qt4 +plugins"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/dnspython[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyfire[${PYTHON_USEDEP}]
+	dev-python/python-daemon[${PYTHON_USEDEP}]
+	dev-python/xmpppy
+	dev-python/yapsy[${PYTHON_USEDEP}]
+	irc? (
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/twisted-core[${PYTHON_USEDEP}]
+		dev-python/twisted-words[${PYTHON_USEDEP}]
+	)
+	qt4? ( dev-python/pyside[${PYTHON_USEDEP},X,webkit] )
+	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. Need to add PYTHON_USEDEP to remaining dev-python/ deps
+# 3. Support for BOT_SENTRY option is missing, cause
+#    we do not have apropriate packages in portage yet
+# 4. 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}
+	dodir /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
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Upstream requires images to be in site-packages directory,
+	# but does not install them at all!
+	if use qt4; then
+		local python_moduleroot=errbot
+		python_domodule errbot/*.svg
+	fi
+}
diff --git a/net-im/err/metadata.xml b/net-im/err/metadata.xml
index a1091ccecb0f..d7e1264c8006 100644
--- a/net-im/err/metadata.xml
+++ b/net-im/err/metadata.xml
@@ -6,6 +6,7 @@
 		<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>