Fix comments to prevent build failures on ia64 wrt #447740 by Agostino Sarubbo <ago@gentoo.org>

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x5D21B852895192F9

4 files changed, 74 insertions, 5 deletions

diff --git a/sci-libs/hdf5/ChangeLog b/sci-libs/hdf5/ChangeLog
index 527902a39b91..db03bb35a988 100644
--- a/sci-libs/hdf5/ChangeLog
+++ b/sci-libs/hdf5/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/hdf5
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.103 2012/12/30 15:07:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.104 2012/12/30 17:02:44 xarthisius Exp $
+
+  30 Dec 2012; Kacper Kowalik <xarthisius@gentoo.org>
+  +files/hdf5-1.8.10-comments.patch, hdf5-1.8.10.ebuild, hdf5-1.8.9-r2.ebuild:
+  Fix comments to prevent build failures on ia64 wrt #447740 by Agostino Sarubbo
+  <ago@gentoo.org>
 
   30 Dec 2012; Agostino Sarubbo <ago@gentoo.org> hdf5-1.8.9-r2.ebuild:
   Stable for alpha, wrt bug #440682
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index 24bff310e2bc..4b5c91723b0d 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -1,4 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX hdf5-1.8.10-buildsystem.patch 1489 SHA256 7fb52e8187009180ea0d5d45c7a48e7680c8ed49533fb2c3d48eaab979956d73 SHA512 8363e983685d7124d8a5ad528786d208d81ecc241ca325c6357eb79d1d39357cdc74c9a283d78f3d3b2a09a59ccee0cd1fb48b92f3cdd2df97b25599e79147d7 WHIRLPOOL a6b24607bf9b651bbbd05be0c755d4eb8ee463550e458940ff6b971a9533a51715a57744a3dcd3159410b88721b909863ac4469e5b3d8dd48834186269f80779
+AUX hdf5-1.8.10-comments.patch 1584 SHA256 d8a7e54546d4571b1a494d3426ac56b0e32cd1e4be0df2be2d069f83cde30b16 SHA512 6b0b360f7d841bde3da8676fd630ab5f7e4ef0864f5ddeec5c2a6f94f182f59a965cf11086288245c46839e3cdd15d7301fdc6cfc9dd41c4f091e7bc938a4522 WHIRLPOOL 54aa4d9d65784b7c274533b082f42d75b70f2fc50909884da82738bceb6dbef6ab0345cae369fcf7de11c7665bb056679e934ee3ebea2af1733b4072fc42a54f
 AUX hdf5-1.8.10-implicits.patch 1424 SHA256 7c733026322ac3fbc86af9983c81b87ba87fc6ac1149c3befb30141e83a79325 SHA512 f48c2ba476496ed137e03b49afe4c12c29a85dd8144558ad21bbef2845eb80574f59def56d4df8d339e884cb8d8662bcf800e9ace2f0b1ab50a811c4bbdd54fc WHIRLPOOL 458b385b8b6a4acd9a581e6e26ee5e582b9c8685464e9240cda75dce7f2a0be69f9011ac54df773546b18d501e092133eb7ef106f8bf1d59fd95a036c5cf026c
 AUX hdf5-1.8.8-array_bounds.patch 624 SHA256 849df1a9fed1d6225b0032507294fbd4eec13f7514e1175907f2c9c00aafb48c SHA512 611816451d8afb284e06082c15527aa71fbf67fd1c48c64257df751e4005ff038485f2a604289f92af106d44abda7537070fc7721e6a555724645b07058dfbde WHIRLPOOL b88a7e82e5e8b99ea76a823514b395a1bb432a019b1ccd7a052c350bb11c22ed8a6bbffab38e152de5d95cb7d2572e3e6fd195fb4ce049b66a7d0e38fef87684
 AUX hdf5-1.8.8-buildsystem.patch 1410 SHA256 a97a7a82197eb4f3c9d43836f24c2c2ae14962970a0b680e5305a977b8c611a5 SHA512 610264a578d292daef20e0b796ccdb899823ca9284321b67aede261717e2bb094116f7775ce9b7ed5d176c61ff187e1cad0ff3c1800c33662c411171b87c4391 WHIRLPOOL a7b58c1a2f08dc9291a7dc84a376135bf307749f27f323a627c6072f89ec44f6cab25a2219106b98b622ac7bcd5949c8915f345ad135d8117f15a28e63d37ae5
