diff options
author | Sebastien Fabbro <bicatali@gentoo.org> | 2014-04-07 17:07:51 +0000 |
---|---|---|
committer | Sebastien Fabbro <bicatali@gentoo.org> | 2014-04-07 17:07:51 +0000 |
commit | e2cf1616f55e7d9f4493c7573ea9bcbeaabf25c6 (patch) | |
tree | 7c8a0a5dc445202fbc6bdff1b1e52ae1f2991215 /sci-libs | |
parent | Remove GTK+-3.x and WebKit2 support from 0.5.5 since it doesn't build with la... (diff) | |
download | historical-e2cf1616f55e7d9f4493c7573ea9bcbeaabf25c6.tar.gz historical-e2cf1616f55e7d9f4493c7573ea9bcbeaabf25c6.tar.bz2 historical-e2cf1616f55e7d9f4493c7573ea9bcbeaabf25c6.zip |
Fixed conflicting macro in installed headers, bug #503076
Package-Manager: portage-2.2.8-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360
Diffstat (limited to 'sci-libs')
-rw-r--r-- | sci-libs/plplot/ChangeLog | 13 | ||||
-rw-r--r-- | sci-libs/plplot/Manifest | 27 | ||||
-rw-r--r-- | sci-libs/plplot/files/plplot-5.10.0-have-config-h.patch | 117 | ||||
-rw-r--r-- | sci-libs/plplot/files/plplot-5.9.10-haru.patch | 30 | ||||
-rw-r--r-- | sci-libs/plplot/files/plplot-5.9.10-itcltk.patch | 34 | ||||
-rw-r--r-- | sci-libs/plplot/files/plplot-5.9.10-tcl86.patch | 77 | ||||
-rw-r--r-- | sci-libs/plplot/files/plplot-5.9.10-tcltk.patch | 74 | ||||
-rw-r--r-- | sci-libs/plplot/files/plplot-5.9.9-CMakeLists.txt.patch | 14 | ||||
-rw-r--r-- | sci-libs/plplot/files/plplot-5.9.9-no-pdftest.patch | 15 | ||||
-rw-r--r-- | sci-libs/plplot/files/plplot-5.9.9-tk86.patch | 636 | ||||
-rw-r--r-- | sci-libs/plplot/plplot-5.10.0-r1.ebuild (renamed from sci-libs/plplot/plplot-5.9.11-r1.ebuild) | 44 | ||||
-rw-r--r-- | sci-libs/plplot/plplot-5.9.10-r1.ebuild | 201 | ||||
-rw-r--r-- | sci-libs/plplot/plplot-5.9.9-r2.ebuild | 191 |
13 files changed, 154 insertions, 1319 deletions
diff --git a/sci-libs/plplot/ChangeLog b/sci-libs/plplot/ChangeLog index e6be54223a7d..05276dd8816b 100644 --- a/sci-libs/plplot/ChangeLog +++ b/sci-libs/plplot/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for sci-libs/plplot # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.57 2014/03/27 04:32:36 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.58 2014/04/07 17:07:44 bicatali Exp $ + +*plplot-5.10.0-r1 (07 Apr 2014) + + 07 Apr 2014; Sébastien Fabbro <bicatali@gentoo.org> + +files/plplot-5.10.0-have-config-h.patch, +plplot-5.10.0-r1.ebuild, + -files/plplot-5.9.10-haru.patch, -files/plplot-5.9.10-itcltk.patch, + -files/plplot-5.9.10-tcl86.patch, -files/plplot-5.9.10-tcltk.patch, + -files/plplot-5.9.9-CMakeLists.txt.patch, + -files/plplot-5.9.9-no-pdftest.patch, -files/plplot-5.9.9-tk86.patch, + -plplot-5.9.10-r1.ebuild, -plplot-5.9.11-r1.ebuild, -plplot-5.9.9-r2.ebuild: + Fixed conflicting macro in installed headers, bug #503076 27 Mar 2014; Sébastien Fabbro <bicatali@gentoo.org> plplot-5.10.0.ebuild: Bump minimum swig version for octave bindings, thanks disperato bug #503418. diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest index 4a500159a511..45578579e1dc 100644 --- a/sci-libs/plplot/Manifest +++ b/sci-libs/plplot/Manifest @@ -1,31 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX plplot-5.9.10-haru.patch 1147 SHA256 2d4484b62a14a5bf008f905cc94bb31ec035f97f1ee6ca5a60b438478c031cb1 SHA512 ea96cd67713acc268fc59c765efba3c4e6deacaf4f439180b3ee1cbd8845cc0e8bf63844664f91e939d3e10493eaccde150a380ed136f4ce15a6be01356ea6a9 WHIRLPOOL ddb9cf541e7424db78f1c4023ae0eeef2d2f44ff54bacb8bb155a789400f8bc4d78f27473ebd44ed3240acb3e9c877b250f04b9173de32678d04fc27c6c47e38 -AUX plplot-5.9.10-itcltk.patch 1530 SHA256 a087564ceb9cb37513664cd0d29bd97e49de0b7f5a60323333a92f722ef70f4f SHA512 bfe835adb7fc403a0376699f187dce5ebb2f39336e675438940960f4def049d1660853961019699d2a8bb5f4539d877b051062b738e3d1469beea3d2b5f667c3 WHIRLPOOL b55b076c56b86e34971d0debd8b611c4b2027c701486258fcbbc7728e7a617178631ed73b94004c863fd47010d8b86b82688a7d9460a2ca3e9c2650ae095b961 -AUX plplot-5.9.10-tcl86.patch 2841 SHA256 1eaabcb012b6dea413a0cab7cacc5d6f7e65c98bf1a8ead9acbb32df182a34d7 SHA512 42a6e3e7090de856338ee9b021179b5045305d8fbd6b814fe661fc7adb058524757b092cee917d8838158f9e9c2db0c132a3138bc4605113bd41a4298cae5426 WHIRLPOOL 5a3e2b401bfdd32bb4395caee77ee210d5f0f4d72a5a401de4067f218729da492db9c88b9784c799c098463d89402d0aa02c83dbf50d76497585ae1c32615a09 -AUX plplot-5.9.10-tcltk.patch 3399 SHA256 34feb86557ee6082455e2127b8e78d8ef8b42d2ed037bced23ade7559fe5f8fb SHA512 4e7007439081f7f87b5ac62514ad3cd84ec678980e8d841c0a38713462a94dd91624d136dfdff23eff9ea0b9f4b8538acdbc09c4ad06bd599238512f3db36510 WHIRLPOOL 2409b1d956f2413bbf3ec8c576080e4b95df46dfe82738ebe68833ff1bc96f39f40ea37c7bd3416c76f876cfad7ce2e9efae321f80dbfe9ab8ac20ce9fa5b832 +AUX plplot-5.10.0-have-config-h.patch 10257 SHA256 981cdb158924046788b6de596f962dcfc047b6b98d80fb3a32576e196d5eb74f SHA512 b94a917d906c49a77cc7f5ae68b3419fc83d16721d2d841ec3f5fac31b30718690a82ae03659a1cd08e8d2432282df97c9fb01b2fd44b8ea4c578a81d50fd83e WHIRLPOOL d00c0dd0365c8ff4c3b76592527aaf79e8ec5de27ca24546e3e74258a253e67eb5d331d33367905a991c946a2448d5027795c12646ee1e8173741d6d1e8dc177 AUX plplot-5.9.11-multiarch.patch 2150 SHA256 8100cdcb843c2d52a663434c481e804e4db22e319a1d6b69c0cfdc6938c70648 SHA512 c638a5bdba7d29d76fdf5c96415d56718dea162c1a03bf4f0180c12d8d8bf26603f628de4ec130403234a5a8e349630bed6d17e53a13fa6faf921da402869da9 WHIRLPOOL b88727e63940505512906886739f0aad7561b3659112bcf03b9ad25b8640a244a60acc69e5f355636c5dd876fc76db2043dafe399669f28b2eb0cbfc3e801d11 AUX plplot-5.9.11-ocaml.patch 2829 SHA256 f355a3af4862133438a90c2b923dfedbce5b3311d2b38736a5cea998ec3fc1e0 SHA512 26d739d0cc3f3b8227de9fdfbb6a7cbfdca6daff6515b1b91571316abc2d057eac953951ad9bb7b0fd2b28d8e220836c5da652e19170ed8401a9b3946b39c34a WHIRLPOOL 7202a6f0d54510bfb46fcf8411014170f407526ed9bb2b14b19269ff66ffbe9a1a597751cb8ab63e2d98f73f9408bb4d8df961d9b2d5d188aba5f8005cff4153 AUX plplot-5.9.11-octave.patch 633 SHA256 672f25cc93722d8116fb45853939b0e0b3cefa75b57ff87f2a8439c97723393e SHA512 c3832d531425cea20aa436cb757ed7bfd30bdc44a4d5cc11cf9a5e5fc7109897cc10748ce780de53232b63cd67d00c1cd2d9f62ef6d378d0f814182d1beb10e2 WHIRLPOOL 96ce5a919a944a833c3febc5b6932376ee32f764709470a405d73f691b2125f76ddb8b99b6ede13a19e9ee996d2ea226e0f4a8c299b174dd9f83b9e9a4aa7a7d AUX plplot-5.9.6-python.patch 379 SHA256 a338e7b7d9893aabf0bc2e4bc5bd25a97b81674abfa40492b6cc8a33fe8763c8 SHA512 cb2022bda3d5408ef0b2dc280981ad8bdb2f7ecb20d827f7e71ce063fba60963e68aeaa5efd8eef87da8e3dc270b609f7cb342c1da175cd757c9f135173842e4 WHIRLPOOL a6ae20047cd0e99251746cadf703e19d35897a6788e5b5d665758f970cc47aad31331640a679f974455aeab4ab6ec4927649d4b1c1a9d9efbe474f2e966aed83 -AUX plplot-5.9.9-CMakeLists.txt.patch 524 SHA256 f2a28ccca6934f85e496bf5c54d192bf436f544b379640498e2077fd882ce647 SHA512 daa8788ca5d55539c146c17318b2f402e360a8f34ce930999b7078e474099535dc8a335f88c520ec756d8e9f2249e2c93a4d65e5822f7224ec400c854f1168cc WHIRLPOOL 02e09ed162aab24f3358f8a3248fae66bac8c60db29180adacc7869ce5a1ae11db44430da9101327bd487a49480ea84647ce2883bfbc954f460e801be89c3aba -AUX plplot-5.9.9-no-pdftest.patch 458 SHA256 ee9d6b0cfdf4e954e24c5c026723334105ee208d9bb92e623bc42fdbd272caad SHA512 4c41b4321cdf4040cf64fba44b5c93032011737c1dbd98a9fa8c8d5b2b0c182cc94b30a3c52d2c1c184ce678e22b2c35a2d4f0e5ddbd93a86396e2c615cb50fe WHIRLPOOL aa6aaaffd9098abde89927a9c1079f351a7810e9c7b41fb61bc72f75225c5f5c3ff636b575444cdab4a22bd6bc24ea110d6bb29dbc684e9984c20cab37c709fd -AUX plplot-5.9.9-tk86.patch 21286 SHA256 9d6c908e7bb36df4e805bf2b95c773b88fb4dfa2542db63157bd994e83a22b35 SHA512 0b60a42a014b35a5b85af830f0dfc200a1156e53fa79ddb230f93080ab9cb19589008456affb6e670e388679a5ee68b981c04ce2a232cfcb7f27fd2ce457b51f WHIRLPOOL a8086c4ffd07ac98b51edc8f8fcdf7bf4de3755d25101464493129aaf4979d2c6247eb3f0afcd9bb57f774760f2e0ea1cb48f91d02d36dc630bf8ebfb0f2e104 DIST plplot-5.10.0.tar.gz 14766687 SHA256 d4e930b8b9d43cd1663408986218d61f166de7cbc9ef5bed111b0bdea934f9d5 SHA512 92a1880dc544694a19aa5a3f6f592df5b63ea65827f11804f0b1bdb1d123546abb213c1af4950c18b50e0e0fb9b40bb3311e7f21e681237df6008fee9873b11e WHIRLPOOL 52b726925a6fa89e2e097a1a7578b8b0004bfac6a841019144785861a467e4d7c812bf4301e7a747d2edab47ef5b0d481c7732f5b0c9b4ff5dae6be6cd3e17ba -DIST plplot-5.9.10.tar.gz 15215720 SHA256 6be3e20d6992cb2afd132a00cbc812aa5db170abe5855c44eb01481ac4b0b723 SHA512 356eff0d27f8b5a672992a8cb642a7bcd15cd49d18512b9e9a3c999d28e19c7da0bf095ac0bbdf4dc1df512190265179aa9311fbead80260a9968cc3d1a11fbe WHIRLPOOL d77917db0c3e9a7236525df01e36f0611bd2145083d827077ac2019ef9c38d0187dada0e20893aaaa37b425f67c700ab50474d63ff457efccb23ca33b9e47c43 -DIST plplot-5.9.11.tar.gz 14586326 SHA256 77383e44ffda2361199b40b8cf25f88ac012eff5c6a7468e80b112c8fd4793b3 SHA512 da95b76bf255c600d662b43555f003237ff2e310276e61c57854b4077f3f71a5847f931a9fba188a94c7b76656782cb22493a060b0aa1f2338107fd3f2cd01a0 WHIRLPOOL 2666822923b9f578df84f00dbe44d8b0549528f42d4f533e931190efda68b1b14a56428df7fac0c8979060e10e3d8ce12e232117ad7b93e080da2650a5531f4e -DIST plplot-5.9.9.tar.gz 13778554 SHA256 747e5a043681f3e20df30d159f6e8517cb1e25e502322adcd80e8ca53ec2c90d SHA512 ad46d40fbfecdf9b8d9e6f1e9da986716b07f88a91ad78f14498bd83acb0186c984b6b5079564046cfedfd1010692d0e7d3c3ce8831b3d1c825c8db335d4c7f1 WHIRLPOOL 3da257b0d0db87f46fd950e32d7bf22ef25b27d7334113fc2b0e5219fdb1d3462a425ff02550ee907fd105041d35f30b22b2b1b39649a13568d3f04f51525664 +EBUILD plplot-5.10.0-r1.ebuild 6681 SHA256 330a0c067dd97bb22298599e5efe386f80562062343ea3f32ed8dbe5ae8058f8 SHA512 2a8a09104ba8ead3ca5cb984db661193abf4973e39bb33408c9bc99586fb08be59db7c2f929d5fa9930a5e6745c49d5368ad4ac9957cc39eb6527741f2a21baa WHIRLPOOL 2ca7a05478295a7ad6774704c98d4ab9a8dd27baa976295bc30b74ba2106d0bef41ee459c2cce1b98d0a7023154973da8391840d12928f1141c4f734e0eeb850 EBUILD plplot-5.10.0.ebuild 6630 SHA256 53a89b9de10a424f22665f2d5c8ba18ddcf4d9c97315cdf6847e0b8019869f35 SHA512 75e561f42ee26d46546d8ddd27ca8bcd5701ca59e093dea593bfe5c8ede78153652a2072c894292030ab249763ada3bb19df883ca08ef8aedc6589a7894b99c0 WHIRLPOOL a53cced311ec6a6c1afa7c54b8745f251782ea76fe513e00db66753b073390836797070337df483b495b7b01f0cdbe5a6f56adf4b4a12ee4a807b9f0237b0b29 -EBUILD plplot-5.9.10-r1.ebuild 6400 SHA256 520e3bf00ac36d9e0de31c68fcdce6baa76f8cfa212f5ebd530848b49cce81f4 SHA512 fa0233ba3b7ee32e2f5c5cfea4ab02b2d022f1a30d37c57c4920c95b83854dfccff1b083b9dcc907f48579ea676ff7d10e6a255519a86a1133080e3f919fc014 WHIRLPOOL cfdb3631e2e87aae1dee01d55844fbe91a47c013445e3590b21aa0af792c087a36f0ce34d77f8c927269840827bcd35bb4bc71fae523e13fa95697c866db377e -EBUILD plplot-5.9.11-r1.ebuild 6607 SHA256 bec389be210e8be7266db3ea142dd79c33e52eadbf7e9368845d6be4a98bbfb5 SHA512 918d56d9ac05d0b3f4f9811b6eb19da1fff5ce7d58650abd75675a0c2f803afea18a495606cbf507f66f0d3b95294bc1b2c53bdb174adfcddb55549b68d982d5 WHIRLPOOL a879916044e779ed1e7b7c62b248d2cd1ee4d5a090d6238c4742cac563885405116716b439229e40a731bd4595e6da5fa2a52c72b04bb3ea10c9e3429de550d3 -EBUILD plplot-5.9.9-r2.ebuild 5923 SHA256 d6e2f4e478bbdb0e993dcae4516c5988a73eeb5ada74e20257d429d1c92c1d75 SHA512 a9b4826e8f0c8219c4159873bf395067bf692c547d062796ea3db87fb178b1c1203e83ff82df5719ba2cf1fd38bc760cbc912eef6efc68d8283c9c98acf5a902 WHIRLPOOL d1d2d5ab9501e63cd6ce3c248ddea46adb4a45053d602f68475f7be0c902b216ac5bddd61149e9f41740be63ac6567193582a60931a512d54d8f3fd60dff70c1 -MISC ChangeLog 10551 SHA256 3f3391cc3efd3dc78eda19b08ad1957163d1abb91718e1a865eb1dcec1ea02d1 SHA512 7d30b02e80f35beef0a9d10b36808e508c540a3987704a46accd5a08084e6e926cae7099455f83887758f7873902a9903ab543155ec90a3e2be560fbba8ebfc6 WHIRLPOOL ef03c828b06a77cb8b36beed1740127bf666bb7ad0c075904076c61cf2a7ce93bb8075b98a07ad01b4a78b5490f63371662ba2b80b8c5eb7170ed1946521d657 +MISC ChangeLog 11105 SHA256 8affd452130137ddd4040a538f176e7073381ed35dced142ba91c87a41d19800 SHA512 ddf786e664cfe055271eb2e426071b0df23f441dad5943ec2396a3c39968665f5cf6ffb681eeb99f0292e183ff4906a6fc86a8f2fd7753ce4f4a6864fb4683c2 WHIRLPOOL ee9954fc15f6dd69966157f61199abb2ff9845f050f83157390214f94e451cec6656b3921c0b2b22de6852e5cefc911f790bc1a8fbda6c6e0014102719ae7641 MISC metadata.xml 1409 SHA256 9fe1c36eb5beb07262c2814c2ff0aa16c18c69fbb091641608f5ac9b90630d99 SHA512 338034d611f0b7fff5fdcfadb76488b25326f00df739c3ce58ca59b67c6fb8738bde9ceb88bf990de77364b938c2c33c5a1e56ca7ae69d910f6eac673ce4d651 WHIRLPOOL 7c81f05237517c0048cc4d4cb91a289d59b84c0923f17f8ca8bf9faf40cdb69c304fa37f63efbe63bfcfad26f5f2da9e884e1e94426eae4df99fcbba45a76c92 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iEYEAREIAAYFAlMzqewACgkQ1ycZbhPLE2ApiwCgsfjfuLwl4NQOXKcazn9ytOAl -DVEAoKcZ764eq48t7Ji72JhQdE1xOKhX -=uN/U ------END PGP SIGNATURE----- diff --git a/sci-libs/plplot/files/plplot-5.10.0-have-config-h.patch b/sci-libs/plplot/files/plplot-5.10.0-have-config-h.patch new file mode 100644 index 000000000000..8c02df13941f --- /dev/null +++ b/sci-libs/plplot/files/plplot-5.10.0-have-config-h.patch @@ -0,0 +1,117 @@ +Apply upstream patch http://sourceforge.net/p/plplot/bugs/146/ +to fix conflicting macros in installed header files. + +diff -Nur plplot-5.10.0.orig/CMakeLists.txt plplot-5.10.0/CMakeLists.txt +--- plplot-5.10.0.orig/CMakeLists.txt 2014-04-07 09:51:53.732857993 -0700 ++++ plplot-5.10.0/CMakeLists.txt 2014-04-07 09:54:03.739699328 -0700 +@@ -125,7 +125,7 @@ + ${CMAKE_CURRENT_BINARY_DIR}/plplot_config.h + ) + # Allow access to the generated plplot_config.h for this build. +-add_definitions("-DHAVE_CONFIG_H") ++add_definitions("-DPLPLOT_HAVE_CONFIG_H") + # Install top-level files + + # Enable testing framework for examples +diff -Nur plplot-5.10.0.orig/bindings/ocaml/CMakeLists.txt plplot-5.10.0/bindings/ocaml/CMakeLists.txt +--- plplot-5.10.0.orig/bindings/ocaml/CMakeLists.txt 2014-04-07 09:51:53.629857267 -0700 ++++ plplot-5.10.0/bindings/ocaml/CMakeLists.txt 2014-04-07 09:54:03.934700592 -0700 +@@ -99,7 +99,7 @@ + ${CMAKE_CURRENT_BINARY_DIR}/dllplplot_stubs.so + ${CMAKE_CURRENT_BINARY_DIR}/libplplot_stubs.a + COMMAND ${OCAMLC} -ccopt -I${CAMLIDL_LIB_DIR} -c ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.c +- COMMAND ${OCAMLC} -ccopt -I${CMAKE_SOURCE_DIR}/include -ccopt -I${CMAKE_BINARY_DIR}/include -ccopt -I${CMAKE_SOURCE_DIR}/lib/qsastime -ccopt -I${CMAKE_BINARY_DIR} -ccopt -I${CAMLIDL_LIB_DIR} -ccopt -DHAVE_CONFIG_H -c ${CMAKE_CURRENT_SOURCE_DIR}/plplot_impl.c ++ COMMAND ${OCAMLC} -ccopt -I${CMAKE_SOURCE_DIR}/include -ccopt -I${CMAKE_BINARY_DIR}/include -ccopt -I${CMAKE_SOURCE_DIR}/lib/qsastime -ccopt -I${CMAKE_BINARY_DIR} -ccopt -I${CAMLIDL_LIB_DIR} -ccopt -DPLPLOT_HAVE_CONFIG_H -c ${CMAKE_CURRENT_SOURCE_DIR}/plplot_impl.c + COMMAND ${OCAMLMKLIB} -o plplot_stubs -L${CAMLIDL_LIB_DIR} -lcamlidl -L${CMAKE_BINARY_DIR}/src -lplplot${LIB_TAG} ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.o ${CMAKE_CURRENT_BINARY_DIR}/plplot_impl.o ${ocaml_STATIC_FLAGS} + DEPENDS + ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.c +diff -Nur plplot-5.10.0.orig/bindings/ocaml/plcairo/CMakeLists.txt plplot-5.10.0/bindings/ocaml/plcairo/CMakeLists.txt +--- plplot-5.10.0.orig/bindings/ocaml/plcairo/CMakeLists.txt 2014-04-07 09:51:53.629857267 -0700 ++++ plplot-5.10.0/bindings/ocaml/plcairo/CMakeLists.txt 2014-04-07 09:54:03.934700592 -0700 +@@ -36,7 +36,7 @@ + ${CMAKE_CURRENT_BINARY_DIR}/plcairo_impl.o + ${CMAKE_CURRENT_BINARY_DIR}/dllplcairo_stubs.so + ${CMAKE_CURRENT_BINARY_DIR}/libplcairo_stubs.a +- COMMAND ${OCAMLC} -ccopt "${CAIRO_COMPILE_FLAGS}" -cclib "${CAIRO_LINK_FLAGS}" -ccopt -I${CMAKE_SOURCE_DIR}/include -ccopt -I${CMAKE_BINARY_DIR}/include -ccopt -I${CMAKE_SOURCE_DIR}/lib/qsastime -ccopt -I${CMAKE_BINARY_DIR} -ccopt -DHAVE_CONFIG_H -c ${CMAKE_CURRENT_SOURCE_DIR}/plcairo_impl.c ++ COMMAND ${OCAMLC} -ccopt "${CAIRO_COMPILE_FLAGS}" -cclib "${CAIRO_LINK_FLAGS}" -ccopt -I${CMAKE_SOURCE_DIR}/include -ccopt -I${CMAKE_BINARY_DIR}/include -ccopt -I${CMAKE_SOURCE_DIR}/lib/qsastime -ccopt -I${CMAKE_BINARY_DIR} -ccopt -DPLPLOT_HAVE_CONFIG_H -c ${CMAKE_CURRENT_SOURCE_DIR}/plcairo_impl.c + COMMAND ${OCAMLMKLIB} -o plcairo_stubs ${CAIRO_LINK_FLAGS_LIST} -L${CMAKE_BINARY_DIR}/src -lplplot${LIB_TAG} ${CMAKE_CURRENT_BINARY_DIR}/plcairo_impl.o + DEPENDS + ${CMAKE_CURRENT_SOURCE_DIR}/plcairo_impl.c +diff -Nur plplot-5.10.0.orig/doc/doxygen/html/plConfig_8h_source.html plplot-5.10.0/doc/doxygen/html/plConfig_8h_source.html +--- plplot-5.10.0.orig/doc/doxygen/html/plConfig_8h_source.html 2014-04-07 09:51:53.712857853 -0700 ++++ plplot-5.10.0/doc/doxygen/html/plConfig_8h_source.html 2014-04-07 09:54:03.935700600 -0700 +@@ -136,7 +136,7 @@ + <div class="line"><a name="l00030"></a><span class="lineno"> 30</span> <span class="comment">// any user applications). Therefore, the configured plConfig.h</span></div> + <div class="line"><a name="l00031"></a><span class="lineno"> 31</span> <span class="comment">// should be installed. In contrast, plplot_config.h.in (note,</span></div> + <div class="line"><a name="l00032"></a><span class="lineno"> 32</span> <span class="comment">// plConfig.h #includes plplot_config.h for the core build because</span></div> +-<div class="line"><a name="l00033"></a><span class="lineno"> 33</span> <span class="comment">// HAVE_CONFIG_H is #defined in that case) contains configured macros</span></div> ++<div class="line"><a name="l00033"></a><span class="lineno"> 33</span> <span class="comment">// PLPLOT_HAVE_CONFIG_H is #defined in that case) contains configured macros</span></div> + <div class="line"><a name="l00034"></a><span class="lineno"> 34</span> <span class="comment">// that are only required for the core build. Therefore, in contrast</span></div> + <div class="line"><a name="l00035"></a><span class="lineno"> 35</span> <span class="comment">// to plConfig.h, plplot_config.h should not be installed.</span></div> + <div class="line"><a name="l00036"></a><span class="lineno"> 36</span> <span class="comment">//</span></div> +@@ -150,7 +150,7 @@ + <div class="line"><a name="l00044"></a><span class="lineno"> 44</span> <span class="preprocessor">#ifndef __PLCONFIG_H__</span></div> + <div class="line"><a name="l00045"></a><span class="lineno"> 45</span> <span class="preprocessor"></span><span class="preprocessor">#define __PLCONFIG_H__</span></div> + <div class="line"><a name="l00046"></a><span class="lineno"> 46</span> <span class="preprocessor"></span></div> +-<div class="line"><a name="l00047"></a><span class="lineno"> 47</span> <span class="preprocessor">#ifdef HAVE_CONFIG_H</span></div> ++<div class="line"><a name="l00047"></a><span class="lineno"> 47</span> <span class="preprocessor">#ifdef PLPLOT_HAVE_CONFIG_H</span></div> + <div class="line"><a name="l00048"></a><span class="lineno"> 48</span> <span class="preprocessor"></span><span class="preprocessor"># include <<a class="code" href="plplot__config_8h.html">plplot_config.h</a>></span></div> + <div class="line"><a name="l00049"></a><span class="lineno"> 49</span> <span class="preprocessor">#endif</span></div> + <div class="line"><a name="l00050"></a><span class="lineno"> 50</span> <span class="preprocessor"></span></div> +diff -Nur plplot-5.10.0.orig/doc/doxygen/html/plplot__config_8h_source.html plplot-5.10.0/doc/doxygen/html/plplot__config_8h_source.html +--- plplot-5.10.0.orig/doc/doxygen/html/plplot__config_8h_source.html 2014-04-07 09:51:53.708857825 -0700 ++++ plplot-5.10.0/doc/doxygen/html/plplot__config_8h_source.html 2014-04-07 09:54:03.935700600 -0700 +@@ -109,7 +109,7 @@ + <div class="line"><a name="l00003"></a><span class="lineno"> 3</span> <span class="comment">// examples (and presumably any user applications). Therefore, the</span></div> + <div class="line"><a name="l00004"></a><span class="lineno"> 4</span> <span class="comment">// configured plplot_config.h should not be installed. In contrast,</span></div> + <div class="line"><a name="l00005"></a><span class="lineno"> 5</span> <span class="comment">// include/plConfig.h.in (note, the configured plConfig.h result</span></div> +-<div class="line"><a name="l00006"></a><span class="lineno"> 6</span> <span class="comment">// #includes plplot_config.h for the core build because HAVE_CONFIG_H</span></div> ++<div class="line"><a name="l00006"></a><span class="lineno"> 6</span> <span class="comment">// #includes plplot_config.h for the core build because PLPLOT_HAVE_CONFIG_H</span></div> + <div class="line"><a name="l00007"></a><span class="lineno"> 7</span> <span class="comment">// is #defined in that case) contains configured macros that are</span></div> + <div class="line"><a name="l00008"></a><span class="lineno"> 8</span> <span class="comment">// required for the core build, installed examples build, and build of</span></div> + <div class="line"><a name="l00009"></a><span class="lineno"> 9</span> <span class="comment">// user applications. Therefore, in contrast to plplot_config.h,</span></div> +diff -Nur plplot-5.10.0.orig/examples/CMakeLists.txt plplot-5.10.0/examples/CMakeLists.txt +--- plplot-5.10.0.orig/examples/CMakeLists.txt 2014-04-07 09:51:53.610857133 -0700 ++++ plplot-5.10.0/examples/CMakeLists.txt 2014-04-07 09:54:03.938700634 -0700 +@@ -414,7 +414,7 @@ + endif(CORE_BUILD) + + if(CORE_BUILD AND BUILD_TEST) +- remove_definitions("-DHAVE_CONFIG_H") ++ remove_definitions("-DPLPLOT_HAVE_CONFIG_H") + endif(CORE_BUILD AND BUILD_TEST) + + # Decide on device to be used for generic interactive tests. +diff -Nur plplot-5.10.0.orig/include/plConfig.h.in plplot-5.10.0/include/plConfig.h.in +--- plplot-5.10.0.orig/include/plConfig.h.in 2014-04-07 09:51:53.616857175 -0700 ++++ plplot-5.10.0/include/plConfig.h.in 2014-04-07 09:54:03.938700634 -0700 +@@ -30,7 +30,7 @@ + // any user applications). Therefore, the configured plConfig.h + // should be installed. In contrast, plplot_config.h.in (note, + // plConfig.h #includes plplot_config.h for the core build because +-// HAVE_CONFIG_H is #defined in that case) contains configured macros ++// PLPLOT_HAVE_CONFIG_H is #defined in that case) contains configured macros + // that are only required for the core build. Therefore, in contrast + // to plConfig.h, plplot_config.h should not be installed. + // +@@ -44,7 +44,7 @@ + #ifndef __PLCONFIG_H__ + #define __PLCONFIG_H__ + +-#ifdef HAVE_CONFIG_H ++#ifdef PLPLOT_HAVE_CONFIG_H + # include <plplot_config.h> + #endif + +diff -Nur plplot-5.10.0.orig/plplot_config.h.in plplot-5.10.0/plplot_config.h.in +--- plplot-5.10.0.orig/plplot_config.h.in 2014-04-07 09:51:53.732857993 -0700 ++++ plplot-5.10.0/plplot_config.h.in 2014-04-07 09:54:03.938700634 -0700 +@@ -3,7 +3,7 @@ + // examples (and presumably any user applications). Therefore, the + // configured plplot_config.h should not be installed. In contrast, + // include/plConfig.h.in (note, the configured plConfig.h result +-// #includes plplot_config.h for the core build because HAVE_CONFIG_H ++// #includes plplot_config.h for the core build because PLPLOT_HAVE_CONFIG_H + // is #defined in that case) contains configured macros that are + // required for the core build, installed examples build, and build of + // user applications. Therefore, in contrast to plplot_config.h, diff --git a/sci-libs/plplot/files/plplot-5.9.10-haru.patch b/sci-libs/plplot/files/plplot-5.9.10-haru.patch deleted file mode 100644 index 9f43875f6aeb..000000000000 --- a/sci-libs/plplot/files/plplot-5.9.10-haru.patch +++ /dev/null @@ -1,30 +0,0 @@ -get hpdf header in /usr/include - applied upstream in trunk -bicatali nov 2013 - ---- cmake/modules/Findhpdf.cmake.orig 2013-11-05 14:44:16.088810181 -0800 -+++ cmake/modules/Findhpdf.cmake 2013-11-05 14:44:23.264854503 -0800 -@@ -8,7 +8,12 @@ - # hpdf_LIBRARY_DIRS, the directory where libhpdf (either shared or static) - # is found. - --find_path(hpdf_INCLUDE_DIR hpdf/hpdf.h /usr/local/include /usr/include) -+# Give preference to header found in hpdf subdirectory (which is the -+# result of a build and install of upstream libharu), then if not -+# found look for the case of no such subdirectory (which is how the -+# Debian system version of libharu headers is installed). -+find_path(hpdf_INCLUDE_DIR hpdf.h PATHS /usr/local/include /usr/include PATH_SUFFIXES hpdf) -+find_path(hpdf_INCLUDE_DIR hpdf.h PATHS /usr/local/include /usr/include) - - if(hpdf_INCLUDE_DIR) - find_library(hpdf_LIBRARY ---- drivers/pdf.c.orig 2013-11-05 14:55:58.928226651 -0800 -+++ drivers/pdf.c 2013-11-05 14:56:10.534299828 -0800 -@@ -38,7 +38,7 @@ - #include <math.h> - #include <setjmp.h> - --#include "hpdf/hpdf.h" -+#include "hpdf.h" - - // PLplot header files - #define DEBUG diff --git a/sci-libs/plplot/files/plplot-5.9.10-itcltk.patch b/sci-libs/plplot/files/plplot-5.9.10-itcltk.patch deleted file mode 100644 index bc1d0f1ed04e..000000000000 --- a/sci-libs/plplot/files/plplot-5.9.10-itcltk.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- bindings/tk/tkMain.c.orig -+++ bindings/tk/tkMain.c -@@ -85,11 +85,6 @@ - - // From tclIntDecls.h - --#ifndef Tcl_Import_TCL_DECLARED --EXTERN int Tcl_Import _ANSI_ARGS_( ( Tcl_Interp * interp, -- Tcl_Namespace * nsPtr, char * pattern, -- int allowOverwrite ) ); --#endif - - #ifndef Tcl_GetGlobalNamespace_TCL_DECLARE - EXTERN Tcl_Namespace * Tcl_GetGlobalNamespace _ANSI_ARGS_( ( ---- cmake/modules/tcl-related.cmake.orig 2013-10-31 08:57:07.044160099 -0700 -+++ cmake/modules/tcl-related.cmake 2013-10-31 08:57:37.854350228 -0700 -@@ -94,7 +94,7 @@ - message(STATUS "Looking for itcl.h - found") - message(STATUS "Looking for itcl library") - get_filename_component(TCL_LIBRARY_PATH ${TCL_LIBRARY} PATH) -- set(itcl_library_versions 3.4 3.3 3.2 3.1 3.0 2.1 2.0) -+ set(itcl_library_versions 4.0.0 3.4 3.3 3.2 3.1 3.0 2.1 2.0) - foreach(version ${itcl_library_versions}) - find_library(ITCL_LIBRARY itcl${version} PATHS ${TCL_LIBRARY_PATH} - PATH_SUFFIXES itcl${version}) -@@ -153,7 +153,7 @@ - if(ITK_INCLUDE_PATH) - message(STATUS "Looking for itk.h - found") - message(STATUS "Looking for itk library") -- set(itk_library_versions 3.4 3.3 3.2 3.1 3.0 2.1 2.0) -+ set(itk_library_versions 4.0.0 3.4 3.3 3.2 3.1 3.0 2.1 2.0) - foreach(version ${itk_library_versions}) - find_library(ITK_LIBRARY itk${version} - PATH_SUFFIXES itk${version}) diff --git a/sci-libs/plplot/files/plplot-5.9.10-tcl86.patch b/sci-libs/plplot/files/plplot-5.9.10-tcl86.patch deleted file mode 100644 index dfa606c1cdbc..000000000000 --- a/sci-libs/plplot/files/plplot-5.9.10-tcl86.patch +++ /dev/null @@ -1,77 +0,0 @@ -Upgrade to tcl-8.6 - not applied upstream -bicatali nov 2013 - ---- drivers/ntk.c.orig 2013-11-05 14:30:01.105432771 -0800 -+++ drivers/ntk.c 2013-11-05 14:29:42.632317282 -0800 -@@ -115,7 +115,7 @@ - // - sprintf( scmd, "send %s {%s}", rem_interp, cmd ); // mess! make it more efficient - if ( Tcl_Eval( interp, scmd ) != TCL_OK ) -- fprintf( stderr, "%s\n", interp->result ); -+ fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) ); - } - } - -@@ -264,7 +264,7 @@ - sprintf( cmd, "send %s \"set client [tk appname]; wm deiconify .\"", rem_interp ); - if ( Tcl_Eval( interp, cmd ) != TCL_OK ) - { -- fprintf( stderr, "%s\n", interp->result ); -+ fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) ); - plexit( "No such tk server." ); - } - } -@@ -301,7 +301,7 @@ - // Set up device parameters - - Tcl_Eval( interp, "tk scaling" ); // pixels per mm -- ppm = (PLFLT) atof( interp->result ) / ( 25.4 / 72. ); -+ ppm = (PLFLT) atof( Tcl_GetStringResult(interp) ) / ( 25.4 / 72. ); - plP_setpxl( ppm, ppm ); - plP_setphy( xmin, xmax * scale, ymin, ymax * scale ); - } -@@ -371,11 +371,11 @@ - { - tk_cmd( "update" ); - tk_cmd( "info exists keypress" ); -- sscanf( interp->result, "%d", &st ); -+ sscanf( Tcl_GetStringResult(interp), "%d", &st ); - } - - tk_cmd( "set keypress" ); -- sscanf( interp->result, "%d", &key ); -+ sscanf( Tcl_GetStringResult(interp), "%d", &key ); - //fprintf(stderr,"\n%d\n", key);fflush(stderr); - tk_cmd( "unset keypress" ); - st = 0; -@@ -433,7 +433,7 @@ - { - tk_cmd( "update" ); - tk_cmd( "winfo exists $plf.f2.c$ccanv" ); -- sscanf( interp->result, "%d", &st ); -+ sscanf( Tcl_GetStringResult(interp), "%d", &st ); - } - st = 0; - // this give a "Segmentation fault", even after checking for the canvas! -@@ -450,16 +450,16 @@ - { - tk_cmd( "update" ); - tk_cmd( "info exists xloc" ); -- sscanf( interp->result, "%d", &st ); -+ sscanf( Tcl_GetStringResult(interp), "%d", &st ); - } - tk_cmd( "set xloc" ); -- sscanf( interp->result, "%d", &gin.pX ); -+ sscanf( Tcl_GetStringResult(interp), "%d", &gin.pX ); - tk_cmd( "set yloc" ); -- sscanf( interp->result, "%d", &gin.pY ); -+ sscanf( Tcl_GetStringResult(interp), "%d", &gin.pY ); - tk_cmd( "set bloc" ); -- sscanf( interp->result, "%d", &gin.button ); -+ sscanf( Tcl_GetStringResult(interp), "%d", &gin.button ); - tk_cmd( "set sloc" ); -- sscanf( interp->result, "%d", &gin.state ); -+ sscanf( Tcl_GetStringResult(interp), "%d", &gin.state ); - - gin.dX = (PLFLT) gin.pX / xmax; - gin.dY = 1. - (PLFLT) gin.pY / ymax; diff --git a/sci-libs/plplot/files/plplot-5.9.10-tcltk.patch b/sci-libs/plplot/files/plplot-5.9.10-tcltk.patch deleted file mode 100644 index 01b664b351cd..000000000000 --- a/sci-libs/plplot/files/plplot-5.9.10-tcltk.patch +++ /dev/null @@ -1,74 +0,0 @@ -Allow itcl and itk 4.0.0, applied upstream in trunk -bicatali nov 2013 - ---- cmake/modules/tcl-related.cmake.orig 2013-11-05 11:31:42.436587456 -0800 -+++ cmake/modules/tcl-related.cmake 2013-11-05 11:31:54.411661141 -0800 -@@ -85,16 +85,16 @@ - OUTPUT_VARIABLE AVAILABLE_ITCL) - if(AVAILABLE_ITCL) - execute_process( -- COMMAND ${TCL_TCLSH} GetITCL_Version.tcl -- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/cmake/modules -- OUTPUT_VARIABLE itcl_library_versions) -+ COMMAND ${TCL_TCLSH} GetITCL_Version.tcl -+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/cmake/modules -+ OUTPUT_VARIABLE itcl_library_versions) - message(STATUS "Looking for itcl.h") - find_path(ITCL_INCLUDE_PATH itcl.h ${TCL_INCLUDE_PATH}) - if(ITCL_INCLUDE_PATH) - message(STATUS "Looking for itcl.h - found") - message(STATUS "Looking for itcl library") -- get_filename_component(TCL_LIBRARY_PATH ${TCL_LIBRARY} PATH) -- set(itcl_library_versions 3.4 3.3 3.2 3.1 3.0 2.1 2.0) -+ get_filename_component(TCL_LIBRARY_PATH ${TCL_LIBRARY} PATH) -+ set(itcl_library_versions 4.0.0 3.4 3.3 3.2 3.1 3.0 2.1 2.0) - foreach(version ${itcl_library_versions}) - find_library(ITCL_LIBRARY itcl${version} PATHS ${TCL_LIBRARY_PATH} - PATH_SUFFIXES itcl${version}) -@@ -132,13 +132,21 @@ - else(ENABLE_itcl) - set(MKTCLINDEX_ARGS "-tcl") - endif(ENABLE_itcl) -+ - if(ENABLE_tk AND NOT X11_FOUND) - message(STATUS "WARNING: X11 not found, disabling Tk interface code") - set(ENABLE_tk OFF CACHE BOOL "Enable Tk interface code" FORCE) - endif(ENABLE_tk AND NOT X11_FOUND) - if(ENABLE_tk) -+ get_filename_component(TK_LIBRARY_PATH ${TK_LIBRARY} PATH) -+ if(NOT ${TK_LIBRARY_PATH} STREQUAL ${TCL_LIBRARY_PATH}) -+ message(STATUS "TCL_LIBRARY_PATH = ${TCL_LIBRARY_PATH}") -+ message(STATUS "TK_LIBRARY_PATH = ${TK_LIBRARY_PATH}") -+ message(STATUS "WARNING: the Tcl and Tk library locations are inconsistent so those libraries are likely not compatible") -+ endif(NOT ${TK_LIBRARY_PATH} STREQUAL ${TCL_LIBRARY_PATH}) -+ endif(ENABLE_tk) -+ if(ENABLE_tk) - set(TK_INCLUDE_PATH ${TK_INCLUDE_PATH} ${X11_INCLUDE_DIR}) -- set(TK_LIBRARY ${TK_LIBRARY}) - message(STATUS "TK_INCLUDE_PATH = ${TK_INCLUDE_PATH}") - message(STATUS "TK_LIBRARY = ${TK_LIBRARY}") - else(ENABLE_tk) -@@ -153,9 +161,9 @@ - if(ITK_INCLUDE_PATH) - message(STATUS "Looking for itk.h - found") - message(STATUS "Looking for itk library") -- set(itk_library_versions 3.4 3.3 3.2 3.1 3.0 2.1 2.0) -+ set(itk_library_versions 4.0.0 3.4 3.3 3.2 3.1 3.0 2.1 2.0) - foreach(version ${itk_library_versions}) -- find_library(ITK_LIBRARY itk${version} -+ find_library(ITK_LIBRARY itk${version} PATHS ${TCL_LIBRARY_PATH} - PATH_SUFFIXES itk${version}) - endforeach(version ${itk_library_versions}) - if(ITK_LIBRARY) ---- bindings/tk/tkMain.c.orig 2013-11-05 11:34:29.219602234 -0800 -+++ bindings/tk/tkMain.c 2013-11-05 11:34:48.394718925 -0800 -@@ -85,7 +85,8 @@ - - // From tclIntDecls.h - --#ifndef Tcl_Import_TCL_DECLARED -+//#ifndef Tcl_Import_TCL_DECLARED -+#if 0 - EXTERN int Tcl_Import _ANSI_ARGS_( ( Tcl_Interp * interp, - Tcl_Namespace * nsPtr, char * pattern, - int allowOverwrite ) ); diff --git a/sci-libs/plplot/files/plplot-5.9.9-CMakeLists.txt.patch b/sci-libs/plplot/files/plplot-5.9.9-CMakeLists.txt.patch deleted file mode 100644 index 6bec2e54cc77..000000000000 --- a/sci-libs/plplot/files/plplot-5.9.9-CMakeLists.txt.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- trunk/scripts/CMakeLists.txt 2011/10/31 15:33:42 12018 -+++ trunk/scripts/CMakeLists.txt 2012/01/04 15:45:07 12116 -@@ -30,9 +30,9 @@ - if(PLD_pstex) - set(scripts_SCRIPTS ${scripts_SCRIPTS} pstex2eps) - endif(PLD_pstex) -- if (NOT ${scripts_SCRIPTS} STREQUAL "") -+ if (NOT "${scripts_SCRIPTS}" STREQUAL "") - install(PROGRAMS ${scripts_SCRIPTS} DESTINATION ${BIN_DIR}) -- endif (NOT ${scripts_SCRIPTS} STREQUAL "") -+ endif (NOT "${scripts_SCRIPTS}" STREQUAL "") - endif(HAVE_BASH) - - if(ENABLE_tcl OR ENABLE_tk) diff --git a/sci-libs/plplot/files/plplot-5.9.9-no-pdftest.patch b/sci-libs/plplot/files/plplot-5.9.9-no-pdftest.patch deleted file mode 100644 index 7e7e8263bad6..000000000000 --- a/sci-libs/plplot/files/plplot-5.9.9-no-pdftest.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- plplot_test/CMakeLists.txt.orig 2011-11-20 16:10:04.000000000 +0000 -+++ plplot_test/CMakeLists.txt 2011-11-20 16:10:24.000000000 +0000 -@@ -387,12 +387,6 @@ - ) - endif(PLD_pdfqt) - -- if(PLD_pdf) -- add_test(examples_pdf -- ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pdf" -- ) -- endif(PLD_pdf) -- - if(CMP_EXECUTABLE OR DIFF_EXECUTABLE AND TAIL_EXECUTABLE) - configure_file( - test_diff.sh.in diff --git a/sci-libs/plplot/files/plplot-5.9.9-tk86.patch b/sci-libs/plplot/files/plplot-5.9.9-tk86.patch deleted file mode 100644 index 5d792070b4b2..000000000000 --- a/sci-libs/plplot/files/plplot-5.9.9-tk86.patch +++ /dev/null @@ -1,636 +0,0 @@ ---- bindings/tk-x-plat/plplotter.c.ORIG 2011-10-13 02:43:01.000000000 +0200 -+++ bindings/tk-x-plat/plplotter.c 2013-01-12 16:42:48.930183645 +0100 -@@ -463,7 +463,7 @@ - PlPlotterFirstInit( (ClientData) plPlotterPtr ); - Tk_GeometryRequest( plPlotterPtr->tkwin, 200, 200 ); - -- interp->result = Tk_PathName( plPlotterPtr->tkwin ); -+ Tcl_SetResult(interp,(char*)Tk_PathName(plPlotterPtr->tkwin) ,TCL_VOLATILE); - - return TCL_OK; - } -@@ -2018,7 +2018,7 @@ - // - // Results: - // The return value is a standard Tcl result. If TCL_ERROR is --// returned, then interp->result contains an error message. -+// returned, then Tcl_GetStringResult(interp) contains an error message. - // - // Side effects: - // Configuration information, such as text string, colors, font, etc. -@@ -2469,7 +2469,7 @@ - plr->at_bop = 0; - if ( Tcl_Eval( interp, plPlotterPtr->bopCmd ) != TCL_OK ) - fprintf( stderr, "Command \"%s\" failed:\n\t %s\n", -- plPlotterPtr->bopCmd, interp->result ); -+ plPlotterPtr->bopCmd, Tcl_GetStringResult(interp) ); - } - - // Signal eop if necessary -@@ -2479,7 +2479,7 @@ - plr->at_eop = 0; - if ( Tcl_Eval( interp, plPlotterPtr->eopCmd ) != TCL_OK ) - fprintf( stderr, "Command \"%s\" failed:\n\t %s\n", -- plPlotterPtr->eopCmd, interp->result ); -+ plPlotterPtr->eopCmd, Tcl_GetStringResult(interp) ); - } - - return result; -@@ -2491,7 +2491,7 @@ - { - if ( Tcl_Eval( interp, plPlotterPtr->eopCmd ) != TCL_OK ) - fprintf( stderr, "Command \"%s\" failed:\n\t %s\n", -- plPlotterPtr->eopCmd, interp->result ); -+ plPlotterPtr->eopCmd, Tcl_GetStringResult(interp) ); - } - } - -@@ -2501,7 +2501,7 @@ - { - if ( Tcl_Eval( interp, plPlotterPtr->bopCmd ) != TCL_OK ) - fprintf( stderr, "Command \"%s\" failed:\n\t %s\n", -- plPlotterPtr->bopCmd, interp->result ); -+ plPlotterPtr->bopCmd, Tcl_GetStringResult(interp ) ); - } - } - -@@ -2536,7 +2536,7 @@ - { - #endif - Tcl_AppendResult( interp, "Packet receive failed:\n\t %s\n", -- interp->result, (char *) NULL ); -+ Tcl_GetStringResult(interp), (char *) NULL ); - return TCL_ERROR; - } - -@@ -3082,7 +3082,7 @@ - - if ( argc == 0 ) - { -- interp->result = "report what?"; -+ Tcl_SetResult(interp,(char*)"report what?",TCL_VOLATILE); - return TCL_ERROR; - } - -@@ -3093,7 +3093,7 @@ - - if ( argc != 3 ) - { -- interp->result = "Wrong # of args: report wc x y"; -+ Tcl_SetResult(interp,(char*)"Wrong # of args: report wc x y",TCL_VOLATILE); - return TCL_ERROR; - } - -@@ -3107,15 +3107,15 @@ - - if ( plTranslateCursor( gin ) ) - { -- sprintf( interp->result, "%f %f", gin->wX, gin->wY ); -+ sprintf( Tcl_GetStringResult(interp), "%f %f", gin->wX, gin->wY ); - return TCL_OK; - } - -- interp->result = "Cannot locate"; -+ Tcl_SetResult(interp,(char*)"Cannot locate",TCL_VOLATILE); - return TCL_OK; - } - -- interp->result = "nonsensical request."; -+ Tcl_SetResult(interp,(char*)"nonsensical request.",TCL_VOLATILE); - return TCL_ERROR; - } - ---- bindings/tk/tkshell.c.ORIG 2011-10-13 02:43:01.000000000 +0200 -+++ bindings/tk/tkshell.c 2013-01-12 16:46:41.288192370 +0100 -@@ -115,7 +115,7 @@ - if ( Tcl_ExprBoolean( interp, argv[1], &result ) ) - { - fprintf( stderr, "wait_until command \"%s\" failed:\n\t %s\n", -- argv[1], interp->result ); -+ argv[1], Tcl_GetStringResult(interp) ); - break; - } - if ( result ) ---- bindings/tk/plserver.c.ORIG 2011-10-13 02:43:01.000000000 +0200 -+++ bindings/tk/plserver.c 2013-01-12 16:48:21.973196151 +0100 -@@ -126,11 +126,11 @@ - if ( Tk_ParseArgv( interp, (Tk_Window) NULL, &argc, argv, - argTable, TK_ARGV_NO_DEFAULTS ) != TCL_OK ) - { -- fprintf( stderr, "\n(plserver) %s\n\n", interp->result ); -+ fprintf( stderr, "\n(plserver) %s\n\n", Tcl_GetStringResult(interp) ); - fprintf( stderr, "\ - The client_<xxx> and -child options should not be used except via the\n\ - PLplot/Tk driver.\n\n(wish) " ); -- if ( strncmp( interp->result, helpmsg, strlen( helpmsg ) ) ) -+ if ( strncmp( Tcl_GetStringResult(interp), helpmsg, strlen( helpmsg ) ) ) - exit( 1 ); - } - -@@ -158,7 +158,7 @@ - // - // Results: - // Returns a standard Tcl completion code, and leaves an error --// message in interp->result if an error occurs. -+// message in Tcl_GetStringResult(interp) if an error occurs. - // - // Side effects: - // Depends on the startup script. -@@ -257,8 +257,8 @@ - - // Print error message if one given - -- if ( interp->result != NULL && interp->result[0] != '\0' ) -- fprintf( stderr, "%s\n", interp->result ); -+ if ( Tcl_GetStringResult(interp) != NULL && Tcl_GetStringResult(interp)[0] != '\0' ) -+ fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) ); - - // Best to check the syntax before proceeding - ---- bindings/tk/tkMain.c.ORIG 2011-10-13 02:43:01.000000000 +0200 -+++ bindings/tk/tkMain.c 2013-01-13 08:19:02.722238116 +0100 -@@ -85,17 +85,6 @@ - - // From tclIntDecls.h - --#ifndef Tcl_Import_TCL_DECLARED --EXTERN int Tcl_Import _ANSI_ARGS_( ( Tcl_Interp * interp, -- Tcl_Namespace * nsPtr, char * pattern, -- int allowOverwrite ) ); --#endif -- --#ifndef Tcl_GetGlobalNamespace_TCL_DECLARE --EXTERN Tcl_Namespace * Tcl_GetGlobalNamespace _ANSI_ARGS_( ( -- Tcl_Interp * interp ) ); --#endif -- - // - // Declarations for various library procedures and variables (don't want - // to include tkInt.h or tkConfig.h here, because people might copy this -@@ -180,7 +180,7 @@ - pltkMain( int argc, const char **argv, char *RcFileName, - int ( *AppInit )( Tcl_Interp *interp ) ) - { -- char *args, *msg; -+ char *args; const char *msg; - const char *p; - char buf[20]; - int code; -@@ -202,7 +202,7 @@ - if ( Tk_ParseArgv( interp, (Tk_Window) NULL, &argc, argv, argTable, 0 ) - != TCL_OK ) - { -- fprintf( stderr, "%s\n", interp->result ); -+ fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) ); - exit( 1 ); - } - if ( name == NULL ) -@@ -331,7 +331,7 @@ - - if ( ( *AppInit )( interp ) != TCL_OK ) - { -- fprintf( stderr, "(*AppInit) failed: %s\n", interp->result ); -+ fprintf( stderr, "(*AppInit) failed: %s\n", Tcl_GetStringResult(interp) ); - } - - // -@@ -343,7 +343,7 @@ - code = Tcl_VarEval( interp, "wm geometry . ", geometry, (char *) NULL ); - if ( code != TCL_OK ) - { -- fprintf( stderr, "%s\n", interp->result ); -+ fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) ); - } - } - -@@ -393,7 +393,7 @@ - fullName = Tcl_TildeSubst( interp, RcFileName, &buffer ); - if ( fullName == NULL ) - { -- fprintf( stderr, "%s\n", interp->result ); -+ fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) ); - } - else - { -@@ -403,7 +403,7 @@ - code = Tcl_EvalFile( interp, fullName ); - if ( code != TCL_OK ) - { -- fprintf( stderr, "%s\n", interp->result ); -+ fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) ); - } - fclose( f ); - } -@@ -442,7 +442,7 @@ - msg = (char *) Tcl_GetVar( interp, "errorInfo", TCL_GLOBAL_ONLY ); - if ( msg == NULL ) - { -- msg = interp->result; -+ msg = Tcl_GetStringResult(interp); - } - fprintf( stderr, "%s\n", msg ); - Tcl_Eval( interp, errorExitCmd ); -@@ -535,11 +535,11 @@ - Tk_CreateFileHandler( 0, TK_READABLE, StdinProc, (ClientData) 0 ); - #endif - Tcl_DStringFree( &command ); -- if ( *interp->result != 0 ) -+ if ( Tcl_GetStringResult(interp) ) - { - if ( ( code != TCL_OK ) || ( tty ) ) - { -- printf( "%s\n", interp->result ); -+ printf( "%s\n", Tcl_GetStringResult(interp) ); - } - } - -@@ -599,7 +599,7 @@ - { - Tcl_AddErrorInfo( interp, - "\n (script that generates prompt)" ); -- fprintf( stderr, "%s\n", interp->result ); -+ fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) ); - goto defaultPrompt; - } - } ---- bindings/tk/plframe.c.ORIG 2011-10-13 02:43:01.000000000 +0200 -+++ bindings/tk/plframe.c 2013-01-13 08:22:04.594239896 +0100 -@@ -484,7 +484,7 @@ - Tk_DestroyWindow( plFramePtr->tkwin ); - return TCL_ERROR; - } -- interp->result = Tk_PathName( plFramePtr->tkwin ); -+ Tcl_SetResult(interp,(char*)Tk_PathName( plFramePtr->tkwin) ,TCL_VOLATILE); - - return TCL_OK; - } -@@ -616,7 +616,7 @@ - { - bcb.cmd = PLESC_DOUBLEBUFFERING_QUERY; - pl_cmd( PLESC_DOUBLEBUFFERING, &bcb ); -- sprintf( interp->result, "%d", bcb.result ); -+ sprintf( Tcl_GetStringResult(interp), "%d", bcb.result ); - } - } - -@@ -2215,7 +2215,7 @@ - // - // Results: - // The return value is a standard Tcl result. If TCL_ERROR is --// returned, then interp->result contains an error message. -+// returned, then Tcl_GetStringResult(interp) contains an error message. - // - // Side effects: - // Configuration information, such as text string, colors, font, etc. -@@ -2675,7 +2675,7 @@ - plr->at_bop = 0; - if ( Tcl_Eval( interp, plFramePtr->bopCmd ) != TCL_OK ) - fprintf( stderr, "Command \"%s\" failed:\n\t %s\n", -- plFramePtr->bopCmd, interp->result ); -+ plFramePtr->bopCmd, Tcl_GetStringResult(interp) ); - } - - // Signal eop if necessary -@@ -2685,7 +2685,7 @@ - plr->at_eop = 0; - if ( Tcl_Eval( interp, plFramePtr->eopCmd ) != TCL_OK ) - fprintf( stderr, "Command \"%s\" failed:\n\t %s\n", -- plFramePtr->eopCmd, interp->result ); -+ plFramePtr->eopCmd, Tcl_GetStringResult(interp) ); - } - - return result; -@@ -3275,7 +3275,7 @@ - - if ( argc == 0 ) - { -- interp->result = "report what?"; -+ Tcl_SetResult(interp,(char*)"report what?",TCL_VOLATILE); - return TCL_ERROR; - } - -@@ -3286,7 +3286,7 @@ - - if ( argc != 3 ) - { -- interp->result = "Wrong # of args: report wc x y"; -+ Tcl_SetResult(interp,(char*)"Wrong # of args: report wc x y",TCL_VOLATILE); - return TCL_ERROR; - } - -@@ -3300,15 +3300,15 @@ - - if ( plTranslateCursor( gin ) ) - { -- sprintf( interp->result, "%f %f", gin->wX, gin->wY ); -+ sprintf( Tcl_GetStringResult(interp), "%f %f", gin->wX, gin->wY ); - return TCL_OK; - } - -- interp->result = "Cannot locate"; -+ Tcl_SetResult(interp,(char*)"Cannot locate",TCL_VOLATILE); - return TCL_OK; - } - -- interp->result = "nonsensical request."; -+ Tcl_SetResult(interp,(char*)"nonsensical request.",TCL_VOLATILE); - return TCL_ERROR; - } - -@@ -3324,7 +3324,7 @@ - - if ( Tcl_Eval( plFramePtr->interp, plFramePtr->bopCmd ) != TCL_OK ) - fprintf( stderr, "Command \"%s\" failed:\n\t %s\n", -- plFramePtr->bopCmd, plFramePtr->interp->result ); -+ plFramePtr->bopCmd, Tcl_GetStringResult(plFramePtr->interp) ); - } - - //-------------------------------------------------------------------------- -@@ -3339,7 +3339,7 @@ - - if ( Tcl_Eval( plFramePtr->interp, plFramePtr->eopCmd ) != TCL_OK ) - fprintf( stderr, "Command \"%s\" failed:\n\t %s\n", -- plFramePtr->eopCmd, plFramePtr->interp->result ); -+ plFramePtr->eopCmd, Tcl_GetStringResult(plFramePtr->interp) ); - } - - //-------------------------------------------------------------------------- ---- utils/pltcl.c.ORIG 2011-10-13 02:43:01.000000000 +0200 -+++ utils/pltcl.c 2013-01-13 08:22:33.877240182 +0100 -@@ -119,7 +119,7 @@ - // - // Results: - // Returns a standard Tcl completion code, and leaves an error --// message in interp->result if an error occurs. -+// message in Tcl_GetStringResult(interp) if an error occurs. - // - // Side effects: - // Depends on the startup script. ---- doc/docbook/src/plplotdoc.info-1.ORIG 2011-10-13 02:43:01.000000000 +0200 -+++ doc/docbook/src/plplotdoc.info-1 2013-01-13 08:23:13.171240567 +0100 -@@ -6435,7 +6435,7 @@ - if (pm->fdata[i] > max) - max = pm->fdata[i]; - -- sprintf( interp->result, "%f", max ); -+ sprintf( Tcl_GetStringResult(interp), "%f", max ); - return TCL_OK; - } - -@@ -6448,7 +6448,7 @@ - if (pm->fdata[i] < min) - min = pm->fdata[i]; - -- sprintf( interp->result, "%f", min ); -+ sprintf( Tcl_GetStringResult(interp), "%f", min ); - return TCL_OK; - } - ---- doc/docbook/src/plplotdoc.texi.ORIG 2011-10-13 02:43:01.000000000 +0200 -+++ doc/docbook/src/plplotdoc.texi 2013-01-13 08:23:38.331240813 +0100 -@@ -6722,7 +6722,7 @@ - if (pm->fdata[i] > max) - max = pm->fdata[i]; - -- sprintf( interp->result, "%f", max ); -+ sprintf( Tcl_GetStringResult(interp), "%f", max ); - return TCL_OK; - @} - -@@ -6735,7 +6735,7 @@ - if (pm->fdata[i] < min) - min = pm->fdata[i]; - -- sprintf( interp->result, "%f", min ); -+ sprintf( Tcl_GetStringResult(interp), "%f", min ); - return TCL_OK; - @} - ---- doc/docbook/src/tcl.xml.ORIG 2011-10-13 02:43:01.000000000 +0200 -+++ doc/docbook/src/tcl.xml 2013-01-13 08:24:03.573241060 +0100 -@@ -576,7 +576,7 @@ - if (pm->fdata[i] > max) - max = pm->fdata[i]; - -- sprintf( interp->result, "%f", max ); -+ sprintf( Tcl_GetStringResult(interp), "%f", max ); - return TCL_OK; - } - -@@ -589,7 +589,7 @@ - if (pm->fdata[i] < min) - min = pm->fdata[i]; - -- sprintf( interp->result, "%f", min ); -+ sprintf( Tcl_GetStringResult(interp), "%f", min ); - return TCL_OK; - } - </programlisting> ---- drivers/ntk.c.ORIG 2011-10-13 02:43:01.000000000 +0200 -+++ drivers/ntk.c 2013-01-13 08:24:39.460241411 +0100 -@@ -115,7 +115,7 @@ - // - sprintf( scmd, "send %s {%s}", rem_interp, cmd ); // mess! make it more efficient - if ( Tcl_Eval( interp, scmd ) != TCL_OK ) -- fprintf( stderr, "%s\n", interp->result ); -+ fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) ); - } - } - -@@ -264,7 +264,7 @@ - sprintf( cmd, "send %s \"set client [tk appname]; wm deiconify .\"", rem_interp ); - if ( Tcl_Eval( interp, cmd ) != TCL_OK ) - { -- fprintf( stderr, "%s\n", interp->result ); -+ fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) ); - plexit( "No such tk server." ); - } - } -@@ -301,7 +301,7 @@ - // Set up device parameters - - Tcl_Eval( interp, "tk scaling" ); // pixels per mm -- ppm = (PLFLT) atof( interp->result ) / ( 25.4 / 72. ); -+ ppm = (PLFLT) atof( Tcl_GetStringResult(interp) ) / ( 25.4 / 72. ); - plP_setpxl( ppm, ppm ); - plP_setphy( xmin, xmax * scale, ymin, ymax * scale ); - } -@@ -371,11 +371,11 @@ - { - tk_cmd( "update" ); - tk_cmd( "info exists keypress" ); -- sscanf( interp->result, "%d", &st ); -+ sscanf( Tcl_GetStringResult(interp), "%d", &st ); - } - - tk_cmd( "set keypress" ); -- sscanf( interp->result, "%d", &key ); -+ sscanf( Tcl_GetStringResult(interp), "%d", &key ); - //fprintf(stderr,"\n%d\n", key);fflush(stderr); - tk_cmd( "unset keypress" ); - st = 0; -@@ -433,7 +433,7 @@ - { - tk_cmd( "update" ); - tk_cmd( "winfo exists $plf.f2.c$ccanv" ); -- sscanf( interp->result, "%d", &st ); -+ sscanf( Tcl_GetStringResult(interp), "%d", &st ); - } - st = 0; - // this give a "Segmentation fault", even after checking for the canvas! -@@ -450,16 +450,16 @@ - { - tk_cmd( "update" ); - tk_cmd( "info exists xloc" ); -- sscanf( interp->result, "%d", &st ); -+ sscanf( Tcl_GetStringResult(interp), "%d", &st ); - } - tk_cmd( "set xloc" ); -- sscanf( interp->result, "%d", &gin.pX ); -+ sscanf( Tcl_GetStringResult(interp), "%d", &gin.pX ); - tk_cmd( "set yloc" ); -- sscanf( interp->result, "%d", &gin.pY ); -+ sscanf( Tcl_GetStringResult(interp), "%d", &gin.pY ); - tk_cmd( "set bloc" ); -- sscanf( interp->result, "%d", &gin.button ); -+ sscanf( Tcl_GetStringResult(interp), "%d", &gin.button ); - tk_cmd( "set sloc" ); -- sscanf( interp->result, "%d", &gin.state ); -+ sscanf( Tcl_GetStringResult(interp), "%d", &gin.state ); - - gin.dX = (PLFLT) gin.pX / xmax; - gin.dY = 1. - (PLFLT) gin.pY / ymax; ---- drivers/tk.c.ORIG 2011-10-13 02:43:01.000000000 +0200 -+++ drivers/tk.c 2013-01-13 08:25:10.959241719 +0100 -@@ -764,7 +764,7 @@ - - if ( Tcl_Init( dev->interp ) != TCL_OK ) - { -- fprintf( stderr, "%s\n", dev->interp->result ); -+ fprintf( stderr, "%s\n", Tcl_GetStringResult(dev->interp) ); - abort_session( pls, "Unable to initialize Tcl" ); - } - -@@ -1568,7 +1568,7 @@ - 0, 1, ( ClientData ) & iodev->file ) != TCL_OK ) - { - fprintf( stderr, "Cannot get file info:\n\t %s\n", -- dev->interp->result ); -+ Tcl_GetStringResult(dev->interp) ); - abort_session( pls, "" ); - } - iodev->fd = fileno( iodev->file ); -@@ -1673,7 +1673,7 @@ - if ( pl_PacketSend( dev->interp, dev->iodev, pls->pdfs ) ) - { - fprintf( stderr, "Packet send failed:\n\t %s\n", -- dev->interp->result ); -+ Tcl_GetStringResult(dev->interp) ); - abort_session( pls, "" ); - } - pdfs->bp = 0; -@@ -2131,7 +2131,7 @@ - - if ( Tk_Init( interp ) ) - { -- fprintf( stderr, "tk_init:%s\n", interp->result ); -+ fprintf( stderr, "tk_init:%s\n", Tcl_GetStringResult(interp) ); - return 1; - } - -@@ -2165,7 +2165,7 @@ - if ( Tcl_ExprBoolean( dev->interp, dev->cmdbuf, &result ) ) - { - fprintf( stderr, "tk_wait command \"%s\" failed:\n\t %s\n", -- cmd, dev->interp->result ); -+ cmd, Tcl_GetStringResult(dev->interp) ); - break; - } - if ( result ) -@@ -2225,7 +2225,7 @@ - if ( result != TCL_OK ) - { - fprintf( stderr, "Server command \"%s\" failed:\n\t %s\n", -- cmd, dev->interp->result ); -+ cmd, Tcl_GetStringResult(dev->interp) ); - abort_session( pls, "" ); - } - } -@@ -2247,7 +2247,7 @@ - if ( Tcl_VarEval( dev->interp, cmd, (char **) NULL ) != TCL_OK ) - { - fprintf( stderr, "TCL command \"%s\" failed:\n\t %s\n", -- cmd, dev->interp->result ); -+ cmd, Tcl_GetStringResult(dev->interp) ); - abort_session( pls, "" ); - } - } ---- examples/tk/xtk01.c.ORIG 2011-10-13 02:43:01.000000000 +0200 -+++ examples/tk/xtk01.c 2013-01-13 08:25:33.757241943 +0100 -@@ -53,7 +53,7 @@ - // - // Results: - // Returns a standard Tcl completion code, and leaves an error --// message in interp->result if an error occurs. -+// message in Tcl_GetStringResult(interp) if an error occurs. - // - // Side effects: - // Depends on the startup script. ---- examples/tk/xtk02.c.ORIG 2011-10-13 02:43:01.000000000 +0200 -+++ examples/tk/xtk02.c 2013-01-13 08:26:06.804242266 +0100 -@@ -49,7 +49,7 @@ - pm->fdata[i] = y; - } - -- interp->result = "Things are cool in gumbyville."; -+ Tcl_SetResult(interp,(char*)"Things are cool in gumbyville.",TCL_VOLATILE); - return TCL_OK; - } - -@@ -82,7 +82,7 @@ - // - // Results: - // Returns a standard Tcl completion code, and leaves an error --// message in interp->result if an error occurs. -+// message in Tcl_GetStringResult(interp) if an error occurs. - // - // Side effects: - // Depends on the startup script. ---- examples/tk/xtk04.c.ORIG 2011-10-13 02:43:01.000000000 +0200 -+++ examples/tk/xtk04.c 2013-01-13 08:26:38.853242580 +0100 -@@ -35,7 +35,7 @@ - if ( pm->fdata[i] > max ) - max = pm->fdata[i]; - -- sprintf( interp->result, "%f", max ); -+ sprintf( Tcl_GetStringResult(interp), "%f", max ); - return TCL_OK; - } - -@@ -48,7 +48,7 @@ - if ( pm->fdata[i] < min ) - min = pm->fdata[i]; - -- sprintf( interp->result, "%f", min ); -+ sprintf( Tcl_GetStringResult(interp), "%f", min ); - return TCL_OK; - } - -@@ -80,7 +80,7 @@ - // - // Results: - // Returns a standard Tcl completion code, and leaves an error --// message in interp->result if an error occurs. -+// message in Tcl_GetStringResult(interp) if an error occurs. - // - // Side effects: - // Depends on the startup script. -@@ -158,7 +158,7 @@ - - if ( pm->dim != 2 ) - { -- interp->result = "must use 2-d matrix."; -+ Tcl_SetResult(interp,(char*)"must use 2-d matrix.",TCL_VOLATILE); - return TCL_ERROR; - } - diff --git a/sci-libs/plplot/plplot-5.9.11-r1.ebuild b/sci-libs/plplot/plplot-5.10.0-r1.ebuild index 4db95d2fde83..4deef769e481 100644 --- a/sci-libs/plplot/plplot-5.9.11-r1.ebuild +++ b/sci-libs/plplot/plplot-5.10.0-r1.ebuild @@ -1,12 +1,13 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.9.11-r1.ebuild,v 1.1 2014/01/17 20:17:24 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.10.0-r1.ebuild,v 1.1 2014/04/07 17:07:44 bicatali Exp $ EAPI=5 WX_GTK_VER="2.8" FORTRAN_NEEDED=fortran PYTHON_COMPAT=( python{2_6,2_7} ) +VIRTUALX_REQUIRED=test inherit eutils fortran-2 cmake-utils python-single-r1 toolchain-funcs \ virtualx wxwidgets java-pkg-opt-2 multilib @@ -24,21 +25,21 @@ IUSE="ada cairo cxx doc +dynamic examples fortran gd java jpeg latex lua RDEPEND=" ada? ( virtual/gnat ) - cairo? ( x11-libs/cairo[svg?,X?] ) + cairo? ( x11-libs/cairo:0=[svg?,X?] ) java? ( >=virtual/jre-1.5 ) - gd? ( media-libs/gd[jpeg?,png?] ) + gd? ( media-libs/gd:2=[jpeg?,png?] ) latex? ( app-text/ghostscript-gpl virtual/latex-base ) - lua? ( dev-lang/lua ) + lua? ( dev-lang/lua:0= ) ocaml? ( dev-lang/ocaml dev-ml/camlidl cairo? ( dev-ml/cairo-ocaml[gtk] ) ) - octave? ( sci-mathematics/octave ) - pdf? ( media-libs/libharu ) + octave? ( sci-mathematics/octave:0= ) + pdf? ( media-libs/libharu:0= ) pdl? ( dev-perl/PDL dev-perl/XML-DOM @@ -49,13 +50,13 @@ RDEPEND=" ) qhull? ( media-libs/qhull ) qt4? ( - dev-qt/qtgui:4 - dev-qt/qtsvg:4 + dev-qt/qtgui:4= + dev-qt/qtsvg:4= ) - shapefile? ( sci-libs/shapelib ) + shapefile? ( sci-libs/shapelib:0= ) tcl? ( - dev-lang/tcl - dev-tcltk/itcl + dev-lang/tcl:0= + dev-tcltk/itcl:0= tk? ( dev-lang/tk dev-tcltk/itk @@ -63,17 +64,17 @@ RDEPEND=" ) truetype? ( media-fonts/freefont - media-libs/lasi - gd? ( media-libs/gd[truetype] ) + media-libs/lasi:0= + gd? ( media-libs/gd:2=[truetype] ) ) wxwidgets? ( - x11-libs/wxGTK:2.8[X] - x11-libs/agg[truetype?] + x11-libs/wxGTK:2.8=[X] + x11-libs/agg:0=[truetype?] ) X? ( - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp + x11-libs/libX11:0= + x11-libs/libXau:0= + x11-libs/libXdmcp:0= )" DEPEND="${RDEPEND} @@ -83,6 +84,7 @@ DEPEND="${RDEPEND} dev-lang/swig ) ocaml? ( dev-ml/findlib ) + octave? ( >=dev-lang/swig-2.0.12 ) python? ( dev-lang/swig ) test? ( media-fonts/font-misc-misc @@ -96,8 +98,8 @@ PATCHES=( "${FILESDIR}"/${PN}-5.9.11-ocaml.patch "${FILESDIR}"/${PN}-5.9.11-octave.patch "${FILESDIR}"/${PN}-5.9.11-multiarch.patch + "${FILESDIR}"/${PN}-5.10.0-have-config-h.patch ) -# "${FILESDIR}"/${PN}-5.9.11-config.patch pkg_setup() { use python && python-single-r1_pkg_setup @@ -223,9 +225,7 @@ src_configure() { } src_test() { - pushd "${BUILD_DIR}" > /dev/null - Xemake test || die "tests failed" - popd > /dev/null + VIRTUALX_COMMAND=cmake-utils_src_test virtualmake } src_install() { diff --git a/sci-libs/plplot/plplot-5.9.10-r1.ebuild b/sci-libs/plplot/plplot-5.9.10-r1.ebuild deleted file mode 100644 index e3fe10affd16..000000000000 --- a/sci-libs/plplot/plplot-5.9.10-r1.ebuild +++ /dev/null @@ -1,201 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.9.10-r1.ebuild,v 1.2 2013/11/16 08:28:49 dirtyepic Exp $ - -EAPI=5 - -WX_GTK_VER="2.8" -FORTRAN_NEEDED=fortran -PYTHON_COMPAT=( python{2_6,2_7} ) - -inherit eutils fortran-2 cmake-utils python-single-r1 toolchain-funcs \ - virtualx wxwidgets java-pkg-opt-2 multilib - -DESCRIPTION="Multi-language scientific plotting library" -HOMEPAGE="http://plplot.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0/11" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="ada cairo cxx doc +dynamic examples fortran gd java jpeg latex lua - ocaml octave pdf perl png python qhull qt4 shapefile svg tcl test - threads tk truetype wxwidgets X" - -RDEPEND=" - ada? ( virtual/gnat ) - cairo? ( x11-libs/cairo[svg?,X?] ) - java? ( >=virtual/jre-1.5 ) - gd? ( media-libs/gd[jpeg?,png?] ) - latex? ( virtual/latex-base app-text/ghostscript-gpl ) - lua? ( dev-lang/lua ) - ocaml? ( - dev-lang/ocaml - dev-ml/camlidl - cairo? ( dev-ml/cairo-ocaml[gtk] ) ) - octave? ( sci-mathematics/octave ) - pdf? ( media-libs/libharu ) - perl? ( dev-perl/PDL dev-perl/XML-DOM ) - python? ( - dev-python/numpy[${PYTHON_USEDEP}] - qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] ) ) - qhull? ( media-libs/qhull ) - qt4? ( - dev-qt/qtgui:4 - dev-qt/qtsvg:4 ) - shapefile? ( sci-libs/shapelib ) - tcl? ( dev-lang/tcl dev-tcltk/itcl - tk? ( dev-lang/tk dev-tcltk/itk ) ) - truetype? ( - media-fonts/freefont - media-libs/lasi - gd? ( media-libs/gd[truetype] ) ) - wxwidgets? ( x11-libs/wxGTK:2.8[X] x11-libs/agg[truetype?] ) - X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen ) - java? ( >=virtual/jdk-1.5 dev-lang/swig ) - ocaml? ( dev-ml/findlib ) - python? ( dev-lang/swig ) - test? ( media-fonts/font-misc-misc - media-fonts/font-cursor-misc )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) qt4? ( dynamic ) test? ( latex )" - -pkg_setup() { - use python && python-single-r1_pkg_setup - java-pkg-opt-2_pkg_setup -} - -src_prepare() { - # path for python independent of python version - epatch \ - "${FILESDIR}"/${PN}-5.9.6-python.patch \ - "${FILESDIR}"/${PN}-5.9.10-tcltk.patch \ - "${FILESDIR}"/${PN}-5.9.10-tcl86.patch \ - "${FILESDIR}"/${PN}-5.9.10-haru.patch - - # avoid installing license - sed -i -e '/COPYING.LIB/d' CMakeLists.txt || die - # prexify hard-coded /usr/include in cmake modules - sed -i \ - -e "s:/usr/include:${EPREFIX}/usr/include:g" \ - -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \ - -e "s:/usr/share:${EPREFIX}/usr/share:g" \ - cmake/modules/*.cmake || die - # change default install directories for doc and examples - sed -i \ - -e 's:${DATA_DIR}/examples:${DOC_DIR}/examples:g' \ - $(find "${S}" -name CMakeLists.txt) || die - sed -i \ - -e 's:${VERSION}::g' \ - -e "s:doc/\${PACKAGE}:doc/${PF}:" \ - cmake/modules/instdirs.cmake || die - java-utils-2_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DDEFAULT_ALL_DEVICES=ON - -DTEST_DYNDRIVERS=OFF - -DCMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)" - -DENABLE_d=OFF - $(cmake-utils_use_build doc DOX_DOC) - $(cmake-utils_use_build test) - $(cmake-utils_use_has python NUMPY) - $(cmake-utils_use_has shapefile SHAPELIB) - $(cmake-utils_use_with truetype FREETYPE) - $(cmake-utils_use_enable ada) - $(cmake-utils_use_enable cxx) - $(cmake-utils_use_enable dynamic DYNDRIVERS) - $(cmake-utils_use_enable fortran f77) - $(cmake-utils_use_enable java) - $(cmake-utils_use_enable lua) - $(cmake-utils_use_enable ocaml) - $(cmake-utils_use_enable octave) - $(cmake-utils_use_enable perl pdl) - $(cmake-utils_use_enable python) - $(cmake-utils_use_enable qt4 qt) - $(cmake-utils_use_enable tcl) - $(cmake-utils_use_enable tcl itcl) - $(cmake-utils_use_enable tk) - $(cmake-utils_use_enable tk itk) - $(cmake-utils_use_enable wxwidgets) - $(cmake-utils_use threads PL_HAVE_PTHREAD) - $(cmake-utils_use qhull PL_HAVE_QHULL) - $(cmake-utils_use qt4 PLD_aqt) - $(cmake-utils_use qt4 PLD_bmpqt) - $(cmake-utils_use qt4 PLD_epsqt) - $(cmake-utils_use qt4 PLD_extqt) - $(cmake-utils_use qt4 PLD_jpgqt) - $(cmake-utils_use qt4 PLD_memqt) - $(cmake-utils_use qt4 PLD_pdfqt) - $(cmake-utils_use qt4 PLD_pngqt) - $(cmake-utils_use qt4 PLD_ppmqt) - $(cmake-utils_use qt4 PLD_svgqt) - $(cmake-utils_use qt4 PLD_qtwidget) - $(cmake-utils_use qt4 PLD_tiffqt) - $(cmake-utils_use cairo PLD_extcairo) - $(cmake-utils_use cairo PLD_memcairo) - $(cmake-utils_use cairo PLD_pdfcairo) - $(cmake-utils_use cairo PLD_pngcairo) - $(cmake-utils_use cairo PLD_pscairo) - $(cmake-utils_use cairo PLD_svgcairo) - $(cmake-utils_use cairo PLD_wincairo) - $(cmake-utils_use cairo PLD_xcairo) - $(cmake-utils_use tk PLD_ntk) - $(cmake-utils_use tk PLD_tk) - $(cmake-utils_use tk PLD_tkwin) - $(cmake-utils_use gd PLD_gif) - $(cmake-utils_use gd PLD_jpeg) - $(cmake-utils_use gd PLD_png) - $(cmake-utils_use pdf PLD_pdf) - $(cmake-utils_use latex PLD_ps) - $(cmake-utils_use latex PLD_pstex) - $(cmake-utils_use truetype PLD_psttf) - $(cmake-utils_use svg PLD_svg) - $(cmake-utils_use wxwidgets PLD_wxpng) - $(cmake-utils_use wxwidgets PLD_wxwidgets) - $(cmake-utils_use X PLD_xwin) - ) - - [[ $(tc-getFC) != *g77 ]] && \ - mycmakeargs+=( - $(cmake-utils_use_enable fortran f95) - ) - - use truetype && mycmakeargs+=( - -DPL_FREETYPE_FONT_PATH:PATH="${EPREFIX}/usr/share/fonts/freefont" - ) - use shapefile && mycmakeargs+=( - -DSHAPELIB_INCLUDE_DIR="${EPREFIX}/usr/include/libshp" - ) - use python && mycmakeargs+=( $(cmake-utils_use_enable qt4 pyqt4) ) - use doc && mycmakeargs+=( -DPREBUILT_DOC=ON ) - cmake-utils_src_configure - - # clean up bloated pkg-config files (help linking properly on prefix) - sed -i \ - -e "/Cflags/s:-I\(${EPREFIX}\|\)/usr/include[[:space:]]::g" \ - -e "/Libs/s:-L\(${EPREFIX}\|\)/usr/lib\(64\|\)[[:space:]]::g" \ - -e "s:${LDFLAGS}::g" \ - "${BUILD_DIR}"/pkgcfg/*pc || die -} - -src_test() { - pushd "${BUILD_DIR}" > /dev/null - Xemake test || die "tests failed" - popd > /dev/null -} - -src_install() { - cmake-utils_src_install - use examples || rm -r "${ED}"/usr/share/doc/${PF}/examples - #use doc && dohtml -r doc/docbook/src/* - if use java; then - rm -r "${ED}"/usr/share/java "${ED}"/usr/$(get_libdir)/jni || die - java-pkg_dojar "${BUILD_DIR}"/examples/java/${PN}.jar - java-pkg_doso "${BUILD_DIR}"/bindings/java/plplotjavac_wrap.so - fi -} diff --git a/sci-libs/plplot/plplot-5.9.9-r2.ebuild b/sci-libs/plplot/plplot-5.9.9-r2.ebuild deleted file mode 100644 index e71ba618ab45..000000000000 --- a/sci-libs/plplot/plplot-5.9.9-r2.ebuild +++ /dev/null @@ -1,191 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.9.9-r2.ebuild,v 1.2 2013/11/16 08:28:48 dirtyepic Exp $ - -EAPI=4 - -WX_GTK_VER="2.8" -PYTHON_DEPEND="python? 2" -FORTRAN_NEEDED=fortran - -inherit eutils fortran-2 cmake-utils python toolchain-funcs virtualx \ - wxwidgets java-pkg-opt-2 multilib - -DESCRIPTION="Multi-language scientific plotting library" -HOMEPAGE="http://plplot.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="ada cairo cxx doc dynamic examples fortran gd java jpeg latex lua - ocaml octave pdf perl png python qhull qt4 svg tcl test threads tk - truetype wxwidgets X" - -RDEPEND=" - ada? ( virtual/gnat ) - cairo? ( x11-libs/cairo[svg?,X?] ) - java? ( >=virtual/jre-1.5 ) - gd? ( media-libs/gd[jpeg?,png?] ) - latex? ( virtual/latex-base app-text/ghostscript-gpl ) - lua? ( dev-lang/lua ) - ocaml? ( - dev-lang/ocaml - dev-ml/camlidl - cairo? ( dev-ml/cairo-ocaml[gtk] ) ) - octave? ( sci-mathematics/octave ) - pdf? ( media-libs/libharu ) - perl? ( dev-perl/PDL dev-perl/XML-DOM ) - python? ( - dev-python/numpy - qt4? ( dev-python/PyQt4 ) ) - qhull? ( media-libs/qhull ) - qt4? ( - dev-qt/qtgui:4 - dev-qt/qtsvg:4 ) - tcl? ( dev-lang/tcl dev-tcltk/itcl - tk? ( dev-lang/tk dev-tcltk/itk ) ) - truetype? ( - media-fonts/freefont - media-libs/lasi - gd? ( media-libs/gd[truetype] ) ) - wxwidgets? ( x11-libs/wxGTK:2.8[X] x11-libs/agg[truetype?] ) - X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - java? ( >=virtual/jdk-1.5 dev-lang/swig ) - ocaml? ( dev-ml/findlib ) - python? ( dev-lang/swig ) - test? ( media-fonts/font-misc-misc - media-fonts/font-cursor-misc )" -REQUIRED_USE="test? ( latex )" - -pkg_setup() { - use python && python_set_active_version 2 - java-pkg-opt-2_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-tk86.patch - # path for python independent of python version - epatch "${FILESDIR}"/${PN}-5.9.6-python.patch - # test with pdf assumes a modified bundled libharu - epatch "${FILESDIR}"/${PN}-5.9.9-no-pdftest.patch - # gentoo bug #419743 fixed upstream - epatch "${FILESDIR}"/${PN}-5.9.9-CMakeLists.txt.patch - - # avoid installing license - sed -i -e '/COPYING.LIB/d' CMakeLists.txt || die - - # change default install directories for doc and examples - sed -i \ - -e 's:${DATA_DIR}/examples:${DOC_DIR}/examples:g' \ - $(find "${S}" -name CMakeLists.txt) || die - sed -i \ - -e 's:${VERSION}::g' \ - -e "s:doc/\${PACKAGE}:doc/${PF}:" \ - cmake/modules/instdirs.cmake || die - java-utils-2_src_prepare -} - -src_configure() { - mycmakeargs=( - -DDEFAULT_ALL_DEVICES=ON - -DTEST_DYNDRIVERS=OFF - -DCMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)" - -DENABLE_d=OFF - $(cmake-utils_use_build test) - $(cmake-utils_use_has python numpy) - $(cmake-utils_use_with truetype FREETYPE) - $(cmake-utils_use_enable ada) - $(cmake-utils_use_enable cxx) - $(cmake-utils_use_enable dynamic DYNDRIVERS) - $(cmake-utils_use_enable fortran f77) - $(cmake-utils_use_enable java) - $(cmake-utils_use_enable lua) - $(cmake-utils_use_enable ocaml) - $(cmake-utils_use_enable octave) - $(cmake-utils_use_enable perl pdl) - $(cmake-utils_use_enable python) - $(cmake-utils_use_enable qt4 qt) - $(cmake-utils_use_enable tcl) - $(cmake-utils_use_enable tcl itcl) - $(cmake-utils_use_enable tk) - $(cmake-utils_use_enable tk itk) - $(cmake-utils_use_enable wxwidgets) - $(cmake-utils_use threads PL_HAVE_PTHREAD) - $(cmake-utils_use qhull PL_HAVE_QHULL) - $(cmake-utils_use qt4 PLD_aqt) - $(cmake-utils_use qt4 PLD_bmpqt) - $(cmake-utils_use qt4 PLD_epsqt) - $(cmake-utils_use qt4 PLD_extqt) - $(cmake-utils_use qt4 PLD_jpgqt) - $(cmake-utils_use qt4 PLD_memqt) - $(cmake-utils_use qt4 PLD_pdfqt) - $(cmake-utils_use qt4 PLD_pngqt) - $(cmake-utils_use qt4 PLD_ppmqt) - $(cmake-utils_use qt4 PLD_svgqt) - $(cmake-utils_use qt4 PLD_qtwidget) - $(cmake-utils_use qt4 PLD_tiffqt) - $(cmake-utils_use cairo PLD_extcairo) - $(cmake-utils_use cairo PLD_memcairo) - $(cmake-utils_use cairo PLD_pdfcairo) - $(cmake-utils_use cairo PLD_pngcairo) - $(cmake-utils_use cairo PLD_pscairo) - $(cmake-utils_use cairo PLD_svgcairo) - $(cmake-utils_use cairo PLD_wincairo) - $(cmake-utils_use cairo PLD_xcairo) - $(cmake-utils_use tk PLD_ntk) - $(cmake-utils_use tk PLD_tk) - $(cmake-utils_use tk PLD_tkwin) - $(cmake-utils_use gd PLD_gif) - $(cmake-utils_use gd PLD_jpeg) - $(cmake-utils_use gd PLD_png) - $(cmake-utils_use pdf PLD_pdf) - $(cmake-utils_use latex PLD_ps) - $(cmake-utils_use latex PLD_pstex) - $(cmake-utils_use truetype PLD_psttf) - $(cmake-utils_use svg PLD_svg) - $(cmake-utils_use wxwidgets PLD_wxpng) - $(cmake-utils_use test PLD_ps) - $(cmake-utils_use wxwidgets PLD_wxwidgets) - $(cmake-utils_use X PLD_xwin) - ) - - [[ $(tc-getFC) != *g77 ]] && \ - mycmakeargs+=( - $(cmake-utils_use_enable fortran f95) - ) - - use truetype && mycmakeargs+=( - -DPL_FREETYPE_FONT_PATH:PATH="${EPREFIX}/usr/share/fonts/freefont" - ) - - use python && mycmakeargs+=( $(cmake-utils_use_enable qt4 pyqt4) ) - use doc && mycmakeargs+=( -DPREBUILT_DOC=ON ) - cmake-utils_src_configure - - # clean up bloated pkg-config files (help linking properly on prefix) - sed -i \ - -e "/Cflags/s:-I\(${EPREFIX}\|\)/usr/include[[:space:]]::g" \ - -e "/Libs/s:-L\(${EPREFIX}\|\)/usr/lib\(64\|\)[[:space:]]::g" \ - -e "s:${LDFLAGS}::g" \ - "${CMAKE_BUILD_DIR}"/pkgcfg/*pc || die -} - -src_test() { - pushd "${CMAKE_BUILD_DIR}" > /dev/null - Xemake test || die "tests failed" - popd > /dev/null -} - -src_install() { - cmake-utils_src_install - use examples || rm -rf "${ED}"/usr/share/doc/${PF}/examples - if use java; then - rm -rf "${ED}"/usr/share/java "${ED}"/usr/$(get_libdir)/jni - java-pkg_dojar "${CMAKE_BUILD_DIR}"/examples/java/${PN}.jar - java-pkg_doso "${CMAKE_BUILD_DIR}"/bindings/java/plplotjavac_wrap.so - fi -} |