| 1 |
commit: ecadec9b5efee4b6e3bb100ac7d16bba3f7a9e3f |
| 2 |
Author: Amy Winston <amynka <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 5 13:14:45 2015 +0000 |
| 4 |
Commit: Amy Winston <amynka <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 5 13:14:45 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecadec9b |
| 7 |
|
| 8 |
sci-geosciences/grass: cleaning mess from package removal |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.20.1 |
| 11 |
|
| 12 |
.../grass/files/grass-6.4.0-html-nonviz.patch | 33 --------- |
| 13 |
.../grass/files/grass-6.4.1-libav-0.8.patch | 60 ---------------- |
| 14 |
.../grass/files/grass-6.4.1-libpng15.patch | 28 -------- |
| 15 |
.../grass/files/grass-6.4.1-nopycompile.patch | 12 ---- |
| 16 |
.../grass/files/grass-6.4.1-timer_flags.patch | 13 ---- |
| 17 |
.../grass/files/grass-6.4.2-configure.patch | 26 ------- |
| 18 |
.../grass/files/grass-6.4.2-ffmpeg-1.patch | 79 ---------------------- |
| 19 |
.../grass/files/grass-6.4.2-libav-9.patch | 11 --- |
| 20 |
sci-geosciences/grass/files/grass-pkgconf.patch | 22 ------ |
| 21 |
sci-geosciences/grass/grass-7.0.1-r3.ebuild | 4 +- |
| 22 |
sci-geosciences/grass/metadata.xml | 4 -- |
| 23 |
11 files changed, 2 insertions(+), 290 deletions(-) |
| 24 |
|
| 25 |
diff --git a/sci-geosciences/grass/files/grass-6.4.0-html-nonviz.patch b/sci-geosciences/grass/files/grass-6.4.0-html-nonviz.patch |
| 26 |
deleted file mode 100644 |
| 27 |
index a5afd0d..0000000 |
| 28 |
--- a/sci-geosciences/grass/files/grass-6.4.0-html-nonviz.patch |
| 29 |
+++ /dev/null |
| 30 |
@@ -1,33 +0,0 @@ |
| 31 |
---- tools/build_html_index.sh.old 2010-06-16 23:07:37.000000000 +0200 |
| 32 |
-+++ tools/build_html_index.sh 2010-06-16 23:10:00.000000000 +0200 |
| 33 |
-@@ -135,7 +135,6 @@ |
| 34 |
- </ul> |
| 35 |
- |
| 36 |
- <ul> |
| 37 |
-- <li><a href=\"nviz.html\">nviz</a> 3D visualization and animation tool</li> |
| 38 |
- <li><a href=\"xganim.html\">xganim</a> tool for animating a raster map series</li> |
| 39 |
- </ul></td> |
| 40 |
- </tr> |
| 41 |
-@@ -245,11 +244,11 @@ |
| 42 |
- #copy over CSS: |
| 43 |
- cp -f grassdocs.css $HTMLDIR/ |
| 44 |
- mkdir -p $HTMLDIR/nviz/ |
| 45 |
--cp -f grassdocs.css $HTMLDIR/nviz/ |
| 46 |
-+#cp -f grassdocs.css $HTMLDIR/nviz/ |
| 47 |
- chmod a+r $HTMLDIR/grassdocs.css $HTMLDIR/nviz/grassdocs.css |
| 48 |
- #copy over GRASS logo: |
| 49 |
- cp -f grass_logo.png $HTMLDIR/ |
| 50 |
--cp -f grass_logo.png $HTMLDIR/nviz/ |
| 51 |
-+#cp -f grass_logo.png $HTMLDIR/nviz/ |
| 52 |
- chmod a+r $HTMLDIR/grass_logo.png $HTMLDIR/nviz/grass_logo.png |
| 53 |
- if [ "$MACOSX" ] ; then |
| 54 |
- cp -f grass_icon.png $HTMLDIR/ |
| 55 |
-@@ -302,7 +301,7 @@ |
| 56 |
- echo "<tr><td> <a href=\"full_index.html#r3\">r3.*</a> </td><td>raster3D commands</td></tr>" >> "$FULLINDEX" |
| 57 |
- echo "<tr><td> <a href=\"full_index.html#v\">v.*</a> </td><td>vector commands</td></tr>" >> "$FULLINDEX" |
| 58 |
- echo "<tr><td> <a href=\"gis.m.html\">gis.m</a> </td><td>GUI frontend to GIS menus and display</td></tr>" >> "$FULLINDEX" |
| 59 |
--echo "<tr><td> <a href=\"nviz.html\">nviz</a> </td><td>visualization suite</td></tr>" >> "$FULLINDEX" |
| 60 |
-+#echo "<tr><td> <a href=\"nviz.html\">nviz</a> </td><td>visualization suite</td></tr>" >> "$FULLINDEX" |
| 61 |
- echo "<tr><td> <a href=\"wxGUI.html\">wxGUI</a> </td><td>wxPython-based GUI frontend</td></tr>" >> "$FULLINDEX" |
| 62 |
- echo "<tr><td> <a href=\"xganim.html\">xganim</a> </td><td>raster map slideshow</td></tr>" >> "$FULLINDEX" |
| 63 |
- echo "</table>" >> "$FULLINDEX" |
| 64 |
|
| 65 |
diff --git a/sci-geosciences/grass/files/grass-6.4.1-libav-0.8.patch b/sci-geosciences/grass/files/grass-6.4.1-libav-0.8.patch |
| 66 |
deleted file mode 100644 |
| 67 |
index 4864d88..0000000 |
| 68 |
--- a/sci-geosciences/grass/files/grass-6.4.1-libav-0.8.patch |
| 69 |
+++ /dev/null |
| 70 |
@@ -1,60 +0,0 @@ |
| 71 |
-Adjust Grass 6.4.1 to work with ffmpeg 8. |
| 72 |
- |
| 73 |
-2011-11-17 Fabio Erculiani |
| 74 |
-2011-12-08 Martin von Gagern |
| 75 |
- |
| 76 |
-References: |
| 77 |
-https://bugs.gentoo.org/390827 |
| 78 |
-https://bugs.gentoo.org/392371 |
| 79 |
- |
| 80 |
---- grass-6.4.1.orig/lib/ogsf/gsd_img_mpeg.c |
| 81 |
-+++ grass-6.4.1/lib/ogsf/gsd_img_mpeg.c |
| 82 |
-@@ -66,7 +66,7 @@ static AVStream *add_video_stream(AVForm |
| 83 |
- |
| 84 |
- c = st->codec; |
| 85 |
- c->codec_id = codec_id; |
| 86 |
-- c->codec_type = CODEC_TYPE_VIDEO; |
| 87 |
-+ c->codec_type = AVMEDIA_TYPE_VIDEO; |
| 88 |
- |
| 89 |
- /* put sample parameters */ |
| 90 |
- c->bit_rate = 400000; |
| 91 |
-@@ -215,7 +215,7 @@ static void write_video_frame(AVFormatCo |
| 92 |
- |
| 93 |
- av_init_packet(&pkt); |
| 94 |
- |
| 95 |
-- pkt.flags |= PKT_FLAG_KEY; |
| 96 |
-+ pkt.flags |= AV_PKT_FLAG_KEY; |
| 97 |
- pkt.stream_index = st->index; |
| 98 |
- pkt.data = (uint8_t *) picture; |
| 99 |
- pkt.size = sizeof(AVPicture); |
| 100 |
-@@ -236,7 +236,7 @@ static void write_video_frame(AVFormatCo |
| 101 |
- av_rescale_q(c->coded_frame->pts, c->time_base, |
| 102 |
- st->time_base); |
| 103 |
- if (c->coded_frame->key_frame) |
| 104 |
-- pkt.flags |= PKT_FLAG_KEY; |
| 105 |
-+ pkt.flags |= AV_PKT_FLAG_KEY; |
| 106 |
- pkt.stream_index = st->index; |
| 107 |
- pkt.data = video_outbuf; |
| 108 |
- pkt.size = out_size; |
| 109 |
-@@ -301,10 +301,10 @@ int gsd_init_mpeg(const char *filename) |
| 110 |
- av_register_all(); |
| 111 |
- |
| 112 |
- /* auto detect the output format from the name. default is mpeg. */ |
| 113 |
-- fmt = guess_format(NULL, filename, NULL); |
| 114 |
-+ fmt = av_guess_format(NULL, filename, NULL); |
| 115 |
- if (!fmt) { |
| 116 |
- G_warning(_("Unable to deduce output format from file extension: using MPEG")); |
| 117 |
-- fmt = guess_format("mpeg", NULL, NULL); |
| 118 |
-+ fmt = av_guess_format("mpeg", NULL, NULL); |
| 119 |
- } |
| 120 |
- if (!fmt) { |
| 121 |
- G_warning(_("Unable to find suitable output format")); |
| 122 |
-@@ -312,7 +312,7 @@ int gsd_init_mpeg(const char *filename) |
| 123 |
- } |
| 124 |
- |
| 125 |
- /* allocate the output media context */ |
| 126 |
-- oc = av_alloc_format_context(); |
| 127 |
-+ oc = av_malloc(sizeof(AVFormatContext)); |
| 128 |
- if (!oc) { |
| 129 |
- G_warning(_("Out of memory")); |
| 130 |
- return (-1); |
| 131 |
|
| 132 |
diff --git a/sci-geosciences/grass/files/grass-6.4.1-libpng15.patch b/sci-geosciences/grass/files/grass-6.4.1-libpng15.patch |
| 133 |
deleted file mode 100644 |
| 134 |
index 3c040e7..0000000 |
| 135 |
--- a/sci-geosciences/grass/files/grass-6.4.1-libpng15.patch |
| 136 |
+++ /dev/null |
| 137 |
@@ -1,28 +0,0 @@ |
| 138 |
---- raster/r.out.png/r.out.png.c |
| 139 |
-+++ raster/r.out.png/r.out.png.c |
| 140 |
-@@ -261,9 +261,6 @@ |
| 141 |
- png_info_init(info_ptr); |
| 142 |
- #endif |
| 143 |
- png_init_io(png_ptr, fp); |
| 144 |
-- info_ptr->width = win.cols; |
| 145 |
-- info_ptr->height = win.rows; |
| 146 |
-- info_ptr->bit_depth = depth; |
| 147 |
- |
| 148 |
- /* explicit filter-type (or none) required */ |
| 149 |
- if ((filter >= 0) && (filter <= 4)) { |
| 150 |
-@@ -302,10 +299,13 @@ |
| 151 |
- /*if(!gscale->answer){ *//* 24BIT COLOR IMAGE */ |
| 152 |
- |
| 153 |
- if (TRUE) { |
| 154 |
-+ int color_type; |
| 155 |
- if (do_alpha) |
| 156 |
-- info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA; |
| 157 |
-+ color_type = PNG_COLOR_TYPE_RGB_ALPHA; |
| 158 |
- else |
| 159 |
-- info_ptr->color_type = PNG_COLOR_TYPE_RGB; |
| 160 |
-+ color_type = PNG_COLOR_TYPE_RGB; |
| 161 |
-+ |
| 162 |
-+ png_set_IHDR(png_ptr, info_ptr, win.cols, win.rows, depth, color_type, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); |
| 163 |
- |
| 164 |
- /* write the png-info struct */ |
| 165 |
- png_write_info(png_ptr, info_ptr); |
| 166 |
|
| 167 |
diff --git a/sci-geosciences/grass/files/grass-6.4.1-nopycompile.patch b/sci-geosciences/grass/files/grass-6.4.1-nopycompile.patch |
| 168 |
deleted file mode 100644 |
| 169 |
index 75f173a..0000000 |
| 170 |
--- a/sci-geosciences/grass/files/grass-6.4.1-nopycompile.patch |
| 171 |
+++ /dev/null |
| 172 |
@@ -1,12 +0,0 @@ |
| 173 |
-diff -ur grass-6.4.1.orig/gui/wxpython/Makefile grass-6.4.1/gui/wxpython/Makefile |
| 174 |
---- grass-6.4.1.orig/gui/wxpython/Makefile |
| 175 |
-+++ grass-6.4.1/gui/wxpython/Makefile |
| 176 |
-@@ -11,7 +11,7 @@ |
| 177 |
- ETCDIR = $(ETC)/wxpython |
| 178 |
- |
| 179 |
- SRCFILES := $(wildcard compat/* gui_modules/* icons/*.* icons/silk/* images/* xml/*) gis_set.py wxgui.py README |
| 180 |
--DSTFILES := $(patsubst %,$(ETCDIR)/%,$(SRCFILES)) $(patsubst %.py,$(ETCDIR)/%.pyc,$(filter %.py,$(SRCFILES))) |
| 181 |
-+DSTFILES := $(patsubst %,$(ETCDIR)/%,$(SRCFILES)) |
| 182 |
- |
| 183 |
- default: install_scripts |
| 184 |
- $(MAKE) parsubdirs |
| 185 |
|
| 186 |
diff --git a/sci-geosciences/grass/files/grass-6.4.1-timer_flags.patch b/sci-geosciences/grass/files/grass-6.4.1-timer_flags.patch |
| 187 |
deleted file mode 100644 |
| 188 |
index 7c25094..0000000 |
| 189 |
--- a/sci-geosciences/grass/files/grass-6.4.1-timer_flags.patch |
| 190 |
+++ /dev/null |
| 191 |
@@ -1,13 +0,0 @@ |
| 192 |
---- tools/timer/Makefile.orig 2011-11-14 18:58:13.000000000 -0800 |
| 193 |
-+++ tools/timer/Makefile 2011-11-14 19:00:41.000000000 -0800 |
| 194 |
-@@ -8,8 +8,8 @@ |
| 195 |
- default: $(ETC)/$(PGM) |
| 196 |
- |
| 197 |
- $(ETC)/$(PGM): main.c |
| 198 |
-- $(CC) -c $< |
| 199 |
-- $(CC) -o $(ETC)/$(PGM) $< |
| 200 |
-+ $(CC) $(CFLAGS) -c $< |
| 201 |
-+ $(CC) $(LDFLAGS) -o $(ETC)/$(PGM) $< |
| 202 |
- |
| 203 |
- clean: |
| 204 |
- \rm -f $(ETC)/$(PGM) main.o |
| 205 |
|
| 206 |
diff --git a/sci-geosciences/grass/files/grass-6.4.2-configure.patch b/sci-geosciences/grass/files/grass-6.4.2-configure.patch |
| 207 |
deleted file mode 100644 |
| 208 |
index 37b7516..0000000 |
| 209 |
--- a/sci-geosciences/grass/files/grass-6.4.2-configure.patch |
| 210 |
+++ /dev/null |
| 211 |
@@ -1,26 +0,0 @@ |
| 212 |
---- grass-6.4.2.orig/configure.in 2012-02-06 11:16:07.000000000 +0100 |
| 213 |
-+++ grass-6.4.2/configure.in 2013-01-17 23:25:41.126387684 +0100 |
| 214 |
-@@ -1110,9 +1110,9 @@ |
| 215 |
- |
| 216 |
- LOC_CHECK_INC_PATH(ffmpeg, FFMPEG, FFMPEGINCPATH) |
| 217 |
- |
| 218 |
--LOC_CHECK_INCLUDES(avcodec.h,FFMPEG,$FFMPEGINCPATH) |
| 219 |
--LOC_CHECK_INCLUDES(avformat.h,FFMPEG,$FFMPEGINCPATH) |
| 220 |
--LOC_CHECK_INCLUDES(swscale.h,FFMPEG,$FFMPEGINCPATH) |
| 221 |
-+LOC_CHECK_INCLUDES(libavcodec/avcodec.h,FFMPEG,$FFMPEGINCPATH) |
| 222 |
-+LOC_CHECK_INCLUDES(libavformat/avformat.h,FFMPEG,$FFMPEGINCPATH) |
| 223 |
-+LOC_CHECK_INCLUDES(libswscale/swscale.h,FFMPEG,$FFMPEGINCPATH) |
| 224 |
- |
| 225 |
- AC_DEFINE(HAVE_FFMPEG) |
| 226 |
- |
| 227 |
-@@ -1125,8 +1125,8 @@ |
| 228 |
- LOC_CHECK_LIB_PATH(ffmpeg, FFMPEG, FFMPEGLIBPATH) |
| 229 |
- |
| 230 |
- LOC_CHECK_LIBS(avutil, av_free, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB,,,,$MATHLIB) |
| 231 |
--LOC_CHECK_LIBS(avcodec, avcodec_init, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB) |
| 232 |
--LOC_CHECK_LIBS(avformat, av_set_parameters, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB) |
| 233 |
-+LOC_CHECK_LIBS(avcodec, avcodec_open2, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB) |
| 234 |
-+LOC_CHECK_LIBS(avformat, av_write_frame, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB) |
| 235 |
- |
| 236 |
- fi # $USE_FFMPEG |
| 237 |
- |
| 238 |
|
| 239 |
diff --git a/sci-geosciences/grass/files/grass-6.4.2-ffmpeg-1.patch b/sci-geosciences/grass/files/grass-6.4.2-ffmpeg-1.patch |
| 240 |
deleted file mode 100644 |
| 241 |
index ec26ae2..0000000 |
| 242 |
--- a/sci-geosciences/grass/files/grass-6.4.2-ffmpeg-1.patch |
| 243 |
+++ /dev/null |
| 244 |
@@ -1,79 +0,0 @@ |
| 245 |
-Fix build with ffmpeg-1. |
| 246 |
-Part of https://bugs.gentoo.org/show_bug.cgi?id=443264 |
| 247 |
- |
| 248 |
-Index: grass-6.4.2/lib/ogsf/gsd_img_mpeg.c |
| 249 |
-=================================================================== |
| 250 |
---- grass-6.4.2.orig/lib/ogsf/gsd_img_mpeg.c |
| 251 |
-+++ grass-6.4.2/lib/ogsf/gsd_img_mpeg.c |
| 252 |
-@@ -26,7 +26,8 @@ |
| 253 |
- |
| 254 |
- /* FFMPEG stuff */ |
| 255 |
- #ifdef HAVE_FFMPEG |
| 256 |
--#include <avformat.h> |
| 257 |
-+#include <libavformat/avformat.h> |
| 258 |
-+#include <libavformat/avio.h> |
| 259 |
- |
| 260 |
- /* 5 seconds stream duration */ |
| 261 |
- #define STREAM_DURATION 5.0 |
| 262 |
-@@ -58,7 +59,7 @@ static AVStream *add_video_stream(AVForm |
| 263 |
- AVCodecContext *c; |
| 264 |
- AVStream *st; |
| 265 |
- |
| 266 |
-- st = av_new_stream(oc, 0); |
| 267 |
-+ st = avformat_new_stream(oc, 0); |
| 268 |
- if (!st) { |
| 269 |
- G_warning(_("Unable to allocate stream")); |
| 270 |
- return NULL; |
| 271 |
-@@ -97,7 +98,7 @@ static AVStream *add_video_stream(AVForm |
| 272 |
- c->flags |= CODEC_FLAG_GLOBAL_HEADER; |
| 273 |
- |
| 274 |
- c->flags |= CODEC_FLAG_QSCALE; |
| 275 |
-- c->global_quality = st->quality = FF_QP2LAMBDA * 10; |
| 276 |
-+ c->global_quality = FF_QP2LAMBDA * 10; |
| 277 |
- |
| 278 |
- return st; |
| 279 |
- } |
| 280 |
-@@ -332,13 +333,7 @@ int gsd_init_mpeg(const char *filename) |
| 281 |
- add_video_stream(oc, fmt->video_codec, (r - l + 1), (t - b + 1)); |
| 282 |
- } |
| 283 |
- |
| 284 |
-- /* set the output parameters (must be done even if no parameters). */ |
| 285 |
-- if (av_set_parameters(oc, NULL) < 0) { |
| 286 |
-- G_warning(_("Invalid output format parameters")); |
| 287 |
-- return (-1); |
| 288 |
-- } |
| 289 |
-- |
| 290 |
-- dump_format(oc, 0, filename, 1); |
| 291 |
-+ av_dump_format(oc, 0, filename, 1); |
| 292 |
- |
| 293 |
- /* now that all the parameters are set, we can open the audio and |
| 294 |
- video codecs and allocate the necessary encode buffers */ |
| 295 |
-@@ -347,14 +342,17 @@ int gsd_init_mpeg(const char *filename) |
| 296 |
- |
| 297 |
- /* open the output file, if needed */ |
| 298 |
- if (!(fmt->flags & AVFMT_NOFILE)) { |
| 299 |
-- if (url_fopen(&oc->pb, filename, URL_WRONLY) < 0) { |
| 300 |
-+ if (avio_open(&oc->pb, filename, AVIO_FLAG_WRITE) < 0) { |
| 301 |
- G_warning(_("Unable to open <%s>"), filename); |
| 302 |
- return (-1); |
| 303 |
- } |
| 304 |
- } |
| 305 |
- |
| 306 |
- /* write the stream header, if any */ |
| 307 |
-- av_write_header(oc); |
| 308 |
-+ if (avformat_write_header(oc, NULL) < 0) { |
| 309 |
-+ G_warning(_("Failed to write header")); |
| 310 |
-+ return (-1); |
| 311 |
-+ } |
| 312 |
- |
| 313 |
- |
| 314 |
- #else |
| 315 |
-@@ -439,7 +437,7 @@ int gsd_close_mpeg(void) |
| 316 |
- #if (LIBAVFORMAT_VERSION_INT>>16) < 52 |
| 317 |
- url_fclose(&oc->pb); |
| 318 |
- #else |
| 319 |
-- url_fclose(oc->pb); |
| 320 |
-+ avio_close(oc->pb); |
| 321 |
- #endif |
| 322 |
- } |
| 323 |
- |
| 324 |
|
| 325 |
diff --git a/sci-geosciences/grass/files/grass-6.4.2-libav-9.patch b/sci-geosciences/grass/files/grass-6.4.2-libav-9.patch |
| 326 |
deleted file mode 100644 |
| 327 |
index 7fbe325..0000000 |
| 328 |
--- a/sci-geosciences/grass/files/grass-6.4.2-libav-9.patch |
| 329 |
+++ /dev/null |
| 330 |
@@ -1,11 +0,0 @@ |
| 331 |
---- grass-6.4.2.orig/lib/ogsf/gsd_img_mpeg.c 2013-01-18 02:11:37.570025278 +0100 |
| 332 |
-+++ grass-6.4.2/lib/ogsf/gsd_img_mpeg.c 2013-01-18 02:13:01.663022218 +0100 |
| 333 |
-@@ -159,7 +159,7 @@ |
| 334 |
- } |
| 335 |
- |
| 336 |
- /* open the codec */ |
| 337 |
-- if (avcodec_open(c, codec) < 0) { |
| 338 |
-+ if (avcodec_open2(c, codec, NULL) < 0) { |
| 339 |
- G_warning(_("Unable to open codec")); |
| 340 |
- return; |
| 341 |
- } |
| 342 |
|
| 343 |
diff --git a/sci-geosciences/grass/files/grass-pkgconf.patch b/sci-geosciences/grass/files/grass-pkgconf.patch |
| 344 |
deleted file mode 100644 |
| 345 |
index 5c00b9d..0000000 |
| 346 |
--- a/sci-geosciences/grass/files/grass-pkgconf.patch |
| 347 |
+++ /dev/null |
| 348 |
@@ -1,22 +0,0 @@ |
| 349 |
---- grass.pc.in.old 2010-06-13 10:53:46.747474687 +0200 |
| 350 |
-+++ grass.pc.in 2010-06-13 10:54:45.957349463 +0200 |
| 351 |
-@@ -1,12 +1,13 @@ |
| 352 |
- # Package Information for pkg-config |
| 353 |
- |
| 354 |
--prefix=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@ |
| 355 |
--exec_prefix=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@ |
| 356 |
--libdir=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/lib |
| 357 |
--includedir=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/include |
| 358 |
-+prefix=@prefix@ |
| 359 |
-+exec_prefix=@prefix@ |
| 360 |
-+libdir=@libdir@ |
| 361 |
-+includedir=@includedir@ |
| 362 |
-+grassdir=@libdir@/grass@GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR@ |
| 363 |
- |
| 364 |
- Name: GRASS |
| 365 |
- Description: GRASS GIS |
| 366 |
- Version: @GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@ |
| 367 |
--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 |
| 368 |
--Cflags: -I@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/include |
| 369 |
-+Libs: -L${libdir} -lgrass_I -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_gproj -lgrass_vect -lgrass_dbmibase -lgrass_dbmiclient |
| 370 |
-+Cflags: -I${includedir}/grass |
| 371 |
|
| 372 |
diff --git a/sci-geosciences/grass/grass-7.0.1-r3.ebuild b/sci-geosciences/grass/grass-7.0.1-r3.ebuild |
| 373 |
index e4dd7e6..d105302 100644 |
| 374 |
--- a/sci-geosciences/grass/grass-7.0.1-r3.ebuild |
| 375 |
+++ b/sci-geosciences/grass/grass-7.0.1-r3.ebuild |
| 376 |
@@ -19,7 +19,7 @@ HOMEPAGE="http://grass.osgeo.org/" |
| 377 |
SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz" |
| 378 |
|
| 379 |
LICENSE="GPL-2" |
| 380 |
-SLOT="7" |
| 381 |
+SLOT="0" |
| 382 |
KEYWORDS="~amd64 ~ppc64 ~x86" |
| 383 |
IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype" |
| 384 |
|
| 385 |
@@ -264,4 +264,4 @@ pkg_postrm() { |
| 386 |
fdo-mime_desktop_database_update |
| 387 |
gnome2_icon_cache_update |
| 388 |
fi |
| 389 |
-} |
| 390 |
\ No newline at end of file |
| 391 |
+} |
| 392 |
|
| 393 |
diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml |
| 394 |
index 3dc849a..8a0d685 100644 |
| 395 |
--- a/sci-geosciences/grass/metadata.xml |
| 396 |
+++ b/sci-geosciences/grass/metadata.xml |
| 397 |
@@ -12,12 +12,8 @@ Army Corp of Engineers, now an active open source GIS. See the GRASS Documentati |
| 398 |
Project for more info http://grass.itc.it/gdp/index.php |
| 399 |
</longdescription> |
| 400 |
<use> |
| 401 |
- <flag name="gdal">Use <pkg>sci-libs/gdal</pkg> for import and export |
| 402 |
- of most external raster and vector map formats</flag> |
| 403 |
<flag name="geos">Use <pkg>sci-libs/geos</pkg> for v.buffer and adds |
| 404 |
extended options to the v.select module</flag> |
| 405 |
- <flag name="gmath">Enable gmath wrapper for BLAS/Lapack |
| 406 |
- (<pkg>virtual/blas</pkg>, <pkg>virtual/lapack</pkg>)</flag> |
| 407 |
<flag name="liblas">Include support for LAS and LAZ encoded LiDAR |
| 408 |
files through <pkg>sci-geosciences/liblas</pkg></flag> |
| 409 |
<flag name="opencl">Enable OpenCL support</flag> |
Archives