diff options
| -rw-r--r-- | sci-geosciences/grass/ChangeLog | 11 | ||||
| -rw-r--r-- | sci-geosciences/grass/Manifest | 28 | ||||
| -rw-r--r-- | sci-geosciences/grass/files/99grass-6 | 3 | ||||
| -rw-r--r-- | sci-geosciences/grass/files/99grass-6.2 | 3 | ||||
| -rw-r--r-- | sci-geosciences/grass/files/grass-6.2.0-html-nonviz.patch | 39 | ||||
| -rw-r--r-- | sci-geosciences/grass/files/grass-6.2.1-ffmpeg-fix.patch | 24 | ||||
| -rw-r--r-- | sci-geosciences/grass/files/grass-6.2.1-gcc43.patch | 11 | ||||
| -rw-r--r-- | sci-geosciences/grass/files/grass-6.2.1-html-nonviz.patch | 33 | ||||
| -rw-r--r-- | sci-geosciences/grass/files/grass-6.2.1-html-nviz-fix.patch | 22 | ||||
| -rw-r--r-- | sci-geosciences/grass/files/grass-pkgconf.patch | 21 | ||||
| -rw-r--r-- | sci-geosciences/grass/grass-5.4.0.ebuild | 117 | ||||
| -rw-r--r-- | sci-geosciences/grass/grass-6.0.1.ebuild | 117 | ||||
| -rw-r--r-- | sci-geosciences/grass/grass-6.2.1.ebuild | 202 | ||||
| -rw-r--r-- | sci-geosciences/grass/grass-6.4.0_rc6.ebuild | 88 |
14 files changed, 113 insertions, 606 deletions
diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog index 05ca2ba96e00..13313a529268 100644 --- a/sci-geosciences/grass/ChangeLog +++ b/sci-geosciences/grass/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for sci-geosciences/grass # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.78 2010/04/30 08:54:30 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.79 2010/05/04 10:52:10 scarabeus Exp $ + + 04 May 2010; Tomáš Chvátal <scarabeus@gentoo.org> -grass-5.4.0.ebuild, + -files/99grass-6, -grass-6.0.1.ebuild, -files/99grass-6.2, + -files/grass-6.2.0-html-nonviz.patch, -grass-6.2.1.ebuild, + -files/grass-6.2.1-ffmpeg-fix.patch, -files/grass-6.2.1-gcc43.patch, + -files/grass-6.2.1-html-nonviz.patch, + -files/grass-6.2.1-html-nviz-fix.patch, grass-6.4.0_rc6.ebuild, + +files/grass-pkgconf.patch: + Update install approach. Install .pc file. Drop old. 30 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org> grass-6.4.0_rc6.ebuild: diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest index 3a7a42930276..12ef8eea8eb9 100644 --- a/sci-geosciences/grass/Manifest +++ b/sci-geosciences/grass/Manifest @@ -1,26 +1,24 @@ -AUX 99grass-6 100 RMD160 e62ea08a12a22039fbe8fb396e011fd9b769ff2f SHA1 8ef4acdbb4330b64a51e7b8304f9c68fce17c438 SHA256 dce426f95d7be7f7deae328537ad8666d4ff140dc6de0bb65495f23ad1a5e8f8 -AUX 99grass-6.2 68 RMD160 08c932be282925ca1316664ba7ef9654a0543488 SHA1 ba73dcd993687fc0bfa95d97ff1ce30fb05bfa45 SHA256 bf7b1df4b9d9f71ffdd36cf924cb374032fd49ba0277a5cc7a4f77658cdc76e4 -AUX grass-6.2.0-html-nonviz.patch 1721 RMD160 ad57109c03792e8376ccbe2ed8ff459b850cdf20 SHA1 20122b510bc7e52dfbaac04fd8587281d99a08e6 SHA256 492475975bb08f5b24f6c043a8bdfce32a1b22b5432127223dfe36e1ba66057c -AUX grass-6.2.1-ffmpeg-fix.patch 816 RMD160 eaefa978b965e1b66d0efec6d3ba8a07d4515307 SHA1 322b5ed2089f5b94f74ba38924cde7fe2611918c SHA256 2cbdfe11078783cf5bc95a5f4baaa05769c0921025737d8afdcf638321b4b501 -AUX grass-6.2.1-gcc43.patch 488 RMD160 23dfe1e408063330281258ae04dee5b07427b5f9 SHA1 c09e881eb3dde567ed1414075f1cbb33426928b4 SHA256 59346dd5aa8d4411622843db8256f20f7cddd1cc506757dd0b7820fa8f7349a4 -AUX grass-6.2.1-html-nonviz.patch 1742 RMD160 39103490f48abcc53f1fb8f3d9df48910866fab6 SHA1 a98486fb4b21f5ef42084d37ec0e6addc655fdc2 SHA256 73b7661832230f5ea1dadf983d6ce723b2f87bd3bafc4e939f36f7620d764270 -AUX grass-6.2.1-html-nviz-fix.patch 592 RMD160 7935449babc7dd6a07cffad66513c404a266848f SHA1 653a049d80fba93968620f7dc4e0ec2bbfb8edba SHA256 df2bfefc4aa6ddb030eb4a809a3cc885ade69e526a0ec99cd31fe1b751e05c41 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX grass-6.3.0-gcc44.patch 387 RMD160 d104b2cbea3ee14d8f266da122d9e4aef63dc6b0 SHA1 1ce70dbb99f64419361816a75e6948d8960d4f4f SHA256 210e7f7f34ec04caf41bd312f5c90c7be206656766e98725f27185e0c8759f80 AUX grass-6.3.0-html-nonviz.patch 763 RMD160 054b336fcc47d64e56a40d2dda955732047ceb08 SHA1 e8f10078f8cccc5a47d2f2c8bed1d9ace7ed2598 SHA256 e870d724170a9d629a5d0bb8897a2e2f5d1b25eed204a7450061f26d48192981 AUX grass-6.3.0-o_creat.patch 1469 RMD160 dd2cec8103c07eabd906f3792544bf2225cb1287 SHA1 3bb27a3069abb47b3ac6a9480c508a036d1f3aba SHA256 b9bb9ea09414fbcb00b52520cd4e98147d3de199401efe9996eb6f911fd7ef05 AUX grass-6.4.0-html-nonviz.patch 2043 RMD160 054a8510ba051656ea89652995a975473fc64dc7 SHA1 49f3f75a1090a3012d60df729aeadb1bafe24417 SHA256 f037db888e1ac33185615207240e98a836fd9efdb5021d0e2f166ea121c98112 +AUX grass-pkgconf.patch 1255 RMD160 c3377144c50575608417e959d9a34b9856d8d887 SHA1 1d01bdf971af0f0a5a1c32fcfcf19656fbe2dc7c SHA256 4a0bfd6e93892e4e72e05d2c0405689ffdaadc56f8bc40b093254a162c6f72b4 AUX grass_icon.png 4470 RMD160 b4a6deeb6ce859a57c6aba3c4095e2dd718f36e9 SHA1 6839c28ec1d01c486d45a245a159fced3c0d0810 SHA256 c6c873f24bb59b8ff98000b500ca3a047ca86af216b4b7b1593baef5f2fbe6a9 -DIST grass-5.4.0.tar.gz 20487737 RMD160 76821edeff55e72ffad0fa5db275dca2221660a5 SHA1 3324bf8af1861c63d9d171577ffa7fb7e87582f1 SHA256 ac4cc3f1408750d7f9d54ea2155b7e8960041337d4e4d3662bffb41cb9899537 -DIST grass-6.0.1.tar.gz 8508427 RMD160 35cc84ecb593ddc83f78d41985d1ffe9db060295 SHA1 7faa22d1ac3e2272c12a82e284d2e3a8819b31ca SHA256 53127007260bf2181e711fa0520636ff497bd0c3406c16a1002945b1c4415340 -DIST grass-6.2.1.tar.gz 12599109 RMD160 ff885023b926ece6545591666fdaa1189facc8bc SHA1 bbd179b9145d735873a13f40a25784b64762387b SHA256 fb7a1030a51222b586f1fd4cbd6ee2c99a0974dba72c70032d336a6a30b073f9 DIST grass-6.3.0.tar.gz 17688547 RMD160 66db4223fc0d5172371903f71d68f1dd024ad2d2 SHA1 c4b0b1407655f8ed1e16e911df191323fe00eb9e SHA256 a84658a7065a3ece09d3d18a3b601515484d1e5dbb3a92b8fbac3c37e368acf4 DIST grass-6.4.0RC5.tar.gz 21087594 RMD160 3fa11d2672a4717a7f348cec3810bcbe51700202 SHA1 6f1f069d3044555f578c62e0601965ff745462b8 SHA256 2a9b43f5ca4946c204a20b286ebb49fe08ef022ea1537595cb9b8d1009aa8e7a DIST grass-6.4.0RC6.tar.gz 22598465 RMD160 6c8a0cd56b72b11395cf97953bc74672939225f3 SHA1 4e82d7211ac85dbefa15ff27397d896d1955db64 SHA256 5f550abf05e65ac91ef38aa249d6de62774bfda1fae02a7ac0a4652284ea6c10 -EBUILD grass-5.4.0.ebuild 3097 RMD160 885b7eabdad5fa912b7120b8a571d5b59c9f3971 SHA1 72b35ffc88f218afb14055e94eb8573713d67bb9 SHA256 d93cbad8dea7f99c74979abfc5a86292dffa76e8e3477c5cbc8a7cdf7cf33d21 -EBUILD grass-6.0.1.ebuild 3185 RMD160 9861427db9a4a846941eacd6d8f35cb057460d1b SHA1 79ef31f94dcb9bf8d7a3a89563867b291509173b SHA256 8ce6c6abd8359c2d736d491998d2d93720c89834a7e5f935c954b26af31781be -EBUILD grass-6.2.1.ebuild 5898 RMD160 55aa97b65c844a9e436f403ea2f8e49aa16620c7 SHA1 57a97027573fb96ebafca2d820b8693b56aedc62 SHA256 fb54121425315410f9cc174b67819ba3d7eb84cc3e9d68ee1d52a2b703879ca1 EBUILD grass-6.3.0.ebuild 8584 RMD160 1bca3fa24ec28bcf0fe1fed886887cb18870c199 SHA1 670624f4df9bb9599ea6e6b25e956d0dabc1ff77 SHA256 a58832dc2a9f23b8136a8c10277c8590ce4aed2240ce042fa77859d1288e2d74 EBUILD grass-6.4.0_rc5.ebuild 7659 RMD160 eaca7a1d7ade7f259bdfdfdbd4bd7905667568a3 SHA1 1aea332d6ab2cf7fdfd2fdd6de1005dede18fed9 SHA256 ad1be0cdf195dc708bbbca82777adad31a4bf4b7fd94180c3ed85b01bbf3254b -EBUILD grass-6.4.0_rc6.ebuild 6428 RMD160 cbfe653142681c08827eb445c85eb7b48f6e7ffa SHA1 7531560b189ca98af7585b951c2501870681d165 SHA256 dd4147e80be102f68c60dace8969495a8c34464bb78241307f097e7e4382d6b8 -MISC ChangeLog 16050 RMD160 b0e44027ac659b6248b205c420c6b724205d891a SHA1 be677452dc987b6771e4321815d4450ce42e3a53 SHA256 00fdae7c65d11453f5171b9f67cb55469d5cc9ee0aa7b53470846f59fb79b063 +EBUILD grass-6.4.0_rc6.ebuild 7734 RMD160 e377b29896f186971b98918c0af07818ac16ab51 SHA1 03fb4d75776691dd1c87ddb2dbad85ea3553298b SHA256 3a2083f3704003f7a211a0b13100e988bd3e98c13b3822552efaf3c781274c82 +MISC ChangeLog 16511 RMD160 6ab15d27fc4c040fbbb90bf86e2fa351cd811a11 SHA1 3f05f918508b2687d2fdc53edddd69a3091958a7 SHA256 21f5ecbe212f802b32889f402450da8510b0f4950a6cc27ab3fc946c5d10afdc MISC metadata.xml 783 RMD160 1b1fa970a119a29ee5502815e2dd8103be600526 SHA1 75c6aef32f661f74e29c550e84af8b637d70e98d SHA256 2cb454a8c266d344c7830cee33fffde971164a0d3456b6ff0c1f28a76f0034cd +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEARECAAYFAkvf/EsACgkQHB6c3gNBRYd3CQCcD7L2BMaE5/GV2Z7kLn3vCB1L +0VcAoIpAp8gncZt9jNxYaKMimo9TdK1F +=KvtT +-----END PGP SIGNATURE----- diff --git a/sci-geosciences/grass/files/99grass-6 b/sci-geosciences/grass/files/99grass-6 deleted file mode 100644 index 320734474f54..000000000000 --- a/sci-geosciences/grass/files/99grass-6 +++ /dev/null @@ -1,3 +0,0 @@ -GRASS_LD_LIBRARY_PATH="/usr/grass60/lib" -LDPATH="/usr/grass60/lib" -CONFIG_PROTECT="/usr/grass60/etc"
\ No newline at end of file diff --git a/sci-geosciences/grass/files/99grass-6.2 b/sci-geosciences/grass/files/99grass-6.2 deleted file mode 100644 index 1c706579148a..000000000000 --- a/sci-geosciences/grass/files/99grass-6.2 +++ /dev/null @@ -1,3 +0,0 @@ -GRASS_LD_LIBRARY_PATH="/usr/grass62/lib" -LDPATH="/usr/grass62/lib" - diff --git a/sci-geosciences/grass/files/grass-6.2.0-html-nonviz.patch b/sci-geosciences/grass/files/grass-6.2.0-html-nonviz.patch deleted file mode 100644 index 5ddb4d6f6282..000000000000 --- a/sci-geosciences/grass/files/grass-6.2.0-html-nonviz.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- tools/build_html_index.sh.orig 2006-12-29 11:55:46.000000000 -0800 -+++ tools/build_html_index.sh 2006-12-29 11:58:10.000000000 -0800 -@@ -129,10 +129,12 @@ - - #copy over CSS: - cp -f grassdocs.css $HTMLDIR/ --cp -f grassdocs.css $HTMLDIR/nviz/ -+# patch for no opengl -+#cp -f grassdocs.css $HTMLDIR/nviz/ - #copy over GRASS logo: - cp -f grass.smlogo.gif $HTMLDIR/ --cp -f grass.smlogo.gif $HTMLDIR/nviz/ -+# patch for no opengl -+#cp -f grass.smlogo.gif $HTMLDIR/nviz/ - #copy over GEM docs: - mkdir -p $HTMLDIR/gem - cp -f $GEMDIR/docs/GEM-Manual/*.html $HTMLDIR/gem/ -@@ -161,7 +163,8 @@ - echo "<tr><td> r.* </td><td>raster commands</td></tr>" >> $FULLINDEX - echo "<tr><td> r3.* </td><td>raster3D commands</td></tr>" >> $FULLINDEX - echo "<tr><td> v.* </td><td>vector commands</td></tr>" >> $FULLINDEX --echo "<tr><td> nviz </td><td>visualization command</td></tr>" >> $FULLINDEX -+# patch for no opengl -+#echo "<tr><td> nviz </td><td>visualization command</td></tr>" >> $FULLINDEX - echo "</table>" >> $FULLINDEX - echo "<p>" >> $FULLINDEX - -@@ -240,9 +243,10 @@ - echo "<li><a href=\"$MODCLASS.html\">$MODCLASS commands</a></li>" >> $FILENAME - done - -+# patch for no opengl (no nviz) - #extra stuff for 'nviz' and 'xganim' and GUIs: - echo "<li><a href=\"gis.m.html\">gis.m</a> and <a href=\"d.m.html\">d.m</a> GIS managers</li>" >> $FILENAME --echo "<li><a href=\"nviz.html\">nviz</a> visualization and animation tool</li>" >> $FILENAME -+#echo "<li><a href=\"nviz.html\">nviz</a> visualization and animation tool</li>" >> $FILENAME - echo "<li><a href=\"xganim.html\">xganim</a> tool for animating a raster map series</li>" >> $FILENAME - - echo "</ul>" >> $FILENAME diff --git a/sci-geosciences/grass/files/grass-6.2.1-ffmpeg-fix.patch b/sci-geosciences/grass/files/grass-6.2.1-ffmpeg-fix.patch deleted file mode 100644 index 3e52df7a5055..000000000000 --- a/sci-geosciences/grass/files/grass-6.2.1-ffmpeg-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- lib/ogsf/gsd_img_ppm.c.orig 2007-08-22 19:07:35.000000000 -0700 -+++ lib/ogsf/gsd_img_ppm.c 2007-08-22 19:10:58.000000000 -0700 -@@ -119,10 +119,9 @@ - - avcodec_init(); - -- register_avcodec(&mpeg1video_encoder); /* just mpeg1 */ -- /* -- use with othe formats ... -+ /* register_avcodec(&mpeg1video_encoder); just mpeg1 */ -+ /* -- use with all formats ... */ - avcodec_register_all(); -- */ - - /* find the mpeg1 video encoder */ - codec = avcodec_find_encoder(CODEC_ID_MPEG1VIDEO); -@@ -144,7 +143,7 @@ - For Xvid the canvas size must be a multiple of (4?). Best try 16, - 720x720. (File->Set Canval Size) Otherwise the codec won't open. - */ -- register_avcodec(&xvid_encoder); -+ avcodec_register_all(); - codec = avcodec_find_encoder(CODEC_ID_XVID); - bitrate=2000000; - #endif diff --git a/sci-geosciences/grass/files/grass-6.2.1-gcc43.patch b/sci-geosciences/grass/files/grass-6.2.1-gcc43.patch deleted file mode 100644 index 556ac73168fe..000000000000 --- a/sci-geosciences/grass/files/grass-6.2.1-gcc43.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -aur grass-6.2.3.orig/raster/r.terraflow/IOStream/include/ami_stream.h grass-6.2.3/raster/r.terraflow/IOStream/include/ami_stream.h ---- grass-6.2.3.orig/raster/r.terraflow/IOStream/include/ami_stream.h 2004-11-09 14:29:58.000000000 +0100 -+++ grass-6.2.3/raster/r.terraflow/IOStream/include/ami_stream.h 2008-03-21 01:03:36.000000000 +0100 -@@ -51,6 +51,7 @@ - #include <fcntl.h> - #include <errno.h> - #include <unistd.h> -+#include <cstring> - - #include <iostream> - using namespace std; diff --git a/sci-geosciences/grass/files/grass-6.2.1-html-nonviz.patch b/sci-geosciences/grass/files/grass-6.2.1-html-nonviz.patch deleted file mode 100644 index 194673562a7a..000000000000 --- a/sci-geosciences/grass/files/grass-6.2.1-html-nonviz.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- tools/build_html_index.sh.orig 2007-07-01 09:47:50.000000000 -0700 -+++ tools/build_html_index.sh 2007-07-01 09:52:47.000000000 -0700 -@@ -129,10 +129,10 @@ - - #copy over CSS: - cp -f grassdocs.css $HTMLDIR/ --cp -f grassdocs.css $HTMLDIR/nviz/ -+#cp -f grassdocs.css $HTMLDIR/nviz/ - #copy over GRASS logo: - cp -f grass.smlogo.gif $HTMLDIR/ --cp -f grass.smlogo.gif $HTMLDIR/nviz/ -+#cp -f grass.smlogo.gif $HTMLDIR/nviz/ - #copy over GEM docs: - mkdir -p $HTMLDIR/gem - cp -f $GEMDIR/docs/GEM-Manual/*.html $HTMLDIR/gem/ -@@ -163,7 +163,7 @@ - echo "<tr><td> r3.* </td><td>raster3D commands</td></tr>" >> $FULLINDEX - echo "<tr><td> v.* </td><td>vector commands</td></tr>" >> $FULLINDEX - echo "<tr><td> <a href=\"gis.m.html\">gis.m</a> </td><td>GUI frontend to GIS menus and display</td></tr>" >> $FULLINDEX --echo "<tr><td> <a href=\"nviz.html\">nviz</a> </td><td>visualization suite</td></tr>" >> $FULLINDEX -+#echo "<tr><td> <a href=\"nviz.html\">nviz</a> </td><td>visualization suite</td></tr>" >> $FULLINDEX - echo "<tr><td> <a href=\"xganim.html\">xganim</a> </td><td>raster map slideshow</td></tr>" >> $FULLINDEX - echo "</table>" >> $FULLINDEX - echo "<p>" >> $FULLINDEX -@@ -245,7 +245,7 @@ - - #extra stuff for 'nviz' and 'xganim' and GUIs: - echo "<li><a href=\"gis.m.html\">gis.m</a> and <a href=\"d.m.html\">d.m</a> GIS managers</li>" >> $FILENAME --echo "<li><a href=\"nviz.html\">nviz</a> visualization and animation tool</li>" >> $FILENAME -+#echo "<li><a href=\"nviz.html\">nviz</a> visualization and animation tool</li>" >> $FILENAME - echo "<li><a href=\"xganim.html\">xganim</a> tool for animating a raster map series</li>" >> $FILENAME - - echo "</ul>" >> $FILENAME diff --git a/sci-geosciences/grass/files/grass-6.2.1-html-nviz-fix.patch b/sci-geosciences/grass/files/grass-6.2.1-html-nviz-fix.patch deleted file mode 100644 index 75997702abd2..000000000000 --- a/sci-geosciences/grass/files/grass-6.2.1-html-nviz-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- tools/build_html_index.sh.orig 2006-11-20 08:02:23.000000000 -0800 -+++ tools/build_html_index.sh 2007-08-22 17:49:12.000000000 -0700 -@@ -127,12 +127,16 @@ - - ################ - --#copy over CSS: -+#copy over CSS and GRASS logo: - cp -f grassdocs.css $HTMLDIR/ --cp -f grassdocs.css $HTMLDIR/nviz/ --#copy over GRASS logo: - cp -f grass.smlogo.gif $HTMLDIR/ -+if ! test -d $HTMLDIR/nviz -+then -+ mkdir $HTMLDIR/nviz -+fi -+cp -f grassdocs.css $HTMLDIR/nviz/ - cp -f grass.smlogo.gif $HTMLDIR/nviz/ -+ - #copy over GEM docs: - mkdir -p $HTMLDIR/gem - cp -f $GEMDIR/docs/GEM-Manual/*.html $HTMLDIR/gem/ diff --git a/sci-geosciences/grass/files/grass-pkgconf.patch b/sci-geosciences/grass/files/grass-pkgconf.patch new file mode 100644 index 000000000000..025217dd13e3 --- /dev/null +++ b/sci-geosciences/grass/files/grass-pkgconf.patch @@ -0,0 +1,21 @@ +--- grass.pc.in.old 2010-05-04 11:38:58.000000000 +0200 ++++ grass.pc.in 2010-05-04 11:40:11.000000000 +0200 +@@ -1,12 +1,12 @@ + # Package Information for pkg-config + +-prefix=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@ +-exec_prefix=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@ +-libdir=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/lib +-includedir=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/include ++prefix=@prefix@ ++exec_prefix=@prefix@ ++libdir=@libdir@ ++includedir=@includedir@ + + Name: GRASS + Description: GRASS GIS + Version: @GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@ +-Libs: -L@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/lib -lgrass_I -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_gproj -lgrass_vect -lgrass_dbmibase -lgrass_dbmiclient +-Cflags: -I@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/include ++Libs: -L${libdir} -lgrass_I -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_gproj -lgrass_vect -lgrass_dbmibase -lgrass_dbmiclient ++Cflags: -I${includedir}/grass diff --git a/sci-geosciences/grass/grass-5.4.0.ebuild b/sci-geosciences/grass/grass-5.4.0.ebuild deleted file mode 100644 index fcba86174e20..000000000000 --- a/sci-geosciences/grass/grass-5.4.0.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-5.4.0.ebuild,v 1.15 2008/06/24 07:45:51 nerdboy Exp $ - -inherit eutils toolchain-funcs - -DESCRIPTION="An open-source GIS with raster and vector functionality" -HOMEPAGE="http://grass.itc.it/" -SRC_URI="http://grass.itc.it/grass54/source/${P}.tar.gz - http://grass.meteo.uni.wroc.pl/grass54/source/${P}.tar.gz - http://grass.ibiblio.org/grass54/source/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 sparc x86" -IUSE="tk png jpeg tiff postgres odbc motif gdal mysql blas lapack X fftw truetype nls opengl" - -RDEPEND=">=sys-libs/zlib-1.1.4 - >=sys-libs/ncurses-5.3 - >=sys-libs/gdbm-1.8.0 - virtual/man - >=sci-libs/proj-4.4.7 - blas? ( virtual/blas ) - lapack? ( virtual/lapack ) - fftw? ( =sci-libs/fftw-2* ) - gdal? ( >=sci-libs/gdal-1.2.6 ) - jpeg? ( media-libs/jpeg ) - tiff? ( media-libs/tiff ) - png? ( >=media-libs/libpng-1.2.2 ) - mysql? ( virtual/mysql ) - odbc? ( >=dev-db/unixODBC-2.0.6 ) - postgres? ( >=virtual/postgresql-server-7.3 ) - nls? ( x11-terms/mlterm ) - tk? ( >=dev-lang/tk-8.3.4 ) - truetype? ( >=media-libs/freetype-2.0.0 ) - motif? ( x11-libs/openmotif ) - X? ( - x11-libs/libXmu - x11-libs/libXext - x11-libs/libXp - x11-libs/libX11 - x11-libs/libXt - x11-libs/libSM - x11-libs/libICE - x11-libs/libXpm - x11-libs/libXaw - )" - -DEPEND="${RDEPEND} - >=sys-devel/make-3.80 - >=sys-devel/flex-2.5.4a - >=sys-devel/bison-1.35 - >=sys-devel/gcc-3.2.2 - X? ( - x11-proto/xproto - x11-proto/xextproto - )" - -src_unpack() { - unpack ${A} - - cd "${S}" - einfo "Patching configure..." - sed -i -e "s:relid':relid:g" configure || die "sed blew chunks" -} - -src_compile() { - MYCONF="--prefix=${D}usr --host=${CHOST} --infodir=${D}usr/share/info \ - --libdir=${D}usr/$(get_libdir) --mandir=${D}usr/share/man \ - --enable-shared --with-cxx" - - use truetype \ - && MYCONF="${MYCONF} --with-freetype \ - --with-freetype-includes=/usr/include/freetype2 \ - --with-freetype-libs=/usr/lib" \ - || MYCONF="${MYCONF} --without-freetype" - - use gdal \ - && MYCONF="${MYCONF} --with-gdal=/usr/bin/gdal-config" \ - || MYCONF="${MYCONF} --without-gdal" - - use mysql \ - && MYCONF="${MYCONF} --with-mysql --with-mysql-includes=/usr/include/mysql \ - --with-mysql-libs=/usr/lib/mysql" \ - || MYCONF="${MYCONF} --without-mysql" - - mkdir ./grass-build - cd ./grass-build - - ../configure ${MYCONF} \ - `use_with X` \ - `use_with readline` \ - `use_with tk tcltk` \ - `use_with postgres` \ - `use_with motif` \ - `use_with blas` \ - `use_with lapack` \ - `use_with fftw` \ - `use_with jpeg` \ - `use_with png` \ - `use_with tiff` \ - `use_with odbc` \ - `use_with nls` \ - `use_enable amd64 64bit` \ - `use_with opengl` || die "Error: configure failed!" - emake -j1 || die "Error: emake failed!" -} - -src_install() { - cd "${WORKDIR}"/${P}/grass-build - make DESTDIR="${D}" install \ - || die "Error: make install failed!" - sed -i "s:^GISBASE=.*$:GISBASE=/usr/grass54:" \ - "${D}"usr/bin/grass54 - # Install grass always in one directory - mv "${D}"usr/${P} "${D}"usr/grass54 -} diff --git a/sci-geosciences/grass/grass-6.0.1.ebuild b/sci-geosciences/grass/grass-6.0.1.ebuild deleted file mode 100644 index 0807f7b2dc28..000000000000 --- a/sci-geosciences/grass/grass-6.0.1.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.0.1.ebuild,v 1.18 2008/06/24 07:45:51 nerdboy Exp $ - -inherit eutils - -DESCRIPTION="An open-source GIS with raster and vector functionality" -HOMEPAGE="http://grass.itc.it/" -SRC_URI="http://grass.itc.it/grass60/source/${P}.tar.gz - http://grass.meteo.uni.wroc.pl/grass60/source/${P}.tar.gz - http://grass.ibiblio.org/grass60/source/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="6" -KEYWORDS="amd64 ppc sparc x86" -# To-do: get ppc64 gdal deps fixed up - -# add gdal back to use flags once grass is fixed -IUSE="fftw jpeg motif mysql nls odbc opengl png postgres readline tk tiff truetype" - -RESTRICT="strip" - -RDEPEND=">=sys-libs/zlib-1.1.4 - >=sys-libs/ncurses-5.3 - >=sys-libs/gdbm-1.8.0 - virtual/man - >=sci-libs/proj-4.4.7 - sci-libs/gdal - fftw? ( =sci-libs/fftw-2* ) - jpeg? ( media-libs/jpeg ) - postgres? ( >=virtual/postgresql-server-7.3 ) - mysql? ( virtual/mysql ) - odbc? ( >=dev-db/unixODBC-2.0.6 ) - png? ( >=media-libs/libpng-1.2.2 ) - readline? ( sys-libs/readline ) - tiff? ( >=media-libs/tiff-3.5.7 ) - truetype? ( >=media-libs/freetype-2.0 ) - nls? ( x11-terms/mlterm ) - opengl? ( virtual/opengl ) - tk? ( >=dev-lang/tk-8.3.4 ) - motif? ( x11-libs/openmotif ) - x11-libs/libXmu - x11-libs/libXext - x11-libs/libXp - x11-libs/libX11 - x11-libs/libXt - x11-libs/libSM - x11-libs/libICE - x11-libs/libXpm - x11-libs/libXaw" - -DEPEND="${RDEPEND} - >=sys-devel/make-3.80 - >=sys-devel/flex-2.5.4a - >=sys-devel/bison-1.35 - >=sys-devel/gcc-3.2.2 - x11-proto/xproto - x11-proto/xextproto" - -src_unpack() { - unpack ${A} - - cd "${S}" - epatch rpm/fedora/grass-readline.patch - sed -i -e "s/relid'/relid/" "${S}"/configure || die "sed blew chunks" -} - -src_compile() { - - MYCONF=" --with-cxx --enable-shared --with-gdal=/usr/bin/gdal-config" - - if use truetype; then - MYCONF="${MYCONF} --with-freetype-includes=/usr/include/freetype2/" - fi - - use mysql && MYCONF="${MYCONF} --with-mysql \ - --with-mysql-includes=/usr/include/mysql \ - --with-mysql-libs=/usr/$(get_libdir)/mysql" \ - || MYCONF="${MYCONF} --without-mysql" - - if use opengl; then - MYCONF="${MYCONF} --with-opengl-libs=/usr/$(get_libdir)/opengl/xorg-x11/lib/" - fi - - # apparently gdal isn't optional with this version - - export LD_LIBRARY_PATH="/${WORKDIR}/image/usr/grass60/$(get_libdir):${LD_LIBRARY_PATH}" - ./configure \ - `use_with postgres` \ - `use_with motif` \ - `use_with fftw` \ - `use_with truetype freetype` \ - `use_with jpeg` \ - `use_with png` \ - `use_with tiff` \ - `use_with odbc` \ - `use_enable amd64 64bit` \ - `use_with opengl` \ - `use_with readline` \ - $(use_with tk tcltk) \ - ${MYCONF} || die "Error: configure failed!" - emake -j1 || die "Error: emake failed!" -} - -src_install() { - make install \ - prefix="${D}"/usr UNIX_BIN="${D}"/usr/bin BINDIR="${D}"/usr/bin PREFIX=${D}/usr \ - || die "Error: make install failed!" - sed -i "s:^GISBASE=.*$:GISBASE=/usr/grass60:" \ - "${D}"/usr/bin/grass60 - - # This is required for GRASS dependent ebuilds (ie. QGIS) - mv "${D}"/usr/${P} "${D}"/usr/grass60 - - einfo "Adding env.d entry for Grass6" - newenvd "${FILESDIR}"/99grass-6 99grass -} diff --git a/sci-geosciences/grass/grass-6.2.1.ebuild b/sci-geosciences/grass/grass-6.2.1.ebuild deleted file mode 100644 index 0099085239f5..000000000000 --- a/sci-geosciences/grass/grass-6.2.1.ebuild +++ /dev/null @@ -1,202 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.1.ebuild,v 1.15 2008/12/19 05:57:29 nerdboy Exp $ - -inherit eutils libtool - -DESCRIPTION="An open-source GIS with raster and vector functionality, as well as 3D vizualization." -HOMEPAGE="http://grass.itc.it/" -SRC_URI="http://grass.itc.it/grass62/source/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="6" -KEYWORDS="amd64 ppc sparc x86" -# To-do: get ppc64 gdal deps fixed up - -IUSE="ffmpeg fftw gmath jpeg largefile motif mysql nls odbc opengl png \ -postgres python readline sqlite tiff truetype X" - -RESTRICT="strip" - -RDEPEND=">=sys-libs/zlib-1.1.4 - >=sys-libs/ncurses-5.3 - >=sys-libs/gdbm-1.8.0 - || ( - sys-apps/man - sys-apps/man-db ) - sci-libs/gdal - >=sci-libs/proj-4.4.7 - ffmpeg? ( media-video/ffmpeg ) - fftw? ( sci-libs/fftw ) - gmath? ( virtual/blas - virtual/lapack ) - jpeg? ( media-libs/jpeg ) - motif? ( x11-libs/openmotif ) - mysql? ( dev-db/mysql ) - odbc? ( >=dev-db/unixODBC-2.0.6 ) - opengl? ( virtual/opengl ) - png? ( >=media-libs/libpng-1.2.2 ) - postgres? ( >=virtual/postgresql-base-7.3 ) - python? ( dev-lang/python ) - readline? ( sys-libs/readline ) - sqlite? ( dev-db/sqlite ) - tiff? ( >=media-libs/tiff-3.5.7 ) - truetype? ( >=media-libs/freetype-2.0 ) - X? ( - x11-libs/libXmu - x11-libs/libXext - x11-libs/libXp - x11-libs/libX11 - x11-libs/libXt - x11-libs/libSM - x11-libs/libICE - x11-libs/libXpm - x11-libs/libXaw - >=dev-lang/tcl-8.4 - >=dev-lang/tk-8.4 - )" - -DEPEND="${RDEPEND} - >=sys-devel/flex-2.5.4a - >=sys-devel/bison-1.35 - X? ( - x11-proto/xproto - x11-proto/xextproto - )" - -pkg_setup() { - local myblas - if use gmath; then - for d in $(eselect lapack show); do myblas=${d}; done - if [[ -z "${myblas/reference/}" ]] && [[ -z "${myblas/atlas/}" ]]; then - ewarn "You need to set lapack to atlas or reference. Do:" - ewarn " eselect lapack set <impl>" - ewarn "where <impl> is atlas, threaded-atlas or reference" - die "setup failed" - fi - for d in $(eselect blas show); do myblas=${d}; done - if [[ -z "${myblas/reference/}" ]] && [[ -z "${myblas/atlas/}" ]]; then - ewarn "You need to set blas to atlas or reference. Do:" - ewarn " eselect blas set <impl>" - ewarn "where <impl> is atlas, threaded-atlas or reference" - die "setup failed" - fi - fi - - if use opengl && ! use X; then - ewarn "GRASS OpenGL support needs X (will also pull in Tcl/Tk)." - die "Please set the X useflag." - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - - use ffmpeg && epatch "${FILESDIR}"/${P}-ffmpeg-fix.patch - epatch "${FILESDIR}"/${P}-gcc43.patch - epatch rpm/fedora/grass-readline.patch - - elibtoolize - - # patch missing math functions (yes, this is still needed) - sed -i -e "s:\$(EXTRA_LIBS):\$(EXTRA_LIBS) \$(MATHLIB):g" include/Make/Shlib.make - echo "MATHLIB=-lm" >> include/Make/Rules.make -} - -src_compile() { - local myconf - myconf="--prefix=/usr --with-cxx --enable-shared \ - --with-gdal=$(type -P gdal-config) --with-curses --with-proj \ - --with-includes=/usr/include --with-libs=/usr/$(get_libdir) \ - --with-proj-includes=/usr/include \ - --with-proj-libs=/usr/$(get_libdir) \ - --with-proj-share=/usr/share/proj \ - --without-glw --without-wxwidgets" - if use X; then - if has_version ">=dev-lang/tcl-8.5"; then - TCL_LIBDIR="/usr/$(get_libdir)/tcl8.5" - else - TCL_LIBDIR="/usr/$(get_libdir)/tcl8.4" - fi - myconf="${myconf} --with-tcltk --with-x \ - --with-tcltk-includes=/usr/include \ - --with-tcltk-libs=${TCL_LIBDIR}" - else - myconf="${myconf} --without-tcltk --without-x" - fi - - if use opengl; then - epatch "${FILESDIR}"/${P}-html-nviz-fix.patch - myconf="${myconf} --with-opengl --with-opengl-libs=/usr/$(get_libdir)/opengl/xorg-x11/lib" - else - epatch "${FILESDIR}"/${P}-html-nonviz.patch - myconf="${myconf} --without-opengl --without-glw" - fi - - # Should handle either older or latest without intervention; - # this won't work forever, but it should be okay for a while... - if use ffmpeg; then - myconf="${myconf} --with-ffmpeg \ - --with-ffmpeg-libs=/usr/$(get_libdir)" - if has_version ">=media-video/ffmpeg-0.4.9_p20080326" ; then - # must pass multiple include dirs now; if anyone has a better - # way to do this, please speak up and file a bug :) - myconf="${myconf} --with-ffmpeg-includes=/usr/include/libav*" - else - myconf="${myconf} --with-ffmpeg-includes=/usr/include/ffmpeg" - fi - else - myconf="${myconf} --without-ffmpeg" - fi - - if use truetype; then - myconf="${myconf} --with-freetype --with-freetype-includes=/usr/include/freetype2" - fi - - if use mysql; then - myconf="${myconf} --with-mysql --with-mysql-includes=/usr/include/mysql \ - --with-mysql-libs=/usr/$(get_libdir)/mysql" - else - myconf="${myconf} --without-mysql" - fi - - if use sqlite; then - myconf="${myconf} --with-sqlite --with-sqlite-includes=/usr/include - --with-sqlite-libs=/usr/lib" - else - myconf="${myconf} --without-sqlite" - fi - - #export LD_LIBRARY_PATH="/${WORKDIR}/image/usr/${P}/$(get_libdir):${LD_LIBRARY_PATH}" - econf ${myconf} --with-libs=/usr/$(get_libdir) \ - $(use_enable amd64 64bit) \ - $(use_with fftw) \ - $(use_with jpeg) \ - $(use_enable largefile) \ - $(use_with motif) \ - $(use_with nls) \ - $(use_with odbc) \ - $(use_with png) \ - $(use_with postgres) \ - $(use_with python) \ - $(use_with readline) \ - $(use_with tiff) || die "configure failed!" - - emake -j1 || die "emake failed!" -} - -src_install() { - make install UNIX_BIN="${D}"usr/bin BINDIR="${D}"usr/bin \ - PREFIX="${D}"usr INST_DIR="${D}"usr/grass62 \ - || die "make install failed!" - - sed -i -e "s:^GISBASE=.*$:GISBASE=/usr/grass62:" \ - "${D}"usr/bin/grass62 || die "sed failed!" - - # Grass Extension Manager conflicts with ruby gems - mv "${D}"usr/bin/gem "${D}"usr/grass62/bin/ - - einfo "Adding env.d entry for Grass6" - newenvd "${FILESDIR}"/99grass-6.2 99grass-6 -} diff --git a/sci-geosciences/grass/grass-6.4.0_rc6.ebuild b/sci-geosciences/grass/grass-6.4.0_rc6.ebuild index 5f501243df78..cb84f45ed93c 100644 --- a/sci-geosciences/grass/grass-6.4.0_rc6.ebuild +++ b/sci-geosciences/grass/grass-6.4.0_rc6.ebuild @@ -1,18 +1,19 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.0_rc6.ebuild,v 1.3 2010/04/30 18:43:55 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.0_rc6.ebuild,v 1.4 2010/05/04 10:52:10 scarabeus Exp $ EAPI="3" PYTHON_DEPEND="python? 2" -inherit eutils python gnome2 versionator wxwidgets base +inherit eutils python gnome2 multilib versionator wxwidgets base MY_PM=${PN}$(get_version_component_range 1-2 ${PV}) +MY_PM=${MY_PM/.} MY_P=${P/_rc/RC} DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization." HOMEPAGE="http://grass.osgeo.org//" -SRC_URI="http://grass.osgeo.org/${MY_PM/.}/source/${MY_P}.tar.gz" +SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="6" @@ -39,7 +40,6 @@ RDEPEND=" virtual/lapack ) jpeg? ( media-libs/jpeg ) - motif? ( x11-libs/openmotif ) mysql? ( dev-db/mysql ) odbc? ( dev-db/unixODBC ) png? ( media-libs/libpng ) @@ -63,6 +63,10 @@ RDEPEND=" x11-libs/libXp x11-libs/libXpm x11-libs/libXt + motif? ( + x11-libs/openmotif + opengl? ( media-libs/mesa[motif] ) + ) opengl? ( virtual/opengl ${TCL_DEPS} @@ -74,7 +78,9 @@ RDEPEND=" " DEPEND="${RDEPEND} + dev-util/pkgconfig sys-devel/flex + sys-devel/gettext sys-devel/bison X? ( x11-proto/xextproto @@ -82,7 +88,11 @@ DEPEND="${RDEPEND} python? ( wxwidgets? ( dev-lang/swig ) ) )" -S=${WORKDIR}/${MY_P} +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}/${PN}-pkgconf.patch" +) pkg_setup() { local myblas @@ -106,6 +116,7 @@ pkg_setup() { fi # check useflag nesting. + use motif && ! use X && ewarn "For motif support X useflag must be enabled" use opengl && ! use X && ewarn "For opengl support X useflag must be enabled" use wxwidgets && ! use X && ewarn "For wxwidgets support X useflag must be enabled" use wxwidgets && ! use python && ewarn "For wxwidgets support python useflag must be enabled" @@ -116,7 +127,7 @@ pkg_setup() { src_prepare() { if ! use opengl; then - epatch "${FILESDIR}"/${PN}-6.4.0-html-nonviz.patch + epatch "${FILESDIR}"/${PN}-6.4.0-html-nonviz.patch fi base_src_prepare @@ -129,10 +140,10 @@ src_configure() { TCL_LIBDIR="/usr/$(get_libdir)/tcl8.5" myconf+=" --with-tcltk-libs=${TCL_LIBDIR} + $(use_with motif) $(use_with opengl) --with-x " - use opengl && myconf+=" --with-tcltk" if use python && use wxwidgets; then WX_BUILD=yes @@ -151,9 +162,14 @@ src_configure() { --without-wxwidgets " fi + + use opengl && myconf+=" --with-tcltk" + use motif && use opengl && myconf+=" --with-glw" + use motif || myconf+=" --without-glw" else myconf+=" --without-opengl + --without-glw --without-tcltk --without-wxwidgets --without-x @@ -168,6 +184,7 @@ src_configure() { --without-glw \ --enable-shared \ $(use_enable amd64 64bit) \ + $(use_enable ppc64 64bit) \ $(use_with cairo) \ $(use_with cxx) \ $(use_with fftw) \ @@ -180,7 +197,6 @@ src_configure() { $(use_with gmath lapack) \ $(use_with jpeg) \ $(use_enable largefile) \ - $(use_with motif) \ $(use_with mysql) \ $(use_with nls) \ $(use_with odbc) \ @@ -202,12 +218,13 @@ src_compile() { src_install() { emake DESTDIR="${D}" \ - INST_DIR="${D}"/usr/share/${PN}/$(get_version_component_range 1-2 ${PV})/ \ - PREFIX="${D}"/usr/share/${PN}/$(get_version_component_range 1-2 ${PV})/ \ - BINDIR="${D}"/usr/bin \ + INST_DIR="${D}"/usr/${MY_PM} \ + prefix="${D}"/usr BINDIR="${D}"/usr/bin \ + PREFIX="${D}"/usr/ \ install || die - cd "${D}"/usr/share/${PN}/$(get_version_component_range 1-2 ${PV})/ + pushd "${D}"/usr/${MY_PM} &> /dev/null + # fix docs dodoc AUTHORS CHANGES || die dohtml -r docs/html/* || die @@ -223,18 +240,51 @@ src_install() { dodir /usr/share/locale/ || die mv locale/* "${D}"/usr/share/locale/ || die rm -rf locale/ || die + # pt_BR is broken + mv "${D}"/usr/share/locale/pt_br "${D}"/usr/share/locale/pt_BR || die + + popd &> /dev/null - # get rid of DESTDIR in script path - sed -i -e "s:${D}:/:" "${D}"usr/bin/${MY_PM/.} || die + # place libraries where they belong + mv "${D}"/usr/${MY_PM}/lib/ "${D}"/usr/$(get_libdir)/ || die + + # place header files where they belong + mv "${D}"/usr/${MY_PM}/include/ "${D}"/usr/include/ || die + # make rules are not required on installed system + rm -rf "${D}"/usr/include/Make || die + + # mv remaining gisbase stuff to libdir + mv "${D}"/usr/${MY_PM} "${D}"/usr/$(get_libdir) || die + + # set proper default window renderer + if [[ ${WX_BUILD} == yes ]]; then + sed -i \ + -e "1,\$s:^DEFAULT_GUI.*:DEFAULT_GUI=\"wxpython\":" \ + "${D}"/usr/$(get_libdir)/${MY_PM}/etc/Init.sh || die + fi + + # get proper folder for grass path in script + sed -i \ + -e "1,\$s:^GISBASE.*:GISBASE=/usr/$(get_libdir)/${MY_PM}:" \ + "${D}"usr/bin/${MY_PM} || die + + # get proper fonts path for fontcap + sed -i \ + -e "s|${D}/usr/${MY_PM}|/usr/$(get_libdir)/${MY_PM}|" \ + "${D}"/usr/$(get_libdir)/${MY_PM}/etc/fontcap || die - cd ${S} if use X; then generate_files doicon gui/icons/${PN}-48x48.png || die - domenu ${MY_PM/.}-grass.desktop || die + domenu ${MY_PM}-grass.desktop || die fi - # FIXME: install .pc file so other apps know where to look for grass + # install .pc file so other apps know where to look for grass + insinto /usr/$(get_libdir)/pkgconfig/ + doins grass.pc || die + + # fix weird +x on tcl scripts + find "${D}" -name "*.tcl" -exec chmod +r-x '{}' \; } pkg_postinst() { @@ -255,14 +305,14 @@ generate_files() { local GUI="-gui" [[ ${WX_BUILD} == yes ]] && GUI="-wxpython" - cat <<-EOF > ${MY_PM/.}-grass.desktop + cat <<-EOF > ${MY_PM}-grass.desktop [Desktop Entry] Encoding=UTF-8 Version=1.0 Name=Grass ${PV} Type=Application Comment=GRASS (Geographic Resources Analysis Support System), the original GIS. - Exec=${TERM} -T Grass -e /usr/bin/${MY_PM/.} ${GUI} + Exec=${TERM} -T Grass -e /usr/bin/${MY_PM} ${GUI} Path= Icon=${PN}-48x48.png Categories=Science;Education; |