[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/files/, sci-geosciences/grass/

["Amy Winston" <amynka@gentoo.org>]

commit:     ecadec9b5efee4b6e3bb100ac7d16bba3f7a9e3f
Author:     Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  5 13:14:45 2015 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Sat Dec  5 13:14:45 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecadec9b

sci-geosciences/grass: cleaning mess from package removal

Package-Manager: portage-2.2.20.1

 .../grass/files/grass-6.4.0-html-nonviz.patch      | 33 ---------
 .../grass/files/grass-6.4.1-libav-0.8.patch        | 60 ----------------
 .../grass/files/grass-6.4.1-libpng15.patch         | 28 --------
 .../grass/files/grass-6.4.1-nopycompile.patch      | 12 ----
 .../grass/files/grass-6.4.1-timer_flags.patch      | 13 ----
 .../grass/files/grass-6.4.2-configure.patch        | 26 -------
 .../grass/files/grass-6.4.2-ffmpeg-1.patch         | 79 ----------------------
 .../grass/files/grass-6.4.2-libav-9.patch          | 11 ---
 sci-geosciences/grass/files/grass-pkgconf.patch    | 22 ------
 sci-geosciences/grass/grass-7.0.1-r3.ebuild        |  4 +-
 sci-geosciences/grass/metadata.xml                 |  4 --
 11 files changed, 2 insertions(+), 290 deletions(-)

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
deleted file mode 100644
index a5afd0d..0000000
--- a/sci-geosciences/grass/files/grass-6.4.0-html-nonviz.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- tools/build_html_index.sh.old	2010-06-16 23:07:37.000000000 +0200
-+++ tools/build_html_index.sh	2010-06-16 23:10:00.000000000 +0200
-@@ -135,7 +135,6 @@
-        </ul>
- 
-        <ul>
--        <li><a href=\"nviz.html\">nviz</a> 3D visualization and animation tool</li>
-         <li><a href=\"xganim.html\">xganim</a> tool  for animating a raster map series</li>
-        </ul></td>
-     </tr>
-@@ -245,11 +244,11 @@
- #copy over CSS:
- cp -f grassdocs.css $HTMLDIR/
- mkdir -p $HTMLDIR/nviz/
--cp -f grassdocs.css $HTMLDIR/nviz/
-+#cp -f grassdocs.css $HTMLDIR/nviz/
- chmod a+r $HTMLDIR/grassdocs.css $HTMLDIR/nviz/grassdocs.css
- #copy over GRASS logo:
- cp -f grass_logo.png $HTMLDIR/
--cp -f grass_logo.png $HTMLDIR/nviz/
-+#cp -f grass_logo.png $HTMLDIR/nviz/
- chmod a+r $HTMLDIR/grass_logo.png $HTMLDIR/nviz/grass_logo.png
- if [ "$MACOSX" ] ; then
-   cp -f grass_icon.png $HTMLDIR/
-@@ -302,7 +301,7 @@
- echo "<tr><td>&nbsp;&nbsp;<a href=\"full_index.html#r3\">r3.*</a> </td><td>raster3D commands</td></tr>" >> "$FULLINDEX"
- echo "<tr><td>&nbsp;&nbsp;<a href=\"full_index.html#v\">v.*</a> </td><td>vector commands</td></tr>" >> "$FULLINDEX"
- echo "<tr><td>&nbsp;&nbsp;<a href=\"gis.m.html\">gis.m</a> </td><td>GUI frontend to GIS menus and display</td></tr>" >> "$FULLINDEX"
--echo "<tr><td>&nbsp;&nbsp;<a href=\"nviz.html\">nviz</a> </td><td>visualization suite</td></tr>" >> "$FULLINDEX"
-+#echo "<tr><td>&nbsp;&nbsp;<a href=\"nviz.html\">nviz</a> </td><td>visualization suite</td></tr>" >> "$FULLINDEX"
- echo "<tr><td>&nbsp;&nbsp;<a href=\"wxGUI.html\">wxGUI</a> </td><td>wxPython-based GUI frontend</td></tr>" >> "$FULLINDEX"
- echo "<tr><td>&nbsp;&nbsp;<a href=\"xganim.html\">xganim</a> </td><td>raster map slideshow</td></tr>" >> "$FULLINDEX"
- echo "</table>" >> "$FULLINDEX"

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
deleted file mode 100644
index 4864d88..0000000
--- a/sci-geosciences/grass/files/grass-6.4.1-libav-0.8.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Adjust Grass 6.4.1 to work with ffmpeg 8.
-
-2011-11-17 Fabio Erculiani
-2011-12-08 Martin von Gagern
-
-References:
-https://bugs.gentoo.org/390827
-https://bugs.gentoo.org/392371
-
---- grass-6.4.1.orig/lib/ogsf/gsd_img_mpeg.c
-+++ grass-6.4.1/lib/ogsf/gsd_img_mpeg.c
-@@ -66,7 +66,7 @@ static AVStream *add_video_stream(AVForm
- 
-     c = st->codec;
-     c->codec_id = codec_id;
--    c->codec_type = CODEC_TYPE_VIDEO;
-+    c->codec_type = AVMEDIA_TYPE_VIDEO;
- 
-     /* put sample parameters */
-     c->bit_rate = 400000;
-@@ -215,7 +215,7 @@ static void write_video_frame(AVFormatCo
- 
- 	av_init_packet(&pkt);
- 
--	pkt.flags |= PKT_FLAG_KEY;
-+	pkt.flags |= AV_PKT_FLAG_KEY;
- 	pkt.stream_index = st->index;
- 	pkt.data = (uint8_t *) picture;
- 	pkt.size = sizeof(AVPicture);
-@@ -236,7 +236,7 @@ static void write_video_frame(AVFormatCo
- 		av_rescale_q(c->coded_frame->pts, c->time_base,
- 			     st->time_base);
- 	    if (c->coded_frame->key_frame)
--		pkt.flags |= PKT_FLAG_KEY;
-+		pkt.flags |= AV_PKT_FLAG_KEY;
- 	    pkt.stream_index = st->index;
- 	    pkt.data = video_outbuf;
- 	    pkt.size = out_size;
-@@ -301,10 +301,10 @@ int gsd_init_mpeg(const char *filename)
-     av_register_all();
- 
-     /* auto detect the output format from the name. default is mpeg. */
--    fmt = guess_format(NULL, filename, NULL);
-+    fmt = av_guess_format(NULL, filename, NULL);
-     if (!fmt) {
- 	G_warning(_("Unable to deduce output format from file extension: using MPEG"));
--	fmt = guess_format("mpeg", NULL, NULL);
-+	fmt = av_guess_format("mpeg", NULL, NULL);
-     }
-     if (!fmt) {
- 	G_warning(_("Unable to find suitable output format"));
-@@ -312,7 +312,7 @@ int gsd_init_mpeg(const char *filename)
-     }
- 
-     /* allocate the output media context */
--    oc = av_alloc_format_context();
-+    oc = av_malloc(sizeof(AVFormatContext));
-     if (!oc) {
- 	G_warning(_("Out of memory"));
- 	return (-1);

diff --git a/sci-geosciences/grass/files/grass-6.4.1-libpng15.patch b/sci-geosciences/grass/files/grass-6.4.1-libpng15.patch
deleted file mode 100644
index 3c040e7..0000000
--- a/sci-geosciences/grass/files/grass-6.4.1-libpng15.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- raster/r.out.png/r.out.png.c
-+++ raster/r.out.png/r.out.png.c
-@@ -261,9 +261,6 @@
-     png_info_init(info_ptr);
- #endif
-     png_init_io(png_ptr, fp);
--    info_ptr->width = win.cols;
--    info_ptr->height = win.rows;
--    info_ptr->bit_depth = depth;
- 
-     /* explicit filter-type (or none) required */
-     if ((filter >= 0) && (filter <= 4)) {
-@@ -302,10 +299,13 @@
- 	/*if(!gscale->answer){ *//* 24BIT COLOR IMAGE */
- 
- 	if (TRUE) {
-+	    int color_type;
- 	    if (do_alpha)
--		info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-+		color_type = PNG_COLOR_TYPE_RGB_ALPHA;
- 	    else
--		info_ptr->color_type = PNG_COLOR_TYPE_RGB;
-+		color_type = PNG_COLOR_TYPE_RGB;
-+
-+	    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);
- 
- 	    /* write the png-info struct */
- 	    png_write_info(png_ptr, info_ptr);

diff --git a/sci-geosciences/grass/files/grass-6.4.1-nopycompile.patch b/sci-geosciences/grass/files/grass-6.4.1-nopycompile.patch
deleted file mode 100644
index 75f173a..0000000
--- a/sci-geosciences/grass/files/grass-6.4.1-nopycompile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur grass-6.4.1.orig/gui/wxpython/Makefile grass-6.4.1/gui/wxpython/Makefile
---- grass-6.4.1.orig/gui/wxpython/Makefile
-+++ grass-6.4.1/gui/wxpython/Makefile
-@@ -11,7 +11,7 @@
- ETCDIR = $(ETC)/wxpython
- 
- SRCFILES := $(wildcard compat/* gui_modules/* icons/*.* icons/silk/* images/* xml/*) gis_set.py wxgui.py README
--DSTFILES := $(patsubst %,$(ETCDIR)/%,$(SRCFILES)) $(patsubst %.py,$(ETCDIR)/%.pyc,$(filter %.py,$(SRCFILES)))
-+DSTFILES := $(patsubst %,$(ETCDIR)/%,$(SRCFILES))
- 
- default: install_scripts
- 	$(MAKE) parsubdirs

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
deleted file mode 100644
index 7c25094..0000000
--- a/sci-geosciences/grass/files/grass-6.4.1-timer_flags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- tools/timer/Makefile.orig	2011-11-14 18:58:13.000000000 -0800
-+++ tools/timer/Makefile	2011-11-14 19:00:41.000000000 -0800
-@@ -8,8 +8,8 @@
- default: $(ETC)/$(PGM)
- 
- $(ETC)/$(PGM): main.c
--	$(CC) -c $<
--	$(CC) -o $(ETC)/$(PGM) $<
-+	$(CC) $(CFLAGS) -c $<
-+	$(CC) $(LDFLAGS) -o $(ETC)/$(PGM) $<
- 
- clean:
- 	\rm -f $(ETC)/$(PGM) main.o

diff --git a/sci-geosciences/grass/files/grass-6.4.2-configure.patch b/sci-geosciences/grass/files/grass-6.4.2-configure.patch
deleted file mode 100644
index 37b7516..0000000
--- a/sci-geosciences/grass/files/grass-6.4.2-configure.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- grass-6.4.2.orig/configure.in	2012-02-06 11:16:07.000000000 +0100
-+++ grass-6.4.2/configure.in	2013-01-17 23:25:41.126387684 +0100
-@@ -1110,9 +1110,9 @@
- 
- LOC_CHECK_INC_PATH(ffmpeg, FFMPEG, FFMPEGINCPATH)
- 
--LOC_CHECK_INCLUDES(avcodec.h,FFMPEG,$FFMPEGINCPATH)
--LOC_CHECK_INCLUDES(avformat.h,FFMPEG,$FFMPEGINCPATH)
--LOC_CHECK_INCLUDES(swscale.h,FFMPEG,$FFMPEGINCPATH)
-+LOC_CHECK_INCLUDES(libavcodec/avcodec.h,FFMPEG,$FFMPEGINCPATH)
-+LOC_CHECK_INCLUDES(libavformat/avformat.h,FFMPEG,$FFMPEGINCPATH)
-+LOC_CHECK_INCLUDES(libswscale/swscale.h,FFMPEG,$FFMPEGINCPATH)
- 
- AC_DEFINE(HAVE_FFMPEG)
- 
-@@ -1125,8 +1125,8 @@
- LOC_CHECK_LIB_PATH(ffmpeg, FFMPEG, FFMPEGLIBPATH)
- 
- LOC_CHECK_LIBS(avutil, av_free, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB,,,,$MATHLIB)
--LOC_CHECK_LIBS(avcodec, avcodec_init, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB)
--LOC_CHECK_LIBS(avformat, av_set_parameters, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB)
-+LOC_CHECK_LIBS(avcodec, avcodec_open2, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB)
-+LOC_CHECK_LIBS(avformat, av_write_frame, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB)
- 
- fi # $USE_FFMPEG
- 

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
deleted file mode 100644
index ec26ae2..0000000
--- a/sci-geosciences/grass/files/grass-6.4.2-ffmpeg-1.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Fix build with ffmpeg-1.
-Part of https://bugs.gentoo.org/show_bug.cgi?id=443264
-
-Index: grass-6.4.2/lib/ogsf/gsd_img_mpeg.c
-===================================================================
---- grass-6.4.2.orig/lib/ogsf/gsd_img_mpeg.c
-+++ grass-6.4.2/lib/ogsf/gsd_img_mpeg.c
-@@ -26,7 +26,8 @@
- 
- /* FFMPEG stuff */
- #ifdef HAVE_FFMPEG
--#include <avformat.h>
-+#include <libavformat/avformat.h>
-+#include <libavformat/avio.h>
- 
- /* 5 seconds stream duration */
- #define STREAM_DURATION   5.0
-@@ -58,7 +59,7 @@ static AVStream *add_video_stream(AVForm
-     AVCodecContext *c;
-     AVStream *st;
- 
--    st = av_new_stream(oc, 0);
-+    st = avformat_new_stream(oc, 0);
-     if (!st) {
- 	G_warning(_("Unable to allocate stream"));
- 	return NULL;
-@@ -97,7 +98,7 @@ static AVStream *add_video_stream(AVForm
- 	c->flags |= CODEC_FLAG_GLOBAL_HEADER;
- 
-     c->flags |= CODEC_FLAG_QSCALE;
--    c->global_quality = st->quality = FF_QP2LAMBDA * 10;
-+    c->global_quality = FF_QP2LAMBDA * 10;
- 
-     return st;
- }
-@@ -332,13 +333,7 @@ int gsd_init_mpeg(const char *filename)
- 	    add_video_stream(oc, fmt->video_codec, (r - l + 1), (t - b + 1));
-     }
- 
--    /* set the output parameters (must be done even if no parameters). */
--    if (av_set_parameters(oc, NULL) < 0) {
--	G_warning(_("Invalid output format parameters"));
--	return (-1);
--    }
--
--    dump_format(oc, 0, filename, 1);
-+    av_dump_format(oc, 0, filename, 1);
- 
-     /* now that all the parameters are set, we can open the audio and
-        video codecs and allocate the necessary encode buffers */
-@@ -347,14 +342,17 @@ int gsd_init_mpeg(const char *filename)
- 
-     /* open the output file, if needed */
-     if (!(fmt->flags & AVFMT_NOFILE)) {
--	if (url_fopen(&oc->pb, filename, URL_WRONLY) < 0) {
-+	if (avio_open(&oc->pb, filename, AVIO_FLAG_WRITE) < 0) {
- 	    G_warning(_("Unable to open <%s>"), filename);
- 	    return (-1);
- 	}
-     }
- 
-     /* write the stream header, if any */
--    av_write_header(oc);
-+    if (avformat_write_header(oc, NULL) < 0) {
-+	G_warning(_("Failed to write header"));
-+	return (-1);
-+    }
- 
- 
- #else
-@@ -439,7 +437,7 @@ int gsd_close_mpeg(void)
- #if (LIBAVFORMAT_VERSION_INT>>16) < 52
- 	url_fclose(&oc->pb);
- #else
--	url_fclose(oc->pb);
-+	avio_close(oc->pb);
- #endif
-     }
- 

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
deleted file mode 100644
index 7fbe325..0000000
--- a/sci-geosciences/grass/files/grass-6.4.2-libav-9.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- grass-6.4.2.orig/lib/ogsf/gsd_img_mpeg.c	2013-01-18 02:11:37.570025278 +0100
-+++ grass-6.4.2/lib/ogsf/gsd_img_mpeg.c	2013-01-18 02:13:01.663022218 +0100
-@@ -159,7 +159,7 @@
-     }
- 
-     /* open the codec */
--    if (avcodec_open(c, codec) < 0) {
-+    if (avcodec_open2(c, codec, NULL) < 0) {
- 	G_warning(_("Unable to open codec"));
- 	return;
-     }

diff --git a/sci-geosciences/grass/files/grass-pkgconf.patch b/sci-geosciences/grass/files/grass-pkgconf.patch
deleted file mode 100644
index 5c00b9d..0000000
--- a/sci-geosciences/grass/files/grass-pkgconf.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- grass.pc.in.old	2010-06-13 10:53:46.747474687 +0200
-+++ grass.pc.in	2010-06-13 10:54:45.957349463 +0200
-@@ -1,12 +1,13 @@
- # 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@
-+grassdir=@libdir@/grass@GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR@
- 
- 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-7.0.1-r3.ebuild b/sci-geosciences/grass/grass-7.0.1-r3.ebuild
index e4dd7e6..d105302 100644
--- a/sci-geosciences/grass/grass-7.0.1-r3.ebuild
+++ b/sci-geosciences/grass/grass-7.0.1-r3.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="http://grass.osgeo.org/"
 SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="7"
+SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype"
 
@@ -264,4 +264,4 @@ pkg_postrm() {
 		fdo-mime_desktop_database_update
 		gnome2_icon_cache_update
 	fi
-}
\ No newline at end of file
+}

diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml
index 3dc849a..8a0d685 100644
--- a/sci-geosciences/grass/metadata.xml
+++ b/sci-geosciences/grass/metadata.xml
@@ -12,12 +12,8 @@ Army Corp of Engineers, now an active open source GIS. See the GRASS Documentati
 Project for more info http://grass.itc.it/gdp/index.php
 </longdescription>
 	<use>
-		<flag name="gdal">Use <pkg>sci-libs/gdal</pkg> for import and export 
-		of most external raster and vector map formats</flag>
 		<flag name="geos">Use <pkg>sci-libs/geos</pkg> for v.buffer and adds
 		extended options to the v.select module</flag>
-		<flag name="gmath">Enable gmath wrapper for BLAS/Lapack 
-		(<pkg>virtual/blas</pkg>, <pkg>virtual/lapack</pkg>)</flag>
 		<flag name="liblas">Include support for LAS and LAZ encoded LiDAR
 		files through <pkg>sci-geosciences/liblas</pkg></flag>
 		<flag name="opencl">Enable OpenCL support</flag>