Fixed bug #504470, thanks jer, fixed for gui prefix, add sub-slotted dependencies, general cleanup

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

11 files changed, 139 insertions, 950 deletions

diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index 52430bec9962..3f12da661b68 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sci-mathematics/octave
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.162 2014/03/08 14:12:30 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.163 2014/04/15 22:42:34 bicatali Exp $
+
+*octave-3.8.1-r1 (15 Apr 2014)
+
+  15 Apr 2014; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/octave-3.8.1-pkgbuilddir.patch, +octave-3.8.1-r1.ebuild,
+  -files/octave-3.4.3-help.patch, -files/octave-3.8.0-JIT-64-bit-indexing.patch,
+  -files/octave-3.8.0-avoid-gui-sigsegv-if-curl-is-not-available.patch,
+  -files/octave-3.8.0-imagemagick.patch, -octave-3.8.0.ebuild,
+  -octave-3.8.1_rc4-r1.ebuild, -octave-3.8.1_rc4.ebuild, metadata.xml:
+  Fixed bug #504470, thanks jer, fixed for gui prefix, add sub-slotted
+  dependencies, general cleanup
 
 *octave-3.8.1 (08 Mar 2014)
 
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 93fd69a7c8c3..f69865739aef 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,38 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX octave-3.4.3-help.patch 579 SHA256 786d6a265d9efa5c606ad84b8d957cf6d0143dae1667d5848ac323e2746d7c77 SHA512 322f8513f71a2769510d759865f1476a3263f11f81885c2e6da75fbb157f87e9fe4c0a0e23032521b082fc70cc0d4b86e52855b6e19d077de266da59d295299a WHIRLPOOL e5ad17c2337c307bbb06f76b71448fd383bbfd5538f3f4d79a5cf2ee0ed80d522b5d933cf523e31560f2d6765e5ebf53b8a1eca9932f53f279f87c42eaf85cc8
 AUX octave-3.4.3-pkgbuilddir.patch 1532 SHA256 5f771b92de6994e267d5f8b1abe7733cb75e9c0cb936728fc31fac3369b78093 SHA512 a6612c26d20c82181e7e1530a4d0cf342ee9f127711c37e44b7a48bfb90eb5d8347cbf424edb951c24ad81645d492814e772aea6bdb027f4eac12fbb4c4bd26f WHIRLPOOL 9863475237b1d8ed2a381ed5ea87f4831b53425f824b489adf83c4db256f608a40fc44f5c111139789a43c3dfa2df6266ab6ac856f12e324392230d580cbd4f2
 AUX octave-3.4.3-texi.patch 375 SHA256 91fb6bfb0825e8159fa38c1f2113a1fc831c3156f0674f49145e6f0f83ff43e7 SHA512 d6d917f421c5c51dd02d01599d312d03d3f1dbec029862fcab5268527f95d8ffe18db86dbc56827b6a8741fb08856ab66a68e6fa965a90397d3a22a14e87b5b8 WHIRLPOOL 0ef4ccd18689190240064cc8fac7df52b7ffb3993b5a8ffb8591e922b935387864723d4cb58d6e0f9be72c1912cca7e49322c5f6098912868c7ae2f6b2ae826b
 AUX octave-3.6.3-legendtext.patch 406 SHA256 86e7bde6f8e4452d706257ce6af69463a056495af4e011575918f4a756bdc99d SHA512 d0607740e0152cc745a11e34ff7ccaf5054e1ef242e74145524b1743617cf5176006a849b7f283ac6c5818f0c86798f9b94c709f1289afc01cc260aaa04ee2ea WHIRLPOOL 72ebcb5d9fcadc681d7949626747981415e820b55e90c66716c51d625df1f3dbc0aefe9fcb8cf90db22b23664657eee617c1a8bcd840badf105452158c5d224d
 AUX octave-3.6.4-gcc-4.8.patch 1035 SHA256 70486bcd5b85040ed9ddcdb83cd14045850709deb2af73fba55f1f304e896489 SHA512 a7da029a47c97e52b26e28417b406aa5122667a8d1596929e839a8530b2c4e305007b6b114e742a27fb9c1b898ecf8845f962c346663de8b1df9ce5f566322b9 WHIRLPOOL d535591350e4042737fcb9cb37ef3381ffb0d7fb93564a127e3b0b7c6192049d2fdb416cfe2e95b5922ac9c6b83084cf32a8c2eb6ae6c2224ffeaa1b91418b96
 AUX octave-3.6.4-texinfo.patch 15072 SHA256 1c1c51369eb4d1a67df898bf0fef1cbec2a08f3a5a7860ad7b1e24a05b3d51fe SHA512 8d7fe866487923e944c5cba882e3cdc1d5f6df2bfb8b40a63753bdc8bf9b251cd15a2c60f46e3b2269c92a83e124286cbf16ab997d5ef3125fedce53ccf6dc74 WHIRLPOOL a2d5f4c1639c8842f7a1ac95c03b0e1f21f2183834aa2a75c8db7a5f7314fac6e26f41ff0cc34efcc7ec33649275709c36864b50426678c40e965a083f05a042
-AUX octave-3.8.0-JIT-64-bit-indexing.patch 3149 SHA256 f3883dd9979eb9a441ac6ba81339486c110a31aa79c47517582c041457159b1f SHA512 c02b050fb66e74a569c2fe5f4cd0902f5e051aed0e0bdf38578eed432fa18902dea1e1635d9a113429f09b3dc6eaa0004b4a1657680af661ea3abcce030dd5a3 WHIRLPOOL 967666181ca9887cc6f1ddd9fb020170f00ad835fe8d8a1b0f5ecf6bbb03c4fc456b8aff7531d66a295683214a816fb520abccd7786a9035d33a920fa6d18913
-AUX octave-3.8.0-avoid-gui-sigsegv-if-curl-is-not-available.patch 5318 SHA256 4984c4f316eeb2e47140041d306449b486ba629f53c98ae988c235d36389de9d SHA512 d0c4a9ba2bbab4966d16eade906042b9d22213ba4df673f9dac47904d3dd0cd9e470ca5d75f92539b7fa41f86581721bd9f9119243dccf7858ac482c49076862 WHIRLPOOL a48328c653c87cb0e48f4125a3f1229f3d3ca6929b57ef3a4903a4c46e2f62f33de7a6b1a11693a578164c200322e2a439bd44449f85939c12f83452dbb73f8b
 AUX octave-3.8.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch 298 SHA256 04d83d8a6dac628965e0c5e732df260c66295ff7c4fc9fa44e552ebf467b5d61 SHA512 968c9748c968916612bf652df4638519edfa86259247c1d81441cf64194ec92610680fbe06c24a2cf422dadec58154d2b811d6828818f1762e8cfd0fd160d64f WHIRLPOOL 583d4170b2ec493a89a8a3b25f12abe3055d2da0c5df6b4d9b99496f1a1110ba6e73a49be99290c228dccc16e3cd56bc9aa90ed9d631d663ae909fc778b97129
 AUX octave-3.8.0-fix-compile.patch 543 SHA256 f958d3ec8e9e9eff52b1cc143ee020fef85da79f1e4927c7f9e59271fe97d28d SHA512 5f7dc096108132e290d4354f3ba48fee9b7bd2df1550ce831a1830c6597df9cb2495a1028343628d98750981b8d87ae67b1d99381442617ba433513913104f72 WHIRLPOOL 76ad5745808f827fd9ad9c8ce805afd48ebc3a0afeb15f353c111ab1bcdb349295cfc14459f66d4658b893a87dcb0404fd330d23b329c36aba2645b5745649a7
 AUX octave-3.8.0-imagemagick-configure.patch 811 SHA256 3bd92429c567614061c95b31ce1870abd198d99b3bcda68b373d8e5c6472b981 SHA512 b032feeef9a48535f14b0998557d8b7be544e7ce32ae2d53854f0cad392f379910ec716b4632729c75a604b3e75e363161e3c96aa3ed5367b8bffba286666f4e WHIRLPOOL 146f1353609db5b6f75edda748f6cb084b5600f080771da93b847ed45d8de347cec341d95234b83731b1e1dceea0da95bceeaa1fc547c037814a718ddd0e96a5
