diff options
Diffstat (limited to 'sci-chemistry')
| -rw-r--r-- | sci-chemistry/hoomd/ChangeLog | 4 | ||||
| -rw-r--r-- | sci-chemistry/hoomd/Manifest | 4 | ||||
| -rw-r--r-- | sci-chemistry/hoomd/hoomd-0.9.1.3815.ebuild | 45 |
3 files changed, 26 insertions, 27 deletions
diff --git a/sci-chemistry/hoomd/ChangeLog b/sci-chemistry/hoomd/ChangeLog index 31f9037bb..d7d150907 100644 --- a/sci-chemistry/hoomd/ChangeLog +++ b/sci-chemistry/hoomd/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 15 Mar 2011; Ross Smith (gaurdro) <gaurdro@gmail.com> + hoomd-0.9.1.3815.ebuild, +hoomd-0.9.1.3815.patch: + fixed errors in hoomd ebuild. Thanks ato mgorny for the review + 13 Mar 2011; Ross Smith (gaurdro) <gaurdro@gmail.com> +hoomd-0.9.1.3815.ebuild, +metadata.xml: New Ebuild for bug 357021. Thanks to the sunrise devs for their help diff --git a/sci-chemistry/hoomd/Manifest b/sci-chemistry/hoomd/Manifest index 1d8c1e3d9..d3fe231a8 100644 --- a/sci-chemistry/hoomd/Manifest +++ b/sci-chemistry/hoomd/Manifest @@ -1,6 +1,6 @@ DIST hoomd-0.9.1.3815.tar.bz2 4631180 RMD160 ba2f16ae7802a8c612fd44cd353bccd1b5249d1a SHA1 4dff6182b6c423627bb5f3d2f434aab1f05fd4f3 SHA256 14ba3e17494681275593f7beafbe11dd84a954aa737f37807671ea70f7c8f3be DIST hoomd-devdoc-0.9.1.tar.bz2 729365 RMD160 e214c7351adbf32d7512ca8f9d0d7d2bc8753403 SHA1 511eb112d28297c0e0a0d3c4525934c54bc704ef SHA256 e2d5fcad50c94b7a7eea1b7142f4d0c7590a014587e6c8978c74e81580b8e57e DIST hoomd-userdoc-0.9.1.pdf 1462069 RMD160 db125732309cbdc85f6233fbefb246158a257820 SHA1 395439b3377d275b974831b00067ac046e94ab25 SHA256 119d97d630df30683debf4e128b3b4692bb3926b14ada3d4da7117a8c1086b09 -EBUILD hoomd-0.9.1.3815.ebuild 3299 RMD160 9f731174bfd60e46750837b024f036e070b70b51 SHA1 6a26156faf3da5dec0e8303fa0f6f5f597ecd418 SHA256 5615c737e2841a516c6a9d652d2bfdf771a57841a86edd75ffe1874b8a33cd37 -MISC ChangeLog 292 RMD160 70af3643d24e3fcd3a6139d056bf270d179afcbb SHA1 9df582916111fd3c69eede3906afdf9877c0bcba SHA256 91bd835482bb94b70d903df4d79861eaad8bd9d871c5a48e02102f808fb9f12e +EBUILD hoomd-0.9.1.3815.ebuild 3234 RMD160 374730505522c2b218e7f82f77119cf4c880e520 SHA1 59195c64d895b37c6500e9b8183ffccedbcf7218 SHA256 221e7700bb37a3adae3b9f51570cb94b21e372205752f2f66145da81f8befab4 +MISC ChangeLog 467 RMD160 89624a0e7806ac72b610ba58570352efc8e38258 SHA1 74c9e0a66df37ecce9fcd8706918134904179553 SHA256 aa77f31f3e326d9ecc416ddd80dbe0f833b14f75efce04f8115308516b071c37 MISC metadata.xml 519 RMD160 9d8f1a598d95942c3832bb3f37c1cf15bde68bfa SHA1 3b646121e743776d9c2f7d5762cec79d67cdae16 SHA256 0274214dbdc5912f598acd525ebb28d0c54c01b23d21182bb31e12bb1e09c7b0 diff --git a/sci-chemistry/hoomd/hoomd-0.9.1.3815.ebuild b/sci-chemistry/hoomd/hoomd-0.9.1.3815.ebuild index 94a7d7e9c..c7f905224 100644 --- a/sci-chemistry/hoomd/hoomd-0.9.1.3815.ebuild +++ b/sci-chemistry/hoomd/hoomd-0.9.1.3815.ebuild @@ -28,26 +28,22 @@ RESTRICT_PYTHON_ABIS="3.*" pkg_setup() { python_pkg_setup - if use cuda && version_is_at_least 4.5 $(gcc-version) \ - && has_version <=nvidia-cuda-toolkit-3.2 \ - && has_version >nvidia-cuda-toolkit-3.0; then - ewarn "Nvidia CUDA SDK Version 3.2 and below require a gcc version less than 4.5" - ewarn "Enabling the cuda use flag with gcc version 4.5 or higher will cause build failures in those SDK versions." - ewarn "Please use gcc-config to set a gcc version less than 4.5." + if use cuda; then + if has_version <=nvidia-cuda-toolkit-3.0; then + if version_is_at_least 4.4 $(gcc-version); then + ewarn "Nvidia CUDA SDK version 3.0 and below requires a gcc version less than 4.4" + ewarn "Enabling the cuda use flag with gcc version 4.4 or higher will cause build failures in those SDK versions." + ewarn "Please use gcc-config to set a gcc version less than 4.4 ." + fi + + elif has_version <=nvidia-cuda-toolkit-3.2; then + if version_is_at_least 4.5 $(gcc-version); then + ewarn "Nvidia CUDA SDK Version 3.2 and below require a gcc version less than 4.5" + ewarn "Enabling the cuda use flag with gcc version 4.5 or higher will cause build failures in those SDK versions." + ewarn "Please use gcc-config to set a gcc version less than 4.5." + fi + fi fi - - if use cuda && version_is_at_least 4.4 $(gcc-version) \ - && has_version <=nvidia-cuda-toolkit-3.0; then - ewarn "Nvidia CUDA SDK version 3.0 and below requires a gcc version less than 4.4" - ewarn "Enabling the cuda use flag with gcc version 4.4 or higher will cause build failures in those SDK versions." - ewarn "Please use gcc-config to set a gcc version less than 4.4 ." - fi - -} - -src_unpack() { - unpack ${P}.tar.bz2 - use doc && unpack hoomd-devdoc-${PV}.tar.bz2 } src_prepare(){ @@ -65,16 +61,16 @@ src_configure(){ my_config() { local mycmakeargs=( $(cmake-utils_use_enable cuda CUDA) - $(cmake-utils_use_enable static-lib STATIC) + $(cmake-utils_use_enable static-libs STATIC) $(cmake-utils_use_enable test BUILD_TESTING) $(cmake-utils_use_enable openmp OPENMP) $(cmake-utils_use_enable zlib ZLIB) -DENABLE_VALGRIND=OFF -DENABLE_NATIVE_INSTALL=0N -DENABLE_DOXYGEN=OFF - -DPYTHON_SITEDIR=$(python_get_sitedir) + -DPYTHON_SITEDIR="$(python_get_sitedir)" -DENABLE_SINGLE_PRECISION=${sp} - -DCMAKE_BUILD_TYPE=${cbt} + -DCMAKE_BUILD_TYPE=${cbt} -DENABLE_OCELOT:BOOL=OFF ) @@ -90,13 +86,12 @@ src_test(){ src_install(){ if use doc; then - insinto /usr/share/doc/${PF} newins "${DISTDIR}/hoomd-userdoc-${MY_DOC_PV}.pdf" hoom-userdoc-${PV}.pdf || die "docs failed" insinto /usr/share/doc/${PF}/devdocs - mv "hoomd-devdoc-${MY_DOC_PV}/" "hoomd-devdoc-${PV}" || die - doins -r "hoomd-devdoc-${PV}/" || die "docs failed" + mv "${WORKDIR}/hoomd-devdoc-${MY_DOC_PV}/" "${WORKDIR}/hoomd-devdoc-${PV}" || die + doins -r "${WORKDIR}/hoomd-devdoc-${PV}/" || die "docs failed" fi python_execute_function -s cmake-utils_src_install |