Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci

18 files changed, 216 insertions, 30 deletions

diff --git a/sci-chemistry/ball/ChangeLog b/sci-chemistry/ball/ChangeLog
index d90512ff2..3a9a2978c 100644
--- a/sci-chemistry/ball/ChangeLog
+++ b/sci-chemistry/ball/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Mar 2014; Justin Lecher <jlec@gentoo.org> ball-9999.ebuild:
+  Import tree changes
+
   06 Jan 2014; Justin Lecher <jlec@gentoo.org> ball-9999.ebuild:
   Switch from git-2 to git-r3
 
diff --git a/sci-chemistry/ball/ball-9999.ebuild b/sci-chemistry/ball/ball-9999.ebuild
index 9c8c92182..e39865cab 100644
--- a/sci-chemistry/ball/ball-9999.ebuild
+++ b/sci-chemistry/ball/ball-9999.ebuild
@@ -11,16 +11,23 @@ inherit cmake-utils git-r3 python-single-r1
 DESCRIPTION="Biochemical Algorithms Library"
 HOMEPAGE="http://www.ball-project.org/"
 SRC_URI=""
-EGIT_REPO_URI="https://bitbucket.org/ball/ball.git"
+EGIT_REPO_URI="http://bitbucket.org/ball/ball.git"
 
 SLOT="0"
 LICENSE="LGPL-2 GPL-3"
 KEYWORDS=""
-IUSE="cuda mpi +python sql +threads +webkit"
+IUSE="cuda mpi +python sql test +threads +webkit"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	dev-cpp/eigen:3
 	dev-libs/boost
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtopengl:4
+	dev-qt/qttest:4
+	dev-qt/qtwebkit:4
 	media-libs/glew
 	sci-libs/fftw:3.0[threads?]
 	sci-libs/gsl
@@ -28,14 +35,10 @@ RDEPEND="
 	sci-mathematics/lpsolve
 	virtual/opengl
 	x11-libs/libX11
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	dev-qt/qttest:4
 	cuda? ( dev-util/nvidia-cuda-toolkit )
 	mpi? ( virtual/mpi )
-	sql? ( dev-qt/qtsql:4 )
 	python? ( ${PYTHON_DEPS} )
+	sql? ( dev-qt/qtsql:4 )
 	webkit? ( dev-qt/qtwebkit:4 )"
 DEPEND="${RDEPEND}
 	dev-python/sip
@@ -53,11 +56,21 @@ pkg_setup() {
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_use threads FFTW_THREADS)
-		$(cmake-utils_use_use cuda CUDA)
-		$(cmake-utils_use_use mpi MPI)
-		$(cmake-utils_use_use sql QTSQL)
-		$(cmake-utils_use_use webkit QTWEBKIT)
+		$(cmake-utils_use cuda MT_ENABLE_CUDA)
+		$(cmake-utils_use mpi MT_ENABLE_MPI)
+		$(cmake-utils_use sql BALL_HAS_QTSQL)
+		$(cmake-utils_use_use webkit USE_QTWEBKIT)
 		$(cmake-utils_use python BALL_PYTHON_SUPPORT)
 	)
 	cmake-utils_src_configure
