Do not pass -R to trial versions that do not support it.

Package-Manager: portage-2660-svn

10 files changed, 67 insertions, 70 deletions

diff --git a/dev-python/axiom/Manifest b/dev-python/axiom/Manifest
index e60150cbdd25..ce679d1f1f8f 100644
--- a/dev-python/axiom/Manifest
+++ b/dev-python/axiom/Manifest
@@ -1,16 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2d30e75dbd043ff2f037298a8c9b079d ChangeLog 451
-MD5 bc10fe0a1d513277b69babd7dd926ebb axiom-0.3.0.ebuild 783
-MD5 4716591f55b4c8b9d988cb5ff81bb309 axiom-0.4.0.ebuild 783
+MD5 2b6c6ece7e179d45572e27a0ae228f8b ChangeLog 606
+RMD160 39acfb8a68c983085bbc8c427afd7d36e30a866d ChangeLog 606
+SHA256 de8cbe9f0849d2da3e9e97b6b8a3fd00c1d81266ccc62f47dc00cef45850d89b ChangeLog 606
+MD5 4b82cecded4e73af70d3f22ac851077e axiom-0.3.0.ebuild 780
+RMD160 ab1008ae5ff18667d8ebf1289e72690804796fa0 axiom-0.3.0.ebuild 780
+SHA256 53bb8b96fcf2710a4b2c5d47ffb2715ff8cf426c674ce00d6ddda61dcfb1849b axiom-0.3.0.ebuild 780
+MD5 75f5020815a5f0812cd730942ed6c4f6 axiom-0.4.0.ebuild 780
+RMD160 979a600ca0597763bbe82563d5043bd3988f8c0a axiom-0.4.0.ebuild 780
+SHA256 9a590d180f8426796eeafac7645dc9b51b04d6f5ae528d2dd9348ac9c2a08b51 axiom-0.4.0.ebuild 780
 MD5 759dd4f04c272c847010b558ba8a7b4e files/digest-axiom-0.3.0 62
+RMD160 3b69f60abfa9fe00823038a7b012d23bff65b996 files/digest-axiom-0.3.0 62
+SHA256 8fe460d2dc8ad16aaf792f7e3a1aa51ac71f087b8bc20550200ecf70b4d03784 files/digest-axiom-0.3.0 62
 MD5 ceeedce6b099dca65be29cd67de099f4 files/digest-axiom-0.4.0 62
+RMD160 0af9c83633501f3a7f57c48e84b1b594b0501bf2 files/digest-axiom-0.4.0 62
+SHA256 790e877c18c79eaa6b7333907bfcce72603a5f9cc4bc2305a8e16cd54cf49c39 files/digest-axiom-0.4.0 62
 MD5 802ad1b55865e3db7bd222d60f78af6d metadata.xml 643
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDqVXJW78445TWHXcRAlT2AJ4vGszT0iCcxNXYVZ/DurnqF7tO5ACeNOhQ
-yPRTiY7wU5EU6zvPBzoIuQ0=
-=y4pK
------END PGP SIGNATURE-----
+RMD160 db810d4f65c9ce6e27f2adc69d50bd09fedaa7e0 metadata.xml 643
+SHA256 083eac150ece10d9e2b24312148702afc34c210aa4a8726135c920fa6353f8de metadata.xml 643
diff --git a/dev-python/ldaptor/ChangeLog b/dev-python/ldaptor/ChangeLog
index 647e9d622bf3..06fe9796f69c 100644
--- a/dev-python/ldaptor/ChangeLog
+++ b/dev-python/ldaptor/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/ldaptor
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ldaptor/ChangeLog,v 1.17 2006/02/02 19:09:16 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ldaptor/ChangeLog,v 1.18 2006/02/13 23:02:32 marienz Exp $
+
+  13 Feb 2006; Marien Zwart <marienz@gentoo.org> ldaptor-0.0.42.ebuild:
+  Do not pass -R to trial versions that do not support it.
 
   02 Feb 2006; Marien Zwart <marienz@gentoo.org> Manifest:
   Fix rmd160 digests.
