diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2012-09-20 17:53:58 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-09-20 17:53:58 +0000 |
commit | 5793d09278cf7bffa23a8d6324ab1a352f8e76aa (patch) | |
tree | 62416105d432f88eeec8633026375756edaa773d /sys-libs | |
parent | Fix homepage. No vars there. (diff) | |
download | gentoo-2-5793d09278cf7bffa23a8d6324ab1a352f8e76aa.tar.gz gentoo-2-5793d09278cf7bffa23a8d6324ab1a352f8e76aa.tar.bz2 gentoo-2-5793d09278cf7bffa23a8d6324ab1a352f8e76aa.zip |
Also add missing patches wrt bug#435568.
(Portage version: 2.2.0_alpha129/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs')
-rw-r--r-- | sys-libs/tevent/ChangeLog | 6 | ||||
-rw-r--r-- | sys-libs/tevent/files/add-py-file-0.9.14.patch | 32 | ||||
-rw-r--r-- | sys-libs/tevent/files/tevent-version.patch | 27 |
3 files changed, 64 insertions, 1 deletions
diff --git a/sys-libs/tevent/ChangeLog b/sys-libs/tevent/ChangeLog index 7e10286cc006..ac46e4ab5d14 100644 --- a/sys-libs/tevent/ChangeLog +++ b/sys-libs/tevent/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/tevent # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/tevent/ChangeLog,v 1.20 2012/09/13 19:08:03 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/tevent/ChangeLog,v 1.21 2012/09/20 17:53:58 scarabeus Exp $ + + 20 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org> + +files/add-py-file-0.9.14.patch, +files/tevent-version.patch: + Also add missing patches wrt bug#435568. *tevent-0.9.14-r1 (13 Sep 2012) diff --git a/sys-libs/tevent/files/add-py-file-0.9.14.patch b/sys-libs/tevent/files/add-py-file-0.9.14.patch new file mode 100644 index 000000000000..32708160ea36 --- /dev/null +++ b/sys-libs/tevent/files/add-py-file-0.9.14.patch @@ -0,0 +1,32 @@ +--- /dev/null ++++ /tevent.py +@@ -0,0 +1,29 @@ ++#!/usr/bin/python ++# ++# Python integration for tevent ++# ++# Copyright (C) Jelmer Vernooij 2011 ++# ++# ** NOTE! The following LGPL license applies to the tevent ++# ** library. This does NOT imply that all of Samba is released ++# ** under the LGPL ++# ++# This library is free software; you can redistribute it and/or ++# modify it under the terms of the GNU Lesser General Public ++# License as published by the Free Software Foundation; either ++# version 3 of the License, or (at your option) any later version. ++# ++# This library is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# Lesser General Public License for more details. ++# ++# You should have received a copy of the GNU Lesser General Public ++# License along with this library; if not, see <http://www.gnu.org/licenses/>. ++ ++from _tevent import ( ++ __version__, ++ backend_list, ++ Context, ++ Signal, ++ ) diff --git a/sys-libs/tevent/files/tevent-version.patch b/sys-libs/tevent/files/tevent-version.patch new file mode 100644 index 000000000000..2042ec58add1 --- /dev/null +++ b/sys-libs/tevent/files/tevent-version.patch @@ -0,0 +1,27 @@ +--- a/pytevent.c ++++ b/pytevent.c +@@ -761,4 +761,6 @@ void init_tevent(void) + + Py_INCREF(&TeventFd_Type); + PyModule_AddObject(m, "Fd", (PyObject *)&TeventFd_Type); ++ ++ PyModule_AddObject(m, "__version__", PyString_FromString(PACKAGE_VERSION)); + } +--- a/wscript ++++ b/wscript +@@ -92,7 +92,14 @@ + 'pytevent.c', + deps='tevent', + enabled=True, +- realname='_tevent.so') ++ realname='_tevent.so', ++ cflags='-DPACKAGE_VERSION=\"%s\"' % VERSION) ++ # install out various python scripts for use by make test ++ bld.SAMBA_SCRIPT('tevent_python', ++ pattern='tevent.py', ++ installdir='python') ++ ++ bld.INSTALL_WILDCARD('${PYTHONDIR}', 'tevent.py', flat=False) + + + def test(ctx): |