summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Delaney <idella4@gentoo.org>2014-01-30 06:34:37 +0000
committerIan Delaney <idella4@gentoo.org>2014-01-30 06:34:37 +0000
commit7e046e06857973424b2d3e7ce087f9f440a9fa28 (patch)
tree6a26091b35c0e4d73e87b90226a9120bb8ae3bcc /dev-vcs
parentVersion bump. (diff)
downloadgentoo-2-7e046e06857973424b2d3e7ce087f9f440a9fa28.tar.gz
gentoo-2-7e046e06857973424b2d3e7ce087f9f440a9fa28.tar.bz2
gentoo-2-7e046e06857973424b2d3e7ce087f9f440a9fa28.zip
bump; update deps, remove -1.5 and invalid_utf8.tar.gz from FILESDIR (qa issue)
(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
Diffstat (limited to 'dev-vcs')
-rw-r--r--dev-vcs/hgsubversion/ChangeLog11
-rw-r--r--dev-vcs/hgsubversion/files/invalid_utf8.tar.gzbin8227 -> 0 bytes
-rw-r--r--dev-vcs/hgsubversion/hgsubversion-1.5.1.ebuild (renamed from dev-vcs/hgsubversion/hgsubversion-1.5.ebuild)23
3 files changed, 17 insertions, 17 deletions
diff --git a/dev-vcs/hgsubversion/ChangeLog b/dev-vcs/hgsubversion/ChangeLog
index 8a11dc0c5ab6..f27d83bb8cd3 100644
--- a/dev-vcs/hgsubversion/ChangeLog
+++ b/dev-vcs/hgsubversion/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-vcs/hgsubversion
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hgsubversion/ChangeLog,v 1.30 2013/06/25 11:45:12 djc Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hgsubversion/ChangeLog,v 1.31 2014/01/30 06:34:37 idella4 Exp $
+
+*hgsubversion-1.5.1 (30 Jan 2014)
+
+ 30 Jan 2014; Ian Delaney <idella4@gentoo.org> +hgsubversion-1.5.1.ebuild,
+ -files/invalid_utf8.tar.gz, -hgsubversion-1.5.ebuild:
+ bump; update deps, remove -1.5 and invalid_utf8.tar.gz from FILESDIR (qa
+ issue)
25 Jun 2013; Dirkjan Ochtman <djc@gentoo.org> metadata.xml:
Remove python from maintainers.
diff --git a/dev-vcs/hgsubversion/files/invalid_utf8.tar.gz b/dev-vcs/hgsubversion/files/invalid_utf8.tar.gz
deleted file mode 100644
index 537021f18693..000000000000
--- a/dev-vcs/hgsubversion/files/invalid_utf8.tar.gz
+++ /dev/null
Binary files differ
diff --git a/dev-vcs/hgsubversion/hgsubversion-1.5.ebuild b/dev-vcs/hgsubversion/hgsubversion-1.5.1.ebuild
index dabe56b76a65..4c12f83f8b9b 100644
--- a/dev-vcs/hgsubversion/hgsubversion-1.5.ebuild
+++ b/dev-vcs/hgsubversion/hgsubversion-1.5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hgsubversion/hgsubversion-1.5.ebuild,v 1.1 2013/06/17 10:14:45 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hgsubversion/hgsubversion-1.5.1.ebuild,v 1.1 2014/01/30 06:34:37 idella4 Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -16,24 +16,17 @@ SLOT="0"
KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-solaris"
IUSE="test"
-RDEPEND="
- >=dev-vcs/mercurial-1.4[${PYTHON_USEDEP}]
+# although any ref absent in the source, tests fail badly with >=mercurial-2.8.1
+RDEPEND=">=dev-vcs/mercurial-1.4[${PYTHON_USEDEP}]
+ <dev-vcs/mercurial-2.8[${PYTHON_USEDEP}]
|| (
- dev-python/subvertpy[${PYTHON_USEDEP}]
- >=dev-vcs/subversion-1.5[python]
- )"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/subvertpy-0.7.4[${PYTHON_USEDEP}]
+ >=dev-vcs/subversion-1.5[python] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
test? ( dev-python/nose[${PYTHON_USEDEP}] )"
DOCS=( README )
-python_prepare_all() {
- # https://bitbucket.org/durin42/hgsubversion/issue/390/latest-release-missing-invalid_utf8targz
- # Still no response, faile imported to files to fix tests
- cp -r "${FILESDIR}"/invalid_utf8.tar.gz tests/fixtures/ || die "deded"
-}
-
python_test() {
"${PYTHON}" tests/run.py || die "Tests failed under ${EPYTHON}"
}