aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAstroFloyd <AstroFloyd@gmail.com>2013-02-02 14:01:11 +0100
committerAstroFloyd <AstroFloyd@gmail.com>2013-02-02 14:01:11 +0100
commit12794e0649ce75d242d502c6c2cc14be59ec2dfa (patch)
tree0e027da0c51f2219e66bb76049360fa96e077d0f /sci-astronomy
parentUpdating sci-astronomy/amuse-7.1: removed inherit distutils (diff)
downloadAstroFloyd-12794e0649ce75d242d502c6c2cc14be59ec2dfa.tar.gz
AstroFloyd-12794e0649ce75d242d502c6c2cc14be59ec2dfa.tar.bz2
AstroFloyd-12794e0649ce75d242d502c6c2cc14be59ec2dfa.zip
Updating sci-astronomy/amuse: reinstated MERGE_TYPE="buildonly"
Diffstat (limited to 'sci-astronomy')
-rw-r--r--sci-astronomy/amuse/Manifest2
-rw-r--r--sci-astronomy/amuse/amuse-7.1.ebuild14
2 files changed, 6 insertions, 10 deletions
diff --git a/sci-astronomy/amuse/Manifest b/sci-astronomy/amuse/Manifest
index f49ae4e..434edb5 100644
--- a/sci-astronomy/amuse/Manifest
+++ b/sci-astronomy/amuse/Manifest
@@ -1,6 +1,6 @@
DIST amuse-5.0.tar.gz 82161180 SHA256 9b33f432b8c12bb8a35d82aedb714477ed5322d57faec03985866edc81ea80e5 SHA512 3a87787b6260badc64b16e9fdf7a802ad3199332c75c797644154d82cc1ad09103ab8b7045af436f23c7353c00cb0e0581584768433ce50086cb047d5e43e233 WHIRLPOOL f76de370b5f0ae82f0dca4f837cc7776901ed1914c81d65343d95c9efaa6c8d8bd555aa2196e25be312ae818fd1adb3053090e8e4aafabbe2e60f427b2f363bb
DIST amuse-7.1.tar.gz 80037230 SHA256 e3c5944f801762b93835ed3352d39efe0ff730081efa0b3f5771a9f166ecd0f2 SHA512 612a1fbd4c717ec4221a3b4ba27540944c83ece8662b2bdbaec14d052003f7fc4dcf8be27c3f75ee3d745efe403b8af6e6105ac481b6f1f717d8e975750e022d WHIRLPOOL 2389730493d7dd3f900651f3fdef2cfd185e11ebfc9164907558f22ce723745ea7480d297967cf03511658331650617266902e62c5de84432535fc6c9f8c03df
EBUILD amuse-5.0.ebuild 674 SHA256 214a2ea6020afd70cc439a3eea2d237151ca3352893f64d8a902c2b40c366305 SHA512 07da22a5201efa987e2c82faddad433a7a65cdcb58ab05a6c558e8ab351364187acd0a1963201828d16b3e0d136e6e6c798b8559b16df8b2c5c011b64041ab1b WHIRLPOOL ca3a3209811e19586ae735a13b35642427a9952250a7334790a067b69708ef1accc92e45e11d953bf36e6bfa7beacbb6fe868cdc5143591b61bbaf8171f52fab
-EBUILD amuse-7.1.ebuild 1171 SHA256 8919c1ca2a6be15f6e60f3b7de952bad16084dd0f8918b4538001a7d66f8c568 SHA512 035c410ea268432ddaff3aa96487c9c833356f8eb79d2362bb0b3c6653260c2f62172f019c0e4f72c2c5e65a43562f57ab8b29d0f21ce3cf6db417e0a1d1a56b WHIRLPOOL c7579e163459aca5aa4f36d9eec52593bd5f8f66e8a4c07db43eab0ac5b64a95c05358460df0f3b95409e71a5e83116d3983675f29509c852b40e9d6dcaf5353
+EBUILD amuse-7.1.ebuild 1149 SHA256 fbaa59af61f29eadcd8b146a3eeb513a2a03a67b19646e89fdc139c4b50228b8 SHA512 2afa0835dff606b6011d886b54b72f1ae2bf629eeefcd3f96f0db7bacdd5e0896dc89faefeca3115211dbcbc038a1cb9afa8d157022223762ca67c38ae105bce WHIRLPOOL 88276053ef606a4e79c60166eff7a7139996b4116290acb28d194e67f3176cab93210dfac6c6f611251e37b731bc2d01a7cc2c0dfc78c9e423d069316cf801ed
MISC ChangeLog 330 SHA256 8903c67a8b629ec475660cd70c3752c154fa298cd9ac1b918e2ac1506f8603c3 SHA512 10c0f2e1006c8c61d90572f102d8f024e9075bd7081300dd5374425c50312b1e2b34516e73b90fbb02449177b6964bcd2975ec94a8126e3705bf295fb3fb72f1 WHIRLPOOL 0d26aceffab5a1924008e4518c1f7278db9722e7d617d2aacb033891f21f50d46d8cf92906452261ecbb3496806b612e55b41fd5c299c89eab8ebb3587e8e713
MISC metadata.xml 638 SHA256 96aacb8242d5f16a0e219b93fb79073010f728c2cfa246531e065a6f60ffd5f2 SHA512 f9dd70420b18a9f3db212a3d9247216f2548e8ead4e7d7c17d685ac7d9203d189280675a9f77661a108449e2f735f287624006032396bc44ad92071b66ca441f WHIRLPOOL ba187af8c6f1332a0465683b9e92ac7598c3eac5ac5aeed972b51ec60508dedc84d0f24c2ae2c05cae0565aeb36c00f0d859773f8176f60227db33bbc9cddeab
diff --git a/sci-astronomy/amuse/amuse-7.1.ebuild b/sci-astronomy/amuse/amuse-7.1.ebuild
index 747599e..408606e 100644
--- a/sci-astronomy/amuse/amuse-7.1.ebuild
+++ b/sci-astronomy/amuse/amuse-7.1.ebuild
@@ -9,7 +9,7 @@ inherit fortran-2
DESCRIPTION="AMUSE is an Astrophysical Multipurpose Software Environment"
HOMEPAGE="http://amusecode.org"
SRC_URI="http://www.amusecode.org/releases/${P}.tar.gz"
-#MERGE_TYPE="buildonly"
+MERGE_TYPE="buildonly"
LICENSE="other"
SLOT="0"
@@ -33,18 +33,14 @@ DEPEND="${RDEPEND}
>=dev-util/cmake-2.4
"
-#src_configure() {
-# econf
-#}
-
src_compile() {
emake
# USE-flag dependent make:
- use mesa && emake mesa.code DOWNLOAD_CODES=1
- use mocassin && emake mocassin.code DOWNLOAD_CODES=1
- use mpiamrvac && emake mpiamrvac.code DOWNLOAD_CODES=1
- use pynbody && emake pynbody.code DOWNLOAD_CODES=1
+ use mesa && emake mesa.code DOWNLOAD_CODES=1
+ use mocassin && emake mocassin.code DOWNLOAD_CODES=1
+ use mpiamrvac && emake mpiamrvac.code DOWNLOAD_CODES=1
+ use pynbody && emake pynbody.code DOWNLOAD_CODES=1
}
#src_install() {