From 39530d71d9b213693dcc9e38edf304c397f977ad Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 9 Apr 2017 11:07:10 +0200 Subject: [PATCH] mercurial: explicit dependency on cmd:python2. otherwise HaikuPorter resolves the "< 3" with specific version requirement "== 2.7.12". --- dev-vcs/mercurial/mercurial-3.2.1.recipe | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dev-vcs/mercurial/mercurial-3.2.1.recipe b/dev-vcs/mercurial/mercurial-3.2.1.recipe index 65c5c9a4d..1e419284c 100644 --- a/dev-vcs/mercurial/mercurial-3.2.1.recipe +++ b/dev-vcs/mercurial/mercurial-3.2.1.recipe @@ -4,7 +4,7 @@ tool." HOMEPAGE="http://mercurial.selenic.com/" COPYRIGHT="2005-2014 Matt Mackall et al." LICENSE="GNU GPL v2" -REVISION="2" +REVISION="3" SOURCE_URI="http://mercurial.selenic.com/release/mercurial-$portVersion.tar.gz" CHECKSUM_SHA256="26418276fbc36850782f1f4feb30da4a83800b48493082985c4d3ac29ad0ca0f" PATCHES="mercurial-3.2.1.patch" @@ -16,16 +16,18 @@ PROVIDES=" cmd:hg = $portVersion compat >= 3 " REQUIRES=" + haiku haiku_devel - cmd:python < 3 + cmd:python2 cmd:nano + lib:libpython2.7 " BUILD_REQUIRES=" haiku_devel " BUILD_PREREQUIRES=" - cmd:python < 3 + cmd:python2 cmd:gcc cmd:gettext cmd:ld @@ -35,12 +37,12 @@ BUILD_PREREQUIRES=" BUILD() { - $portPackageLinksDir/cmd~python/bin/python setup.py build --force + $portPackageLinksDir/cmd~python2/bin/python2 setup.py build --force } INSTALL() { - $portPackageLinksDir/cmd~python/bin/python setup.py install \ + $portPackageLinksDir/cmd~python2/bin/python2 setup.py install \ --prefix="$prefix" \ --force } @@ -48,5 +50,5 @@ INSTALL() TEST() { cd tests - python run-tests.py + python2 run-tests.py }