Fix tests without FEATURES=userpriv. No bump since it only affects the tests.

Package-Manager: portage-2.1.2.1-r1

diff --git a/dev-util/buildbot/ChangeLog b/dev-util/buildbot/ChangeLog
index 1d9d433ff85871adfd68f2ae5e5351cd74cabe77..a8b0ef8051c85f0a8d03833c3e0988fcae37633f 100644 (file)
--- a/dev-util/buildbot/ChangeLog
+++ b/dev-util/buildbot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/buildbot
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/ChangeLog,v 1.6 2007/03/05 03:20:30 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/ChangeLog,v 1.7 2007/03/08 16:00:12 marienz Exp $
+
+  08 Mar 2007; Marien Zwart <marienz@gentoo.org>
+  +files/buildbot-0.7.5-root-skip-tests.patch, buildbot-0.7.5.ebuild:
+  Fix tests without FEATURES=userpriv. No bump since it only affects the tests.
 
   05 Mar 2007; Marius Mauch <genone@gentoo.org> buildbot-0.7.4.ebuild,
   buildbot-0.7.5.ebuild:

diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index b48ec455bffe82e99e64efb4c21db074a8a0a8e9..54a1e8eeaa79100d13e15496e24dd02b440f9e72 100644 (file)
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -5,6 +5,10 @@ AUX buildbot-0.7.4-svn-1.4.patch 1551 RMD160 43c38ca11f1e1cb24d4f91619f2b02c3dee
 MD5 b161bc2b612cd2eb758208f570df0d95 files/buildbot-0.7.4-svn-1.4.patch 1551
 RMD160 43c38ca11f1e1cb24d4f91619f2b02c3deec2ed1 files/buildbot-0.7.4-svn-1.4.patch 1551
 SHA256 5dc4efac0c94baafb22cd102f1b8006db67d62d7a6a02a4c2c0d58cf8dd2b6d0 files/buildbot-0.7.4-svn-1.4.patch 1551
+AUX buildbot-0.7.5-root-skip-tests.patch 430 RMD160 696badc78f800a535996550977fa9a433a0ad7ae SHA1 f774027e049544bb241548914b7ff393aa0a4ee4 SHA256 ca953c4edeaac73fd8de49d9e936621efb2e9c6dead31f276db9b1cdb8488ebd
+MD5 7863bbbf5e5c26bea51d0c51fbe6128f files/buildbot-0.7.5-root-skip-tests.patch 430
+RMD160 696badc78f800a535996550977fa9a433a0ad7ae files/buildbot-0.7.5-root-skip-tests.patch 430
+SHA256 ca953c4edeaac73fd8de49d9e936621efb2e9c6dead31f276db9b1cdb8488ebd files/buildbot-0.7.5-root-skip-tests.patch 430
 AUX buildbot.initd 1207 RMD160 3bc054c15b8c530f8f4012026319d3f5c6264079 SHA1 1eefb47a1872b578a6b47b01c79662cb8890fa6e SHA256 0774ae5c3cfd67e537251a6e3c4bdd4bc6c948fadf7e15bd137ad977e21475fb
 MD5 b62d383ef78ce8427e2e4846a286936b files/buildbot.initd 1207
 RMD160 3bc054c15b8c530f8f4012026319d3f5c6264079 files/buildbot.initd 1207
@@ -23,14 +27,14 @@ EBUILD buildbot-0.7.4.ebuild 2305 RMD160 0767366857ef6671e4ce2d7399261a7c1e17afa
 MD5 ead25f8d284f13e7bd4cac74c7cc10b3 buildbot-0.7.4.ebuild 2305
 RMD160 0767366857ef6671e4ce2d7399261a7c1e17afa0 buildbot-0.7.4.ebuild 2305
 SHA256 a430eb86f3804027a2d5f497032b78bac9c73236ac0d80adefe17ad53b340f6b buildbot-0.7.4.ebuild 2305