@@ -10,8 +14,25 @@ AUX mpd.conf 48 SHA256 ae740cacaf2cb798921cb2092f5af98de67445e27af3f88858f3e6d2b
 DIST hdf5-1.8.10.tar.bz2 6024645 SHA256 fa6e6b37b7976edac860732b87c50370e3beba3ae784d05f16f298c033a45a44 SHA512 de9269eb21142bc92214f05293a5fb7f77eb74e4a9293f4fb26e346842ebfff340b1a13cd631082548b6fabfe9a0b670bad28e35b58675d4db55061e91a59955 WHIRLPOOL baf65f79da563de94403d34141d7e7e28cd121b693772948ed91ca5ba71c57ac7b0b292e09e0189a90dc9af3bd7a717437496752a3f9c3daa82f327f226d5023
 DIST hdf5-1.8.8.tar.bz2 5827394 SHA256 b0ebb0b5478c6c0427631d4ad08f96e39f1b09fde615aa98d2a1b8fb7f6dced3 SHA512 cfa5b31e06a42308519d440a6c5792f26fea6ce27cc3624658acf4499930ac45e596c5b61c9e59d7f4d610a3a04851966929cb8da1f1d12a94b73a1f2562ed17 WHIRLPOOL 8ad9d2b79c0adf3c31db2d13e0e4df4c532e8ff583501df61af7e8bbcdcfd9d503d6816a40fc747ce61482caa8f913a6ed1550dafdb0efab4a42933f5b2933f5
 DIST hdf5-1.8.9.tar.bz2 6006715 SHA256 fafe54856b00f0d6531629f66e2c476ab6ee03458803088f270bbfc4a60966c7 SHA512 08d916c37baa14896f51492559b298bf94e8ba9a6b19ac16ff63ec5814cfc788b522386c2392abbc9d24839aac7fb4585246bd1ff57e6030a2c6d5377f719eee WHIRLPOOL 424f6e2052a8b6beaa9f37865904849419ec1155a7adf4d19aa87633315061775ca970723d8c2284456b8b4972590ce8581fac7efe687160001903afe53a9903
-EBUILD hdf5-1.8.10.ebuild 3644 SHA256 2559d60d76fb85166592901f3da084091cdbcd67899395a1b6ccf86d70ba3d6c SHA512 a6d9103df3669cd465088833ecd7538f675cf7378be8b1a988ab05de4a6bf2f10a53daaf32c657fe6296f2e253526678a13b59aad271a86322be73b282151e4a WHIRLPOOL b33e36e126b219ba1d2dd1773f2bbe359112ccae83ab84d26f0854df6c8a804b15f28241d772d201817f3c6680ac531382513a1cd57be88f47b733e0a4eecfb9
+EBUILD hdf5-1.8.10.ebuild 3682 SHA256 1701f024b4161c23c268ffe251087319e20b0ac9fc9fa51baad2bb3e9d72266c SHA512 79937accdfd08d50bfff328aca1c42622e0d0bd427ebded0b43f9760fa8cc237968ba988ba7ffa1d21ab254f7d23ce55fd6e7069de0ef848845ad6532ea2c58d WHIRLPOOL 2b9061e182f032d3c1eec2b212d201b43576167754c07b9917fa4749565d5f0e28389d27e2a7029b174ac631fbabb601327fc50bd29d642ad136337e26d6d057
 EBUILD hdf5-1.8.8-r1.ebuild 2834 SHA256 f28d79faf3ccdfb132a9a1e719982b41eba7036641ff1d688fac042e4dfbaddd SHA512 6ddf7979f5dbf9800bad67b7f0cca1218d94fd67465e414fb70fe3204ddff0158729bc9a6ebe4beac3d7099db3d97b5bb49166516f84aa578dd2f1d948f63922 WHIRLPOOL bf93d43a72e59c0659479380a653bd72ea5c0a8decd6744eea551ba82e4394cdac1927a6117f41e722d33b20f396fbae64340b0e273dfbfd0a9842ad6b058c82
 EBUILD hdf5-1.8.9-r2.ebuild 3109 SHA256 374c012051395156ab24d1a5a5f73a1cb5daabbf2f2cd86a8eb0eb722a9db824 SHA512 59a6d923193eb23cf21a2750539008bcf1c24170f8ec7596a093b4c208b83cce47646dde8395e8323cb2c6a26e6c27cdd1a5fc8017fcc88ac23dbbfe3fdb7777 WHIRLPOOL 1eb85ab9c5e61dea5bc0dbea20fdc3dde889d12bf66573fd5cfc773b5c8a1b04e63fe131d38efdaf1ec3e66a5207ca800a64f53473df33a3e235e9369be3229c
