diff options
Diffstat (limited to 'sci-geosciences')
| -rw-r--r-- | sci-geosciences/grass/ChangeLog | 11 | ||||
| -rw-r--r-- | sci-geosciences/grass/Manifest | 36 | ||||
| -rw-r--r-- | sci-geosciences/grass/files/digest-grass-6.0.2 | 3 | ||||
| -rw-r--r-- | sci-geosciences/grass/grass-5.0.2.ebuild | 6 | ||||
| -rw-r--r-- | sci-geosciences/grass/grass-5.4.0.ebuild | 6 | ||||
| -rw-r--r-- | sci-geosciences/grass/grass-6.0.1.ebuild | 44 | ||||
| -rw-r--r-- | sci-geosciences/grass/grass-6.0.2.ebuild | 131 |
7 files changed, 209 insertions, 28 deletions
diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog index 21cb3337bdc5..97166c666ffd 100644 --- a/sci-geosciences/grass/ChangeLog +++ b/sci-geosciences/grass/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-geosciences/grass -# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.14 2005/10/13 06:38:35 nerdboy Exp $ +# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.15 2006/03/18 22:28:45 nerdboy Exp $ + +*grass-6.0.2 (18 Mar 2006) + + 18 Mar 2006; Steve Arnold <nerdboy@gentoo.org> grass-5.0.2.ebuild, + grass-5.4.0.ebuild, grass-6.0.1.ebuild, +grass-6.0.2.ebuild: + Fixes for bugs 119133, 123707, and 125561 (dep removal, sed bash fix, and + rev bump) plus tcltk repair and modular X updates (ver. 6 only). 13 Oct 2005; Steve Arnold <nerdboy@gentoo.org> -grass-6.0.0-r2.ebuild, grass-6.0.1.ebuild: diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest index 2c303f3a9c94..6d64f923b6f0 100644 --- a/sci-geosciences/grass/Manifest +++ b/sci-geosciences/grass/Manifest @@ -1,9 +1,33 @@ -MD5 ebaaf5b47adaf9656d99909aa9d8ff51 ChangeLog 4080 -MD5 3bd6e46846f23339b4e13fb95dc58a71 grass-5.0.2.ebuild 2644 -MD5 844e4e2afa998f9da5e57bf51f07b9c7 grass-6.0.1.ebuild 3208 -MD5 e3525ea07aea3bae2424110708012cd1 metadata.xml 480 -MD5 350d9696f5bd4a42c007d7e1358f5c9e grass-5.4.0.ebuild 2746 +MD5 c06d1dea54d53600cf5e1a3abe569171 ChangeLog 4385 +RMD160 41dc7324aa8d44aca86e69c3ffc260e303fbddcf ChangeLog 4385 +SHA256 ebc9f005b91a588b9f375515d6bc258268dfb4870997c5b661e9e27dec891e29 ChangeLog 4385 MD5 f41ae1ddcca30e1eeea2a74100f36ba4 files/99grass-6 100 +RMD160 e62ea08a12a22039fbe8fb396e011fd9b769ff2f files/99grass-6 100 +SHA256 dce426f95d7be7f7deae328537ad8666d4ff140dc6de0bb65495f23ad1a5e8f8 files/99grass-6 100 MD5 bdf9112abfe51ff3b2cd0547318640df files/digest-grass-5.0.2 69 -MD5 1c66247c142863956c87662a927bf828 files/digest-grass-6.0.1 64 +RMD160 f611ce7fe84cba829ad5a44e51bfeaaf1304d19a files/digest-grass-5.0.2 69 +SHA256 fae4faae61b0e9a8b1c4d3bea57b36a8a25ff16501c0b770841a4a0f2a0f882a files/digest-grass-5.0.2 69 MD5 3856d089c392313ea91a67cb000a90a9 files/digest-grass-5.4.0 65 +RMD160 78106b2a53336a74eda55cb43f05bd5f1ec57ffe files/digest-grass-5.4.0 65 +SHA256 635cd0b0f4ca4d3c6cd455a9acd50b49e438bf58d0a292d0e46a5bda370f2983 files/digest-grass-5.4.0 65 +MD5 1c66247c142863956c87662a927bf828 files/digest-grass-6.0.1 64 +RMD160 fa76b80c704923cb5de5a7fe50f1627cbd615a2c files/digest-grass-6.0.1 64 +SHA256 a6f0cc573230f918e9f384c64711e2cece48aa737a847c765175c11c51908bf8 files/digest-grass-6.0.1 64 +MD5 e66c229df06d3688329f85a424c1e1ff files/digest-grass-6.0.2 238 +RMD160 bf3ba19f561ae1797a385f9aac5f729f833e2fb0 files/digest-grass-6.0.2 238 +SHA256 9ca2a9fab8f3a80cbcb6bd4fa6fe6b8dfc22ea9e0270303bacf0fddc3d3babec files/digest-grass-6.0.2 238 +MD5 cafde681f19fe6665a059a58a29e6d11 grass-5.0.2.ebuild 2666 +RMD160 c1b33151a98c8ab25d955c8a029e3650b72ca92e grass-5.0.2.ebuild 2666 +SHA256 ebb95565645a88ddfb78520eca500e46f8d2d56751ba266187ad8198da845ef2 grass-5.0.2.ebuild 2666 +MD5 6a0b30e6944c73ea2bcbc47630aceaff grass-5.4.0.ebuild 2765 +RMD160 2d2c234ca95fea2e385ae945d3a04cf3a0c8de49 grass-5.4.0.ebuild 2765 +SHA256 9f7e30b443b090783a92da68c51529d17a61ee16aeed7b7acd354d9d55dda6b4 grass-5.4.0.ebuild 2765 +MD5 6f6feedc890aac848470c3a3445947f6 grass-6.0.1.ebuild 3502 +RMD160 d9dc7375e335ee3cec584c6900a31bf2fed0f10a grass-6.0.1.ebuild 3502 +SHA256 9acad8e6caa62d4acc6974a9773c8a4e2b426b17b20f97c07a25c2e89b0cd5a1 grass-6.0.1.ebuild 3502 +MD5 f825dfbde480f61ccb61e63a3e657633 grass-6.0.2.ebuild 3431 +RMD160 f9ec1e665e9244249eb7a7894f351ddd903f678a grass-6.0.2.ebuild 3431 +SHA256 5f7a45f0ffd05fc343f19afcee5bdd56a7c118d789c3a98fa7b2b4e380dde6c4 grass-6.0.2.ebuild 3431 +MD5 e3525ea07aea3bae2424110708012cd1 metadata.xml 480 +RMD160 bbaed2145b0a160795114ae2b9b254cbdedae480 metadata.xml 480 +SHA256 da3919f4adbc99a2833fbd43f3986a7a389eb469dd2a4fe03b690373e1f5e048 metadata.xml 480 diff --git a/sci-geosciences/grass/files/digest-grass-6.0.2 b/sci-geosciences/grass/files/digest-grass-6.0.2 new file mode 100644 index 000000000000..d4d5551a1528 --- /dev/null +++ b/sci-geosciences/grass/files/digest-grass-6.0.2 @@ -0,0 +1,3 @@ +MD5 e31887f84ff1f0c830c2b2e8760bbde7 grass-6.0.2.tar.gz 8640862 +RMD160 64a251c9fe9ae0920e86c0fba7e3081eb0b83fc3 grass-6.0.2.tar.gz 8640862 +SHA256 dabe7315be1147b40f148a93add29dd405725aca39f366f31826b17230f8437b grass-6.0.2.tar.gz 8640862 diff --git a/sci-geosciences/grass/grass-5.0.2.ebuild b/sci-geosciences/grass/grass-5.0.2.ebuild index bb21bdae6dda..08186f6e9b5e 100644 --- a/sci-geosciences/grass/grass-5.0.2.ebuild +++ b/sci-geosciences/grass/grass-5.0.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-5.0.2.ebuild,v 1.5 2005/06/02 15:41:24 ribosome Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-5.0.2.ebuild,v 1.6 2006/03/18 22:28:45 nerdboy Exp $ DESCRIPTION="An open-source GIS with raster and vector functionality" HOMEPAGE="http://grass.itc.it/" @@ -18,7 +18,7 @@ DEPEND=">=sys-devel/make-3.80 >=sys-devel/flex-2.5.4a >=sys-devel/bison-1.35 >=sys-libs/ncurses-5.3 - virtual/x11 + || ( x11-libs/libX11 virtual/x11 ) >=sys-libs/gdbm-1.8.0 >=sys-devel/gcc-3.2.2 =sci-libs/fftw-2* diff --git a/sci-geosciences/grass/grass-5.4.0.ebuild b/sci-geosciences/grass/grass-5.4.0.ebuild index c864cdd03090..7478182e800e 100644 --- a/sci-geosciences/grass/grass-5.4.0.ebuild +++ b/sci-geosciences/grass/grass-5.4.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 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.2 2005/09/11 04:14:51 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-5.4.0.ebuild,v 1.3 2006/03/18 22:28:45 nerdboy Exp $ inherit eutils toolchain-funcs @@ -38,7 +38,7 @@ DEPEND=">=sys-devel/make-3.80 >=dev-lang/tk-8.3.4 ) truetype? ( >=media-libs/freetype-2.0.0 ) motif? ( x11-libs/openmotif ) - X? ( virtual/x11 ) + X? || ( x11-libs/libX11 virtual/x11 ) nls? ( x11-terms/mlterm )" src_compile() { diff --git a/sci-geosciences/grass/grass-6.0.1.ebuild b/sci-geosciences/grass/grass-6.0.1.ebuild index ecb661a62653..67f4f9c84168 100644 --- a/sci-geosciences/grass/grass-6.0.1.ebuild +++ b/sci-geosciences/grass/grass-6.0.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 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.2 2005/10/13 06:38:35 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.0.1.ebuild,v 1.3 2006/03/18 22:28:45 nerdboy Exp $ inherit eutils @@ -12,15 +12,15 @@ SRC_URI="http://grass.itc.it/grass60/source/${P}.tar.gz LICENSE="GPL-2" SLOT="6" -KEYWORDS="x86 ~amd64 ~ppc sparc" +KEYWORDS="~amd64 ~ppc sparc x86" # To-do: get ppc64 gdal deps fixed up # add gdal back to use flags once grass is fixed -IUSE="blas fftw jpeg lapack motif mysql nls odbc opengl png postgres readline tiff truetype" +IUSE="fftw jpeg motif mysql nls odbc opengl png postgres readline tcltk tiff truetype" RESTRICT="nostrip" -DEPEND=">=sys-devel/make-3.80 +RDEPEND=">=sys-devel/make-3.80 >=sys-libs/zlib-1.1.4 >=sys-devel/flex-2.5.4a >=sys-devel/bison-1.35 @@ -30,11 +30,8 @@ DEPEND=">=sys-devel/make-3.80 sys-apps/man >=sci-libs/proj-4.4.7 sci-libs/gdal - blas? ( virtual/blas ) fftw? ( =sci-libs/fftw-2* ) jpeg? ( media-libs/jpeg ) - lapack? ( virtual/lapack ) - motif? ( x11-libs/openmotif ) postgres? ( >=dev-db/postgresql-7.3 ) mysql? ( dev-db/mysql ) odbc? ( >=dev-db/unixODBC-2.0.6 ) @@ -44,15 +41,36 @@ DEPEND=">=sys-devel/make-3.80 truetype? ( >=media-libs/freetype-2.0 ) nls? ( x11-terms/mlterm ) opengl? ( virtual/opengl ) - >=dev-lang/tcl-8.3.4 - >=dev-lang/tk-8.3.4 - virtual/x11" + tcltk? ( >=dev-lang/tcl-8.3.4 + >=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 ) + virtual/x11 + )" + +DEPEND="${RDEPEND} + X? ( || ( + ( x11-proto/xproto x11-proto/xextproto ) + virtual/x11 + ) + )" + 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() { @@ -82,11 +100,8 @@ src_compile() { export LD_LIBRARY_PATH="/${WORKDIR}/image/usr/grass60/$(get_libdir):${LD_LIBRARY_PATH}" ./configure \ - `use_with tcltk` \ `use_with postgres` \ `use_with motif` \ - `use_with blas` \ - `use_with lapack` \ `use_with fftw` \ `use_with truetype freetype` \ `use_with jpeg` \ @@ -96,6 +111,7 @@ src_compile() { `use_enable amd64 64bit` \ `use_with opengl` \ `use_with readline` \ + `use_with tcltk` \ ${MYCONF} || die "Error: configure failed!" emake -j1 || die "Error: emake failed!" } diff --git a/sci-geosciences/grass/grass-6.0.2.ebuild b/sci-geosciences/grass/grass-6.0.2.ebuild new file mode 100644 index 000000000000..d5afb006b2ea --- /dev/null +++ b/sci-geosciences/grass/grass-6.0.2.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.0.2.ebuild,v 1.1 2006/03/18 22:28:45 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 tcltk tiff truetype" + +RESTRICT="nostrip" + +RDEPEND=">=sys-devel/make-3.80 + >=sys-libs/zlib-1.1.4 + >=sys-devel/flex-2.5.4a + >=sys-devel/bison-1.35 + >=sys-libs/ncurses-5.3 + >=sys-libs/gdbm-1.8.0 + >=sys-devel/gcc-3.2.2 + sys-apps/man + >=sci-libs/proj-4.4.7 + sci-libs/gdal + fftw? ( =sci-libs/fftw-2* ) + jpeg? ( media-libs/jpeg ) + postgres? ( >=dev-db/postgresql-7.3 ) + mysql? ( dev-db/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 ) + tcltk? ( >=dev-lang/tcl-8.3.4 + >=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 ) + virtual/x11 + )" + +DEPEND="${RDEPEND} + X? ( || ( + ( x11-proto/xproto x11-proto/xextproto ) + virtual/x11 + ) + )" + + +src_unpack() { + unpack ${A} + + cd ${S} + epatch rpm/fedora/grass-readline.patch +} + +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 +# we'll temporarily make it a hard dep for now +# if use gdal; then +# MYCONF="${MYCONF} --with-gdal=/usr/bin/gdal-config" +# else +# MYCONF="${MYCONF} --without-gdal" +# fi + + 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 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" + insinto /etc/env.d + newins ${FILESDIR}/99grass-6 99grass +} |