summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorMaxim Koltsov <maksbotan@gentoo.org>2012-07-03 15:45:35 +0000
committerMaxim Koltsov <maksbotan@gentoo.org>2012-07-03 15:45:35 +0000
commit51aaa11f3b7fd4fbd5cc9aac033e6d88df74a8d9 (patch)
tree05034522afead952e67f1fc3c2322abb412fcb67 /net-im
parentAdd patch to enable shared lib building, bug 402829. Thanks to Pinkbyte (diff)
downloadgentoo-2-51aaa11f3b7fd4fbd5cc9aac033e6d88df74a8d9.tar.gz
gentoo-2-51aaa11f3b7fd4fbd5cc9aac033e6d88df74a8d9.tar.bz2
gentoo-2-51aaa11f3b7fd4fbd5cc9aac033e6d88df74a8d9.zip
Fix tests, bug 316083. Thanks to Pinkbyte
(Portage version: 2.1.11.4/cvs/Linux x86_64)
Diffstat (limited to 'net-im')
-rw-r--r--net-im/err/ChangeLog10
-rw-r--r--net-im/err/err-1.2.1-r1.ebuild (renamed from net-im/err/err-1.2.1.ebuild)6
-rw-r--r--net-im/err/err-1.3.0-r1.ebuild (renamed from net-im/err/err-1.3.0.ebuild)6
-rw-r--r--net-im/err/files/err-tests.patch11
4 files changed, 30 insertions, 3 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/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'],