-MISC ChangeLog 19898 SHA256 e9832a0da45c2316dbd33efcef5227defb76f31703a4cbc7375e8519a2e39d54 SHA512 b62d0c684ca3045c6a3dd5d852498fa2368a141d2d4c82b97f3f53a1ef1631b82edfa9442751867dc4027cc17e323fbdd548728d1c43f2380aca375b46559096 WHIRLPOOL a01e258a5f1a0efaf09c0b4ad076f4c49be35228e7d909c0931f1b12b2e4fe62eea87229471be23948175c21b896ab48e5a8f291c918d20481557a6f77ccbbf9
+MISC ChangeLog 20139 SHA256 d8068c483f89db921db0cc313bb611df3e3cb6317c71c041390cae5361bb44fb SHA512 0cae900811e8514f6740484aa3c2bfccfd2545fc134099bcedccde506117f0e1638dfdfe0b6915a86fbd553aa3b046a941ffa567e021e65de38be68cdf744ea1 WHIRLPOOL 4369dc3b81be8195dce461d36aebb57590b8c9ffbbf72e51fcde8b50cb47ecc9e48991ed4fbc180851c7336e8cc8d6242161278455859d792d27459067a73681
 MISC metadata.xml 710 SHA256 7b7f18e0b3b2975d97477a9155f7b5d1c79aeca7afa5ed03d6bd241a36a603e7 SHA512 4280f9a13672bef49ad95176d999a2d3214e2469f1cd7a50f9883755543ab74caafc53624322b6050dd066ac7d4af45f1559180d63b9d654cd1cc546f2882fd6 WHIRLPOOL e4a5effb8546579f44eaec2597d3c176ce144f099b85315d1635ffcd8598ef8035211268f898c3f72a84b8b70c6583ed11a4f35924f62c95f469f149f1277711
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQ4HPAAAoJEF0huFKJUZL5jU0P/iAQk2oa86hpcv8nha7dM1Ca
+OLwT17xAraI3Ecsyz7fLf45xczE/W6MgaV3oaH+zY5HDdCwm3rAmEbNdcmf+24kM
+uDhd+Qso4jY9mTr0MIgX8YfKBkBYBMBoZuc33hkPcYdAGKyfpAUxi36nzlHfMZb+
+JRDHp2vyvQVXfC6JrJEolwI9EmwYy7wowtoKTR06BIJPw86Ua0EKG7R+oQfZzzty
+XD4Lj89m69m49tO1wbh43LOYr5wy56gBrvVNWI5s6T1VYl4CHPks3t6QhNFLwiM/
+j5fIIBLLoK2dzQhPtqNaz0WxMShbxlFciz098YkeD/txAtn42skziJnW9dE3Lp6j
+HRPRVoEwOu8R2GpE7ofNeoSurkHsqiFlGNz3Dc0lRhH8OfGQN3FQyUtWKDgWdNZP
+2+L+6VgekdDeNi8DZycyEQNZssWsBWtsrARxr+Lh9V8l8atJm0FHm+VU8+JpKXFC
+1u699Au5yYgGYqhWTrPCNw8SswkBwRujyx4KE754nSN1ReoXq1zC2mJHGzLnXpTO
+/SdPqFTX5USQtoRwPcmIBfcfk++6VuGc1UgvNCMIVYcBLgm8i88zd8lgI5KEN6Ia
+eJV9T1k2cw7chzKJTsKwDcTDDW0CVntWpSqfTh0xF+kG2UlPS8CgzwapFngvFw2U
+rJquwzc2qhCMxNqWp3Ds
+=I1uj
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/hdf5/files/hdf5-1.8.10-comments.patch b/sci-libs/hdf5/files/hdf5-1.8.10-comments.patch
new file mode 100644
index 000000000000..845bd81bdd8c
--- /dev/null
+++ b/sci-libs/hdf5/files/hdf5-1.8.10-comments.patch
@@ -0,0 +1,42 @@
+Convert // comment marks to /**/ in order to fix FTBS on ia64
+
+https://bugs.gentoo.org/show_bug.cgi?id=447740
+
+Patch written by Kacper Kowalik <xarthisius@gentoo.org>
+--- a/test/th5s.c
++++ b/test/th5s.c
+@@ -730,8 +730,8 @@ test_h5s_zero_dim(void)
+         ret = H5Pset_chunk(plist_id, SPACE1_RANK, chunk_dims);
+         CHECK(ret, FAIL, "H5Pset_chunk");
+ 
+-        // ret = H5Pset_alloc_time(plist_id, alloc_time);
+-        // CHECK(ret, FAIL, "H5Pset_alloc_time");
++        /* ret = H5Pset_alloc_time(plist_id, alloc_time);
++           CHECK(ret, FAIL, "H5Pset_alloc_time"); */
+ 
+         dset1 = H5Dcreate2(fid1, BASICDATASET1, H5T_NATIVE_INT, sid_chunk, H5P_DEFAULT, plist_id, H5P_DEFAULT);
+         CHECK(dset1, FAIL, "H5Dcreate2");
+--- a/tools/h5dump/h5dump_ddl.c
++++ b/tools/h5dump/h5dump_ddl.c
+@@ -1341,8 +1341,8 @@ handle_attributes(hid_t fid, const char *attr, void UNUSED * data, int UNUSED pe
+     string_dataformat.do_escape = display_escape;
+     outputformat = &string_dataformat;
+ 
+-    //attr_name = attr + j + 1;
+-	// need to replace escape characters
++    /* attr_name = attr + j + 1; */
++	/* need to replace escape characters */
+ 	attr_name = h5tools_str_replace(attr + j + 1, "\\/", "/");
+ 
+ 
+--- a/tools/lib/h5tools_str.c
++++ b/tools/lib/h5tools_str.c
+@@ -632,7 +632,7 @@ h5tools_str_indent(h5tools_str_t *str, const h5tool_format_t *info,
+         h5tools_str_append(str, "%s", OPT(info->line_indent, ""));
+     }
+ 
+-//    ctx->need_prefix = 0;
++      /* ctx->need_prefix = 0; */
+ }
+ 
+ /*-------------------------------------------------------------------------
diff --git a/sci-libs/hdf5/hdf5-1.8.10.ebuild b/sci-libs/hdf5/hdf5-1.8.10.ebuild
index d5809e52e492..1f1136cecbe0 100644
--- a/sci-libs/hdf5/hdf5-1.8.10.ebuild
+++ b/sci-libs/hdf5/hdf5-1.8.10.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-libs/hdf5/hdf5-1.8.10.ebuild,v 1.3 2012/12/11 17:31:05 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.10.ebuild,v 1.4 2012/12/30 17:02:44 xarthisius Exp $
 
 EAPI=4
 
@@ -55,7 +55,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.8.8-array_bounds.patch \
 		"${FILESDIR}"/${P}-implicits.patch \
 		"${FILESDIR}"/${PN}-1.8.9-static_libgfortran.patch \
-		"${FILESDIR}"/${PN}-1.8.9-mpicxx.patch
+		"${FILESDIR}"/${PN}-1.8.9-mpicxx.patch \
+		"${FILESDIR}"/${P}-comments.patch
 	# respect gentoo examples directory
 	sed \
 		-e "s:hdf5_examples:doc/${PF}/examples:g" \