diff --git a/dev-python/ldaptor/Manifest b/dev-python/ldaptor/Manifest
index c4ef67316f6e..256748ea69c1 100644
--- a/dev-python/ldaptor/Manifest
+++ b/dev-python/ldaptor/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 5c7b954f0df4601339611442e335dcf1 ChangeLog 2156
 RMD160 ef244408b6f546fccb5df023a584a7f3e09d6c16 ChangeLog 2156
 SHA256 807deaad7b0a71ee89282fa256b053c8a3f3bbcf13ba2650888d913578c72749 ChangeLog 2156
@@ -13,19 +10,12 @@ SHA256 18c5bee2efb8f63f77692774a244156420e3848b32a45aa011ee1b3e7688f9f6 files/di
 MD5 da3a030bf2a5c7d1aad834223aa777ff files/ldaptor-0.0.42-trial-2.1-compat.patch 794
 RMD160 68f9c8e6dd4dc0dfe128dac5729b2559afad350e files/ldaptor-0.0.42-trial-2.1-compat.patch 794
 SHA256 e4111a713185f617dc586ac502c7c14a2e264c47051932e200dffc2757561903 files/ldaptor-0.0.42-trial-2.1-compat.patch 794
-MD5 ff3d398b529b72a79460c82de601f2fc ldaptor-0.0.42.ebuild 1969
-RMD160 247862bfa53c94a712e37488c98a3e0e86d2704b ldaptor-0.0.42.ebuild 1969
-SHA256 620127aeefbe54805a05cf95991d294e87c4d619fd945aa485222fb362bc6fda ldaptor-0.0.42.ebuild 1969
+MD5 98d58ba94e2af0113602b46628ccb56b ldaptor-0.0.42.ebuild 2066
+RMD160 9967ca57cda465040c91a20871d805679bf33c91 ldaptor-0.0.42.ebuild 2066
+SHA256 8ac45040fb9c2827a6678f897ecfa2ef5dbdda4536c63e51347e0a6265a3d9fd ldaptor-0.0.42.ebuild 2066
 MD5 c8490f42970655cad51ec6ac8de4e8b5 ldaptor-0.0.6.ebuild 1252
 RMD160 ee1aee340c051716080c6b200bdf0af7ab930b1e ldaptor-0.0.6.ebuild 1252
 SHA256 819904650a1d1c65f6affeaa327b4f46b840ca4121177331eb2d373ed4c70750 ldaptor-0.0.6.ebuild 1252
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 metadata.xml 159
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD4ljtW78445TWHXcRAqS4AJ9x0MReaXSej1O7iLqA01ed8OdtKQCdFR2M
-So/rTKgcaxw9Fw21zZ8MpyA=
-=B6fa
------END PGP SIGNATURE-----
diff --git a/dev-python/ldaptor/ldaptor-0.0.42.ebuild b/dev-python/ldaptor/ldaptor-0.0.42.ebuild
index 665e7df46f21..98943c552a94 100644
--- a/dev-python/ldaptor/ldaptor-0.0.42.ebuild
+++ b/dev-python/ldaptor/ldaptor-0.0.42.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ldaptor/ldaptor-0.0.42.ebuild,v 1.4 2006/01/31 23:57:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ldaptor/ldaptor-0.0.42.ebuild,v 1.5 2006/02/13 23:02:32 marienz Exp $
 
 inherit distutils eutils
 
@@ -74,5 +74,9 @@ src_install() {
 }
 
 src_test() {
-	trial -R ldaptor || die "test failed"
+	local trialopts
+	if ! has_version ">=dev-python/twisted-2.1"; then
+		trialopts=-R
+	fi
+	trial ${trialopts} ldaptor || die "test failed"
 }
