Fix tests, bug 316083. Thanks to Pinkbyte

Package-Manager: portage-2.1.11.4/cvs/Linux x86_64

5 files changed, 48 insertions, 6 deletions

diff --git a/net-im/err/ChangeLog b/net-im/err/ChangeLog
index d926b2cc1abe..5f79778c7dfe 100644
--- a/net-im/err/ChangeLog
+++ b/net-im/err/ChangeLog
@@ -1,6 +1,14 @@
 # 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.2 2012/06/26 16:51:35 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/err/ChangeLog,v 1.3 2012/07/03 15:45:35 maksbotan Exp $
+
+*err-1.3.0-r1 (03 Jul 2012)
+*err-1.2.1-r1 (03 Jul 2012)
+
+  03 Jul 2012; Maxim Koltsov <maksbotan@gentoo.org> +err-1.2.1-r1.ebuild,
+  +err-1.3.0-r1.ebuild, +files/err-tests.patch, -err-1.2.1.ebuild,
+  -err-1.3.0.ebuild:
+  Fix tests, bug 316083. Thanks to Pinkbyte
 
 *err-1.3.0 (26 Jun 2012)
 
diff --git a/net-im/err/Manifest b/net-im/err/Manifest
index 2a30cb1814d5..2098e7ffcf97 100644
--- a/net-im/err/Manifest
+++ b/net-im/err/Manifest
@@ -1,9 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX err-tests.patch 398 RMD160 6a9df7fc611c906201a3896e4ce29970c2676d99 SHA1 ac35ba7faf6a3df742c47101b0998f56ba639182 SHA256 2dc36330cf4b875e0c35a8ab7304e42f95847b59d498b5911fc38f4000bb134a
 AUX errd.confd 86 RMD160 e0ed18e871e43f8730ff5c81282e7df4ef51fb1f SHA1 d18318b2fd95b864c4cdca2263561532ce76e0f7 SHA256 2ce2d0233670c1a6077274ff84f9e8f7b65075a5dc8682efadd43f9476437962
 AUX errd.initd 481 RMD160 6b0b4087221335a103c53fce017a308eab11c8df SHA1 b17094486ca9595d86ca095fe1b89e2387f1bbeb SHA256 b4919e1bae84cffbefac8dc4436effee0d7afba01e35acd823d59eb245e45303
 DIST err-1.2.1.tar.gz 24308 RMD160 77b83061ce9ffaece8aaadfa5058f473b0ddbd88 SHA1 3fc9f3f29e4843d37b6fb8191f22f4595629e8b6 SHA256 969b693935578b9fb0fcb2c42a956d139040fadbf41e6911ea756c18f19a2a03
 DIST err-1.3.0.tar.gz 28167 RMD160 9447590cb7fa7d337f39dbc86b345beac1cb94a1 SHA1 660d595d2e6b35183d572ed5d08437f97b54cb86 SHA256 44b0f0f4cc054595f439889892149e48aa7bcc571a51353cb59cc2638678d8bf
-EBUILD err-1.2.1.ebuild 1224 RMD160 27a054a3cf50ab45a5aa26bc3fe545f58cb38fae SHA1 b1168baf772822b25beae2615bbda2a1ae755ed8 SHA256 ce9193f6368254c621786c10c7645b146d6c878461bf07c13b6b6c725e9b351a
-EBUILD err-1.3.0.ebuild 1372 RMD160 d0a3191de5e41c4055197948873130acfdace074 SHA1 6a9cc33a8f0c6ee825b7d34722267f2dcee091bc SHA256 0a7de1fea223b2479a1993fe77ed1fb8702cbabc3ae3d73d09b0f8295591df3b
+EBUILD err-1.2.1-r1.ebuild 1284 RMD160 4ab50d9290d6fd19aff2a2ad0f62435dbee8a8c3 SHA1 3fc1bdde66db7607552678cbb8583ec1c3134284 SHA256 8eb249d3f4c3fd7c31fa856f29bf2be3217a51f223c182c77b33891a5e0427b0
+EBUILD err-1.3.0-r1.ebuild 1432 RMD160 15920b50f0e214c704e5d3ea0e6968e76de1972b SHA1 ad136ded21b2d376c85f0988448175f85ab538b7 SHA256 16cb42639372419199e04eabb362fa3d51132b44b48ef5bfdcfa8bd89946fa9c
 EBUILD err-9999.ebuild 1380 RMD160 04aefe0a650d67faee35f7cefa5d25ed34d4079c SHA1 cf4c5c22de9b284a5a06e07ef0e8e75436f9e504 SHA256 78bf5946b596a444792bd226aa80d6496601f3951e2f69e16bd3a928b7e94133
