From: Steve Arnold Date: Mon, 29 Jan 2007 01:57:03 +0000 (+0000) Subject: added fix for bug 160809 and workaround for bug 159074 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bd3351a64471eb2a28430f5d002659aa993216be;p=gentoo.git added fix for bug 160809 and workaround for bug 159074 Package-Manager: portage-2.1.2-r4 --- diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog index 18695aeeecdb..5e82ca789de5 100644 --- a/sci-geosciences/grass/ChangeLog +++ b/sci-geosciences/grass/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-geosciences/grass # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.30 2007/01/08 00:55:11 kugelfang Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.31 2007/01/29 01:57:03 nerdboy Exp $ + +*grass-6.2.0-r1 (29 Jan 2007) + + 29 Jan 2007; Steve Arnold files/99grass-6.2.0, + +files/grass-6.2.0-html-nonviz.patch, -grass-6.2.0.ebuild, + +grass-6.2.0-r1.ebuild: + Added fix for bug 160809 and workaround for bug 159074. 08 Jan 2007; Danny van Dyk -grass-6.1.0.ebuild: QA: Removed unused versions. diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest index d2b79217cf15..b48bff18df4e 100644 --- a/sci-geosciences/grass/Manifest +++ b/sci-geosciences/grass/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 99grass-6 100 RMD160 e62ea08a12a22039fbe8fb396e011fd9b769ff2f SHA1 8ef4acdbb4330b64a51e7b8304f9c68fce17c438 SHA256 dce426f95d7be7f7deae328537ad8666d4ff140dc6de0bb65495f23ad1a5e8f8 MD5 f41ae1ddcca30e1eeea2a74100f36ba4 files/99grass-6 100 RMD160 e62ea08a12a22039fbe8fb396e011fd9b769ff2f files/99grass-6 100 @@ -9,29 +6,33 @@ AUX 99grass-6.1.0 75 RMD160 2223006ec70c67dceb4e9395b497a0e22bd4ee3b SHA1 dfccf8 MD5 bcf80c80f08a6847fca6220fc7cf0f49 files/99grass-6.1.0 75 RMD160 2223006ec70c67dceb4e9395b497a0e22bd4ee3b files/99grass-6.1.0 75 SHA256 fde4b8be94db0d1f4f7d871397e4a74b8bbf41643adc10f26630a1f5a0eada25 files/99grass-6.1.0 75 -AUX 99grass-6.2.0 75 RMD160 fb5c1ca803d8da1c2258e9472484482741b0dace SHA1 159b8e8914bba4d96327c2481825a700c7c10a85 SHA256 d310c69cedca3d7e494961e264f5f2ed0edfcace49f85aa9739b66ac0fe9841e -MD5 a248b70f3e8fe51275cf453721f42a9b files/99grass-6.2.0 75 -RMD160 fb5c1ca803d8da1c2258e9472484482741b0dace files/99grass-6.2.0 75 -SHA256 d310c69cedca3d7e494961e264f5f2ed0edfcace49f85aa9739b66ac0fe9841e files/99grass-6.2.0 75 +AUX 99grass-6.2.0 67 RMD160 832371f15402bd8bd12f1b664d62833ddf62fb40 SHA1 dfa27b0ac5c2fea63c62cf94d4dd5f00843bcbe0 SHA256 53bc02c87c2032451f23f465785cebe1258ea50c7461b3ec4749e77849a3e33b +MD5 64cadb3af3adc7f0494a55264df7f452 files/99grass-6.2.0 67 +RMD160 832371f15402bd8bd12f1b664d62833ddf62fb40 files/99grass-6.2.0 67 +SHA256 53bc02c87c2032451f23f465785cebe1258ea50c7461b3ec4749e77849a3e33b files/99grass-6.2.0 67 +AUX grass-6.2.0-html-nonviz.patch 1721 RMD160 ad57109c03792e8376ccbe2ed8ff459b850cdf20 SHA1 20122b510bc7e52dfbaac04fd8587281d99a08e6 SHA256 492475975bb08f5b24f6c043a8bdfce32a1b22b5432127223dfe36e1ba66057c +MD5 b75daa0a3523b22844a17b3968bd1dd6 files/grass-6.2.0-html-nonviz.patch 1721 +RMD160 ad57109c03792e8376ccbe2ed8ff459b850cdf20 files/grass-6.2.0-html-nonviz.patch 1721 +SHA256 492475975bb08f5b24f6c043a8bdfce32a1b22b5432127223dfe36e1ba66057c files/grass-6.2.0-html-nonviz.patch 1721 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.0.tar.gz 12534549 RMD160 0173e1c7cd3a13af9fe0d9e77101e5e216df7dac SHA1 ace7ddcd3219550dd7068948865d96ce5f16d289 SHA256 2246008c1baadbb35398b35d8d069bee60c23c780e1573c22ae947e3f5a451a8 -EBUILD grass-5.4.0.ebuild 3189 RMD160 5b0f5e05f7da44571dbcd6e4372432018e8f0ad2 SHA1 8d34bea8dd8ba49459503a0bd04b01c12d5ad962 SHA256 aa9053132c469c7a873ff809d73e66fed2321cf24c6a158ea15f6c74e92bd5b8 -MD5 4e6ad10f74dbb30c937f097e8b234142 grass-5.4.0.ebuild 3189 -RMD160 5b0f5e05f7da44571dbcd6e4372432018e8f0ad2 grass-5.4.0.ebuild 3189 -SHA256 aa9053132c469c7a873ff809d73e66fed2321cf24c6a158ea15f6c74e92bd5b8 grass-5.4.0.ebuild 3189 -EBUILD grass-6.0.1.ebuild 3488 RMD160 89516418e451b475f92e2046004325a163752b4a SHA1 1f7127b0dd79a9b72d26f71cba8e7e6fce8bb188 SHA256 6ba372a81be2d1990145bea5e41b822491201a66b2b6984eb9ccfee74f8adccd -MD5 e15a983cca9c21b2a72b50066cf6acc6 grass-6.0.1.ebuild 3488 -RMD160 89516418e451b475f92e2046004325a163752b4a grass-6.0.1.ebuild 3488 -SHA256 6ba372a81be2d1990145bea5e41b822491201a66b2b6984eb9ccfee74f8adccd grass-6.0.1.ebuild 3488 -EBUILD grass-6.2.0.ebuild 5242 RMD160 7a53f99a1529b22a68a6b11c11673e1108c59314 SHA1 6ad8a660bf62c3fd41ad6ffcc9e1e1252a1d6a60 SHA256 25e2b3a2294c6305ce231e371c63e3d7558f6576da0b7dfb52a39610d89bd70a -MD5 d847a17aa3c9b06a53d9f0f33d1498c4 grass-6.2.0.ebuild 5242 -RMD160 7a53f99a1529b22a68a6b11c11673e1108c59314 grass-6.2.0.ebuild 5242 -SHA256 25e2b3a2294c6305ce231e371c63e3d7558f6576da0b7dfb52a39610d89bd70a grass-6.2.0.ebuild 5242 -MISC ChangeLog 6691 RMD160 615ec60426208f3b93a5b0152ef2236729a7f606 SHA1 1c48243154db3937d36cd217fa7e142a426fbe75 SHA256 b574527e848ad8d9b402e21b732e8d3da3689c5b1acb8713192364f8357e911a -MD5 110b5765c61c8e1e9819838026dac1be ChangeLog 6691 -RMD160 615ec60426208f3b93a5b0152ef2236729a7f606 ChangeLog 6691 -SHA256 b574527e848ad8d9b402e21b732e8d3da3689c5b1acb8713192364f8357e911a ChangeLog 6691 +EBUILD grass-5.4.0.ebuild 3192 RMD160 08dac7c025c92c4a7eeae3a3e7f7f2f7a6ca50a9 SHA1 3afce67353e8c597eacbc16e7ef4c3016befc267 SHA256 d21ac808cf821a4f4bd7580429e003386fc6f02a304d36b9706ac2c2d9168630 +MD5 119bb03a015ee0166a60fa6cb7e4b0c9 grass-5.4.0.ebuild 3192 +RMD160 08dac7c025c92c4a7eeae3a3e7f7f2f7a6ca50a9 grass-5.4.0.ebuild 3192 +SHA256 d21ac808cf821a4f4bd7580429e003386fc6f02a304d36b9706ac2c2d9168630 grass-5.4.0.ebuild 3192 +EBUILD grass-6.0.1.ebuild 3488 RMD160 45e9a1d2bb04359883411ea9ac584074fa2453db SHA1 acce377e3702412573ba792d176777eb1767b8df SHA256 a343c4cdac479b9431b9398c6f407a1484d14085f9a691711dcf1ebc639f984f +MD5 b463776f6a9a072e79ee0db4900af5ea grass-6.0.1.ebuild 3488 +RMD160 45e9a1d2bb04359883411ea9ac584074fa2453db grass-6.0.1.ebuild 3488 +SHA256 a343c4cdac479b9431b9398c6f407a1484d14085f9a691711dcf1ebc639f984f grass-6.0.1.ebuild 3488 +EBUILD grass-6.2.0-r1.ebuild 5482 RMD160 1c19ad038869d6e6efac97d6521250837845be23 SHA1 ae3d80600d1efa749f369dec4bf57c08bb6cccd0 SHA256 5007215b0a4ac5e17b3be025b2a5c9c4dc4bb4166ea24247672585b53d848a1a +MD5 95bb1922888c4fb07911c55da4d242cc grass-6.2.0-r1.ebuild 5482 +RMD160 1c19ad038869d6e6efac97d6521250837845be23 grass-6.2.0-r1.ebuild 5482 +SHA256 5007215b0a4ac5e17b3be025b2a5c9c4dc4bb4166ea24247672585b53d848a1a grass-6.2.0-r1.ebuild 5482 +MISC ChangeLog 6936 RMD160 9412c566aec37ba62bb9fb952158349d56e95cf1 SHA1 f865c6aeaa774aa1551fab70dc674460bb28955b SHA256 43b760a873d2aa87812950c663893e09e4c1bdc364737c75b9ffae643bb63da9 +MD5 7811491342bcbe6e78528d498ed0222c ChangeLog 6936 +RMD160 9412c566aec37ba62bb9fb952158349d56e95cf1 ChangeLog 6936 +SHA256 43b760a873d2aa87812950c663893e09e4c1bdc364737c75b9ffae643bb63da9 ChangeLog 6936 MISC metadata.xml 492 RMD160 03cf12a529c5443dffc366017b997d183a2bcf3b SHA1 bd8657499f8b6cb3b232684afd63c3b5d915ba5e SHA256 976d5771ed6fbabbeba026b0394186b7735135deb79c86aa9388fc5134467e8e MD5 efddef8657f71e6240e2d838ebf178d1 metadata.xml 492 RMD160 03cf12a529c5443dffc366017b997d183a2bcf3b metadata.xml 492 @@ -42,13 +43,6 @@ SHA256 2a33429a8c21883ad4eebce6548896ff304d292d1e0b66b863c936978fdbce9f files/di MD5 2a6b8167e8ead329a2dc3f2371d5ca90 files/digest-grass-6.0.1 238 RMD160 e3423f590b4400168daff513e2b42c1403ec0265 files/digest-grass-6.0.1 238 SHA256 50f9fc1916ee615d2490f1a84ed0321970f39c3664820724950a718becf63fa4 files/digest-grass-6.0.1 238 -MD5 74a5fc63e9fc9b7b327e0858baa19367 files/digest-grass-6.2.0 241 -RMD160 a64da970229d571841614cb1097bd6c7dcc608aa files/digest-grass-6.2.0 241 -SHA256 1e1ab91d1ef68251fd0784aa3e9ada0962ed1123bb11fe0dc931aa924ad4c045 files/digest-grass-6.2.0 241 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.4 (GNU/Linux) - -iD8DBQFFoZZ95mJXAu5GbtIRAn11AJwLB/UgS331E78dDi3JcLLpwTOz9QCePRlB -Xrjb15Xl9iVGzBvvvvXsCdg= -=lktO ------END PGP SIGNATURE----- +MD5 74a5fc63e9fc9b7b327e0858baa19367 files/digest-grass-6.2.0-r1 241 +RMD160 a64da970229d571841614cb1097bd6c7dcc608aa files/digest-grass-6.2.0-r1 241 +SHA256 1e1ab91d1ef68251fd0784aa3e9ada0962ed1123bb11fe0dc931aa924ad4c045 files/digest-grass-6.2.0-r1 241 diff --git a/sci-geosciences/grass/files/99grass-6.2.0 b/sci-geosciences/grass/files/99grass-6.2.0 index 9bbc265198d3..464ccee6a426 100644 --- a/sci-geosciences/grass/files/99grass-6.2.0 +++ b/sci-geosciences/grass/files/99grass-6.2.0 @@ -1,2 +1,2 @@ -GRASS_LD_LIBRARY_PATH="/usr/grass-6.2.0/lib" -LDPATH="/usr/grass-6.2.0/lib" +GRASS_LD_LIBRARY_PATH="/usr/grass62/lib" +LDPATH="/usr/grass62/lib" diff --git a/sci-geosciences/grass/files/digest-grass-6.2.0 b/sci-geosciences/grass/files/digest-grass-6.2.0-r1 similarity index 100% rename from sci-geosciences/grass/files/digest-grass-6.2.0 rename to sci-geosciences/grass/files/digest-grass-6.2.0-r1 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 new file mode 100644 index 000000000000..5ddb4d6f6282 --- /dev/null +++ b/sci-geosciences/grass/files/grass-6.2.0-html-nonviz.patch @@ -0,0 +1,39 @@ +--- 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 "  r.* raster commands" >> $FULLINDEX + echo "  r3.* raster3D commands" >> $FULLINDEX + echo "  v.* vector commands" >> $FULLINDEX +-echo "  nviz visualization command" >> $FULLINDEX ++# patch for no opengl ++#echo "  nviz visualization command" >> $FULLINDEX + echo "" >> $FULLINDEX + echo "

