summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Ostorga <vostorga@gentoo.org>2011-10-31 16:02:11 +0000
committerVictor Ostorga <vostorga@gentoo.org>2011-10-31 16:02:11 +0000
commit421fb820693c6e70aa9019671d6d91d4ff551a70 (patch)
tree662e426bdd460b6e0a4d1cf4e39c21efdc658c92
parentalpha/ia64/s390/sh/sparc stable wrt #378039 (diff)
downloadhistorical-421fb820693c6e70aa9019671d6d91d4ff551a70.tar.gz
historical-421fb820693c6e70aa9019671d6d91d4ff551a70.tar.bz2
historical-421fb820693c6e70aa9019671d6d91d4ff551a70.zip
Fixing file collision with sys-libs/talloc, bug #384873
Package-Manager: portage-2.1.10.11/cvs/Linux i686
-rw-r--r--sys-libs/tevent/ChangeLog5
-rw-r--r--sys-libs/tevent/Manifest10
-rw-r--r--sys-libs/tevent/tevent-0.9.14.ebuild10
3 files changed, 15 insertions, 10 deletions
diff --git a/sys-libs/tevent/ChangeLog b/sys-libs/tevent/ChangeLog
index 80af22857aff..ffbca7056066 100644
--- a/sys-libs/tevent/ChangeLog
+++ b/sys-libs/tevent/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-libs/tevent
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/tevent/ChangeLog,v 1.8 2011/09/27 20:27:52 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/tevent/ChangeLog,v 1.9 2011/10/31 16:02:11 vostorga Exp $
+
+ 31 Oct 2011; VĂ­ctor Ostorga <vostorga@gentoo.org> tevent-0.9.14.ebuild:
+ Fixing file collision with sys-libs/talloc, bug #384873
*tevent-0.9.14 (27 Sep 2011)
diff --git a/sys-libs/tevent/Manifest b/sys-libs/tevent/Manifest
index 017136af7948..d0c301c44c74 100644
--- a/sys-libs/tevent/Manifest
+++ b/sys-libs/tevent/Manifest
@@ -4,13 +4,13 @@ Hash: SHA1
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
EBUILD tevent-0.9.12.ebuild 662 RMD160 d7e13aeab5014b868de511ab4b8f4daf0710ba70 SHA1 1010e94e15524912ad7dfe66ab71a23e8a573e8e SHA256 297e407f72a15a15726fe6ac621df3ccb3ca2b804e5ced948e5b6eb5c6657ecc
-EBUILD tevent-0.9.14.ebuild 660 RMD160 511de4405deb21dc640f9a4a9448503606f3abbd SHA1 8d0508e08ab34d9070561c370da41c9c5728133d SHA256 f247739a66acc621c6aeef1e3b9d8fd6addf233638a045a8a42cc381ea856aca
-MISC ChangeLog 1311 RMD160 fb216ffdf935e68228d255d40727432103a1d707 SHA1 4e60a2cdba81e9088633a25574fb2ce57412fe7b SHA256 92d705694944c7d7fefca0e8590404e369e2b19266e866a982f9e45c21aced2e
+EBUILD tevent-0.9.14.ebuild 690 RMD160 b3ce3a495de80709e1f038e9a76c58bf0860b095 SHA1 5b5d5639fa6b84f8ce6bbbc83ba29b11f746f961 SHA256 0894d1a9e050c955d44d80874764b02e225c64da694452b140781e632a25b8eb
+MISC ChangeLog 1445 RMD160 b9e9a15a35af5b8465d70c958e4517cba704d8c4 SHA1 24b090c792c6fc8b4178d91afcdc60cc23c12be6 SHA256 3dfa44258cfe3c03e2de1efcc7e8444ec760894e544e51bb65e289645f978f72
MISC metadata.xml 253 RMD160 c3ade38fa7a209fad3bd557b95bb081bdadc16e0 SHA1 398363be25617e373071f14e5fe71a38e418e95a SHA256 89737be021da6f1a76894bd234f227b72ba57fd0213bdfdc0f5b38f1051ce775
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk6CMc4ACgkQKQaZ7OJe4zbVKACfUX22B4Kwj6clAnmZ7RMFbRst
-zMAAmwSzZ8hEYPYHV4DRPjxZkp268u5O
-=ywj3
+iEYEARECAAYFAk6uxooACgkQKQaZ7OJe4zbAFQCeP3FaQ1yv6x3uNW1UB9y6YqJs
+RdEAn1DPnpMFICNeo1LX1KlDzYWCLyl8
+=3cUu
-----END PGP SIGNATURE-----
diff --git a/sys-libs/tevent/tevent-0.9.14.ebuild b/sys-libs/tevent/tevent-0.9.14.ebuild
index 1fc7d9d10cb5..ff67e5ca6de5 100644
--- a/sys-libs/tevent/tevent-0.9.14.ebuild
+++ b/sys-libs/tevent/tevent-0.9.14.ebuild
@@ -1,6 +1,6 @@
# 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.14.ebuild,v 1.1 2011/09/27 20:27:52 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/tevent/tevent-0.9.14.ebuild,v 1.2 2011/10/31 16:02:11 vostorga Exp $
EAPI=3
PYTHON_DEPEND="2"
@@ -16,9 +16,11 @@ 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}"
+RDEPEND=">=dev-lang/python-2.4.2
+ >=sys-libs/talloc-2.0.6[python]"
+
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig"
WAF_BINARY="${S}/buildtools/bin/waf"