Stabilise latest on amd64 and x86. Drop older.

(Portage version: 2.2.0_alpha125/cvs/Linux x86_64)

7 files changed, 13 insertions, 185 deletions

diff --git a/sys-libs/tevent/ChangeLog b/sys-libs/tevent/ChangeLog
index 8f4e838e2c4e..7ec18ea97dd1 100644
--- a/sys-libs/tevent/ChangeLog
+++ b/sys-libs/tevent/ChangeLog
@@ -1,6 +1,12 @@
 # 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.18 2012/07/06 03:16:12 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/tevent/ChangeLog,v 1.19 2012/09/13 19:00:54 scarabeus Exp $
+
+  13 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/add-py-file-0.9.14.patch, -files/tevent-version.patch,
+  -tevent-0.9.12.ebuild, -tevent-0.9.14-r1.ebuild, -tevent-0.9.15.ebuild,
+  tevent-0.9.16.ebuild:
+  Stabilise latest on amd64 and x86. Drop older.
 
   06 Jul 2012; Jeff Horelick <jdhore@gentoo.org> tevent-0.9.14-r1.ebuild:
   marked x86 per bug 417115
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/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.12.ebuild b/sys-libs/tevent/tevent-0.9.12.ebuild
deleted file mode 100644
index e24a92e5670e..000000000000
--- a/sys-libs/tevent/tevent-0.9.12.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/tevent/tevent-0.9.12.ebuild,v 1.3 2011/08/14 09:58:07 xarthisius Exp $
-
-EAPI=3
-PYTHON_DEPEND="2"
-
-inherit waf-utils python
-
-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 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=sys-libs/talloc-2.0.5
-	>=dev-lang/python-2.4.2"
-RDEPEND="${DEPEND}"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
diff --git a/sys-libs/tevent/tevent-0.9.14-r1.ebuild b/sys-libs/tevent/tevent-0.9.14-r1.ebuild
deleted file mode 100644
index 19aee035e2fe..000000000000
--- a/sys-libs/tevent/tevent-0.9.14-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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-r1.ebuild,v 1.5 2012/07/06 03:16:12 jdhore Exp $
-
-EAPI=4
-PYTHON_DEPEND="2"
-
-inherit waf-utils python
-
-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 ~hppa ~ppc ~ppc64 x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-lang/python-2.4.2
-	>=sys-libs/talloc-2.0.6[python]"
-
-DEPEND="${RDEPEND}
-	virtual/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
-}
diff --git a/sys-libs/tevent/tevent-0.9.15.ebuild b/sys-libs/tevent/tevent-0.9.15.ebuild
deleted file mode 100644
index 7353b165ab3d..000000000000
--- a/sys-libs/tevent/tevent-0.9.15.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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.15.ebuild,v 1.4 2012/05/12 19:32:21 aballier Exp $
-
-EAPI=4
-PYTHON_DEPEND="2"
-
-inherit waf-utils python
-
-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 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-lang/python-2.4.2
-	>=sys-libs/talloc-2.0.6[python]"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-PATCHES=( "${FILESDIR}"/add-py-file.patch )
-
-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
-}
diff --git a/sys-libs/tevent/tevent-0.9.16.ebuild b/sys-libs/tevent/tevent-0.9.16.ebuild
index 4895ead8ce51..6e7fd918fbeb 100644
--- a/sys-libs/tevent/tevent-0.9.16.ebuild
+++ b/sys-libs/tevent/tevent-0.9.16.ebuild
@@ -1,9 +1,9 @@
 # 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.16.ebuild,v 1.1 2012/07/04 09:10:05 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/tevent/tevent-0.9.16.ebuild,v 1.2 2012/09/13 19:00:54 scarabeus Exp $
 
 EAPI=4
-PYTHON_DEPEND="2"
+PYTHON_DEPEND="2:2.4"
 
 inherit waf-utils python
 
@@ -13,14 +13,14 @@ SRC_URI="http://samba.org/ftp/tevent/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=dev-lang/python-2.4.2
-	>=sys-libs/talloc-2.0.6[python]"
+RDEPEND=">=sys-libs/talloc-2.0.6[python]"
 
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 WAF_BINARY="${S}/buildtools/bin/waf"
 PATCHES=( "${FILESDIR}"/add-py-file.patch )