CMAKE_BUILD_DIR -> BUILD_DIR

Package-Manager: portage-2.2.0_alpha145/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

4 files changed, 32 insertions, 28 deletions

diff --git a/sci-chemistry/gromacs/ChangeLog b/sci-chemistry/gromacs/ChangeLog
index 44786a8a7960..1e26308fc329 100644
--- a/sci-chemistry/gromacs/ChangeLog
+++ b/sci-chemistry/gromacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/gromacs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/ChangeLog,v 1.112 2012/12/07 02:52:37 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/ChangeLog,v 1.113 2012/12/08 22:15:02 ottxor Exp $
+
+  08 Dec 2012; Christoph Junghans <ottxor@gentoo.org> gromacs-4.5.5-r1.ebuild,
+  gromacs-4.6_beta2.ebuild:
+  CMAKE_BUILD_DIR -> BUILD_DIR
 
 *gromacs-4.6_beta2 (07 Dec 2012)
 
diff --git a/sci-chemistry/gromacs/Manifest b/sci-chemistry/gromacs/Manifest
index 36d7796225ad..7dc44233be6f 100644
--- a/sci-chemistry/gromacs/Manifest
+++ b/sci-chemistry/gromacs/Manifest
@@ -10,18 +10,18 @@ DIST gromacs-4.5.5.tar.gz 10398178 SHA256 e0605e4810b0d552a8761fef5540c545beeaf8
 DIST gromacs-4.6-beta2.tar.gz 10224320 SHA256 6456a79c7322ddfdaf78f0d81350841ef0d738936059f032611c4688b1e71bf8 SHA512 f669180342be95bbf34b4b5fc4a47ce1fdeee13199a64552154ee5d3b61ccf645618f59f1498e45da19ddadcf0e21505b96b55d9e5fb5a3c49ef36a3144996d0 WHIRLPOOL e93f8486065d61023ccb2ae74ea7aea7e91e33c0edf819f37dd8b3ed1c7eeb72aeb4192aa3af43ad333e1a2c6443d0c45ac5b7b1955b4e54f71f31e6649d06ee
 DIST gromacs-manual-4.5.4.pdf 2463242 SHA256 dc14504a7072b61e7aa576c48f04df03356824f3a9d9e744dfaf51529ab46252 SHA512 957995333163f6f28568a18d5423a75dc6c315215692da94d0916f09b6221e2a875c5ff4b05385ad6604bd8ae38f0cb61c740cd734c76b360aa4b598cd2c3380 WHIRLPOOL 07077d81ea89bc02207e45e56c77a668375a7284bf6f4a3cc7fe637f1f53ce4ab687c722f13f208cdd2c056b9d766ebfcbe5ea9579ce7649ec9e088371e7db8d
 DIST gromacs-manual-4.6-beta1.pdf 5527287 SHA256 788a424720b149d905d236d3c792d72c3f5af1c054f6ef19192bd12f44fe1fb9 SHA512 5a76aa847a865bfa8ca77bbad67eec18e8328c3db8af411a609a7039f48bcc1973ac6af0201c78f1428ed05040102cbe96638399413520bb1f1c1013031662c6 WHIRLPOOL 1c189bc1cc1da42bcb7332c45c13789ca822e57dbbff6452be7328163a95ed29b678a201250018a214a95e23fb43258d7cc6a58bdde88afcdf718db0c80cf45a