-AUX octave-3.8.0-imagemagick.patch 5543 SHA256 27a9933b085575022b752ec979bddfce18d57cf741385685938285fb55a1bd05 SHA512 6754cb196c6d475f03a1096a9ce81971a3b9db77a43442f4e2044916114b1a2a706bb04b805ec11acd83ccbb35fd75324aeb8d306b1d01ad84be8d09d2d92760 WHIRLPOOL 4c7153df6e4050d20771ae8d3085b9f8b507c32e59fc6adb60238643577362e33ec4ab7a4bab77189cceca14d3d0f3e12a595560857761eea3c6e34bea1266be
 AUX octave-3.8.0-llvm-3.4.patch 2424 SHA256 40c6ea5fd4c59470038624398cffcb7d9f1b60d1bf678ab168c656c894824746 SHA512 8862dfe1060cc30b083ad62863b789f9c30e7d3d9a660b6ff591f2dc29611e23a75243cd8712fde04833c8285ff57f8e6483d7b23dd1cdc1923b309b8b004ece WHIRLPOOL ecc6ca44bba42f734fa911e81c10b0c4fb8f19815330351eba28ef34df19007112baf59efc8486596354a819d04490d1937945f1c4d3438d95a7270a2f24b44e
 AUX octave-3.8.0-llvm-configure.patch 624 SHA256 96d297d78d423663567e5790407c58ddc52af6bd6c9e3ddf499dc10ad6a955cb SHA512 bdaaf2e7d7fc4254caf9a04b082dc02e58369256ce09c0c3632309f624b2b97a447020b0a37b4da4770a7f8e02ae5f1ad233c986e337e93b89bc83ed8cf34c2c WHIRLPOOL 08d3ab914c964d526f8a7b013166aa6d86258eb0a4eff11ce74c4f377dc15786c9dfe1688048537c09787f37226fd0587d4a8d5afeac74751e86547cd66a8c6d
 AUX octave-3.8.0-pkgbuilddir.patch 1413 SHA256 277a2cf88d50db3125e5bffb989626f806f7140161a12caf6db711e67443b2e9 SHA512 37b1d88f0afcde01c6c59cb1f3a8ed4a73a611d0bc2acb2d9854ad53234c92daf8e38ca8510fcee91552d87dea18bce5c7d6ff3c3b00d73898076cc3f8a3245d WHIRLPOOL d4d1494ad1e25ed13fc4b4df281b49be8d53253e78ef5cc42dfab58a4f519b4e2e66ee6865441c965dcc66791449431e97d4395711515fe20d941b73a453b92a
 AUX octave-3.8.1-imagemagick.patch 5627 SHA256 ca2ca6df409d36e0f64b6c9b5c3be6ed1bfe990d14b54f39f149cb2a938aeb89 SHA512 119aa0a3ae312f41f28a57dd1115cabad27f9a9f329eef7c9f2a8e67d994948218a4f68332c122833e58e07d2defe42079fb51a590733055451b93e0187c4dc6 WHIRLPOOL 2aee7d3f470d2405be8c998ec362277329b822108bda7393d69c5974498928e75bfd8778d016b68fd83f8758891274c79fbc7119476871380abd27f834a0a93d
+AUX octave-3.8.1-pkgbuilddir.patch 1417 SHA256 7b2e74e3e9b713a2c52d19aa4fb4c3dd637ee4887c358027289f394342560c07 SHA512 5f1aa2e1533223832045ea418e06b6fb1276f9d16aca6cd8f0e8708bcdd0fcc67421462b40b0bd8a4fe7d98abdc2cccc2a2383fb17c12fd73c812b148b06fd30 WHIRLPOOL fe5df789a0d0bdd387423685b6ab3ae636b87a64bd6e579ac7fac80797297dee25177c86c0d1bb8e045160b153622c6bd331331d17d270128f52be00eeaec620
 DIST octave-3.6.4.tar.bz2 15627315 SHA256 fa185df9591f5d740f4d37ff6eaf06db576fdd3e0ddd9d0737365799e5d1c962 SHA512 a49ef50161272618c9543057be5903e1e50b7f4ecb929777f6715d4b3a07a92c36a5b13958c52d8b942b6c7e7e3f7844409d0062eb02bdb3972d7194312b7a81 WHIRLPOOL f51c764ce1ed911661bb3dd1d31a2321f09c0d887ead7bbe8c1f4ad1ebe05137223afb5ff18fc57b83d631936975964a85e4fed9a087760935acb5a35050cda0
-DIST octave-3.8.0.tar.bz2 17669638 SHA256 519330c6dd34eb69ca26a811722948fceac2acebd67ba924eba9b34a2e5a94f9 SHA512 2e8b81b418e235cddd6678d7cc83b8441c64b36f98854ab704c1b34d5ff711d3f6cce7ffe33f5f70a7bc231b2219b39d16033e6b9d04174cbab68f21c5a8abec WHIRLPOOL ace3d162722b0e47d78fbf8029396c3e5690a4260d5fcef09be4a1a58f7a1144888f5829a47f77d344ca20fa6844c55b80955e7093c5cd2e98a89188b6ec3708
-DIST octave-3.8.1-rc4.tar.gz 20688476 SHA256 f137c8132b77044c21e5ace97e67c3c74d36d106ba6b33f683201bfd59268e33 SHA512 295d1056a609cdeea357cab257dcbd672c8d885e67da5e20a16cc477e69deb9bcc082df6a168dfb01a3738e50ee5cb6518aa002800fa3bddbecca624e30d2e7b WHIRLPOOL 7bf1467474934fe7e69c7d1da79520c562a6c8546f541b04be99cac385439275f0353423d833ae4246c3d2a6b288dc83f73325febb2179ef81e5421472b17219
 DIST octave-3.8.1.tar.bz2 17664241 SHA256 d6762ed2ad4a042243a095fb44c7a1d3a91c635b6dca37fcef15a5efdffa9bbd SHA512 673ff37692d2ef1116a10afb36448494e69cb01de609017af1a72c3258a1fe71012e9986aafc29127509f7e6664127b4e9b7f269322820b3464eb30ab4b4ef7f WHIRLPOOL 85729283a65051159245f31ab53951c756ea55d1cc93518dbb55b740329a89cffbdf3679ae8d2b957e1a4b47dbf5f2dd9d60f51acf32e159d821979661a5fa54
 EBUILD octave-3.6.4-r1.ebuild 3546 SHA256 1e303b6d0b5dae850e83a12cfdf2c48f856d9eedf619a8eef4538ae811b8c591 SHA512 c5740862f898795f7f69af11da70ee479e610002385bfe2d46b6ded46e7e7e8eef772bd3e21db00da148065672d6cd58cf6484d80a2b759324f1d1f7805c9d36 WHIRLPOOL 46b56b068c35bad96c458e86c87feb14b7998a7ebf05a17fb9dba31631f0dd1e7b570852c393010f925a356091e312a765e5d50fbb4fb8de7cec1f35ef8e26f9
 EBUILD octave-3.6.4.ebuild 3481 SHA256 33e2e2bc509d636036b854b1db531daaf8cbd245740696c9fbed5d7bdd632e0e SHA512 c03a63c4cec131a9384d5eacc67f8724b102e48a4356318a89b8eec2c34b2da9c19e903e2e0a2f1b408803044c7689078aaadf527b90bcd3a6c0b6b8f619ae13 WHIRLPOOL c14ff910f1bab7362fc95d4730a3a752abfc011b5d7ce655afd9bafbdac7c1dfc989a7b0286a4dbd54836cb15522149561ebaffe77c99c58762c824dfc1dc873
-EBUILD octave-3.8.0.ebuild 6180 SHA256 41c99fe7f3c15be96503a54210197dc4b6893699246352152710e6c43413c6fd SHA512 7682aa2f48982650599a463ee3a8c761943f479a805d34f4ede45ea88c20f5dc51c4170d9a8995a667cffeb88cfe5ceca3c55351503bd6ad8fc58d089ea7e4ea WHIRLPOOL 0b38206317efac4ddb57c9fc12bf56363bf95a742034a18d3a6869f4dda721980414995ec9352c8d6b1c115329eed052af8836a61919fd773ee1e6a2596ff02e
+EBUILD octave-3.8.1-r1.ebuild 5519 SHA256 bd7e36ac18a2e71c7e003512dfb5c029823689f242d67ebd8ec00a5e2e6a9582 SHA512 7ccc21ced243b87d97615c58925126a36484b26cf184a246600bae5edbb25d4603917116f7f852c454e30290a5731801a33874a9a62aa7824d74fa17ccb0e06f WHIRLPOOL 5d8e8a47617222ed231391b1026f318a6c563d4c430247540fb7dd87dbf895e4a03fe8bd3265adc04c1966c471cd2303787239b3b766903321d0383bc2c462f6
 EBUILD octave-3.8.1.ebuild 6044 SHA256 f63dfe96e4049cc9c06ee2b5b64585fd46073b967b727444270a1f8a0b43d886 SHA512 46063c87a6d938b6d458fb163e66531323c8d9d140d8bc76507cad9e7cf661e91f6ff4526cc42b63b17230141b233065d7b197bbfe83c051b2145d057ac956db WHIRLPOOL c62f4aabec268a0e06c7e03eb78b6a368738d530cecfa7a4b773c989a6942db5df2b6f79ee1c66d31b7d03e14f12429baf75c455ad020112cff9738322e9599a
