Version bump, respect CC, keyword amd64-linux, x86-linux

Package-Manager: portage-2.2.01.20796-prefix/cvs/Linux x86_64

5 files changed, 280 insertions, 49 deletions

diff --git a/sci-libs/cdf/ChangeLog b/sci-libs/cdf/ChangeLog
index f3d1012a2472..e8126603a88b 100644
--- a/sci-libs/cdf/ChangeLog
+++ b/sci-libs/cdf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/cdf
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cdf/ChangeLog,v 1.22 2011/08/07 04:55:41 bicatali Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cdf/ChangeLog,v 1.23 2012/08/03 17:15:34 bicatali Exp $
+
+*cdf-3.4.1 (03 Aug 2012)
+
+  03 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> +cdf-3.4.1.ebuild,
+  +files/cdf-3.4-Makefile.patch:
+  Version bump, respect CC, keyword amd64-linux, x86-linux
 
 *cdf-3.3.1 (07 Aug 2011)
 
@@ -104,4 +110,3 @@
   22 Dec 2003; Patrick Kursawe <phosphan@gentoo.org> cdf-2.7.ebuild,
   metadata.xml:
   Initial import
-
diff --git a/sci-libs/cdf/Manifest b/sci-libs/cdf/Manifest
index 232beca51c9c..8df1e383a0f2 100644
--- a/sci-libs/cdf/Manifest
+++ b/sci-libs/cdf/Manifest
@@ -1,27 +1,37 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX 50cdf 124 RMD160 5679d93455dbd245d61bbf426cf23c6dd95112a7 SHA1 516aecfa3edb8cfd7ad4dc386321545e9463dc0c SHA256 030452ff70f6c05eca8776976b7f2ab15c74a189065a6dda1a7b8eb32de953a2
-AUX cdf-3.2-Makefile.patch 3632 RMD160 855a23b22af02df56ac7b87ea00f2e3f2d4e62f9 SHA1 0c0a4660f37a196b88df0880ae7273c41c245c2d SHA256 852cd68c57d822e579cf8ebcb31449464a77266f2da890853642f49884665bd6
-AUX cdf-3.2-soname.patch 738 RMD160 53718fa03b56c27a8d0fdc2d6fef802b1e744874 SHA1 e58f01f3ea7d5f198e60f64e951f7f73e8163c24 SHA256 df148aad093d5ac4a51e2d2805f36e3fb3156979a4b1cff34d8e9ba2619741ff
-DIST cdf33_0-dist-cdf.tar.gz 985719 RMD160 c60330c656890841e8304420c960da157a0b04f6 SHA1 1579243652dd2f0f8efc05c307469c02a39a2acb SHA256 2cb49e9c0d282cdd3737c55df3df0f4b62bb701a07ecfa11c5372a0416bfa81f
-DIST cdf33_0-dist-java.tar.gz 685584 RMD160 9bdead010c33595cd0d2fdb66c79e3191e1d88a2 SHA1 775134893851cec27a1a8ff7534a78e6b20f29e1 SHA256 1a02bcd2d62dcdaf86a53e2d4817a79a68e04da3afd723eb32f298b6ba4a1c54
-DIST cdf33_1-dist-cdf.tar.gz 1015529 RMD160 76601ac3bc7050c55e84fa8d0a9b2e7efdc856c4 SHA1 b80dc9e0d160e9e48215b7e03b2d014e4d1b09e6 SHA256 8eb388b57e79bf51c250965515b9e186eb7ddb1a2f18e8953f355fdd13a63d11
-DIST cdf33_1-dist-java.tar.gz 696968 RMD160 bf8e9c5c5eaba6808d5f2d7ca767163e3d0039a1 SHA1 80fd52ad92d2869bb5593b869bd6eda0a2c3081e SHA256 a25366f6086ce0ca6ccc6b6b6af491472c9ca2abf1791460ba959d318e2dfbc8
-DIST cdf33crm.pdf 1454306 RMD160 ea6ae1b3dff7d99c8aeffe75af21572567746116 SHA1 83c34bb15725e663060299d20f143e826b2f3036 SHA256 bc0a86330d90340fb58732dbbe5bdd41fdee3670084678deb89b7be5e80ea7df
-DIST cdf33frm.pdf 1737939 RMD160 3f4ae21637b5423819d6ef00e3ca271d27cd9e8e SHA1 32fff4729aebf0ad97fbe2ce21eab3fa972c13c8 SHA256 b43caf6134e9c2de6c2add800e8545c5699eb48d5adeab860ee0c701d184079e
-DIST cdf33ifd.pdf 369110 RMD160 a4c86af47f72a662179cf38877faf7f7db2227c3 SHA1 2c75be0b069b49122e82e15a5d19d8c004f2fce0 SHA256 eb0181573a6e2bffcc675d72844fd0f27a3e81d755e99f1516a5f4727cbbe19c
-DIST cdf33jrm.pdf 2707863 RMD160 3af11e459cecaef21a17f574bddc2a0984d45bd7 SHA1 0c291c2ba89d2d08dc9a4190ebf706666e03581a SHA256 e9fd33fd5afdb9a3b882a5e14c28d69b2ff4ba91e9f0aa2e0254ea84bd78f32f
-DIST cdf33prm.pdf 961286 RMD160 be7abb47bda9dad0c8a95920647c4d014581984c SHA1 697be389d3056643df059ca096472a0a7277e0e4 SHA256 73a8f878891a5d80233238a6210b962eb4327c11205596da7a6cd7a73417a837
-DIST cdf33ug.pdf 1372504 RMD160 25fe71578c3d4bee62ca612f77dc8b4ba99fa0ef SHA1 e04e180e6217be970cc6ce31efc106acd58ad2bc SHA256 85631b4a96043c8c4ceb368836a43199d06a5e7726732df29c6f4ae164062756
-EBUILD cdf-3.3.0.ebuild 3309 RMD160 b580f7d6041f2af8bf5dbad886c41d0532f02d86 SHA1 c5f003bb381c139512f12c6ca28533ad4f94629c SHA256 7d45eebe659e262738d09bc0bed171731ae3311dbe196d6b3bc87ec20b032f66
-EBUILD cdf-3.3.1.ebuild 3294 RMD160 747d1547ff2c14507623d5d21da792219a355c5e SHA1 da9f60fb3ea50d80ad589927fb7f4d6813a2cd76 SHA256 921935d6284962f99ad5b535759ae7394dcf3db8c4588cb7b09486026f4125fd
-MISC ChangeLog 3607 RMD160 8757ed7100fc110890ae154a9e6c7dc5df344d30 SHA1 c71b7f2d270d1f0e35028384081adfb85bf91714 SHA256 f46ce6b530831c787cf9a4ee243f2a9ea7bd381695776fe7ff1b5c2c9be485bc
-MISC metadata.xml 920 RMD160 19216d66dfe3e690c26b89013e697a848ad3190d SHA1 cfbaedc3d345509812ce3339f4f06d5b31ab034c SHA256 da95dbe621a4e9b48b392bd653c1b0b25f74c5eb2cd3bb8046cf0eeb88066f5f
+AUX 50cdf 124 SHA256 030452ff70f6c05eca8776976b7f2ab15c74a189065a6dda1a7b8eb32de953a2 SHA512 4fe515d03379f2b6e1723c771f73e65be9f67365a46e75dbeb3358bbdc6f3446b91efd989363bf229b7ae93a446ddedeefd883a0d59d28c1480a10a8994eeadc WHIRLPOOL f017286eee25e2bfc081fe8d9eb85e30207adedfac4a3687f73a71d2c880e13db84bbf7d83b3d45d929f32b175a4feed449805f09d856a43c506a22f1cfad9f6
+AUX cdf-3.2-Makefile.patch 3632 SHA256 852cd68c57d822e579cf8ebcb31449464a77266f2da890853642f49884665bd6 SHA512 488a70fee781335e02c2fcfd97a318db732ad2cdd2a9512741073946b1f3c2bfb3f2cfe77be1401fe979b396c1b048564c73846f44c32b21c00214363316728d WHIRLPOOL 2ab53b6462ee4831cddc60109650ea9feaa60dcad419e0a0f5394aade7182bfde53d84497b323002425f79bb542b0e003ae1b5a81fdf4a51e68db3d96edafac2
+AUX cdf-3.2-soname.patch 738 SHA256 df148aad093d5ac4a51e2d2805f36e3fb3156979a4b1cff34d8e9ba2619741ff SHA512 f3bb09e43b3b36ed346dc7690cc0c75a28e8dcfb2c1ebbf8a0577abdc2d15bbcbce7b0da9c5de23ef65e669bd118692db498aef230e9395dd4b67dba48258a8d WHIRLPOOL 5771aebab646b35bca54ded793a5428dfa22c528e062f60041e0d9cdd60b2ddf0f796081d025675020b6558313362d063e2a6a06180101dbcca7cdd2591942b7
+AUX cdf-3.4-Makefile.patch 3838 SHA256 271962757be1d5f9f87aea8f4f0c4cd1fea44f0297231e2ad79dc945eca3c1ff SHA512 f8eb1b78b5a8e466dff38fa8108ac7316bd171e50e7e9125a99b10482994f02b86656d2d3e34a29c1a384beab6c0fd97ddf6e4697c18657d189620a9efcd1e47 WHIRLPOOL 3fcfa15abe8f69934c461c2d3f172b441eefe0cb37b54d66bd1c9b98a8d20bcae96d15766b22a6f3e210ce4a8ce0871f91a4bed1ed4a4b9d9e944f386d420158
+DIST cdf33_0-dist-cdf.tar.gz 985719 SHA256 2cb49e9c0d282cdd3737c55df3df0f4b62bb701a07ecfa11c5372a0416bfa81f
+DIST cdf33_0-dist-java.tar.gz 685584 SHA256 1a02bcd2d62dcdaf86a53e2d4817a79a68e04da3afd723eb32f298b6ba4a1c54
+DIST cdf33_1-dist-cdf.tar.gz 1015529 SHA256 8eb388b57e79bf51c250965515b9e186eb7ddb1a2f18e8953f355fdd13a63d11 SHA512 5a204bfe33f94cbf5297f6dd345406376fea0a85a902bd6aa108ccdcbfbfc819cd935038e1a41bcda37a1a2f90f5ce3b41c8247b6234c4c828fee22a2fbd282c WHIRLPOOL d3035bdf897c39819b6181151a0487cb986697ee3d37b3a6f05f5bb0d5870bceb5144a53a86f23b2730a0aece55b4aa4a40f691720b3b95d9c0ee7c27ca6ac5e
+DIST cdf33_1-dist-java.tar.gz 696968 SHA256 a25366f6086ce0ca6ccc6b6b6af491472c9ca2abf1791460ba959d318e2dfbc8 SHA512 1c90b76ca524d3e2bc661e3444937b4c9628eb5d93c815f860afb028d2e584098355dce455137ed05c15b67df6bcadcc7516aa7c3c847baaf82a2bdab270bccd WHIRLPOOL 467efddcd2599d5978884de7c91401e95f1fdf0989b8adff4019c281831690c75f8cf5aa42a1e78c06dbead1270e7e3a73f83e4bdbf709dc058f67a003797598
+DIST cdf33crm.pdf 1454306 SHA256 bc0a86330d90340fb58732dbbe5bdd41fdee3670084678deb89b7be5e80ea7df
+DIST cdf33frm.pdf 1737939 SHA256 b43caf6134e9c2de6c2add800e8545c5699eb48d5adeab860ee0c701d184079e
+DIST cdf33ifd.pdf 369110 SHA256 eb0181573a6e2bffcc675d72844fd0f27a3e81d755e99f1516a5f4727cbbe19c
+DIST cdf33jrm.pdf 2707863 SHA256 e9fd33fd5afdb9a3b882a5e14c28d69b2ff4ba91e9f0aa2e0254ea84bd78f32f
+DIST cdf33prm.pdf 961286 SHA256 73a8f878891a5d80233238a6210b962eb4327c11205596da7a6cd7a73417a837
+DIST cdf33ug.pdf 1372504 SHA256 85631b4a96043c8c4ceb368836a43199d06a5e7726732df29c6f4ae164062756
+DIST cdf34_1-dist-cdf.tar.gz 1045465 SHA256 d4bffe144e2e2c47c38830681a86b417e3426ffce378f0634682953957185117 SHA512 d68e39b521402256205196f09ec9742b7fdcd1d59fb3251b5eb50812fee52f9ae193c39d342b3dcc467d03911972e4e19f1cf157ac102eae6cc77cb6abacac44 WHIRLPOOL 4c8b5ee2ed1af21511c235a2b7204f142b98ac68181026816fee72be33b7b56b33dbfbf91b9923d913c052b26c1018d916857d57fc599c63782aef54a384384d
+DIST cdf34_1-dist-java.tar.gz 713180 SHA256 d6efb2e1c06a42e52e3a3a90c0f155b31d3fdac71f781b73e8a6c0ffa85f459e SHA512 1b95110e6ff455cb379370a74b4160098b5dbd3bef8a3854634caad40d93fde9bc804e4f10187cfeb232f9b9a28a69ce6de6caba969c64dc21b89b339e01e112 WHIRLPOOL 410e5b3dbedd3c4a19e3fac85687ec69e5ad605e9b85c45ce679fc2fdd3b28ad353e76990886ccb0ff7fab4a09b287b2b2bd0c14beef6945de43e47273141502
+DIST cdf34crm.pdf 1693915 SHA256 cc3add52cef16be0820b314a0f7928c254e85a870ba11b931f662a6ce545f2e9 SHA512 cbc8a4b6237632147de24c0eecaaff0f7fa6551eec08f68ebc72c79aff71a99608c309874bd07e9dca6203868171159556a29a7669ecb7e45e60a5cef8d81cb4 WHIRLPOOL 35a01d1cae36d683c232fc3de779c3541b209d303edebdec254eebbba88b10063cd632d0a36bf18b82f47e002695ad858801359b75af7fbf7b1282a1f97ea575
+DIST cdf34frm.pdf 1968381 SHA256 a725ee218c00fd544fdce4c7868d49b1c6128077ba60c2eebf19d7357bfbb8a4 SHA512 c5402db80c05192430e1ca7142d356a8224c52f128fe8c1be937767623c12a7ed55d7afaa0955a00e9ebcace87ba5fed977fc8020a71cdac40fb44326c5f8f65 WHIRLPOOL 7ce91654405d8e80c81b775d931fdf676b00987406fc608df19f69278a5f362f83c30c6e8c4986bd064f1f32f3ce48fb03e2cd8e39a785fa53335a95c4a83d7d
+DIST cdf34ifd.pdf 415359 SHA256 3bf7b3ec80c8be85425bb632a9da34142eabc7a26f5c1cdb6208eb47095922ec SHA512 1ab42f8677fbbb7cb477c6cbbfe632a8569c6a78fee07dd32c42f549b7d451faaf0ca61ba03f2ea5ba4de2a3a71cc40e4de6ca3dcf86b7caef7594cefc9f2246 WHIRLPOOL adfcd60cdb58799a652cea688e2515d6e336e3ac3913b515afcca7dfd507691cd16471564baaa6690691442ffe6319cd693aa176f23ebea0d573f576dbf1a9f5
+DIST cdf34jrm.pdf 3505200 SHA256 7a08793d023080cedf370f4dc2ff589074b0ef11add2abfd634691790e4efeb3 SHA512 1609f609f7f455bb4749f5f948183f066bc7b6a1367082fccfed669a9768d8c6d8e46f39680e0e99b4accd030c262af92deff9f832e2789ea191874c107df94c WHIRLPOOL 107f852b43b950c2b603299622a1ddec75221cbf6c19520576a9b95e694579545585340d609560eba691f49acf4ec4beae9994bf15ce6a5844752fe975fefc78
+DIST cdf34prm.pdf 1062987 SHA256 157253ec0cfe47eb6e9f76f2f1a1c365abf82303ffd3334dd7b0168448c1d0cd SHA512 f4e95ce93c896147e4c3074caa8a4d564aadebc8e741c6e593a9377fc0fb0e6f3225c2cd9962900a144418a5b445f462fe12d1178857c3f229f2650da4030587 WHIRLPOOL 261dae7cb16a7bf0cf83d3eda4a939b6d0890a3049b8e7f5817a203408320b9ea41445ae46b4ecd4651a5f70f755a7bdba46e4ced1c0d59d03ceaca5bdcaeb25
+DIST cdf34ug.pdf 1307731 SHA256 a23eb912cb1b371e34ba39e4c3d9ea28cd4512b072910ee8cfa6e00c9323775d SHA512 78c4891690494131f1a8793e1e0dbb9aa0d021b88d04489385156dcc25a218555acad3ec727265aa2b749e24c9a66601ad0698ad201bc6f16b74c9266aae4a0f WHIRLPOOL f15dfbeb68574359d9ccee3ab085ddd671d63b8fa46b16df2b9995aaf85281681dbefe5bc6b9e8f6c64bf6ea9fa1911d96dfa3c6d1e54cb3b0593db8e8ededa8
+EBUILD cdf-3.3.0.ebuild 3309 SHA256 7d45eebe659e262738d09bc0bed171731ae3311dbe196d6b3bc87ec20b032f66 SHA512 3bb87957322db485cbebdffaed56f8b4dc2f09f22aaf4216c1ee65a6fb7512a375b523a4519f946550cced5aff098eb41d5a4a6081a3cd241e71bab4e5b34b12 WHIRLPOOL 937da0fb1a4f9200025ffeac32ee73032ae7c9373be10775a82639d73edeb5c7084def5089cb957284a48a3a6b56024b99bc519d5c30644005905b7d39d2ed7f
+EBUILD cdf-3.3.1.ebuild 3294 SHA256 921935d6284962f99ad5b535759ae7394dcf3db8c4588cb7b09486026f4125fd SHA512 c12bf7af1b941fb0d3a68d9e1d7d7ccd913a34e6031665f5fc641564a9a41c30a283f28d3b35a582c83ceefd28db405c00c6058dba9672750e5107ccfff12c18 WHIRLPOOL 9c7fc9b683e88c1a948fb8bebaed160dfbab1c51869ca695b657e6898ab70d466cd9e6df495b2a34e7667a6d8302b0a7a4adfb5af81dbed38f3466a857b7acd3
+EBUILD cdf-3.4.1.ebuild 3337 SHA256 d6e257416d95e44ab6864462d34ece6979bacd68d310ced0cc558ddb8bb1be12 SHA512 8f377c092cd6cd84752de851ab116c17a7ae2167ad59859a572edc1c5421e0f6be56c10ca7e0fff574cc4eb8289313d6e9f34a5b250301d371360c6a7fa80978 WHIRLPOOL 830cd40c323310b4297df5edab9adedce540667d83697dc392f874194a2e4d54b016c00b5947daaaded901b1a29efea66326de903e1fb61b564ba2e8dd741be9
+MISC ChangeLog 3799 SHA256 62894bc9f255c226ff718695c31f4dbbe77fd702a15f82056f1e9717b80266fb SHA512 c258caf4d29099fbc7ca5542956616c58f64f78ec4c226c882d249139f24287d8750dffc4ffec660ba4baad643c0f5974ece1008ad332295c0cf2d854ac70f61 WHIRLPOOL ea6d21a598438da9831d7a61f158d5df13bd9ef14649c66b49643ffde4ee5294105b68ed4f5b54c1046c9c7d9507da1d6aa16c4d879cd288640ab6e608e4c114
+MISC metadata.xml 920 SHA256 da95dbe621a4e9b48b392bd653c1b0b25f74c5eb2cd3bb8046cf0eeb88066f5f SHA512 cb75abca7b54c9924f210e72adef2b47601e1cf44a9562dbb0ff1a58f40c60dc70f43b9f4b12c159affd2d7896a05fb3cc32b2f83aa97005911f4434cc31bdff WHIRLPOOL 18777b07b193b98daeea69f133bde8d380c37d2b4ced882e04dd27643c1b3fa100b92cd5df2ff3138d5bbe9df08222475d5593990ce47d5dd3d4ba073c488081
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk4/Z/sACgkQ/ejvha5XGaPcUgCg6c0klNk4UyxPXfgO3RjmN1ZD
-g8kAoIqhi6MXGA72T81Wm3aPmPuxJR9h
-=WFrM
+iEYEAREIAAYFAlAcBzwACgkQ1ycZbhPLE2C4oACgqINFO6h01ucJRqBWKaGIEn3U
+tlcAninasPs7C9KsGkg+S8ob/Hi/ajoq
+=lMP1
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/cdf/cdf-3.4.1.ebuild b/sci-libs/cdf/cdf-3.4.1.ebuild
new file mode 100644
index 000000000000..07b4e71f65ee
--- /dev/null
+++ b/sci-libs/cdf/cdf-3.4.1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cdf/cdf-3.4.1.ebuild,v 1.1 2012/08/03 17:15:34 bicatali Exp $
+
+EAPI=4
+inherit eutils toolchain-funcs multilib versionator java-pkg-opt-2
+
+MY_DP="${PN}$(get_version_component_range 1)$(get_version_component_range 2)"
+MY_P="${MY_DP}_$(get_version_component_range 3)"
+
+DESCRIPTION="Common Data Format I/O library for multi-dimensional data sets"
+HOMEPAGE="http://cdf.gsfc.nasa.gov/"
+SRC_BASE="ftp://cdaweb.gsfc.nasa.gov/pub/${PN}/dist/${MY_P}/unix"
+
+SRC_URI="${SRC_BASE}/${MY_P}-dist-${PN}.tar.gz
+	java? ( ${SRC_BASE}/${MY_P}-dist-java.tar.gz )
+	doc? ( ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}crm.pdf
+		   ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}frm.pdf
+		   ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}ifd.pdf
+		   ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}prm.pdf
+		   ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}ug.pdf
+	java? ( ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}jrm.pdf ) )"
+
+LICENSE="CDF"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples java ncurses static-libs"
+
+RDEPEND="ncurses? ( sys-libs/ncurses )
+	java? ( >=virtual/jre-1.5 )"
+DEPEND="ncurses? ( sys-libs/ncurses )
+	java? ( >=virtual/jdk-1.5 )"
+
+S="${WORKDIR}/${MY_P}-dist"
+
+src_prepare() {
+	# respect cflags, remove useless scripts
+	epatch "${FILESDIR}"/${PN}-3.4-Makefile.patch
+	epatch "${FILESDIR}"/${PN}-3.2-soname.patch
+	# use proper lib dir
+	sed -i \
+		-e "s:\$(INSTALLDIR)/lib:\$(INSTALLDIR)/$(get_libdir):g" \
+		Makefile || die "sed failed"
+}
+
+src_compile() {
+	local myconf
+	if use ncurses; then
+		myconf="${myconf} CURSES=yes"
+	else
+		myconf="${myconf} CURSES=no"
+	fi
+	PV_SO=${PV:0:1}
+	emake \
+		OS=linux \
+		CC=$(tc-getCC) \
+		ENV=gnu \
+		SHARED=yes \
+		SHAREDEXT_linux=so.${PV_SO} \
+		${myconf} \
+		all
+
+	if use java; then
+		export CDF_BASE="${S}"
+		export CDF_LIB="${S}/src/lib"
+		cd cdfjava/jni
+		$(tc-getCC) \
+			${CFLAGS} -fPIC \
+			-I${CDF_BASE}/src/include \
+			-I$(java-config -O)/include \
+			-I$(java-config -O)/include/linux \
+			-c cdfNativeLibrary.c \
+			-o cdfNativeLibrary.o \
+			|| die "compiling java lib failed"
+		$(tc-getCC) \
+			${LDFLAGS} \
+			-L${CDF_LIB} -lcdf -lm \
+			-shared cdfNativeLibrary.o \
+			-Wl,-soname=libcdfNativeLibrary.so.${PV_SO} \
+			-o libcdfNativeLibrary.so.${PV_SO} \
+			|| die "linking java lib failed"
+	fi
+}
+
+src_test() {
+	emake -j1 test
+}
+
+src_install() {
+	dodir /usr/bin
+	dodir /usr/$(get_libdir)
+	# -j1 (fragile non-autotooled make)
+	emake -j1 \
+		INSTALLDIR="${ED}/usr" \
+		SHAREDEXT=so.${PV_SO} \
+		install
+	dosym libcdf.so.${PV_SO} /usr/$(get_libdir)/libcdf.so
+	use static-libs && rm -f "${ED}"/usr/$(get_libdir)/libcdf.a
+	dodoc Release.notes CHANGES.txt Welcome.txt
+	doenvd "${FILESDIR}"/50cdf
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins "${DISTDIR}"/${MY_DP}*.pdf
+		use java || rm "${D}"/usr/share/doc/${PF}/${MY_P}jrm.pdf
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins samples/*
+	fi
+
+	if use java; then
+		cd cdfjava
+		dolib.so jni/libcdfNativeLibrary.so.${PV_SO}
+		dosym libcdfNativeLibrary.so.${PV_SO} \
+			/usr/$(get_libdir)/libcdfNativeLibrary.so
+		java-pkg_dojar */*.jar
+		if use examples; then
+			insinto /usr/share/doc/${PF}/examples/java
+			doins examples/*
+		fi
+	fi
+}
diff --git a/sci-libs/cdf/files/cdf-3.4-Makefile.patch b/sci-libs/cdf/files/cdf-3.4-Makefile.patch
new file mode 100644
index 000000000000..4a6c0a0ef266
--- /dev/null
+++ b/sci-libs/cdf/files/cdf-3.4-Makefile.patch
@@ -0,0 +1,102 @@
+diff -Nur cdf34_1-dist.orig/Makefile cdf34_1-dist/Makefile
+--- cdf34_1-dist.orig/Makefile	2012-06-19 06:05:21.000000000 -0700
++++ cdf34_1-dist/Makefile	2012-08-03 10:11:38.672992055 -0700
+@@ -715,17 +715,17 @@
+ "PIC=$(PIC_$(OS)_$(ENV))" \
+ "CCx=$(CC_$(OS)_$(ENV))" \
+ "LDx=$(LD_$(OS)_$(ENV))" \
+-"COPTIONS=$(UCOPTIONS) $(COPTIONS_$(OS)_$(ENV))" \
++"COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))" \
+ "SYSLIBS=$(SYSLIBSshr_$(OS)_$(ENV))" \
+ "SHAREDEXT=$(SHAREDEXT_$(OS))" \
+-"LDOPTIONS=$(LDOPTIONS_$(OS)_$(ENV))" \
++"LDOPTIONS=$(LDFLAGS) $(LDOPTIONS_$(OS)_$(ENV))" \
+ "AROPTIONS=$(AROPTIONS_$(OS))" \
+ "RANLIB=$(RANLIB_$(OS))" \
+ all
+ 	@cd $(TOOLSsrcDIR); $(MAKE) \
+ "CURSES=$(AND.$(CURSES).$(CURSES_$(OS)_$(ENV)))" \
+ "CCx=$(CC_$(OS)_$(ENV))" \
+-"COPTIONS=$(COPTIONS_$(OS)_$(ENV))" \
++"COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))" \
+ "COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))" \
+ "SYSLIBS=$(SYSLIBSexe_$(OS)_$(ENV))" \
+ "CURSESLIB=$(CURSESLIB_$(OS)_$(ENV))" \
+@@ -735,9 +735,9 @@
+ "FCx=$(FC_$(OS))" \
+ "CCx=$(CC_$(OS)_$(ENV))" \
+ "SHARED=$(AND.$(SHARED).$(SHARED_$(OS)))" \
+-"FOPTIONS=$(FOPTIONS_$(OS)) $(FOPTIONS_$(OS)_$(ENV))" \
++"FOPTIONS=$(FFLAGS) $(FOPTIONS_$(OS)) $(FOPTIONS_$(OS)_$(ENV))" \
+ "FOPTIONSld=$(FOPTIONSld_$(OS)) $(FOPTIONSld_$(OS)_$(ENV))" \
+-"COPTIONS=$(COPTIONS_$(OS)_$(ENV))" \
++"COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))" \
+ "COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))" \
+ "SYSLIBS=$(SYSLIBSexe_$(OS)_$(ENV))" \
+ "SHAREDEXT=$(SHAREDEXT_$(OS))" \
+@@ -773,12 +773,17 @@
+ install.all: install.definitions install.include install.lib \
+ 	     install.tools install.help_ notify.user copy.leapseconds
+ 
+-install.definitions: create.bin copy.definitions change.definitions
++install.definitions: create.bin
+ install.include: create.include copy.include
+ install.tools: create.bin copy.tools
+ install.help_: create.help copy.help
+ 
+ install.lib: create.lib copy.lib.a
++	@if [ -f $(LIBsrcDIR)/libcdf.$(SHAREDEXT) ] ; then \
++	   $(MAKE) "INSTALLDIR=$(INSTALLDIR)" install.lib.so ; \
++	 else \
++	   $(NULL) ; \
++	 fi
+ 	@if [ -f $(LIBsrcDIR)/libcdf.so ] ; then \
+ 	   $(MAKE) "INSTALLDIR=$(INSTALLDIR)" install.lib.so ; \
+ 	 else \
+@@ -884,8 +889,8 @@
+ 	      cp $(INCsrcDIR)/cdfconfig.h $(INSTALLDIR)/include
+ 
+ copy.lib.so:
+-	@echo cp $(LIBsrcDIR)/libcdf.so $(INSTALLDIR)/lib
+-	      cp $(LIBsrcDIR)/libcdf.so $(INSTALLDIR)/lib
++	@echo cp $(LIBsrcDIR)/libcdf.$(SHAREDEXT) $(INSTALLDIR)/lib
++	      cp $(LIBsrcDIR)/libcdf.$(SHAREDEXT) $(INSTALLDIR)/lib
+ 
+ copy.lib.sl:
+ 	@echo cp $(LIBsrcDIR)/libcdf.sl $(INSTALLDIR)/lib
+@@ -1964,15 +1969,15 @@
+ show.supported:
+ 	@echo SHARED is $(SUPPORTED.$(SHARED_$(OS)))
+ 	@echo CURSES is $(SUPPORTED.$(CURSES_$(OS)_$(ENV)))
+-	@echo FOPTIONS=$(FOPTIONS_$(OS))
++	@echo FOPTIONS=$(FFLAGS) $(FOPTIONS_$(OS))
+ 	@echo FOPTIONSld=$(FOPTIONSld_$(OS))
+ 	@echo SHAREDEXT=$(SHAREDEXT_$(OS))
+-	@echo LDOPTIONSlibcdf=$(LDOPTIONS_$(OS)_$(ENV))
++	@echo LDOPTIONSlibcdf=$(LDFLAGS) $(LDOPTIONS_$(OS)_$(ENV))
+ 	@echo RANLIB=$(RANLIB_$(OS))
+ 	@echo FCx=$(FC_$(OS))
+ 	@echo CCx=$(CC_$(OS)_$(ENV))
+ 	@echo PIC=$(PIC_$(OS)_$(ENV))
+-	@echo COPTIONS=$(COPTIONS_$(OS)_$(ENV))
++	@echo COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))
+ 	@echo COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))
+ 	@echo CURSESLIB=$(CURSESLIB_$(OS)_$(ENV))
+ 	@echo SYSLIBSexe=$(SYSLIBSexe_$(OS)_$(ENV))
+diff -Nur cdf34_1-dist.orig/src/tools/Makefile cdf34_1-dist/src/tools/Makefile
+--- cdf34_1-dist.orig/src/tools/Makefile	2012-06-15 09:22:16.000000000 -0700
++++ cdf34_1-dist/src/tools/Makefile	2012-08-03 10:11:38.685992724 -0700
+@@ -35,10 +35,10 @@
+ INCLUDEcdf= ../include
+ 
+ CC=$(CCx)
+-CFLAGS=$(COPTIONS) -I$(INCLUDEcdf)
+-CFLAGSld=$(COPTIONSld)
++CFLAGS:=$(CFLAGS) $(COPTIONS) -I$(INCLUDEcdf)
++CFLAGSld=$(LDFLAGS) $(COPTIONSld)
+ 
+-LIBCDFa=../lib/libcdf.a 
++LIBCDFa=../lib/libcdf.so.3
+ LIBs1=$(LIBCDFa) $(SYSLIBS)
+ LIBs2=$(LIBCDFa) $(CURSESLIB) $(SYSLIBS)
+ 
diff --git a/sci-libs/clapack/Manifest b/sci-libs/clapack/Manifest
index 61d17f37e5e0..dfc88666aa19 100644
--- a/sci-libs/clapack/Manifest
+++ b/sci-libs/clapack/Manifest
@@ -1,29 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX clapack-3.2.1-findblas-r6.patch 2001 RMD160 ae087273de037f12e96067c54eca15027ac3c225 SHA1 5e1028c1f561d1cfaf43c5a34bf9bb5d23c90cf5 SHA256 1f9c53147fd0e0ba3e0b391fc37a814d1d0b5cdd66327ab05b3f9746d54153e8
-AUX clapack-3.2.1-findblas.patch 1945 RMD160 97595331812bbdbc5c63c7697dd00ceb7137e9e7 SHA1 3aea0b50f353d47f999f591a26480f813ae5966b SHA256 c11045e539ff7c19e12e590cf1d55518b9c53250adb65d0bd5a77e7a9558bc50
-AUX clapack-3.2.1-fix_include_file.patch 689 RMD160 1140593aa3d24e749e86b2c15f01b59512287c02 SHA1 eec4b685ab1b09333e7d5cb5d2d1419815935b9f SHA256 9b6024cecbfb152d910b8fb878db6918704388479876719b43f4378992581603
-AUX clapack-3.2.1-hang.patch 641 RMD160 70eb3fb9c6772d3d88e0a88216cbdd21d547a4d6 SHA1 3ed2ede728a2bcbc21ad5b8da4dad93676e34353 SHA256 19322ccb00dea5abdd28aaad5c25ad58c4a6bb8b5ad15e9dad329fa6c113f9a8
-AUX clapack-3.2.1-noblasf2c.patch 5841 RMD160 50ca84aad167c389ddd5fe9c760daa5fce6a5082 SHA1 f14ced41155786b90ea8b98f9ab746dc81e8719e SHA256 37525a9099aba9130346abd2b765d05b7164c880a45b0b231b9bedfd63894fc2
-DIST clapack-3.2.1-CMAKE.tgz 6017667 RMD160 42af2b40a78b0cc4020a961a2fe0faf73c20560c SHA1 5ea1bcc4314e392bca8b9e5f61d44355cf9f4cc1 SHA256 0b3f782bc24845d85f36bafbff0f2f1384dc72df730fda4e7924ec1a70baca5a
-EBUILD clapack-3.2.1-r6.ebuild 935 RMD160 c643614e41884b5b12103385723dcfb47966774f SHA1 217de191910a03f7db60da9cefa19be4dd0f9d06 SHA256 a1008e037fa84ca22f647ed7f6915254f13aa27449e5d619b28f727b2a3fbdcd
-MISC ChangeLog 3630 RMD160 ec0bb69479dc1ead377e0cd0d041893005723354 SHA1 531424b852504c4b7163e4d6b05b2855f0a55525 SHA256 ac3a0d722d2a0053f6a90a757e8a9270f94cf6a858a37f6655b34986dcb89eef
-MISC metadata.xml 581 RMD160 aa5fd2f24c925ba53410c2a6b2b9e357a79a5e22 SHA1 6d88ecc9bfaa1d1711cfb76d307b41b0ccd5f429 SHA256 c7fdad96aad5a3bbb64f5ea60fbacfa7cf51175b32a3c8c187df749a6206e393
+AUX clapack-3.2.1-findblas-r6.patch 2001 SHA256 1f9c53147fd0e0ba3e0b391fc37a814d1d0b5cdd66327ab05b3f9746d54153e8 SHA512 71e7ee27999228886d605020ba6fb223a7cf99bcf34d7d2bc859ea632ce9837e2755159efbc1a339397d0e544064b187563b47bb340e1d9f7d8a8b95c390180c WHIRLPOOL 1c7405d34d72df6d851e352d4466ab5152237a1ebfe0dc6c32f8a7a85cd07d206eb0f9095f03ff45bacd049e40542305124d9d5cbd0a0e6dd2c1c2c8b61ba14a
+AUX clapack-3.2.1-findblas.patch 1945 SHA256 c11045e539ff7c19e12e590cf1d55518b9c53250adb65d0bd5a77e7a9558bc50 SHA512 9fab257f24ec642636e6bff434b5dab9f8c2e9bbe55a5c6675fee3d179fb5dc3c09bd4329a4e30dac52237a49522175b86612f81cc2a8abf961e6c08016f9740 WHIRLPOOL d0c07c19b24e3525284f633ae313be435fefc92686f2292788da73789b42670329777d7bd8830209130806ce994f32d0d48a646b7b38148d1b358c1789fcf341
+AUX clapack-3.2.1-fix_include_file.patch 689 SHA256 9b6024cecbfb152d910b8fb878db6918704388479876719b43f4378992581603 SHA512 74bddac93db98e2752eb7064578e246e113bc850fe8671ecd129f05490345130ded6c5188eb07cc6a086b8044959a4595ee46912af30ee39b9f80244d7b8335b WHIRLPOOL 99732f878d800cacaa819fe211a6109b4a4426971dae808357fc7425d92ad6144f160c4ff897be66504e891295fb7aebc9fcc7036930f22eda3549eca951ce92
+AUX clapack-3.2.1-hang.patch 641 SHA256 19322ccb00dea5abdd28aaad5c25ad58c4a6bb8b5ad15e9dad329fa6c113f9a8 SHA512 a6e7461bfe7bddd2120c46e3629a899cc12c23669b22b562675922bf11d2fb69793e8093d24773d688e0d7e1f24c08b16ccd2b01631b23f55fbb7a10c29ed036 WHIRLPOOL 066c25f92ef6354c113f3ccc46f50fc884c323d718e5db50a68fa7981e1e7e5366f1ca847901f3fb7c9e73d1a5ebe061c4342d2819ed9d06cefd3c0df2818599
+AUX clapack-3.2.1-noblasf2c.patch 5841 SHA256 37525a9099aba9130346abd2b765d05b7164c880a45b0b231b9bedfd63894fc2 SHA512 68571f682e7015c75104494f8d156cd0c1f758aa03d9c2614f93db418c8d4f9c9c2e7b5d965022060f776a9baa8d48c15bbfa30dbcada03bccffa4ebb3c4deef WHIRLPOOL 695a06b64ba1fcd76b78693d9992ef1e7209fce8355e81c81a354a2f041e1198e1693b3246b98512a2e725b18fa7aa6b21466605792b56c68d56e77c63d6d444
+DIST clapack-3.2.1-CMAKE.tgz 6017667 SHA256 0b3f782bc24845d85f36bafbff0f2f1384dc72df730fda4e7924ec1a70baca5a SHA512 cf19c710291ddff3f6ead7d86bdfdeaebca21291d9df094bf0a8ef599546b007757fb2dbb19b56511bb53ef7456eac0c73973b9627bf4d02982c856124428b49 WHIRLPOOL 9b2e5ba8a2503542c480565e4c34510b9fd501677c30e34b19ede18092ae40b282e4261f1939b5681c82f82d448d4afa24123ce8fb15120c7446e91ea51a698e
+EBUILD clapack-3.2.1-r6.ebuild 945 SHA256 a9f76108dffd84a7831d2e4d18c5fb201dc2568ce0ad04f7d71c2384ca56d499 SHA512 6c76ea216510bc4100446842a0d3874d78651945349a0b6db0748a43080b6824f0dff0c304b667daf13db0eb4205882b874f58ce193e7ade31867d4e3dc64dd5 WHIRLPOOL 2abd19aacb567462483a4f59405518c9552292ea77b9150fafd05824e0a5bc449ed5159c608df99476e2925037a900e7fc3c195bf707b2cd869d9e2daa3b41e6
+MISC ChangeLog 3728 SHA256 b4c2982d95a6a7f2df62cc659d16ca581b952801f80b04fb28ee0835ead4e82d SHA512 501805995883ebf9881c11fb62f3e65e59d54ecb7b31a95bca8110af92441f25d00777c6624e3cb6602b1616a79b2e7eef03a722b8b766f4412a213ee3369831 WHIRLPOOL 8ab873ba175a15572336216259c02394c2629ee391ba7a7994513a8b42ad9e23b59161c32406d97d329be94947166f10ba400d9dbcc9a054069d6363f8a0ee4a
+MISC metadata.xml 581 SHA256 c7fdad96aad5a3bbb64f5ea60fbacfa7cf51175b32a3c8c187df749a6206e393 SHA512 b100f88d9e4bd9da4dcdefc9f8dacf96b985bc9bf25366d0e658bccca9cfaad1c8a253e43152e55d497a00bc1c5ce2034beaf881be7eacc0c20100108427f6f0 WHIRLPOOL cfc2cface3c594ec8f43de961cf27222764d2d9b6cb170349e7a51c722def62d51ab5f24e894f5474783cb312af958959345f68a9afacef34ddf24ad16f9f22c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPhzNWAAoJENwGBM22xffevUIP/A3Lfoh/miomwQQmkf1eNg/F
-Y3re9f1heUjIEJ71Ycy/MnCG2BiS+JvZuRuRq4Rn0bXXJ1gTOhgyVLgg6RcN0OJ4
-uErbV9AQaZfwZVHEJqjnHrM2+Vhi8aMEIm6oaBeLvJdtPw1Ok9pw2t6odB2pPDJ7
-9Ern1Bk7FFnfOLnhg5RmjGO9cHliBuQ5DvcsvKQn8EFRGMlO+rXt4RgaQ7ozDCDL
-yTUkBGQ0ZrnE9iA1sVR1INA7NAYAQc9BY+QL5nwDcEwsEVCpkoBSSkh06XMO2oM6
-AaVj/NSXZgZ/ZVwH7sY+Qt/zo0jJapNFeDjpylVt44wZbtPLicpTAFEj/puJx0fI
-+zsh/sGHSpkrpPeWMq8smD++zB4GQcX1o3K7vLbQBgvwU6yxI03KO5B4GOTTqgU/
-kw8xo74jaM1FCkRmv5xa7mf8+/pRdTeO7FJYAT9qX18ZVnbtJMNHugjqDMEagzr9
-W1jx9ApehqXnu2Myfn02cSoJwnLY8Ka9BEdbNBbegS3dx26InUU7SmB+g7QXE5Xb
-oh+WEK8MCpLE7SJQmBynqz6bIln/AF6qcl/6mnikADbTTk+PB4zOCN/4k/QEXVaW
-ISydCEj+F+emUUSemCBlaIZls9bFndMebpXkedF1x0SKPa5m12upC2WaSAGIxmIP
-Ppdx3cYdR2IqXoETdx/m
-=hPVQ
+iEYEAREIAAYFAlAcCDMACgkQ1ycZbhPLE2D5MACfdPOHmB0vvdnG7VmLpBM4KL2Y
+4DwAn1yeVrt8xcE0j0FyEEYgujBHkDsF
+=lkSK
 -----END PGP SIGNATURE-----