-EBUILD gromacs-4.5.5-r1.ebuild 7842 SHA256 1ba4a48edc07438bac8d3e33d2e760c02aee71ed831ecc48c0112b26b0ab4676 SHA512 41f08d9279667e9f6bbad390d2d9bef5ed07a1c51510d5c0e52466780ad56a38ed47a1514de7469c2d9e23eaaf17483cbe51fc1af1898cfa84f5cc234fb5b336 WHIRLPOOL 92a420817efd8540b8009699042f8907821a6b87df42b2517864fcea4d17f22b6fb866d4b957232b95278805c7d45cf1b4042ce9835e03fbb4856c996fcbc4bc
-EBUILD gromacs-4.6_beta2.ebuild 7226 SHA256 fe2d3290b565f3cbaae7e5a876a2ae55c7f5b64d2fd7dc08417fbf6a1f4a683a SHA512 02df40b1b76f07b3d04e7ac4ef3cba3436b64e0becbcf8a3318e368b6e5576c06042ea6c4293a4f512dc0f8000e0388d678a256dedc030acce1a3d113d44c6a7 WHIRLPOOL 6c14baab1b0e51845c81acf5f73c2d655771cec42595ec5588d4f9295e43d30cbcb0f1004147798175b9a1088b14b08f5f69b4e2fa6eba03b20953853f38a282
-MISC ChangeLog 18880 SHA256 c790de90ee105b7dc1546f3a85bfeb4c4e5e972bf8bf3ac7adfe9a02e39ab39c SHA512 06bf35dc666ce9b1b44552215e74721ff3445e08cc6c08ee119d7170e249cc13575bf228e926fbabad2a13065a33d4ad4ff7cb828945826b56ab1d760fdb5b5a WHIRLPOOL 60066d3bd31e9d7985ef60260ecac7f027975eb44823d9e83163d7c14cebc575c77c14167ea6adb6fb2952d8ea7e33bf867aef85f0c9e4216a2e1c10c75c81d9
+EBUILD gromacs-4.5.5-r1.ebuild 7808 SHA256 ffedeea7d72e555a7ee13232b252c536d917ea9f428558386e72ccc010779b01 SHA512 1c21a6b55611c7aff88bf67a5519e5926cb9277bba44db36eebdf4e22f9fcc733a157ae2e2643123f1e38f998fd8d1524a5440b20de5c041d832567e12976497 WHIRLPOOL 7a2664e943bbd2eac9e095a37946794a32f843ec90dcc3c05209a77c454a17c61ea19ed5105bd81ccc1014f500ac434f4a2e73802decbbed0041a298f1c7dc54
+EBUILD gromacs-4.6_beta2.ebuild 7172 SHA256 b7d8ada1ba29a54aacab731200e6b68ef9f1c8db4bd08dbddc20637f47b93e14 SHA512 32381a341dce7ec21468d2b3aa25a23cf8075d4b537130af791fc65ffb4824c3fd752ef62ea9deb9684022990d345cec43754abb1c9fb243b0fc882dc93c1d78 WHIRLPOOL 1150a3f0a4609675fb07939882ea81f51a86f7c8503739c302ce533d173e5eca3212897cf685e047112fa7f7a53a52845b3a8656d15247d2b08b0f4206dc4551
+MISC ChangeLog 19019 SHA256 a5bbc0c28ed659bdb0fa13b58f3a35630c1b057e5b0d50eb7c15253d810176b7 SHA512 18e8b7f4862c081048f09166c0b2c8208794db534733141f7d0a36de21a4621dbca621718b637b65ea777d097c22fab0dbc6ae0f7c99eb1a8311c3e82fdc0bfb WHIRLPOOL f19efaed84155616eadd6ddfd45a07b0c822b695b4234bc841a09e6194cf88240da0a26ac19a9e48b29ad4b47fd1bb4c8cd141f0c7fac8c3de0af403c4237823
 MISC metadata.xml 1011 SHA256 86b258212de20c0346564d9e1705da78bf98c38b3a167417754f980734f12c20 SHA512 b824647ab78588b7312fb8b1cff5931e65940b0027b9f1edc7a258dfb981b8dd2cd88757d2b479d99cb150dd51dc3c93cc888b85aaa238403519dd28fed586e3 WHIRLPOOL 8cd1dc1682ad266ff47d5bf0770cf60649e30ce40e8fd2a072cf040efc6db99374242a5d0d1ea5eb24c5f68a4f04d1d946883d8d88741036256e0ba10d80da12
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQwVpNAAoJEOeBhlrCAAWGhOIH/1BLVlNZCL+2ZuZG3hWFkdA7
-hF3wPaS3soh7ew8j6xxISjkiQWZo0tPFxW7P1sEie2RHCxFWio/FppzItADMe7au
-2s0Asr2cJwkk+RWqt/kThUd77PUBgVWmp6XyENPo18PqRMscCtWogniEce76WXg4
-e7QXe3Mv+wScmTFjyR8kf235wcPRzqWc0hUm2S8hRmma/clnnBcU9UHyIEj3V6AX
-++9AfwoC++BOEj3J0wsQnDfuyGqes1uafFvvOmL/cznBdnnqoC0FBTdYGLHg0pgx
-ZvaMLHV74eU6mdr0dSEzcIsh6v9BxfvqGyXT+0lF3pY6ROMtSkrwuMNp025IdXQ=
-=bPNx
+iQEcBAEBCAAGBQJQw7wzAAoJEOeBhlrCAAWGGLEH/Av9eX1W4C5c8J1H3BS+Km5i
+SmMYM+eCVICpAYcxoFZNkVdIQkv2nlz9XDEe76XUdqjZzpnf4QkrR2F/83kZxALc
+nXTQN6Qrjd/GrfvyagL0nXO2zBJPXNqTaN+WHTwm1lh0AMNRm63Aimf8B66GGsm8
+Lj9RE7hD3Vg6svQ0kvtRSjco3QtIsXZcJ0iv0wFS5ZrLy2hUiEzrirqgUGYBQOlj
+2oj1tJqD678zvIINsyKfN7stuBZuKkJVlDvqJ7ManW+kxdSkZDk59EpLNWH37VC0
+vC6Gw4t4dhpbAhkyIvaTRZRVY8vG97OmeBM+1Qder1RE1G+c9cigh5n1YmzxDPY=
+=gtUO
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/gromacs/gromacs-4.5.5-r1.ebuild b/sci-chemistry/gromacs/gromacs-4.5.5-r1.ebuild
index 3cc034e83190..96690e3f1925 100644
--- a/sci-chemistry/gromacs/gromacs-4.5.5-r1.ebuild
+++ b/sci-chemistry/gromacs/gromacs-4.5.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/gromacs-4.5.5-r1.ebuild,v 1.10 2012/10/19 09:50:26 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/gromacs-4.5.5-r1.ebuild,v 1.11 2012/12/08 22:15:02 ottxor Exp $
 
 EAPI="4"
 