-EBUILD octave-3.8.1_rc4-r1.ebuild 6128 SHA256 2af836609125c9f8fef1b24b01f5fe37c0a1a28131f7e268ff028e2eee04f381 SHA512 9cd34a50e4152e103db083c31273674493f4a51d231259b1507a13b8260cd7ac47aad61bc066dcbea3907b18b12b649dbc148fd4ce6cfe09b9f8fe10cfc62413 WHIRLPOOL c88038a012baaeba60e676729fd73efddfe6f915f9267a7fecca4808972064b4aabbb428486fe5154435a70f7df4c83b61cbec304bf55db94011ddad04ed8940
-EBUILD octave-3.8.1_rc4.ebuild 6099 SHA256 75ae4a7f987a74c218f83bb5adcda3413e1a4a6e2ed09669aa48c5ed06256153 SHA512 b0c00a5760771554879790e645e737dafb8ad05a47f370be144e37574bbaee99f87819e9deecc307cd3e26541a80c2200792ba79f92e2a27b3de1f013c1316a6 WHIRLPOOL ae0f8efedbdef9b54c41f7a40c0046ddd0e6b875539716bfba70e3d8b49119d9bce04f1478f53d94fe7c4f5676ee78a20a82c53117781f85d87c77937c26b97f
-MISC ChangeLog 38108 SHA256 919df3b7bfa330d8d51a2d70ece83af16954b3c00ae9fbb527582e24ff6f6473 SHA512 5dde07aed0f2441fd162473fa22310df67edb0bd4cd83f8f95e5931ac218f2930dc9c70bc2a1adab928a69c4ce3d2d5c272d6ccc6cdcbe92d6f559b3aa46d66f WHIRLPOOL 7ea948d2bdf56306e9eed37d445841dd83e4b91bf18dd43963d27994a0c7255267619d0e238cf61f1e8e0a2ba2cbd8e162247477c8e2b53c57966db497e0ba9f
-MISC metadata.xml 1086 SHA256 a4f870296c42bebec9c57c95dd6ed0c847de692b004a4dd4dfb54611d44b514a SHA512 63bc97ab9911e4b1dcc9fd5ae465e124eafb05e83aa3feaf7f2adcb862b57b54bd75d99841d68af3f1cdc5cfe2bed91d0b606d00910a23eb7bbcc57ec048d5b5 WHIRLPOOL c00282871a332d1ccf36d98fc1d8a6709b61fbfeb8425dc1849d595ff357660db9f51dc13ef2a4a7b9bb257c0d424e7909179d61a1f7a1b651e821372065c926
+MISC ChangeLog 38654 SHA256 2e6c4cc4d70e8d07da16a42e6d772c2214f069bc3dad3407b75eb8c828854836 SHA512 8d72de0a4076b7e754c488ce92f1385c769ab1294c8fccc38ec593a6292a3d09dd93f9437c9dba63f11b99122819406df4c3632247474ed822c8fe2ee9854cb9 WHIRLPOOL 9d362bd4f9beccf72c3d70f60610cf570f66e8c8c7a10db6d9e87a199f79056f032e17e6051ec7b823a5279029d82ac05685dab4272a1daa393f0841cdfe9bf8
+MISC metadata.xml 1066 SHA256 e334e61be56a49bc98ef4c043256f1dacd978bff38870acbcefa7188eda0d4ff SHA512 a807577947d366ddcdd0d828e5fac276e8a1060752350f7dd680f415f56b9c50d1e2a69191ef0c55400944552181a97370f7c64c91ba1697fc4a9bd60e97b1d1 WHIRLPOOL d4d7d934483435c88c474b547d39e9153da6f1a2c31f8a6702fa2398b2104bb3ec1492ba38093f340cd3be48da42758e853db9e8e246a304b4f582ed0b2194bf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlMbJVgACgkQoBEVQmGOlx/VfwEAnZtpBxGNwaBx3nBbAa4s8SjB
-fQWkQyFZZZP52U+qZfEBAId9c8sPogYcEIfQ6SF33WsywfoD6d87QYikzncVVD80
-=yR7k
+iEYEAREIAAYFAlNNtd8ACgkQ1ycZbhPLE2DpmwCeM2uBql5KNDHGph0NQhm9Z3da
+H5AAn3F8L6QHgijkw/MX4++PzJCobsAK
+=26PP
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/octave/files/octave-3.4.3-help.patch b/sci-mathematics/octave/files/octave-3.4.3-help.patch
deleted file mode 100644
index c0e693abc4a2..000000000000
--- a/sci-mathematics/octave/files/octave-3.4.3-help.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Help parallel compilation
-patch by Sebastien Fabbro 
---- scripts/Makefile.am.orig	2011-06-09 22:27:22.688268651 +0100
-+++ scripts/Makefile.am	2011-02-08 10:00:51.000000000 +0000
-@@ -316,7 +316,7 @@
- 
- gethelp_SOURCES = gethelp.cc
- 
--.DOCSTRINGS: $(FCN_FILES) $(GEN_FCN_FILES) mkdoc $(gethelp_SOURCES) Makefile
-+.DOCSTRINGS: $(FCN_FILES) $(GEN_FCN_FILES) mkdoc $(gethelp_SOURCES) Makefile gethelp
- 	@$(MAKE) $(AM_MAKEFLAGS) gethelp$(BUILD_EXEEXT)
- 	if [ "x$(srcdir)" != "x." ] && [ -f $(srcdir)/DOCSTRINGS ] && [ ! -f DOCSTRINGS ]; then \
- 		cp $(srcdir)/DOCSTRINGS DOCSTRINGS; \
diff --git a/sci-mathematics/octave/files/octave-3.8.0-JIT-64-bit-indexing.patch b/sci-mathematics/octave/files/octave-3.8.0-JIT-64-bit-indexing.patch
deleted file mode 100644
index fc8d6c5884c3..000000000000
--- a/sci-mathematics/octave/files/octave-3.8.0-JIT-64-bit-indexing.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-
-# HG changeset patch
-# User Lasse Schuirmann <lasse@schuirmann.net>
-# Date 1389727640 28800
-# Node ID e243b705a726cbcef27fc3c88da984614eece2bc
-# Parent  ec975e8267288372e957d5b81c8185b504492ba3
-Fix building JIT with 64-bit indexing (bug #41163).
-
-jit-typeinfo.cc (jit_typeinfo): Create two constants for the value 1.  One
-constant (one_idx) is of type index_t and the other (one_int) is of int_t.  Use
-these constants when comparing to objects of the matching type.
-
-diff --git a/libinterp/corefcn/jit-typeinfo.cc b/libinterp/corefcn/jit-typeinfo.cc
---- a/libinterp/corefcn/jit-typeinfo.cc
-+++ b/libinterp/corefcn/jit-typeinfo.cc
-@@ -1609,12 +1609,8 @@
-   body = fn.new_block ();
-   builder.SetInsertPoint (body);
-   {
--    llvm::Value *one = llvm::ConstantInt::get (index_t, 1);
--    llvm::Value *ione;
--    if (index_t == int_t)
--      ione = one;
--    else
--      ione = llvm::ConstantInt::get (int_t, 1);
-+    llvm::Value *one_idx = llvm::ConstantInt::get (index_t, 1);
-+    llvm::Value *one_int = llvm::ConstantInt::get (int_t, 1);
- 
-     llvm::Value *undef = llvm::UndefValue::get (scalar_t);
-     llvm::Value *mat = fn.argument (builder, 0);
-@@ -1624,7 +1620,7 @@
-     llvm::Value *int_idx = builder.CreateFPToSI (idx, index_t);
-     llvm::Value *check_idx = builder.CreateSIToFP (int_idx, scalar_t);
-     llvm::Value *cond0 = builder.CreateFCmpUNE (idx, check_idx);
--    llvm::Value *cond1 = builder.CreateICmpSLT (int_idx, one);
-+    llvm::Value *cond1 = builder.CreateICmpSLT (int_idx, one_idx);
-     llvm::Value *cond = builder.CreateOr (cond0, cond1);
- 
-     llvm::BasicBlock *done = fn.new_block ("done");
-@@ -1647,7 +1643,7 @@
-     builder.CreateCondBr (cond, bounds_error, success);
- 
-     builder.SetInsertPoint (bounds_error);
--    gindex_range.call (builder, ione, ione, int_idx, len);
-+    gindex_range.call (builder, one_int, one_int, int_idx, len);
-     builder.CreateBr (done);
- 
-     builder.SetInsertPoint (success);
-@@ -1681,7 +1677,8 @@
-   body = fn.new_block ();
-   builder.SetInsertPoint (body);
-   {
--    llvm::Value *one = llvm::ConstantInt::get (index_t, 1);
-+    llvm::Value *one_idx = llvm::ConstantInt::get (index_t, 1);
-+    llvm::Value *one_int = llvm::ConstantInt::get (int_t, 1);
- 
-     llvm::Value *mat = fn.argument (builder, 0);
-     llvm::Value *idx = fn.argument (builder, 1);
-@@ -1690,7 +1687,7 @@
-     llvm::Value *int_idx = builder.CreateFPToSI (idx, index_t);
-     llvm::Value *check_idx = builder.CreateSIToFP (int_idx, scalar_t);
-     llvm::Value *cond0 = builder.CreateFCmpUNE (idx, check_idx);
--    llvm::Value *cond1 = builder.CreateICmpSLT (int_idx, one);
-+    llvm::Value *cond1 = builder.CreateICmpSLT (int_idx, one_idx);
-     llvm::Value *cond = builder.CreateOr (cond0, cond1);
- 
-     llvm::BasicBlock *done = fn.new_block ("done");
-@@ -1708,7 +1705,7 @@
- 
-     llvm::Value *rcount = builder.CreateExtractValue (mat, 0);
-     rcount = builder.CreateLoad (rcount);
--    cond1 = builder.CreateICmpSGT (rcount, one);
-+    cond1 = builder.CreateICmpSGT (rcount, one_int);
-     cond = builder.CreateOr (cond0, cond1);
- 
-     llvm::BasicBlock *bounds_error = fn.new_block ("bounds_error", done);
-
diff --git a/sci-mathematics/octave/files/octave-3.8.0-avoid-gui-sigsegv-if-curl-is-not-available.patch b/sci-mathematics/octave/files/octave-3.8.0-avoid-gui-sigsegv-if-curl-is-not-available.patch
deleted file mode 100644
index afeb156bace7..000000000000
--- a/sci-mathematics/octave/files/octave-3.8.0-avoid-gui-sigsegv-if-curl-is-not-available.patch
+++ /dev/null
@@ -1,206 +0,0 @@
-
-# HG changeset patch
-# User John W. Eaton <jwe@octave.org>
-# Date 1389817323 18000
-# Node ID 9a43d8d6e29ed1d9c29f3916f7064ebbbcb955f1
-# Parent  de72c443ed3fd6abb22fa1b5236835d96da62f99
-avoid startup crash if curl library is not available (bug #41067)
-
-* main-window.cc (news_reader::process): Don't attempt to use
-url_transfer object unless it is valid.
-* urlwrite.cc (ch_manager::do_make_curl_handle, Furlwrite, Furlread):
-Likewise.
-* url-transfer.cc (url_transfer::url_transfer): Don't call
-disabled_error.
-(disabled_error): Delete unused function.
-
-diff --git a/libgui/src/main-window.cc b/libgui/src/main-window.cc
---- a/libgui/src/main-window.cc
-+++ b/libgui/src/main-window.cc
-@@ -367,11 +367,14 @@
-       std::ostringstream buf;
-       url_transfer octave_dot_org (url.toStdString (), buf);
- 
--      Array<std::string> param;
--      octave_dot_org.http_get (param);
--
--      if (octave_dot_org.good ())
--        html_text = QString::fromStdString (buf.str ());
-+      if (octave_dot_org.is_valid ())
-+        {
-+          Array<std::string> param;
-+          octave_dot_org.http_get (param);
-+
-+          if (octave_dot_org.good ())
-+            html_text = QString::fromStdString (buf.str ());
-+        }
- 
-       if (html_text.contains ("this-is-the-gnu-octave-community-news-page"))
-         {
-diff --git a/libinterp/corefcn/urlwrite.cc b/libinterp/corefcn/urlwrite.cc
---- a/libinterp/corefcn/urlwrite.cc
-+++ b/libinterp/corefcn/urlwrite.cc
-@@ -189,10 +189,15 @@
- 
-     url_transfer obj (host, user, passwd, os);
- 
--    if (! error_state)
--      handle_map[h] = obj;
-+    if (obj.is_valid ())
-+      {
-+        if (! error_state)
-+          handle_map[h] = obj;
-+        else
-+          h = curl_handle ();
-+      }
-     else
--      h = curl_handle ();
-+      error ("support for url transfers was disabled when Octave was built");
- 
-     return h;
-   }
-@@ -413,31 +418,36 @@
- 
-   url_transfer curl = url_transfer (url, ofile);
- 
--  curl.http_action (param, method);
-+  if (! curl.is_valid ())
-+    {
-+      curl.http_action (param, method);
- 
--  ofile.close ();
-+      ofile.close ();
- 
--  if (curl.good ())
--    frame.discard ();
-+      if (curl.good ())
-+        frame.discard ();
- 
--  if (nargout > 0)
--    {
--      if (curl.good ())
-+      if (nargout > 0)
-         {
--          retval(2) = std::string ();
--          retval(1) = true;
--          retval(0) = octave_env::make_absolute (filename);
-+          if (curl.good ())
-+            {
-+              retval(2) = std::string ();
-+              retval(1) = true;
-+              retval(0) = octave_env::make_absolute (filename);
-+            }
-+          else
-+            {
-+              retval(2) = curl.lasterror ();
-+              retval(1) = false;
-+              retval(0) = std::string ();
-+            }
-         }
--      else
--        {
--          retval(2) = curl.lasterror ();
--          retval(1) = false;
--          retval(0) = std::string ();
--        }
-+
-+      if (nargout < 2 && ! curl.good ())
-+        error ("urlwrite: %s", curl.lasterror ().c_str ());
-     }
--
--  if (nargout < 2 && ! curl.good ())
--    error ("urlwrite: %s", curl.lasterror ().c_str ());
-+  else
-+    error ("support for url transfers was disabled when Octave was built");
- 
-   return retval;
- }
-@@ -540,21 +550,26 @@
- 
-   url_transfer curl = url_transfer (url, buf);
- 
--  curl.http_action (param, method);
-+  if (curl.is_valid ())
-+    {
-+      curl.http_action (param, method);
- 
--  if (curl.good ())
--    {
--      if (nargout > 0)
-+      if (curl.good ())
-         {
--          // Return empty string if no error occured.
--          retval(2) = curl.good () ? "" : curl.lasterror ();
--          retval(1) = curl.good ();
--          retval(0) = buf.str ();
-+          if (nargout > 0)
-+            {
-+              // Return empty string if no error occured.
-+              retval(2) = curl.good () ? "" : curl.lasterror ();
-+              retval(1) = curl.good ();
-+              retval(0) = buf.str ();
-+            }
-         }
-+
-+      if (nargout < 2 && ! curl.good ())
-+        error ("urlread: %s", curl.lasterror().c_str());
-     }
--
--  if (nargout < 2 && ! curl.good ())
--    error ("urlread: %s", curl.lasterror().c_str());
-+  else
-+    error ("support for url transfers was disabled when Octave was built");
- 
-   return retval;
- }
-diff --git a/liboctave/util/url-transfer.cc b/liboctave/util/url-transfer.cc
---- a/liboctave/util/url-transfer.cc
-+++ b/liboctave/util/url-transfer.cc
-@@ -767,15 +767,6 @@
- 
- #undef SETOPT
- 
--#else
--
--static void
--disabled_error (void)
--{
--  (*current_liboctave_error_handler)
--    ("support for url transfers was disabled when Octave was built");
--}
--
- #endif
- 
- #if defined (HAVE_CURL)
-@@ -785,27 +776,15 @@
- #endif
- 
- url_transfer::url_transfer (void) : rep (new REP_CLASS ())
--{
--#if !defined (HAVE_CURL)
--  disabled_error ();
--#endif
--}
-+{ }
- 
- url_transfer::url_transfer (const std::string& host, const std::string& user,
-                             const std::string& passwd, std::ostream& os)
-   : rep (new REP_CLASS (host, user, passwd, os))
--{
--#if !defined (HAVE_CURL)
--  disabled_error ();
--#endif
--}
-+{ }
- 
- url_transfer::url_transfer (const std::string& url, std::ostream& os)
-   : rep (new REP_CLASS (url, os))
--{
--#if !defined (HAVE_CURL)
--  disabled_error ();
--#endif
--}
-+{ }
- 
- #undef REP_CLASS
-
diff --git a/sci-mathematics/octave/files/octave-3.8.0-imagemagick.patch b/sci-mathematics/octave/files/octave-3.8.0-imagemagick.patch
deleted file mode 100644
index 0f9acdb90a6f..000000000000
--- a/sci-mathematics/octave/files/octave-3.8.0-imagemagick.patch
+++ /dev/null
@@ -1,137 +0,0 @@
---- octave-3.8.0-orig/libinterp/dldfcn/__magick_read__.cc	2013-12-28 08:57:41.000000000 +1100
-+++ octave-3.8.0/libinterp/dldfcn/__magick_read__.cc	2014-02-20 18:01:35.603737907 +1100
-@@ -38,8 +38,15 @@
- #include "gripes.h"
- 
- #ifdef HAVE_MAGICK
--
-+#define MAGICKCORE_EXCLUDE_DEPRECATED 1
- #include <Magick++.h>
-+#if !defined(QuantumRange) && defined(MaxRGB)
-+#define QuantumRange MaxRGB
-+#endif
-+#if !defined(MAGICKCORE_QUANTUM_DEPTH) && defined(QuantumDepth)
-+#define MAGICKCORE_QUANTUM_DEPTH QuantumDepth
-+#endif
-+
- #include <clocale>
- 
- // In theory, it should be enough to check the class:
-@@ -104,12 +111,18 @@
- get_depth (Magick::Image& img)
- {
-   octave_idx_type depth = img.depth ();
-+#if defined(MagickLibVersion) && (MagickLibVersion <= 0x686)
-+#define Magick MagickCore
-+#endif
-   if (depth == 8
-       && img.channelDepth (Magick::RedChannel)     == 1
-       && img.channelDepth (Magick::CyanChannel)    == 1
-       && img.channelDepth (Magick::OpacityChannel) == 1
-       && img.channelDepth (Magick::GrayChannel)    == 1)
-     depth = 1;
-+#if defined(MagickLibVersion) && (MagickLibVersion <= 0x686)
-+#undef Magick
-+#endif
- 
-   return depth;
- }
-@@ -332,7 +345,10 @@
-   if (imvec[def_elem].depth () == 32)
-     divisor = std::numeric_limits<uint32_t>::max ();
-   else
--    divisor = MaxRGB / ((uint64_t (1) << imvec[def_elem].depth ()) - 1);
-+  {
-+    using namespace Magick;
-+    divisor = QuantumRange / ((uint64_t (1) << imvec[def_elem].depth ()) - 1);
-+  }
- 
-   // FIXME: this workaround should probably be fixed in GM by creating a
-   //        new ImageType BilevelMatteType
-@@ -463,7 +479,8 @@
-                 for (octave_idx_type row = 0; row < nRows; row++)
-                   {
-                     img_fvec[idx] = pix->red / divisor;
--                    a_fvec[idx]   = (MaxRGB - pix->opacity) / divisor;
-+                    using namespace Magick;
-+                    a_fvec[idx]   = (QuantumRange - pix->opacity) / divisor;
-                     pix += row_shift;
-                     idx++;
-                   }
-@@ -538,7 +555,8 @@
-                     rbuf[idx]     = pix->red     / divisor;
-                     gbuf[idx]     = pix->green   / divisor;
-                     bbuf[idx]     = pix->blue    / divisor;
--                    a_fvec[a_idx++] = (MaxRGB - pix->opacity) / divisor;
-+                    using namespace Magick;
-+                    a_fvec[a_idx++] = (QuantumRange - pix->opacity) / divisor;
-                     pix += row_shift;
-                     idx++;
-                   }
-@@ -620,7 +638,8 @@
-                     mbuf[idx]     = pix->green   / divisor;
-                     ybuf[idx]     = pix->blue    / divisor;
-                     kbuf[idx]     = pix->opacity / divisor;
--                    a_fvec[a_idx++] = (MaxRGB - *apix) / divisor;
-+                    using namespace Magick;
-+                    a_fvec[a_idx++] = (QuantumRange - *apix) / divisor;
-                     pix += row_shift;
-                     idx++;
-                   }
-@@ -678,9 +697,10 @@
-       // Restore locale from before GraphicsMagick initialisation
-       setlocale (LC_ALL, locale.c_str ());
- 
--      if (QuantumDepth < 32)
-+      using namespace Magick;
-+      if (MAGICKCORE_QUANTUM_DEPTH < 32)
-         warning ("your version of %s limits images to %d bits per pixel",
--                 MagickPackageName, QuantumDepth);
-+                 MagickPackageName, MAGICKCORE_QUANTUM_DEPTH);
- 
-       initialized = true;
-     }
-@@ -1053,8 +1073,9 @@
-   // From GM documentation:
-   //  Color arguments are must be scaled to fit the Quantum size according to
-   //  the range of MaxRGB
-+  using namespace Magick;
-   const double divisor = static_cast<double>((uint64_t (1) << bitdepth) - 1)
--                         / MaxRGB;
-+                         / QuantumRange;
- 
-   const P *img_fvec = img.fortran_vec ();
-   const P *a_fvec   = alpha.fortran_vec ();
-@@ -1105,7 +1126,8 @@
-                   {
-                     Magick::Color c;
-                     c.redQuantum   (double (*img_fvec) / divisor);
--                    c.alphaQuantum (MaxRGB - (double (*a_fvec) / divisor));
-+                    using namespace Magick;
-+                    c.alphaQuantum (QuantumRange - (double (*a_fvec) / divisor));
-                     pix[GM_idx] = c;
-                     img_fvec++;
-                     a_fvec++;
-@@ -1170,10 +1192,11 @@
-               {
-                 for (octave_idx_type row = 0; row < nRows; row++)
-                   {
-+                    using namespace Magick;
-                     Magick::Color c (double (*img_fvec)          / divisor,
-                                      double (img_fvec[G_offset]) / divisor,
-                                      double (img_fvec[B_offset]) / divisor,
--                                     MaxRGB - (double (*a_fvec) / divisor));
-+                                     QuantumRange - (double (*a_fvec) / divisor));
-                     pix[GM_idx] = c;
-                     img_fvec++;
-                     a_fvec++;
-@@ -1247,7 +1270,8 @@
-                                      double (img_fvec[Y_offset]) / divisor,
-                                      double (img_fvec[K_offset]) / divisor);
-                     pix[GM_idx] = c;
--                    ind[GM_idx] = MaxRGB - (double (*a_fvec) / divisor);
-+                    using namespace Magick;
-+                    ind[GM_idx] = QuantumRange - (double (*a_fvec) / divisor);
-                     img_fvec++;
-                     a_fvec++;
-                     GM_idx += nCols;
diff --git a/sci-mathematics/octave/files/octave-3.8.1-pkgbuilddir.patch b/sci-mathematics/octave/files/octave-3.8.1-pkgbuilddir.patch
new file mode 100644
index 000000000000..98fe3d5e8eed
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-3.8.1-pkgbuilddir.patch
@@ -0,0 +1,41 @@
+--- scripts/pkg/private/install.m.orig	2014-04-15 08:45:55.487258887 -0700
++++ scripts/pkg/private/install.m	2014-04-15 12:12:40.985606248 -0700
+@@ -62,7 +62,14 @@
+     for i = 1:length (files)
+       tgz = files{i};
+ 
+-      if (exist (tgz, "file"))
++      ## The filename pointed to an uncompressed package to begin with.
++      if (exist (tgz, "dir"))
++        if (tgz(1) == '/')
++          packdir = tgz;
++        else
++          packdir = fullfile (pwd(), tgz);
++        endif
++      elseif (exist (tgz, "file"))
+         ## Create a temporary directory.
+         tmpdir = tmpnam ();
+         tmpdirs{end+1} = tmpdir;
+@@ -89,20 +96,12 @@
+         if (length (dirlist) > 3)
+           error ("bundles of packages are not allowed");
+         endif
+-      endif
+ 
+-      ## The filename pointed to an uncompressed package to begin with.
+-      if (exist (tgz, "dir"))
+-        dirlist = {".", "..", tgz};
++        ## The two first entries of dirlist are "." and "..".
++        packdir = fullfile (tmpdir, dirlist{3});
+       endif
+ 
+       if (exist (tgz, "file") || exist (tgz, "dir"))
+-        ## The two first entries of dirlist are "." and "..".
+-        if (exist (tgz, "file"))
+-          packdir = fullfile (tmpdir, dirlist{3});
+-        else
+-          packdir = fullfile (pwd (), dirlist{3});
+-        endif
+         packdirs{end+1} = packdir;
+ 
+         ## Make sure the package contains necessary files.
diff --git a/sci-mathematics/octave/metadata.xml b/sci-mathematics/octave/metadata.xml
index 7778ca576576..b135f553475f 100644
--- a/sci-mathematics/octave/metadata.xml
+++ b/sci-mathematics/octave/metadata.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
-  <longdescription lang="en">
+<herd>sci-mathematics</herd>
+<longdescription lang="en">
   Octave is a high-level language, primarily intended for numerical
   computations.  It provides a convenient command line interface for
   solving linear and nonlinear problems numerically, and for performing
   other numerical experiments.  It may also be used as a batch-oriented
   language.
 </longdescription>
-  <use>
-    <flag name="glpk">Add support for <pkg>sci-libs/glpk</pkg> for linear programming</flag>
-    <flag name="gui">Enable the graphical user interface</flag>
-    <flag name="jit">(EXPERIMENTAL) enable JIT compiler</flag>
-    <flag name="qhull">Add support for <pkg>sci-libs/qhull</pkg>, to allow `delaunay', `convhull', and related functions</flag>
-    <flag name="qrupdate">Add support for <pkg>sci-libs/qrupdate</pkg>for QR and Cholesky update functions</flag>
-    <flag name="sparse">Add enhanced support for sparse matrix algebra with SuiteSparse</flag>
-  </use>
+<use>
+  <flag name="glpk">Add support for <pkg>sci-libs/glpk</pkg> for linear programming</flag>
+  <flag name="gui">Enable the graphical user interface</flag>
+  <flag name="jit">(EXPERIMENTAL) enable JIT compiler</flag>
+  <flag name="qhull">Add support for <pkg>sci-libs/qhull</pkg>, to allow `delaunay', `convhull', and related functions</flag>
+  <flag name="qrupdate">Add support for <pkg>sci-libs/qrupdate</pkg>for QR and Cholesky update functions</flag>
+  <flag name="sparse">Add enhanced support for sparse matrix algebra with SuiteSparse</flag>
+</use>
 </pkgmetadata>
diff --git a/sci-mathematics/octave/octave-3.8.0.ebuild b/sci-mathematics/octave/octave-3.8.1-r1.ebuild
index 69159fb59d6c..5f4222767f65 100644
--- a/sci-mathematics/octave/octave-3.8.0.ebuild
+++ b/sci-mathematics/octave/octave-3.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.0.ebuild,v 1.9 2014/03/06 15:51:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.1-r1.ebuild,v 1.1 2014/04/15 22:42:34 bicatali Exp $
 
 EAPI=5
 
@@ -15,47 +15,48 @@ HOMEPAGE="http://www.octave.org/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot hdf5 +imagemagick java jit opengl postscript
-	+qhull +qrupdate readline +sparse static-libs X zlib"
+IUSE="curl doc fftw +glpk gnuplot gui hdf5 +imagemagick java jit opengl
+	postscript +qhull +qrupdate readline +sparse static-libs X zlib"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-text/ghostscript-gpl
-	dev-libs/libpcre
-	sys-libs/ncurses
-	jit? ( sys-devel/llvm )
+	dev-libs/libpcre:3=
+	sys-libs/ncurses:5=
 	virtual/lapack
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0 )
-	glpk? ( sci-mathematics/glpk )
+	curl? ( net-misc/curl:0= )
+	fftw? ( sci-libs/fftw:3.0= )
+	glpk? ( sci-mathematics/glpk:0= )
 	gnuplot? ( sci-visualization/gnuplot )
