diff options
Diffstat (limited to 'sci-mathematics/octave')
16 files changed, 3 insertions, 1074 deletions
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest index 0c203194367b..ba001605187c 100644 --- a/sci-mathematics/octave/Manifest +++ b/sci-mathematics/octave/Manifest @@ -1,24 +1,7 @@ AUX octave-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch 199 BLAKE2B 36c7f66c0fba3387dcbc027dc60370f1526e0f5bd42c4a24ed031745f6fdf6ff3860909dc2462b6577db30b8b47ec301299ccd3584fbb99d1b1b205c8f46e0b6 SHA512 e9984fe54b7b4c49783f5f7559d24e9f1076b47ff8c0ec2751dda2e96c1f84ad48f03a760fd4d8b87fba021174237bc7f19c75ba7f33e84bce6def6318184e7d -AUX octave-4.2.0-imagemagick.patch 5945 BLAKE2B 44898e339d9f26ed776839365f0719414216f40a275a000b9dfef879d17ac26318ca6b10cc96c485f860dcc335f4b7820e4bcf95da704326a2c8bb44b265dec9 SHA512 061c941cd23a3565f35c70bfaf0db23ea62f70e8943794216b00cb1d8ced201859f98eae5aba5f566627a301745691b53aa6a62cf9bfc0ee9d99159859ceb593 -AUX octave-4.2.0-pkgbuilddir.patch 1346 BLAKE2B 38b3e3ea90e7e5f381cf75e7becad83c92dd4d8be07e30ca82e54f7811fbf42d83872059c5bab1af884d5f5e70c4826c119ed69286d07338d017335e68922969 SHA512 7dc10b4d27aa0fb4443dffaa28c84843d9c233172eb1c7b7d93d196434ea7db9c330b3152def21829e483ab3765423927e70718ca0662ae7aeba3a1a8540fa19 -AUX octave-4.2.0-texi.patch 557 BLAKE2B bb79b2b56975feaa60e1dd0f6811cf7e11ab7080c88cc9103373a6bb0066c99e09a02b9651cf0317c0c19c31584fe68ba9c8796217c8e3aad316cda9ef3fb745 SHA512 1d4a6ce92ffde0945858b605cb37ed7c91abca201dd2c7f0d974852ef65c59e638a91aa219612c7acf9b46a0743a4a5e0ccbe590a8a056efd0d9d3293928c56a -AUX octave-4.2.0-zlib-underlinking.patch 275 BLAKE2B a6353807c2c672b80ce5a015c5650cf017443bd92256ceb39d855e22bb9f20431c1837fa1e4fff1b4f547ff12da4fa85e6e1e49e5c350a9e5e7910de73c63b6b SHA512 093b13ad457e290d746908a5de1855071b2cd27b4c08101826d32fcf63398e863c3b72bb81f19255a04a880a2bf49e3ced1141bf7d0044db1328c6f2c9492f66 -AUX octave-4.2.2-fix-qscintilla-detection.patch 452 BLAKE2B bed48bf923cbfba50c50fdadfc807da0e199e2e7160f2a3078ba13fb58c123ecada0510ba8dd101f7772c7164533ff2aeb0841484ce41a86d27761b2e39e7fb0 SHA512 f5dd5a349dbdb36cba718ed378609f73090a32ce40240f002312539820538a30039c550c8b78493f3dca9e5f5eda8858c2e97afd313052d40d47d3edf08f1e80 -AUX octave-4.2.2-imagemagick-configure.patch 873 BLAKE2B 9de92c88f83c56d521f83df7672e71bc9398ad782004339c737d2991d85154cc1cf2c3d5fe912892c87b18f51af6b11d4b8fadcc5ed058b76cfa604b93aaa720 SHA512 582df053f6c14790461408a180ce66589bd6501e3f9ecdc126b2cf12e8044198dff6eb66904b7704f87cba46adaabbac3126e46c61e406debe8cca49b935f93d AUX octave-4.2.2-ncurses-pkgconfig.patch 1034 BLAKE2B 244a96ab7cfd47203e7d23774c52f54e105f209edf79c869e6ce253a9cec7a3373a8dd0c98196ba3271f9b2b066ad3de3784151072055f2319ebbb4d1b68a475 SHA512 d2d6fe57a11f0493f86378bc4e1fc71378ae6d1878d17a367b77aa16a29880e37134e61343ba081f7ab2c4d127d93611491bef1320d6cd202eff0d78681cd4cc -AUX octave-4.4.0-imagemagick-configure.patch 862 BLAKE2B 46e5b0ab1f7e2fd261b012bebc7a21789df102f0467e93c72c02a0615dc05fce4def0dc26aabdd0d10922e51f53b93f57d15b71a983b0ebcb3c23a900f692c49 SHA512 17fe3cfdcfdde0caaedf7983f46f286cc7c66b39b7f696527cb8d217af7d9d63a4de26f798afb8a189b351c509c958ecfbab925f927449f97ae763fed750cd51 -AUX octave-4.4.0-imagemagick.patch 850 BLAKE2B d6779333b449150299608f07d3d8a2fbce2dea1c9db7f1e04f9407ab570216e323795aeaa2964b32747f33e49d707fbea069e7dd4a438440eee4731771707125 SHA512 94d9743e2029f46e842a73ebb6315f85c5f6b0a71b797a0e43ac0f81abeccd8683d2cb84f858730c3ce40b3130012d659f571d4111f949494f6dd6bba7619477 -AUX octave-4.4.0-qt-5.11.patch 346 BLAKE2B 0e9d5a2701ca789abaf9b396e5716226ce786fe259ae84ab8cbdeeff80dcf871945e1eec5260c14525744559ee8258e96ca5e8543ab21cff27ac21723078435f SHA512 48fbd44cf0af2ecc391c18a4fdd5e0f6682998f5ab5aadf5b2f1740504b4bd40fa24c08449c4ee50d47d0307748ff7fd5a23870e6b643658583260de8b338130 AUX octave-4.4.0-texi.patch 570 BLAKE2B 83863f20e995eb4512944d6766b09a648b0d00b434f98f25db214ef6b3bcfa504d316dad984e7330ed51d972e5caec69c42797f703595a39d6acab7128270313 SHA512 e2d0390e586e001182a31a840ed6a93b4fb6ce0dd581f64460dcf3947783dd4755a8bd277f4babb6328f04cf653f02ac681952610d7eb70165936a9d79998c3f AUX octave-5.1.0-pkgbuilddir.patch 1565 BLAKE2B 7b2968139e080aaa20b5372b400ac84c1754296767834011bcdda5258e7859c48ffaedcade17e8b23e2d23635a546c6a726061e8b4679913ff5b204a26cd0ef4 SHA512 28dcebc3a904cf048cb0568591c6c55616d40f6ca80982a232489a51ec92505dca186043ee3750d8a3f3782149ef1861332a8486466fba2898f0084adf0acb90 -DIST octave-4.2.2.tar.gz 25624087 BLAKE2B c46de90d9a985c2b6b4f87b94b56f2ba4fb648ca0a0aff1f64e9b9d27a6d791e8657c2bff0c4daa3de5ac3622c23b34724e740ec1fe0f1a71d8f416c9f58d88a SHA512 b94edd79adc0e19229bb654037910201b51b6cfa373d63de5e3aa69e9b659b2e2790e2d2b4b5e8d2f12b26846c20ba5c12eae657155c8329e85e970f738d08c2 -DIST octave-4.4.0.tar.gz 29009355 BLAKE2B 3f7b4a6e1262cd0009f8649a570749acc2dc8b42aa1f88a6ce69b9c6bb99a95390f5a153c391a60ac118dc1e87f15596c7225764634c6076bb1ab3dfa4e09bcc SHA512 6a167a4a6a2f6ae70511f13b14feea0ce3efcc964227c93f3195adb3a1f1f28dda56f86a2e1c7c5e9f54891d2846fb96972092387e3da41f2e04cb700606ffc2 -DIST octave-4.4.1.tar.gz 28626462 BLAKE2B 0ea7a9b5840c7afdf20dff36e896b37c1c69eb8799ba48722c02f9636591b849f26f56720a75293c11c1000d0088e07373aa84ef7d360436eb095fc0a2e721a6 SHA512 21a1f13e2145fa530f2169254d19442b572745d65b91453ba1f552f6eda6aecfead57dbe0260b3293a29db0aa0f27cfd4f26df332e6d640848a822b20c1232f8 -DIST octave-5.1.0.tar.gz 32034788 BLAKE2B d387f41f6ae826b35735fc4208d71be84076a81544f5cd0e3d5410f41a70eebb5b0b3bbf19e4344b88901869d54f2759259dc374c44a430f681d3b0c32cb02cb SHA512 a842fb50c13f25e9d425fe9a2c71d9433d7e125747d2175efe0c9b2a780c799d9ce1ee085b5a13fbfedb7990b0ba5d11079d880ddb3bdb66782efc321390eebb DIST octave-5.2.0.tar.gz 33360285 BLAKE2B 6d53a48a7fbe929e372fd51d084c0269befd3140341f3f3a1f2cae02f9f085ed434c3336c770c9a856081197c93ee306f481dd116b958685175bc294e4db62ae SHA512 fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498 -EBUILD octave-4.2.2.ebuild 5103 BLAKE2B 690f0a397a887a26d0ad7dc31af6893af0ccafed623013d02f2f79e9683a558827e313f2c3a46b035eef754662ed26691c8b56be5cf05a5b79b41604f37635b1 SHA512 7534b737c7e9c9b56ac768b00f46c3ff79ec5362c9f73f3deda6e41776f2e4d254189c22ccae32d723481fb1c675f8bc1cd7af8783bfd6dc6c51e4ebb8e99f7f -EBUILD octave-4.4.0.ebuild 5082 BLAKE2B 8736fa239d93b6847d413e50cf75427bf16407814d5d32f55f2d8688b57fbeacb471afd2a86ec8c1f6a1c1da11882a40dd221e5eea9fdd0ad59e224c0f1e5d65 SHA512 b71030ab908c404a3672d1df9f85e2cf3aa99f4e6e968ae90a95af228912e4615e869d58efaa018a7cb1300d4630111af82bc306b3d1e56340df5dbd1065bd32 -EBUILD octave-4.4.1.ebuild 5180 BLAKE2B 495f7aa6fc5508fbe2285e5fbc8eb7a4055d84e538384487c3f535f9d5cb90bb3c0d896455d05a02878d786a0a338373380f8e955415673a625db17cc80a14fe SHA512 b26dd91d325a55a94da6eb4bba15f279f3d8c80dcecc19c53ff3d8c43c664aea45769b0f3310a38addab326bf6bc59aa6b88b2b07981d731803d82865989250d -EBUILD octave-5.1.0.ebuild 5076 BLAKE2B 6f843fc6ff0157c6e4f80aaa2f2cc056c4215483e0b62b809821e8f81234caf8be57bb9232fd305fb2bf8d4266de452b7efa20c208a23f4aa7ca4e038785adb3 SHA512 41f83b3a3431a103b10a654573a8d7cb5eb1f45b79125e15818d8f2850faccd5266ee24ee102e4bed0452ba17a3d8999ca755830fea353ada4dd973282a5b0d1 -EBUILD octave-5.2.0.ebuild 5461 BLAKE2B 6e31e77cd0ed5e8c6dd53fc8959cbfd4f89695df7545e40c3038ff7172108c2d9669d79f3af0c6e638b4f4a68703dc7faa8a77ca8f6671870c1cb3b755088450 SHA512 4b9628bdf4d55a37ed29f7b1dbde04b302f3ddccba10f3df424a1419d59d01ca16c39ef421b341a3e0434c19bba8ec5cafb8e5e191b2c9dd8c213aecffe39ac0 -MISC metadata.xml 1137 BLAKE2B 69a3d32e58fcf2f855b54664e1fb4e0f2eec69bd8522218957320a0d0f8bf67fb8d5e28f7f108d3baf7992454adef3a416d4bdae9d7b4fd2bfe77225de17a69e SHA512 7351fa4b9a696406543cda7246378e4b4df4dad3033f9a87e4c5036663fc32965c7db45d8ff32959904a9bf71cff88484b542bc3e20ea0ee946a0025c091a345 +EBUILD octave-5.2.0.ebuild 5460 BLAKE2B 42e812d4d982eaf4cfd9a08b041ef5bc46450e0c481caaa82590e93798e2b5d3df4db7ac6e06ed4e881e6dd1dc8c582d39499243894e4c837025a7af5613ac90 SHA512 1a58e2e58814ebf34e6fd698c8fffe46a73c55df4a345ba02bacca4120b23b4ac6ce18b729c1b4b949d1fabfff61ff0813393e50b25a451d9492b9ab4f504163 +MISC metadata.xml 1046 BLAKE2B 1f3b62ee1553ab0cfd1a176b5e79a49e86341cb379ee7ef95e9d0b6efc0d621c68f0f8fd2cf1ec85a351d14964d5038e373a88a713a3078e782e8e8392a6ee7f SHA512 2debc123655a81c380f212467820e464eb1e2184d542a183e07633d82fa410cc802a2a49f7071df1ae5df1a16e73b867975edb44c9cda94484732cd66454798b diff --git a/sci-mathematics/octave/files/octave-4.2.0-imagemagick.patch b/sci-mathematics/octave/files/octave-4.2.0-imagemagick.patch deleted file mode 100644 index 8fb786964c20..000000000000 --- a/sci-mathematics/octave/files/octave-4.2.0-imagemagick.patch +++ /dev/null @@ -1,139 +0,0 @@ ---- a/libinterp/corefcn/__magick_read__.cc -+++ b/libinterp/corefcn/__magick_read__.cc -@@ -39,7 +39,15 @@ - - #if defined (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: -@@ -121,6 +129,9 @@ - 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::GreenChannel) == 1 -@@ -132,6 +143,9 @@ - && img.channelDepth (Magick::OpacityChannel) == 1 - && img.channelDepth (Magick::GrayChannel) == 1) - depth = 1; -+#if defined(MagickLibVersion) && (MagickLibVersion <= 0x686) -+#undef Magick -+#endif - - return depth; - } -@@ -355,7 +369,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 -@@ -489,7 +506,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++; - } -@@ -568,7 +586,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++; - } -@@ -655,7 +674,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++; - } -@@ -732,10 +752,11 @@ - // depth is 8, there's a good chance that we will be limited. It - // is also the GraphicsMagick recommended setting and the default - // for ImageMagick. -- if (QuantumDepth < 16) -+ using namespace Magick; -+ if (MAGICKCORE_QUANTUM_DEPTH < 16) - warning_with_id ("Octave:GraphicsMagic-Quantum-Depth", - "your version of %s limits images to %d bits per pixel\n", -- MagickPackageName, QuantumDepth); -+ MagickPackageName, MAGICKCORE_QUANTUM_DEPTH); - - initialized = true; - } -@@ -1094,8 +1115,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 (); -@@ -1147,8 +1169,9 @@ - for (octave_idx_type row = 0; row < nRows; row++) - { - double grey = octave::math::round (double (*img_fvec) / divisor); -+ using namespace Magick; - Magick::Color c (grey, grey, grey, -- MaxRGB - octave::math::round (double (*a_fvec) / divisor)); -+ QuantumRange - octave::math::round (double (*a_fvec) / divisor)); - pix[GM_idx] = c; - img_fvec++; - a_fvec++; -@@ -1216,10 +1239,11 @@ - { - for (octave_idx_type row = 0; row < nRows; row++) - { -+ using namespace Magick; - Magick::Color c (octave::math::round (double (*img_fvec) / divisor), - octave::math::round (double (img_fvec[G_offset]) / divisor), - octave::math::round (double (img_fvec[B_offset]) / divisor), -- MaxRGB - octave::math::round (double (*a_fvec) / divisor)); -+ QuantumRange - octave::math::round (double (*a_fvec) / divisor)); - pix[GM_idx] = c; - img_fvec++; - a_fvec++; -@@ -1297,7 +1321,8 @@ - octave::math::round (double (img_fvec[Y_offset]) / divisor), - octave::math::round (double (img_fvec[K_offset]) / divisor)); - pix[GM_idx] = c; -- ind[GM_idx] = MaxRGB - octave::math::round (double (*a_fvec) / divisor); -+ using namespace Magick; -+ ind[GM_idx] = QuantumRange - octave::math::round (double (*a_fvec) / divisor); - img_fvec++; - a_fvec++; - GM_idx += nCols; diff --git a/sci-mathematics/octave/files/octave-4.2.0-pkgbuilddir.patch b/sci-mathematics/octave/files/octave-4.2.0-pkgbuilddir.patch deleted file mode 100644 index a72ac97c0a15..000000000000 --- a/sci-mathematics/octave/files/octave-4.2.0-pkgbuilddir.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/scripts/pkg/private/install.m -+++ b/scripts/pkg/private/install.m -@@ -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 = tempname (); - 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/files/octave-4.2.0-texi.patch b/sci-mathematics/octave/files/octave-4.2.0-texi.patch deleted file mode 100644 index 1352ff5a1f75..000000000000 --- a/sci-mathematics/octave/files/octave-4.2.0-texi.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/doc/interpreter/module.mk -+++ b/doc/interpreter/module.mk -@@ -298,6 +298,8 @@ - $(AWK) -f $(srcdir)/doc/interpreter/mkcontrib.awk $(srcdir)/doc/interpreter/contributors.in > $@-t && \ - mv $@-t $@ - -+doc/interpreter/preface.texi: doc/interpreter/contributors.texi -+ - AUTHORS: doc/interpreter/preface.texi doc/interpreter/contributors.texi | doc/interpreter/$(octave_dirstamp) - $(AM_V_MAKEINFO)rm -f $@-t $@ && \ - if [ "x$(srcdir)" != "x." ] && [ -f $(srcdir)/doc/interpreter/contributors.texi ] && [ ! -f doc/interpreter/contributors.texi ]; then \ diff --git a/sci-mathematics/octave/files/octave-4.2.0-zlib-underlinking.patch b/sci-mathematics/octave/files/octave-4.2.0-zlib-underlinking.patch deleted file mode 100644 index 0c8736069d8e..000000000000 --- a/sci-mathematics/octave/files/octave-4.2.0-zlib-underlinking.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/libinterp/corefcn/module.mk -+++ b/libinterp/corefcn/module.mk -@@ -318,6 +318,7 @@ - $(HDF5_CPPFLAGS) \ - $(LLVM_CPPFLAGS) \ - $(Z_CPPFLAGS) -+libinterp_corefcn_libcorefcn_la_LIBADD = $(Z_LIBS) - - libinterp_corefcn_libcorefcn_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS) - diff --git a/sci-mathematics/octave/files/octave-4.2.2-fix-qscintilla-detection.patch b/sci-mathematics/octave/files/octave-4.2.2-fix-qscintilla-detection.patch deleted file mode 100644 index 80fc28013239..000000000000 --- a/sci-mathematics/octave/files/octave-4.2.2-fix-qscintilla-detection.patch +++ /dev/null @@ -1,14 +0,0 @@ -In Gentoo, QScintilla for Qt5 has the same library name -as its Qt4 variant. - ---- a/m4/acinclude.m4 -+++ b/m4/acinclude.m4 -@@ -1460,7 +1460,7 @@ - ;; - 5) - QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport" -- octave_qscintilla_libnames="qscintilla2-qt5 qscintilla2_qt5 qt5scintilla2" -+ octave_qscintilla_libnames="qscintilla2_qt5 qscintilla2" - ;; - *) - AC_MSG_ERROR([Unrecognized Qt version $qt_version]) diff --git a/sci-mathematics/octave/files/octave-4.2.2-imagemagick-configure.patch b/sci-mathematics/octave/files/octave-4.2.2-imagemagick-configure.patch deleted file mode 100644 index d80c23ec4224..000000000000 --- a/sci-mathematics/octave/files/octave-4.2.2-imagemagick-configure.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -1560,11 +1560,11 @@ if test $check_magick = yes; then - MAGICK_LIBS= - - PKG_CHECK_EXISTS([$magick++], [ -- ## Make sure we only get -I, -L, and -l flags. Some Graphics/ImageMagick++ -+ ## Make sure we only get -I, -D, -L, and -l flags. Some Graphics/ImageMagick++ - ## packages add extra flags that are useful when building - ## Graphics/ImageMagick++ extentions. These extra flags break the - ## Octave build. -- MAGICK_CPPFLAGS="$($PKG_CONFIG --cflags-only-I $magick++ | $SED -e 's/^ *$//')" -+ MAGICK_CPPFLAGS="$($PKG_CONFIG --cflags-only-I $magick++ | $SED -e 's/^ *$//' | $SED -e 's/\(-@<:@DI@:>@@<:@^ \t@:>@*\)\|\(-@<:@^ \t@:>@*\)/\1/g')" - MAGICK_LDFLAGS="$($PKG_CONFIG --libs-only-L $magick++ | $SED -e 's/^ *$//')" - MAGICK_LIBS="$($PKG_CONFIG --libs-only-l $magick++ | $SED -e 's/^ *$//')" - diff --git a/sci-mathematics/octave/files/octave-4.4.0-imagemagick-configure.patch b/sci-mathematics/octave/files/octave-4.4.0-imagemagick-configure.patch deleted file mode 100644 index ce81b801d99c..000000000000 --- a/sci-mathematics/octave/files/octave-4.4.0-imagemagick-configure.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/configure.ac 2018-04-30 19:03:56.000000000 +0200 -+++ a/configure.ac.new 2018-05-22 12:23:30.371174341 +0200 -@@ -1946,11 +1946,11 @@ - MAGICK_LIBS= - - PKG_CHECK_EXISTS([$magick++], [ -- dnl Make sure we only get -I, -L, and -l flags. -+ dnl Make sure we only get -I, -D, -L, and -l flags. - dnl Some Graphics/ImageMagick++ dnl packages add extra flags that are - dnl useful when building Graphics/ImageMagick++ extentions. These extra - dnl flags break the Octave build. -- MAGICK_CPPFLAGS="$($PKG_CONFIG --cflags-only-I $magick++ | $SED -e 's/^ *$//')" -+ MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags $magick++ | sed -e 's/\(-@<:@DI@:>@@<:@^ \t@:>@*\)\|\(-@<:@^ \t@:>@*\)/\1/g'` - MAGICK_LDFLAGS="$($PKG_CONFIG --libs-only-L $magick++ | $SED -e 's/^ *$//')" - MAGICK_LIBS="$($PKG_CONFIG --libs-only-l $magick++ | $SED -e 's/^ *$//')" - diff --git a/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch b/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch deleted file mode 100644 index 2aa6e5b9d8c6..000000000000 --- a/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/libinterp/corefcn/__magick_read__.cc 2018-05-22 12:25:37.688173855 +0200 -+++ a/libinterp/corefcn/__magick_read__.cc.new 2018-05-22 12:32:51.475172200 +0200 -@@ -817,10 +817,19 @@ - // depth is 8, there's a good chance that we will be limited. It - // is also the GraphicsMagick recommended setting and the default - // for ImageMagick. -+#ifdef QuantumDepth - if (QuantumDepth < 16) -+#else -+ using namespace Magick; -+ if (MAGICKCORE_QUANTUM_DEPTH < 16) -+#endif - warning_with_id ("Octave:GraphicsMagick-Quantum-Depth", - "your version of %s limits images to %d bits per pixel\n", -+#ifdef QuantumDepth - MagickPackageName, QuantumDepth); -+#else -+ MagickPackageName, MAGICKCORE_QUANTUM_DEPTH); -+#endif - - initialized = true; - } diff --git a/sci-mathematics/octave/files/octave-4.4.0-qt-5.11.patch b/sci-mathematics/octave/files/octave-4.4.0-qt-5.11.patch deleted file mode 100644 index 70ffbb471992..000000000000 --- a/sci-mathematics/octave/files/octave-4.4.0-qt-5.11.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- octave-4.4.0-orig/libgui/src/settings-dialog.cc 2018-05-01 03:03:56.000000000 +1000 -+++ octave-4.4.0/libgui/src/settings-dialog.cc 2018-07-03 19:35:41.865149269 +1000 -@@ -41,6 +41,7 @@ - #include <QHash> - #include <QMessageBox> - #include <QTextCodec> -+#include <QButtonGroup> - - #if defined (HAVE_QSCINTILLA) - # include "octave-qscintilla.h" diff --git a/sci-mathematics/octave/metadata.xml b/sci-mathematics/octave/metadata.xml index 54f7c4586ad3..619b5f255ad1 100644 --- a/sci-mathematics/octave/metadata.xml +++ b/sci-mathematics/octave/metadata.xml @@ -10,7 +10,6 @@ </longdescription> <use> <flag name="glpk">Add support for <pkg>sci-mathematics/glpk</pkg> for linear programming</flag> - <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> for low level hash functions</flag> <flag name="qhull">Add support for <pkg>media-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> diff --git a/sci-mathematics/octave/octave-4.2.2.ebuild b/sci-mathematics/octave/octave-4.2.2.ebuild deleted file mode 100644 index 8600b40098fd..000000000000 --- a/sci-mathematics/octave/octave-4.2.2.ebuild +++ /dev/null @@ -1,191 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic fortran-2 gnome2-utils java-pkg-opt-2 pax-utils toolchain-funcs xdg-utils - -DESCRIPTION="High-level interactive language for numerical computations" -LICENSE="GPL-3" -HOMEPAGE="https://www.gnu.org/software/octave/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -SLOT="0/${PV}" -IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl openssl - portaudio postscript +qhull +qrupdate readline sndfile +sparse static-libs X zlib" -KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - app-arch/bzip2 - app-text/ghostscript-gpl - dev-libs/libpcre:3= - sys-libs/ncurses:0= - sys-libs/zlib - virtual/blas - virtual/lapack - curl? ( net-misc/curl:0= ) - fftw? ( sci-libs/fftw:3.0= ) - glpk? ( sci-mathematics/glpk:0= ) - gnuplot? ( sci-visualization/gnuplot ) - gui? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - >=x11-libs/qscintilla-2.9.3-r2:=[qt5(+)] - ) - hdf5? ( sci-libs/hdf5:0= ) - imagemagick? ( - !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) - graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) - ) - java? ( >=virtual/jre-1.6.0:* ) - opengl? ( - media-libs/freetype:2= - media-libs/fontconfig:1.0= - virtual/glu - >=x11-libs/fltk-1.3:1=[opengl,xft] - x11-libs/gl2ps:0= - ) - openssl? ( dev-libs/openssl:0= ) - portaudio? ( media-libs/portaudio ) - postscript? ( - app-text/epstool - media-gfx/pstoedit - media-gfx/transfig - ) - qhull? ( media-libs/qhull:0= ) - qrupdate? ( sci-libs/qrupdate:0= ) - readline? ( sys-libs/readline:0= ) - sndfile? ( media-libs/libsndfile ) - sparse? ( - 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= )" -DEPEND="${RDEPEND} - dev-util/gperf - sys-apps/texinfo - virtual/pkgconfig - doc? ( - dev-texlive/texlive-fontsrecommended - dev-texlive/texlive-plaingeneric - dev-texlive/texlive-metapost - virtual/latex-base - ) - gui? ( dev-qt/linguist-tools:5 ) - java? ( >=virtual/jdk-1.6.0 ) - qrupdate? ( app-misc/pax-utils ) - sparse? ( app-misc/pax-utils )" - -PATCHES=( - "${FILESDIR}"/${PN}-4.2.0-texi.patch - "${FILESDIR}"/${PN}-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch - "${FILESDIR}"/${P}-imagemagick-configure.patch - "${FILESDIR}"/${PN}-4.2.0-imagemagick.patch - "${FILESDIR}"/${PN}-4.2.0-pkgbuilddir.patch - "${FILESDIR}"/${P}-ncurses-pkgconfig.patch - "${FILESDIR}"/${PN}-4.2.0-zlib-underlinking.patch - "${FILESDIR}"/${P}-fix-qscintilla-detection.patch - "${FILESDIR}"/${PN}-4.4.0-qt-5.11.patch -) - -src_prepare() { - # nasty prefix hacks for fltk:1 linking - if use prefix; then - use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1" - fi - - # occasional fail on install, force regeneration (bug #401189) - rm doc/interpreter/contributors.texi || die - - default - eautoreconf -} - -src_configure() { - # [QA] detect underlinking #593670 - append-ldflags $(test-flags-CXX -Wl,-z,defs) - - # 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 - - econf \ - --localstatedir="${EPREFIX}/var/state/octave" \ - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ - --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \ - --disable-64 \ - --disable-jit \ - --enable-shared \ - --with-z \ - --with-bz2 \ - --without-OSMesa \ - $(use_enable static-libs static) \ - $(use_enable doc docs) \ - $(use_enable java) \ - $(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 imagemagick magick $(usex graphicsmagick GraphicsMagick ImageMagick)) \ - $(use_with opengl) \ - $(use_with opengl fltk) \ - $(use_with openssl) \ - $(use_with portaudio) \ - $(use_with qhull) \ - $(use_with qrupdate) \ - $(use_with gui qt 5) \ - $(use_with sndfile) \ - $(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) -} - -src_compile() { - export VARTEXFONTS="${T}/fonts" # otherwise it will write to /var/cache/fonts/ and trip sandbox - default - if use java; then - pax-mark m "${S}/src/.libs/octave-cli" - fi -} - -src_install() { - default - if use doc; then - dodoc $(find doc -name '*.pdf') - else - # bug 566134, macros.texi is installed by make install if use doc - insinto /usr/share/${PN}/${PV}/etc - doins doc/interpreter/macros.texi - fi - [[ -e test/fntests.log ]] && dodoc test/fntests.log - use java && \ - java-pkg_regjar "${ED%/}/usr/share/${PN}/${PV}/m/java/octave.jar" - echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die - doenvd 99octave -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/sci-mathematics/octave/octave-4.4.0.ebuild b/sci-mathematics/octave/octave-4.4.0.ebuild deleted file mode 100644 index 692b5029491b..000000000000 --- a/sci-mathematics/octave/octave-4.4.0.ebuild +++ /dev/null @@ -1,195 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic fortran-2 gnome2-utils java-pkg-opt-2 pax-utils toolchain-funcs xdg-utils - -DESCRIPTION="High-level interactive language for numerical computations" -LICENSE="GPL-3" -HOMEPAGE="https://www.gnu.org/software/octave/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -SLOT="0/${PV}" -IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java libressl opengl - portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl static-libs X zlib" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - app-arch/bzip2 - app-text/ghostscript-gpl - dev-libs/libpcre:3= - sys-libs/ncurses:0= - sys-libs/zlib - virtual/blas - virtual/lapack - curl? ( net-misc/curl:0= ) - fftw? ( sci-libs/fftw:3.0= ) - glpk? ( sci-mathematics/glpk:0= ) - gnuplot? ( sci-visualization/gnuplot ) - gui? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qthelp:5 - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - x11-libs/qscintilla:= - ) - hdf5? ( sci-libs/hdf5:0= ) - imagemagick? ( - !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) - graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) - ) - java? ( >=virtual/jre-1.6.0:* ) - opengl? ( - media-libs/freetype:2= - media-libs/fontconfig:1.0= - virtual/glu - >=x11-libs/fltk-1.3:1=[opengl,xft] - x11-libs/gl2ps:0= - ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - portaudio? ( media-libs/portaudio ) - postscript? ( - app-text/epstool - media-gfx/pstoedit - media-gfx/transfig - ) - qhull? ( media-libs/qhull:0= ) - qrupdate? ( sci-libs/qrupdate:0= ) - readline? ( sys-libs/readline:0= ) - sndfile? ( media-libs/libsndfile ) - sparse? ( - 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= )" -DEPEND="${RDEPEND} - dev-util/gperf - sys-apps/texinfo - virtual/pkgconfig - doc? ( - dev-texlive/texlive-fontsrecommended - dev-texlive/texlive-plaingeneric - dev-texlive/texlive-metapost - virtual/latex-base - ) - gui? ( dev-qt/linguist-tools:5 ) - java? ( >=virtual/jdk-1.6.0 ) - qrupdate? ( app-misc/pax-utils ) - sparse? ( app-misc/pax-utils )" - -PATCHES=( - "${FILESDIR}"/${PN}-4.4.0-texi.patch - "${FILESDIR}"/${PN}-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch - "${FILESDIR}"/${PN}-4.4.0-imagemagick-configure.patch - "${FILESDIR}"/${PN}-4.4.0-imagemagick.patch - "${FILESDIR}"/${PN}-4.2.0-pkgbuilddir.patch - "${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch - "${FILESDIR}"/${PN}-4.2.0-zlib-underlinking.patch - "${FILESDIR}"/${PN}-4.4.0-qt-5.11.patch -) - -src_prepare() { - # nasty prefix hacks for fltk:1 linking - if use prefix; then - use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1" - fi - - # occasional fail on install, force regeneration (bug #401189) - rm doc/interpreter/contributors.texi || die - - default - eautoreconf -} - -src_configure() { - # [QA] detect underlinking #593670 - append-ldflags $(test-flags-CXX -Wl,-z,defs) - - # 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 - - econf \ - --localstatedir="${EPREFIX}/var/state/octave" \ - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ - --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \ - --disable-64 \ - --disable-jit \ - --enable-shared \ - --with-z \ - --with-bz2 \ - --without-OSMesa \ - $(use_enable static-libs static) \ - $(use_enable doc docs) \ - $(use_enable java) \ - $(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 imagemagick magick $(usex graphicsmagick GraphicsMagick ImageMagick)) \ - $(use_with opengl) \ - $(use_with opengl fltk) \ - $(use_with ssl openssl) \ - $(use_with portaudio) \ - $(use_with qhull) \ - $(use_with qrupdate) \ - $(use_with gui qt 5) \ - $(use_with sndfile) \ - $(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) -} - -src_compile() { - default - if use java; then - pax-mark m "${S}/src/.libs/octave-cli" - fi -} - -src_install() { - default - if use doc; then - dodoc $(find doc -name '*.pdf') - else - # bug 566134, macros.texi is installed by make install if use doc - insinto /usr/share/${PN}/${PV}/etc - doins doc/interpreter/macros.texi - fi - [[ -e test/fntests.log ]] && dodoc test/fntests.log - use java && \ - java-pkg_regjar "${ED%/}/usr/share/${PN}/${PV}/m/java/octave.jar" - echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die - doenvd 99octave -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/sci-mathematics/octave/octave-4.4.1.ebuild b/sci-mathematics/octave/octave-4.4.1.ebuild deleted file mode 100644 index 192d67e3fde9..000000000000 --- a/sci-mathematics/octave/octave-4.4.1.ebuild +++ /dev/null @@ -1,196 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic fortran-2 gnome2-utils java-pkg-opt-2 pax-utils toolchain-funcs xdg-utils - -DESCRIPTION="High-level interactive language for numerical computations" -LICENSE="GPL-3" -HOMEPAGE="https://www.gnu.org/software/octave/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -SLOT="0/${PV}" -IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java libressl opengl - portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl static-libs X zlib" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - app-arch/bzip2 - app-text/ghostscript-gpl - dev-libs/libpcre:3= - sys-libs/ncurses:0= - sys-libs/zlib - virtual/blas - virtual/lapack - curl? ( net-misc/curl:0= ) - fftw? ( sci-libs/fftw:3.0= ) - glpk? ( sci-mathematics/glpk:0= ) - gnuplot? ( sci-visualization/gnuplot ) - gui? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qthelp:5 - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - x11-libs/qscintilla:= - ) - hdf5? ( sci-libs/hdf5:0= ) - imagemagick? ( - !graphicsmagick? ( >=media-gfx/imagemagick-7:=[cxx] ) - graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) - ) - java? ( >=virtual/jre-1.6.0:* ) - opengl? ( - media-libs/freetype:2= - media-libs/fontconfig:1.0= - virtual/glu - >=x11-libs/fltk-1.3:1=[opengl,xft] - x11-libs/gl2ps:0= - ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - portaudio? ( media-libs/portaudio ) - postscript? ( - app-text/epstool - media-gfx/pstoedit - media-gfx/transfig - ) - qhull? ( media-libs/qhull:0= ) - qrupdate? ( sci-libs/qrupdate:0= ) - readline? ( sys-libs/readline:0= ) - sndfile? ( media-libs/libsndfile ) - sparse? ( - 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= )" -DEPEND="${RDEPEND} - dev-util/gperf - sys-apps/texinfo - virtual/pkgconfig - doc? ( - dev-texlive/texlive-fontsrecommended - dev-texlive/texlive-plaingeneric - dev-texlive/texlive-metapost - virtual/latex-base - ) - gui? ( dev-qt/linguist-tools:5 ) - java? ( >=virtual/jdk-1.6.0 ) - qrupdate? ( app-misc/pax-utils ) - sparse? ( app-misc/pax-utils )" - -PATCHES=( - "${FILESDIR}"/${PN}-4.4.0-texi.patch - "${FILESDIR}"/${PN}-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch - "${FILESDIR}"/${PN}-4.4.0-imagemagick-configure.patch - "${FILESDIR}"/${PN}-4.4.0-imagemagick.patch - "${FILESDIR}"/${PN}-4.2.0-pkgbuilddir.patch - "${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch - "${FILESDIR}"/${PN}-4.2.0-zlib-underlinking.patch - "${FILESDIR}"/${PN}-4.4.0-qt-5.11.patch -) - -src_prepare() { - # nasty prefix hacks for fltk:1 linking - if use prefix; then - use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1" - fi - - # occasional fail on install, force regeneration (bug #401189) - rm doc/interpreter/contributors.texi || die - - default - eautoreconf -} - -src_configure() { - # [QA] detect underlinking #593670 - append-ldflags $(test-flags-CXX -Wl,-z,defs) - - # 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 - - econf \ - --localstatedir="${EPREFIX}/var/state/octave" \ - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ - --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \ - --disable-64 \ - --disable-jit \ - --enable-shared \ - --with-z \ - --with-bz2 \ - --without-OSMesa \ - $(use_enable static-libs static) \ - $(use_enable doc docs) \ - $(use_enable java) \ - $(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 imagemagick magick $(usex graphicsmagick GraphicsMagick ImageMagick)) \ - $(use_with opengl) \ - $(use_with opengl fltk) \ - $(use_with ssl openssl) \ - $(use_with portaudio) \ - $(use_with qhull) \ - $(use_with qrupdate) \ - $(use_with gui qt 5) \ - $(use_with sndfile) \ - $(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) -} - -src_compile() { - export VARTEXFONTS="${T}/fonts" # otherwise it will write to /var/cache/fonts/ and trip sandbox - default - if use java; then - pax-mark m "${S}/src/.libs/octave-cli" - fi -} - -src_install() { - default - if use doc; then - dodoc $(find doc -name '*.pdf') - else - # bug 566134, macros.texi is installed by make install if use doc - insinto /usr/share/${PN}/${PV}/etc - doins doc/interpreter/macros.texi - fi - [[ -e test/fntests.log ]] && dodoc test/fntests.log - use java && \ - java-pkg_regjar "${ED%/}/usr/share/${PN}/${PV}/m/java/octave.jar" - echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die - doenvd 99octave -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/sci-mathematics/octave/octave-5.1.0.ebuild b/sci-mathematics/octave/octave-5.1.0.ebuild deleted file mode 100644 index d70fbe73ac50..000000000000 --- a/sci-mathematics/octave/octave-5.1.0.ebuild +++ /dev/null @@ -1,192 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic fortran-2 gnome2-utils java-pkg-opt-2 pax-utils toolchain-funcs xdg-utils - -DESCRIPTION="High-level interactive language for numerical computations" -LICENSE="GPL-3" -HOMEPAGE="https://www.gnu.org/software/octave/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -SLOT="0/${PV}" -IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java libressl opengl - portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl static-libs X zlib" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - app-arch/bzip2 - app-text/ghostscript-gpl - dev-libs/libpcre:3= - sys-libs/ncurses:0= - sys-libs/zlib - virtual/blas - virtual/lapack - curl? ( net-misc/curl:0= ) - fftw? ( sci-libs/fftw:3.0= ) - glpk? ( sci-mathematics/glpk:0= ) - gnuplot? ( sci-visualization/gnuplot ) - gui? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qthelp:5 - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - x11-libs/qscintilla:= - ) - hdf5? ( sci-libs/hdf5:0= ) - imagemagick? ( - !graphicsmagick? ( >=media-gfx/imagemagick-7:=[cxx] ) - graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) - ) - java? ( >=virtual/jre-1.6.0:* ) - opengl? ( - media-libs/freetype:2= - media-libs/fontconfig:1.0= - virtual/glu - >=x11-libs/fltk-1.3:1=[opengl,xft] - x11-libs/gl2ps:0= - ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - portaudio? ( media-libs/portaudio ) - postscript? ( - app-text/epstool - media-gfx/pstoedit - media-gfx/transfig - ) - qhull? ( media-libs/qhull:0= ) - qrupdate? ( sci-libs/qrupdate:0= ) - readline? ( sys-libs/readline:0= ) - sndfile? ( media-libs/libsndfile ) - sparse? ( - 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= )" -DEPEND="${RDEPEND} - dev-util/gperf - sys-apps/texinfo - virtual/pkgconfig - doc? ( - dev-texlive/texlive-fontsrecommended - dev-texlive/texlive-plaingeneric - dev-texlive/texlive-metapost - virtual/latex-base - ) - gui? ( dev-qt/linguist-tools:5 ) - java? ( >=virtual/jdk-1.6.0 ) - qrupdate? ( app-misc/pax-utils ) - sparse? ( app-misc/pax-utils )" - -PATCHES=( - "${FILESDIR}"/${PN}-4.4.0-texi.patch - "${FILESDIR}"/${PN}-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch - "${FILESDIR}"/${PN}-4.4.0-imagemagick-configure.patch - "${FILESDIR}"/${PN}-4.4.0-imagemagick.patch - "${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch - "${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch - "${FILESDIR}"/${PN}-4.2.0-zlib-underlinking.patch - "${FILESDIR}"/${PN}-4.4.0-qt-5.11.patch -) - -src_prepare() { - # nasty prefix hacks for fltk:1 linking - if use prefix; then - use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1" - fi - - # occasional fail on install, force regeneration (bug #401189) - rm doc/interpreter/contributors.texi || die - - default - eautoreconf -} - -src_configure() { - # 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 - - econf \ - --localstatedir="${EPREFIX}/var/state/octave" \ - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ - --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \ - --disable-64 \ - --disable-jit \ - --enable-shared \ - --with-z \ - --with-bz2 \ - $(use_enable static-libs static) \ - $(use_enable doc docs) \ - $(use_enable java) \ - $(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 imagemagick magick $(usex graphicsmagick GraphicsMagick ImageMagick)) \ - $(use_with opengl) \ - $(use_with opengl fltk) \ - $(use_with ssl openssl) \ - $(use_with portaudio) \ - $(use_with qhull) \ - $(use_with qrupdate) \ - $(use_with gui qt 5) \ - $(use_with sndfile) \ - $(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) -} - -src_compile() { - export VARTEXFONTS="${T}/fonts" # otherwise it will write to /var/cache/fonts/ and trip sandbox - default - if use java; then - pax-mark m "${S}/src/.libs/octave-cli" - fi -} - -src_install() { - default - if use doc; then - dodoc $(find doc -name '*.pdf') - else - # bug 566134, macros.texi is installed by make install if use doc - insinto /usr/share/${PN}/${PV}/etc - doins doc/interpreter/macros.texi - fi - [[ -e test/fntests.log ]] && dodoc test/fntests.log - use java && \ - java-pkg_regjar "${ED%/}/usr/share/${PN}/${PV}/m/java/octave.jar" - echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die - doenvd 99octave -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/sci-mathematics/octave/octave-5.2.0.ebuild b/sci-mathematics/octave/octave-5.2.0.ebuild index 08552a338be7..1fe5608b0c30 100644 --- a/sci-mathematics/octave/octave-5.2.0.ebuild +++ b/sci-mathematics/octave/octave-5.2.0.ebuild @@ -14,7 +14,7 @@ SLOT="0/${PV}" IUSE="curl doc fftw +glpk gnuplot gui hdf5 java libressl opengl portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl static-libs X zlib" -KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" RDEPEND=" app-arch/bzip2 |