@@ -166,23 +166,23 @@ src_configure() {
 		[ "${x}" = "double" ] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
 		mycmakeargs=( ${mycmakeargs_pre[@]} ${p} -DGMX_MPI=OFF
 			-DGMX_BINARY_SUFFIX="${suffix}" -DGMX_LIBS_SUFFIX="${suffix}" )
-		CMAKE_BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure
+		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure
 		use mpi || continue
 		einfo "Configuring for ${x} precision with mpi"
 		mycmakeargs=( ${mycmakeargs_pre[@]} ${p} -DGMX_MPI=ON
 			-DGMX_BINARY_SUFFIX="_mpi${suffix}" -DGMX_LIBS_SUFFIX="_mpi${suffix}" )
-		CMAKE_BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" cmake-utils_src_configure
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" cmake-utils_src_configure
 	done
 }
 
 src_compile() {
 	for x in ${GMX_DIRS}; do
 		einfo "Compiling for ${x} precision"
-		CMAKE_BUILD_DIR="${WORKDIR}/${P}_${x}"\
+		BUILD_DIR="${WORKDIR}/${P}_${x}"\
 			cmake-utils_src_compile
 		use mpi || continue
 		einfo "Compiling for ${x} precision with mpi"
-		CMAKE_BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
 			cmake-utils_src_compile mdrun
 	done
 }