diff --git a/dev-python/nevow/ChangeLog b/dev-python/nevow/ChangeLog
index 2ddd242111b9..9444a70c9723 100644
--- a/dev-python/nevow/ChangeLog
+++ b/dev-python/nevow/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/nevow
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nevow/ChangeLog,v 1.11 2006/02/02 19:10:48 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nevow/ChangeLog,v 1.12 2006/02/13 23:05:49 marienz Exp $
+
+  13 Feb 2006; Marien Zwart <marienz@gentoo.org> nevow-0.6.0.ebuild,
+  nevow-0.7.0.ebuild:
+  Do not pass -R to trial versions that do not support it.
 
   02 Feb 2006; Marien Zwart <marienz@gentoo.org> Manifest:
   Fix rmd160 digests.
diff --git a/dev-python/nevow/Manifest b/dev-python/nevow/Manifest
index 02badb945a93..5eb562909ed1 100644
--- a/dev-python/nevow/Manifest
+++ b/dev-python/nevow/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 14a378f7c4f57f9fadadee7ee1f4225c ChangeLog 1356
 RMD160 52ec25cc5e02c061f45ade79ae9fd2ae725dd2a5 ChangeLog 1356
 SHA256 9bd49a34e9cf9f621e4beaba4d7498478f5281b8cc44429535c163bc028dc499 ChangeLog 1356
@@ -16,9 +13,9 @@ SHA256 7e745c4fdb2e80e47e9ffd83f4b0134157a4daf71c50497f89255082137aabb4 files/di
 MD5 d0ee9a3efdce2732a78c5a86c196029e files/digest-nevow-0.6.0 63
 RMD160 a10c9d69860bdb932480e05e104fc4717841a989 files/digest-nevow-0.6.0 63
 SHA256 162f0c740ae1065666d527a48409f4a41628fff5b236c3b89b661cf6ef045016 files/digest-nevow-0.6.0 63
-MD5 f5e43fb1a3c614dfffc4a39873afe06b files/digest-nevow-0.7.0 235
-RMD160 b56ecb54c64974124e15fc4ab237112744aa4eb8 files/digest-nevow-0.7.0 235
-SHA256 725a20a6233e7063f2ac5daeb8d061ec106d5c87e040ad39989a036c7ed9bc60 files/digest-nevow-0.7.0 235
+MD5 6a19141aff9336b9cc9ceea8872b6a88 files/digest-nevow-0.7.0 235
+RMD160 f51548cd6cdb43718863ee7734d16156e6fb2e8b files/digest-nevow-0.7.0 235
+SHA256 89e49511a38554be867713c863f38e931a3f4e8579a756c7ed47d70b7f6e59b6 files/digest-nevow-0.7.0 235
 MD5 bc29fb845d6836abeba3eeff41da8476 metadata.xml 218
 RMD160 0daf1f824cd7035b959dfc437279171ce5f1075b metadata.xml 218
 SHA256 1ac3509e75b2cc8bf394a0c7e068039cc0152de1feae40a64b401365c9db67b2 metadata.xml 218
@@ -31,16 +28,9 @@ SHA256 7fa5c1c4b9525e9514c4ac0a5972d8ca8181ede38e4b3940cf252bbf527d566d nevow-0.
 MD5 7c59c07a935a79c355203a60f8959899 nevow-0.4.1.ebuild 923
 RMD160 a17d8604947d63e3407337585c6574c78daca47c nevow-0.4.1.ebuild 923
 SHA256 4a12c8894211e8e0ade2080bd4eac26238af7716cc412c8af7ef19ae4860db2b nevow-0.4.1.ebuild 923
