diff options
Diffstat (limited to 'sci-physics')
| -rw-r--r-- | sci-physics/geant/ChangeLog | 12 | ||||
| -rw-r--r-- | sci-physics/geant/files/geant-4.9.4-trajectory.patch | 11 | ||||
| -rw-r--r-- | sci-physics/geant/files/geant-4.9.4-zlib.patch | 31 | ||||
| -rw-r--r-- | sci-physics/geant/geant-4.9.3_p02-r1.ebuild | 257 | ||||
| -rw-r--r-- | sci-physics/geant/geant-4.9.4_p03.ebuild (renamed from sci-physics/geant/geant-4.9.4_p01.ebuild) | 7 | ||||
| -rw-r--r-- | sci-physics/geant/geant-4.9.5.ebuild | 98 |
6 files changed, 143 insertions, 273 deletions
diff --git a/sci-physics/geant/ChangeLog b/sci-physics/geant/ChangeLog index e2da46f1b119..ef0f36c34299 100644 --- a/sci-physics/geant/ChangeLog +++ b/sci-physics/geant/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for sci-physics/geant # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.54 2011/08/02 05:50:11 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.55 2011/12/18 07:13:04 bicatali Exp $ + +*geant-4.9.5 (18 Dec 2011) +*geant-4.9.4_p03 (18 Dec 2011) + + 18 Dec 2011; Sébastien Fabbro <bicatali@gentoo.org> + -geant-4.9.3_p02-r1.ebuild, -geant-4.9.4_p01.ebuild, +geant-4.9.4_p03.ebuild, + +files/geant-4.9.4-trajectory.patch, files/geant-4.9.4-zlib.patch, + +geant-4.9.5.ebuild: + Version bumps. Re-introduced some older flags and fixed linking of + zlib. Added patch for source trajectory example (bug #365171), thanks Matthias Nagl. 02 Aug 2011; Matt Turner <mattst88@gentoo.org> geant-4.9.2_p02.ebuild, geant-4.9.3_p02-r1.ebuild: diff --git a/sci-physics/geant/files/geant-4.9.4-trajectory.patch b/sci-physics/geant/files/geant-4.9.4-trajectory.patch new file mode 100644 index 000000000000..df45ae234e50 --- /dev/null +++ b/sci-physics/geant/files/geant-4.9.4-trajectory.patch @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2011-04-28 01:19:54.232041312 +0200 ++++ CMakeLists.txt 2011-04-28 01:15:11.434101391 +0200 +@@ -43,6 +43,8 @@ + set(${PROJECT_NAME}_VERSION_MINOR "4") + set(${PROJECT_NAME}_VERSION_PATCH "1") + ++add_definitions(-DG4_STORE_TRAJECTORY) ++ + #------------------------------------------------------------------------------ + # Set up path to internal set of CMake modules. + # diff --git a/sci-physics/geant/files/geant-4.9.4-zlib.patch b/sci-physics/geant/files/geant-4.9.4-zlib.patch index faa850e214ae..ac7b72818be9 100644 --- a/sci-physics/geant/files/geant-4.9.4-zlib.patch +++ b/sci-physics/geant/files/geant-4.9.4-zlib.patch @@ -1,11 +1,20 @@ ---- CMakeLists.txt.orig 2011-01-17 06:25:14.536078940 +0000 -+++ CMakeLists.txt 2011-01-17 06:25:26.166078780 +0000 -@@ -154,7 +154,7 @@ - #------------------------------------------------------------------------------ - # Optional use of system zlib library - # --#option(GEANT4_USE_SYSTEM_ZLIB "Use the system's zlib library" OFF) -+option(GEANT4_USE_SYSTEM_ZLIB "Use the system's zlib library" OFF) - if(GEANT4_USE_SYSTEM_ZLIB) - # This needs more work - use ITK's way of doing it as an example. - find_package(ZLIB) +--- source/visualization/HepRep/sources.cmake.orig 2011-12-02 15:07:49.000000000 +0000 ++++ source/visualization/HepRep/sources.cmake 2011-12-18 06:21:22.000000000 +0000 +@@ -91,7 +91,7 @@ + G4specsolids + G4tracking + G4vis_management +- G4zlib ++ ${ZLIB_LIBRARIES} + GLOBAL_DEPENDENCIES + G4digits_hits + G4geometry +@@ -102,7 +102,7 @@ + G4modeling + G4tracking + G4vis_management +- G4zlib ++ ${ZLIB_LIBRARIES} + LINK_LIBRARIES + ) + diff --git a/sci-physics/geant/geant-4.9.3_p02-r1.ebuild b/sci-physics/geant/geant-4.9.3_p02-r1.ebuild deleted file mode 100644 index 0815d3220ba9..000000000000 --- a/sci-physics/geant/geant-4.9.3_p02-r1.ebuild +++ /dev/null @@ -1,257 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.3_p02-r1.ebuild,v 1.8 2011/08/02 05:50:11 mattst88 Exp $ - -EAPI=4 - -inherit eutils fortran-2 toolchain-funcs versionator - -PV1=$(get_version_component_range 1 ${PV}) -PV2=$(get_version_component_range 2 ${PV}) -PV3=$(get_version_component_range 3 ${PV}) -MY_P=${PN}$(replace_version_separator 3 .) - -DESCRIPTION="Toolkit for simulation of passage of particles through matter" -HOMEPAGE="http://geant4.cern.ch/" -SRC_COM="http://geant4.cern.ch/support/source" -SRC_URI="${SRC_COM}/${MY_P}.tar.gz" -GEANT4_DATA=" - G4NDL.3.13 - G4EMLOW.6.9 - G4RadioactiveDecay.3.2 - PhotonEvaporation.2.0 - G4ABLA.3.0 - RealSurface.1.0" -for d in ${GEANT4_DATA}; do - SRC_URI="${SRC_URI} data? ( ${SRC_COM}/${d}.tar.gz )" -done - -LICENSE="geant4" -SLOT="4" -KEYWORDS="~amd64 ~x86" -IUSE="athena +data dawn debug examples gdml geant3 global minimal +motif - +opengl openinventor qt4 +raytracerx static-libs +vrml zlib" - -RDEPEND=" - virtual/fortran - <sci-physics/clhep-2.1 - motif? ( x11-libs/openmotif:0 ) - athena? ( x11-libs/libXaw ) - qt4? ( x11-libs/qt-gui:4 ) - openinventor? ( >=media-libs/openinventor-2.1.5.10-r3 ) - raytracerx? ( x11-libs/libX11 x11-libs/libXmu ) - opengl? ( virtual/opengl - athena? ( x11-libs/libXaw3d ) - qt4? ( x11-libs/qt-opengl:4 ) ) - gdml? ( dev-libs/xerces-c ) - geant3? ( sci-physics/geant:3 ) - dawn? ( media-gfx/dawn ) - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - fortran-2_pkg_setup - eval unset ${!G4*} - tc-export CXX CC -} - -src_prepare() { - # fix bad zlib dependency - epatch "${FILESDIR}"/${PN}-4.9.3-zlib.patch \ - "${FILESDIR}"/${PN}-4.9.3-respect_flags.patch - - # propagate user's flags and compiler settings - sed -i -e 's/-o/$(LDFLAGS) -o/g' source/GNUmakefile || die - sed -i \ - -e 's:g++:$(CXX):g' \ - config/*.gmk || die "sed for forced g++ failed" - - # fix forced lib directory - sed -i \ - -e 's:$(G4LIB)/$(G4SYSTEM):$(G4LIB):g' \ - config/binmake.gmk || die "sed binmake.gmk failed" - sed -i \ - -e '/$(G4LIB)\/$(G4SYSTEM)/d' \ - config/architecture.gmk || die "sed architecture.gmk failed" - sed -i \ - -e 's:$(G4LIB)/$(G4SYSTEM):$(G4TMP):g' \ - config/common.gmk || die "sed common.gmk failed" - sed -i \ - -e 's:$(G4LIB)/$(G4SYSTEM):$(G4TMP):g' \ - config/moc.gmk || die "sed moc.gmk failed" - sed -i \ - -e 's:$(G4LIB)/$(G4SYSTEM):$(G4TMP):g' \ - -e 's:$(G4BIN)/$(G4SYSTEM):$(G4TMP):g' \ - -e 's:$(G4TMP)/$(G4SYSTEM):$(G4TMP):g' \ - source/GNUmakefile || die "sed GNUmakefile failed" - sed -i \ - -e 's:$(G4LIB)/$(G4SYSTEM):$(G4TMP):g' \ - config/globlib.gmk || die "sed globlib.gmk failed" - - # work around a non defined fortran compiler - use geant3 && export FC=$(tc-getFC) - # don't worry about the g++ name of the file, we remove all specific - export G4SYSTEM=Linux-g++ -} - -src_configure() { - export GEANT4_DIR="${EPREFIX}/usr/share/${PN}${PV1}" - # where to put compiled libraries; - # we set env var G4LIB in src_install() - # to avoid confusing make - export GEANT4_LIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}${PV1}" - export G4INSTALL="${S}" - export G4WORKDIR="${S}" - export G4INCLUDE="${ED}/usr/include/${PN}" - export CLHEP_BASE_DIR="${EPREFIX}/usr" - - # parse USE; just set flags of drivers to build, G4*_USE_* vars are set - # later automatically for G4*_BUILD_*_DRIVER - use minimal && export G4UI_NONE=y \ - && export G4VIS_NONE=y - - use motif && export G4UI_BUILD_XM_SESSION=y - use athena && export G4UI_BUILD_XAW_SESSION=y - if use qt4; then - export G4UI_BUILD_QT_SESSION=y - export G4UI_USE_QT=1 - export QTLIBS="-L${EPREFIX}/usr/$(get_libdir)/qt4 -lQtCore -lQtGui" - export QTFLAGS="-I${EPREFIX}/usr/include/qt4 -I${EPREFIX}/usr/include/qt4/Qt" - if use opengl; then - export GLQTLIBS="${QTLIBS} -lQtOpenGL" - export G4VIS_USE_OPENGLQT=1 - export G4VIS_BUILD_OPENGLQT_DRIVER=y - fi - fi - use dawn && export G4VIS_BUILD_DAWN_DRIVER=y - use raytracerx && export G4VIS_BUILD_RAYTRACERX_DRIVER=y - use openinventor && export G4VIS_BUILD_OI_DRIVER=y - use opengl && export G4VIS_BUILD_OPENGLX_DRIVER=y - use opengl && use motif && export G4VIS_BUILD_OPENGLXM_DRIVER=y - use gdml && export G4LIB_BUILD_GDML=y - use geant3 && export G4LIB_BUILD_G3TOG4=y - use zlib && export G4LIB_USE_ZLIB=y - use vrml && export G4VIS_BUILD_VRML_DRIVER=y \ - && export G4VIS_BUILD_VRMLFILE_DRIVER=y - use data && export G4DATA="${GEANT4_DIR}/data" - use debug && export G4DEBUG=y || export G4OPTIMIZE=y - - # switch to see compiling flags - export CPPVERBOSE=y - - # if shared libs are built, the script will also build static libs - # with pic flags - # avoid that by building it twice and removing temporary objects - export G4LIB_BUILD_SHARED=y -} - -src_compile() { - cd "${S}/source/" - einfo "Building shared library" - emake - - if use global; then - export G4LIB_USE_GRANULAR=y - einfo "Building granular libraries" - emake global - emake - fi - - if use static-libs; then - einfo "Building static libraries" - rm -rf tmp - export G4LIB_BUILD_STATIC=y ; unset G4LIB_BUILD_SHARED - emake - fi -} - -g4_create_env_script() { - # we need to change some variables to the final values since we hide these - # from make during the compile - export G4INSTALL=${GEANT4_DIR} - export G4LIB=${GEANT4_LIBDIR} - export G4INCLUDE=${G4INCLUDE/${ED}/} - - local g4env=99${PN}${PV1} - cat <<-EOF > ${g4env} - LDPATH=${G4LIB} - CLHEP_BASE_DIR=${CLHEP_BASE_DIR} - EOF - - # detailed data file locations - if use data; then - G4LEVELGAMMADATA="${G4DATA}/$(basename ${WORKDIR}/PhotonEvaporation*)" - G4RADIOACTIVEDATA="${G4DATA}/$(basename ${WORKDIR}/RadioactiveDecay*)" - G4LEDATA="${G4DATA}/$(basename ${WORKDIR}/G4EMLOW*)" - G4ABLADATA="${G4DATA}/$(basename ${WORKDIR}/G4ABLA*)" - G4NEUTRONHPCROSSSECTIONS="${G4DATA}/$(basename ${WORKDIR}/G4NDL*)" - G4REALSURFACEDATA="${G4DATA}/$(basename ${WORKDIR}/G4REALSURFACEDATA*)" - export G4LEVELGAMMADATA G4RADIOACTIVEDATA G4LEDATA \ - G4ABLADATA G4NEUTRONHPCROSSSECTIONS G4REALSURFACEDATA - fi - - # read env variables defined up to now - printenv | grep ^G4 | uniq >> ${g4env} - # define env vars for capabilities we can build into user projects - printenv | uniq | \ - sed -n -e '/^G4/s:BUILD\(.*\)_DRIVER:USE\1:gp' >> ${g4env} - sed -i -e '/G4WORKDIR/d' ${g4env} - doenvd ${g4env} -} - -src_install() { - # install headers via make since we want them in a single directory - cd "${S}/source/" - einfo "Installing Geant4 headers" - emake includes - cd "${S}" - - # but install libraries and Geant library tool manually - einfo "Installing Geant4 libraries" - insinto ${GEANT4_LIBDIR} - insopts -m0755 - doins tmp/*.so - doins tmp/libname.map - insopts -m0644 - if use static-libs; then - doins tmp/*.a - fi - exeinto ${GEANT4_LIBDIR} - doexe tmp/liblist - - g4_create_env_script - - # configs - insinto ${GEANT4_DIR} - doins -r config - - # install data - if use data; then - einfo "Installing Geant4 data" - insinto ${G4DATA} - pushd "${WORKDIR}" > /dev/null - for d in ${GEANT4_DATA}; do - local p=${d/.} - doins -r *${p/G4} - done - popd > /dev/null - fi - - # doc and examples - insinto /usr/share/doc/${PF} - local mypv="${PV1}.${PV2}.${PV3}" - doins ReleaseNotes/ReleaseNotes${mypv}.html - [[ -e ReleaseNotes/Patch${mypv}-1.txt ]] && \ - dodoc ReleaseNotes/Patch${mypv}-*.txt - - use examples && doins -r examples - # TODO: * momo with momo or java flag, and check java stuff -} - -pkg_postinst() { - elog "Users need to define the G4WORKDIR (\$HOME/geant4 is normally used)." - elog "To use AIDA you have to explicitly set G4ANALYSIS_USE=y in" - elog "your environment." -} diff --git a/sci-physics/geant/geant-4.9.4_p01.ebuild b/sci-physics/geant/geant-4.9.4_p03.ebuild index c0bb499bfb0a..1e9436db7791 100644 --- a/sci-physics/geant/geant-4.9.4_p01.ebuild +++ b/sci-physics/geant/geant-4.9.4_p03.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.4_p01.ebuild,v 1.6 2011/06/28 13:34:44 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.4_p03.ebuild,v 1.1 2011/12/18 07:13:04 bicatali Exp $ EAPI=4 @@ -33,8 +33,7 @@ SLOT="4" KEYWORDS="~amd64 ~x86" IUSE="+data dawn examples gdml geant3 granular qt4 static-libs vrml zlib" -RDEPEND=" - virtual/fortran +RDEPEND="virtual/fortran >=sci-physics/clhep-2.1 qt4? ( x11-libs/qt-gui:4 x11-libs/qt-opengl:4 ) gdml? ( dev-libs/xerces-c ) @@ -45,7 +44,7 @@ DEPEND="${RDEPEND}" S="${WORKDIR}/${MYP}" -PATCHES=( "${FILESDIR}"/${PN}-4.9.4-{no-benchmarks,zlib,libdir,datadir,no-examples}.patch ) +PATCHES=( "${FILESDIR}"/${PN}-4.9.4-{zlib,libdir,datadir,trajectory}.patch ) src_configure() { mycmakeargs=( diff --git a/sci-physics/geant/geant-4.9.5.ebuild b/sci-physics/geant/geant-4.9.5.ebuild new file mode 100644 index 000000000000..16c998e18f01 --- /dev/null +++ b/sci-physics/geant/geant-4.9.5.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.5.ebuild,v 1.1 2011/12/18 07:13:04 bicatali Exp $ + +EAPI=4 + +inherit cmake-utils eutils fortran-2 versionator + +PV1=$(get_version_component_range 1 ${PV}) +PV2=$(get_version_component_range 2 ${PV}) +PV3=$(get_version_component_range 3 ${PV}) +MYP=${PN}$(replace_version_separator 3 .) + +DESCRIPTION="Toolkit for simulation of passage of particles through matter" +HOMEPAGE="http://geant4.cern.ch/" +SRC_COM="http://geant4.cern.ch/support/source" +SRC_URI="${SRC_COM}/${MYP}.tar.gz" +GEANT4_DATA=" + G4NDL.4.0 + G4EMLOW.6.23 + G4RadioactiveDecay.3.4 + G4NEUTRONXS.1.1 + G4PII.1.3 + G4PhotonEvaporation.2.2 + G4ABLA.3.0 + RealSurface.1.0" +for d in ${GEANT4_DATA}; do + SRC_URI="${SRC_URI} data? ( ${SRC_COM}/${d}.tar.gz )" +done + +LICENSE="geant4" +SLOT="4" +KEYWORDS="~amd64 ~x86" +IUSE="+data dawn examples gdml geant3 granular motif opengl openinventor + raytracerx qt4 static-libs test vrml zlib" + +RDEPEND="virtual/fortran + >=sci-physics/clhep-2.1.1 + dawn? ( media-gfx/dawn ) + gdml? ( dev-libs/xerces-c ) + geant3? ( sci-physics/geant:3 ) + motif? ( x11-libs/openmotif:0 ) + openinventor? ( media-libs/openinventor ) + raytracerx? ( x11-libs/libX11 x11-libs/libXmu ) + qt4? ( x11-libs/qt-gui:4 opengl? ( x11-libs/qt-opengl:4 ) ) + zlib? ( sys-libs/zlib )" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MYP}" + +PATCHES=( "${FILESDIR}"/${PN}-4.9.4-zlib.patch ) + +src_configure() { + mycmakeargs=( + -DGEANT4_USE_SYSTEM_CLHEP=ON + -DCMAKE_SKIP_RPATH=ON + $(cmake-utils_use dawn GEANT4_USE_NETWORKDAWN) + $(cmake-utils_use gdml GEANT4_USE_GDML) + $(cmake-utils_use geant3 GEANT4_USE_GEANT3TOGEANT4) + $(cmake-utils_use granular GEANT4_BUILD_GRANULAR_BUILD) + $(cmake-utils_use dawn GEANT4_USE_NETWORKDAWN) + $(cmake-utils_use motif GEANT4_USE_XM) + $(cmake-utils_use opengl GEANT4_USE_OPENGL_X11) + $(cmake-utils_use openinventor GEANT4_USE_INVENTOR) + $(cmake-utils_use qt4 GEANT4_USE_QT) + $(cmake-utils_use raytracerx GEANT4_USE_RAYTRACER_X11) + $(cmake-utils_use test GEANT4_ENABLE_TESTING) + $(cmake-utils_use vrml GEANT4_USE_NETWORKVRML) + $(cmake-utils_use zlib GEANT4_USE_SYSTEM_ZLIB) + $(cmake-utils_use_build static-libs STATIC_LIBS) + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + if use data; then + einfo "Installing Geant4 data" + insinto /usr/share/geant4/data + pushd "${WORKDIR}" > /dev/null + for d in ${GEANT4_DATA}; do + local p=${d/.} + doins -r *${p/G4} + done + popd > /dev/null + fi + + insinto /usr/share/doc/${PF} + local mypv="${PV1}.${PV2}.${PV3}" + doins ReleaseNotes/ReleaseNotes${mypv}.html + [[ -e ReleaseNotes/Patch${mypv}-1.txt ]] && \ + dodoc ReleaseNotes/Patch${mypv}-*.txt + use examples && doins -r examples +} + +pkg_postinst() { + elog "Users need to define the G4WORKDIR variable (\$HOME/geant4 is normally used)." +} |