diff options
Diffstat (limited to 'sci-misc')
| -rw-r--r-- | sci-misc/simx/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-misc/simx/Manifest | 2 | ||||
| -rw-r--r-- | sci-misc/simx/files/simx-0.1-python-check.patch | 27 | ||||
| -rw-r--r-- | sci-misc/simx/simx-0.2.ebuild (renamed from sci-misc/simx/simx-0.1.ebuild) | 13 | ||||
| -rw-r--r-- | sci-misc/simx/simx-9999.ebuild | 13 |
5 files changed, 26 insertions, 35 deletions
diff --git a/sci-misc/simx/ChangeLog b/sci-misc/simx/ChangeLog index 365ac8991..1907c83c6 100644 --- a/sci-misc/simx/ChangeLog +++ b/sci-misc/simx/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*simx-0.2 (07 Feb 2014) + + 07 Feb 2014; Christoph Junghans <ottxor@gentoo.org> +simx-0.2.ebuild, + -files/simx-0.1-python-check.patch, -simx-0.1.ebuild, simx-9999.ebuild: + version bump + 06 Jan 2014; Justin Lecher <jlec@gentoo.org> simx-0.1.ebuild, simx-9999.ebuild, metadata.xml: Switch from git-2 to git-r3 diff --git a/sci-misc/simx/Manifest b/sci-misc/simx/Manifest index cdce293c5..87c227b63 100644 --- a/sci-misc/simx/Manifest +++ b/sci-misc/simx/Manifest @@ -1 +1 @@ -DIST simx-0.1.tar.gz 586678 SHA256 ea9d9d9dbeb96d94391b77d4ca3d237524f5f6217cf38ffa1300c6becbe7fe91 SHA512 59ee36de32d6098a1fb6d91f2bacc3bed62abbf37fb2dd7437aeddd2ae9766f10ae49c9e3aa1f32556c5c667fefb23c7165c61fd113773a6022d9b2013a3eaaa WHIRLPOOL 25c8e47c656775525567b0e0b8d19455d662b97d508efe6ae68c5b5b16c101890be3489cab34dc8e87563bdefcb83dd323b6bf86cbf47f5883b888e17d5a131b +DIST simx-0.2.tar.gz 595766 SHA256 012b86c0ab2e8f671a8e4325ed233b8ff4cdc1ea3d7293cdc8095222b8905ed3 SHA512 f03ed149b369d60ea9eafa7bff0b2a08007808f6ea280d12c413583a30a55cb80e660a062d701ff745bb30a2f63d4c958c63e76d6b00264221c3c830cb526116 WHIRLPOOL cf3bbd589c924059fa8287e12fae5ae58d8adb3c412bd912c759b273f4bb3346ce0e46b480dd27afcbad0e2d7ccbd56a05eae34117fb17491fbb678cb61d6caa diff --git a/sci-misc/simx/files/simx-0.1-python-check.patch b/sci-misc/simx/files/simx-0.1-python-check.patch deleted file mode 100644 index 6e40ae0fa..000000000 --- a/sci-misc/simx/files/simx-0.1-python-check.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b8a606460fddc050d0df7aa0e8dfedd3dedb90a8 Mon Sep 17 00:00:00 2001 -From: Christoph Junghans <junghans@lanl.gov> -Date: Mon, 21 Oct 2013 19:02:17 -0600 -Subject: [PATCH] fixed cmake python checks - ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5e17b01..6e92faa 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -51,8 +51,8 @@ link_directories(${Boost_LIBRARY_DIRS}) - - - # for python --find_package(PythonInterp REQUIRED VERSION 2) --find_package(PythonLibs REQUIRED VERSION 2) -+find_package(PythonInterp 2 REQUIRED) -+find_package(PythonLibs 2 REQUIRED) - include_directories(${PYTHON_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIR} ${PYTHON_INCLUDE_PATH}) - link_directories(${PYTHON_LIBRARY_DIRS}) - --- -1.8.1.5 - diff --git a/sci-misc/simx/simx-0.1.ebuild b/sci-misc/simx/simx-0.2.ebuild index 38fe6e2ea..b53d77911 100644 --- a/sci-misc/simx/simx-0.1.ebuild +++ b/sci-misc/simx/simx-0.2.ebuild @@ -8,14 +8,21 @@ PYTHON_COMPAT=( python{2_6,2_7} ) inherit cmake-utils distutils-r1 +if [ "${PV}" = "9999" ]; then + EGIT_REPO_URI="git://github.com/sim-x/${PN}.git http://github.com/sim-x/${PN}.git" + inherit git-2 + KEYWORDS="" +else + SRC_URI="https://github.com/sim-x/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi + DESCRIPTION="a library for developing parallel, discrete-event simulations in Python" HOMEPAGE="https://github.com/sim-x" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" SLOT="0" LICENSE="LGPL-2.1" IUSE="" -KEYWORDS="~amd64" RDEPEND=" virtual/mpi @@ -27,6 +34,4 @@ DEPEND="${RDEPEND} src_prepare() { # don't do egg install sed -i 's/self.do_egg_install()/_install.install.run(self)/' setup.py || die - - epatch "${FILESDIR}/${P}-python-check.patch" } diff --git a/sci-misc/simx/simx-9999.ebuild b/sci-misc/simx/simx-9999.ebuild index 0ab6e11cd..b53d77911 100644 --- a/sci-misc/simx/simx-9999.ebuild +++ b/sci-misc/simx/simx-9999.ebuild @@ -6,16 +6,23 @@ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) -inherit cmake-utils distutils-r1 git-r3 +inherit cmake-utils distutils-r1 + +if [ "${PV}" = "9999" ]; then + EGIT_REPO_URI="git://github.com/sim-x/${PN}.git http://github.com/sim-x/${PN}.git" + inherit git-2 + KEYWORDS="" +else + SRC_URI="https://github.com/sim-x/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi DESCRIPTION="a library for developing parallel, discrete-event simulations in Python" HOMEPAGE="https://github.com/sim-x" -SRC_URI="" SLOT="0" LICENSE="LGPL-2.1" IUSE="" -KEYWORDS="" RDEPEND=" virtual/mpi |