diff options
| -rw-r--r-- | sci-geosciences/grass/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-geosciences/grass/Manifest | 14 | ||||
| -rw-r--r-- | sci-geosciences/grass/files/grass-6.3.0-gcc44.patch | 11 | ||||
| -rw-r--r-- | sci-geosciences/grass/files/grass-6.3.0-html-nonviz.patch | 14 | ||||
| -rw-r--r-- | sci-geosciences/grass/files/grass-6.3.0-o_creat.patch | 36 | ||||
| -rw-r--r-- | sci-geosciences/grass/files/grass_icon.png | bin | 4470 -> 0 bytes | |||
| -rw-r--r-- | sci-geosciences/grass/grass-6.3.0.ebuild | 294 |
7 files changed, 10 insertions, 366 deletions
diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog index a8d6c1aa9c8e..a3d16099df23 100644 --- a/sci-geosciences/grass/ChangeLog +++ b/sci-geosciences/grass/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-geosciences/grass # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.105 2011/07/19 19:47:28 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.106 2011/07/22 11:14:58 scarabeus Exp $ + + 22 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org> -grass-6.3.0.ebuild, + -files/grass-6.3.0-gcc44.patch, -files/grass-6.3.0-html-nonviz.patch, + -files/grass-6.3.0-o_creat.patch, -files/grass_icon.png: + old 19 Jul 2011; Markus Meier <maekke@gentoo.org> grass-6.4.1.ebuild: x86 stable, bug #362987 diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest index a6b1333f2f07..89f048c465c0 100644 --- a/sci-geosciences/grass/Manifest +++ b/sci-geosciences/grass/Manifest @@ -1,22 +1,16 @@ -----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 1774 RMD160 95f278e851dc782fa89861a60e97f2c6c4da564b SHA1 d917690626b669a9e9455b12bcb1aa14db65c29d SHA256 6da939c90fa851c50895aeb26c54bd9a512e2e7ca14c3da3268e1daa672442ff AUX grass-pkgconf.patch 1322 RMD160 7b48d8e05a07090d8d36d2fb96b385f2d655e066 SHA1 cb33293f442ad0bdd5592f842bcafe13eb021b48 SHA256 2d80c1a3851cd82bdcd7401c537348ec43e488c8b475718727d65ac423a5640c -AUX grass_icon.png 4470 RMD160 b4a6deeb6ce859a57c6aba3c4095e2dd718f36e9 SHA1 6839c28ec1d01c486d45a245a159fced3c0d0810 SHA256 c6c873f24bb59b8ff98000b500ca3a047ca86af216b4b7b1593baef5f2fbe6a9 -DIST grass-6.3.0.tar.gz 17688547 RMD160 66db4223fc0d5172371903f71d68f1dd024ad2d2 SHA1 c4b0b1407655f8ed1e16e911df191323fe00eb9e SHA256 a84658a7065a3ece09d3d18a3b601515484d1e5dbb3a92b8fbac3c37e368acf4 DIST grass-6.4.1.tar.gz 23608488 RMD160 2a9ee5da891c9d89a5ad0e66f914d2dd763e5128 SHA1 ea1cdfd1b7422367d671eeaf66f362d694a94abd SHA256 8b886faf8635f77f0d1626806454e6e8bdfa9155e3c10a0bc3e10447b9e6bd03 -EBUILD grass-6.3.0.ebuild 8155 RMD160 cee6ef727cbbc37b172fcedc83991fbb5cc01678 SHA1 efb08916ab3f1bf6e1e3e3881954de8accdc5bd6 SHA256 0b0331383d9ac16a4363cdb2ae6a359ff0e3dae7ccd36e28716e0ae203ed18e1 EBUILD grass-6.4.1.ebuild 7804 RMD160 227218a8fa588f9abfd697d094a7d4044437c2b0 SHA1 9e97dc80618712bff77aceb0df1b646819ab67d8 SHA256 41570e7ca1f46d7aa159c18d6e1d261b5590332717ccbed951159bc3db246476 -MISC ChangeLog 20442 RMD160 100268ff64a23c0ec1d251664590336439b4c4c9 SHA1 7271036af1d36dde86df6318421d8809b0f701d9 SHA256 d43ff171f19d4cc51f7e53b1820c26e18de2e3fb4d1a57c93faf4838413a9ab4 +MISC ChangeLog 20659 RMD160 bc10d2a7e33f753c69593fae31dd8309cc70086c SHA1 d7fef3c044dcf20200e559e0bf14b5a31844aaf4 SHA256 8f7e5200534276b13cb08d95366e5490677863f5ecff3f4b5c1e69a1aa1ca561 MISC metadata.xml 623 RMD160 f3ab7360eb95e18d25fa0f35bd8817e8628e3246 SHA1 497c577a971010147239a61515ab66a678881569 SHA256 d6200460324878b71cae01dc1193c77749b88b7c2e723041d9f426487c50c85f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk4l33YACgkQkKaRLQcq0GIDXACfZfL1y3Co3XKgxc2R66xbFiB6 -FKIAn3Gb76jrWqB7jRLMXURUwLJS+c6F -=FVIp +iEYEARECAAYFAk4pW60ACgkQHB6c3gNBRYcITQCgi85TGcoTCqYS1cKVfHvZ+rs/ +BC0AoINHcjZ9hz3xvyajX2qs9BExaLpl +=67X5 -----END PGP SIGNATURE----- diff --git a/sci-geosciences/grass/files/grass-6.3.0-gcc44.patch b/sci-geosciences/grass/files/grass-6.3.0-gcc44.patch deleted file mode 100644 index d90f074283cd..000000000000 --- a/sci-geosciences/grass/files/grass-6.3.0-gcc44.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nupr grass-6.3.0/imagery/i.atcorr/Output.h~ grass-6.3.0/imagery/i.atcorr/Output.h ---- grass-6.3.0/imagery/i.atcorr/Output.h~ 2009-04-29 20:49:42.000000000 +0000 -+++ grass-6.3.0/imagery/i.atcorr/Output.h 2009-04-29 20:49:50.000000000 +0000 -@@ -1,6 +1,7 @@ - #ifndef MY_OUTPUT_H - #define MY_OUTPUT_H - -+#include <cstdio> - #include <iostream> - #include <sstream> - #include <string> diff --git a/sci-geosciences/grass/files/grass-6.3.0-html-nonviz.patch b/sci-geosciences/grass/files/grass-6.3.0-html-nonviz.patch deleted file mode 100644 index 47c2633a657e..000000000000 --- a/sci-geosciences/grass/files/grass-6.3.0-html-nonviz.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- tools/build_html_index.sh.orig 2008-04-16 10:21:15.000000000 +0200 -+++ tools/build_html_index.sh 2008-04-16 10:23:52.000000000 +0200 -@@ -141 +141 @@ --cp -f grassdocs.css $HTMLDIR/nviz/ -+#cp -f grassdocs.css $HTMLDIR/nviz/ -@@ -145 +145 @@ --cp -f grass_logo.png $HTMLDIR/nviz/ -+#cp -f grass_logo.png $HTMLDIR/nviz/ -@@ -182 +182 @@ --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 -@@ -262 +262 @@ --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 diff --git a/sci-geosciences/grass/files/grass-6.3.0-o_creat.patch b/sci-geosciences/grass/files/grass-6.3.0-o_creat.patch deleted file mode 100644 index 32893044a4fc..000000000000 --- a/sci-geosciences/grass/files/grass-6.3.0-o_creat.patch +++ /dev/null @@ -1,36 +0,0 @@ -open with O_CREAT in second argument needs 3 arguments. -2009-03-05 Martin von Gagern -Reference: https://bugs.gentoo.org/261283 - -Index: grass-6.3.0/raster/r.drain/main.c -=================================================================== ---- grass-6.3.0.orig/raster/r.drain/main.c -+++ grass-6.3.0/raster/r.drain/main.c -@@ -296,8 +296,8 @@ int main(int argc, char **argv) - tempfile1 = G_tempfile(); - tempfile2 = G_tempfile(); - -- fe = open(tempfile1, O_RDWR | O_CREAT); -- fd = open(tempfile2, O_RDWR | O_CREAT); -+ fe = open(tempfile1, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR); -+ fd = open(tempfile2, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR); - - /* transfer the input map to a temp file */ - for (i = 0; i < nrows; i++) { -Index: grass-6.3.0/raster/r.fill.dir/main.c -=================================================================== ---- grass-6.3.0.orig/raster/r.fill.dir/main.c -+++ grass-6.3.0/raster/r.fill.dir/main.c -@@ -196,9 +196,9 @@ main(int argc, char **argv) - tempfile2 = G_tempfile(); - tempfile3 = G_tempfile(); - -- fe=open(tempfile1,O_RDWR|O_CREAT); /* elev */ -- fd=open(tempfile2,O_RDWR|O_CREAT); /* dirn */ -- fm=open(tempfile3,O_RDWR|O_CREAT); /* problems */ -+ fe=open(tempfile1,O_RDWR|O_CREAT, S_IRUSR|S_IWUSR); /* elev */ -+ fd=open(tempfile2,O_RDWR|O_CREAT, S_IRUSR|S_IWUSR); /* dirn */ -+ fm=open(tempfile3,O_RDWR|O_CREAT, S_IRUSR|S_IWUSR); /* problems */ - - G_message(_("Reading map...")); - for(i=0;i<nrows;i++) diff --git a/sci-geosciences/grass/files/grass_icon.png b/sci-geosciences/grass/files/grass_icon.png Binary files differdeleted file mode 100644 index f1a0ca3754bb..000000000000 --- a/sci-geosciences/grass/files/grass_icon.png +++ /dev/null diff --git a/sci-geosciences/grass/grass-6.3.0.ebuild b/sci-geosciences/grass/grass-6.3.0.ebuild deleted file mode 100644 index 34acfaba14f1..000000000000 --- a/sci-geosciences/grass/grass-6.3.0.ebuild +++ /dev/null @@ -1,294 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.3.0.ebuild,v 1.24 2011/04/12 17:39:42 arfrever Exp $ - -EAPI=3 - -inherit eutils fdo-mime python versionator wxwidgets - -MY_PV=$(get_version_component_range 1-2 ${PV}) -MY_PVM=$(delete_all_version_separators ${MY_PV}) -MY_PM=${PN}${MY_PVM} - -DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization." -HOMEPAGE="http://grass.osgeo.org//" -SRC_URI="http://download.osgeo.org/grass/${MY_PM}/source/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="6" -KEYWORDS="amd64 ppc ~ppc64 x86" - -IUSE="ffmpeg fftw gmath jpeg motif mysql nls odbc opengl png \ -postgres python readline sqlite tiff truetype wxwidgets 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? ( virtual/ffmpeg ) - fftw? ( sci-libs/fftw ) - gmath? ( virtual/blas - virtual/lapack ) - jpeg? ( virtual/jpeg ) - mysql? ( dev-db/mysql ) - odbc? ( >=dev-db/unixODBC-2.0.6 ) - opengl? ( virtual/opengl ) - motif? ( >=x11-libs/openmotif-2.3:0 ) - png? ( >=media-libs/libpng-1.2.2 ) - postgres? ( || ( - >=dev-db/postgresql-base-8.0 - >=dev-db/postgresql-server-8.0 ) - ) - 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 ) - wxwidgets? ( - >=dev-python/wxpython-2.8.1.1 - >=dev-lang/python-2.4 - ) - 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 - wxwidgets? ( >=dev-lang/swig-1.3.31 ) - X? ( - x11-proto/xproto - x11-proto/xextproto - )" - -pkg_setup() { - local myblas - elog "" - elog "This version enables the experimental wxpython interface, which" - elog "you may want to try. If the legacy GUI seems a little wonky in" - elog "this version, just enable the wxwidgets USE flag and rebuild" - elog "grass to use it." - elog "" - 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_prepare() { - epatch rpm/fedora/grass-readline.patch - # fix the fortify_source and buffer issues (see bug #261283) - epatch "${FILESDIR}"/${P}-o_creat.patch - # and update for gcc 4.4 C++ changes (see bug #270916) - epatch "${FILESDIR}"/${P}-gcc44.patch - - sed -i -e "s:buff\[12:buff\[16:g" general/g.parser/main.c \ - || die "sed failed" - - if ! use opengl; then - epatch "${FILESDIR}"/${P}-html-nonviz.patch - fi - - # 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_configure() { - local myconf - addpredict /var/cache/fontconfig - - 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" - - 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}" - if use wxwidgets; then - WX_GTK_VER=2.8 - need-wxwidgets unicode - # The following lib should be there, based on the above and the - # wxpython dependency (in theory). I still need a good way to - # query for the location... - LIBGDI="$(python_get_sitedir)/wx-${WX_GTK_VER}-gtk2-unicode/wx/_gdi_.so" - myconf="${myconf} --with-python --with-wxwidgets=${WX_CONFIG}" - else - # USE=python must be enabled above if wxwidgets is enabled - myconf="${myconf} $(use_with python) --without-wxwidgets" - fi - else - myconf="${myconf} --without-tcltk --without-x" - fi - - if use opengl; then - myconf="${myconf} --with-opengl --with-opengl-libs=/usr/$(get_libdir)/opengl/xorg-x11/lib" - else - myconf="${myconf} --without-opengl" - 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)" - myconf="${myconf} --with-ffmpeg-includes=/usr/include/libav*" - 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/$(get_libdir)" - else - myconf="${myconf} --without-sqlite" - fi - - econf ${myconf} --with-libs=/usr/$(get_libdir) \ - $(use_enable amd64 64bit) \ - $(use_with fftw) \ - $(use_with gmath blas) \ - $(use_with gmath lapack) \ - $(use_with jpeg) \ - $(use_with motif) \ - $(use_with nls) \ - $(use_with odbc) \ - $(use_with png) \ - $(use_with postgres) \ - $(use_with readline) \ - $(use_with tiff) \ - --enable-largefile -} - -src_compile() { - if use wxwidgets; then - # can't use die here since we need to hack the vdigit build - emake -j1 - ln -sf "${LIBGDI}" dist.${CHOST}/lib/libgdi.so \ - || die "making libgdi link failed" - cd gui/wxpython/vdigit - # now we're OK - make default -j1 || die "make vdigit failed!" - else - emake -j1 || die "make failed!" - fi -} - -src_install() { - elog "Grass Home is ${MY_PM}" - make install UNIX_BIN="${D}"usr/bin BINDIR="${D}"usr/bin \ - PREFIX="${D}"usr INST_DIR="${D}"usr/${MY_PM} \ - || die "make install failed!" - - if use wxwidgets; then - ln -sf "${LIBGDI}" "${D}"usr/${MY_PM}/lib/libgdi.so \ - || die "failed to find wx library" - fi - - # get rid of DESTDIR in script path - sed -i -e "s@${D}@/@" "${D}"usr/bin/${MY_PM} - - # Grass Extension Manager conflicts with ruby gems - mv "${D}"usr/bin/gem "${D}"usr/${MY_PM}/bin/ - - ebegin "Adding env.d and desktop entry for Grass6..." - generate_files - doenvd 99grass-6 - if use X; then - doicon "${FILESDIR}"/grass_icon.png - domenu ${MY_PM}-grass.desktop - fi - eend ${?} -} - -pkg_postinst() { - use X && fdo-mime_desktop_database_update - - elog "Note this version re-enables support for threads in Tcl and Tk." - elog "Enable the threads USE flag and rebuild to try it." -} - -pkg_postrm() { - use X && fdo-mime_desktop_database_update -} - -generate_files() { - local GUI="-gui" - use wxwidgets && GUI="-wxpython" - - cat <<-EOF > 99grass-6 - GRASS_LD_LIBRARY_PATH="/usr/${MY_PM}/lib" - LDPATH="/usr/${MY_PM}/lib" - MANPATH="/usr/${MY_PM}/man" - GRASS_HOME="/usr/${MY_PM}" - EOF - - 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} - Path= - Icon=grass_icon.png - Categories=Science;Education; - Terminal=false - EOF -} |
