[gentoo-commits] proj/sci:master commit in: sys-cluster/hpx/

[Christoph Junghans]

commit:     0c47baa6e043d3c21aadcd312f5baccd7f28b425
Author:     Andreas Schäfer <gentryx <AT> gmx <DOT> de>
AuthorDate: Mon Jul 21 21:00:02 2014 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Mon Jul 21 21:00:02 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0c47baa6

more corrections

---
 sys-cluster/hpx/hpx-0.9.8.ebuild | 13 +++++--------
 sys-cluster/hpx/hpx-9999.ebuild  |  2 --
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/sys-cluster/hpx/hpx-0.9.8.ebuild b/sys-cluster/hpx/hpx-0.9.8.ebuild
index 182746f..ac3aad7 100644
--- a/sys-cluster/hpx/hpx-0.9.8.ebuild
+++ b/sys-cluster/hpx/hpx-0.9.8.ebuild
@@ -9,14 +9,17 @@ PYTHON_COMPAT=( python{2_6,2_7} )
 if [ ${PV} == "9999" ] ; then
        inherit git-r3
        EGIT_REPO_URI="https://github.com/STEllAR-GROUP/hpx.git";
-       SRC_URI=""
        KEYWORDS=""
        S="${WORKDIR}/${PN}"
-       CMAKE_USE_DIR="${S}"
 else
        SRC_URI="http://stellar.cct.lsu.edu/files/${PN}_${PV}.7z";
        KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
        S="${WORKDIR}/${PN}_${PV}"
+       PATCHES=(
+               "${FILESDIR}"/${P}-install-path.patch
+               "${FILESDIR}"/${P}-multilib.patch
+               "${FILESDIR}"/${P}-cmake_dir.patch
+       )
 fi
 
 inherit cmake-utils fortran-2 multilib python-single-r1
@@ -48,12 +51,6 @@ DEPEND="${RDEPEND}
 "
 REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )"
 
-PATCHES=(
-       "${FILESDIR}"/hpx-0.9.8-install-path.patch
-       "${FILESDIR}"/hpx-0.9.8-multilib.patch
-       "${FILESDIR}"/hpx-0.9.8-cmake_dir.patch
-)
-
 pkg_setup() {
        use test && python-single-r1_pkg_setup
 }

diff --git a/sys-cluster/hpx/hpx-9999.ebuild b/sys-cluster/hpx/hpx-9999.ebuild
index 8d76801..5e56db9 100644
--- a/sys-cluster/hpx/hpx-9999.ebuild
+++ b/sys-cluster/hpx/hpx-9999.ebuild
@@ -9,9 +9,7 @@ PYTHON_COMPAT=( python{2_6,2_7} )
 if [ ${PV} == "9999" ] ; then
        inherit git-r3
        EGIT_REPO_URI="https://github.com/STEllAR-GROUP/hpx.git";
-       SRC_URI=""
        KEYWORDS=""
-       CMAKE_USE_DIR="${S}"
 else
        SRC_URI="http://stellar.cct.lsu.edu/files/${PN}_${PV}.7z";
        KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"