Add patches to 0.9.14, fix bug 403239. Thanks to slepnoga

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

5 files changed, 97 insertions, 13 deletions

diff --git a/sys-libs/tevent/ChangeLog b/sys-libs/tevent/ChangeLog
index 7115c8b8a279..932b80fc9d39 100644
--- a/sys-libs/tevent/ChangeLog
+++ b/sys-libs/tevent/ChangeLog
@@ -1,6 +1,13 @@
 # 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.10 2012/02/12 11:43:28 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/tevent/ChangeLog,v 1.11 2012/02/12 12:28:08 maksbotan Exp $
+
+*tevent-0.9.14-r1 (12 Feb 2012)
+
+  12 Feb 2012; Maxim Koltsov <maksbotan@gentoo.org>
+  +files/add-py-file-0.9.14.patch, +files/tevent-version.patch,
+  +tevent-0.9.14-r1.ebuild, -tevent-0.9.14.ebuild:
+  Add patches to 0.9.14, fix bug 403239. Thanks to slepnoga
 
 *tevent-0.9.15 (12 Feb 2012)
 
diff --git a/sys-libs/tevent/Manifest b/sys-libs/tevent/Manifest
index f66761165e5b..91d9524006ca 100644
--- a/sys-libs/tevent/Manifest
+++ b/sys-libs/tevent/Manifest
@@ -1,23 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX add-py-file-0.9.14.patch 1093 RMD160 2584b587e62fe22d2aa8b82c75bc0a0796ba0cea SHA1 d4feac73909a96dcf67eb092edbaea188dfa6ac6 SHA256 8b19556991ca4c5279e842a267ae38a5275caf0eaaa0db19f3c407972fa66c29
 AUX add-py-file.patch 1094 RMD160 d388405c8e69fd01e61d0b5008009df3c9816aab SHA1 6901c3395fccaf7265c6bf3bc11f2a0f8af1d21f SHA256 91543e43496f22684032eece3ab409b6e45908d3c4cc9c25f2e3d1844a6cb457
+AUX tevent-version.patch 832 RMD160 d5f97dfd22ba077bb134a5a9136c52b8b96ee424 SHA1 bff60651e61513c8320681608543776e704c2392 SHA256 9f03c4fa65358620e6ed50d5ebad78a522ee4e3a3dceade97fd5023c36e97799
 DIST tevent-0.9.12.tar.gz 436380 RMD160 2e657afb043073d1d179a071df4340c39ae2ccbf SHA1 70681427f9038fbb60e6a845721d8c2681f73127 SHA256 b0f6822bb882b6d6f03f92fd6ed051178b9807ddf4f773fe3fcf2b1a3112ea9e
 DIST tevent-0.9.14.tar.gz 434393 RMD160 87211b3f1abea4ff48b05fa196d6fda70085f1c9 SHA1 85aa3a6cc9a8e6a1c9f2e67117398ed6724a0ed5 SHA256 52f085f8177ebbe5b60d2dcc1d72a4630aeb4da792ec37fc4ea56974e2927a75
 DIST tevent-0.9.15.tar.gz 484269 RMD160 0692fda5799856dd8f37b0841fa348bdb7bef685 SHA1 48fedbb14a7b95fa023fd2891300dcaabc73a79a SHA256 2b32ad8b26a5fe2666992615858f9ebe38edac9c50fb2348288ab499d1f2c245
 EBUILD tevent-0.9.12.ebuild 662 RMD160 d7e13aeab5014b868de511ab4b8f4daf0710ba70 SHA1 1010e94e15524912ad7dfe66ab71a23e8a573e8e SHA256 297e407f72a15a15726fe6ac621df3ccb3ca2b804e5ced948e5b6eb5c6657ecc
-EBUILD tevent-0.9.14.ebuild 690 RMD160 b3ce3a495de80709e1f038e9a76c58bf0860b095 SHA1 5b5d5639fa6b84f8ce6bbbc83ba29b11f746f961 SHA256 0894d1a9e050c955d44d80874764b02e225c64da694452b140781e632a25b8eb
+EBUILD tevent-0.9.14-r1.ebuild 970 RMD160 727d4aa0ed96216f3f6524e11cfd6e81299af4d3 SHA1 db6463471ab3c73cc3eb9f4c8e487af8662667cd SHA256 822aca6fb894b8afd056aa234584d63d24606a0890df779757ab3e2616c66af8
 EBUILD tevent-0.9.15.ebuild 924 RMD160 683e99915a97e4a1653e213fc92193e2dd60d377 SHA1 e941ca93a059e2a989d0edcbd8e25f758acb1902 SHA256 b21b1b36a60743d359d34e4a53335de796e6b1c39b73dc9b32ccb33916a8152c
