[gentoo-commits] proj/sci:master commit in: sci-physics/vgm/, sci-physics/geant-vmc/

[Justin Lecher]

commit:     dc4a79d21bc0c4c18499f9a7b401546fa302b12a
Author:     olifre <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Sat Aug  6 06:41:39 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Aug  6 06:41:39 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=dc4a79d2

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

 sci-physics/geant-vmc/geant-vmc-3.1.15a.ebuild     |  4 +--
 sci-physics/geant-vmc/geant-vmc-4.2.15a.ebuild     |  4 +--
 ...eant-vmc-9999.ebuild => geant-vmc-4.3.3.ebuild} | 22 ++++++++--------
 sci-physics/geant-vmc/geant-vmc-9999.ebuild        | 22 ++++++++--------
 .../vgm/{vgm-9999.ebuild => vgm-4.3.ebuild}        | 30 ++++++++++++----------
 sci-physics/vgm/vgm-9999.ebuild                    | 30 ++++++++++++----------
 6 files changed, 60 insertions(+), 52 deletions(-)

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 15738c0..767c759 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 c00fbca..efd9a00 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-9999.ebuild b/sci-physics/geant-vmc/geant-vmc-4.3.3.ebuild
similarity index 72%
copy from sci-physics/geant-vmc/geant-vmc-9999.ebuild
copy to sci-physics/geant-vmc/geant-vmc-4.3.3.ebuild
index deaf458..2e5507d 100644
--- a/sci-physics/geant-vmc/geant-vmc-9999.ebuild
+++ b/sci-physics/geant-vmc/geant-vmc-4.3.3.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/geant-vmc/geant-vmc-9999.ebuild b/sci-physics/geant-vmc/geant-vmc-9999.ebuild
index deaf458..2e5507d 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/vgm-9999.ebuild b/sci-physics/vgm/vgm-4.3.ebuild
similarity index 63%
copy from sci-physics/vgm/vgm-9999.ebuild
copy to sci-physics/vgm/vgm-4.3.ebuild
index 169184f..c1f05af 100644
--- a/sci-physics/vgm/vgm-9999.ebuild
+++ b/sci-physics/vgm/vgm-4.3.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
 }

diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-9999.ebuild
index 169184f..c1f05af 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
 }