Version bumps for sci-physics/geant-vmc and sci-physics/vgm (#655)

* sci-physics/vgm: Bump to 4.3, update to EAPI 6.

Package-Manager: portage-2.3.0

* sci-physics/geant-vmc: Bump to geant-vmc-4.3.3, adapt to changed upstream SRC URI, bump all geant-4 packages to EAPI 6.

Package-Manager: portage-2.3.0

8 files changed, 176 insertions, 28 deletions

diff --git a/sci-physics/geant-vmc/Manifest b/sci-physics/geant-vmc/Manifest
index 19c33c22b..571f74cdc 100644
--- a/sci-physics/geant-vmc/Manifest
+++ b/sci-physics/geant-vmc/Manifest
@@ -1,2 +1,3 @@
 DIST geant321+_vmc.1.15a.tar.gz 11301200 SHA256 bcb29719be1a6dd2842f1a2d66e50d176b1be9d9dd07e7d573db500465857922 SHA512 a5d92cbd0b4199feeedace3e0b09f7cdef6e8270bed44ae7adb024a3a8e6f0fdce51ed6ade3dd58a841594ebf1b4430c2702b71e262075b790e8a82c24c2ac0a WHIRLPOOL 98f0cf1d23bd54a58413aaa8c14cccd626654371ac43f00b7c3d8ff729db2e9f421c0251a0768ed77dadf791982c3f1853d46f44af8e34cdb3bb4eed8fa3d73c
 DIST geant4_vmc.2.15a.tar.gz 18180065 SHA256 1c44db9c52cd419b8b75239dcac73e930ea5f128499c30760d4d158d9f9c2c0d SHA512 b2ea376c44fbf27010572112e1cfbb20c09850a458487f80d6fbe5f4150d8de0bf45d5b134875aff458ed143ad0c6a9db43fda9c7323d2fd625c1bc7adfe9b7a WHIRLPOOL b828004908073021aeefb6d03bc5bea80b22005e64fe0f4094fcd64e2f9dcbd19351635754485981dd8579c1a40f878a8fb4d7ab549b2c5a2c39150b5e9df8cb
+DIST geant4_vmc.3.3.tar.gz 1072223 SHA256 736e384ca86f08882a9ef14fec8459fb31c03585c86cd16a7189f6707ce40e70 SHA512 77ec63c6502f193694a595a822edca5363b057304bc5603c0919000399cd76727b0f2782f347c1bf9ce5fabd05550b1698cca211690680aab8eb832796337acf WHIRLPOOL 963ad056dc21f892af9c9ef66e77a30f46cf22974f5f77ee1967e2a518f4636349c95ed2b482aa7c31e216671a997ea3bacbdd759559bb5c9fe2ca49f551535b
diff --git a/sci-physics/geant-vmc/geant-vmc-3.1.15a.ebuild b/sci-physics/geant-vmc/geant-vmc-3.1.15a.ebuild
index 15738c0aa..767c7596a 100644
--- a/sci-physics/geant-vmc/geant-vmc-3.1.15a.ebuild
+++ b/sci-physics/geant-vmc/geant-vmc-3.1.15a.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,7 @@ MPV=$(get_version_component_range 2-)
 
 DESCRIPTION="Virtual Monte Carlo Geant3 implementation"
 HOMEPAGE="http://root.cern.ch/root/vmc/VirtualMC.html"
-SRC_URI="ftp://root.cern.ch/root/vmc/geant321+_vmc.${MPV}.tar.gz"
+SRC_URI="http://root.cern.ch/download/vmc/geant321+_vmc.${MPV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="3"
diff --git a/sci-physics/geant-vmc/geant-vmc-4.2.15a.ebuild b/sci-physics/geant-vmc/geant-vmc-4.2.15a.ebuild
index c00fbca5e..efd9a0035 100644
--- a/sci-physics/geant-vmc/geant-vmc-4.2.15a.ebuild
+++ b/sci-physics/geant-vmc/geant-vmc-4.2.15a.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,7 @@ MPV=$(get_version_component_range 2-)
 
 DESCRIPTION="Virtual Monte Carlo Geant4 implementation"
 HOMEPAGE="http://root.cern.ch/root/vmc/VirtualMC.html"
-SRC_URI="ftp://root.cern.ch/root/vmc/geant4_vmc.${MPV}.tar.gz"
+SRC_URI="http://root.cern.ch/download/vmc/geant4_vmc.${MPV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="4"
diff --git a/sci-physics/geant-vmc/geant-vmc-4.3.3.ebuild b/sci-physics/geant-vmc/geant-vmc-4.3.3.ebuild
new file mode 100644
index 000000000..2e5507d11
--- /dev/null
+++ b/sci-physics/geant-vmc/geant-vmc-4.3.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils versionator
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=" http://root.cern.ch/git/geant4_vmc.git"
+	KEYWORDS=""
+else
+	MPV=$(get_version_component_range 2-)
+	SRC_URI="http://root.cern.ch/download/vmc/geant4_vmc.${MPV}.tar.gz"
+	S="${WORKDIR}/geant4_vmc.${MPV}"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Virtual Monte Carlo Geant4 implementation"
+HOMEPAGE="http://root.cern.ch/root/vmc/VirtualMC.html"
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="doc examples geant3 +g4root +mtroot vgm test"
+
+RDEPEND="
+	sci-physics/root:=
+	>=sci-physics/geant-4.9.6[opengl,geant3?]
+	vgm? ( >=sci-physics/vgm-4.00 )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+src_configure() {
+	local mycmakeargs=(
+			-DGeant4VMC_USE_VGM="$(usex vgm)"
+			-DGeant4VMC_USE_GEANT4_G3TOG4="$(usex geant3)"
+			-DGeant4VMC_USE_G4Root="$(usex g4root)"
+			-DGeant4VMC_USE_MTRoot="$(usex mtroot)"
+			-DGeant4VMC_BUILD_EXAMPLES="$(usex test)"
+			-DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)"
+			)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	local dirs="source"
+	use g4root && dirs+=" g4root "
+	use mtroot && dirs+=" mtroot "
+	use examples && dirs+=" examples "
+	local d
+	for d in ${dirs}; do
+		pushd ${d} > /dev/null || die
+		if use doc; then
+			doxygen || die
+		fi
+		popd > /dev/null
+	done
+}
+
+src_test() {
+	cd examples || die
+	./test_suite.sh --g3=off --builddir="${BUILD_DIR}" || die
+	./test_suite_exe.sh --g3=off --builddir="${BUILD_DIR}" || die
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc README history
+	use doc && dohtml -r Geant4VMC.html doc/*
+}
diff --git a/sci-physics/geant-vmc/geant-vmc-9999.ebuild b/sci-physics/geant-vmc/geant-vmc-9999.ebuild
index deaf458a0..2e5507d11 100644
--- a/sci-physics/geant-vmc/geant-vmc-9999.ebuild
+++ b/sci-physics/geant-vmc/geant-vmc-9999.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit cmake-utils versionator git-r3
+inherit cmake-utils versionator
 
 if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
 	EGIT_REPO_URI=" http://root.cern.ch/git/geant4_vmc.git"
 	KEYWORDS=""
 else
 	MPV=$(get_version_component_range 2-)
-	SRC_URI="ftp://root.cern.ch/root/vmc/geant4_vmc.${MPV}.tar.gz"
+	SRC_URI="http://root.cern.ch/download/vmc/geant4_vmc.${MPV}.tar.gz"
+	S="${WORKDIR}/geant4_vmc.${MPV}"
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
@@ -31,12 +33,12 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-			$(cmake-utils_use vgm Geant4VMC_USE_VGM)
-			$(cmake-utils_use geant3 Geant4VMC_USE_GEANT4_G3TOG4)
-			$(cmake-utils_use g4root Geant4VMC_USE_G4Root)
-			$(cmake-utils_use mtroot Geant4VMC_USE_MTRoot)
-			$(cmake-utils_use test Geant4VMC_BUILD_EXAMPLES)
-			$(cmake-utils_use examples Geant4VMC_INSTALL_EXAMPLES)
+			-DGeant4VMC_USE_VGM="$(usex vgm)"
+			-DGeant4VMC_USE_GEANT4_G3TOG4="$(usex geant3)"
+			-DGeant4VMC_USE_G4Root="$(usex g4root)"
+			-DGeant4VMC_USE_MTRoot="$(usex mtroot)"
+			-DGeant4VMC_BUILD_EXAMPLES="$(usex test)"
+			-DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)"
 			)
 	cmake-utils_src_configure
 }
diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest
index d1cc263a9..180f21b73 100644
--- a/sci-physics/vgm/Manifest
+++ b/sci-physics/vgm/Manifest
@@ -1 +1,2 @@
 DIST vgm-code-731-tags-v3-06.zip 3668484 SHA256 b56faddcf28a2af8ebd835b17804d7edaf843b3e2ad9ee3170a6fe5bba209263 SHA512 27b275f4710bfd4f445147854260a768ca1808bad7fc0c4b38e28a4ade22acd80ff80d519341b279c81b9e9e303135f681003381acee2e28e549c93d74858f01 WHIRLPOOL 6393871bd1effd8318cbd3d76921eef79fc253fa09f2bf9e005bc6448b9602e481344f89e00d6a48dc43f6ff6c881dd8ea62ce9d07673c9b1e64c0cc842fec7e
+DIST vgm.4.3.tar.gz 2989397 SHA256 9c5fe088a84e9afedf92d0ff7dd2e516f4eac974d8195c710235ddf2530fd970 SHA512 2e832639becc098ade28d965bc05da56dc54899ea80e475990098ceef39b00e64458c8a18df8995a82afaa7fa8e983c3f104ff1440254cd0b29213039081c12d WHIRLPOOL 12c9db0af332e5fe84479f332c695a31a74c95f95e2d30aa11b9604ee07df0ed239345bb784a17aeb8fafdbbd60329d1eafef7ad653f296376b058fbfa1969a9
diff --git a/sci-physics/vgm/vgm-4.3.ebuild b/sci-physics/vgm/vgm-4.3.ebuild
new file mode 100644
index 000000000..c1f05afa3
--- /dev/null
+++ b/sci-physics/vgm/vgm-4.3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils versionator
+
+if [[ ${PV} == *9999* ]]; then
+	inherit subversion
+	ESVN_REPO_URI="svn://svn.code.sf.net/p/vgm/code/trunk/vgm"
+	KEYWORDS=""
+else
+	SRC_URI="http://ivana.home.cern.ch/ivana/${PN}.${PV}.tar.gz"
+	S="${WORKDIR}/${PN}.${PV}"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Virtual Geometry Model for High Energy Physics Experiments"
+HOMEPAGE="http://ivana.home.cern.ch/ivana/VGM.html"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc examples +geant4 +root test xml"
+
+RDEPEND="
+	sci-physics/clhep:=
+	root? ( sci-physics/root:= )
+	geant4? ( >=sci-physics/geant-4.9.6 )
+	xml? ( dev-libs/xerces-c )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen[dot] )
+	test? ( geant4? ( xml? ( >=sci-physics/geant-4.9.6[gdml] ) ) )"
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCLHEP_DIR="${EROOT}usr"
+		-Dexamples="$(usex examples)"
+		-DVGM_INSTALL_EXAMPLES="$(usex examples)"
+		-Dgeant4="$(usex geant4)"
+		-Droot="$(usex root)"
+		-Dtest="$(usex test)"
+		-Dxercesc="$(usex xml)"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use doc; then
+		cd packages
+		doxygen || die
+	fi
+}
+
+src_test() {
+	cd "${BUILD_DIR}"/test
+	./test_suite.sh || die
+}
+
+src_install() {
+	cmake-utils_src_install
+	cd doc || die
+	dodoc README todo.txt VGMhistory.txt VGM.html VGMversions.html
+	use doc && dohtml -r html/*
+}
diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-9999.ebuild
index 169184f17..c1f05afa3 100644
--- a/sci-physics/vgm/vgm-9999.ebuild
+++ b/sci-physics/vgm/vgm-9999.ebuild
@@ -1,20 +1,18 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit cmake-utils versionator subversion
+inherit cmake-utils versionator
 
 if [[ ${PV} == *9999* ]]; then
+	inherit subversion
 	ESVN_REPO_URI="svn://svn.code.sf.net/p/vgm/code/trunk/vgm"
 	KEYWORDS=""
 else
-	# .zip-snapshot can be recreated by visiting
-	# http://sourceforge.net/p/${PN}/code/${COMMIT}/tarball?path=/tags/v$(replace_all_version_separators '-')
-	TAG_VER="${PN}-code-731-tags-v$(replace_all_version_separators '-')"
-	SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${TAG_VER}.zip"
-	S=${WORKDIR}/${TAG_VER}/${PN}
+	SRC_URI="http://ivana.home.cern.ch/ivana/${PN}.${PV}.tar.gz"
+	S="${WORKDIR}/${PN}.${PV}"
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
@@ -34,15 +32,19 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen[dot] )
 	test? ( geant4? ( xml? ( >=sci-physics/geant-4.9.6[gdml] ) ) )"
 
+src_prepare() {
+	default
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DCLHEP_DIR="${EROOT}usr"
-		$(cmake-utils_use_with examples)
-		$(cmake-utils_use examples VGM_INSTALL_EXAMPLES)
-		$(cmake-utils_use_with geant4)
-		$(cmake-utils_use_with root)
-		$(cmake-utils_use_with test)
-		$(cmake-utils_use_with xml xercesc)
+		-Dexamples="$(usex examples)"
+		-DVGM_INSTALL_EXAMPLES="$(usex examples)"
+		-Dgeant4="$(usex geant4)"
+		-Droot="$(usex root)"
+		-Dtest="$(usex test)"
+		-Dxercesc="$(usex xml)"
 	)
 	cmake-utils_src_configure
 }