-EBUILD buildbot-0.7.5.ebuild 2601 RMD160 7825a8abb8fb742e849c4491c8d2f7138dd0d46b SHA1 12209dd128c7e97c9640de2c620b1e4c605a3e13 SHA256 160b1679ed0050ca6ec92263f0d321a01520b83254e60f1395a2cf0403855730
-MD5 cf825d43650171c01fb751c6fc6d284e buildbot-0.7.5.ebuild 2601
-RMD160 7825a8abb8fb742e849c4491c8d2f7138dd0d46b buildbot-0.7.5.ebuild 2601
-SHA256 160b1679ed0050ca6ec92263f0d321a01520b83254e60f1395a2cf0403855730 buildbot-0.7.5.ebuild 2601
-MISC ChangeLog 1377 RMD160 8fc88cf453b4653f1e6fd863965b9c0d5f1094ff SHA1 2ea76cdba77d70442f5488cc804014b2a996e5b8 SHA256 3b8a30fec7e975b9b8d368ffebb3b8eb74768d3cce5da5ffafebc200ada508e6
-MD5 516eac07877dfd42cfa95c5d33f4a20f ChangeLog 1377
-RMD160 8fc88cf453b4653f1e6fd863965b9c0d5f1094ff ChangeLog 1377
-SHA256 3b8a30fec7e975b9b8d368ffebb3b8eb74768d3cce5da5ffafebc200ada508e6 ChangeLog 1377
+EBUILD buildbot-0.7.5.ebuild 2694 RMD160 f3db8805be8e21cbd4f5fe8d5e2ee40f619cc264 SHA1 f98678c3b0c1b6d461b035b29f0670438caada3f SHA256 ba4b56bcfa56394931a1f10f7de2a9545a1b9b9c0d08e6a257ba05ecb51de482
+MD5 1e1de617fd736de1c15970f24103461c buildbot-0.7.5.ebuild 2694
+RMD160 f3db8805be8e21cbd4f5fe8d5e2ee40f619cc264 buildbot-0.7.5.ebuild 2694
+SHA256 ba4b56bcfa56394931a1f10f7de2a9545a1b9b9c0d08e6a257ba05ecb51de482 buildbot-0.7.5.ebuild 2694
+MISC ChangeLog 1578 RMD160 b673fce9f9eaf67821d9bb120974fb422ac7dce2 SHA1 69e736cc373fe90ce586fb945d57203f7551691a SHA256 5224d01ab7e1ea47361b5ad975516e23dfd672cc941bf50e55e5c1a90f2a860a
+MD5 6c701381f4a99eb645c592013996e860 ChangeLog 1578
+RMD160 b673fce9f9eaf67821d9bb120974fb422ac7dce2 ChangeLog 1578
+SHA256 5224d01ab7e1ea47361b5ad975516e23dfd672cc941bf50e55e5c1a90f2a860a ChangeLog 1578
 MISC metadata.xml 958 RMD160 9d7be621968219470c6fb4e66c55e91d3d7765b6 SHA1 d8a978793941a2a566dcbc9364d09e22ae54d256 SHA256 f61483b7976a1fc93cda8f8cc6d23e744f8f3ae765b385d35246be3a2ef87d76
 MD5 374d908b2008bc1082871d993dd850b8 metadata.xml 958
 RMD160 9d7be621968219470c6fb4e66c55e91d3d7765b6 metadata.xml 958
@@ -44,7 +48,7 @@ SHA256 0f36c77615aadb48a2e1dd8db1ce74e6d20dd25b72f45bad6fb4e842ae25448e files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF641t6J2i8a8J4okRAl6qAKCVxpAs+QEaqRXzk8sZCX8mEKCqFgCfcbd0
-kdnN9DWPevS/N7XoQp8Y2uQ=
-=TNFJ
+iD8DBQFF8DM7UElL7eJpfEQRAqYyAJwKX0Fw1WJ8WUiUNnk85ngy1hXuIQCbB961
+hEbvAvVwYq3AtMkdgw4ie84=
+=Zm9r
 -----END PGP SIGNATURE-----

diff --git a/dev-util/buildbot/buildbot-0.7.5.ebuild b/dev-util/buildbot/buildbot-0.7.5.ebuild
index 0a15dbf1af4baf59ef65c4836c9ce83211ab645a..c1d864f73e5bf44e905832607b4b21b02e08b992 100644 (file)
--- a/dev-util/buildbot/buildbot-0.7.5.ebuild
+++ b/dev-util/buildbot/buildbot-0.7.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/buildbot-0.7.5.ebuild,v 1.3 2007/03/05 03:20:30 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/buildbot-0.7.5.ebuild,v 1.4 2007/03/08 16:00:12 marienz Exp $
 
 inherit distutils eutils
 
@@ -27,6 +27,13 @@ pkg_setup() {
        enewuser buildbot
 }
 
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       epatch "${FILESDIR}/${P}-root-skip-tests.patch"
+}
+
 src_compile() {
        distutils_src_compile
        if use doc; then

diff --git a/dev-util/buildbot/files/buildbot-0.7.5-root-skip-tests.patch b/dev-util/buildbot/files/buildbot-0.7.5-root-skip-tests.patch
new file mode 100644 (file)
index 0000000..b180506
--- /dev/null
+++ b/dev-util/buildbot/files/buildbot-0.7.5-root-skip-tests.patch
@@ -0,0 +1,13 @@
+=== modified file 'buildbot/test/test_vc.py'
+--- buildbot/test/test_vc.py   2007-03-08 15:34:45 +0000
++++ buildbot/test/test_vc.py   2007-03-08 15:38:45 +0000
+@@ -1083,6 +1083,8 @@
+     try_branchname = "branch"
+ 
+     def capable(self):
++        if not os.geteuid():
++            return (False, "CVS tests fail as root")
+         cvspaths = which('cvs')
+         if not cvspaths:
+             return (False, "CVS is not installed")
+