-MD5 cd1c7b60b70a4676d1cf713d630a8d5b nevow-0.6.0.ebuild 1396
-RMD160 a31dac1b46249fc1c9b6902c1b0d48edbac6ecaa nevow-0.6.0.ebuild 1396
-SHA256 c22c6a8ffef3f6810ffa9fc9d1cccd771c701115b0b2a209074082afdea3d632 nevow-0.6.0.ebuild 1396
-MD5 782ff174e6eb3c0dcc2013f9baee1290 nevow-0.7.0.ebuild 1410
-RMD160 cde8440402bc766e76e012aabe00f29087f9e635 nevow-0.7.0.ebuild 1410
-SHA256 6333f47f6ba05f83e4740cb49e9ebd9c55c6ff299ffbbfc996f9c86694146d9f nevow-0.7.0.ebuild 1410
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFD4+UqJrHF4yAQTrARAjeXAKCZPEkJpH+4liimZvZusGp0trYBBgCeJgBK
-i7JxMotyDw+R4bRp8yLoVaE=
-=cX/G
------END PGP SIGNATURE-----
+MD5 c4d3fcfe4d74209bac25333da96aea5f nevow-0.6.0.ebuild 1503
+RMD160 5da928b0a39d7f9021dd92b48e887237c779b6fc nevow-0.6.0.ebuild 1503
+SHA256 2d809172b65535d4b6490359cd382e06f065eeb9e3e1e79ded53fccd664920fd nevow-0.6.0.ebuild 1503
+MD5 d11414c6bcadc239cd3fd9b1d08a4238 nevow-0.7.0.ebuild 1517
+RMD160 1a3d730553e8c316a642bce27bae34c5ac8f75d9 nevow-0.7.0.ebuild 1517
+SHA256 bcdc5fd14d6e87ebd98baae1f8818095743bc57d6581e412ffa8a64681ee7eb0 nevow-0.7.0.ebuild 1517
diff --git a/dev-python/nevow/files/digest-nevow-0.7.0 b/dev-python/nevow/files/digest-nevow-0.7.0
index 601be8b265f5..047565b6b758 100644
--- a/dev-python/nevow/files/digest-nevow-0.7.0
+++ b/dev-python/nevow/files/digest-nevow-0.7.0
@@ -1,3 +1,3 @@
-MD5 be81fbd0d878c8b57e749ba0024540fe Nevow-0.7.0.tar.gz 440644
 RMD160 dccc8cd3555ab4fc21f91ded140e02a14f878a16 Nevow-0.7.0.tar.gz 440644
 SHA256 6707f0d45ed6f6d2ac1790a9dc99db6ce6e7b156b4bc6faf58f8256cbbd2936f Nevow-0.7.0.tar.gz 440644
+MD5 be81fbd0d878c8b57e749ba0024540fe Nevow-0.7.0.tar.gz 440644
diff --git a/dev-python/nevow/nevow-0.6.0.ebuild b/dev-python/nevow/nevow-0.6.0.ebuild
index c8f2a0c3aa7b..e8843551d603 100644
--- a/dev-python/nevow/nevow-0.6.0.ebuild
+++ b/dev-python/nevow/nevow-0.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nevow/nevow-0.6.0.ebuild,v 1.1 2005/12/05 17:16:11 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nevow/nevow-0.6.0.ebuild,v 1.2 2006/02/13 23:05:49 marienz Exp $
 
 inherit distutils
 