@@ -199,12 +199,12 @@ src_test() {
 
 src_install() {
 	for x in ${GMX_DIRS}; do
-		CMAKE_BUILD_DIR="${WORKDIR}/${P}_${x}" \
+		BUILD_DIR="${WORKDIR}/${P}_${x}" \
 			cmake-utils_src_install
 		use mpi || continue
 		#cmake-utils_src_install does not support args
 		#using cmake-utils_src_compile instead
-		CMAKE_BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
 			cmake-utils_src_make install-mdrun DESTDIR="${D}"
 	done
 
diff --git a/sci-chemistry/gromacs/gromacs-4.6_beta2.ebuild b/sci-chemistry/gromacs/gromacs-4.6_beta2.ebuild
index 80ffce73c2d4..478742a691ff 100644
--- a/sci-chemistry/gromacs/gromacs-4.6_beta2.ebuild
+++ b/sci-chemistry/gromacs/gromacs-4.6_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/gromacs-4.6_beta2.ebuild,v 1.1 2012/12/07 02:52:37 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/gromacs-4.6_beta2.ebuild,v 1.2 2012/12/08 22:15:02 ottxor Exp $
 
 EAPI=5
 
@@ -144,13 +144,13 @@ src_configure() {
 		mycmakeargs=( ${mycmakeargs_pre[@]} ${p} -DGMX_MPI=OFF
 			$(cmake-utils_use threads GMX_THREAD_MPI) ${cuda}
 			-DGMX_BINARY_SUFFIX="${suffix}" -DGMX_LIBS_SUFFIX="${suffix}" )
-		CMAKE_BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure
+		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure
 		if [[ ${x} = float ]] && use openmm; then
 			einfo "Configuring for openmm build"
 			mycmakeargs=( ${mycmakeargs_pre[@]} ${p} -DGMX_MPI=OFF
 				-DGMX_THREAD_MPI=OFF -DGMX_GPU=OFF -DGMX_OPENMM=ON
 				-DGMX_BINARY_SUFFIX="openmm" -DGMX_LIBS_SUFFIX="openmm" )
-			CMAKE_BUILD_DIR="${WORKDIR}/${P}_openmm" \
+			BUILD_DIR="${WORKDIR}/${P}_openmm" \
 				OPENMM_ROOT_DIR="${EPREFIX}/usr" cmake-utils_src_configure
 		fi
 		use mpi || continue
@@ -158,23 +158,23 @@ src_configure() {
 		mycmakeargs=( ${mycmakeargs_pre[@]} ${p} -DGMX_THREAD_MPI=OFF
 			-DGMX_MPI=ON ${cuda}
 			-DGMX_BINARY_SUFFIX="_mpi${suffix}" -DGMX_LIBS_SUFFIX="_mpi${suffix}" )
-		CMAKE_BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake-utils_src_configure
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake-utils_src_configure
 	done
 }
 
 src_compile() {
 	for x in ${GMX_DIRS}; do
 		einfo "Compiling for ${x} precision"
-		CMAKE_BUILD_DIR="${WORKDIR}/${P}_${x}"\
+		BUILD_DIR="${WORKDIR}/${P}_${x}"\
 			cmake-utils_src_compile
 		if [[ ${x} = float ]] && use openmm; then
 			einfo "Compiling for openmm build"
-			CMAKE_BUILD_DIR="${WORKDIR}/${P}_openmm"\
+			BUILD_DIR="${WORKDIR}/${P}_openmm"\
 				cmake-utils_src_compile mdrun
 		fi
 		use mpi || continue
 		einfo "Compiling for ${x} precision with mpi"
-		CMAKE_BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
 			cmake-utils_src_compile mdrun
 	done
 }
@@ -191,14 +191,14 @@ src_test() {
 
 src_install() {
 	for x in ${GMX_DIRS}; do
-		CMAKE_BUILD_DIR="${WORKDIR}/${P}_${x}" \
+		BUILD_DIR="${WORKDIR}/${P}_${x}" \
 			cmake-utils_src_install
 		if [[ ${x} = float ]] && use openmm; then
-			CMAKE_BUILD_DIR="${WORKDIR}/${P}_openmm" \
+			BUILD_DIR="${WORKDIR}/${P}_openmm" \
 				DESTDIR="${D}" cmake-utils_src_make install-mdrun
 		fi
 		use mpi || continue
-		CMAKE_BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
 			DESTDIR="${D}" cmake-utils_src_make install-mdrun
 	done