Version bump. Drop old ebuilds and tests' patch

Package-Manager: portage-2.2.0_alpha134/cvs/Linux x86_64

5 files changed, 11 insertions, 77 deletions

diff --git a/net-im/err/ChangeLog b/net-im/err/ChangeLog
index 934efe6c89ad..52935d917c8b 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.7 2012/09/18 15:31:37 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/err/ChangeLog,v 1.8 2012/10/06 09:15:59 pinkbyte Exp $
+
+*err-1.3.1 (06 Oct 2012)
+
+  06 Oct 2012; Sergey Popov <pinkbyte@gentoo.org> -err-1.2.1-r1.ebuild,
+  -err-1.3.0-r1.ebuild, +err-1.3.1.ebuild, -files/err-tests.patch:
+  Version bump. Drop old ebuilds and tests' patch
 
   18 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> err-1.3.0-r1.ebuild:
   Fix description
diff --git a/net-im/err/Manifest b/net-im/err/Manifest
index 08f40828b280..642af8366b27 100644
--- a/net-im/err/Manifest
+++ b/net-im/err/Manifest
@@ -1,11 +1,8 @@
-AUX err-tests.patch 398 SHA256 2dc36330cf4b875e0c35a8ab7304e42f95847b59d498b5911fc38f4000bb134a SHA512 7f8b4aeb22e3f50986c070eda56c7676a7c9a45c4822fd90d0d3d3134b9771cb5384ed551e957c71e195ae0200b640640d80a51850d7c7eb2eefb3695fdb0025 WHIRLPOOL 713be459899e9421dda6405659de619e55d62e301700182e585e58ab8c629cb1d78b999d1397066ae0345455b91fd926c9f6282fed2fa6cb6ccdfbb3f7535f93
 AUX errd.confd 86 SHA256 2ce2d0233670c1a6077274ff84f9e8f7b65075a5dc8682efadd43f9476437962 SHA512 880006134b7432bdf60c89b8c930b87aae0450330d936a41db5148d2fa94508e6dfe1930733d59d1effdf217d0f9e0b4b79fa1faed5d0bc7cc2ad4951865bf66 WHIRLPOOL 1bf955480a32b0585f3ec1ee1c8f557e19a2cb547189e02e898ba8c74723844e3d5f00cf251ab44002784d0d8a2639082053455823287fb002643b8d3de60503
 AUX errd.initd 481 SHA256 b4919e1bae84cffbefac8dc4436effee0d7afba01e35acd823d59eb245e45303 SHA512 d0cb608c10fe009d29a41596656f2dc41df73df202a929b8f35f0cd53a0a35ae3fb95e6cc685f64ac99aea8b9237091c75598d617bc21c1c8a767b0ae17ace7f WHIRLPOOL d1ef3b17da3690f02283b5fecdc57ea14255756d6c57187ca2f6e9d73c321dacd445285439f695b0caf83d4410efc7a1692d517df98eb61dcf8a6a92a17eed26
-DIST err-1.2.1.tar.gz 24308 SHA256 969b693935578b9fb0fcb2c42a956d139040fadbf41e6911ea756c18f19a2a03
-DIST err-1.3.0.tar.gz 28167 SHA256 44b0f0f4cc054595f439889892149e48aa7bcc571a51353cb59cc2638678d8bf
+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
-EBUILD err-1.2.1-r1.ebuild 1284 SHA256 8eb249d3f4c3fd7c31fa856f29bf2be3217a51f223c182c77b33891a5e0427b0 SHA512 9194ef53239cc9a8c866252a4890d59741ab2efa3cbcb6953bee5633f00836bddf7f92f75d94558eedc3125679c7fb7fbfca8e17938cc269f823ea63a0f37506 WHIRLPOOL b23fa13a1ab99c9445b9b9fd4bbce2a3e778cf88621460d2807d600aa1fc54b2364e2b9572af9b7531fcf5350dba803bc0e83579bcbbe638e997e0e2fa41f118
-EBUILD err-1.3.0-r1.ebuild 1421 SHA256 405f1aeb9514ce667361cb03ab4d32b8e3040f8989a3e7d41b5ee7d86bbd4ac7 SHA512 ab36c855974210f393d474b084ae6888cc09e8df9a08457fd9c73c8501b9b3075a8f0140a7a6b1792b51322a626e1942e1ff2ec2cb4bca8e91573e182746e1d4 WHIRLPOOL a691869b5786ee6bb6a3f295c9f7d8f03d25646d85e2d5e26c240edcc737cd680fa1a19e436e939f4afeb9929e490cc87bae6573f11ebd73185aaafd0e39acf3
+EBUILD err-1.3.1.ebuild 1361 SHA256 27a607a1ef655d878263848654f9d1a319cd69c70ed2b638a457ee20f4b044dd SHA512 3638e766541e0785cb73c8cae74edef9fe29949519facb470eff5cb8ec884b9af1dda77146e0e2cc9bec6fbb30cb533ea6fb99efa87ae560be1106cd3cd2a128 WHIRLPOOL cd9e277d4c6e21c8bea5347351091d32734adbc3a04f7edfdc5884b231b40f12f53affde1b7699be66d000a4d46ca92153292d5785a34626c20c32729d4338d5
 EBUILD err-1.5.1.ebuild 1559 SHA256 2979129ce3793ab001b3200d61c62e4e4482c70d4dc85f18dea9425dddd25369 SHA512 380dd338e038c94433e13d62029cb72af4457c410f351e2f6e2a4b9450a6c217940dc07ae4d200edfee5141d0479e4933806610e2d18d60bb008adab81d28cec WHIRLPOOL bdd9e7fdf05b6e7a329846f8d050e6d01f563a5c219df036febeb618d199fee558ea911dee75f3113c6cea29aa418edee3937fb9e83a32b5b4a09a651cab7950