@@ -22,8 +22,12 @@ S=${WORKDIR}/Nevow-${PV}
 PYTHON_MODNAME="nevow formless"
 
 src_test() {
-	trial -R nevow || die "nevow trial failed"
-	trial -R formless || die "formless trial failed"
+	local trialopts
+	if ! has_version ">=dev-python/twisted-2.1"; then
+		trialopts=-R
+	fi
+	trial ${trialopts} nevow || die "nevow trial failed"
+	trial ${trialopts} formless || die "formless trial failed"
 }
 
 src_compile() {
diff --git a/dev-python/nevow/nevow-0.7.0.ebuild b/dev-python/nevow/nevow-0.7.0.ebuild
index 5cb535cd558e..6e3d230f2fab 100644
--- a/dev-python/nevow/nevow-0.7.0.ebuild
+++ b/dev-python/nevow/nevow-0.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nevow/nevow-0.7.0.ebuild,v 1.2 2006/01/31 23:57:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nevow/nevow-0.7.0.ebuild,v 1.3 2006/02/13 23:05:49 marienz Exp $
 
 inherit distutils
 
@@ -22,8 +22,12 @@ S=${WORKDIR}/Nevow-${PV}
 PYTHON_MODNAME="nevow formless"
 
 src_test() {
-	trial -R nevow || die "nevow trial failed"
-	trial -R formless || die "formless trial failed"
+	local trialopts
+	if ! has_version ">=dev-python/twisted-2.1"; then
+		trialopts=-R
+	fi
+	trial ${trialopts} nevow || die "nevow trial failed"
+	trial ${trialopts} formless || die "formless trial failed"
 }
 
 src_compile() {
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index aac44305beab..ca7323afd0bb 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9c4dad1c4d6b973a3b1bc60ced3df36e ChangeLog 11500
-RMD160 2455e832561b325c3cd379c56b0916ab2647542b ChangeLog 11500
-SHA256 850d2e8fda38d56c8265204779b8f9ba0cc8daa924fb8956317aee138580be7b ChangeLog 11500
+MD5 6435f88cf2c7b0f4ff0759033ed38d2b ChangeLog 11618
+RMD160 3b748fe02b8a6d2c88cc88382176678b43677246 ChangeLog 11618
+SHA256 a81f3ef9e6ffcd6c6b28d4f28e2318edf16e5e0d40505dfe6eaf1835506cab56 ChangeLog 11618
 MD5 9e8836d4aec3a1a4f688add9c6c64877 files/digest-twisted-1.2.0 74
 RMD160 b7ac0db163e47302bf30a68202840894b993478b files/digest-twisted-1.2.0 74
 SHA256 642c76cdb39a453babb98695aed3964ff25cf2f26dce55598e976b799f927149 files/digest-twisted-1.2.0 74
@@ -16,6 +13,9 @@ SHA256 7c64aad689e66d0c5d2a61941ae747c7707eaec77d217d61877c3f9d31c7f300 files/di
 MD5 f31de6220dc1b05c4ae5e7d0e4bb06bc files/digest-twisted-2.1.0 247
 RMD160 42077382825c92fc5e929bdb19a1452dfdf9318d files/digest-twisted-2.1.0 247
 SHA256 176d9d35264027ca7dcf72b0d34df0ecaa03d577138f9ce1b73bd436ce657fa2 files/digest-twisted-2.1.0 247
+MD5 3fa954d81a62bdb393e7a56df82d513c files/digest-twisted-2.2.0 247
+RMD160 d90e86737213df3b14ee67c14de08479185469a7 files/digest-twisted-2.2.0 247
+SHA256 ca85a35f8effefe40c79dd999de29da5cb548ff2606677cd2b3d52f35e8e13dd files/digest-twisted-2.2.0 247
 MD5 7ec438488427334851e2eb977e4d8073 files/twistd.conf 277
 RMD160 c959b879d6f7358b647c71c3b514a4a6c8a49eef files/twistd.conf 277
 SHA256 aa2ffa5b128973bc0c58a1251b8bbb56f6f890728bc902805ea2db7606416119 files/twistd.conf 277
@@ -46,10 +46,6 @@ SHA256 1ff2d9ba4f1b641ea22269c72801b72581ad35479808d6755aea2caac25a9638 twisted-
 MD5 594fb659773dc51c1f0c8b03a4f24e90 twisted-2.1.0.ebuild 3044
 RMD160 aa9f70996d8c2b2797e7f80e643277b04ad4bbc9 twisted-2.1.0.ebuild 3044
 SHA256 46ad17bb5d27d534e9b5d5d43c24c4840e6e987dac5fbee4d2547f497e87582a twisted-2.1.0.ebuild 3044
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD5rzGJrHF4yAQTrARAjs3AJ9v9YjLpmNMXB8UGi87O1bjTIvU3QCgmOxb
-c/dHXJuMh/MwHuRk3ZcT/UY=
-=9Tq1
------END PGP SIGNATURE-----
+MD5 94b317c8c9eb5bce018d9fcc489da417 twisted-2.2.0.ebuild 2959
+RMD160 fd9faa5358aa4aad026d191ff55966943dd2a47b twisted-2.2.0.ebuild 2959
+SHA256 da5a068fb4372619a497953f3129b1b097b0cbf365cc3231e6549d23af0b7ee4 twisted-2.2.0.ebuild 2959