-	hdf5? ( sci-libs/hdf5 )
+	gui? ( x11-libs/qscintilla:0= )
+	hdf5? ( sci-libs/hdf5:0= )
 	imagemagick? ( || (
-			media-gfx/graphicsmagick[cxx]
-			media-gfx/imagemagick[cxx] ) )
+			media-gfx/graphicsmagick:0=[cxx]
+			media-gfx/imagemagick:0=[cxx] ) )
+	jit? ( sys-devel/llvm )
 	opengl? (
-		media-libs/freetype:2
-		media-libs/fontconfig
-		>=x11-libs/fltk-1.3:1[opengl]
-		x11-libs/gl2ps
+		media-libs/freetype:2=
+		media-libs/fontconfig:1.0=
+		>=x11-libs/fltk-1.3:1=[opengl]
+		x11-libs/gl2ps:0=
 		virtual/glu )
 	postscript? (
 		app-text/epstool
 		media-gfx/pstoedit
 		media-gfx/transfig )
-	qhull? ( media-libs/qhull )
-	qrupdate? ( sci-libs/qrupdate )
-	readline? ( sys-libs/readline )
+	qhull? ( media-libs/qhull:0= )
+	qrupdate? ( sci-libs/qrupdate:0= )
+	readline? ( sys-libs/readline:0= )
 	sparse? (
-		sci-libs/arpack
-		sci-libs/camd
-		sci-libs/ccolamd
-		sci-libs/cholmod
-		sci-libs/colamd
-		sci-libs/cxsparse
-		sci-libs/umfpack )
-	X? ( x11-libs/libX11 )
-	zlib? ( sys-libs/zlib )"
+		sci-libs/arpack:0=
+		sci-libs/camd:0=
+		sci-libs/ccolamd:0=
+		sci-libs/cholmod:0=
+		sci-libs/colamd:0=
+		sci-libs/cxsparse:0=
+		sci-libs/umfpack:0= )
+	X? ( x11-libs/libX11:0= )
+	zlib? ( sys-libs/zlib:0= )"
 
 DEPEND="${RDEPEND}
 	qrupdate? ( app-misc/pax-utils )
