summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-python/ldaptor/ChangeLog5
-rw-r--r--dev-python/ldaptor/Manifest16
-rw-r--r--dev-python/ldaptor/ldaptor-0.0.42.ebuild8
-rw-r--r--dev-python/nevow/ChangeLog6
-rw-r--r--dev-python/nevow/Manifest28
-rw-r--r--dev-python/nevow/files/digest-nevow-0.7.02
-rw-r--r--dev-python/nevow/nevow-0.6.0.ebuild12
-rw-r--r--dev-python/nevow/nevow-0.7.0.ebuild10
8 files changed, 43 insertions, 44 deletions
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() {