+	local i
+	for i in "${S}"/data/*; do
+		ln -sf "${i}" "${BUILD_DIR}"/source/TEST/ || die
+		ln -sf "${i}" "${S}"/source/TEST/ || die
+	done
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use test && cmake-utils_src_make build_tests
 }
diff --git a/sci-chemistry/chemBuild/ChangeLog b/sci-chemistry/chemBuild/ChangeLog
index 4a29f89a6..55f36ef4a 100644
--- a/sci-chemistry/chemBuild/ChangeLog
+++ b/sci-chemistry/chemBuild/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*chemBuild-1.0.4 (26 Mar 2014)
+
+  26 Mar 2014; Justin Lecher <jlec@gentoo.org> +chemBuild-1.0.4.ebuild:
+  Version Bump
+
   08 Jan 2014; Justin Lecher <jlec@gentoo.org> chemBuild-1.0.3.ebuild:
   Fix double prefix
 
diff --git a/sci-chemistry/chemBuild/Manifest b/sci-chemistry/chemBuild/Manifest
index 98ec13ed4..16d7c540f 100644
--- a/sci-chemistry/chemBuild/Manifest
+++ b/sci-chemistry/chemBuild/Manifest
@@ -1,2 +1,3 @@
 DIST chemBuild1.0.2_WithApi.tar.gz 15593107 SHA256 f27c5f7c5e557af2cbe1ccdacff6e0896ab041536d127733478d27a963bf2f2c SHA512 85cc5d83c63b230c889bbdeed560ac7043db477d7f1a54e42cc85d6b18733b0279e6de0d3e3f1e3b30eb99f450a236a673eb3202d4e0942a20e857ec285df037 WHIRLPOOL ab8f51284056921cb4eb1cf812cd715036ba38547bb1931e187430b5dd2b01315bfebe12a6ef8de9d57fc6c54acb095dbdef53d60eae86d2f116861ed4f5600c
 DIST chemBuild1.0.3_WithApi.tar.gz 15626451 SHA256 aba90084efc9d66f45a3a0f4f1716941ee9f957d2ee4bda54e3c25e758a16dda SHA512 a087af3d57513b6a14c7b45db5d0f071a632260bc2ffd3e6b509afb5fcc830f00ecc7234f13b9e60b60600f1be211f3a3d34deb0b6ab0287b076cfadacc336c2 WHIRLPOOL 4fe77a90f9a07fd5c3cf130e6210df69413040a716ea90aab09e4099b44efd9b4f1c609356da9123c104fb5003683aecc87accd4677ce58ff60add999d122853
+DIST chemBuild1.0.4_WithApi.tar.gz 15818720 SHA256 678229e037817dfce608bfce895330ecd3938cf591c806530f89ade3cde770a2 SHA512 7b351436db6a9856a4a41bf91ec2c1ccd566e0dbff169f28c76ed209d875340c16ed18af236676b47bd6e526abd0bdaa29068f7f7f27204bf2239ea528d7a002 WHIRLPOOL 6697f14b9cf83a4404d54d1943ec64594dffdd64de1e26e0e81853b892c123008f9beaf7478390b3adbb17cfccf9dd5795d70b62df9b980d5c971b08b1cadaee
diff --git a/sci-chemistry/chemBuild/chemBuild-1.0.4.ebuild b/sci-chemistry/chemBuild/chemBuild-1.0.4.ebuild
new file mode 100644
index 000000000..24554b77f
--- /dev/null
+++ b/sci-chemistry/chemBuild/chemBuild-1.0.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit python-single-r1 toolchain-funcs
+
+DESCRIPTION="Graphical tool to construct chemical compound definitions for NMR"
+HOMEPAGE="http://www.ccpn.ac.uk/software/chembuild"
+SRC_URI="http://www2.ccpn.ac.uk/download/ccpnmr/${PN}${PV}_WithApi.tar.gz"
+
+SLOT="0"
+LICENSE="|| ( CCPN LGPL-2.1 )"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="dev-python/pyside[webkit,${PYTHON_USEDEP}]"
+DEPEND=""
+
+S="${WORKDIR}"/ccpnmr/ccpnmr3.0/
+
+#TODO:
+#install in sane place
+#unbundle data model
+#unbundle inchi
+#parallel build
+
+src_install() {
+	local in_path=$(python_get_sitedir)/${PN}
+	local _file
+
+	find . -name "*.pyc" -type f -delete
+	dodir /usr/bin
+	sed \
+	-e "s|gentoo_sitedir|$(python_get_sitedir)|g" \
+	-e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
+	-e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
+	-e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
+	-e "s|gentoopython|${PYTHON}|g" \
+	-e "s|gentoousr|${EPREFIX}/usr|g" \
+	-e "s|//|/|g" \
+		"${FILESDIR}"/${PN} > "${ED}"/usr/bin/${PN} || die
+	fperms 755 /usr/bin/${PN}
+
+	rm -rf cNg license || die
+
+	ebegin "Installing main files"
+	python_moduleinto ${PN}
+	python_domodule *
+	python_optimize
+	eend
+}
diff --git a/sci-chemistry/specView/ChangeLog b/sci-chemistry/specView/ChangeLog
index 6fcf527be..e7854b8de 100644
--- a/sci-chemistry/specView/ChangeLog
+++ b/sci-chemistry/specView/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*specView-1.0.3_p2 (26 Mar 2014)
+
+  26 Mar 2014; Justin Lecher <jlec@gentoo.org> +specView-1.0.3_p2.ebuild:
+  Version BUmp
+
   08 Jan 2014; Justin Lecher <jlec@gentoo.org> specView-1.0.3.ebuild:
   Fix double prefix
 
diff --git a/sci-chemistry/specView/Manifest b/sci-chemistry/specView/Manifest
index f35353b9a..50c8ebc9f 100644
--- a/sci-chemistry/specView/Manifest
+++ b/sci-chemistry/specView/Manifest
@@ -1,2 +1,3 @@
 DIST specView1.0.2.tar.gz 15811413 SHA256 3a8d8b9e0f15e6481d8d6ea9a1f51d06a3cd2a4295acc3dfaf9e4ee0e3b1509f SHA512 f3194148f90d9dbe706c33fefda9cb6db71e0812f83bbf94bb170170bd9d4fcd4eae6295ccc78c6544b093dfbf09512555405dfab5b0516152dce2cb25b18965 WHIRLPOOL d35dd8753565f29b36c55014b8b34f0a5c60fad9f4353d4a094b6a7d2010a9936e9e3e42d27c4d5e6076a861fe7eb424acf86c7847e0218e8877ffb4a9865411
 DIST specView1.0.3.tar.gz 15675662 SHA256 24e88651b1c544db7967d2d650d03f5cf88092a5da7c333ea16d563a32ff57f8 SHA512 2d29121b0dfff6158e9d7a6e9f666eccae655f258720a2d595a21e81241a44c0cf5347acbbca420f70464a21eabd22041a8402fb26a814dacaed9ed90b10e25c WHIRLPOOL ccba371740a8d45a26072c02dfc98d7c0de00071665f745fa19d65c6470eb4edb10fac827519bf6b12c8ff6cb7e39c541f9b7f9aff20cfb83325ca8c8dc93f20
+DIST specView1.0.3r2.tar.gz 15739439 SHA256 0c843fc690cefd347f9845c64c60289965b906d68a9181e944b5ad0831544ba1 SHA512 8795eb643837475bccb611bb3067ee9675a668079fc6c12e3470d6d0c463932afa0499836a5d4728c2c7f582a18ea4c4f7713291fa429758ccbadb432e0671a9 WHIRLPOOL 4b73f2589fb4e7cfc4cc7f4b579355abc301c9def1e644aec621ab45741aceddc1e96bb34066aeb4a7f900b026073bc488f4b015fbfcbb3d38faf3f84ef05e44
diff --git a/sci-chemistry/specView/specView-1.0.3_p2.ebuild b/sci-chemistry/specView/specView-1.0.3_p2.ebuild
new file mode 100644
index 000000000..279a8fc60
--- /dev/null
+++ b/sci-chemistry/specView/specView-1.0.3_p2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit multilib python-single-r1 toolchain-funcs
+
+DESCRIPTION="Fast way to visualise NMR spectrum and peak data"
+HOMEPAGE="http://www.ccpn.ac.uk/software/specview"
+SRC_URI="http://www2.ccpn.ac.uk/download/ccpnmr/${PN}${PV/_p/r}.tar.gz"
+
+SLOT="0"
+LICENSE="|| ( CCPN LGPL-2.1 )"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/pyopengl[${PYTHON_USEDEP}]
+	dev-python/pyside[webkit,${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/ccpnmr/ccpnmr3.0/
+
+#TODO:
+#install in sane place
+#unbundle data model
+#unbundle inchi
+#parallel build
+
+src_prepare() {
+	sed \
+		-e "s|/usr|\"${EPREFIX}/usr\"|g" \
+		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
+		-e '/^MALLOC_FLAG/s:^:#:g' \
+		-e "/^OPT_FLAG/s:=.*$:= ${CFLAGS}:g" \
+		-e "/^LINK_FLAGS/s:$: ${LDFLAGS}:g" \
+		-e "/^PYTHON_DIR/s:=.*:= \"${EPREFIX}/usr\":g" \
+		-e "/^PYTHON_LIB/s:=.*:= $(python_get_LIBS):g" \
+		-e "/^PYTHON_INCLUDE_FLAGS/s:=.*:= -I\"$(python_get_includedir)\" -I\"$(python_get_sitedir)/numpy/core/include/numpy\":g" \
+		-e "/^PYTHON_LIB_FLAGS/s:=.*:= -L\"${EPREFIX}/usr/$(get_libdir)\":g" \
+		-e "/^SHARED_FLAGS/s:=.*:= -shared:g" \
+		-e "/^GL_DIR/s:=.*:= \"${EPREFIX}/usr/$(get_libdir)\":g" \
+		-e "/^GL_INCLUDE_FLAGS/s:=.*:= -I\"${EPREFIX}/usr/include\":g" \
+		-e "/^GL_LIB_FLAGS/s:=.*:= -L\"${EPREFIX}/usr/$(get_libdir)\":g" \
+		cNg/environment_default.txt > cNg/environment.txt || die
+	echo "SHARED_LINK_PARM = ${LDFLAGS}" >> cNg/environment.txt || die
+
+	rm -rf license || die
+
+	sed \
+	-e 's:ln -s:cp -f:g' \
+	-i $(find python -name linkSharedObjs) || die
+}
+
+src_compile() {
+	emake -C cNg all
+	emake -j1 -C cNg links
+}
+
+src_install() {
+	local in_path=$(python_get_sitedir)/${PN}
+	local _file
+
+	find . -name "*.pyc" -type f -delete
+	dodir /usr/bin
+	sed \
+		-e "s|gentoo_sitedir|$(python_get_sitedir)|g" \
+		-e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
+		-e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
+		-e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
+		-e "s|gentoopython|${PYTHON}|g" \
+		-e "s|gentoousr|\"${EPREFIX}/usr\"|g" \
+		-e "s|//|/|g" \
+		"${FILESDIR}"/${PN} > "${ED}"/usr/bin/${PN} || die
+	fperms 755 /usr/bin/${PN}
+
+	dodir "${in_path#${EPREFIX}}/cNg"
+	rm -rf cNg || die
+
+	ebegin "Installing main files"
+	python_moduleinto ${PN}
+	python_domodule *
+	eend
+	python_optimize
+}
diff --git a/sci-misc/fitscut/ChangeLog b/sci-misc/fitscut/ChangeLog
index 7716847a6..6e8a13862 100644
--- a/sci-misc/fitscut/ChangeLog
+++ b/sci-misc/fitscut/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-misc/fitscut
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Mar 2014; Sébastien Fabbro <bicatali@gentoo.org> fitscut-1.4.4.ebuild,
+  metadata.xml:
+  sci-misc/fitscut: Switch to EAPI5, autotools-utils, fixed for prefix
+
   14 Mar 2011; Justin Lecher <jlec@gentoo.org> fitscut-1.4.4.ebuild:
   Moved media-libs/jpeg -> virtual/jpeg
 
@@ -10,4 +14,3 @@
   02 Feb 2010; Sébastien Fabbro <bicatali@gentoo.org>
   +fitscut-1.4.4.ebuild, +metadata.xml:
   Initial import
-
diff --git a/sci-misc/fitscut/Manifest b/sci-misc/fitscut/Manifest
index 731757698..3c69b4721 100644
--- a/sci-misc/fitscut/Manifest
+++ b/sci-misc/fitscut/Manifest
@@ -1 +1 @@
-DIST fitscut-1.4.4.tar.gz 163663 SHA256 1df936af9cd36bf1cd1e3a095ecc8bec68a6974525e0f4fd0e9cccb9633728bb
+DIST fitscut-1.4.4.tar.gz 163663 SHA256 1df936af9cd36bf1cd1e3a095ecc8bec68a6974525e0f4fd0e9cccb9633728bb SHA512 1d80671efeebfb07e7e2714d9cdbdd445a2e7644119d5b82ba4a8f033b36e773d13f87998ece45091f4a127beca374021e8c5afd88f649c9405fb329cd1ee97f WHIRLPOOL fa2a7ac7306988b574dd9155fe1062bd86fea8cf1bd45cfb8a05795d7ef305cd5de9d9061fe00b2d7e9f25c263f8db4bed252bf171082943b7c9d82684c0dcd4
diff --git a/sci-misc/fitscut/fitscut-1.4.4.ebuild b/sci-misc/fitscut/fitscut-1.4.4.ebuild
index 3580896ed..1a5bdee11 100644
--- a/sci-misc/fitscut/fitscut-1.4.4.ebuild
+++ b/sci-misc/fitscut/fitscut-1.4.4.ebuild
@@ -2,8 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
-inherit autotools
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils
 
 DESCRIPTION="Extract cutouts from FITS image files"
 HOMEPAGE="http://acs.pha.jhu.edu/general/software/fitscut/"
@@ -11,11 +14,12 @@ SRC_URI="${HOMEPAGE}/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND=">=sci-libs/cfitsio-3
-	sci-astronomy/wcstools
+RDEPEND="
+	>=sci-libs/cfitsio-3:0=
+	sci-astronomy/wcstools:0=
 	media-libs/libpng
 	virtual/jpeg"
 DEPEND="${RDEPEND}"
@@ -25,14 +29,11 @@ src_prepare() {
 	sed -i \
 		-e 's/libwcs/wcs/g' \
 		wcs*.c fitscut.c || die
+	# cfitsio/fitsio.h might conflict with host on prefix
 	sed -i \
 		-e 's/LIB(wcs,/LIB(wcstools,/' \
 		-e 's/-lwcs/-lwcstools/' \
+		-e '/cfitsio\/fitsio.h/d' \
 		configure.in || die
-	eautoreconf
-}
-
-src_install() {
-	emake DESDTIR="${D}" || die "emake install failed"
-	dodoc README AUTHORS TODO NEWS ChangeLog THANKS
+	autotools-utils_src_prepare
 }
diff --git a/sci-misc/fitscut/metadata.xml b/sci-misc/fitscut/metadata.xml
index 3b60a949c..3d253f3a7 100644
--- a/sci-misc/fitscut/metadata.xml
+++ b/sci-misc/fitscut/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<herd>sci-astronomy</herd>
 <longdescription lang="en">
   fitscut is designed to extract cutouts from FITS image format
   files. FITS, PNG, and JPEG output types are supported.
diff --git a/sci-physics/geant-vmc/ChangeLog b/sci-physics/geant-vmc/ChangeLog
index bf527564f..2571fa174 100644
--- a/sci-physics/geant-vmc/ChangeLog
+++ b/sci-physics/geant-vmc/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Mar 2014; Oliver Freyermuth <o.freyermuth@googlemail.com>
+  geant-vmc-3.1.15a.ebuild, geant-vmc-4.2.14b.ebuild, geant-vmc-4.2.15.ebuild:
+  Add subslot-dependency on sci-physics/root, rebuilding is needed on each ROOT
+  version string change. For more details c.f. #505358 .
+
   02 Feb 2014; <o.freyermuth@googlemail.com> geant-vmc-4.2.14b.ebuild,
   geant-vmc-4.2.15.ebuild:
   Make header installation work again, include/ contains folders only so
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 229a5e8d3..ba8fcad4b 100644
--- a/sci-physics/geant-vmc/geant-vmc-3.1.15a.ebuild
+++ b/sci-physics/geant-vmc/geant-vmc-3.1.15a.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND="
-	sci-physics/root[pythia6]
+	sci-physics/root[pythia6]:=
 	!sci-physics/geant:3"
 DEPEND="${RDEPEND}"
 
diff --git a/sci-physics/geant-vmc/geant-vmc-4.2.14b.ebuild b/sci-physics/geant-vmc/geant-vmc-4.2.14b.ebuild
index df2884eb4..cef4e1f71 100644
--- a/sci-physics/geant-vmc/geant-vmc-4.2.14b.ebuild
+++ b/sci-physics/geant-vmc/geant-vmc-4.2.14b.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples vgm"
 
 RDEPEND="
-	sci-physics/root
+	sci-physics/root:=
 	>=sci-physics/geant-4.9.6[opengl,geant3,examples?]
 	<sci-physics/geant-4.10.00
 	vgm? ( sci-physics/vgm )"
diff --git a/sci-physics/geant-vmc/geant-vmc-4.2.15.ebuild b/sci-physics/geant-vmc/geant-vmc-4.2.15.ebuild
index f08e49043..d21296780 100644
--- a/sci-physics/geant-vmc/geant-vmc-4.2.15.ebuild
+++ b/sci-physics/geant-vmc/geant-vmc-4.2.15.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples vgm"
 
 RDEPEND="
-	sci-physics/root
+	sci-physics/root:=
 	>=sci-physics/geant-4.9.6[opengl,geant3,examples?]
 	vgm? ( sci-physics/vgm )"
 DEPEND="${RDEPEND}
diff --git a/sci-physics/vgm/ChangeLog b/sci-physics/vgm/ChangeLog
index e02c8741c..239f62b44 100644
--- a/sci-physics/vgm/ChangeLog
+++ b/sci-physics/vgm/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Mar 2014; Oliver Freyermuth <o.freyermuth@googlemail.com> vgm-3.06.ebuild:
+  Add subslot-dependency on sci-physics/root, rebuilding is needed on each ROOT
+  version string change. For more details c.f. #505358 . 
+
   22 Mar 2014; <o.freyermuth@googlemail.com> vgm-3.06.ebuild:
   Address ebuild-issues: Use zip-snapshot instead of repo-tag, add missing die,
   fix typo in description. 
diff --git a/sci-physics/vgm/vgm-3.06.ebuild b/sci-physics/vgm/vgm-3.06.ebuild
index efd9cc425..d6fe3fdb3 100644
--- a/sci-physics/vgm/vgm-3.06.ebuild
+++ b/sci-physics/vgm/vgm-3.06.ebuild
@@ -22,7 +22,7 @@ IUSE="doc examples +geant4 +root test xml"
 
 RDEPEND="
 	sci-physics/clhep
-	root? ( sci-physics/root )
+	root? ( sci-physics/root:= )
 	geant4? ( >=sci-physics/geant-4.9.6[examples?] )
 	xml? ( dev-libs/xerces-c )"
 DEPEND="${RDEPEND}