@@ -69,74 +70,62 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.8.0-pkgbuilddir.patch
 	"${FILESDIR}"/${PN}-3.4.3-texi.patch
+	"${FILESDIR}"/${PN}-3.8.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
 	"${FILESDIR}"/${PN}-3.8.0-imagemagick-configure.patch
-	"${FILESDIR}"/${PN}-3.8.0-imagemagick.patch
-	"${FILESDIR}"/${PN}-3.8.0-fix-compile.patch
 	"${FILESDIR}"/${PN}-3.8.0-llvm-configure.patch
-	"${FILESDIR}"/${PN}-3.8.0-JIT-64-bit-indexing.patch
-	"${FILESDIR}"/${PN}-3.8.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
-	"${FILESDIR}"/${PN}-3.8.0-avoid-gui-sigsegv-if-curl-is-not-available.patch
+	"${FILESDIR}"/${PN}-3.8.1-imagemagick.patch
+	"${FILESDIR}"/${PN}-3.8.1-pkgbuilddir.patch
 )
 
 pkg_pretend() {
+	# do we really need this test? it looks a deficiency of our framework
 	if use qrupdate || use sparse; then
-		local blaslib=$(pkg-config --libs-only-l blas | sed -e 's@-l\([^ \t]*\)@lib\1@' | cut -d' ' -f 1)
-		einfo "Checking dependencies are built with the same blas lib = ${blaslib}"
-		local usr_lib="${ROOT}usr/$(get_libdir)"
-		local libs=( )
-		use qrupdate && libs+=( "${usr_lib}"/libqrupdate.so )
+		local blaslib=$($(tc-getPKG_CONFIG) --libs-only-l blas \
+			| sed -e 's@-l\([^ \t]*\)@lib\1@' | cut -d' ' -f 1)
+		einfo "Checking linear algebra dependencies for ${blaslib}"
+		local libdir="${EROOT%/}/usr/$(get_libdir)"
+		local lib failed_libs libs=( )
+		use qrupdate && libs+=( "${libdir}"/libqrupdate.so )
 		use sparse && libs+=(
-			"${usr_lib}"/libarpack.so
-			"${usr_lib}"/libcholmod.so
-			"${usr_lib}"/libspqr.so
-			"${usr_lib}"/libumfpack.so
+			"${libdir}"/libarpack.so
+			"${libdir}"/libcholmod.so
+			"${libdir}"/libspqr.so
+			"${libdir}"/libumfpack.so
 		)
-		for i in ${libs[*]}
-		do
-			# Is it not linked with the current blas?  This check is not enough though, as
-			# earlier versions of sci-libs/cholmod were not linked with blas, while as later
-			# versions are if built with the lapack use flag.
-			scanelf -n ${i} | grep -q "${blaslib}"
-			if [[ $? -ne 0 ]]; then
-				# Does it appear to be linked with some blas or lapack library?
-				scanelf -n ${i} | egrep -q "blas|lapack"
-				if [[ $? -eq 0 ]]; then
-					eerror "*******************************************************************************"
-					eerror "${i} must be rebuilt with ${blaslib}"
-					eerror ""
-					eerror "To check the libaries ${i} is currently built with:"
-					eerror ""
-					eerror "scanelf -n ${i}"
-					eerror ""
-					eerror "To find the package that needs to be rebuilt:"
-					eerror ""
-					eerror "equery belongs ${i}"
-					eerror "*******************************************************************************"
-					die
+		for lib in ${libs[@]}; do
+			# linked with the current blas?
+			if ! scanelf -n ${lib} | grep -q "${blaslib}"; then
+				# linked with some blas or lapack library?
+				if ! scanelf -n ${lib} | egrep -q "blas|lapack"; then
+					failed_libs="${failed_libs} ${lib}"
 				fi
 			fi
 		done
+		if [[ -n ${failed_libs} ]]; then
+			eerror "${failed_libs} must be rebuilt with ${blaslib}"
+			eerror "Try re-installing ${failed_libs}"
+			die "check of blas/lapack consistency failed"
+		fi
 	fi
+
 }
 
 src_prepare() {
-	# nasty prefix hack for fltk:1 linking
-	if use prefix && use opengl; then
-		sed -i \
-			-e "s:ldflags\`:ldflags\` -Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/fltk-1:" \
-			configure.ac
+	# nasty prefix hacks for fltk:1 and qt4 linking
+	if use prefix; then
+		use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
+		use gui && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/qt4"
 	fi
-	if has_version ">=sys-devel/llvm-3.4"; then
+
+	has_version ">=sys-devel/llvm-3.4" && \
 		epatch "${FILESDIR}"/${PN}-3.8.0-llvm-3.4.patch
-	fi
-	# Fix bug 501756 - sci-mathematics/octave-3.8.0 LC_ALL=et_EE - octave.cc:485:56:
-	# error: 'Fallow_noninteger_range_as_index' was not declared in this scope
-	sed -e 's@A-Za-z0-9@[:alnum:]@g' \
+
+	# Fix bug 501756
+	sed -i \
+		-e 's@A-Za-z0-9@[:alnum:]@g' \
 		-e 's@A-Za-z@[:alpha:]@g' \
-		-i "${S}/libinterp/mkbuiltins" \
-		|| die "Could not patch ${S}/libinterp/mkbuiltins for some non-English locales"
+		libinterp/mkbuiltins || die
 	autotools-utils_src_prepare
 }
 
