summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Faulhammer <fauli@gentoo.org>2011-08-31 09:21:43 +0000
committerChristian Faulhammer <fauli@gentoo.org>2011-08-31 09:21:43 +0000
commit940dc76ae0096c243d51ffebfde9a12097cf8350 (patch)
treea074d7c61ba3e57fef5816fd463e0b698983afb8 /dev-vcs/bzr
parentFix bash completion placement. Fixes bug #380977. (diff)
downloadhistorical-940dc76ae0096c243d51ffebfde9a12097cf8350.tar.gz
historical-940dc76ae0096c243d51ffebfde9a12097cf8350.tar.bz2
historical-940dc76ae0096c243d51ffebfde9a12097cf8350.zip
initial commit: New plugin for Claws Mail to use the Google data providers
Package-Manager: portage-2.1.10.11/cvs/Linux i686
Diffstat (limited to 'dev-vcs/bzr')
-rw-r--r--dev-vcs/bzr/ChangeLog7
-rw-r--r--dev-vcs/bzr/Manifest10
-rw-r--r--dev-vcs/bzr/bzr-2.4.0.ebuild8
3 files changed, 14 insertions, 11 deletions
diff --git a/dev-vcs/bzr/ChangeLog b/dev-vcs/bzr/ChangeLog
index 929a91471f57..cf1a0ab664b0 100644
--- a/dev-vcs/bzr/ChangeLog
+++ b/dev-vcs/bzr/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-vcs/bzr
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.33 2011/08/30 19:20:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.34 2011/08/31 09:21:43 fauli Exp $
+
+ 31 Aug 2011; Christian Faulhammer <fauli@gentoo.org> bzr-2.4.0.ebuild:
+ Drop privilege setgid patch for tests, is fixed upstream. Drop
+ dev-python/medusa dependency, upstream prefers dev-python/pyftpdlib. Give a
+ version number for testtools dependency.
30 Aug 2011; Raúl Porcel <armin76@gentoo.org> bzr-2.2.2-r1.ebuild:
alpha stable
diff --git a/dev-vcs/bzr/Manifest b/dev-vcs/bzr/Manifest
index 1fcd600a747d..fb1acc146c5b 100644
--- a/dev-vcs/bzr/Manifest
+++ b/dev-vcs/bzr/Manifest
@@ -10,13 +10,13 @@ AUX bzr-2.4.0-no-pyrex-citon.patch 1191 RMD160 4890e3d07ddff670f7a6dd3bcea01ef0a
DIST bzr-2.2.2.tar.gz 6897175 RMD160 888e0f59c88e0fde26adf697a9422ed732cc3329 SHA1 9db8f061d94ba3f0b48dcd623c473c6e8b570b6a SHA256 734ee0c3a64e7b820d6632ae0e2a4bf91add908fdebe5c82865618c38175c8e3
DIST bzr-2.4.0.tar.gz 7522083 RMD160 68508cf0188fba6507cbef6274c08e3f2038698e SHA1 94f0de11e1acc9f07765174f0a01d7fd01da568a SHA256 b1052d8fdb6e9ee63d98a11186295013d6a0c4cdbe0f832c014dff6a3ecf6be0
EBUILD bzr-2.2.2-r1.ebuild 4008 RMD160 6a66fb84971bd83d155255ba3102ae115e843f51 SHA1 8c6409561102e6db409e04f8fa772c59c7c80459 SHA256 3b06b5af051c8cf0c3a6c9aaa1589852b100e91c195798285d39d5a446ecd7ad
-EBUILD bzr-2.4.0.ebuild 4661 RMD160 b8de20ccf5d5df52e8fc706a0259216d30db8560 SHA1 586949f326275489d2d17c1f8041e49ffbaee93e SHA256 1b4ff75e261195f6f05daf064e3b7c10e265e4ada7deb4661d62afe7d5331035
-MISC ChangeLog 23229 RMD160 34c314af2e745b943aa76ba696ccaa61bf0bf5b0 SHA1 e6d4eed52c06e6a48c500c7ba43be90fb8fbc572 SHA256 aff5f3ca28075fdb8eba4b49236e051497be99afec44fe671a09de4dfac6b4ee
+EBUILD bzr-2.4.0.ebuild 4575 RMD160 5603c3b98a016b6f9b9cdab967f0c10239511b49 SHA1 518aa8310b763b7215053ecb9e30897933bd0ba8 SHA256 c160c6f55984912dc3550a0fc2540a89fc1649584bceec3ce4ecadd2da5f2260
+MISC ChangeLog 23487 RMD160 85e2dba75ec2bf5958eaa5336daf5eecbcb36930 SHA1 4f0e7bd7188a58e72fb9653f1b53d6b8150393c0 SHA256 35d00e2773da8ebdf0d3ee4eab3fc235916d7c21d25f9a737f007b2917298436
MISC metadata.xml 712 RMD160 36b19a78e61a946c4bd8db576c4ee1ee3039f9f8 SHA1 bc90063835a8043bea6940cba69c0134d6b34e0a SHA256 dcfc4ef80c924142d79801e013ba53c17731d6813e130dd23d7007dd4011a2bb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk5dN/AACgkQuQc30/atMkB6lACgtkGTIhT405dBQUFuDVec62u2
-K0QAnAkTe/RDriRc4KomPKpi7v/miNjs
-=jeRP
+iEYEARECAAYFAk5d/TMACgkQNQqtfCuFneP05wCfedRwNLOdCqkCkQFO76eXlBYi
+Fh4AoJ0L+9B8VgSXEjli6QAMvwHKV7Fi
+=8f9W
-----END PGP SIGNATURE-----
diff --git a/dev-vcs/bzr/bzr-2.4.0.ebuild b/dev-vcs/bzr/bzr-2.4.0.ebuild
index 2a0844e00867..0fb5ecbab3b1 100644
--- a/dev-vcs/bzr/bzr-2.4.0.ebuild
+++ b/dev-vcs/bzr/bzr-2.4.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.4.0.ebuild,v 1.2 2011/08/19 19:17:32 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.4.0.ebuild,v 1.3 2011/08/31 09:21:43 fauli Exp $
EAPI="3"
PYTHON_DEPEND="2"
@@ -29,9 +29,9 @@ RDEPEND="|| ( dev-lang/python:2.7[xml] dev-lang/python:2.6[xml] dev-lang/python:
DEPEND="emacs? ( virtual/emacs )
test? (
${RDEPEND}
- dev-python/medusa
+ || ( dev-python/pyftpdlib dev-python/medusa )
dev-python/subunit
- dev-python/testtools
+ >=dev-python/testtools-0.9.5
)"
S="${WORKDIR}/${MY_P}"
@@ -47,8 +47,6 @@ src_prepare() {
# Don't regenerate .c files from .pyx when pyrex is found.
epatch "${FILESDIR}/${PN}-2.4.0-no-pyrex-citon.patch"
- # Fix permission errors when run under directories with setgid set.
- epatch "${FILESDIR}/${PN}-0.90-tests-sgid.patch"
}
src_compile() {