8 files changed, 29 insertions, 203 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/Manifest b/sys-libs/tevent/Manifest
index 18fb8760b4e5..a4688c7628dd 100644
--- a/sys-libs/tevent/Manifest
+++ b/sys-libs/tevent/Manifest
@@ -1,27 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-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-version.patch 832 SHA256 9f03c4fa65358620e6ed50d5ebad78a522ee4e3a3dceade97fd5023c36e97799 SHA512 e0762c4f45bf6cdbf91dc45de22bab3a7722707ca0a19246ad10a622959e63507ded160e27d5cb6f55b086cccc06d5dfaad0dcc89b9b46c4f8926f7ea4546db1 WHIRLPOOL a16eceed526dc7d82cdd99f26e47dd7ef3463a07a1b31f2287443ab28abecfe9d1afbf8c96a8992bf6055ade1f057dc07a2cb300c5b61ac6387f19422b09ef05
-DIST tevent-0.9.12.tar.gz 436380 SHA256 b0f6822bb882b6d6f03f92fd6ed051178b9807ddf4f773fe3fcf2b1a3112ea9e SHA512 33a120d1f01f06504c0fd72d0b7ee84346c3fc1763be3257cdef729d4e2bd9070c8be777376a438d74aa53d250b36631603f89f712dfcfe8095680b7947118f4 WHIRLPOOL 7f12a46ce6521cfaa408188a7cff69672cab891e21fed0e38a01be88f29dbd8ca3d70922e32d759752e0da72756b14d73d31c36b4b3d12cdda416f78ffd4ad66
-DIST tevent-0.9.14.tar.gz 434393 SHA256 52f085f8177ebbe5b60d2dcc1d72a4630aeb4da792ec37fc4ea56974e2927a75 SHA512 5fd1f5d097ce20657c91a7542e74d12c923cd776924bcbb7dab9e4b9bab1e19ae0bdf464f9cc4470d26fb523b7564b15bc2cdb699ff8c00acf3a2defbc987675 WHIRLPOOL c35f20f7b1d5c527eca413b5fe81aca8118abbbb26b41d7b6c81df2fd30b32a4f57fbd9c9b70a052971e6fd93f7ce7468642a4591cf4514a4686518e19bc8068
-DIST tevent-0.9.15.tar.gz 484269 SHA256 2b32ad8b26a5fe2666992615858f9ebe38edac9c50fb2348288ab499d1f2c245 SHA512 bc42edc1c1cf3dc572974d267fde7d05eca0765df5b34df56a21e79df069a8a1967e9f72e1789c30b36792c244b26e18900dc899e7dd436b60b0c3769fa96780 WHIRLPOOL e74cb1cfdb48cc765dac9ff401df93c8a6e38759759035f0bbc8c371205be50459c5f67beb52ad5063de38b28d923c6910e7f2bca1c6372f5846ef24c1df2880
 DIST tevent-0.9.16.tar.gz 494670 SHA256 ccaa11fb3aa2516951f08d02fef186f30bb76cd4114c839fa410ff819162e021 SHA512 0b8c65bdb465e39737acb8be850ae096ab5182762dbd5510b974480b6d336ffafbe48c983671a6cb7bd9c19eb8ef52e71475d7ed0c8a64b0226b4ca0e0773407 WHIRLPOOL e9b26fb7c80c06c4e14699cb2f016387870fe2e83f4f9af7f7be3fd42222e0723cda0a7f1c5796edc7b74b87cc151fca28a0a81f70adb9c17ba30d735eb87b3f