-MISC ChangeLog 1415 SHA256 8770453c8d1b5913f3e828cc73b1b1efafa0054558af9d3e77d955abd00392ca SHA512 ed9e27c173a9363471eded6dd58e8ae537de5f3e74ee0e7be3d6234af831f4a41f931785a6493471a5b38b69ad6ea2d943b718f4e01f114e8d03a16497a3d033 WHIRLPOOL e434da9c2f9e47be6a241393502970339e8baeeaf4b9cf436bf9fec0055a5b21807a788edf26a51f41488cacd6309fac688013ced033db0eb1d8cfd87b45ff84
+MISC ChangeLog 1631 SHA256 d1f66487a3be6397722edff004269cf7e7d22abd4bff1a8d869a226479abac50 SHA512 129351a22946fe81b98ad0e0bef543d13309d584aeafdc4ec2db614d7742a8ab1c71aea951d32df4c4885fda603c4a54d40791173c8325c6f0992eb6091770f7 WHIRLPOOL 01e07848f578ecf586c9cbb9121e35bd5ade305b4080afc8d6052ac30d53cc5afdaca8c86990d6d18e053406577344338d8aca058add3dc2494b41751080c80e
 MISC metadata.xml 344 SHA256 388fbb3ff322390f625ba1df28374cb50a8250cb5daaa9e5eea0cc949b703c5f SHA512 540ceb7369bf4b95e214bec22598c49d9fb909bf83c12cb4bb8539ef4076fb17c85d43bf239bfedcd71b1d97fa3b7d3b26ae1e353a54f6e2a542d9892120db6f WHIRLPOOL b225bc9240c96a6deb207aee6f754f19b3a80c660c81fb46800e818fc6bdd825181cbea5db833eaa325dd20e0c193f1b6038ba66840f303a59264a939b4d1b11
diff --git a/net-im/err/err-1.2.1-r1.ebuild b/net-im/err/err-1.2.1-r1.ebuild
deleted file mode 100644
index c77f5b222ca3..000000000000
--- a/net-im/err/err-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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.2.1-r1.ebuild,v 1.1 2012/07/03 15:45:35 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=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND="dev-python/xmpppy
-	dev-python/python-daemon
-	dev-python/yapsy"
-
-pkg_setup() {
-	python_pkg_setup
-	ebegin "Creating err group and user"
-	enewgroup 'err'
-	enewuser 'err' -1 -1 -1 'err'
-	eend ${?}
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/err-tests.patch
-}
-
-src_install() {
-	distutils_src_install
-	newinitd "${FILESDIR}"/errd.initd errd
-	newconfd "${FILESDIR}"/errd.confd errd
-	dodir /etc/${PN}
-	dodir /var/lib/${PN}
-	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-1.3.0-r1.ebuild b/net-im/err/err-1.3.1.ebuild
index ad35b73302c1..30a134c9306b 100644
--- a/net-im/err/err-1.3.0-r1.ebuild
+++ b/net-im/err/err-1.3.1.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-1.3.0-r1.ebuild,v 1.2 2012/09/18 15:31:37 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/err/err-1.3.1.ebuild,v 1.1 2012/10/06 09:15:59 pinkbyte Exp $
 
 EAPI=4
 
@@ -35,10 +35,6 @@ pkg_setup() {
 	eend ${?}
 }
 
-src_prepare() {
-	epatch "${FILESDIR}"/err-tests.patch
-}
-
 src_install() {
 	distutils_src_install
 	newinitd "${FILESDIR}"/errd.initd errd
diff --git a/net-im/err/files/err-tests.patch b/net-im/err/files/err-tests.patch
deleted file mode 100644
index 6af73ddc0e81..000000000000
--- a/net-im/err/files/err-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.orig	2012-06-23 21:20:47.305550337 +0400
-+++ setup.py	2012-06-23 21:20:57.400549755 +0400
-@@ -25,7 +25,7 @@
-     packages = find_packages(),
-     scripts = ['scripts/err.py'],
- 
--    install_requires = ['xmpppy', 'yapsy', 'configparser', 'python-daemon'],
-+    install_requires = ['xmpppy', 'yapsy', 'python-daemon'],
- 
-     package_data = {
-         '': ['*.txt', '*.rst', '*.plug'],