-MISC ChangeLog 1637 RMD160 15ae1ae74dfccff48e34959d373a2a22130d2cb3 SHA1 0a21508002852ba5431b7f86cc1d4ea0068b1227 SHA256 a50ca4d6e3b3d64497a9dfd57477f381150e6a623061137d1f977200ee9f9f69
+MISC ChangeLog 1898 RMD160 3f201a4254f3516efa2ae7e778af0bfee7d2c1ab SHA1 641da9d2b8b46225f84ec128b7f2b97117818e96 SHA256 a726a19a6dd6e5e59ab3bdc6e4905f38ad93213310e3e571df0dfb1ed0a50e26
 MISC metadata.xml 253 RMD160 c3ade38fa7a209fad3bd557b95bb081bdadc16e0 SHA1 398363be25617e373071f14e5fe71a38e418e95a SHA256 89737be021da6f1a76894bd234f227b72ba57fd0213bdfdc0f5b38f1051ce775
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPN6ZcAAoJEAmJmMX429reXtUH/3Cwtqdg8JQxF+kpCi0od7fV
-99o2iecRHk9N4jZjo+tTfdgoOUO6VUkzazct7Zw9J2oOBs6BTimFpPcVR5ErIg3e
-1if0ziY9TNKEovTDIvRngnj0D7y8JoMQX9zfSuQBuMzIokGajmfFEZ0o0mMvuv2/
-nzE9PjIEI1GncVRVq8jUVLVmzYj9jnZHZcPEsBpavBrHohmjeZpNKP+Z9tbGprGd
-2hnQe7XjjCplKNOcBp+IXJP2kfK1B9e23xrZWKFVoRaxlqr2eoBNJu49yg4A98sI
-Kzfzv0t3ojDw+TTHKqCg9Sjq7kzYKkFA5hmh5KjcYi+gjRanBzgUe1sby6zhAkk=
-=XVnj
+iQEcBAEBAgAGBQJPN7DUAAoJEAmJmMX429reXPUIAIK9uophVXs5o0RUc5ldpShP
+cw74OMW3DA+nGVgAVrlfIs/z0foEdUUkwVKks/W0PWRjp7PspR+mkX+Gupl6Z7iC
+kVm1Use5VgdDGfC+3sJbneHt5EUsKNiHjlK77QOHUMm4vh68jc375KkgS7v4xx7O
+aorIP8EZrh4cvRACqyTmEheVcQtj3Zmxi/BWasiHAp5CQKA92NTObCV4LkVThTEQ
+UJChimemPhzB55pijY1MGA5XLxnY605025xhxsvk5zu9pdrV3V4ovSaaks3v6TRl
++cZZCT585/l3ZcHZdTs3WJgliG1Iz0ggUlAsGM8TJT6FoepludEZ8gJkLsL5Mlo=
+=A90f
 -----END PGP SIGNATURE-----
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):
diff --git a/sys-libs/tevent/tevent-0.9.14.ebuild b/sys-libs/tevent/tevent-0.9.14-r1.ebuild
index ff67e5ca6de5..5ff20d03bad8 100644
--- a/sys-libs/tevent/tevent-0.9.14.ebuild
+++ b/sys-libs/tevent/tevent-0.9.14-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/tevent/tevent-0.9.14.ebuild,v 1.2 2011/10/31 16:02:11 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/tevent/tevent-0.9.14-r1.ebuild,v 1.1 2012/02/12 12:28:08 maksbotan Exp $
 
-EAPI=3
+EAPI=4
 PYTHON_DEPEND="2"
 
 inherit waf-utils python
@@ -22,9 +22,25 @@ RDEPEND=">=dev-lang/python-2.4.2
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/add-py-file-${PV}.patch
+		"${FILESDIR}"/tevent-version.patch )
 WAF_BINARY="${S}/buildtools/bin/waf"
 
 pkg_setup() {
 	python_set_active_version 2
 	python_pkg_setup
 }
+
+src_install() {
+	waf-utils_src_install
+	insinto $(python_get_sitedir)
+	doins tevent.py
+}
+
+pkg_postinst() {
+	python_mod_optimize tevent.py
+}
+
+pkg_postrm() {
+	python_mod_cleanup tevent.py
+}