Version bump. Fixed parallel doc building (bug #437482) and doc installation directory

Package-Manager: portage-2.2.01.21313-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

4 files changed, 34 insertions, 11 deletions

diff --git a/sci-physics/clhep/ChangeLog b/sci-physics/clhep/ChangeLog
index e4866d29e5c7..669e19af0b79 100644
--- a/sci-physics/clhep/ChangeLog
+++ b/sci-physics/clhep/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-physics/clhep
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/clhep/ChangeLog,v 1.43 2012/08/14 20:17:28 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/clhep/ChangeLog,v 1.44 2012/11/30 21:59:52 bicatali Exp $
+
+*clhep-2.1.3.1 (30 Nov 2012)
+
+  30 Nov 2012; Sébastien Fabbro <bicatali@gentoo.org> +clhep-2.1.3.1.ebuild,
+  -clhep-2.1.2.3.ebuild, clhep-2.1.2.4.ebuild:
+  Version bump. Fixed parallel doc building (bug #437482) and doc installation
+  directory
 
   14 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org>
   +files/clhep-2.1.2.4-lsb-whitespace.patch, clhep-2.1.2.4.ebuild:
diff --git a/sci-physics/clhep/Manifest b/sci-physics/clhep/Manifest
index 3948a0ec5ff8..4841b87a261b 100644
--- a/sci-physics/clhep/Manifest
+++ b/sci-physics/clhep/Manifest
@@ -6,18 +6,18 @@ AUX clhep-2.1.2.4-libdir.patch 4448 SHA256 60719f87870d1506a6d6a6df813a26575b964
 AUX clhep-2.1.2.4-lsb-whitespace.patch 1885 SHA256 4083981e5d39f148018cea98d7de6e3aa19751a64f58a905de7cfa2a1d28f3a4 SHA512 87a7ffa15829b4fe0de7f38f538301597a37ec89d34e21c8b4d6373346e539f00d04b1cfe0e528558d43c39fd237c0bb08f7ed04d6792380a9e0f8979184c9bf WHIRLPOOL b40ca8cc2c647e2f844099585a5e1f6104c29c2b8e8cecd7a7cdf1559c78c7ea6193e0aaab558ccfaa665ea516f849b8071d660e23107d402a00daff86fdd161
 DIST clhep-2.0.4.6.tgz 3593699 SHA256 a75e9d5b08cec7456e580834fb0894043054ee66336c2ce4c33622ca2500ee55
 DIST clhep-2.1.0.1.tgz 4243520 SHA256 b8492c1c795e899d8ab2462fc4f40f05a520dba17e598ca2434623e24f51cd29 SHA512 fa6d69239c539992371e053a17c4cb83a2283f87a16ec8249c99a415ab0730a74c59c2386091b5efd040a429075e7a6acd855dfc9c6a68e60f5eb6dcada6327a WHIRLPOOL aa019105093175b197aa4ca9841736d9ad3586a6251e41dede0950e4107b533680293fd8038a239e415bb55d251238a0157803fbb12b05eaa898367252bd9096
-DIST clhep-2.1.2.3.tgz 1845390 SHA256 4353231be09c134507092161cd3ced27a065ca0ebb31ee0256e60a8163c47c3b
 DIST clhep-2.1.2.4.tgz 1845804 SHA256 ca1b39772c4fb75047c001a892019e65be4ac61ccd9f059bd2ff273c88b5c2cf SHA512 5386c41e33e780a3096f8cea47700b8e89246b4450d6ba135bafecde8af6d7315c681f2eee7569afd837cfaacd2c35f104bf5b077f5a4e23faaeaee9fdca7363 WHIRLPOOL 1c26d5ac15fecfdf6302a69ac547b732c65cda3e34d43c90c8a7a0327073bebed24a34ccc6ff0c3bc673733d5ba2368004016a65da46b5cedbf23ce7b3585526
+DIST clhep-2.1.3.1.tgz 1860936 SHA256 5d3e45b39a861731fe3a532bb1426353bf62b54c7b90ecf268827e50f925642b SHA512 d5bd1c459b1a89e53e8768d7b00c1b854172419d1f8a1218f80265c6c995235850cceec6120daaf80067a7717845982ffcbd35944f81fa2f0542e842941d6807 WHIRLPOOL 716a2289c55f727c1c9ba3294abdd592624953fcb57a0235519fa3620dc121a9cc57ab3c5c7cea0849a1bbd10f5f8dd63a2b5aa7b0f5e2c8c889f7aa0c27a013
 EBUILD clhep-2.0.4.6.ebuild 1267 SHA256 18855f294ddabbe38220a07a88cf619727bd6192cb652d5b6a299fa1fd5912db SHA512 509a3de7b577a90605f8b7f86ae9dddda6b24cd4c56b36492257e227dfae501396c9542948cd1050ec2c14fafd7fc4b5c8e4c07e110bfef95f663bae600db1c9 WHIRLPOOL 5da973ddfdb7d94e3fe16e180271940ed8260a3a7317823e734759553a55a636ccd33cd7c0f5d8bcfb4c565a92aed07c2538bdf85f4c7790583ff08d88edebd1
 EBUILD clhep-2.1.0.1.ebuild 1340 SHA256 790b11816d9fa7106aeda93c8d5765f4c7a61abe4d538cec637c15e7cc8c03b9 SHA512 75f8f6f163c0b3c429d330e371eff1497b0f33748037361ed6faa8ea3f9acf71b1d694b47743c6c29e5b8cc448ead3a5536507cd24c92b0750a82d14b2a36d79 WHIRLPOOL 0549e6ebeb5142a40cbd4acbbf4b3aa8354059d36d37921e8f18e313467c93495559eb47a4719ff2681f688dae05f5e6b2346ed1f0c93b91011f2bdd2cb81af5
-EBUILD clhep-2.1.2.3.ebuild 1194 SHA256 fc62999db1b229d3ac4a96112cfd9e661d9ff1b723856206db174330b3b688f4 SHA512 99b21257b2f875bcf47b8a02f720d753d1835fef9dc26c05e28db45572f717162795fdb68d0d493c24f1a4db0b1cdcc12d1b0f6b5025edb1b0e2d9b9b4f46fc1 WHIRLPOOL 460ee73e70d84042764b7a51f9cd96dac2be7e50435e08acd809357484bdad6094a84785ace45b9801b0d0b4e7a1d683b81040f98d5e53f3b28a9a174ad0ad32
-EBUILD clhep-2.1.2.4.ebuild 1242 SHA256 606b2664e77246cf6ed174415f3d7defae6ebe12c16b465cd6a71c6abeb1cd74 SHA512 51a38e8e51335b9dac75c86fad75a70fd0afce374ef7b60b0d425dafaed64473da0eec60d0d834697b174149414233fc3b660891cacc59a92be61b56b0e3fb3d WHIRLPOOL 059db90eb10155c45d76c5920229614c8370fb5ec89d47b0751b032659802a991a042e63adffae54505e3852d0997a0ddfe6ba1c391a7367d10d8964c24909c4
-MISC ChangeLog 5918 SHA256 0a5b3d93ebf796b57a8ffa7c6370a6c9e7ff0cfc5edf18e38ad8832e5737cb8a SHA512 1fd4e7be8ef50b707f8b9df46f77af9b7d1da6ea0e4f3885479c04068ee4e7730a645fa10c0ebf2b794fec3667321c03c4bf628bf0d9340af592257aec6aaf88 WHIRLPOOL 3bd40bcdf35104c9c89a53df96d4450d708b3a2625e35f71300464eebb4c75cbf0162589625b0153aec9aacdd6dfed6ecbbe5d0e90c841b8f729754fc40b4f11
+EBUILD clhep-2.1.2.4.ebuild 1533 SHA256 ce0477ce190345be1e210bca074850b5b3fa26856bc92e6e18d147676cbc1913 SHA512 5b06ca12c26cd252e3f21cbbc95d8806b864cc07d6fbf14a0ba40822e6dea34adbf792230bf2cae8938996548454b942efcf547d83fee2c44c1d1fdf59ba9f51 WHIRLPOOL 6e447e0e54187d5ab8f99a9f57984f66d9ad2df6d38e4c17029a2e1530513ce8f22343365fffaa1ef2b9f0a230b3690af345fdc7e9baf47a9d9e7c19649acdcc
+EBUILD clhep-2.1.3.1.ebuild 1474 SHA256 884095f283acf032d40fe19caa06a6d820aa5f344592f920ca54032c4cdacfee SHA512 8687fff94932b13f748b41364ef1e0140751dfa9e9ba48057d5b726bd84bbe95710f9032a7bc65ee93ba249ac363a2a3179b6f06a859f94da1b7b969c8358ed8 WHIRLPOOL fa59b5f7582e76cb8d98e1f53705da3eb4d87d90acf6e58b8ae617d31cbb308cf890353331ca2fd6132c0a4357b5979e6b7d6c0edfd04a7953b1c55b64cfe674
+MISC ChangeLog 6165 SHA256 f036f0c59966e4f83e3809e87adcc00275fb63891987696c4114033866f46f00 SHA512 251213133f67401b7497491fd49a8ee71ad792a7b2f4f7bb5fd563e4b923271f0da0f06179041cc8bd256aba656a86a3c153eacfbc01fd543e5c236bec76e1f3 WHIRLPOOL 6f21d43953e07ea4f4f1d4394ed0c2cf84c56a807be865748b77eb78b260b1a1c9d04780ad7b880783f2a2dc6978f7a9d3e5f9cac31c4d98967beb5e2c7a9cee
 MISC metadata.xml 492 SHA256 613ba276ff258a43d37ebe01e499de73706b9d0de732adc015e747e5b9569bb8 SHA512 70f52dc251a60a9f80201e189c520f521dfa64af233cb64ca2192c5f51bdcd38bd6095b829291434e36e51011cb73f85171ef20088d38e2ff8abdd2cf32a5c1e WHIRLPOOL 635ff8090f1fb594a6138bb375b801bdc83f944488a6f1a1c531892d8072ecb0da8dabbd7f5fd58d8d3b4a9dbe870ce945d193894cc7dce8fc2dfca0b31e4008
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAqsmAACgkQ1ycZbhPLE2BHUgCfYzEcKpMSVyfmJ1yUcrWE4D9m
-e1sAnjmFKchspmM534D5ZR5kc6tHPyZn
-=2xZ7
+iEYEAREIAAYFAlC5LF4ACgkQ1ycZbhPLE2Ds7ACeIdnLjvhK4DPTVGFYCNxqFDw7
+UH8AnR74RF7wTPOMFA+mMm/mdE6PjPsg
+=YJmi
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/clhep/clhep-2.1.2.4.ebuild b/sci-physics/clhep/clhep-2.1.2.4.ebuild
index 495d8601f355..adc252072fd5 100644
--- a/sci-physics/clhep/clhep-2.1.2.4.ebuild
+++ b/sci-physics/clhep/clhep-2.1.2.4.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-physics/clhep/clhep-2.1.2.4.ebuild,v 1.2 2012/08/14 20:17:28 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/clhep/clhep-2.1.2.4.ebuild,v 1.3 2012/11/30 21:59:52 bicatali Exp $
 
 EAPI=4
 
@@ -25,6 +25,14 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-lsb-whitespace.patch
 	# respect flags
 	sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die
+	# no batch mode to allow parallel building (bug #437482)
+	sed -i \
+		-e 's:-interaction=batchmode::g' \
+		cmake/Modules/ClhepBuildTex.cmake || die
+	# gentoo doc directory
+	sed -i \
+		-e "/DESTINATION/s:doc:share/doc/${PF}:" \
+		cmake/Modules/ClhepBuildTex.cmake */doc/CMakeLists.txt || die
 	# dont build test if not asked
 	if ! use test; then
 		sed -i \
diff --git a/sci-physics/clhep/clhep-2.1.2.3.ebuild b/sci-physics/clhep/clhep-2.1.3.1.ebuild
index 9760f1fcd507..bbe047cccbc3 100644
--- a/sci-physics/clhep/clhep-2.1.2.3.ebuild
+++ b/sci-physics/clhep/clhep-2.1.3.1.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-physics/clhep/clhep-2.1.2.3.ebuild,v 1.1 2012/06/28 00:31:06 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/clhep/clhep-2.1.3.1.ebuild,v 1.1 2012/11/30 21:59:52 bicatali Exp $
 
 EAPI=4
 
@@ -21,9 +21,16 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${PV}/CLHEP"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-libdir.patch
 	# respect flags
 	sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die
+	# no batch mode to allow parallel building (bug #437482)
+	sed -i \
+		-e 's:-interaction=batchmode::g' \
+		cmake/Modules/ClhepBuildTex.cmake || die
+	# gentoo doc directory
+	sed -i \
+		-e "/DESTINATION/s:doc:share/doc/${PF}:" \
+		cmake/Modules/ClhepBuildTex.cmake */doc/CMakeLists.txt || die
 	# dont build test if not asked
 	if ! use test; then
 		sed -i \
@@ -38,6 +45,7 @@ src_configure() {
 		$(cmake-utils_use doc CLHEP_BUILD_DOCS)
 	)
 	DESTDIR="${ED}" cmake-utils_src_configure
+	use doc && MAKEOPTS+=" -j1"
 }
 
 src_install() {