diff options
author | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2010-10-23 15:08:07 +0000 |
---|---|---|
committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2010-10-23 15:08:07 +0000 |
commit | e8917085ca56c29519bfc6eb83ad9419e3208d3e (patch) | |
tree | 23dec163a222d8231e4fb74b8e4a0f6fa89990df /dev-python/pysvn | |
parent | Fix deptree. (diff) | |
download | historical-e8917085ca56c29519bfc6eb83ad9419e3208d3e.tar.gz historical-e8917085ca56c29519bfc6eb83ad9419e3208d3e.tar.bz2 historical-e8917085ca56c29519bfc6eb83ad9419e3208d3e.zip |
Delete no longer needed patch (bug #299422).
Package-Manager: portage-2.2.0_alpha1/cvs/Linux x86_64
Diffstat (limited to 'dev-python/pysvn')
-rw-r--r-- | dev-python/pysvn/ChangeLog | 6 | ||||
-rw-r--r-- | dev-python/pysvn/Manifest | 5 | ||||
-rw-r--r-- | dev-python/pysvn/files/pysvn-1.7.1-skip_root_test.patch | 17 | ||||
-rw-r--r-- | dev-python/pysvn/pysvn-1.7.4.ebuild | 7 |
4 files changed, 9 insertions, 26 deletions
diff --git a/dev-python/pysvn/ChangeLog b/dev-python/pysvn/ChangeLog index 635201a6691a..bcadd8df545f 100644 --- a/dev-python/pysvn/ChangeLog +++ b/dev-python/pysvn/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/pysvn # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pysvn/ChangeLog,v 1.13 2010/10/17 22:44:42 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pysvn/ChangeLog,v 1.14 2010/10/23 15:08:07 arfrever Exp $ + + 23 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + -files/pysvn-1.7.1-skip_root_test.patch, pysvn-1.7.4.ebuild: + Delete no longer needed patch (bug #299422). 17 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> pysvn-1.7.4.ebuild: diff --git a/dev-python/pysvn/Manifest b/dev-python/pysvn/Manifest index 900f5af6a64e..5f3b8cdc3fa8 100644 --- a/dev-python/pysvn/Manifest +++ b/dev-python/pysvn/Manifest @@ -1,5 +1,4 @@ -AUX pysvn-1.7.1-skip_root_test.patch 985 RMD160 e5479747d3d2eaf6be704d8a62aabb1b6ac7081c SHA1 4c84c61555bfede768a3cf3d54cf988e319800a4 SHA256 1ee21a57a9765b07e955a5ce5386153d68c90d35528ddbc4fb5020ae3d70b96d DIST pysvn-1.7.4.tar.gz 330984 RMD160 d08c71d7ee3702f39f4fe168a8cb8ca59793f8ca SHA1 6d75f96f756161653b13f73f09fa8310e572f59a SHA256 88ecdbe7fdbb31b74108a318e4b53f85b770ca4f88ca32fcc89ab4e39e44a7a4 -EBUILD pysvn-1.7.4.ebuild 2429 RMD160 f0b6bb138ecd7ebd3c4643ec6aa827f3c51b558b SHA1 848da3e27da802b53ebfa78192142f895acf774a SHA256 0c9a71b35ed80fbe82b97c77adaaf74618241bc246ba512001d3ff5a3eb90ec7 -MISC ChangeLog 2264 RMD160 befd5a544707599c5b6e0c98acd7104c125f18c2 SHA1 fa39efd4f76fb19571f378d29bfe4ae2be83db79 SHA256 8d674bc718c14becdd294c81133dad70f7b7ddf7dc1a941548a49dc71c61c6f1 +EBUILD pysvn-1.7.4.ebuild 2307 RMD160 5862ce87bd6ab61acc07ced24709c3804a085cbc SHA1 f273dcfdcb34a5863ccc5a2b55fe5f4d6e20fcad SHA256 0a0a1d780f8c7b893db4bd2b1f356dc3f3fc047072b3d1acc4bda16a841aee1b +MISC ChangeLog 2448 RMD160 3ca60751777acf146863af2d85ffbaea33c6f4db SHA1 ae033185eb00c6ee434f3cf6f8575a6d888b427f SHA256 504c0105408514783446c94e19df2188c2d3f4632035ac976e661c833b9174ed MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a diff --git a/dev-python/pysvn/files/pysvn-1.7.1-skip_root_test.patch b/dev-python/pysvn/files/pysvn-1.7.1-skip_root_test.patch deleted file mode 100644 index 90f0fff48f07..000000000000 --- a/dev-python/pysvn/files/pysvn-1.7.1-skip_root_test.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- Tests/pysvn_test_common.mak -+++ Tests/pysvn_test_common.mak -@@ -89,8 +89,12 @@ - - test-06.unix.new.log: test-06.sh test-06.unix.known_good-$(KNOWN_GOOD_VERSION).log - -rm -rf testroot-06 -- if PYTHONPATH=../Source $(PYTHON) svn_min_version.py 1 3 0; then PATH=$(SVN_BIN_DIR):$(PATH) PYTHON=$(PYTHON) ./test-06.sh >test-06.unix.new.log 2>&1; fi -- if PYTHONPATH=../Source $(PYTHON) svn_min_version.py 1 3 0; then $(PYTHON) benchmark_diff.py test-06.unix.known_good-$(KNOWN_GOOD_VERSION).log test-06.unix.new.log; fi -+ if [[ $${UID} -ne 0 ]]; \ -+ if PYTHONPATH=../Source $(PYTHON) svn_min_version.py 1 3 0; then PATH=$(SVN_BIN_DIR):$(PATH) PYTHON=$(PYTHON) ./test-06.sh >test-06.unix.new.log 2>&1; fi \ -+ if PYTHONPATH=../Source $(PYTHON) svn_min_version.py 1 3 0; then $(PYTHON) benchmark_diff.py test-06.unix.known_good-$(KNOWN_GOOD_VERSION).log test-06.unix.new.log; fi \ -+ else \ -+ echo "Skipping $@, Reason: executed as root"; \ -+ fi - - clean-06: - -rm -f test-06.unix.new.log diff --git a/dev-python/pysvn/pysvn-1.7.4.ebuild b/dev-python/pysvn/pysvn-1.7.4.ebuild index d2a79c20ae14..aaf2df1722b2 100644 --- a/dev-python/pysvn/pysvn-1.7.4.ebuild +++ b/dev-python/pysvn/pysvn-1.7.4.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pysvn/pysvn-1.7.4.ebuild,v 1.2 2010/10/17 22:44:42 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pysvn/pysvn-1.7.4.ebuild,v 1.3 2010/10/23 15:08:07 arfrever Exp $ EAPI="3" PYTHON_DEPEND="*" SUPPORT_PYTHON_ABIS="1" -inherit eutils python toolchain-funcs +inherit python toolchain-funcs DESCRIPTION="Object-oriented python bindings for subversion" HOMEPAGE="http://pysvn.tigris.org/" @@ -23,9 +23,6 @@ DEPEND="${RDEPEND} dev-python/setuptools" src_prepare() { - # Skip test test-06 if executed as root to avoid failure. - epatch "${FILESDIR}/${PN}-1.7.1-skip_root_test.patch" - # Don't use internal copy of dev-python/pycxx. rm -fr Import |