From a2c17286efdeddfbc2fa8c56e196a2ec4b5d9a9a Mon Sep 17 00:00:00 2001 From: Sebastien Fabbro Date: Tue, 5 Nov 2013 23:56:24 +0000 Subject: Fixed tcl/tk binding upgrade (bug #489728), add shared lib soversion slot, use BUILD_DIR instead of CMAKE_BUILD_DIR, fixed calling libharu headers Package-Manager: portage-2.2.7-prefix/cvs/Linux x86_64 Manifest-Sign-Key: 0x13CB1360 --- sci-libs/plplot/ChangeLog | 11 +- sci-libs/plplot/Manifest | 14 +- sci-libs/plplot/files/plplot-5.9.10-haru.patch | 30 ++++ sci-libs/plplot/files/plplot-5.9.10-itcltk.patch | 34 ++++ sci-libs/plplot/files/plplot-5.9.10-tcl86.patch | 77 +++++++++ sci-libs/plplot/files/plplot-5.9.10-tcltk.patch | 80 +++++++++ sci-libs/plplot/plplot-5.9.10-r1.ebuild | 202 +++++++++++++++++++++++ sci-libs/plplot/plplot-5.9.10.ebuild | 197 ---------------------- 8 files changed, 442 insertions(+), 203 deletions(-) create mode 100644 sci-libs/plplot/files/plplot-5.9.10-haru.patch create mode 100644 sci-libs/plplot/files/plplot-5.9.10-itcltk.patch create mode 100644 sci-libs/plplot/files/plplot-5.9.10-tcl86.patch create mode 100644 sci-libs/plplot/files/plplot-5.9.10-tcltk.patch create mode 100644 sci-libs/plplot/plplot-5.9.10-r1.ebuild delete mode 100644 sci-libs/plplot/plplot-5.9.10.ebuild (limited to 'sci-libs') diff --git a/sci-libs/plplot/ChangeLog b/sci-libs/plplot/ChangeLog index a8f38ae0be87..0c9f233f359f 100644 --- a/sci-libs/plplot/ChangeLog +++ b/sci-libs/plplot/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for sci-libs/plplot # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.50 2013/10/28 19:36:30 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.51 2013/11/05 23:56:14 bicatali Exp $ + +*plplot-5.9.10-r1 (05 Nov 2013) + + 05 Nov 2013; Sébastien Fabbro + +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, + +plplot-5.9.10-r1.ebuild, -plplot-5.9.10.ebuild: + Fixed tcl/tk binding upgrade (bug #489728), add shared lib soversion slot, use + BUILD_DIR instead of CMAKE_BUILD_DIR, fixed calling libharu headers *plplot-5.9.10 (28 Oct 2013) diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest index 363a1f1ad2d7..ad27cc43b33a 100644 --- a/sci-libs/plplot/Manifest +++ b/sci-libs/plplot/Manifest @@ -1,21 +1,25 @@ -----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 3637 SHA256 f86bf3dcb7fd2acc58a79da8330e44596847dd215daed07cbdcec1d2f00cdbd5 SHA512 a1d2346dce497ced11c04d665c5bdb695dbc10302ee55a4acb4779691cf1f9e471d8c0aab6e6a71602459a49b86cace6890f8699f9ae6d7be4d3612c610cf13c WHIRLPOOL ca44297aab8c30dcd4110bf2f2ab8a43a63382b0e61d1c9c0ac4f686b72e9605f104709c59649ce8459f47f2d7c58f1538a5001875356e1415fa2ff6a955c3f8 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.9.10.tar.gz 15215720 SHA256 6be3e20d6992cb2afd132a00cbc812aa5db170abe5855c44eb01481ac4b0b723 SHA512 356eff0d27f8b5a672992a8cb642a7bcd15cd49d18512b9e9a3c999d28e19c7da0bf095ac0bbdf4dc1df512190265179aa9311fbead80260a9968cc3d1a11fbe WHIRLPOOL d77917db0c3e9a7236525df01e36f0611bd2145083d827077ac2019ef9c38d0187dada0e20893aaaa37b425f67c700ab50474d63ff457efccb23ca33b9e47c43 DIST plplot-5.9.9.tar.gz 13778554 SHA256 747e5a043681f3e20df30d159f6e8517cb1e25e502322adcd80e8ca53ec2c90d SHA512 ad46d40fbfecdf9b8d9e6f1e9da986716b07f88a91ad78f14498bd83acb0186c984b6b5079564046cfedfd1010692d0e7d3c3ce8831b3d1c825c8db335d4c7f1 WHIRLPOOL 3da257b0d0db87f46fd950e32d7bf22ef25b27d7334113fc2b0e5219fdb1d3462a425ff02550ee907fd105041d35f30b22b2b1b39649a13568d3f04f51525664 -EBUILD plplot-5.9.10.ebuild 6320 SHA256 ead1c15438f1c28f72d42170f1ce0bba978a8b94f4831c24db654fa236848292 SHA512 73b9f444ac510d6ef26407a92cd35f2f76c23a5d0f320b84434019577e03a2b7f830539304dde9268304deeafb8f0f20f69d610b2fee096817f3f61c232f0372 WHIRLPOOL aa668aa9f0c0a05c3bce21a37debf09a171b74dab175941a4466ac9b8a0ebf42dfc8d5555e8de13735a3623e8ab48f746b2dceecc28f43293c3d00511baaeb03 +EBUILD plplot-5.9.10-r1.ebuild 6437 SHA256 c82c3aa8fdea05683af46f12262646e8272c78be42d3d47b0c037b94e89e93ed SHA512 e9baaf0a0cc8d2a58e0bd44bc41521eb9cb6d652be3c6883ecc041ac16c161ee70caea6abf159e90d164787fb4eae1ef01537aa8b02df00c63b4f840826ecf03 WHIRLPOOL 2e801468aa8c9451a6c68572499468fac540b2767127bd561b886c05ac61539f3fe886d4e0f1bdfa2b2fd877b08c390210ab58c610e247affef7ed4e6234821a EBUILD plplot-5.9.9-r1.ebuild 5944 SHA256 7f47557aa53823b2cc2bbab2d9d7c205f3d3cf3c9f820afb5d5c59786e807e14 SHA512 e7b2a877941837b95ea96cea3053577aa252071426cf00fcae098fa5f0cfbbc5c5a7ba2662fc58a39f78d8e73c0b129a2521a6ec34edbb2dc683e9d806acda66 WHIRLPOOL 85ee7e189bff2d637e29c1b28127af703e4dfbf72db6e6ce5577e2555f68235941805f80dee3348935ffbb6fb6c095ad2a4dc567770ed1548d2cce17c51ce973 EBUILD plplot-5.9.9-r2.ebuild 5959 SHA256 f62f54b16283b5bb5c06e514b9f2725a23f6a1f28f95be319859f3449c8c19a7 SHA512 090fe2769d0a8171eb599bfb59166d486ee3c2b153c005ce1bfb9d5eae21fea494684f9d61f0d2fd52701be9ffd42c3fb00d2e0ebf9c60832fdb666923ff3ea7 WHIRLPOOL 94e11c2c1388f42167d10359150b1c41de6f4e0153b8a5bc828e7106e8c1ecd2fb64a8b0ae76443bf470a0f07581cd75293ae17d19ab1d50c05a5478d2b4b2ab -MISC ChangeLog 8903 SHA256 dd547bd7558b926338aed6d6cf18ce88f3357e8d1a3e5cb49b52699ff4618e21 SHA512 062f567b9a121d7781ea4d8484759a2ae1a8329a4cc94a51493ff4fb1dab5750b343f465fe56407cd846aeb28b0e19ff1fa721b120e12dce586c2f886e63014b WHIRLPOOL 6e23b844a3ac6b92a3c4e31156d2959e69cd449b3d80e930b3d4a8abf2952189ed0dbe9dadd070d11d035dcd4ae165b57cb2beb284e722e02169fbe555a051d7 +MISC ChangeLog 9334 SHA256 0e6c5364b3613b39a174e2fbc406531e636b87f96288c3e2e8b32f39b148a4a9 SHA512 624511161513213610adb9dcada2b65f71b14cbfe4159df100e7cbbc48935213c9f8bae9c9cd3c36645d8410a3124d88015639077e3c5f7b8ffcc7148b9f1a06 WHIRLPOOL ba3a0ebdf2f2f0a3b2de2f93664f9d59b8d56698db7a15cf6d873945ed5b76dad4436d1b58aed237bd4329bad615b31b6a04bef0f172bfaa2a0b6369b5c40c73 MISC metadata.xml 1340 SHA256 ba735c538783ca6b35ccccedd2626936718d8061c24e8335d2af42a00ecc3b9d SHA512 0b715adc49a9ea90ec3f7a3a94c91b006a815674f8190a3398e30064ae5eb42fbc261ad972ea37a3943e93f552032da5eaa8d4d0af0e7066282511c27a95ad09 WHIRLPOOL c44d78922e8bdd22e2399fbbc973541a5fc8ff085aa73a87a1368ca98612ef9ff49b02f7a3aba7405496e554e71b795dbd1e67fb0949bc8692d5b74c2d18a0b3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iEYEAREIAAYFAlJuvNsACgkQ1ycZbhPLE2CgrACghCykKATWC1dXiXRkLCD7aFmT -sl4An2P6kKyKMWmm06K32gbjsNyp0C3k -=js76 +iEYEAREIAAYFAlJ5haMACgkQ1ycZbhPLE2AdbQCbBYsv9mvJaYxR+ggXUPJEu3zS +glEAoKVfH0w0VUP58sG0c21Lawt+TT2b +=RpSc -----END PGP SIGNATURE----- diff --git a/sci-libs/plplot/files/plplot-5.9.10-haru.patch b/sci-libs/plplot/files/plplot-5.9.10-haru.patch new file mode 100644 index 000000000000..9f43875f6aeb --- /dev/null +++ b/sci-libs/plplot/files/plplot-5.9.10-haru.patch @@ -0,0 +1,30 @@ +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 + #include + +-#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 new file mode 100644 index 000000000000..bc1d0f1ed04e --- /dev/null +++ b/sci-libs/plplot/files/plplot-5.9.10-itcltk.patch @@ -0,0 +1,34 @@ +--- 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 new file mode 100644 index 000000000000..dfa606c1cdbc --- /dev/null +++ b/sci-libs/plplot/files/plplot-5.9.10-tcl86.patch @@ -0,0 +1,77 @@ +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 new file mode 100644 index 000000000000..94271604c76e --- /dev/null +++ b/sci-libs/plplot/files/plplot-5.9.10-tcltk.patch @@ -0,0 +1,80 @@ +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 +@@ -1,4 +1,4 @@ +-// $Id: plplot-5.9.10-tcltk.patch,v 1.1 2013/11/05 23:56:14 bicatali Exp $ ++// $Id: plplot-5.9.10-tcltk.patch,v 1.1 2013/11/05 23:56:14 bicatali Exp $ + // + // Modified version of tkMain.c, from Tk 3.6. + // Maurice LeBrun +@@ -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/plplot-5.9.10-r1.ebuild b/sci-libs/plplot/plplot-5.9.10-r1.ebuild new file mode 100644 index 000000000000..b478b53c9843 --- /dev/null +++ b/sci-libs/plplot/plplot-5.9.10-r1.ebuild @@ -0,0 +1,202 @@ +# 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.1 2013/11/05 23:56:14 bicatali 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 wxwidgets && wxwidgets_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.10.ebuild b/sci-libs/plplot/plplot-5.9.10.ebuild deleted file mode 100644 index 563f8406d0fe..000000000000 --- a/sci-libs/plplot/plplot-5.9.10.ebuild +++ /dev/null @@ -1,197 +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.ebuild,v 1.1 2013/10/28 19:36:30 bicatali 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" -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 wxwidgets && wxwidgets_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 - # 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" \ - "${CMAKE_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 "${CMAKE_BUILD_DIR}"/examples/java/${PN}.jar - java-pkg_doso "${CMAKE_BUILD_DIR}"/bindings/java/plplotjavac_wrap.so - fi -} -- cgit v1.2.3-65-gdbad