commit: e9ee4f7e9758acd1805844b5dce495d5364b06f6 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Thu Jul 16 19:50:21 2015 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Thu Jul 16 19:50:21 2015 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=e9ee4f7e
sys-libs/tevent: stabilize to keep up with the tree version. Package-Manager: portage-2.2.18 Manifest-Sign-Key: 0xF52D4BBA sys-libs/tevent/Manifest | 9 +----- sys-libs/tevent/files/add-py-file-0.9.14.patch | 32 ------------------- sys-libs/tevent/files/add-py-file.patch | 32 ------------------- sys-libs/tevent/files/tevent-version.patch | 27 ---------------- sys-libs/tevent/tevent-0.9.19-r99.ebuild | 44 -------------------------- sys-libs/tevent/tevent-0.9.20-r99.ebuild | 44 -------------------------- sys-libs/tevent/tevent-0.9.21-r99.ebuild | 40 +++++++++++++++-------- 7 files changed, 27 insertions(+), 201 deletions(-) diff --git a/sys-libs/tevent/Manifest b/sys-libs/tevent/Manifest index b7af3db..3fbf905 100644 --- a/sys-libs/tevent/Manifest +++ b/sys-libs/tevent/Manifest @@ -1,11 +1,4 @@ -AUX add-py-file-0.9.14.patch 1093 SHA256 8b19556991ca4c5279e842a267ae38a5275caf0eaaa0db19f3c407972fa66c29 SHA512 aca86b56fd353c04eedd2a02a1f68db3a72b2b8ad7b669bdda1fbb9632a8acd69d523ad1e23665fc0ff4abdee89815fe8194a36a9d0d03ac45c7ac06e0ff262b WHIRLPOOL 9fd1b46c5b8c93597401cdcbdeda1e03f9e9fac97b38dcede18be4f67930fe53fcaacdf8324bbb74b37700eb77ab9e2bdf7672115204a6178c751f0fb441fe61 -AUX add-py-file.patch 1094 SHA256 91543e43496f22684032eece3ab409b6e45908d3c4cc9c25f2e3d1844a6cb457 SHA512 f1db337951fe797b48ef630e4c0e1370ed514f156671f5b039385c4cd6285109f681a2c38efa77ae02de64798076ad533557ac07b6827e99ee1d181fbae03b35 WHIRLPOOL 7dcabfabc62da2d12a5ea7fc9db78deaa7b81242c367ca0d44c63091d40d3a661696f565b11c2f64688a02d861026b8174651e72ffe87b28928ea27285e409ed AUX tevent-remove-check-bsd-strtoll.patch 1149 SHA256 3c912c5129e9bcfce51cb1c0517e4fe641371d3eea9af43454024858eb6418fe SHA512 69ef329df08066b877b554b1fdc0270190db4b80d3fc11988736584e7743047d3afc11c1678dcaaff71d00fe443a13de118a85727df1097ae7edf80d43b7bdf9 WHIRLPOOL c50aa5ffef33ff9fc099893f81081dcb2d939216a05bad7106d210eba08ab41413ebb5054675e30a943fe0d5dd91190576069a9156d6735576daf744e22923f3 -AUX tevent-version.patch 832 SHA256 9f03c4fa65358620e6ed50d5ebad78a522ee4e3a3dceade97fd5023c36e97799 SHA512 e0762c4f45bf6cdbf91dc45de22bab3a7722707ca0a19246ad10a622959e63507ded160e27d5cb6f55b086cccc06d5dfaad0dcc89b9b46c4f8926f7ea4546db1 WHIRLPOOL a16eceed526dc7d82cdd99f26e47dd7ef3463a07a1b31f2287443ab28abecfe9d1afbf8c96a8992bf6055ade1f057dc07a2cb300c5b61ac6387f19422b09ef05 -DIST tevent-0.9.19.tar.gz 543195 SHA256 f9a1d079844ec0068804541ee2421d8ff34d7a4cdb93a6cc20d0edd5302e3fc9 SHA512 9c8eb11dc8efbf6b7651261bb4359c6100022145df749630c116ecafea62f6527c3cc7ab73499e3ff1854454aab3947c58d49a9765fc857ac0ddd90250299d0d WHIRLPOOL ebdda4d558a023531c7c991027442dd05f83936f9e8389ce83de06b9d60033dea0e36299c3ed808a9670d84bb3c43297d3d5a5d62670e69ede474ef0bec32581 -DIST tevent-0.9.20.tar.gz 549404 SHA256 b31ce8d066f124a920ed106855ce5df4dc2f86614edd861f422f06890d353814 SHA512 b3d8b892d463f903eab88a569fadd2bf8588d83b2a7db973a5445d66e1eb4dfddc93e349407b16d0e52b6a23cd2fa131bc92cac657f71e8998516017a9dcb546 WHIRLPOOL 7bfcdbc93d3286f5b70ca33031e89cd342babf301549d99a02aad563fc8199041736287dfbe9b783a3674404c2cf11864a761c02795db72044c8f6e0b0e6dd1f DIST tevent-0.9.21.tar.gz 550606 SHA256 f2be7463573dab2d8210cb57fe7e7e2aeb323274cbdc865a6e29ddcfb977f0f4 SHA512 d1d76402bf32c4da9394ec5e0eb149abefa3f4dc86e5d22529f5cc4f30b1d3071e7a00aac3bd5707532e68dfed5a03dc5a267ea367c8fbe0aaead9df63beafdf WHIRLPOOL 4b4525394cdc06a5ce2535216eea8fdcf44dc0b4ab7964506042df3ee67ce9463d82e9b6be3bdd4cd9983ce92a62e3dfc69c6abf66d30b9b6466e863b2c1d7cd -EBUILD tevent-0.9.19-r99.ebuild 932 SHA256 59f9365bb387a6d6a57c48fddfe0ad6520e1e6403f004cd5016f63559ba282f2 SHA512 601cabdf6bd42f371b4929b2ec08a83e57160101b9be344bb116038ed65e738d357bc35993cdfc9f2914a10fe08a15608512e31608fa3c9b3e17961bd4d31485 WHIRLPOOL a0323d708fd1f3222f8a7beaeadd1b4862d0fe0bd13435d0e12f4c9730d0b2ce59f166952dafdd8db2c002b471faddc42451084d7f082ce5e8da020116757ac8 -EBUILD tevent-0.9.20-r99.ebuild 930 SHA256 e573558731ba8286fcd528583b40cc46f44911924c2ba96ea127c5865f689eea SHA512 24a803638473fe6786c0f19f7fbd99c702ceb8421696d40e9735d46d61de840d862b7eeddfe95fa77c8316962584ab92ad2a3cee16f1d7a53cd2b869d514eccc WHIRLPOOL d03eead599ad9d78baacf906c8fb5b3b52d4147ca78148b642110f64fd8dc745ff6cac87c3cbf0bd6b17c9e168524044ed574371bddadf020d926f8b1e08e4bc -EBUILD tevent-0.9.21-r99.ebuild 930 SHA256 596d6e88c77bb05a3a96a17cc699f7fd3785d523bdf7280fbd75d96fb53ea637 SHA512 7ae4d1ae75978c5e58231ec65e4488fef882e4226a8c7e9dd9e3a608611d641b4d78c47383bcabdf29dd208a713843cd5570e9bc832cf6b18d1d1cfee0510113 WHIRLPOOL a3ec7e7ac5aeb1be57752d07aa360a7da05d73010bb0ccc35cf809cd71966087f624c7c119e110e0e7c10d1d8974d5ba2275f11f80184d09f6652946e9585066 +EBUILD tevent-0.9.21-r99.ebuild 1382 SHA256 c46d259567c1d393d49d6a59cc99d2d307664842b774ec4a5e47bc6940ba70dd SHA512 3cfbc1aab681f1502269e6a00757ce5a2827cfd1a5fa57c19083032409bbe2ccbee896a4ca55c4a4af1f04430ab618ba3c100bc58b1d95281aae09506a300838 WHIRLPOOL 255bae50fb10489a06d7cb430c50d60d2e32703219df93af0626b77bc61e1893e56d069f2059242ecb3014f1cbc0364cefd9bcfa51fca0292ae6485d0faa2982 MISC metadata.xml 253 SHA256 89737be021da6f1a76894bd234f227b72ba57fd0213bdfdc0f5b38f1051ce775 SHA512 58c5ed90694ec0914f49f21b7066d7bd5610f53bbd0ee01e6d1b285e5f8f261bcb681e19b21c39287c312fc982b300f2a34a8cc638eaa0e939dd0da2b046288a WHIRLPOOL 15e90e302adf797a5761d14558f652e319613ec179ea5a4cdfcff2040bcf8d0cc734266744a69e644108ec47bcdde213ad5eaf0c7adf9d796a21e62a58ed9dfe 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 deleted file mode 100644 index 3270816..0000000 --- a/sys-libs/tevent/files/add-py-file-0.9.14.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- /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/add-py-file.patch b/sys-libs/tevent/files/add-py-file.patch deleted file mode 100644 index cd91983..0000000 --- a/sys-libs/tevent/files/add-py-file.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- /dev/null -+++ b/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 deleted file mode 100644 index 2042ec5..0000000 --- a/sys-libs/tevent/files/tevent-version.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- 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.19-r99.ebuild b/sys-libs/tevent/tevent-0.9.19-r99.ebuild deleted file mode 100644 index b5d6060..0000000 --- a/sys-libs/tevent/tevent-0.9.19-r99.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/tevent/tevent-0.9.19.ebuild,v 1.15 2013/09/06 20:08:35 maekke Exp $ - -EAPI=5 -PYTHON_COMPAT=( python2_{6,7} ) - -inherit waf-utils python-single-r1 - -DESCRIPTION="Samba tevent library" -HOMEPAGE="http://tevent.samba.org/"; -SRC_URI="http://samba.org/ftp/tevent/${P}.tar.gz"; - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 arm ~mips ppc x86" -IUSE="" - -RDEPEND=">=sys-libs/talloc-2.0.8[python] - ${PYTHON_DEPS}" - -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -WAF_BINARY="${S}/buildtools/bin/waf" - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-remove-check-bsd-strtoll.patch -} - -src_install() { - waf-utils_src_install - python_export PYTHON_SITEDIR - insinto "${PYTHON_SITEDIR#${EPREFIX}}" - doins tevent.py - python_optimize -} diff --git a/sys-libs/tevent/tevent-0.9.20-r99.ebuild b/sys-libs/tevent/tevent-0.9.20-r99.ebuild deleted file mode 100644 index 8b1a9c5..0000000 --- a/sys-libs/tevent/tevent-0.9.20-r99.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/tevent/tevent-0.9.20.ebuild,v 1.2 2013/12/16 08:53:50 polynomial-c Exp $ - -EAPI=5 -PYTHON_COMPAT=( python2_{6,7} ) - -inherit waf-utils python-single-r1 - -DESCRIPTION="Samba tevent library" -HOMEPAGE="http://tevent.samba.org/"; -SRC_URI="http://samba.org/ftp/tevent/${P}.tar.gz"; - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -RDEPEND=">=sys-libs/talloc-2.1.0[python] - ${PYTHON_DEPS}" - -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -WAF_BINARY="${S}/buildtools/bin/waf" - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-remove-check-bsd-strtoll.patch -} - -src_install() { - waf-utils_src_install - python_export PYTHON_SITEDIR - insinto "${PYTHON_SITEDIR#${EPREFIX}}" - doins tevent.py - python_optimize -} diff --git a/sys-libs/tevent/tevent-0.9.21-r99.ebuild b/sys-libs/tevent/tevent-0.9.21-r99.ebuild index 89f9e79..843c634 100644 --- a/sys-libs/tevent/tevent-0.9.21-r99.ebuild +++ b/sys-libs/tevent/tevent-0.9.21-r99.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-libs/tevent/tevent-0.9.21.ebuild,v 1.1 2014/01/18 23:19:27 polynomial-c Exp $ EAPI=5 -PYTHON_COMPAT=( python2_{6,7} ) +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="threads(+)" -inherit waf-utils python-single-r1 +inherit waf-utils multilib-minimal python-single-r1 DESCRIPTION="Samba tevent library" HOMEPAGE="http://tevent.samba.org/"; @@ -13,16 +14,17 @@ SRC_URI="http://samba.org/ftp/tevent/${P}.tar.gz"; LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" +KEYWORDS="amd64 arm ~mips ppc x86" +IUSE="python" -RDEPEND=">=sys-libs/talloc-2.1.0[python] - ${PYTHON_DEPS}" +RDEPEND=">=sys-libs/talloc-2.1.0[python?,${MULTILIB_USEDEP}] + python? ( ${PYTHON_DEPS} )" DEPEND="${RDEPEND} - virtual/pkgconfig + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + ${PYTHON_DEPS} " - +# build system does not work with python3 REQUIRED_USE="${PYTHON_REQUIRED_USE}" WAF_BINARY="${S}/buildtools/bin/waf" @@ -33,12 +35,22 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}"/${PN}-remove-check-bsd-strtoll.patch + multilib_copy_sources +} + +multilib_src_configure() { + waf-utils_src_configure \ + $(multilib_native_usex python '' '--disable-python') } -src_install() { +multilib_src_compile() { + # need to avoid parallel building, this looks like the sanest way with waf-utils/multiprocessing eclasses + unset MAKEOPTS + waf-utils_src_compile +} + +multilib_src_install() { waf-utils_src_install - python_export PYTHON_SITEDIR - insinto "${PYTHON_SITEDIR#${EPREFIX}}" - doins tevent.py - python_optimize + + multilib_is_native_abi && use python && python_domodule tevent.py }