-MISC ChangeLog 667 RMD160 40d8ffcfc02098ed02c7a0c9936319a115c3657c SHA1 e17782b99f90e892303810716f559193e0a853c2 SHA256 a217041e9c0ca0b4fa3aad33d276d234e56196e59a2914854699ad18503ac33d
+MISC ChangeLog 931 RMD160 025da298c492300ab25c23b1e8a93ae127556c47 SHA1 7f37bee159fd7a3035a241915654ca8c5694fcca SHA256 1696479720d002a27641320c3f8c0d1f367e0cae38557e8fad13939c77eee67f
 MISC metadata.xml 470 RMD160 5288fa633d8054f2b536a2e2da4d60b1af9e4ad2 SHA1 c5812ade410c1cda446fbcf60e0c8b42933df4ef SHA256 d5136c5ea2620ea8c8850b57303aa1939c9adc93b4ffa0515dbc04efc0863e68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJP8xO+AAoJEAmJmMX429reRk8H/0nIBFI8vT7dm0qNIku9/rU6
+3sHTx/AnMB8yNP7KlkePPsJF4Xg3Qi+vwLUlqsJqjjHNpyENFIhr8jyxZHaaSDIc
+pOKbUFlAYiVOYHWZ57PqVn/8Rcltbe/VNIsmWl9cv08tJFSX2qwhLqK3uhK/zF7j
+gpXabi+xY+6RzDhpxsVRPHsOpSzpDj9ZmSEmrW/oivPFfeIBMFVz3l/eq8eY0Q6n
+USxUr/GsTvcwiF2LA5ietWqgV6qksF787gxHAJ7BSnEU05yW9gBNte1IcGrXJzGl
+J+vbNH2xnh35J8WgkCOxQcq4oDti0/4cbWsqRy7VbSXEzhNojLgLw3qRMvzxPS8=
+=tEqN
+-----END PGP SIGNATURE-----
diff --git a/net-im/err/err-1.2.1.ebuild b/net-im/err/err-1.2.1-r1.ebuild
index a608da06582e..c77f5b222ca3 100644
--- a/net-im/err/err-1.2.1.ebuild
+++ b/net-im/err/err-1.2.1-r1.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.2.1.ebuild,v 1.1 2012/06/21 11:27:53 maksbotan Exp $
+# $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
 
@@ -34,6 +34,10 @@ 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/err-1.3.0.ebuild b/net-im/err/err-1.3.0-r1.ebuild
index 026bfa853c68..2faad73d8a70 100644
--- a/net-im/err/err-1.3.0.ebuild
+++ b/net-im/err/err-1.3.0-r1.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.ebuild,v 1.1 2012/06/26 16:51:34 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/err/err-1.3.0-r1.ebuild,v 1.1 2012/07/03 15:45:35 maksbotan Exp $
 
 EAPI=4
 
@@ -35,6 +35,10 @@ 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
new file mode 100644
index 000000000000..6af73ddc0e81
--- /dev/null
+++ b/net-im/err/files/err-tests.patch
@@ -0,0 +1,11 @@
+--- 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'],