@@ -154,7 +143,7 @@ src_configure() {
 		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
 		$(use_enable doc docs)
 		$(use_enable java)
-		$(use_enable opengl gui)
+		$(use_enable gui)
 		$(use_enable jit)
 		$(use_enable readline)
 		$(use_with curl)
@@ -198,7 +187,8 @@ src_install() {
 	autotools-utils_src_install
 	use doc && dodoc $(find doc -name \*.pdf)
 	[[ -e test/fntests.log ]] && dodoc test/fntests.log
-	use java && java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar"
+	use java && \
+		java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar"
 	echo "LDPATH=${EROOT}usr/$(get_libdir)/${PN}/${PV}" > 99octave
 	doenvd 99octave
 }
diff --git a/sci-mathematics/octave/octave-3.8.1_rc4-r1.ebuild b/sci-mathematics/octave/octave-3.8.1_rc4-r1.ebuild
deleted file mode 100644
index 8169bad80008..000000000000
--- a/sci-mathematics/octave/octave-3.8.1_rc4-r1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.1_rc4-r1.ebuild,v 1.3 2014/03/06 15:51:14 jer Exp $
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils multilib toolchain-funcs fortran-2 flag-o-matic java-pkg-opt-2 pax-utils
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-level interactive language for numerical computations"
-LICENSE="GPL-3"
-HOMEPAGE="http://www.octave.org/"
-SRC_URI="mirror://gnu-alpha/octave/${MY_P}.tar.gz"
-
-SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 +imagemagick java jit opengl postscript
-	+qhull +qrupdate readline +sparse static-libs X zlib"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-text/ghostscript-gpl
-	dev-libs/libpcre
-	sys-libs/ncurses
-	jit? ( sys-devel/llvm )
-	virtual/lapack
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0 )
-	glpk? ( sci-mathematics/glpk )
-	gnuplot? ( sci-visualization/gnuplot )
-	gui? ( x11-libs/qscintilla )
-	hdf5? ( sci-libs/hdf5 )
-	imagemagick? ( || (
-			media-gfx/graphicsmagick[cxx]
-			media-gfx/imagemagick[cxx] ) )
-	opengl? (
-		media-libs/freetype:2
-		media-libs/fontconfig
-		>=x11-libs/fltk-1.3:1[opengl]
-		x11-libs/gl2ps
-		virtual/glu )
-	postscript? (
-		app-text/epstool
-		media-gfx/pstoedit
-		media-gfx/transfig )
-	qhull? ( media-libs/qhull )
-	qrupdate? ( sci-libs/qrupdate )
-	readline? ( sys-libs/readline )
-	sparse? (
-		sci-libs/arpack
-		sci-libs/camd
-		sci-libs/ccolamd
-		sci-libs/cholmod
-		sci-libs/colamd
-		sci-libs/cxsparse
-		sci-libs/umfpack )
-	X? ( x11-libs/libX11 )
-	zlib? ( sys-libs/zlib )"
-
-DEPEND="${RDEPEND}
-	qrupdate? ( app-misc/pax-utils )
-	sparse? ( app-misc/pax-utils )
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-genericrecommended
-		dev-texlive/texlive-metapost
-		sys-apps/texinfo )
-	dev-util/gperf
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.8.0-pkgbuilddir.patch
-	"${FILESDIR}"/${PN}-3.4.3-texi.patch
-	"${FILESDIR}"/${PN}-3.8.0-imagemagick-configure.patch
-	"${FILESDIR}"/${PN}-3.8.0-imagemagick.patch
-	"${FILESDIR}"/${PN}-3.8.0-llvm-configure.patch
-	"${FILESDIR}"/${PN}-3.8.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if use qrupdate || use sparse; then
-		local blaslib=$($(tc-getPKG_CONFIG) --libs-only-l blas | sed -e 's@-l\([^ \t]*\)@lib\1@' | cut -d' ' -f 1)
-		einfo "Checking dependencies are built with the same blas lib = ${blaslib}"
-		local usr_lib="${ROOT}usr/$(get_libdir)"
-		local libs=( )
-		use qrupdate && libs+=( "${usr_lib}"/libqrupdate.so )
-		use sparse && libs+=(
-			"${usr_lib}"/libarpack.so
-			"${usr_lib}"/libcholmod.so
-			"${usr_lib}"/libspqr.so
-			"${usr_lib}"/libumfpack.so
-		)
-		for i in ${libs[*]}
-		do
-			# Is it not linked with the current blas?  This check is not enough though, as
-			# earlier versions of sci-libs/cholmod were not linked with blas, while as later
-			# versions are if built with the lapack use flag.
-			scanelf -n ${i} | grep -q "${blaslib}"
-			if [[ $? -ne 0 ]]; then
-				# Does it appear to be linked with some blas or lapack library?
-				scanelf -n ${i} | egrep -q "blas|lapack"
-				if [[ $? -eq 0 ]]; then
-					eerror "*******************************************************************************"
-					eerror "${i} must be rebuilt with ${blaslib}"
-					eerror ""
-					eerror "To check the libaries ${i} is currently built with:"
-					eerror ""
-					eerror "scanelf -n ${i}"
-					eerror ""
-					eerror "To find the package that needs to be rebuilt:"
-					eerror ""
-					eerror "equery belongs ${i}"
-					eerror "*******************************************************************************"
-					die
-				fi
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	# nasty prefix hack for fltk:1 linking
-	if use prefix && use opengl; then
-		sed -i \
-			-e "s:ldflags\`:ldflags\` -Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/fltk-1:" \
-			configure.ac
-	fi
-	if has_version ">=sys-devel/llvm-3.4"; then
-		epatch "${FILESDIR}"/${PN}-3.8.0-llvm-3.4.patch
-	fi
-	# Fix bug 501756 - sci-mathematics/octave-3.8.0 LC_ALL=et_EE - octave.cc:485:56:
-	# error: 'Fallow_noninteger_range_as_index' was not declared in this scope
-	sed -e 's@A-Za-z0-9@[:alnum:]@g' \
-		-e 's@A-Za-z@[:alpha:]@g' \
-		-i "${S}/libinterp/mkbuiltins" \
-		|| die "Could not patch ${S}/libinterp/mkbuiltins for some non-English locales"
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# occasional fail on install, force regeneration (bug #401189)
-	rm doc/interpreter/contributors.texi || die
-
-	# unfortunate dependency on mpi from hdf5 (bug #302621)
-	use hdf5 && has_version sci-libs/hdf5[mpi] && \
-		export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
-
-	local myeconfargs=(
-		--localstatedir="${EPREFIX}/var/state/octave"
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
-		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
-		$(use_enable doc docs)
-		$(use_enable java)
-		$(use_enable gui gui)
-		$(use_enable jit)
-		$(use_enable readline)
-		$(use_with curl)
-		$(use_with fftw fftw3)
-		$(use_with fftw fftw3f)
-		$(use_enable fftw fftw-threads)
-		$(use_with glpk)
-		$(use_with hdf5)
-		$(use_with opengl)
-		$(use_with qhull)
-		$(use_with qrupdate)
-		$(use_with sparse arpack)
-		$(use_with sparse umfpack)
-		$(use_with sparse colamd)
-		$(use_with sparse ccolamd)
-		$(use_with sparse cholmod)
-		$(use_with sparse cxsparse)
-		$(use_with X x)
-		$(use_with zlib z)
-	)
-	if use imagemagick; then
-		if has_version media-gfx/graphicsmagick[cxx]; then
-			myeconfargs+=( "--with-magick=GraphicsMagick" )
-		else
-			myeconfargs+=( "--with-magick=ImageMagick" )
-		fi
-	else
-		myeconfargs+=( "--without-magick" )
-	fi
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	emake
-	if use java || use jit ; then
-		pax-mark m "${S}/src/.libs/octave-cli"
-	fi
-}
-
-src_install() {
-	autotools-utils_src_install
-	use doc && dodoc $(find doc -name \*.pdf)
-	[[ -e test/fntests.log ]] && dodoc test/fntests.log
-	use java && java-pkg_regjar "${ED}/usr/share/${PN}/${MY_PV}/m/java/octave.jar"
-	echo "LDPATH=${EROOT}usr/$(get_libdir)/${PN}/${MY_PV}" > 99octave
-	doenvd 99octave
-}
diff --git a/sci-mathematics/octave/octave-3.8.1_rc4.ebuild b/sci-mathematics/octave/octave-3.8.1_rc4.ebuild
deleted file mode 100644
index da479c16de1a..000000000000
--- a/sci-mathematics/octave/octave-3.8.1_rc4.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.1_rc4.ebuild,v 1.3 2014/03/06 15:51:14 jer Exp $
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils multilib toolchain-funcs fortran-2 flag-o-matic java-pkg-opt-2 pax-utils
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-level interactive language for numerical computations"
-LICENSE="GPL-3"
-HOMEPAGE="http://www.octave.org/"
-SRC_URI="mirror://gnu-alpha/octave/${MY_P}.tar.gz"
-
-SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot hdf5 +imagemagick java jit opengl postscript
-	+qhull +qrupdate readline +sparse static-libs X zlib"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-text/ghostscript-gpl
-	dev-libs/libpcre
-	sys-libs/ncurses
-	jit? ( sys-devel/llvm )
-	virtual/lapack
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0 )
-	glpk? ( sci-mathematics/glpk )
-	gnuplot? ( sci-visualization/gnuplot )
-	hdf5? ( sci-libs/hdf5 )
-	imagemagick? ( || (
-			media-gfx/graphicsmagick[cxx]
-			media-gfx/imagemagick[cxx] ) )
-	opengl? (
-		media-libs/freetype:2
-		media-libs/fontconfig
-		>=x11-libs/fltk-1.3:1[opengl]
-		x11-libs/gl2ps
-		virtual/glu )
-	postscript? (
-		app-text/epstool
-		media-gfx/pstoedit
-		media-gfx/transfig )
-	qhull? ( media-libs/qhull )
-	qrupdate? ( sci-libs/qrupdate )
-	readline? ( sys-libs/readline )
-	sparse? (
-		sci-libs/arpack
-		sci-libs/camd
-		sci-libs/ccolamd
-		sci-libs/cholmod
-		sci-libs/colamd
-		sci-libs/cxsparse
-		sci-libs/umfpack )
-	X? ( x11-libs/libX11 )
-	zlib? ( sys-libs/zlib )"
-
-DEPEND="${RDEPEND}
-	qrupdate? ( app-misc/pax-utils )
-	sparse? ( app-misc/pax-utils )
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-genericrecommended
-		dev-texlive/texlive-metapost
-		sys-apps/texinfo )
-	dev-util/gperf
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.8.0-pkgbuilddir.patch
-	"${FILESDIR}"/${PN}-3.4.3-texi.patch
-	"${FILESDIR}"/${PN}-3.8.0-imagemagick-configure.patch
-	"${FILESDIR}"/${PN}-3.8.0-imagemagick.patch
-	"${FILESDIR}"/${PN}-3.8.0-llvm-configure.patch
-	"${FILESDIR}"/${PN}-3.8.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if use qrupdate || use sparse; then
-		local blaslib=$($(tc-getPKG_CONFIG) --libs-only-l blas | sed -e 's@-l\([^ \t]*\)@lib\1@' | cut -d' ' -f 1)
-		einfo "Checking dependencies are built with the same blas lib = ${blaslib}"
-		local usr_lib="${ROOT}usr/$(get_libdir)"
-		local libs=( )
-		use qrupdate && libs+=( "${usr_lib}"/libqrupdate.so )
-		use sparse && libs+=(
-			"${usr_lib}"/libarpack.so
-			"${usr_lib}"/libcholmod.so
-			"${usr_lib}"/libspqr.so
-			"${usr_lib}"/libumfpack.so
-		)
-		for i in ${libs[*]}
-		do
-			# Is it not linked with the current blas?  This check is not enough though, as
-			# earlier versions of sci-libs/cholmod were not linked with blas, while as later
-			# versions are if built with the lapack use flag.
-			scanelf -n ${i} | grep -q "${blaslib}"
-			if [[ $? -ne 0 ]]; then
-				# Does it appear to be linked with some blas or lapack library?
-				scanelf -n ${i} | egrep -q "blas|lapack"
-				if [[ $? -eq 0 ]]; then
-					eerror "*******************************************************************************"
-					eerror "${i} must be rebuilt with ${blaslib}"
-					eerror ""
-					eerror "To check the libaries ${i} is currently built with:"
-					eerror ""
-					eerror "scanelf -n ${i}"
-					eerror ""
-					eerror "To find the package that needs to be rebuilt:"
-					eerror ""
-					eerror "equery belongs ${i}"
-					eerror "*******************************************************************************"
-					die
-				fi
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	# nasty prefix hack for fltk:1 linking
-	if use prefix && use opengl; then
-		sed -i \
-			-e "s:ldflags\`:ldflags\` -Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/fltk-1:" \
-			configure.ac
-	fi
-	if has_version ">=sys-devel/llvm-3.4"; then
-		epatch "${FILESDIR}"/${PN}-3.8.0-llvm-3.4.patch
-	fi
-	# Fix bug 501756 - sci-mathematics/octave-3.8.0 LC_ALL=et_EE - octave.cc:485:56:
-	# error: 'Fallow_noninteger_range_as_index' was not declared in this scope
-	sed -e 's@A-Za-z0-9@[:alnum:]@g' \
-		-e 's@A-Za-z@[:alpha:]@g' \
-		-i "${S}/libinterp/mkbuiltins" \
-		|| die "Could not patch ${S}/libinterp/mkbuiltins for some non-English locales"
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# occasional fail on install, force regeneration (bug #401189)
-	rm doc/interpreter/contributors.texi || die
-
-	# unfortunate dependency on mpi from hdf5 (bug #302621)
-	use hdf5 && has_version sci-libs/hdf5[mpi] && \
-		export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
-
-	local myeconfargs=(
-		--localstatedir="${EPREFIX}/var/state/octave"
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
-		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
-		$(use_enable doc docs)
-		$(use_enable java)
-		$(use_enable opengl gui)
-		$(use_enable jit)
-		$(use_enable readline)
-		$(use_with curl)
-		$(use_with fftw fftw3)
-		$(use_with fftw fftw3f)
-		$(use_enable fftw fftw-threads)
-		$(use_with glpk)
-		$(use_with hdf5)
-		$(use_with opengl)
-		$(use_with qhull)
-		$(use_with qrupdate)
-		$(use_with sparse arpack)
-		$(use_with sparse umfpack)
-		$(use_with sparse colamd)
-		$(use_with sparse ccolamd)
-		$(use_with sparse cholmod)
-		$(use_with sparse cxsparse)
-		$(use_with X x)
-		$(use_with zlib z)
-	)
-	if use imagemagick; then
-		if has_version media-gfx/graphicsmagick[cxx]; then
-			myeconfargs+=( "--with-magick=GraphicsMagick" )
-		else
-			myeconfargs+=( "--with-magick=ImageMagick" )
-		fi
-	else
-		myeconfargs+=( "--without-magick" )
-	fi
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	emake
-	if use java || use jit ; then
-		pax-mark m "${S}/src/.libs/octave-cli"
-	fi
-}
-
-src_install() {
-	autotools-utils_src_install
-	use doc && dodoc $(find doc -name \*.pdf)
-	[[ -e test/fntests.log ]] && dodoc test/fntests.log
-	use java && java-pkg_regjar "${ED}/usr/share/${PN}/${MY_PV}/m/java/octave.jar"
-	echo "LDPATH=${EROOT}usr/$(get_libdir)/${PN}/${MY_PV}" > 99octave
-	doenvd 99octave
-}