Fix dependencies. Set SUPPORT_PYTHON_ABIS (bug #312139).

Package-Manager: portage-2.2.0_alpha14/cvs/Linux x86_64

4 files changed, 22 insertions, 12 deletions

diff --git a/dev-db/desktopcouch/Manifest b/dev-db/desktopcouch/Manifest
index 8a79f407d20c..333518449f03 100644
--- a/dev-db/desktopcouch/Manifest
+++ b/dev-db/desktopcouch/Manifest
@@ -3,7 +3,7 @@ AUX desktopcouch-0.6.9b-drop_ubuntuone_support.patch 435 RMD160 b056171542754245
 AUX desktopcouch-0.6.9b-setup_hardlinks.patch 1872 RMD160 3c18d26b8a2d395596e9ae60997a0c8ef980b838 SHA1 fec3f220eaf7fb0ac3a76c2bd9be6404e23d2200 SHA256 8a6c747904ddb957be0beb8452ab83d7b160d9e342ade021b53fd489fced0ad4
 DIST desktopcouch-0.6.4.tar.gz 105609 RMD160 1655bf1addf06f183b9ce1cfd5e7492a685482b2 SHA1 c5d122a3d4897bc058962238f3b31ef246abdebd SHA256 e37c89cb9c3c905138b56b0ae62f287e79a527e8d2c6fe64a7fbb94eebd91085
 DIST desktopcouch-0.6.9b.tar.gz 113235 RMD160 a5636affe229686507eb0685a05ef978b28c69a0 SHA1 c03eb44e3c00beaae1b1e02b27e7e09fe70d34a4 SHA256 5f9b8f324cd07dabe8ccb021556774a378dec83895e0450fa9d729716adc5b86
-EBUILD desktopcouch-0.6.4.ebuild 1408 RMD160 d0a7c414c3e2a645ec5472c828e216c173d12464 SHA1 5b79f4e2bd049f531d428f8a6741ed2bb028a4a5 SHA256 b605e7b17cb79fde9a3fa0fa1de6cf53fffc7b658e35e4e3f939296f59065615
-EBUILD desktopcouch-0.6.9_beta.ebuild 1546 RMD160 90903662c49b7a94e6445e3dfb7e6312c7bea7ab SHA1 bd3a93fb503d61d7ed82e870eca53cbd0cc1c861 SHA256 976cd9800c5eabad535a6915aa8731c3f7cde0f3415c31dac7e7fb6cc56674db
-MISC ChangeLog 1374 RMD160 f39fc04f02e8d045a56ef1e923ee821e342eb7b7 SHA1 d86be2af2c41c716ea22594c2a84ccc5b606071b SHA256 828e2e7156c37aca101a2aacf576c02115b6ff06d2dd310bb29ca32bf06e3c91
+EBUILD desktopcouch-0.6.4.ebuild 1426 RMD160 74092f3c2400b58b836f88f055d8bca8157ba776 SHA1 c59b99826901d38cb5ee20db208583b655594112 SHA256 827f20eb0d2bd54b041aeb8105a84beda5c0a49e627a02d94a6f72744bc47d8f
+EBUILD desktopcouch-0.6.9_beta.ebuild 1563 RMD160 5f9df1f3da2d3c07ec68c71d462687bb9b1053a8 SHA1 9847f6b4d8bd0299cf0c1cde41763f5ac108968d SHA256 27746512f108f896e395f2aa1e51de9074d63d57feb4ca4249d0af1f10c580e7
+MISC ChangeLog 1536 RMD160 6c0cd45eb81355cb395f85455939b05da62a435c SHA1 b5314e40b0f97b46dcde93271ae66bb5e52e27a3 SHA256 d08e129bc6d8f16087464d74009c12641ec85ac50d753ab5e7e2b643d86279f3
 MISC metadata.xml 255 RMD160 b69d2df062aad1158c03b925d5bfdeab02f98db2 SHA1 c94d776662afd93f3be5dc1fea7793b80738dbc5 SHA256 01d09f8eee4532c21a12d462263dfa84fda9e1b421410b13fe9799ed4680ba7b
diff --git a/dev-db/pgasync/ChangeLog b/dev-db/pgasync/ChangeLog
index 88e91798a003..f4a28360d7b0 100644
--- a/dev-db/pgasync/ChangeLog
+++ b/dev-db/pgasync/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/pgasync
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgasync/ChangeLog,v 1.5 2011/01/08 16:24:13 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgasync/ChangeLog,v 1.6 2011/01/08 16:30:29 arfrever Exp $
+
+  08 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  pgasync-2.01.ebuild:
+  Fix dependencies. Set SUPPORT_PYTHON_ABIS (bug #312139).
 
   08 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   -pgasync-1.15b.ebuild:
diff --git a/dev-db/pgasync/Manifest b/dev-db/pgasync/Manifest
index e5cd4ba4890d..e2a5c18d81b3 100644
--- a/dev-db/pgasync/Manifest
+++ b/dev-db/pgasync/Manifest
@@ -1,4 +1,4 @@
 DIST pgasync-2.01.tar.gz 22314 RMD160 768b92a0b134245be153890530942aa2df106d81 SHA1 bab54f93cd22ccf3f2c9d99a0aaa7d88307d559b SHA256 c38ac6ae200d54c22ad480ea020e0019692e69992344abce287232b30ccfe56c
-EBUILD pgasync-2.01.ebuild 661 RMD160 097694a4ac795d3b8764ecc10c9477fc51ce3591 SHA1 850d7b9809cfbdecdb20e22096a0b2d465fad03c SHA256 4b7f3f60f67d4cdc9d1220ff38c685ea2be0b1592b8ae47b785f817ce1b5e67b
-MISC ChangeLog 864 RMD160 030ed97a60a5c3938f66a3a62414247b7732e5d3 SHA1 190e57ce06676901526ae9698f2b809800bf388a SHA256 89563a61e34d024b8311af5b370bfd5e2ed8797e5e6d18760e6d5042a224455d
+EBUILD pgasync-2.01.ebuild 766 RMD160 74f51d3c43727f9de4a48a69a1aad492548a4cd4 SHA1 c592e84eaa383161b5eb561a7385457f0e790177 SHA256 bca97ff0f623d508aacf608c38ce4e45f2b34f2a8c4368fa6bed40afbfea4a60
+MISC ChangeLog 1020 RMD160 b6297f260c163a4995dd9238a3b767b51b58a7a2 SHA1 d1cb471a5ee792043a797e50dd526a91d9b8395b SHA256 9e19629cc8fc9e4f0fd93da75982fef24046013d97ce03202de01843ea64828a
 MISC metadata.xml 163 RMD160 70bbda1c1e8316a09d467334131898ae833a3205 SHA1 f43b9a4a2a82140936f9b04e4e63b3c9a495141f SHA256 f0699a4c3ad24cc38836c2d4a1ba03e4e403a9a5364b51df405db02014005891
diff --git a/dev-db/pgasync/pgasync-2.01.ebuild b/dev-db/pgasync/pgasync-2.01.ebuild
index 8de26ca1cb71..d6b322237be6 100644
--- a/dev-db/pgasync/pgasync-2.01.ebuild
+++ b/dev-db/pgasync/pgasync-2.01.ebuild
@@ -1,6 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgasync/pgasync-2.01.ebuild,v 1.2 2010/02/06 10:40:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgasync/pgasync-2.01.ebuild,v 1.3 2011/01/08 16:30:29 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
 
 inherit distutils
 
@@ -13,15 +18,16 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE="doc"
 
-DEPEND=">=dev-python/twisted-1.3
-	>=dev-lang/python-2.3"
+DEPEND=">=dev-python/twisted-1.3"
+RDEPEND="${DEPEND}"
 
-DOCS="CHANGELOG LICENSE PKG-INFO README TODO"
+DOCS="CHANGELOG PKG-INFO README TODO"
 
 src_install() {
 	distutils_src_install
+
 	if use doc; then
 		insinto /usr/share/doc/${PF}
-		doins -r examples
+		doins -r examples || die "doins failed"
 	fi
 }