From 622b78d0d832282505f685f2f442c34ea0e8a7b1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 23 Apr 2023 18:08:08 +0100 Subject: gentoo auto-resync : 23:04:2023 - 18:08:08 --- sci-libs/Manifest.gz | Bin 43967 -> 43966 bytes sci-libs/caffe2/Manifest | 2 +- sci-libs/caffe2/caffe2-2.0.0-r1.ebuild | 1 + sci-libs/med/Manifest | 2 +- sci-libs/med/med-4.1.1-r2.ebuild | 114 --------------------------------- sci-libs/med/med-4.1.1-r3.ebuild | 109 +++++++++++++++++++++++++++++++ 6 files changed, 112 insertions(+), 116 deletions(-) delete mode 100644 sci-libs/med/med-4.1.1-r2.ebuild create mode 100644 sci-libs/med/med-4.1.1-r3.ebuild (limited to 'sci-libs') diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz index 3bff9f406786..8391813e0b06 100644 Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest index d34439736bd4..272e1d8f5f1c 100644 --- a/sci-libs/caffe2/Manifest +++ b/sci-libs/caffe2/Manifest @@ -8,5 +8,5 @@ AUX caffe2-2.0.0-gentoo.patch 6682 BLAKE2B 67657b1ca48ded05a6b07ce18df89c4b87590 DIST pytorch-1.13.1.tar.gz 108279745 BLAKE2B 75de03b74dfdaf8d8fb5ea743fcc0c1b0e408a714ad4160c487921220a7b1755e5fa6e587e6bbc8c9f34dd75e096d2e6dd69c80d24821835fff6c833314434d3 SHA512 f16f89d027efade11d057245cad5b69a390e88b458398310ae30de2dbff7c8fd7f1165be7b8da7ea989c81ac3f5a66c5cb9050610e441a97c83fb8aa28c0bd62 DIST pytorch-2.0.0.tar.gz 111327292 BLAKE2B 6d593a975c0ade714f0b189f7e3c4ff704b9a9a2377b5e441a9cefc202fa22779966d08948e63671912c6ea5a0eee124042155f4f57a654db34e19e42f013cc9 SHA512 4dd76160711c0d87f3026c8b7fa3ed149dd86b8ac0ee9ecea0eaf80d2e6ce8c29368392e77b9466d90b60634087b462b782495997a5d33367cc8ca9fe14c8a14 EBUILD caffe2-1.13.1-r4.ebuild 5009 BLAKE2B dd92c8d27be86d635a832e286ed2b1617e10520f02447d7aaf097cdabcd9c8ba634490ef4af59325d64048bf63f39d00a693373ab921c855e5716514c212d38c SHA512 5269a5c121b2bb9c5d4a1a07c6d1300577e4abec418625c2cae88c6d0385768fe73f380a997b5f46837eba29948c6397e4a4ac642c9d1c94f5ac0fba6e794732 -EBUILD caffe2-2.0.0-r1.ebuild 5054 BLAKE2B ffc593b91584da704962cb82347d2c860140775588741c28482a9a15f4bb9f07d561c63e30382cd5fc116b58c58b05088f31da49b22c25c44c71d905c48abdaf SHA512 938d89fdd4595908b45c943efe660bcd4eb05f31a1b0b4eeeaf6694fc8882ff223570489a2bdf90ea1b43765785bcd69c2d2819294d8e227db42d15aac6706cf +EBUILD caffe2-2.0.0-r1.ebuild 5079 BLAKE2B d30f3a505b2008bcb457f23c7f5bb9da3a71ebed1f94842b73f07ac7c71f0bdde39ecf7af2067208ff3875c84f40d4542c9b8a21af1e0a7d39c30f0141ffe755 SHA512 93bd4e5ae0365d2e316c1df4c8e4725c9cd5352ff5bf87399d6c4a5cd7464ad8efa2c41086f68b59122ff5f910d57899c5ade0f249a9be0306b7dc5e940742e0 MISC metadata.xml 1116 BLAKE2B ac8f5d50c8727a42ab904c5705009247b89b695b8a4e918b2a9a184c7c3e11de19dde49dce207b1eafb0a73a03198efc2efe3890a3b697c18fe86b5740ce2b4b SHA512 6060fb034c36e65279e01ff3c858f944407fbf7a47359f795a13d7fbaa26f5f26945d28d26fbf4301ba359144fc53ba4d845c9dc89669496c0830146fea34724 diff --git a/sci-libs/caffe2/caffe2-2.0.0-r1.ebuild b/sci-libs/caffe2/caffe2-2.0.0-r1.ebuild index 48a01218a4e0..4f0586de46e1 100644 --- a/sci-libs/caffe2/caffe2-2.0.0-r1.ebuild +++ b/sci-libs/caffe2/caffe2-2.0.0-r1.ebuild @@ -161,6 +161,7 @@ src_configure() { if use cuda; then addpredict "/dev/nvidiactl" # bug 867706 + addpredict "/dev/char" mycmakeargs+=( -DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")" diff --git a/sci-libs/med/Manifest b/sci-libs/med/Manifest index 09b7746ea3d0..dd08882af1c2 100644 --- a/sci-libs/med/Manifest +++ b/sci-libs/med/Manifest @@ -4,5 +4,5 @@ AUX med-4.1.0-0003-build-against-hdf5-1.12.patch 4749 BLAKE2B 3a606c27bce6130e83 AUX med-4.1.0-0003-build-against-hdf5-1.14.patch 4749 BLAKE2B 2968edac958b96a66c0d3ddd16d67ab24b8767b26da95eb22c14c97cec0afba337df0f1bdeb07f4d21a353d9cdc788ac63ad496a833de9f0b9d5066620ec8b78 SHA512 2156ab5f929b4f91323dd8e2c03adef1ec1aabfad8433fdaf2afd165f67bf45a8110f89781a4ab8d347c173baca8f2fdba4bbff3b1a00da8b9811437e412d917 DIST med-4.1.1.tar.gz 50506725 BLAKE2B fb9bc3239c18c53fa42c5dd1101559746e8d38db2a3cb5fb47d1bf0cb578facc4ab95409af8524f5c20251848842cc1a331f6a816ce0754e9a6c95f507174ed1 SHA512 8917e7ecfe30e1259b0927c8e1c3d6efd86ed2386813f6d90217bd95589199478e587f0815031ab65cacf7901a30b77a6307414f9073caffe6e7f013e710d768 EBUILD med-4.1.1-r1.ebuild 3420 BLAKE2B 57dd4c3ffd7c3d9cd7413252ae04a58f0cbe86223e7bca74eafc4caf808c7c194232ada980d652528f727e19a9a12a8e9d098d805d00d7b63169d30b05113de1 SHA512 30c185c5e7b88b8756af77c207138900745e7906721ab9fe675f663c01670754774ce34f366dc154bc128803f614453d1c448ea828f06d03320c39c8f2a31a2d -EBUILD med-4.1.1-r2.ebuild 3422 BLAKE2B d7ec3931d07d58994f3783a54a7f92e0b2c18cf87caaeb7fb225dbc89ce19094cde18831db08b320312e7e447751368aedd99dcebf8fad81df26d9cdf7c23dd2 SHA512 df8e12f535a7adb9259863e2865ce687f943dce8de356b15ee9a5ce59f1e8f6ecd3d6dba2597036ccee8669f1545aec8dec2448a259c65d14843615a7633308e +EBUILD med-4.1.1-r3.ebuild 3187 BLAKE2B 43d4a69d866410f4411b45554eee0c3956e648e48f88f2ff07bb7a5acc48d647eddd5842d2e54c69b09dee9e54da20f652c1c98c4f57446ab51ba6429aa522b2 SHA512 055b48dc9bade624e3a08e06df19e98cc8bf9f29ff83d2d938b8997bab995cffcd89304b17a6b13da584af845f0e7dfa00a4bc7bdec2550cea24210b8bff1417 MISC metadata.xml 636 BLAKE2B de5e1c1d3f715459d5ca0945d0d795c1c549e6e20c27283140190bdc24289f4ccc0c12940e00aa689b90fd9af53749f0eabab44cecaf6815ef37adc1795f43e9 SHA512 60a3c3afd0db34569993b73d795830d86eb51778f9a7f0375d0b196c6f0862ca10a77c4c33ad2c906c56c6715be6f4452b61ffab5a25c254e480e50b64c021e4 diff --git a/sci-libs/med/med-4.1.1-r2.ebuild b/sci-libs/med/med-4.1.1-r2.ebuild deleted file mode 100644 index 6b6346b2560b..000000000000 --- a/sci-libs/med/med-4.1.1-r2.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -FORTRAN_NEEDED=fortran - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit cmake flag-o-matic fortran-2 python-single-r1 - -DESCRIPTION="A library to store and exchange meshed data or computation results" -HOMEPAGE="https://www.salome-platform.org/user-section/about/med" -SRC_URI="https://files.salome-platform.org/Salome/other/${P}.tar.gz" -LICENSE="LGPL-3" -S="${WORKDIR}/${P}_SRC" - -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc fortran mpi python test" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -RESTRICT="!test? ( test ) python? ( test )" - -RDEPEND=" - !sci-libs/libmed - dev-lang/tk:0= - >=sci-libs/hdf5-1.10.2:=[fortran?,mpi(+)?] - mpi? ( virtual/mpi[fortran?] ) - python? ( ${PYTHON_DEPS} ) -" -DEPEND="${RDEPEND}" -BDEPEND="python? ( >=dev-lang/swig-3.0.8 )" - -PATCHES=( - "${FILESDIR}/${PN}-4.1.0-0001-Gentoo-specific-Adjust-install-path-for-build-dir.patch" - "${FILESDIR}/${PN}-4.1.0-0002-Re-add-option-for-building-Fortran-library.patch" - "${FILESDIR}/${PN}-4.1.0-0003-build-against-hdf5-1.14.patch" -) - -DOCS=( AUTHORS ChangeLog NEWS README README.CMAKE TODO ) - -pkg_setup() { - use python && python-single-r1_pkg_setup - use fortran && fortran-2_pkg_setup -} - -src_prepare() { - if use python; then - # fixes for correct libdir name - local pysite=$(python_get_sitedir) - pysite="${pysite##/usr/}" - sed \ - -e 's@SET(_install_dir lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/med)@SET(_install_dir '${pysite}'/med)@' \ - -i ./python/CMakeLists.txt || die "sed on ./python/CMakeLists.txt failed" - fi - for cm in ./src/CMakeLists.txt ./tools/medimport/CMakeLists.txt - do - sed -i -e "s@INSTALL(TARGETS \(.*\) DESTINATION lib)@INSTALL(TARGETS \1 DESTINATION $(get_libdir))@" \ - "${cm}" || die "sed on ${cm} failed" - done - sed -e 's/med-fichier/med/' -i CMakeLists.txt || die "fix paths failed" - sed -e 's|doc/med-${MED_STR_VERSION}|doc/med-${MED_STR_VERSION}/html|' \ - -i CMakeLists.txt || die "fix doc path failed" - - # bug #862900, already reported upstream. CHECK on updates! - filter-lto - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - # as indicated in the CMakeLists.txt, the shipped documentation is generated by a custom doxygen, - # so let's avoid rebuilding it because it will be different - -DMEDFILE_BUILD_DOC=OFF - -DMEDFILE_BUILD_FORTRAN=$(usex fortran) - -DMEDFILE_BUILD_PYTHON=$(usex python) - -DMEDFILE_BUILD_SHARED_LIBS=ON - -DMEDFILE_BUILD_STATIC_LIBS=OFF - -DMEDFILE_BUILD_TESTS=$(usex test) - -DMEDFILE_INSTALL_DOC=$(usex doc) - -DMEDFILE_USE_MPI=$(usex mpi) - -DMEDFILE_USE_UNICODE=ON - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - - # we don't need old 2.3.6 include files - rm -r "${ED}"/usr/include/2.3.6 || die "failed to delete obsolete include dir" - - # the optimization done in CMakeLists.txt has been disabled so - # we need to do it manually - use python && python_optimize - - # Prevent test executables being installed - if use test; then - rm -r "${ED}"/usr/bin/testc || die "failed to delete C test executables" - if use fortran; then - rm -r "${ED}"/usr/bin/testf || die "failed to delete fortran test executables" - fi - if use python; then - rm -r "${ED}"/usr/bin/testpy || die "failed to delete python test executables" - fi - fi -} - -src_test() { - # override parallel mode only for tests - local myctestargs=( "-j 1" ) - cmake_src_test -} diff --git a/sci-libs/med/med-4.1.1-r3.ebuild b/sci-libs/med/med-4.1.1-r3.ebuild new file mode 100644 index 000000000000..6fa0f413d8c9 --- /dev/null +++ b/sci-libs/med/med-4.1.1-r3.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +FORTRAN_NEEDED=fortran + +PYTHON_COMPAT=( python3_{9..11} ) + +inherit cmake flag-o-matic fortran-2 python-single-r1 + +DESCRIPTION="A library to store and exchange meshed data or computation results" +HOMEPAGE="https://www.salome-platform.org/user-section/about/med" +SRC_URI="https://files.salome-platform.org/Salome/other/${P}.tar.gz" +LICENSE="LGPL-3" +S="${WORKDIR}/${P}_SRC" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc fortran mpi python test" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="!test? ( test ) python? ( test )" + +RDEPEND=" + !sci-libs/libmed + dev-lang/tk:0= + >=sci-libs/hdf5-1.10.2:=[fortran?,mpi(+)?] + mpi? ( virtual/mpi[fortran?] ) + python? ( ${PYTHON_DEPS} ) +" +DEPEND="${RDEPEND}" +BDEPEND="python? ( >=dev-lang/swig-3.0.8 )" + +PATCHES=( + "${FILESDIR}/${PN}-4.1.0-0001-Gentoo-specific-Adjust-install-path-for-build-dir.patch" + "${FILESDIR}/${PN}-4.1.0-0002-Re-add-option-for-building-Fortran-library.patch" + "${FILESDIR}/${PN}-4.1.0-0003-build-against-hdf5-1.14.patch" +) + +DOCS=( AUTHORS ChangeLog NEWS README README.CMAKE TODO ) + +pkg_setup() { + use python && python-single-r1_pkg_setup + use fortran && fortran-2_pkg_setup +} + +src_prepare() { + if use python; then + # fixes for correct libdir name + local pysite=$(python_get_sitedir) + pysite="${pysite##/usr/}" + sed \ + -e 's@SET(_install_dir lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/med)@SET(_install_dir '${pysite}'/med)@' \ + -i ./python/CMakeLists.txt || die "sed on ./python/CMakeLists.txt failed" + fi + sed -e 's/med-fichier/med/' -i CMakeLists.txt || die "fix paths failed" + sed -e 's|doc/med-${MED_STR_VERSION}|doc/'${PF}'/html|' \ + -i CMakeLists.txt || die "fix doc path failed" + + # bug #862900, already reported upstream. CHECK on updates! + filter-lto + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + # as indicated in the CMakeLists.txt, the shipped documentation is generated by a custom doxygen, + # so let's avoid rebuilding it because it will be different + -DMEDFILE_BUILD_DOC=OFF + -DMEDFILE_BUILD_FORTRAN=$(usex fortran) + -DMEDFILE_BUILD_PYTHON=$(usex python) + -DMEDFILE_BUILD_SHARED_LIBS=ON + -DMEDFILE_BUILD_STATIC_LIBS=OFF + -DMEDFILE_BUILD_TESTS=$(usex test) + -DMEDFILE_INSTALL_DOC=$(usex doc) + -DMEDFILE_USE_MPI=$(usex mpi) + -DMEDFILE_USE_UNICODE=ON + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + # we don't need old 2.3.6 include files + rm -r "${ED}"/usr/include/2.3.6 || die "failed to delete obsolete include dir" + + # the optimization done in CMakeLists.txt has been disabled so + # we need to do it manually + use python && python_optimize + + # Prevent test executables being installed + if use test; then + rm -r "${ED}"/usr/bin/testc || die "failed to delete C test executables" + if use fortran; then + rm -r "${ED}"/usr/bin/testf || die "failed to delete fortran test executables" + fi + if use python; then + rm -r "${ED}"/usr/bin/testpy || die "failed to delete python test executables" + fi + fi +} + +src_test() { + # override parallel mode only for tests + local myctestargs=( "-j 1" ) + cmake_src_test +} -- cgit v1.2.3