" >> $FULLINDEX + +@@ -240,9 +243,10 @@ + echo "

  • $MODCLASS commands
    • " >> $FILENAME + done + ++# patch for no opengl (no nviz) + #extra stuff for 'nviz' and 'xganim' and GUIs: + echo "
  • gis.m and d.m GIS managers
    • " >> $FILENAME +-echo "
  • nviz visualization and animation tool
    • " >> $FILENAME ++#echo "
  • nviz visualization and animation tool
    • " >> $FILENAME + echo "
  • xganim tool for animating a raster map series
    • " >> $FILENAME + + echo "" >> $FILENAME diff --git a/sci-geosciences/grass/grass-5.4.0.ebuild b/sci-geosciences/grass/grass-5.4.0.ebuild index 5b9eb5495336..a798ba1d3e34 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-2006 Gentoo Foundation +# Copyright 1999-2007 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.8 2006/11/23 16:49:13 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-5.4.0.ebuild,v 1.9 2007/01/29 01:57:03 nerdboy Exp $ inherit eutils toolchain-funcs diff --git a/sci-geosciences/grass/grass-6.0.1.ebuild b/sci-geosciences/grass/grass-6.0.1.ebuild index df72ceb105e1..9b69f621e3de 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-2006 Gentoo Foundation +# Copyright 1999-2007 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.10 2006/12/25 04:48:52 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.0.1.ebuild,v 1.11 2007/01/29 01:57:03 nerdboy Exp $ inherit eutils diff --git a/sci-geosciences/grass/grass-6.2.0.ebuild b/sci-geosciences/grass/grass-6.2.0-r1.ebuild similarity index 89% rename from sci-geosciences/grass/grass-6.2.0.ebuild rename to sci-geosciences/grass/grass-6.2.0-r1.ebuild index 24e5cde142b6..bf5510e14715 100644 --- a/sci-geosciences/grass/grass-6.2.0.ebuild +++ b/sci-geosciences/grass/grass-6.2.0-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.0.ebuild,v 1.2 2006/12/24 22:01:41 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.0-r1.ebuild,v 1.1 2007/01/29 01:57:03 nerdboy Exp $ inherit eutils autotools @@ -69,7 +69,8 @@ DEPEND="${RDEPEND} src_unpack() { if use glw && ! use opengl; then ewarn "You set USE='glw -opengl'. GLw support needs OpenGL." - die "Set 'opengl' useflag!" + ewarn "OpenGL support also requires Tcl and Tk support." + die "Set opengl, tcl, and tk useflags!" fi if use glw && ! built_with_use media-libs/mesa motif; then ewarn "GRASS OpenGL support needs mesa with motif headers." @@ -109,14 +110,14 @@ src_compile() { myconf="--prefix=/usr --with-cxx --enable-shared \ --with-gdal=$(which gdal-config) --with-curses --with-proj \ --with-proj-includes=/usr/include --with-proj-libs=/usr/lib \ - --with-proj-share=/usr/share/proj --with-x" + --with-proj-share=/usr/share/proj" if use tcl || use tk; then myconf="${myconf} --with-tcltk \ --with-tcltk-includes=/usr/include \ - --with-tcltk-libs=/usr/$(get_libdir)/tcl8.4" + --with-tcltk-libs=/usr/$(get_libdir)/tcl8.4 --with-x" else - myconf="${myconf} --without-tcltk" + myconf="${myconf} --without-tcltk --without-x" fi if use ffmpeg; then @@ -140,6 +141,8 @@ src_compile() { if use glw; then myconf="${myconf} --with-glw" fi + else + epatch ${FILESDIR}/${P}-html-nonviz.patch fi if use sqlite; then @@ -174,11 +177,15 @@ src_compile() { src_install() { make install UNIX_BIN=${D}usr/bin BINDIR=${D}usr/bin \ - PREFIX=${D}usr INST_DIR=${D}usr/${P} \ + PREFIX=${D}usr INST_DIR=${D}usr/grass62 \ || die "Error: make install failed!" - sed -i "s:^GISBASE=.*$:GISBASE=/usr/${P}:" \ + + sed -i "s:^GISBASE=.*$:GISBASE=/usr/grass62:" \ ${D}usr/bin/grass62 || die "Error: 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}/99${P} 99grass }