diff options
author | Anthony G. Basile <blueness@gentoo.org> | 2012-06-04 11:50:19 +0000 |
---|---|---|
committer | Anthony G. Basile <blueness@gentoo.org> | 2012-06-04 11:50:19 +0000 |
commit | aa7ea18939665cdd7b09fd120e27787a9f725297 (patch) | |
tree | 1d07a3d6e8fbb574c02453c16b6fd92d3ccce52c /net-p2p | |
parent | Remove dead code that breaks FEATURES=test, remove unnecessary certifi dep, t... (diff) | |
download | historical-aa7ea18939665cdd7b09fd120e27787a9f725297.tar.gz historical-aa7ea18939665cdd7b09fd120e27787a9f725297.tar.bz2 historical-aa7ea18939665cdd7b09fd120e27787a9f725297.zip |
RDEPEND <dev-lang/python-3 to prevent pulling in python-3, bug #419339
Package-Manager: portage-2.1.10.49/cvs/Linux x86_64
Diffstat (limited to 'net-p2p')
-rw-r--r-- | net-p2p/tribler/ChangeLog | 5 | ||||
-rw-r--r-- | net-p2p/tribler/Manifest | 10 | ||||
-rw-r--r-- | net-p2p/tribler/tribler-5.9.12.ebuild | 4 |
3 files changed, 11 insertions, 8 deletions
diff --git a/net-p2p/tribler/ChangeLog b/net-p2p/tribler/ChangeLog index df624fbf3b96..e2545d75b1f5 100644 --- a/net-p2p/tribler/ChangeLog +++ b/net-p2p/tribler/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-p2p/tribler # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/ChangeLog,v 1.13 2012/06/02 15:46:37 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/ChangeLog,v 1.14 2012/06/04 11:50:19 blueness Exp $ + + 04 Jun 2012; Anthony G. Basile <blueness@gentoo.org> tribler-5.9.12.ebuild: + RDEPEND <dev-lang/python-3 to prevent pulling in python-3, bug #419339 *tribler-5.9.12 (02 Jun 2012) diff --git a/net-p2p/tribler/Manifest b/net-p2p/tribler/Manifest index afaa0d3b91c2..3ced5663994f 100644 --- a/net-p2p/tribler/Manifest +++ b/net-p2p/tribler/Manifest @@ -16,13 +16,13 @@ EBUILD tribler-5.5.20.ebuild 1764 RMD160 5af57195d7f50fea9307eae5e2aa71e1a9e83fa EBUILD tribler-5.5.21.ebuild 1764 RMD160 a7d1b976a97510c2b3a5bc5d37a20834f0514d87 SHA1 2d0da4ea900a2555b4bf65c98ced0e45a69b9edc SHA256 09f5e1043cffd1380138b3f0f8389828d647be24d456209ef02ba4c474bb5d64 EBUILD tribler-5.5.23.ebuild 1764 RMD160 d958332855e590049a0c30a287d2b7875f4b3e0b SHA1 8108682e375071fe3a31837eca5ee28fce89b197 SHA256 bdc43117eae9487663c8224ba722efd3ad6c9dc530e70739d1dffbdee558aa13 EBUILD tribler-5.5.24.ebuild 1764 RMD160 e16213e6800fbe40f5857b502f7d782a02ffe9df SHA1 f1cee628110a9caaec87f05f27acca3195f73b51 SHA256 69451e19f9e807be952afe607653e80f2a27916dc3285d3646455bc2db50913a -EBUILD tribler-5.9.12.ebuild 1811 RMD160 986a355adaa1d4af65c808bb69acad51df2db586 SHA1 adb641b22492bfb388fbeb22778226099c55c639 SHA256 250ad27daccd1e656e53638af286f8b002ef7fa6814802d4f2f716ad290eb196 -MISC ChangeLog 2160 RMD160 66de0ee3b8f3a171643524814972f96d28c4167e SHA1 9fb8f3cfa961430755b39938ad70910c615e0f07 SHA256 e42389ffe78321eb6a78f86fbc865e37f898d03797d66d276e4e763031343081 +EBUILD tribler-5.9.12.ebuild 1808 RMD160 328673dd94b858cc23453b0cc2c82cfb60cfcb42 SHA1 9d899a8374dec6dc66147382b527f39cf9cfec98 SHA256 7561497478feb438e74a669d18723e1cfa49055c802050f58341eb8598085f73 +MISC ChangeLog 2312 RMD160 4b65e0ae3af7400df3ada598e2dd65e5cf7d681f SHA1 b12fd6ddd733bb40995010d66408cbea6cd25de6 SHA256 85d29f0594039b369f090074d5e974655d9c4dc9b9fd0dcb8b466eacc705e1e5 MISC metadata.xml 456 RMD160 c23da6949f1a748719d924a5c998efbdee63847a SHA1 83c4d741970af014737f6bfcb2a6791867b56be5 SHA256 de4487feb43cb09d85bf841828694e1c01ea93c405421a45654cdb14569593b9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEAREIAAYFAk/KNWkACgkQl5yvQNBFVTUWlACeJKpqUzR77qsRhuFdHFJCKS2q -gwcAn0wPoYnAh41CmKGEwCj1RwHxB6zw -=rr6T +iEYEAREIAAYFAk/MoQQACgkQl5yvQNBFVTVVcwCdFb9vgEkPamIGn4vmORFlbXb2 +JmsAn3lppdkq8QRkkI4f6JygFVo6CR8F +=GTCi -----END PGP SIGNATURE----- diff --git a/net-p2p/tribler/tribler-5.9.12.ebuild b/net-p2p/tribler/tribler-5.9.12.ebuild index 3b4d5c831905..1f861bc40a67 100644 --- a/net-p2p/tribler/tribler-5.9.12.ebuild +++ b/net-p2p/tribler/tribler-5.9.12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/tribler-5.9.12.ebuild,v 1.1 2012/06/02 15:46:37 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/tribler-5.9.12.ebuild,v 1.2 2012/06/04 11:50:19 blueness Exp $ EAPI="4" PYTHON_DEPEND="2:2.7" @@ -18,7 +18,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="vlc" -RDEPEND=">=dev-lang/python-2.5[sqlite] +RDEPEND="<dev-lang/python-3[sqlite] >=dev-python/m2crypto-0.16 >=dev-python/wxpython-2.8 >=dev-python/apsw-3.6 |