-EBUILD tevent-0.9.12.ebuild 662 SHA256 297e407f72a15a15726fe6ac621df3ccb3ca2b804e5ced948e5b6eb5c6657ecc SHA512 9d59a880ecf8b126e136cfb4dd06321e22d1ff523d8963c10c38dcbfe9c59dd1636acd456830614769b6c84cfc359dbf7a0b512597911555e028078b95a64851 WHIRLPOOL 723035b3c3d8f9210a747d006e902e839ecca750aa899437ae26dafa56e7733f4ada548830a7db2a1b99fd2734f844854b929871ed1998ab04df9635a6e413d5
-EBUILD tevent-0.9.14-r1.ebuild 971 SHA256 62e1963841aee5b0b6b7a9c89e56793b803cad667dc31b28141f0ed53d5b0073 SHA512 79b35e48ac8714a9b974a29e334545cc4224b5bb22dc2c133654ca3eb92d7a32c2e3754e1e4c48c604b4d7cbc1b06a9874194e319d45e8c82239aff4350b2624 WHIRLPOOL 1db616fec15879e679999ffc6a0693c03e987932738d694880b4a6e2e260360df884670ad1112558d9048d9bab5ca204505bdbc3639fe879cd4c30ff8317e28a
-EBUILD tevent-0.9.15.ebuild 939 SHA256 8c38662f6394d7c1904ca268e09d42dcc8a9ce513e7a820acfd820a9d215aa41 SHA512 c9a667f325fd4e6cc020e69cbe4dc02f9411e8bf8096cf472b5c3190ceaf90a868f26518fd31c42d7affa36dcf2b1e78ec55d65fe9d666f1cb157d72d1d73dd8 WHIRLPOOL a736cf1566925c34108d9cd1a79d2ed372f1549a799ccf1d40d177a01c7310a3b6e796b6971bbdf0c771058ed88bc8d8a6cdc8bace8c37ed7bb06ac88b6f197f
-EBUILD tevent-0.9.16.ebuild 938 SHA256 b181500d74904622fb596ac6009a96993fc7a42c0a11238aa5e702c35b935137 SHA512 4bcc39411d9ec34a7fabfd3d34b8e8e2a133e2e44d1e4e69a0ce254748667c907ba4db4741b2d82ccbe344666e04cc0dce18b2af929222d74b89504d37338c80 WHIRLPOOL 580dec09af6b50f2d60a09871b8f159c2bee62c2e9ebb8642d98d22e3998b559fc1e85aeca3508f54c8a756a3ca4fda658fd10df4fc9c3bd8d08c9c60c398a58
-MISC ChangeLog 2678 SHA256 c429b9e65dabb213087b874a63679def4374e9bfa643b8b728a8e7e3d14b299c SHA512 8bd92c3f80b7e4a5f6e9daffd6fe4b5227d26768ebad89ff700027342844d5a2dad37afbbaf996a1650c117b8302e9a4f8f63e10d44de8689a155646774a2c41 WHIRLPOOL 1e9c7a501e8685dd1ad752121eaf2c272e862dec495eca8abf67e4876a19037b8b7a061ae15071e81752e0d485c475c1b4973354f157be75fee3e73060dacd0c
+EBUILD tevent-0.9.16.ebuild 918 SHA256 6d5f2382bea48e98ecdf23f737b60b6bd0caaad93e36fdbd33e842b5e4c9f263 SHA512 f691bc724407ddfaceef8ac2c0734740eff698397d69b8c5b359972f6f97ab97c8e5812ad36ea2937b2c0e8fc2ab41ae60c410356b866330d60453f3e4d04db5 WHIRLPOOL e379a0dbb9a86355918b19f7aad9ae00e6194cd239796520784e9f3c03f729052ac0ceb74437f6113e083427febd1a34bd19dd2a943e310330619abd6a850bc5
+MISC ChangeLog 2948 SHA256 899b2c6a11d312195af52ade85f7940b7795b44cae7be2e5ac57c0811a914cdd SHA512 7dc8734470a9cbba9dbf9c3ffd0c6e1ed49763ef0b6f6824c711184ae6bc0b3b37efa0ef692afe7205193635993e41443df3b42880c4c4b45170e63f1455eeda WHIRLPOOL 090851b82d8e63d61a8a3f0b5840745986449bd99612393adf11655662f8f87def3901b2cf4d48f45b59bde2a9315928a623bfae9bafe30e55ceb7a9b5ea1e86
 MISC metadata.xml 253 SHA256 89737be021da6f1a76894bd234f227b72ba57fd0213bdfdc0f5b38f1051ce775 SHA512 58c5ed90694ec0914f49f21b7066d7bd5610f53bbd0ee01e6d1b285e5f8f261bcb681e19b21c39287c312fc982b300f2a34a8cc638eaa0e939dd0da2b046288a WHIRLPOOL 15e90e302adf797a5761d14558f652e319613ec179ea5a4cdfcff2040bcf8d0cc734266744a69e644108ec47bcdde213ad5eaf0c7adf9d796a21e62a58ed9dfe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP9liCAAoJEPUd7O0j6ekA+DsIAMYVky3aXRpeWzYwByQzt0B/
-/lVdxpwnXLsueExNqQXDwVnZSWdsFN1i3YOFZF5JNk7rn6r7cjnbmm5F2sAJ/TeB
-yPX7sTZd35ZI0J6pNVovJdxXL4AVQeu9Ms48mmy2fWB/YgNuqMfyj8ZiZA1k+N9s
-JI+dCMck7PGI2RDF4j6TnMINpAoDOGAUSxnMeMUg6m2PmR2ryMLQq+DCxfrg9ajn
-qw+eW5g5XfIiC2+35Zn329kFmn0M4dpXNXz0pbCjgWBtImt1rzaUbd5k4AXgQxyP
-PZub57/pi8FSgFe2X2RLDF8cWiZA+4JCcfk4kM1sRfvbmh3bpPGCJ8qSJ4d6akI=
-=3G/6
+iQIcBAEBCAAGBQJQUi1sAAoJEOSiRoyO7jvoYw0P/AzMVP4kfeuxLMSLrD16a5XC
+rWTmjCaYx4WnjSbxlg08XL2JTCYSwRK2CkP0KZfCGAmfF/sO3p7eUE5hlM8yqzM7
+kuwVgwO48hhNEEua62SEeiDaPjMiLU1fpLzXjki5CTswFy/gd5/PjCUFdYEtY3ed
+yjG8tEUIWPGEhYw6AzHboiIq9wBQ7v5sRkNDAYlV7GZCJjqjqZvhxm8zsXNcTb6t
++32l/pwc0q0gvlOf6PrVGW4Gs4AWYgwchtZoWRFfrtoSl2/Ex0tTqbBsYKQaoK13
+e39ZyVhSWIwDoMc6oQFB6eVsZNikoc0Abmu+L7jbf6if7UCFu7aDqHxTqWONsAOU
+780IGA5et4eW5ne2OmZThdF3M2LFVgFBPCVtwjybI9jr5SA+2bv45037YvpQ4DCh
+UPCfXPNc74MxyZW+tJ1RlFG1fCtA5Y7Nv/BFS0LeRhizHf/7jZlhOGH8bjciNEeQ
+kHfLnmXGjioWROrbMsdVvDGXvAC3AhLhXCTQK1IMuz3rcqN0pu5UCgXgPMxUk4R4
+vrFMCRZBaeP3YSV5US2o2hD2qcobF3QOTYUBe67g5+/w1VHQ1VJytPh564JBClHh
+p1XC+qwWl0TAKA6T65IP1hP2E5oCneLK+dzMGMeiM9VbuPSgLB6BiJH9Rm2obafE
+aRRiS0/YwAACoDvFZV5+
+=3rDl
 -----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
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 )