Version bump. Removed old

(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

7 files changed, 63 insertions, 172 deletions

diff --git a/sys-libs/tevent/ChangeLog b/sys-libs/tevent/ChangeLog
index 8fec6ec6a646..004e4257e79e 100644
--- a/sys-libs/tevent/ChangeLog
+++ b/sys-libs/tevent/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-libs/tevent
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/tevent/ChangeLog,v 1.70 2014/09/15 08:24:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/tevent/ChangeLog,v 1.71 2014/10/03 21:02:14 polynomial-c Exp $
+
+*tevent-0.9.22 (03 Oct 2014)
+
+  03 Oct 2014; Lars Wendler <polynomial-c@gentoo.org> -tevent-0.9.20.ebuild,
+  -tevent-0.9.21.ebuild, +tevent-0.9.22.ebuild,
+  -files/add-py-file-0.9.14.patch, -files/add-py-file.patch,
+  -files/tevent-version.patch:
+  Version bump. Removed old.
 
   15 Sep 2014; Agostino Sarubbo <ago@gentoo.org> tevent-0.9.21-r1.ebuild:
   Stable for sparc, wrt bug #512012
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 32708160ea36..000000000000
--- 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 cd919834e66d..000000000000
--- 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 2042ec58add1..000000000000
--- 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.20.ebuild b/sys-libs/tevent/tevent-0.9.20.ebuild
deleted file mode 100644
index 935f7580ce1f..000000000000
--- a/sys-libs/tevent/tevent-0.9.20.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 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.3 2014/06/10 00:13:08 vapier 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-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_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.ebuild b/sys-libs/tevent/tevent-0.9.21.ebuild
deleted file mode 100644
index 22138d81ad1f..000000000000
--- a/sys-libs/tevent/tevent-0.9.21.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 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.2 2014/06/10 00:13:08 vapier 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-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_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.22.ebuild b/sys-libs/tevent/tevent-0.9.22.ebuild
new file mode 100644
index 000000000000..596188b5f834
--- /dev/null
+++ b/sys-libs/tevent/tevent-0.9.22.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/tevent/tevent-0.9.22.ebuild,v 1.1 2014/10/03 21:02:14 polynomial-c Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit waf-utils multilib-minimal 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="python"
+
+RDEPEND=">=sys-libs/talloc-2.1.0[python?,${MULTILIB_USEDEP}]
+	python? ( ${PYTHON_DEPS} )"
+
+DEPEND="${RDEPEND}
+	>=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"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		$(multilib_native_usex python '' '--disable-python')
+}
+
+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
+
+	multilib_is_native_abi && use python && python_domodule tevent.py
+}