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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/files/, sci-geosciences/grass/
@ 2015-10-23  6:53 Ian Delaney
  0 siblings, 0 replies; 9+ messages in thread
From: Ian Delaney @ 2015-10-23  6:53 UTC (permalink / raw
  To: gentoo-commits

commit:     ea4be14d06c027b2e0dcdf0c3beab1b2cf45e3ee
Author:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 23 06:52:09 2015 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Fri Oct 23 06:52:53 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea4be14d

sci-geosciences/grass: patch, fixes failure built with format-security

qa issue; error filed upstream by 'wraeth', patch rebased from the
upstream commit, runtested by myself, closes gentoo bug

Upstream patch: https://trac.osgeo.org/grass/changeset/66561
Gentoo bug: #563490

Package-Manager: portage-2.2.20.1

 sci-geosciences/grass/files/7.0.1-sec-format.patch | 1026 ++++++++++++++++++++
 sci-geosciences/grass/grass-7.0.1-r1.ebuild        |   10 +-
 2 files changed, 1032 insertions(+), 4 deletions(-)

diff --git a/sci-geosciences/grass/files/7.0.1-sec-format.patch b/sci-geosciences/grass/files/7.0.1-sec-format.patch
new file mode 100644
index 0000000..a545a2b
--- /dev/null
+++ b/sci-geosciences/grass/files/7.0.1-sec-format.patch
@@ -0,0 +1,1026 @@
+rebased patch by 'wraeth' from
+https://trac.osgeo.org/grass/changeset/66561
+diff --git a/db/drivers/dbf/column.c b/db/drivers/dbf/column.c
+index ee0fd6e..1d2780e 100644
+--- a/db/drivers/dbf/column.c
++++ b/db/drivers/dbf/column.c
+@@ -40,7 +40,7 @@ int add_column(int tab, int type, char *name, int width, int decimals)
+ 	sprintf(buf, "DBMI-DBF driver: column name '%s'", name);
+ 	name[DBF_COL_NAME - 1] = '\0';
+ 	sprintf(buf + strlen(buf), " truncated to '%s'", name);
+-	G_warning(buf);
++	G_warning("%s", buf);
+     }
+ 
+     /* Check if the column exists */
+diff --git a/db/drivers/ogr/select.c b/db/drivers/ogr/select.c
+index 27ae090..6584bd5 100644
+--- a/db/drivers/ogr/select.c
++++ b/db/drivers/ogr/select.c
+@@ -48,7 +48,7 @@ int db__driver_open_select_cursor(dbString * sel, dbCursor * dbc, int mode)
+ 
+     if (c->hLayer == NULL) {
+ 	db_d_append_error(_("Unable to select: \n"));
+-	db_d_append_error(db_get_string(sel));
++	db_d_append_error("%s", db_get_string(sel));
+ 	db_d_append_error("\n");
+ 	db_d_report_error();
+ 	return DB_FAILED;
+diff --git a/db/drivers/postgres/db.c b/db/drivers/postgres/db.c
+index b02bade..5e171eb 100644
+--- a/db/drivers/postgres/db.c
++++ b/db/drivers/postgres/db.c
+@@ -248,7 +248,7 @@ int create_delete_db(dbHandle *handle, int create)
+     if (PQstatus(pg_conn) == CONNECTION_BAD) {
+ 	db_d_append_error(_("Connection failed."));
+ 	db_d_append_error("\n");
+-	db_d_append_error(PQerrorMessage(pg_conn));
++	db_d_append_error("%s", PQerrorMessage(pg_conn));
+ 	db_d_report_error();
+ 	PQfinish(pg_conn);
+ 	return DB_FAILED;
+@@ -269,7 +269,7 @@ int create_delete_db(dbHandle *handle, int create)
+ 	else
+ 	    db_d_append_error(_("Unable to drop database <%s>"), name);
+ 	db_d_append_error("\n");
+-	db_d_append_error(PQerrorMessage(pg_conn));
++	db_d_append_error("%s", PQerrorMessage(pg_conn));
+ 	db_d_report_error();
+ 	
+ 	PQclear(res);	
+diff --git a/imagery/i.landsat.toar/landsat_met.c b/imagery/i.landsat.toar/landsat_met.c
+index 506d719..5b612a4 100644
+--- a/imagery/i.landsat.toar/landsat_met.c
++++ b/imagery/i.landsat.toar/landsat_met.c
+@@ -384,14 +384,14 @@ void lsat_metadata(char *metafile, lsat_data * lsat)
+ 	    sprintf(key, "Band%dGainSetting", lsat->band[i].code);
+ 	    get_mtldata(mtldata, key, value);
+ 	    if (value[0] == '\0') {
+-		G_warning(key);
++                G_warning("%s", key);
+ 		continue;
+ 	    }
+ 	    lsat->band[i].gain = atof(value);
+ 	    sprintf(key, "Band%dBiasSetting", lsat->band[i].code);
+ 	    get_mtldata(mtldata, key, value);
+ 	    if (value[0] == '\0') {
+-		G_warning(key);
++		G_warning("%s", key);
+ 		continue;
+ 	    }
+ 	    lsat->band[i].bias = atof(value);
+diff --git a/imagery/i.ortho.photo/i.ortho.rectify/cp.c b/imagery/i.ortho.photo/i.ortho.rectify/cp.c
+index b8ec48c..86e5b33 100644
+--- a/imagery/i.ortho.photo/i.ortho.rectify/cp.c
++++ b/imagery/i.ortho.photo/i.ortho.rectify/cp.c
+@@ -31,7 +31,7 @@ int get_conz_points(void)
+     default:
+ 	return 1;
+     }
+-    G_fatal_error(msg);
++    G_fatal_error("%s", msg);
+ }
+ 
+ int get_ref_points(void)
+@@ -61,6 +61,6 @@ int get_ref_points(void)
+     default:
+ 	return 1;
+     }
+-    G_fatal_error(msg);
++    G_fatal_error("%s", msg);
+     /* exit(1);   shouldn't get here */
+ }
+diff --git a/imagery/i.ortho.photo/i.ortho.rectify/target.c b/imagery/i.ortho.photo/i.ortho.rectify/target.c
+index 99f8480..462833a 100644
+--- a/imagery/i.ortho.photo/i.ortho.rectify/target.c
++++ b/imagery/i.ortho.photo/i.ortho.rectify/target.c
+@@ -31,5 +31,5 @@ int get_target(char *group)
+     sprintf(buf, _("Mapset <%s> in target location <%s> - "), mapset, location);
+     strcat(buf, stat == 0 ? _("permission denied") : _("not found"));
+   error:
+-    G_fatal_error(buf);
++    G_fatal_error("%s", buf);
+ }
+diff --git a/imagery/i.ortho.photo/lib/camera.c b/imagery/i.ortho.photo/lib/camera.c
+index 26e454e..7d298be 100644
+--- a/imagery/i.ortho.photo/lib/camera.c
++++ b/imagery/i.ortho.photo/lib/camera.c
+@@ -36,7 +36,7 @@ int I_get_group_camera(char *group, char *camera)
+ 	sprintf(buf,
+ 		_("Unable to open camera file for group <%s> in mapset <%s>"),
+ 		group, G_mapset());
+-	G_warning(buf);
++	G_warning("%s", buf);
+ 	return 0;
+     }
+     G_getl2(buf, sizeof(buf), fd);
+diff --git a/imagery/i.ortho.photo/lib/conz_points.c b/imagery/i.ortho.photo/lib/conz_points.c
+index ad604dd..9d6f940 100644
+--- a/imagery/i.ortho.photo/lib/conz_points.c
++++ b/imagery/i.ortho.photo/lib/conz_points.c
+@@ -104,7 +104,7 @@ int I_get_con_points(char *group, struct Ortho_Control_Points *cp)
+ 	sprintf(msg,
+ 		"unable to open control point (Z) file for group [%s in %s]",
+ 		group, G_mapset());
+-	G_warning(msg);
++	G_warning("%s", msg);
+ 	G_sleep(4);
+ 	return 0;
+     }
+@@ -114,7 +114,7 @@ int I_get_con_points(char *group, struct Ortho_Control_Points *cp)
+     if (stat < 0) {
+ 	sprintf(msg, "bad format in control point file for group [%s in %s]",
+ 		group, G_mapset());
+-	G_warning(msg);
++	G_warning("%s", msg);
+ 	G_sleep(4);
+ 	return 0;
+     }
+@@ -131,7 +131,7 @@ int I_put_con_points(char *group, struct Ortho_Control_Points *cp)
+ 	sprintf(msg,
+ 		"unable to create control point file for group [%s in %s]",
+ 		group, G_mapset());
+-	G_warning(msg);
++	G_warning("%s", msg);
+ 	G_sleep(4);
+ 	return 0;
+     }
+@@ -156,7 +156,7 @@ int I_convert_con_points(char *group, struct Ortho_Control_Points *con_cp,
+ 	sprintf(msg,
+ 		"unable to open control point (Z) file for group [%s in %s]",
+ 		group, G_mapset());
+-	G_warning(msg);
++	G_warning("%s", msg);
+ 	G_sleep(4);
+ 	return 0;
+     }
+@@ -166,7 +166,7 @@ int I_convert_con_points(char *group, struct Ortho_Control_Points *con_cp,
+     if (stat < 0) {
+ 	sprintf(msg, "bad format in control point file for group [%s in %s]",
+ 		group, G_mapset());
+-	G_warning(msg);
++	G_warning("%s", msg);
+ 	G_sleep(4);
+ 	return 0;
+     }
+diff --git a/imagery/i.ortho.photo/lib/fopen_camera.c b/imagery/i.ortho.photo/lib/fopen_camera.c
+index 93cb326..2e904e9 100644
+--- a/imagery/i.ortho.photo/lib/fopen_camera.c
++++ b/imagery/i.ortho.photo/lib/fopen_camera.c
+@@ -46,7 +46,7 @@ static int error(char *camera, char *msga, char *msgb)
+ 
+     sprintf(buf, "%s camera file [%s] in [%s %s] %s",
+ 	    msga, camera, G_location(), G_mapset(), msgb);
+-    G_warning(buf);
++    G_warning("%s", buf);
+ 
+     return 0;
+ }
+diff --git a/imagery/i.ortho.photo/lib/init_info.c b/imagery/i.ortho.photo/lib/init_info.c
+index 0bb1a67..11f4bc6 100644
+--- a/imagery/i.ortho.photo/lib/init_info.c
++++ b/imagery/i.ortho.photo/lib/init_info.c
+@@ -101,7 +101,7 @@ int I_get_init_info(char *group, struct Ortho_Camera_Exp_Init *init_info)
+     if (fd == NULL) {
+ 	sprintf(msg, "unable to open camera initial file %s in %s",
+ 		group, G_mapset());
+-	G_warning(msg);
++	G_warning("%s", msg);
+ 	return 0;
+     }
+ 
+@@ -110,7 +110,7 @@ int I_get_init_info(char *group, struct Ortho_Camera_Exp_Init *init_info)
+     if (stat < 0) {
+ 	sprintf(msg, "bad format in camera initial file %s in %s",
+ 		group, G_mapset());
+-	G_warning(msg);
++	G_warning("%s", msg);
+ 	return 0;
+     }
+     return 1;
+@@ -125,7 +125,7 @@ int I_put_init_info(char *group, struct Ortho_Camera_Exp_Init *init_info)
+     if (fd == NULL) {
+ 	sprintf(msg, "unable to open camera initial file %s in %s",
+ 		group, G_mapset());
+-	G_warning(msg);
++	G_warning("%s", msg);
+ 	return 0;
+     }
+ 
+diff --git a/imagery/i.ortho.photo/lib/m_mult.c b/imagery/i.ortho.photo/lib/m_mult.c
+index 301ebc0..b93a512 100644
+--- a/imagery/i.ortho.photo/lib/m_mult.c
++++ b/imagery/i.ortho.photo/lib/m_mult.c
+@@ -21,7 +21,7 @@ int m_mult(MATRIX * a, MATRIX * b, MATRIX * c)
+     if (a->ncols != b->nrows) {
+ 	sprintf(message, "*: matrices not conformable, %d x %d * %d x %d\n",
+ 		a->nrows, a->ncols, b->nrows, b->ncols);
+-	fprintf(stderr, message);
++	fprintf(stderr, "%s", message);
+ 	return error(message);
+     }
+ 
+diff --git a/imagery/i.ortho.photo/lib/open_camera.c b/imagery/i.ortho.photo/lib/open_camera.c
+index 30c6184..1b7af57 100644
+--- a/imagery/i.ortho.photo/lib/open_camera.c
++++ b/imagery/i.ortho.photo/lib/open_camera.c
+@@ -50,7 +50,7 @@ static int camera_error(char *camera, char *file, char *msga, char *msgb)
+ 
+     sprintf(buf, "%sfile [%s] of group [%s in %s]%s",
+ 	    msga, file, camera, G_mapset(), msgb);
+-    G_warning(buf);
++    G_warning("%s", buf);
+ 
+     return 0;
+ }
+diff --git a/imagery/i.ortho.photo/lib/ref_points.c b/imagery/i.ortho.photo/lib/ref_points.c
+index 6f03e8d..2fa6e65 100644
+--- a/imagery/i.ortho.photo/lib/ref_points.c
++++ b/imagery/i.ortho.photo/lib/ref_points.c
+@@ -97,7 +97,7 @@ int I_get_ref_points(char *groupname, struct Ortho_Photo_Points *cp)
+ 	sprintf(msg,
+ 		"unable to open reference point file for group [%s in %s]",
+ 		groupname, G_mapset());
+-	G_warning(msg);
++	G_warning("%s", msg);
+ 	return 0;
+     }
+ 
+@@ -108,7 +108,7 @@ int I_get_ref_points(char *groupname, struct Ortho_Photo_Points *cp)
+ 	sprintf(msg,
+ 		"bad format in reference point file for group [%s in %s]",
+ 		groupname, G_mapset());
+-	G_warning(msg);
++	G_warning("%s", msg);
+ 	return 0;
+     }
+     return 1;
+@@ -124,7 +124,7 @@ int I_put_ref_points(char *groupname, struct Ortho_Photo_Points *cp)
+ 	sprintf(msg,
+ 		"unable to create reference point file for group [%s in %s]",
+ 		groupname, G_mapset());
+-	G_warning(msg);
++	G_warning("%s", msg);
+ 	return 0;
+     }
+ 
+diff --git a/imagery/i.rectify/cp.c b/imagery/i.rectify/cp.c
+index b0b2123..5cf06d6 100644
+--- a/imagery/i.rectify/cp.c
++++ b/imagery/i.rectify/cp.c
+@@ -67,7 +67,7 @@ int get_control_points(char *group, int order	/* THIS HAS BEEN ADDED WITH THE CR
+ 	    return 1;
+ 	}
+     }
+-    G_fatal_error(msg);
++    G_fatal_error("%s", msg);
+ 
+     return 0; /* G_fatal_error() calls exit() */
+ }
+diff --git a/imagery/i.rectify/target.c b/imagery/i.rectify/target.c
+index d97e3df..043628c 100644
+--- a/imagery/i.rectify/target.c
++++ b/imagery/i.rectify/target.c
+@@ -34,6 +34,6 @@ int get_target(char *group)
+   error:
+     strcat(buf, _("Please run i.target for group."));
+     strcat(buf, group);
+-    G_fatal_error(buf);
++    G_fatal_error("%s", buf);
+     return 1;			/* never reached */
+ }
+diff --git a/raster/r.external/proj.c b/raster/r.external/proj.c
+index d984196..9d1626f 100644
+--- a/raster/r.external/proj.c
++++ b/raster/r.external/proj.c
+@@ -110,7 +110,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, int override)
+ 	    strcat(error_msg,
+ 		   _("Consider generating a new location from the input dataset using "
+ 		     "the 'location' parameter.\n"));
+-	    G_fatal_error(error_msg);
++	    G_fatal_error("%s", error_msg);
+ 	}
+ 	else {
+ 	    G_message(_("Projection of input dataset and current location "
+diff --git a/raster/r.flow/mem.h b/raster/r.flow/mem.h
+index ca34e0a..f763fac 100644
+--- a/raster/r.flow/mem.h
++++ b/raster/r.flow/mem.h
+@@ -33,7 +33,7 @@ void put_row_seg( /* l, row */ );
+ 		   Segment_get_row(l.seg, l.buf[row] - l.col_offset, \
+ 				          row + l.row_offset) < 1)) ? \
+ 	(sprintf(string, "r.flow: cannot write segment file for %s", l.name),\
+-	 G_fatal_error(string), (DCELL *) NULL) : \
++	 G_fatal_error("%s", string), (DCELL *) NULL) :                  \
+ 	l.buf[row])
+ 
+ /*   This was is Astley's version 12...
+@@ -52,7 +52,7 @@ void put_row_seg( /* l, row */ );
+ 	(Segment_get(as.seg, &v, \
+ 			row + as.row_offset, col + as.col_offset) < 1 ? \
+ 	  (sprintf(string,"r.flow: cannot read segment file for %s",as.name), \
+-	   G_fatal_error(string), 0) :					\
++	   G_fatal_error("%s", string), 0) :                             \
+ 	  v) : \
+ 	(parm.mem ? \
+ 	   aspect_fly(el.buf[row - 1] + col, \
+@@ -64,7 +64,7 @@ void put_row_seg( /* l, row */ );
+     (parm.seg ? \
+ 	(Segment_get(l.seg, &v, row + l.row_offset, col + l.col_offset) < 1 ? \
+ 	  (sprintf(string,"r.flow: cannot read segment file for %s",l.name),\
+-	   G_fatal_error(string), 0) : \
++	   G_fatal_error("%s", string), 0) :                             \
+ 	 v) : \
+ 	l.buf[row][col])
+ 
+@@ -72,7 +72,7 @@ void put_row_seg( /* l, row */ );
+     (parm.seg ? \
+ 	(v = w, \
+ 	 Segment_put(l.seg, &v, row + l.row_offset, col + l.col_offset) < 1 ? \
+-	  (sprintf(string,"r.flow: cannot write segment file for %s",l.name), \
+-	   G_fatal_error(string), 0) : \
++           (sprintf(string, "r.flow: cannot write segment file for %s",l.name), \
++            G_fatal_error("%s", string), 0) :                            \
+ 	 0) : \
+ 	(l.buf[row][col] = w))
+diff --git a/raster/r.in.gdal/main.c b/raster/r.in.gdal/main.c
+index 778b5f4..457f22e 100644
+--- a/raster/r.in.gdal/main.c
++++ b/raster/r.in.gdal/main.c
+@@ -872,7 +872,7 @@ static void SetupReprojector(const char *pszSrcWKT, const char *pszDstLoc,
+ 		target_mapset, pszDstLoc);
+ 	strcat(errbuf, permissions == 0 ? _("permission denied")
+ 	       : _("not found"));
+-	G_fatal_error(errbuf);
++	G_fatal_error("%s", errbuf);
+     }				/* permission check */
+ 
+     /* And switch back to original location */
+diff --git a/raster/r.in.lidar/main.c b/raster/r.in.lidar/main.c
+index aae2dcb..390f990 100644
+--- a/raster/r.in.lidar/main.c
++++ b/raster/r.in.lidar/main.c
+@@ -451,7 +451,7 @@ int main(int argc, char *argv[])
+ 	    strcat(error_msg,
+ 		   _("Consider generating a new location with 'location' parameter"
+ 		    " from input data set.\n"));
+-	    G_fatal_error(error_msg);
++	    G_fatal_error("%s", error_msg);
+ 	}
+ 	else if (!shell_style->answer) {
+ 	    G_message(_("Projection of input dataset and current location "
+@@ -1229,7 +1229,7 @@ int main(int argc, char *argv[])
+ 
+ 
+     sprintf(buff, _("%lu points found in region."), count_total);
+-    G_done_msg(buff);
++    G_done_msg("%s", buff);
+     G_debug(1, "Processed %lu points.", line_total);
+ 
+     exit(EXIT_SUCCESS);
+diff --git a/raster/r.in.xyz/main.c b/raster/r.in.xyz/main.c
+index d4ce602..2580217 100644
+--- a/raster/r.in.xyz/main.c
++++ b/raster/r.in.xyz/main.c
+@@ -1153,7 +1153,7 @@ int main(int argc, char *argv[])
+ 
+ 
+     sprintf(buff, _("%lu points found in region."), count_total);
+-    G_done_msg(buff);
++    G_done_msg("%s", buff);
+     G_debug(1, "Processed %lu lines.", line);
+ 
+     exit(EXIT_SUCCESS);
+diff --git a/raster/r.profile/main.c b/raster/r.profile/main.c
+index 458ff75..dba7ceb 100644
+--- a/raster/r.profile/main.c
++++ b/raster/r.profile/main.c
+@@ -187,7 +187,7 @@ int main(int argc, char *argv[])
+ 	sprintf(formatbuff, _("Along track dist. [%s], Elevation"), unit);
+     if (clr)
+ 	strcat(formatbuff, _(" RGB color"));
+-    G_message(formatbuff);
++    G_message("%s", formatbuff);
+ 
+     /* Get Profile Start Coords */
+     if (parm.coord_file->answer) {
+diff --git a/raster/r.quant/read_rules.c b/raster/r.quant/read_rules.c
+index a4e467c..d255ccd 100644
+--- a/raster/r.quant/read_rules.c
++++ b/raster/r.quant/read_rules.c
+@@ -20,13 +20,13 @@ int read_range(void)
+     for (i = 0; i < noi; i++) {
+ 	if (Rast_read_fp_range(name[i], G_mapset(), &drange) <= 0) {
+ 	    sprintf(buff, "Can't read f_range for map %s", name[i]);
+-	    G_fatal_error(buff);
++	    G_fatal_error("%s", buff);
+ 	}
+ 	Rast_get_fp_range_min_max(&drange, &tmp_dmin, &tmp_dmax);
+ 
+ 	if (Rast_read_range(name[i], G_mapset(), &range) <= 0) {
+ 	    sprintf(buff, "Can't read range for map %s", name[i]);
+-	    G_fatal_error(buff);
++	    G_fatal_error("%s", buff);
+ 	}
+ 	Rast_get_range_min_max(&range, &tmp_min, &tmp_max);
+ 	if (!i || tmp_max > old_max || Rast_is_c_null_value(&old_max))
+diff --git a/raster/r.random.surface/init.c b/raster/r.random.surface/init.c
+index c19046b..738d843 100644
+--- a/raster/r.random.surface/init.c
++++ b/raster/r.random.surface/init.c
+@@ -110,7 +110,7 @@ void Init(void)
+ 		Seeds[i] = Seeds[i] % SEED_MAX;
+ 		sprintf(msg2, _(" seed is set to %d"), Seeds[i]);
+ 		strcat(msg, msg2);
+-		G_warning(msg);
++		G_warning("%s", msg);
+ 	    }
+ 	    else if (Seeds[i] < SEED_MIN) {
+ 		sprintf(msg, _("Seed (%d) smaller than minimum (%d)"),
+@@ -119,7 +119,7 @@ void Init(void)
+ 		    Seeds[i] += SEED_MAX - SEED_MIN;
+ 		sprintf(msg2, _(" seed is set to %d"), Seeds[i]);
+ 		strcat(msg, msg2);
+-		G_warning(msg);
++		G_warning("%s", msg);
+ 	    }
+ 	}			/* /for */
+     }				/* /else */
+diff --git a/raster/r.reclass/main.c b/raster/r.reclass/main.c
+index c3a8463..e640088 100644
+--- a/raster/r.reclass/main.c
++++ b/raster/r.reclass/main.c
+@@ -121,7 +121,7 @@ int main(int argc, char *argv[])
+ 	    }
+ 	    else {
+ 		strcat(buf, _(" - invalid reclass rule"));
+-		G_fatal_error(buf);
++		G_fatal_error("%s", buf);
+ 	    }
+ 	    break;
+ 
+diff --git a/raster/r.to.rast3/main.c b/raster/r.to.rast3/main.c
+index 7a6e790..4901b27 100644
+--- a/raster/r.to.rast3/main.c
++++ b/raster/r.to.rast3/main.c
+@@ -64,7 +64,7 @@ void fatal_error(void *map, int *fd, int depths, char *errorMsg)
+             close_input_raster_map(fd[i]);
+     }
+ 
+-    Rast3d_fatal_error(errorMsg);
++    Rast3d_fatal_error("%s", errorMsg);
+     exit(EXIT_FAILURE);
+ 
+ }
+diff --git a/raster/r.to.rast3elev/main.c b/raster/r.to.rast3elev/main.c
+index 1766514..fcd0286 100644
+--- a/raster/r.to.rast3elev/main.c
++++ b/raster/r.to.rast3elev/main.c
+@@ -142,7 +142,7 @@ void fatal_error(Database db, char *errorMsg)
+     if (db.elev)
+         close_input_raster_map(db.elev);
+ 
+-    Rast3d_fatal_error(errorMsg);
++    Rast3d_fatal_error("%s", errorMsg);
+     exit(EXIT_FAILURE);
+ }
+ 
+diff --git a/raster/r.to.vect/main.c b/raster/r.to.vect/main.c
+index bc7bb93..9db8ed6 100644
+--- a/raster/r.to.vect/main.c
++++ b/raster/r.to.vect/main.c
+@@ -216,7 +216,7 @@ int main(int argc, char *argv[])
+ 
+ 	db_append_string(&sql, ")");
+ 
+-	G_debug(3, db_get_string(&sql));
++	G_debug(3, "%s", db_get_string(&sql));
+ 
+ 	if (db_execute_immediate(driver, &sql) != DB_OK)
+ 	    G_fatal_error(_("Unable to create table: %s"),
+@@ -296,7 +296,7 @@ int main(int argc, char *argv[])
+ 		sprintf(buf, "insert into %s values ( %d, '%s')", Fi->table,
+ 			cat, db_get_string(&label));
+ 		db_set_string(&sql, buf);
+-		G_debug(3, db_get_string(&sql));
++		G_debug(3, "%s", db_get_string(&sql));
+ 
+ 		if (db_execute_immediate(driver, &sql) != DB_OK)
+ 		    G_fatal_error(_("Unable to insert into table: %s"),
+diff --git a/raster/r.to.vect/util.c b/raster/r.to.vect/util.c
+index eebc212..bc8a39c 100644
+--- a/raster/r.to.vect/util.c
++++ b/raster/r.to.vect/util.c
+@@ -151,7 +151,7 @@ void insert_value(int cat, int val, double dval)
+ 
+     db_append_string(&sql, ")");
+ 
+-    G_debug(3, db_get_string(&sql));
++    G_debug(3, "%s", db_get_string(&sql));
+ 
+     if (db_execute_immediate(driver, &sql) != DB_OK)
+ 	G_fatal_error(_("Cannot insert new row: %s"), db_get_string(&sql));
+diff --git a/raster3d/r3.cross.rast/main.c b/raster3d/r3.cross.rast/main.c
+index 1dadcde..600384f 100644
+--- a/raster3d/r3.cross.rast/main.c
++++ b/raster3d/r3.cross.rast/main.c
+@@ -62,7 +62,7 @@ void fatal_error(void *map, int elevfd, int outfd, char *errorMsg)
+     if (elevfd != -1)
+         close_output_map(elevfd);
+ 
+-    Rast3d_fatal_error(errorMsg);
++    Rast3d_fatal_error("%s", errorMsg);
+     exit(EXIT_FAILURE);
+ 
+ }
+diff --git a/raster3d/r3.in.ascii/main.c b/raster3d/r3.in.ascii/main.c
+index 9e92285..a67d7ad 100644
+--- a/raster3d/r3.in.ascii/main.c
++++ b/raster3d/r3.in.ascii/main.c
+@@ -65,7 +65,7 @@ void fatalError(char *errorMsg)
+         Rast3d_close(map);
+     }
+ 
+-    Rast3d_fatal_error(errorMsg);
++    Rast3d_fatal_error("%s", errorMsg);
+ }
+ 
+ /*---------------------------------------------------------------------------*/
+diff --git a/raster3d/r3.in.v5d/main.c b/raster3d/r3.in.v5d/main.c
+index 7d1652f..d258818 100644
+--- a/raster3d/r3.in.v5d/main.c
++++ b/raster3d/r3.in.v5d/main.c
+@@ -48,7 +48,7 @@ static void fatalError(char *errorMsg)
+ 	/* should unopen map here! */
+     }
+ 
+-    Rast3d_fatal_error(errorMsg);
++    Rast3d_fatal_error("%s", errorMsg);
+ }
+ 
+ /*---------------------------------------------------------------------------*/
+diff --git a/raster3d/r3.out.ascii/main.c b/raster3d/r3.out.ascii/main.c
+index 72d50bd..2af12d0 100644
+--- a/raster3d/r3.out.ascii/main.c
++++ b/raster3d/r3.out.ascii/main.c
+@@ -64,7 +64,7 @@ void fatalError(char *errorMsg)
+ 
+     }
+ 
+-    Rast3d_fatal_error(errorMsg);
++    Rast3d_fatal_error("%s", errorMsg);
+ }
+ 
+ /*---------------------------------------------------------------------------*/
+diff --git a/raster3d/r3.out.v5d/main.c b/raster3d/r3.out.v5d/main.c
+index 5d54b1f..7b74c33 100644
+--- a/raster3d/r3.out.v5d/main.c
++++ b/raster3d/r3.out.v5d/main.c
+@@ -55,7 +55,7 @@ void fatalError(char *errorMsg)
+ 	    fatalError(_("Unable to close 3D raster map"));
+     }
+ 
+-    Rast3d_fatal_error(errorMsg);
++    Rast3d_fatal_error("%s", errorMsg);
+ }
+ 
+ /*---------------------------------------------------------------------------*/
+diff --git a/raster3d/r3.retile/main.c b/raster3d/r3.retile/main.c
+index 10fb26e..c10d7f5 100644
+--- a/raster3d/r3.retile/main.c
++++ b/raster3d/r3.retile/main.c
+@@ -54,7 +54,7 @@ void fatal_error(void *map, int *fd, int depths, char *errorMsg)
+             Rast_unopen(fd[i]);
+     }
+ 
+-    Rast3d_fatal_error(errorMsg);
++    Rast3d_fatal_error("%s", errorMsg);
+     exit(EXIT_FAILURE);
+ 
+ }
+diff --git a/raster3d/r3.to.rast/main.c b/raster3d/r3.to.rast/main.c
+index 9006d22..1119f26 100644
+--- a/raster3d/r3.to.rast/main.c
++++ b/raster3d/r3.to.rast/main.c
+@@ -60,7 +60,7 @@ void fatal_error(void *map, int *fd, int depths, char *errorMsg)
+             Rast_unopen(fd[i]);
+     }
+ 
+-    Rast3d_fatal_error(errorMsg);
++    Rast3d_fatal_error("%s", errorMsg);
+     exit(EXIT_FAILURE);
+ 
+ }
+diff --git a/vector/v.in.ascii/main.c b/vector/v.in.ascii/main.c
+index adcd9d2..dae9c59 100644
+--- a/vector/v.in.ascii/main.c
++++ b/vector/v.in.ascii/main.c
+@@ -404,7 +404,7 @@ int main(int argc, char *argv[])
+ 				Fi->driver);
+ 
+ 	    /* Create table */
+-	    G_debug(3, db_get_string(&sql));
++	    G_debug(3, "%s", db_get_string(&sql));
+ 	    if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 		G_fatal_error(_("Unable to create table: %s"),
+ 			      db_get_string(&sql));
+diff --git a/vector/v.in.ascii/points.c b/vector/v.in.ascii/points.c
+index a3c5186..bfa6d2f 100644
+--- a/vector/v.in.ascii/points.c
++++ b/vector/v.in.ascii/points.c
+@@ -446,7 +446,7 @@ int points_to_bin(FILE * ascii, int rowlen, struct Map_info *Map,
+ 		db_append_string(&sql, buf2);
+ 	    }
+ 	    db_append_string(&sql, ")");
+-	    G_debug(3, db_get_string(&sql));
++	    G_debug(3, "%s", db_get_string(&sql));
+ 
+ 	    if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 		G_fatal_error(_("Unable to insert new record: %s"),
+diff --git a/vector/v.in.lidar/main.c b/vector/v.in.lidar/main.c
+index 6b22cbe..f4cd4cf 100644
+--- a/vector/v.in.lidar/main.c
++++ b/vector/v.in.lidar/main.c
+@@ -472,7 +472,7 @@ int main(int argc, char *argv[])
+ 	    strcat(error_msg,
+ 		   _("Consider generating a new location with 'location' parameter"
+ 		    " from input data set.\n"));
+-	    G_fatal_error(error_msg);
++	    G_fatal_error("%s", error_msg);
+ 	}
+ 	else {
+ 	    G_verbose_message(_("Projection of input dataset and current "
+@@ -596,7 +596,7 @@ int main(int argc, char *argv[])
+ 	}
+ 
+ 	db_append_string(&sql, ")");
+-	G_debug(3, db_get_string(&sql));
++	G_debug(3, "%s", db_get_string(&sql));
+ 
+ 	driver =
+ 	    db_start_driver_open_database(Fi->driver,
+@@ -778,7 +778,7 @@ int main(int argc, char *argv[])
+ 		db_append_string(&sql, buf);
+ 	    }
+ 	    db_append_string(&sql, " )");
+-	    G_debug(3, db_get_string(&sql));
++	    G_debug(3, "%s", db_get_string(&sql));
+ 
+ 	    if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 		G_fatal_error(_("Cannot insert new row: %s"),
+diff --git a/vector/v.in.ogr/main.c b/vector/v.in.ogr/main.c
+index 6604065..1b16e85 100644
+--- a/vector/v.in.ogr/main.c
++++ b/vector/v.in.ogr/main.c
+@@ -1101,7 +1101,7 @@ int main(int argc, char *argv[])
+ 		G_free(Ogr_fieldname);
+ 	    }
+ 	    db_append_string(&sql, ")");
+-	    G_debug(3, db_get_string(&sql));
++	    G_debug(3, "%s", db_get_string(&sql));
+ 
+ 	    driver =
+ 		db_start_driver_open_database(Fi->driver,
+@@ -1236,7 +1236,7 @@ int main(int argc, char *argv[])
+ 		    db_append_string(&sql, buf);
+ 		}
+ 		db_append_string(&sql, " )");
+-		G_debug(3, db_get_string(&sql));
++		G_debug(3, "%s", db_get_string(&sql));
+ 
+ 		if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 		    db_close_database(driver);
+diff --git a/vector/v.net.allpairs/main.c b/vector/v.net.allpairs/main.c
+index ae877fd..b459021 100644
+--- a/vector/v.net.allpairs/main.c
++++ b/vector/v.net.allpairs/main.c
+@@ -172,7 +172,7 @@ int main(int argc, char *argv[])
+ 	    Fi->table);
+ 
+     db_set_string(&sql, buf);
+-    G_debug(2, db_get_string(&sql));
++    G_debug(2, "%s", db_get_string(&sql));
+ 
+     if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 	db_close_database_shutdown_driver(driver);
+@@ -264,7 +264,7 @@ int main(int argc, char *argv[])
+ 	    sprintf(buf, "insert into %s values (%d, %d, %d, %f)",
+ 		    Fi->table, cat, spnode[i].cat, spnode[j].cat, cost);
+ 	    db_set_string(&sql, buf);
+-	    G_debug(3, db_get_string(&sql));
++	    G_debug(3, "%s", db_get_string(&sql));
+ 
+ 	    if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 		db_close_database_shutdown_driver(driver);
+diff --git a/vector/v.net.centrality/main.c b/vector/v.net.centrality/main.c
+index 0f89bb3..fc7058f 100644
+--- a/vector/v.net.centrality/main.c
++++ b/vector/v.net.centrality/main.c
+@@ -260,7 +260,7 @@ int main(int argc, char *argv[])
+ 	    "create table %s(cat integer%s)", Fi->table, db_get_string(&tmp));
+ 
+     db_set_string(&sql, buf);
+-    G_debug(2, db_get_string(&sql));
++    G_debug(2, "%s", db_get_string(&sql));
+ 
+     if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 	G_fatal_error(_("Unable to create table: '%s'"), db_get_string(&sql));
+diff --git a/vector/v.net.components/main.c b/vector/v.net.components/main.c
+index 0520651..9a1d6dd 100644
+--- a/vector/v.net.components/main.c
++++ b/vector/v.net.components/main.c
+@@ -31,7 +31,7 @@ int insert_new_record(dbDriver * driver, struct field_info *Fi,
+ 
+     sprintf(buf, "insert into %s values (%d, %d)", Fi->table, cat, comp);
+     db_set_string(sql, buf);
+-    G_debug(3, db_get_string(sql));
++    G_debug(3, "%s", db_get_string(sql));
+ 
+     if (db_execute_immediate(driver, sql) != DB_OK) {
+ 	db_close_database_shutdown_driver(driver);
+@@ -182,7 +182,7 @@ int main(int argc, char *argv[])
+     sprintf(buf, "create table %s ( cat integer, comp integer)", Fi->table);
+ 
+     db_set_string(&sql, buf);
+-    G_debug(2, db_get_string(&sql));
++    G_debug(2, "%s", db_get_string(&sql));
+ 
+     if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 	db_close_database_shutdown_driver(driver);
+diff --git a/vector/v.net.distance/main.c b/vector/v.net.distance/main.c
+index fbf61c8..0bd04ac 100644
+--- a/vector/v.net.distance/main.c
++++ b/vector/v.net.distance/main.c
+@@ -257,7 +257,7 @@ int main(int argc, char *argv[])
+ 	    Fi->table);
+ 
+     db_set_string(&sql, buf);
+-    G_debug(2, db_get_string(&sql));
++    G_debug(2, "%s", db_get_string(&sql));
+ 
+     if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 	G_fatal_error(_("Unable to create table: '%s'"), db_get_string(&sql));
+@@ -320,7 +320,7 @@ int main(int argc, char *argv[])
+ 		    tcat, cost);
+ 
+ 	    db_set_string(&sql, buf);
+-	    G_debug(3, db_get_string(&sql));
++	    G_debug(3, "%s", db_get_string(&sql));
+ 	    if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 		G_fatal_error(_("Cannot insert new record: %s"),
+ 			      db_get_string(&sql));
+diff --git a/vector/v.net.flow/main.c b/vector/v.net.flow/main.c
+index 1a37d2a..a002180 100644
+--- a/vector/v.net.flow/main.c
++++ b/vector/v.net.flow/main.c
+@@ -174,7 +174,7 @@ int main(int argc, char *argv[])
+ 	    Fi->table);
+ 
+     db_set_string(&sql, buf);
+-    G_debug(2, db_get_string(&sql));
++    G_debug(2, "%s", db_get_string(&sql));
+ 
+     if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 	db_close_database_shutdown_driver(driver);
+@@ -255,7 +255,7 @@ int main(int argc, char *argv[])
+ 	    sprintf(buf, "insert into %s values (%d, %f)", Fi->table, cat,
+ 		    flow[i] / (double)In.dgraph.cost_multip);
+ 	    db_set_string(&sql, buf);
+-	    G_debug(3, db_get_string(&sql));
++	    G_debug(3, "%s", db_get_string(&sql));
+ 
+ 	    if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 		db_close_database_shutdown_driver(driver);
+diff --git a/vector/v.net.path/path.c b/vector/v.net.path/path.c
+index ed0f04c..a45023c 100644
+--- a/vector/v.net.path/path.c
++++ b/vector/v.net.path/path.c
+@@ -103,7 +103,7 @@ int path(struct Map_info *In, struct Map_info *Out, char *filename,
+ 	    Fi->table);
+ 
+     db_set_string(&sql, buf);
+-    G_debug(2, db_get_string(&sql));
++    G_debug(2, "%s", db_get_string(&sql));
+ 
+     if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 	G_fatal_error(_("Unable to create table: '%s'"), db_get_string(&sql));
+@@ -306,7 +306,7 @@ int path(struct Map_info *In, struct Map_info *Out, char *filename,
+ 		"insert into %s values ( %d, %d, %d, %d, %d, %f, %f, %f)",
+ 		Fi->table, cat, id, fcat, tcat, sp, cost, fdist, tdist);
+ 	db_set_string(&sql, buf);
+-	G_debug(3, db_get_string(&sql));
++	G_debug(3, "%s", db_get_string(&sql));
+ 
+ 	if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 	    G_fatal_error(_("Cannot insert new record: %s"),
+diff --git a/vector/v.net.timetable/main.c b/vector/v.net.timetable/main.c
+index 2e9bba6..18f2ba6 100644
+--- a/vector/v.net.timetable/main.c
++++ b/vector/v.net.timetable/main.c
+@@ -96,7 +96,7 @@ void init_database(struct Map_info *Out, dbDriver ** driver,
+     sprintf(buf, "create table %s (%s)", (*Fi)->table, columns);
+ 
+     db_set_string(&sql, buf);
+-    G_debug(2, db_get_string(&sql));
++    G_debug(2, "%s", db_get_string(&sql));
+ 
+     if (db_execute_immediate(*driver, &sql) != DB_OK) {
+ 	db_close_database_shutdown_driver(*driver);
+@@ -128,7 +128,7 @@ void insert_point(dbDriver * driver, char *table, int cat, int path,
+     sprintf(buf, "insert into %s values (%d, %d, %d, %d, %d, %d)", table, cat,
+ 	    path, stop_id, index, arrival_time, departure_time);
+     db_set_string(&sql, buf);
+-    G_debug(3, db_get_string(&sql));
++    G_debug(3, "%s", db_get_string(&sql));
+     if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 	db_close_database_shutdown_driver(driver);
+ 	G_fatal_error(_("Cannot insert new record: %s"), db_get_string(&sql));
+@@ -150,7 +150,7 @@ void insert_line(dbDriver * driver, char *table, int cat, int path,
+ 	    table, cat, path, from_id, to_id, route_id, index, from_time,
+ 	    to_time);
+     db_set_string(&sql, buf);
+-    G_debug(3, db_get_string(&sql));
++    G_debug(3, "%s", db_get_string(&sql));
+     if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 	db_close_database_shutdown_driver(driver);
+ 	G_fatal_error(_("Cannot insert new record: %s"), db_get_string(&sql));
+diff --git a/vector/v.net/main.c b/vector/v.net/main.c
+index d1cc5b2..12e0d39 100644
+--- a/vector/v.net/main.c
++++ b/vector/v.net/main.c
+@@ -171,7 +171,7 @@ int main(int argc, char **argv)
+     if (file_arcs)
+ 	fclose(file_arcs);
+ 
+-    G_done_msg(message);
++    G_done_msg("%s", message);
+ 
+     return (EXIT_SUCCESS);
+ }
+diff --git a/vector/v.out.postgis/create.c b/vector/v.out.postgis/create.c
+index 5aa1682..a33dc20 100644
+--- a/vector/v.out.postgis/create.c
++++ b/vector/v.out.postgis/create.c
+@@ -77,9 +77,9 @@ char *create_pgfile(const char *dsn, const char *schema, const char *olink,
+ 	    G_set_key_value(tokens[0], tokens[1], key_val);
+ 	    
+ 	    if (strcmp(tokens[0], "fid") == 0)
+-		G_asprintf(fid_column, tokens[1]);
++                G_asprintf(fid_column, "%s", tokens[1]);
+ 	    if (strcmp(tokens[0], "geometry_name") == 0)
+-		G_asprintf(geom_column, tokens[1]);
++		G_asprintf(geom_column, "%s", tokens[1]);
+ 
+ 	    G_free_tokens(tokens);
+ 	}
+diff --git a/vector/v.overlay/area_area.c b/vector/v.overlay/area_area.c
+index 70d5323..e766126 100644
+--- a/vector/v.overlay/area_area.c
++++ b/vector/v.overlay/area_area.c
+@@ -339,7 +339,7 @@ int area_area(struct Map_info *In, int *field, struct Map_info *Tmp,
+ 
+ 			db_append_string(&stmt, " )");
+ 
+-			G_debug(3, db_get_string(&stmt));
++			G_debug(3, "%s", db_get_string(&stmt));
+ 
+ 			if (db_execute_immediate(driver, &stmt) != DB_OK)
+ 			    G_warning(_("Unable to insert new record: '%s'"),
+diff --git a/vector/v.overlay/line_area.c b/vector/v.overlay/line_area.c
+index 5bd828d..5384193 100644
+--- a/vector/v.overlay/line_area.c
++++ b/vector/v.overlay/line_area.c
+@@ -404,7 +404,7 @@ int line_area(struct Map_info *In, int *field, struct Map_info *Tmp,
+ 
+ 			    db_append_string(&stmt, " )");
+ 
+-			    G_debug(3, db_get_string(&stmt));
++			    G_debug(3, "%s", db_get_string(&stmt));
+ 
+ 			    if (db_execute_immediate(driver, &stmt) != DB_OK)
+ 				G_warning(_("Unable to insert new record: '%s'"),
+diff --git a/vector/v.overlay/main.c b/vector/v.overlay/main.c
+index e9bdc91..2e163a5 100644
+--- a/vector/v.overlay/main.c
++++ b/vector/v.overlay/main.c
+@@ -572,7 +572,7 @@ int main(int argc, char *argv[])
+ 
+ 	db_append_string(&stmt, " )");
+ 
+-	G_debug(3, db_get_string(&stmt));
++	G_debug(3, "%s", db_get_string(&stmt));
+ 
+ 	if (db_execute_immediate(driver, &stmt) != DB_OK) {
+ 	    Vect_close(&Out);
+diff --git a/vector/v.random/main.c b/vector/v.random/main.c
+index 51b9419..07e8671 100644
+--- a/vector/v.random/main.c
++++ b/vector/v.random/main.c
+@@ -462,7 +462,7 @@ int main(int argc, char *argv[])
+ 			sprintf(buf, "%.0f )", z);
+ 		    db_append_string(&sql, buf);
+ 
+-		    G_debug(3, db_get_string(&sql));
++		    G_debug(3, "%s", db_get_string(&sql));
+ 		    if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 			G_fatal_error(_("Cannot insert new row: %s"),
+ 				      db_get_string(&sql));
+@@ -582,7 +582,7 @@ int main(int argc, char *argv[])
+ 		    sprintf(buf, "%.0f )", z);
+ 		db_append_string(&sql, buf);
+ 
+-		G_debug(3, db_get_string(&sql));
++		G_debug(3, "%s", db_get_string(&sql));
+ 		if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 		    G_fatal_error(_("Cannot insert new row: %s"),
+ 				  db_get_string(&sql));
+diff --git a/vector/v.rectify/cp.c b/vector/v.rectify/cp.c
+index c3c9464..d5e3eed 100644
+--- a/vector/v.rectify/cp.c
++++ b/vector/v.rectify/cp.c
+@@ -373,7 +373,7 @@ int get_control_points(char *group, char *pfile, int order, int use3d,
+ 	break;
+     }
+     if (ret != 1)
+-	G_fatal_error(msg);
++        G_fatal_error("%s", msg);
+ 	
+     if (rms) {
+ 	compute_rms(&cp, &cp3, order, use3d, orthorot, sep, fpr);
+diff --git a/vector/v.rectify/target.c b/vector/v.rectify/target.c
+index efa6dc6..77c461b 100644
+--- a/vector/v.rectify/target.c
++++ b/vector/v.rectify/target.c
+@@ -42,6 +42,6 @@ int get_target(char *group)
+   error:
+     strcat(buf, _("Please run i.target for group."));
+     strcat(buf, group);
+-    G_fatal_error(buf);
++    G_fatal_error("%s", buf);
+     return 1;			/* never reached */
+ }
+diff --git a/vector/v.surf.rst/main.c b/vector/v.surf.rst/main.c
+index 286d7a1..1c7f2ed 100644
+--- a/vector/v.surf.rst/main.c
++++ b/vector/v.surf.rst/main.c
+@@ -581,7 +581,7 @@ int main(int argc, char *argv[])
+ 	db_append_string(&sql2, "cat integer");
+ 	db_append_string(&sql2, ", flt1 double precision");
+ 	db_append_string(&sql2, ")");
+-	G_debug(1, db_get_string(&sql2));
++	G_debug(1, "%s", db_get_string(&sql2));
+ 	driver2 = db_start_driver_open_database(ff->driver, ff->database);
+ 	if (driver2 == NULL)
+ 	    G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
+diff --git a/vector/v.vol.rst/main.c b/vector/v.vol.rst/main.c
+index fe4bf63..a283d7e 100644
+--- a/vector/v.vol.rst/main.c
++++ b/vector/v.vol.rst/main.c
+@@ -594,7 +594,7 @@ int main(int argc, char *argv[])
+ 	db_append_string(&sql, " integer");
+ 	db_append_string(&sql, ", flt1 double precision");
+ 	db_append_string(&sql, ")");
+-	G_debug(1, db_get_string(&sql));
++	G_debug(1, "%s", db_get_string(&sql));
+ 	driver = db_start_driver_open_database(f->driver, f->database);
+ 	if (driver == NULL)
+ 	    G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
+diff --git a/vector/v.vol.rst/vector.c b/vector/v.vol.rst/vector.c
+index 3551603..a3bfc1b 100644
+--- a/vector/v.vol.rst/vector.c
++++ b/vector/v.vol.rst/vector.c
+@@ -72,7 +72,7 @@ int point_save(double xmm, double ymm, double zmm, double err)
+     sprintf(buf, ", %f", err);
+     db_append_string(&sql, buf);
+     db_append_string(&sql, ")");
+-    G_debug(3, db_get_string(&sql));
++    G_debug(3, "%s", db_get_string(&sql));
+ 
+     if (db_execute_immediate(driver, &sql) != DB_OK) {
+ 	db_close_database(driver);
+diff --git a/vector/v.what.rast/main.c b/vector/v.what.rast/main.c
+index 542093f..e329710 100644
+--- a/vector/v.what.rast/main.c
++++ b/vector/v.what.rast/main.c
+@@ -623,7 +623,7 @@ int main(int argc, char *argv[])
+ 		sprintf(buf, " AND %s", opt.where->answer);
+ 		db_append_string(&stmt, buf);
+ 	    }
+-	    G_debug(3, db_get_string(&stmt));
++	    G_debug(3, "%s", db_get_string(&stmt));
+ 
+ 	    /* Update table */
+ 	    if (db_execute_immediate(driver, &stmt) == DB_OK) {
+diff --git a/vector/v.what.rast3/main.c b/vector/v.what.rast3/main.c
+index d84f155..27ff931 100644
+--- a/vector/v.what.rast3/main.c
++++ b/vector/v.what.rast3/main.c
+@@ -305,7 +305,7 @@ int main(int argc, char *argv[])
+ 	    G_snprintf(buf, 2048, " AND %s", opt.where->answer);
+ 	    db_append_string(&stmt, buf);
+ 	}
+-	G_debug(3, db_get_string(&stmt));
++	G_debug(3, "%s", db_get_string(&stmt));
+ 
+ 	/* Update table */
+ 	if (db_execute_immediate(driver, &stmt) == DB_OK) {

diff --git a/sci-geosciences/grass/grass-7.0.1-r1.ebuild b/sci-geosciences/grass/grass-7.0.1-r1.ebuild
index 68af821..797d5cd 100644
--- a/sci-geosciences/grass/grass-7.0.1-r1.ebuild
+++ b/sci-geosciences/grass/grass-7.0.1-r1.ebuild
@@ -77,8 +77,7 @@ S="${WORKDIR}/${MY_P}"
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
-	opengl? ( X )
-"
+	opengl? ( X )"
 
 pkg_setup() {
 	if use lapack; then
@@ -111,10 +110,13 @@ pkg_setup() {
 src_prepare() {
 	# Fix undefined reference to errno in lib/raster/open.c
 	# see http://trac.osgeo.org/grass/changeset/66398
-	epatch "${FILESDIR}/${P}-include-errno.patch"
+	epatch "${FILESDIR}/${P}"-include-errno.patch
 
 	# Fix undeclared variable if OSG is disabled
-	epatch "${FILESDIR}/${P}-declare-inespg.patch"
+	epatch "${FILESDIR}/${P}"-declare-inespg.patch
+
+	# Bug #563490
+	epatch "${FILESDIR}/${PV}"-sec-format.patch
 
 	# Fix unversioned python calls
 	local pyver=${EPYTHON/python/}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/files/, sci-geosciences/grass/
@ 2015-12-05 13:55 Amy Winston
  0 siblings, 0 replies; 9+ messages in thread
From: Amy Winston @ 2015-12-05 13:55 UTC (permalink / raw
  To: gentoo-commits

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>


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/files/, sci-geosciences/grass/
@ 2018-04-04 21:10 Andreas Sturmlechner
  0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2018-04-04 21:10 UTC (permalink / raw
  To: gentoo-commits

commit:     f602ce29a225b52165cf735a263c65a6a8774f36
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  4 21:01:04 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr  4 21:09:32 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f602ce29

sci-geosciences/grass: Fix build with glibc-2.26

Reported-by: Martin von Gagern <Martin.vGagern <AT> gmx.net>
Thanks-to: MarisN <maris.gis <AT> gmail.com>
Closes: https://bugs.gentoo.org/588980
Package-Manager: Portage-2.3.28, Repoman-2.3.9

 .../grass/files/grass-7.2.0-glibc-2.26-1.patch     | 10 +++++++
 .../grass/files/grass-7.2.0-glibc-2.26-2.patch     | 32 ++++++++++++++++++++++
 sci-geosciences/grass/grass-7.2.0-r1.ebuild        |  1 +
 3 files changed, 43 insertions(+)

diff --git a/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-1.patch b/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-1.patch
new file mode 100644
index 00000000000..115ff06febc
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-1.patch
@@ -0,0 +1,10 @@
+Index: /grass/trunk/lib/raster/R.h
+===================================================================
+--- /grass/trunk/lib/raster/R.h	(revision 71264)
++++ /grass/trunk/lib/raster/R.h	(revision 71265)
+@@ -1,5 +1,4 @@
+ #include <grass/config.h>
+ #include <grass/gis.h>
+-#include <rpc/types.h>
+ #ifdef HAVE_GDAL
+ #include <gdal.h>

diff --git a/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-2.patch b/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-2.patch
new file mode 100644
index 00000000000..c1361f6af08
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-2.patch
@@ -0,0 +1,32 @@
+Index: /grass/branches/releasebranch_7_2/lib/raster/get_row.c
+===================================================================
+--- /grass/branches/releasebranch_7_2/lib/raster/get_row.c	(revision 71943)
++++ /grass/branches/releasebranch_7_2/lib/raster/get_row.c	(revision 71944)
+@@ -15,6 +15,4 @@
+ #include <unistd.h>
+ #include <sys/types.h>
+-
+-#include <rpc/types.h>		/* need this for sgi */
+ 
+ #include <grass/config.h>
+Index: /grass/branches/releasebranch_7_2/lib/raster/open.c
+===================================================================
+--- /grass/branches/releasebranch_7_2/lib/raster/open.c	(revision 71943)
++++ /grass/branches/releasebranch_7_2/lib/raster/open.c	(revision 71944)
+@@ -13,6 +13,4 @@
+  */
+ 
+-#include <rpc/types.h>
+-#include <rpc/xdr.h>
+ #include <unistd.h>
+ #include <string.h>
+Index: /grass/branches/releasebranch_7_2/lib/raster/range.c
+===================================================================
+--- /grass/branches/releasebranch_7_2/lib/raster/range.c	(revision 71943)
++++ /grass/branches/releasebranch_7_2/lib/raster/range.c	(revision 71944)
+@@ -13,5 +13,4 @@
+ 
+ #include <unistd.h>
+-#include <rpc/types.h>		/* need this for sgi */
+ 
+ #include <grass/raster.h>

diff --git a/sci-geosciences/grass/grass-7.2.0-r1.ebuild b/sci-geosciences/grass/grass-7.2.0-r1.ebuild
index 00657af184e..233823e1fa4 100644
--- a/sci-geosciences/grass/grass-7.2.0-r1.ebuild
+++ b/sci-geosciences/grass/grass-7.2.0-r1.ebuild
@@ -79,6 +79,7 @@ REQUIRED_USE="
 PATCHES=(
 	"${FILESDIR}/${PN}"-7.0.1-declare-inespg.patch
 	"${FILESDIR}/${P}"-gcc7.patch
+	"${FILESDIR}/${P}"-glibc-2.26-{1,2}.patch
 )
 
 pkg_setup() {


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/files/, sci-geosciences/grass/
@ 2019-06-27 17:21 Andreas Sturmlechner
  0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2019-06-27 17:21 UTC (permalink / raw
  To: gentoo-commits

commit:     504ecda44c5f9d0e661f6af325fe587e83ff9a22
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 27 13:59:05 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 27 17:18:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=504ecda4

sci-geosciences/grass: Drop old

Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/grass/Manifest                     |   3 -
 sci-geosciences/grass/files/grass-7.2.0-gcc7.patch |  94 -------
 .../grass/files/grass-7.2.0-glibc-2.26-1.patch     |  10 -
 .../grass/files/grass-7.2.0-glibc-2.26-2.patch     |  32 ---
 sci-geosciences/grass/grass-7.2.0-r1.ebuild        | 265 -------------------
 sci-geosciences/grass/grass-7.4.0.ebuild           | 281 --------------------
 sci-geosciences/grass/grass-7.4.1.ebuild           | 284 ---------------------
 7 files changed, 969 deletions(-)

diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index ab09e66a39f..1fcbb8c2267 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,4 +1 @@
-DIST grass-7.2.0.tar.gz 48315008 BLAKE2B 927da2119e199cee7cbf55a172141abfe9ce86499e307b355fec2cdf79ec3424acddc4410e3049e7cade5dd3da39e618af7e1003093f87de5735a981984b46c6 SHA512 b1aa17ec554c2f0473df3726993b0891df4589c60ca9362405932a4c479b5883245b0a0ba9e787ce2e9de210b6307f34883e4e63ddfbf04eb5d75e8583bc2c5b
-DIST grass-7.4.0.tar.gz 56329374 BLAKE2B 924ecd9ad073dd3c59542a871780397a2516e1f0d912b4644978154ea6305ccf50229655aa7f38ab20f2bf85e4a4783cd793fff5101423dd6c212108d638d1df SHA512 b0393ec5d149e2146cc1f30cdcea00e31039bf0a2541486ab0ecd5debe260d267d74e60761b45ce306ad9942264cce9134dbafbf3c75a55df1c610499877d321
-DIST grass-7.4.1.tar.gz 57969640 BLAKE2B 1d3d0fd20611971ec349bf0e26ef7d886b7047e1ec48f48584f8ba2e5562f352433c9869420d7e030e66fb5a9e60de20e6a78d1fd5142380fbcab51f700766d8 SHA512 66616e495aa798cd1ad7a0284a386f7e99741918596b816a712788114e7dc491be0b5f19551f102b436518a5cabcdedbc61042acf0a9b06b9d8df12b4de26c90
 DIST grass-7.4.4.tar.gz 58454921 BLAKE2B bf8f85e4dad800a32ac0c23025b0844dde17c806aeec7d150d3263ff8fae80deab7b7052cfb664e138b2af1e5fbe3282db087d7545d42710db6d9890f0b285ee SHA512 9971bd1184c4b2eb38ecf5efafd28094c2d05d22e9ae53a8b074a15e26c029dd13c4627b442a428bca4030fd9118e49422863515cf0fc58dd46e70d2923a9f83

diff --git a/sci-geosciences/grass/files/grass-7.2.0-gcc7.patch b/sci-geosciences/grass/files/grass-7.2.0-gcc7.patch
deleted file mode 100644
index 97be4d7d860..00000000000
--- a/sci-geosciences/grass/files/grass-7.2.0-gcc7.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Index: releasebranch_7_2/lib/python/ctypes/ctypesgencore/parser/lextab.py
-===================================================================
---- a/lib/python/ctypes/ctypesgencore/parser/lextab.py	(revision 71218)
-+++ b/lib/python/ctypes/ctypesgencore/parser/lextab.py	(revision 71219)
-@@ -1,59 +1,8 @@
- # lextab.py. This file automatically created by PLY (version 2.2). Don't edit!
--_lextokens = {
--    'RIGHT_OP': None,
--    'RIGHT_ASSIGN': None,
--    'DEC_OP': None,
--    'PP_MACRO_PARAM': None,
--    'DIV_ASSIGN': None,
--    'PP_DEFINE': None,
--    'PP_END_DEFINE': None,
--    'PP_DEFINE_MACRO_NAME': None,
--    'HEADER_NAME': None,
--    'NEWLINE': None,
--    'CHARACTER_CONSTANT': None,
--    'PP_STRINGIFY': None,
--    'AND_ASSIGN': None,
--    'PTR_OP': None,
--    'ELLIPSIS': None,
--    'IDENTIFIER': None,
--    'ADD_ASSIGN': None,
--    'PERIOD': None,
--    'AND_OP': None,
--    'OTHER': None,
--    'LPAREN': None,
--    'LEFT_OP': None,
--    'LE_OP': None,
--    'OR_OP': None,
--    'SUB_ASSIGN': None,
--    'MOD_ASSIGN': None,
--    'STRING_LITERAL': None,
--    'PP_IDENTIFIER_PASTE': None,
--    'PP_NUMBER': None,
--    'PP_DEFINE_NAME': None,
--    'XOR_ASSIGN': None,
--    'OR_ASSIGN': None,
--    'GE_OP': None,
--    'MUL_ASSIGN': None,
--    'LEFT_ASSIGN': None,
--    'INC_OP': None,
--    'NE_OP': None,
--    'EQ_OP': None}
--_lexreflags = 0
--_lexliterals = ''
-+_lextokens    = {'RIGHT_OP': None, 'RIGHT_ASSIGN': None, 'DEC_OP': None, 'PP_MACRO_PARAM': None, 'DIV_ASSIGN': None, 'PP_DEFINE': None, 'PP_END_DEFINE': None, 'PP_DEFINE_MACRO_NAME': None, 'HEADER_NAME': None, 'NEWLINE': None, 'CHARACTER_CONSTANT': None, 'PP_STRINGIFY': None, 'AND_ASSIGN': None, 'PTR_OP': None, 'ELLIPSIS': None, 'IDENTIFIER': None, 'ADD_ASSIGN': None, 'PERIOD': None, 'AND_OP': None, 'OTHER': None, 'LPAREN': None, 'LEFT_OP': None, 'LE_OP': None, 'OR_OP': None, 'SUB_ASSIGN': None, 'MOD_ASSIGN': None, 'STRING_LITERAL': None, 'PP_IDENTIFIER_PASTE': None, 'PP_NUMBER': None, 'PP_DEFINE_NAME': None, 'XOR_ASSIGN': None, 'OR_ASSIGN': None, 'GE_OP': None, 'MUL_ASSIGN': None, 'LEFT_ASSIGN': None, 'INC_OP': None, 'NE_OP': None, 'EQ_OP': None}
-+_lexreflags   = 0
-+_lexliterals  = ''
- _lexstateinfo = {'INITIAL': 'inclusive', 'DEFINE': 'exclusive'}
--_lexstatere = {
--    'INITIAL': [
--        ('(?P<t_ANY_directive>\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P<t_ANY_punctuator>(\\.\\.\\.|\\|\\||\\+\\+|\\*=|\\^=|<<=|>>=|\\|=|\\+=|>=|>>|<<|<=|<:|%=|:>|<%|!=|\\)|\\+|\\*|\\.|\\?|==|&=|&&|\\[|\\^|--|/=|%>|-=|->|\\||!|%|&|-|,|/|;|:|=|>|]|<|{|}|~))', [
--            None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P<t_INITIAL_identifier>[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [
--                None, ('t_INITIAL_identifier', 'INITIAL_identifier')]), ('(?P<t_ANY_float>(?P<p1>[0-9]+)?(?P<dp>[.]?)(?P<p2>(?(p1)[0-9]*|[0-9]+))(?P<exp>(?:[Ee][+-]?[0-9]+)?)(?P<suf>[FflL]?)(?!\\w))', [
--                    None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P<t_ANY_int>(?P<p1>(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P<suf>[uUlL]*))', [
--                        None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?P<t_ANY_character_constant>L?\'(\\\\.|[^\\\\\'])+\')|(?P<t_ANY_string_literal>L?"(\\\\.|[^\\\\"])*")|(?P<t_ANY_lparen>\\()|(?P<t_INITIAL_newline>\\n)|(?P<t_INITIAL_pp_define>\\#define)', [
--                            None, ('t_ANY_character_constant', 'ANY_character_constant'), None, ('t_ANY_string_literal', 'ANY_string_literal'), None, ('t_ANY_lparen', 'ANY_lparen'), ('t_INITIAL_newline', 'INITIAL_newline'), ('t_INITIAL_pp_define', 'INITIAL_pp_define')])], 'DEFINE': [
--                                ('(?P<t_ANY_directive>\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P<t_ANY_punctuator>(\\.\\.\\.|\\|\\||\\+\\+|\\*=|\\^=|<<=|>>=|\\|=|\\+=|>=|>>|<<|<=|<:|%=|:>|<%|!=|\\)|\\+|\\*|\\.|\\?|==|&=|&&|\\[|\\^|--|/=|%>|-=|->|\\||!|%|&|-|,|/|;|:|=|>|]|<|{|}|~))', [
--                                    None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P<t_DEFINE_identifier>[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [
--                                        None, ('t_DEFINE_identifier', 'DEFINE_identifier')]), ('(?P<t_ANY_float>(?P<p1>[0-9]+)?(?P<dp>[.]?)(?P<p2>(?(p1)[0-9]*|[0-9]+))(?P<exp>(?:[Ee][+-]?[0-9]+)?)(?P<suf>[FflL]?)(?!\\w))', [
--                                            None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P<t_ANY_int>(?P<p1>(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P<suf>[uUlL]*))', [
--                                                None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?P<t_ANY_character_constant>L?\'(\\\\.|[^\\\\\'])+\')|(?P<t_ANY_string_literal>L?"(\\\\.|[^\\\\"])*")|(?P<t_ANY_lparen>\\()|(?P<t_DEFINE_newline>\\n)|(?P<t_DEFINE_pp_param_op>(\\#\\#)|(\\#))', [
--                                                    None, ('t_ANY_character_constant', 'ANY_character_constant'), None, ('t_ANY_string_literal', 'ANY_string_literal'), None, ('t_ANY_lparen', 'ANY_lparen'), ('t_DEFINE_newline', 'DEFINE_newline'), ('t_DEFINE_pp_param_op', 'DEFINE_pp_param_op')])]}
-+_lexstatere   = {'INITIAL': [('(?P<t_ANY_directive>\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P<t_ANY_punctuator>(\\.\\.\\.|\\|\\||\\+\\+|>>=|\\|=|\\^=|<<=|\\*=|\\+=|>=|>>|%=|:>|%>|!=|\\*|\\.|==|\\^|--|-=|->|\\||<<|<=|<:|<%|\\)|\\+|\\?|&=|&&|\\[|/=|&|,|:|<|>|~|!|%|-|/|;|=|]|{|}))', [None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P<t_INITIAL_identifier>[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [None, ('t_INITIAL_identifier', 'INITIAL_identifier')]), ('(?P<t_ANY_float>(?P<p1>[0-9]+)?(?P<dp>[.]?)(?P<p2>(?(p1)[0-9]*|[0-9]+))(?P<exp>(?:[Ee][+-]?[0-9]+)?)(?P<suf>([FfLl]|d[dfl]|D[DFL]|[fFdD][0-9]+x?)?)(?!\\w))', [None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P<t_ANY_int>(?P<p1>(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P<suf>[uUlL]*))', [None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?P<t_ANY_character_constant>L?\'(\\\\.|[^\\\\\'])+\')|(?P<t_ANY_string_literal>L?"(\\\\.|[^\\\\"])*")|(?P<t_ANY_lparen>\\()|(?P<t_INITIAL_newline>\\n)
 |(?P<t_INITIAL_pp_define>\\#define)', [None, ('t_ANY_character_constant', 'ANY_character_constant'), None, ('t_ANY_string_literal', 'ANY_string_literal'), None, ('t_ANY_lparen', 'ANY_lparen'), ('t_INITIAL_newline', 'INITIAL_newline'), ('t_INITIAL_pp_define', 'INITIAL_pp_define')])], 'DEFINE': [('(?P<t_ANY_directive>\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P<t_ANY_punctuator>(\\.\\.\\.|\\|\\||\\+\\+|>>=|\\|=|\\^=|<<=|\\*=|\\+=|>=|>>|%=|:>|%>|!=|\\*|\\.|==|\\^|--|-=|->|\\||<<|<=|<:|<%|\\)|\\+|\\?|&=|&&|\\[|/=|&|,|:|<|>|~|!|%|-|/|;|=|]|{|}))', [None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P<t_DEFINE_identifier>[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [None, ('t_DEFINE_identifier', 'DEFINE_identifier')]), ('(?P<t_ANY_float>(?P<p1>[0-9]+)?(?P<dp>[.]?)(?P<p2>(?(p1)[0-9]*|[0-9]+))(?P<exp>(?:[Ee][+-]?[0-9]+)?)(?P<suf>([FfLl]|d[dfl]|D[DFL]|[fFdD][0-9]+x?)?)(?!\\w))', [None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P<t_ANY
 _int>(?P<p1>(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P<suf>[uUlL]*))', [None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?P<t_ANY_character_constant>L?\'(\\\\.|[^\\\\\'])+\')|(?P<t_ANY_string_literal>L?"(\\\\.|[^\\\\"])*")|(?P<t_ANY_lparen>\\()|(?P<t_DEFINE_newline>\\n)|(?P<t_DEFINE_pp_param_op>(\\#\\#)|(\\#))', [None, ('t_ANY_character_constant', 'ANY_character_constant'), None, ('t_ANY_string_literal', 'ANY_string_literal'), None, ('t_ANY_lparen', 'ANY_lparen'), ('t_DEFINE_newline', 'DEFINE_newline'), ('t_DEFINE_pp_param_op', 'DEFINE_pp_param_op')])]}
- _lexstateignore = {'INITIAL': ' \t\x0b\x0c\r', 'DEFINE': ' \t\x0b\x0c\r'}
- _lexstateerrorf = {'INITIAL': 't_INITIAL_error', 'DEFINE': 't_DEFINE_error'}
-Index: releasebranch_7_2/lib/python/ctypes/ctypesgencore/parser/pplexer.py
-===================================================================
---- a/lib/python/ctypes/ctypesgencore/parser/pplexer.py	(revision 71218)
-+++ b/lib/python/ctypes/ctypesgencore/parser/pplexer.py	(revision 71219)
-@@ -52,7 +52,7 @@
-     'L': '[a-zA-Z_]',
-     'H': '[a-fA-F0-9]',
-     'E': '[Ee][+-]?\s*{D}+',
--    'FS': '[FflL]',
-+    'FS': '([FfLl]|d[dfl]|D[DFL]|[fFdD][0-9]+x?)',
-     'IS': '[uUlL]*',
- }
- # Helper: substitute {foo} with subs[foo] in string (makes regexes more lexy)
-@@ -226,10 +226,10 @@
-     exp = m.group("exp")
-     suf = m.group("suf")
- 
--    if dp or exp or (suf and suf in ("Ff")):
-+    if dp or exp or (suf and suf not in ("Ll")):
-         s = m.group(0)
-         if suf:
--            s = s[:-1]
-+            s = s[:-len(suf)]
-         # Attach a prefix so the parser can figure out if should become an
-         # integer, float, or long
-         t.value = "f" + s

diff --git a/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-1.patch b/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-1.patch
deleted file mode 100644
index 115ff06febc..00000000000
--- a/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-1.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: /grass/trunk/lib/raster/R.h
-===================================================================
---- /grass/trunk/lib/raster/R.h	(revision 71264)
-+++ /grass/trunk/lib/raster/R.h	(revision 71265)
-@@ -1,5 +1,4 @@
- #include <grass/config.h>
- #include <grass/gis.h>
--#include <rpc/types.h>
- #ifdef HAVE_GDAL
- #include <gdal.h>

diff --git a/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-2.patch b/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-2.patch
deleted file mode 100644
index c1361f6af08..00000000000
--- a/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-2.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: /grass/branches/releasebranch_7_2/lib/raster/get_row.c
-===================================================================
---- /grass/branches/releasebranch_7_2/lib/raster/get_row.c	(revision 71943)
-+++ /grass/branches/releasebranch_7_2/lib/raster/get_row.c	(revision 71944)
-@@ -15,6 +15,4 @@
- #include <unistd.h>
- #include <sys/types.h>
--
--#include <rpc/types.h>		/* need this for sgi */
- 
- #include <grass/config.h>
-Index: /grass/branches/releasebranch_7_2/lib/raster/open.c
-===================================================================
---- /grass/branches/releasebranch_7_2/lib/raster/open.c	(revision 71943)
-+++ /grass/branches/releasebranch_7_2/lib/raster/open.c	(revision 71944)
-@@ -13,6 +13,4 @@
-  */
- 
--#include <rpc/types.h>
--#include <rpc/xdr.h>
- #include <unistd.h>
- #include <string.h>
-Index: /grass/branches/releasebranch_7_2/lib/raster/range.c
-===================================================================
---- /grass/branches/releasebranch_7_2/lib/raster/range.c	(revision 71943)
-+++ /grass/branches/releasebranch_7_2/lib/raster/range.c	(revision 71944)
-@@ -13,5 +13,4 @@
- 
- #include <unistd.h>
--#include <rpc/types.h>		/* need this for sgi */
- 
- #include <grass/raster.h>

diff --git a/sci-geosciences/grass/grass-7.2.0-r1.ebuild b/sci-geosciences/grass/grass-7.2.0-r1.ebuild
deleted file mode 100644
index 6b99aa466e7..00000000000
--- a/sci-geosciences/grass/grass-7.2.0-r1.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"  # bug 572440
-WANT_AUTOCONF="2.1"
-WX_GTK_VER=3.0
-
-inherit autotools gnome2 python-single-r1 versionator wxwidgets xdg-utils
-
-MY_PM=${PN}$(get_version_component_range 1-2 ${PV})
-MY_PM=${MY_PM/.}
-MY_P=${P/_rc/RC}
-
-DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
-HOMEPAGE="https://grass.osgeo.org/"
-SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/7.2.0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-admin/eselect-1.2
-	dev-python/numpy[${PYTHON_USEDEP}]
-	media-libs/libprojectm
-	sci-libs/proj
-	sci-libs/xdrfile
-	sci-libs/gdal
-	sys-libs/gdbm
-	sys-libs/ncurses:0=
-	sys-libs/zlib:=
-	fftw? ( sci-libs/fftw:3.0= )
-	geos? ( sci-libs/geos )
-	blas? ( virtual/blas
-		sci-libs/cblas-reference )
-	lapack? ( virtual/lapack )
-	liblas? ( sci-geosciences/liblas )
-	mysql? ( virtual/mysql )
-	netcdf? ( sci-libs/netcdf )
-	odbc? ( dev-db/unixODBC )
-	opencl? ( virtual/opencl )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng:0= )
-	postgres? ( >=dev-db/postgresql-8.4:= )
-	readline? ( sys-libs/readline:0= )
-	sqlite? ( dev-db/sqlite:3 )
-	tiff? ( media-libs/tiff:0= )
-	truetype? ( media-libs/freetype:2 )
-	X? (
-		dev-python/wxpython:3.0[cairo,opengl?]
-		x11-libs/cairo[X,opengl?]
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXt
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/flex
-	sys-devel/gettext
-	sys-devel/bison
-	X? (
-		dev-lang/swig
-		x11-base/xorg-proto
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	opengl? ( X )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-7.0.1-declare-inespg.patch
-	"${FILESDIR}/${P}"-gcc7.patch
-	"${FILESDIR}/${P}"-glibc-2.26-{1,2}.patch
-)
-
-pkg_setup() {
-	if use lapack; then
-		local mylapack
-		mylapack=$(eselect lapack show) || die
-		if [[ -z "${mylapack/.*reference.*/}" ]] && \
-			[[ -z "${mylapack/.*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
-	fi
-
-	if use blas; then
-		local myblas
-		myblas=$(eselect blas show) || die
-		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
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Fix unversioned python calls
-	local pyver=${EPYTHON/python/}
-	sed -e "s:GRASS_PYTHON=.*:&${pyver}:" -i "${S}/lib/init/grass.sh" || die
-	sed -e "s:= python:&${pyver}:" -i "${S}/include/Make/Platform.make.in" || die
-
-	# fix header being unconditionally included
-	# see upstream https://trac.osgeo.org/grass/ticket/2779
-	sed -e 's:\(#include <ogr_api.h>\):#ifdef HAVE_OGR\n\1\n#endif:' \
-		-i "${S}/vector/v.external/main.c" || die "failed to sed main.c"
-
-	default
-	eautoconf
-
-	ebegin "Fixing python shebangs"
-	python_fix_shebang -q "${S}"
-	eend $?
-}
-
-src_configure() {
-	if use X; then
-		WX_BUILD=yes
-		setup-wxwidgets
-	fi
-
-	addwrite "${ROOT}dev/dri/renderD128"
-
-	econf \
-		--enable-shared \
-		--disable-w11 \
-		$(use_with cxx) \
-		$(use_with tiff) \
-		$(use_with png) \
-		$(use_with postgres) \
-		$(use_with mysql) \
-		$(use_with mysql mysql-includes "${ROOT}usr/include/mysql") \
-		$(use_with mysql mysql-libs "${ROOT}usr/$(get_libdir)/mysql") \
-		$(use_with sqlite) \
-		$(use_with opengl) \
-		$(use_with odbc) \
-		$(use_with fftw) \
-		$(use_with blas) \
-		$(use_with lapack) \
-		$(use_with X cairo) \
-		$(use_with truetype freetype) \
-		$(use_with truetype freetype-includes "${ROOT}usr/include/freetype2") \
-		$(use_with nls) \
-		$(use_with readline) \
-		--without-opendwg \
-		--with-regex \
-		$(use_with threads pthread) \
-		$(use_with openmp) \
-		$(use_with opencl) \
-		--with-gdal="${ROOT}usr/bin/gdal-config" \
-		$(use_with liblas liblas "${ROOT}usr/bin/liblas-config") \
-		$(use_with X wxwidgets "${WX_CONFIG}") \
-		$(use_with netcdf netcdf "${ROOT}usr/bin/nc-config") \
-		$(use_with geos geos "${ROOT}usr/bin/geos-config") \
-		--with-proj-includes="${ROOT}usr/include/libprojectM" \
-		--with-proj-libs="${ROOT}usr/$(get_libdir)" \
-		--with-proj-share="${ROOT}usr/share/proj/" \
-		$(use_with X x)
-}
-
-src_compile() {
-	# we don't want to link against embedded mysql lib
-	emake CC="$(tc-getCC)" MYSQLDLIB=""
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		INST_DIR="${D}usr/${MY_PM}" \
-		prefix="${D}usr" BINDIR="${D}usr/bin" \
-		PREFIX="${D}usr/" \
-		install
-
-	pushd "${D}usr/${MY_PM}" &> /dev/null || die
-
-	# fix docs
-	dodoc AUTHORS CHANGES
-	docinto html
-	dodoc -r docs/html/*
-	rm -rf docs/ || die
-	rm -rf {AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} || die
-
-	# manuals
-	dodir /usr/share/man/man1
-	rm -rf man/ || die
-
-	# translations
-	if use nls; then
-		dodir /usr/share/locale/
-		mv locale/* "${D}usr/share/locale/" || die
-		rm -rf locale/ || die
-		# pt_BR is broken
-		mv "${D}usr/share/locale/pt_br" "${D}usr/share/locale/pt_BR" || die
-	fi
-
-	popd &> /dev/null || die
-
-	# place libraries where they belong
-	mv "${D}usr/${MY_PM}/lib/" "${D}usr/$(get_libdir)/" || die
-
-	# place header files where they belong
-	mv "${D}usr/${MY_PM}/include/" "${D}usr/include/" || die
-	# make rules are not required on installed system
-	rm -rf "${D}usr/include/Make" || die
-
-	# mv remaining gisbase stuff to libdir
-	mv "${D}usr/${MY_PM}" "${D}usr/$(get_libdir)" || die
-
-	# get proper folder for grass path in script
-	local gisbase
-	gisbase="${ROOT}usr/$(get_libdir)/${MY_PM}"
-	sed -e "s:gisbase = \".*:gisbase = \"${gisbase}\":" \
-		-i "${D}usr/bin/${MY_PM}" || die
-
-	# get proper fonts path for fontcap
-	sed -i \
-		-e "s|${D}usr/${MY_PM}|${EPREFIX}usr/$(get_libdir)/${MY_PM}|" \
-		"${D}usr/$(get_libdir)/${MY_PM}/etc/fontcap" || die
-
-	# set proper python interpreter
-	sed -e "s:= \"python\":= \"${EPYTHON}\":" -i "${D}usr/bin/${MY_PM}" || die
-
-	if use X; then
-		local GUI="-gui"
-		[[ ${WX_BUILD} == yes ]] && GUI="-wxpython"
-		make_desktop_entry "/usr/bin/${MY_PM} ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
-		doicon -s 48 gui/icons/${PN}-48x48.png
-	fi
-
-	# install .pc file so other apps know where to look for grass
-	insinto /usr/$(get_libdir)/pkgconfig/
-	doins grass.pc
-
-	# fix weird +x on tcl scripts
-	find "${D}" -name "*.tcl" -exec chmod +r-x '{}' \;
-}
-
-pkg_postinst() {
-	if use X; then
-		xdg_desktop_database_update
-		gnome2_icon_cache_update
-	fi
-}
-
-pkg_postrm() {
-	if use X; then
-		xdg_desktop_database_update
-		gnome2_icon_cache_update
-	fi
-}

diff --git a/sci-geosciences/grass/grass-7.4.0.ebuild b/sci-geosciences/grass/grass-7.4.0.ebuild
deleted file mode 100644
index 4b0679f5b2c..00000000000
--- a/sci-geosciences/grass/grass-7.4.0.ebuild
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"  # bug 572440
-WANT_AUTOCONF="2.1"
-WX_GTK_VER=3.0
-
-inherit autotools gnome2 python-single-r1 versionator wxwidgets xdg-utils
-
-MY_PM=${PN}$(get_version_component_range 1-2 ${PV})
-MY_PM=${MY_PM/.}
-MY_P=${P/_rc/RC}
-
-DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
-HOMEPAGE="https://grass.osgeo.org/"
-SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/7.4.0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-admin/eselect-1.2
-	dev-python/numpy[${PYTHON_USEDEP}]
-	media-libs/libprojectm
-	sci-libs/proj
-	sci-libs/xdrfile
-	sci-libs/gdal
-	sys-libs/gdbm
-	sys-libs/ncurses:0=
-	sys-libs/zlib:=
-	fftw? ( sci-libs/fftw:3.0= )
-	geos? ( sci-libs/geos )
-	blas? ( virtual/blas
-		sci-libs/cblas-reference )
-	lapack? ( virtual/lapack )
-	liblas? ( sci-geosciences/liblas )
-	mysql? ( virtual/mysql )
-	netcdf? ( sci-libs/netcdf )
-	odbc? ( dev-db/unixODBC )
-	opencl? ( virtual/opencl )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng:0= )
-	postgres? ( >=dev-db/postgresql-8.4:= )
-	readline? ( sys-libs/readline:0= )
-	sqlite? ( dev-db/sqlite:3 )
-	tiff? ( media-libs/tiff:0= )
-	truetype? ( media-libs/freetype:2 )
-	X? (
-		dev-python/wxpython:3.0[cairo,opengl?]
-		x11-libs/cairo[X,opengl?]
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXt
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/flex
-	sys-devel/gettext
-	sys-devel/bison
-	X? (
-		dev-lang/swig
-		x11-base/xorg-proto
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	opengl? ( X )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-7.0.1-declare-inespg.patch
-)
-
-#pre_pkg_setup() {
-#	export LIBS="$(pkg-config --libs libtirpc) ${LIBS}"
-#	export CPPFLAGS="$(pkg-config --cflags libtirpc) ${CPPFLAGS}"
-#	einfo "LIBS='${LIBS}' CPPFLAGS='${CPPFLAGS}' # bug #588980"
-#}
-
-pkg_setup() {
-	if use lapack; then
-		local mylapack
-		mylapack=$(eselect lapack show) || die
-		if [[ -z "${mylapack/.*reference.*/}" ]] && \
-			[[ -z "${mylapack/.*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
-	fi
-
-	if use blas; then
-		local myblas
-		myblas=$(eselect blas show) || die
-		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
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Fix unversioned python calls
-	local pyver=${EPYTHON/python/}
-	sed -e "s:GRASS_PYTHON=.*:&${pyver}:" -i "${S}/lib/init/grass.sh" || die
-	sed -e "s:= python:&${pyver}:" -i "${S}/include/Make/Platform.make.in" || die
-
-	# fix header being unconditionally included
-	# see upstream https://trac.osgeo.org/grass/ticket/2779
-	sed -e 's:\(#include <ogr_api.h>\):#ifdef HAVE_OGR\n\1\n#endif:' \
-		-i "${S}/vector/v.external/main.c" || die "failed to sed main.c"
-
-	default
-	eautoconf
-
-	ebegin "Fixing python shebangs"
-	python_fix_shebang -q "${S}"
-	eend $?
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	shopt -s nullglob
-	mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-
-}
-
-src_configure() {
-	if use X; then
-		WX_BUILD=yes
-		setup-wxwidgets
-	fi
-
-	addwrite "${EPREFIX}/dev/dri/renderD128"
-
-	econf \
-		--enable-shared \
-		--disable-w11 \
-		$(use_with cxx) \
-		$(use_with tiff) \
-		$(use_with png) \
-		$(use_with postgres) \
-		$(use_with mysql) \
-		$(use_with mysql mysql-includes "${EPREFIX}/usr/include/mysql") \
-		$(use_with mysql mysql-libs "${EPREFIX}/usr/$(get_libdir)/mysql") \
-		$(use_with sqlite) \
-		$(use_with opengl) \
-		$(use_with odbc) \
-		$(use_with fftw) \
-		$(use_with blas) \
-		$(use_with lapack) \
-		$(use_with X cairo) \
-		$(use_with truetype freetype) \
-		$(use_with truetype freetype-includes "${EPREFIX}/usr/include/freetype2") \
-		$(use_with nls) \
-		$(use_with readline) \
-		--without-opendwg \
-		--with-regex \
-		$(use_with threads pthread) \
-		$(use_with openmp) \
-		$(use_with opencl) \
-		--with-gdal="${EPREFIX}/usr/bin/gdal-config" \
-		$(use_with liblas liblas "${EPREFIX}/usr/bin/liblas-config") \
-		$(use_with X wxwidgets "${WX_CONFIG}") \
-		$(use_with netcdf netcdf "${EPREFIX}/usr/bin/nc-config") \
-		$(use_with geos geos "${EPREFIX}/usr/bin/geos-config") \
-		--with-proj-includes="${EPREFIX}/usr/include/libprojectM" \
-		--with-proj-libs="${EPREFIX}/usr/$(get_libdir)" \
-		--with-proj-share="${EPREFIX}/usr/share/proj/" \
-		$(use_with X x)
-}
-
-src_compile() {
-	# we don't want to link against embedded mysql lib
-	emake CC="$(tc-getCC)" MYSQLDLIB=""
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		INST_DIR="${D}usr/${MY_PM}" \
-		prefix="${D}usr" BINDIR="${D}usr/bin" \
-		PREFIX="${D}usr/" \
-		install
-
-	pushd "${D}usr/${MY_PM}" &> /dev/null || die
-
-	# fix docs
-	dodoc AUTHORS CHANGES
-	docinto html
-	dodoc -r docs/html/*
-	rm -rf docs/ || die
-	rm -rf {AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} || die
-
-	# manuals
-	dodir /usr/share/man/man1
-	rm -rf man/ || die
-
-	# translations
-	if use nls; then
-		dodir /usr/share/locale/
-		mv locale/* "${D}usr/share/locale/" || die
-		rm -rf locale/ || die
-	fi
-
-	popd &> /dev/null || die
-
-	# place libraries where they belong
-	mv "${D}usr/${MY_PM}/lib/" "${D}usr/$(get_libdir)/" || die
-
-	# place header files where they belong
-	mv "${D}usr/${MY_PM}/include/" "${D}usr/include/" || die
-	# make rules are not required on installed system
-	rm -rf "${D}usr/include/Make" || die
-
-	# mv remaining gisbase stuff to libdir
-	mv "${D}usr/${MY_PM}" "${D}usr/$(get_libdir)" || die
-
-	# get proper folder for grass path in script
-	local gisbase
-	gisbase="${ROOT}usr/$(get_libdir)/${MY_PM}"
-	sed -e "s:gisbase = \".*:gisbase = \"${gisbase}\":" \
-		-i "${D}usr/bin/${MY_PM}" || die
-
-	# get proper fonts path for fontcap
-	sed -i \
-		-e "s|${D}usr/${MY_PM}|${EPREFIX}usr/$(get_libdir)/${MY_PM}|" \
-		"${D}usr/$(get_libdir)/${MY_PM}/etc/fontcap" || die
-
-	# set proper python interpreter
-	sed -e "s:= \"python\":= \"${EPYTHON}\":" -i "${D}usr/bin/${MY_PM}" || die
-
-	if use X; then
-		local GUI="-gui"
-		[[ ${WX_BUILD} == yes ]] && GUI="-wxpython"
-		make_desktop_entry "/usr/bin/${MY_PM} ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
-		doicon -s 48 gui/icons/${PN}-48x48.png
-	fi
-
-	# install .pc file so other apps know where to look for grass
-	insinto /usr/$(get_libdir)/pkgconfig/
-	doins grass.pc
-
-	# fix weird +x on tcl scripts
-	find "${D}" -name "*.tcl" -exec chmod +r-x '{}' \;
-}
-
-pkg_postinst() {
-	if use X; then
-		xdg_desktop_database_update
-		gnome2_icon_cache_update
-	fi
-}
-
-pkg_postrm() {
-	if use X; then
-		xdg_desktop_database_update
-		gnome2_icon_cache_update
-	fi
-}

diff --git a/sci-geosciences/grass/grass-7.4.1.ebuild b/sci-geosciences/grass/grass-7.4.1.ebuild
deleted file mode 100644
index 7c4d6e63529..00000000000
--- a/sci-geosciences/grass/grass-7.4.1.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"  # bug 572440
-WANT_AUTOCONF="2.1"
-WX_GTK_VER=3.0
-
-inherit autotools gnome2 python-single-r1 versionator wxwidgets xdg-utils
-
-MY_PM=${PN}$(get_version_component_range 1-2 ${PV})
-MY_PM=${MY_PM/.}
-MY_P=${P/_rc/RC}
-
-DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
-HOMEPAGE="https://grass.osgeo.org/"
-SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/7.4.0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-admin/eselect-1.2
-	dev-python/numpy[${PYTHON_USEDEP}]
-	media-libs/libprojectm
-	sci-libs/proj
-	sci-libs/xdrfile
-	sci-libs/gdal
-	sys-libs/gdbm
-	sys-libs/ncurses:0=
-	sys-libs/zlib:=
-	fftw? ( sci-libs/fftw:3.0= )
-	geos? ( sci-libs/geos )
-	blas? ( virtual/blas
-		sci-libs/cblas-reference )
-	lapack? ( virtual/lapack )
-	liblas? ( sci-geosciences/liblas )
-	mysql? ( virtual/mysql )
-	netcdf? ( sci-libs/netcdf )
-	odbc? ( dev-db/unixODBC )
-	opencl? ( virtual/opencl )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng:0= )
-	postgres? ( >=dev-db/postgresql-8.4:= )
-	readline? ( sys-libs/readline:0= )
-	sqlite? ( dev-db/sqlite:3 )
-	tiff? ( media-libs/tiff:0= )
-	truetype? ( media-libs/freetype:2 )
-	X? (
-		dev-python/wxpython:3.0[cairo,opengl?]
-		x11-libs/cairo[X,opengl?]
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXt
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/flex
-	sys-devel/gettext
-	sys-devel/bison
-	X? (
-		dev-lang/swig
-		x11-base/xorg-proto
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	opengl? ( X )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-7.0.1-declare-inespg.patch
-)
-
-pkg_setup() {
-	if use lapack; then
-		local mylapack
-		mylapack=$(eselect lapack show) || die
-		if [[ -z "${mylapack/.*reference.*/}" ]] && \
-			[[ -z "${mylapack/.*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
-	fi
-
-	if use blas; then
-		local myblas
-		myblas=$(eselect blas show) || die
-		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
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Fix unversioned python calls
-	local pyver=${EPYTHON/python/}
-	sed -e "s:GRASS_PYTHON=.*:&${pyver}:" -i "${S}/lib/init/grass.sh" || die
-	sed -e "s:= python:&${pyver}:" -i "${S}/include/Make/Platform.make.in" || die
-
-	# fix header being unconditionally included
-	# see upstream https://trac.osgeo.org/grass/ticket/2779
-	sed -e 's:\(#include <ogr_api.h>\):#ifdef HAVE_OGR\n\1\n#endif:' \
-		-i "${S}/vector/v.external/main.c" || die "failed to sed main.c"
-
-	default
-	eautoconf
-
-	ebegin "Fixing python shebangs"
-	python_fix_shebang -q "${S}"
-	eend $?
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	shopt -s nullglob
-	mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-
-}
-
-src_configure() {
-	if use X; then
-		WX_BUILD=yes
-		setup-wxwidgets
-	fi
-
-	addwrite "${EPREFIX}/dev/dri/renderD128"
-
-	econf \
-		--enable-shared \
-		--disable-w11 \
-		$(use_with cxx) \
-		$(use_with tiff) \
-		$(use_with png) \
-		$(use_with postgres) \
-		$(use_with mysql) \
-		$(use_with mysql mysql-includes "${EPREFIX}/usr/include/mysql") \
-		$(use_with mysql mysql-libs "${EPREFIX}/usr/$(get_libdir)/mysql") \
-		$(use_with sqlite) \
-		$(use_with opengl) \
-		$(use_with odbc) \
-		$(use_with fftw) \
-		$(use_with blas) \
-		$(use_with lapack) \
-		$(use_with X cairo) \
-		$(use_with truetype freetype) \
-		$(use_with truetype freetype-includes "${EPREFIX}/usr/include/freetype2") \
-		$(use_with nls) \
-		$(use_with readline) \
-		--without-opendwg \
-		--with-regex \
-		$(use_with threads pthread) \
-		$(use_with openmp) \
-		$(use_with opencl) \
-		--with-gdal="${EPREFIX}/usr/bin/gdal-config" \
-		$(use_with liblas liblas "${EPREFIX}/usr/bin/liblas-config") \
-		$(use_with X wxwidgets "${WX_CONFIG}") \
-		$(use_with netcdf netcdf "${EPREFIX}/usr/bin/nc-config") \
-		$(use_with geos geos "${EPREFIX}/usr/bin/geos-config") \
-		--with-proj-includes="${EPREFIX}/usr/include/libprojectM" \
-		--with-proj-libs="${EPREFIX}/usr/$(get_libdir)" \
-		--with-proj-share="${EPREFIX}/usr/share/proj/" \
-		$(use_with X x)
-}
-
-src_compile() {
-	# we don't want to link against embedded mysql lib
-	emake CC="$(tc-getCC)" MYSQLDLIB=""
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		INST_DIR="${D}/usr/$(get_libdir)/${MY_PM}" \
-		prefix="${D}/usr/" BINDIR="${D}/usr/bin" \
-		PREFIX="${D}/usr/" \
-		install
-
-	pushd "${D}/usr/$(get_libdir)/${MY_PM}" &> /dev/null || die
-
-	dodoc AUTHORS CHANGES
-	docinto html
-	dodoc -r docs/html/*
-
-	# manuals
-	dodir /usr/share/man/man1
-	rm -rf man/ || die
-
-	# translations
-	if use nls; then
-		dodir /usr/share/locale/
-		mv locale/* "${D}usr/share/locale/" || die
-	fi
-
-	popd &> /dev/null || die
-
-	# link libraries in the ~standard~ place
-	for fLib in $(ls "${D}/usr/$(get_libdir)/${MY_PM}/lib/"); do
-		dosym "${MY_PM}/lib/${fLib}" "/usr/$(get_libdir)/${fLib}"
-	done
-
-	# link headers in the ~standard~ place
-	dodir "/usr/include/"
-	dosym "../$(get_libdir)/${MY_PM}/include/grass" "/usr/include/grass"
-
-	# fix paths in addons makefile includes
-	local scriptMakeDir
-	scriptMakeDir="${D}/usr/$(get_libdir)/${MY_PM}/include/Make/"
-	for mkFile in $(ls "${scriptMakeDir}"); do
-		echo sed -i "s|${D}|/|g" "${scriptMakeDir}/${mkFile}" || die
-		sed -i "s|${D}|/|g" "${scriptMakeDir}/${mkFile}" || die
-	done
-
-	# get proper folder for grass path in script
-	local gisbase
-	gisbase="${ROOT}usr/$(get_libdir)/${MY_PM}"
-	sed -e "s:gisbase = \".*:gisbase = \"${gisbase}\":" \
-		-i "${D}usr/bin/${MY_PM}" || die
-
-	# get proper fonts path for fontcap
-	sed -i \
-		-e "s|${D}usr/${MY_PM}|${EPREFIX}usr/$(get_libdir)/${MY_PM}|" \
-		"${D}usr/$(get_libdir)/${MY_PM}/etc/fontcap" || die
-
-	# set proper python interpreter
-	sed -e "s:= \"python\":= \"${EPYTHON}\":" -i "${D}usr/bin/${MY_PM}" || die
-
-	if use X; then
-		local GUI="-gui"
-		[[ ${WX_BUILD} == yes ]] && GUI="-wxpython"
-		make_desktop_entry "/usr/bin/${MY_PM} ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
-		doicon -s 48 gui/icons/${PN}-48x48.png
-	fi
-
-	# install .pc file so other apps know where to look for grass
-	insinto /usr/$(get_libdir)/pkgconfig/
-	doins grass.pc
-
-	# fix weird +x on tcl scripts
-	find "${D}" -name "*.tcl" -exec chmod +r-x '{}' \;
-}
-
-pkg_postinst() {
-	if use X; then
-		xdg_desktop_database_update
-		gnome2_icon_cache_update
-	fi
-
-	ewarn "GRASS addons may fail due to Python 3 incompatibility."
-	ewarn "If that is tha case you can change the shebang a the beginning of"
-	ewarn "the script to enforce Python 2 usage."
-	ewarn "#!/usr/bin/env python"
-	ewarn "Should be changed into"
-	ewarn "#!/usr/bin/env python2"
-}
-
-pkg_postrm() {
-	if use X; then
-		xdg_desktop_database_update
-		gnome2_icon_cache_update
-	fi
-}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/files/, sci-geosciences/grass/
@ 2021-05-29 17:46 Sam James
  0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2021-05-29 17:46 UTC (permalink / raw
  To: gentoo-commits

commit:     d849efc7539748cecb34c3d6e69ca30e0a58f5b4
Author:     Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Sat May 29 17:35:48 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 29 17:45:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d849efc7

sci-geosciences/grass: fix build failure with GCC 11

Closes: https://bugs.gentoo.org/792801
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/21039
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/grass/files/grass-7.8.5-bool.patch | 164 +++++++++++++++++++++
 sci-geosciences/grass/grass-7.8.5.ebuild           |   4 +-
 2 files changed, 167 insertions(+), 1 deletion(-)

diff --git a/sci-geosciences/grass/files/grass-7.8.5-bool.patch b/sci-geosciences/grass/files/grass-7.8.5-bool.patch
new file mode 100644
index 00000000000..fddcb9f6df8
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-7.8.5-bool.patch
@@ -0,0 +1,164 @@
+diff --git a/include/gis.h b/include/gis.h
+index 46bb06c52f..333651b938 100644
+--- a/include/gis.h
++++ b/include/gis.h
+@@ -23,6 +23,8 @@
+ /* System include files */
+ #include <stdio.h>
+ #include <stdarg.h>
++#include <stdbool.h>
++
+ 
+ /* Grass and local include files */
+ #include <grass/config.h>
+@@ -51,13 +53,14 @@ static const char *GRASS_copyright __attribute__ ((unused))
+ #define G_gisinit(pgm) G__gisinit(GIS_H_VERSION, (pgm))
+ #define G_no_gisinit() G__no_gisinit(GIS_H_VERSION)
+ 
+-/* Define TRUE and FALSE for boolean comparisons */
++/* For boolean values and comparisons use the C99 type 'bool' with values 'true' */
++/* and 'false' For historical reasons 'TRUE' and 'FALSE' are still valid.        */
+ #ifndef TRUE
+-#define TRUE 1
++#define TRUE true
+ #endif
+ 
+ #ifndef FALSE
+-#define FALSE 0
++#define FALSE false
+ #endif
+ 
+ #if (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) || (__APPLE__ && __LP64__)
+diff --git a/lib/lidar/lidar.h b/lib/lidar/lidar.h
+index 89a25de3bf..978894ea74 100644
+--- a/lib/lidar/lidar.h
++++ b/lib/lidar/lidar.h
+@@ -62,9 +62,6 @@
+     /* INTERPOLATOR */
+ #define P_BILINEAR 		1
+ #define P_BICUBIC 		0
+-    /* Boolean definitions */
+-#define TRUE 			1
+-#define FALSE 			0
+ 
+ /*----------------------------------------------------------------------------------------------------------*/
+     /*STRUCTS DECLARATION */
+diff --git a/raster/r.param.scale/param.h b/raster/r.param.scale/param.h
+index 9c1dab4e81..2512fedaa2 100644
+--- a/raster/r.param.scale/param.h
++++ b/raster/r.param.scale/param.h
+@@ -18,8 +18,6 @@
+ 				/* 'blank' edge around raster.          */
+ #define MAX_WSIZE 499		/* Maximum dimensions of window.        */
+ 				/* Some useful labels.                  */
+-#define TRUE 1
+-#define FALSE 0
+ 
+ #define RAD2DEG M_R2D
+ #define DEG2RAD M_D2R
+diff --git a/raster/r.surf.idw/main.h b/raster/r.surf.idw/main.h
+index 33164f43cb..47028e7444 100644
+--- a/raster/r.surf.idw/main.h
++++ b/raster/r.surf.idw/main.h
+@@ -1,8 +1,6 @@
+ #include <grass/raster.h>
+ 
+ #define         SHORT           short
+-#define         TRUE    1
+-#define         FALSE   0
+ 
+ #define MELEMENT        struct Melement
+ MELEMENT {
+diff --git a/raster3d/r3.showdspf/Ball.c b/raster3d/r3.showdspf/Ball.c
+index fb3b79882f..ae3ec3933a 100644
+--- a/raster3d/r3.showdspf/Ball.c
++++ b/raster3d/r3.showdspf/Ball.c
+@@ -7,8 +7,6 @@
+ #include "Ball.h"
+ #include "BallMath.h"
+ #include <stdio.h>
+-#define TRUE 1
+-#define FALSE 0
+ 
+ HMatrix mId = { {1, 0, 0, 0}
+ , {0, 1, 0, 0}
+diff --git a/raster3d/r3.showdspf/togif.c b/raster3d/r3.showdspf/togif.c
+index 589f243a8d..b48236b33f 100644
+--- a/raster3d/r3.showdspf/togif.c
++++ b/raster3d/r3.showdspf/togif.c
+@@ -324,9 +324,6 @@ static int ditherrow(unsigned short *r, unsigned short *g, unsigned short *b,
+  *
+  *****************************************************************************/
+ 
+-#define TRUE 1
+-#define FALSE 0
+-
+ 
+ /************************** BumpPixel() ********************************/
+ /*
+diff --git a/vector/v.hull/chull.c b/vector/v.hull/chull.c
+index 1ad97396fa..584af5d8ba 100644
+--- a/vector/v.hull/chull.c
++++ b/vector/v.hull/chull.c
+@@ -29,10 +29,6 @@
+ 
+ #include "globals.h"
+ 
+-/*Define Boolean type */
+-typedef enum
+-{ BFALSE, BTRUE } bool;
+-
+ /* Define vertex indices. */
+ #define X   0
+ #define Y   1
+@@ -76,10 +72,10 @@ struct tFaceStructure
+ };
+ 
+ /* Define flags */
+-#define ONHULL   	BTRUE
+-#define REMOVED  	BTRUE
+-#define VISIBLE  	BTRUE
+-#define PROCESSED	BTRUE
++#define ONHULL   	true
++#define REMOVED  	true
++#define VISIBLE  	true
++#define PROCESSED	true
+ 
+ /* Global variable definitions */
+ tVertex vertices = NULL;
+@@ -436,7 +432,7 @@ bool AddOne(tVertex p)
+     tFace f;
+     tEdge e, temp;
+     long int vol;
+-    bool vis = BFALSE;
++    bool vis = false;
+ 
+ 
+     /* Mark faces visible from p. */
+@@ -446,7 +442,7 @@ bool AddOne(tVertex p)
+ 
+ 	if (vol < 0) {
+ 	    f->visible = VISIBLE;
+-	    vis = BTRUE;
++	    vis = true;
+ 	}
+ 	f = f->next;
+     } while (f != faces);
+@@ -454,7 +450,7 @@ bool AddOne(tVertex p)
+     /* If no faces are visible from p, then p is inside the hull. */
+     if (!vis) {
+ 	p->onhull = !ONHULL;
+-	return BFALSE;
++	return false;
+     }
+ 
+     /* Mark edges in interior of visible region for deletion.
+@@ -470,7 +466,7 @@ bool AddOne(tVertex p)
+ 	    e->newface = MakeConeFace(e, p);
+ 	e = temp;
+     } while (e != edges);
+-    return BTRUE;
++    return true;
+ }
+ 
+ /*---------------------------------------------------------------------

diff --git a/sci-geosciences/grass/grass-7.8.5.ebuild b/sci-geosciences/grass/grass-7.8.5.ebuild
index eb00d1ab6a8..7b96039d1d7 100644
--- a/sci-geosciences/grass/grass-7.8.5.ebuild
+++ b/sci-geosciences/grass/grass-7.8.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/7.8.0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
@@ -82,6 +82,8 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	# bug 746590
 	"${FILESDIR}/${PN}-7.8-flock.patch"
+	# bug 792801
+	"${FILESDIR}/${PN}-7.8.5-bool.patch"
 )
 
 pkg_setup() {


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/files/, sci-geosciences/grass/
@ 2022-01-02  7:05 Sam James
  0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2022-01-02  7:05 UTC (permalink / raw
  To: gentoo-commits

commit:     5c4e2c2692b53050f93dcd5afd349dd34df64797
Author:     Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Thu Dec 30 20:11:45 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan  2 07:02:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c4e2c26

sci-geosciences/grass: rename patch file

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../grass/files/{grass-7.8-flock.patch => grass-flock.patch}            | 0
 sci-geosciences/grass/grass-7.8.6-r1.ebuild                             | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/grass/files/grass-7.8-flock.patch b/sci-geosciences/grass/files/grass-flock.patch
similarity index 100%
rename from sci-geosciences/grass/files/grass-7.8-flock.patch
rename to sci-geosciences/grass/files/grass-flock.patch

diff --git a/sci-geosciences/grass/grass-7.8.6-r1.ebuild b/sci-geosciences/grass/grass-7.8.6-r1.ebuild
index 4332f826c81a..c751961cabf0 100644
--- a/sci-geosciences/grass/grass-7.8.6-r1.ebuild
+++ b/sci-geosciences/grass/grass-7.8.6-r1.ebuild
@@ -81,7 +81,7 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	# bug 746590
-	"${FILESDIR}/${PN}-7.8-flock.patch"
+	"${FILESDIR}/${PN}-flock.patch"
 )
 
 pkg_setup() {


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/files/, sci-geosciences/grass/
@ 2022-01-29  6:20 Sam James
  0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2022-01-29  6:20 UTC (permalink / raw
  To: gentoo-commits

commit:     7c473887fbc1dfbc393930e612cfc811e0f7e077
Author:     Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Fri Jan 28 22:59:57 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 29 06:18:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c473887

sci-geosciences/grass: version bump 8.0.0

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/24003
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/grass/Manifest                     |   2 +-
 .../grass/files/grass-8.0.0-mkhtml.patch           | 316 +++++++++++++++++++++
 .../{grass-8.0.0_rc2.ebuild => grass-8.0.0.ebuild} |   1 +
 3 files changed, 318 insertions(+), 1 deletion(-)

diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index ff32202d3394..85de9606c6e5 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,2 +1,2 @@
 DIST grass-7.8.6.tar.gz 66331264 BLAKE2B bb5a3387f74bc30b7ce3230765cecdc7e61ded8693d888e6cefc2d491022496409d053e170293fcef392a9c9178a41b070767e1ce90b57b448b189c9e16a2761 SHA512 6db10a20e5b70f0ce9a8fc4d6966c6f078453a88fa8f0577c1c62303f9787fa3bf3369e281f7ca864280c865e3ef022c51d8805d1258ea04da45e63cd34c27df
-DIST grass-8.0.0RC2.tar.gz 64942585 BLAKE2B fc7499def2029acb9b547c688eaaad986daae5c80b085bbe876d7bca4d4c7547867375edee752705e30ab215d0b8e0c7f017e94802a549569a525196bbd7bcb4 SHA512 9e624c54974e253dce1b93a0ce1c51eaa421d8baacdf61b03893d34c5cd36af76915ab035fb9bb78af4c16e1efc12bb501a707e335e312a12cf2c17a2b0d6f61
+DIST grass-8.0.0.tar.gz 64944539 BLAKE2B 61ea667321599026f2514333e5fe47313d232236a818458939e968d80ed88a511ddc29e2b51edd082bd246b614a0b121b10c09e9059ae31fd5c211e9844d89b1 SHA512 29bd57fb017937b0f3ad105790449704c6f12b56ffe79091f0aceed328f4da5293dd42cc3071158aad5386a51309f35a4f0b9bbd57221431e705f51880c2ce42

diff --git a/sci-geosciences/grass/files/grass-8.0.0-mkhtml.patch b/sci-geosciences/grass/files/grass-8.0.0-mkhtml.patch
new file mode 100644
index 000000000000..1eb46012f6a4
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-8.0.0-mkhtml.patch
@@ -0,0 +1,316 @@
+--- a/lib/init/variables.html
++++ b/lib/init/variables.html
+@@ -234,12 +234,7 @@ PERMANENT
+   <dt>GRASS_PERL</dt>
+   <dd>[used during install process for generating man pages]<br>
+     set Perl with path.</dd>
+-
+-  <dt>GRASS_PROXY</dt>
+-  <dd>[used during addon install/reinstall process for generating man
+-    pages (download commit from GitHub API server and remote modules.xml file)]<br>
+-    set the proxy with: <tt>GRASS_PROXY="http=&lt;value&gt;,ftp=&lt;value&gt;"</tt>.</dd>
+-
++  
+   <dt>GRASS_SKIP_MAPSET_OWNER_CHECK</dt>
+   <dd>By default it is not possible to work with MAPSETs that are
+     not owned by current user. Setting this variable to any non-empty value
+--- a/scripts/g.extension/g.extension.py
++++ b/scripts/g.extension/g.extension.py
+@@ -354,6 +354,7 @@ def download_addons_paths_file(url, response_format, *args, **kwargs):
+                 ),
+             )
+         return response
++
+     except HTTPError as err:
+         if err.code == 403 and err.msg == "rate limit exceeded":
+             gscript.warning(
+@@ -2588,8 +2589,6 @@ def main():
+         proxy = urlrequest.ProxyHandler(PROXIES)
+         opener = urlrequest.build_opener(proxy)
+         urlrequest.install_opener(opener)
+-        # Required for mkhtml.py script (get addon git commit from GitHub API server)
+-        os.environ["GRASS_PROXY"] = options["proxy"]
+ 
+     # define path
+     options["prefix"] = resolve_install_prefix(
+--- a/utils/mkhtml.py
++++ b/utils/mkhtml.py
+@@ -16,7 +16,6 @@
+ #
+ #############################################################################
+ 
+-import http
+ import sys
+ import os
+ import string
+@@ -25,9 +24,6 @@ from datetime import datetime
+ import locale
+ import json
+ import pathlib
+-import shutil
+-import subprocess
+-import time
+ 
+ try:
+     # Python 2 import
+@@ -35,26 +31,11 @@ try:
+ except ImportError:
+     # Python 3 import
+     from html.parser import HTMLParser
+-
+-from six.moves.urllib import request as urlrequest
+-from six.moves.urllib.error import HTTPError, URLError
+-
+ try:
+     import urlparse
+ except ImportError:
+     import urllib.parse as urlparse
+ 
+-try:
+-    import grass.script as gs
+-except ImportError:
+-    # During compilation GRASS GIS
+-    gs = None
+-
+-HEADERS = {
+-    "User-Agent": "Mozilla/5.0",
+-}
+-HTTP_STATUS_CODES = list(http.HTTPStatus)
+-
+ if sys.version_info[0] == 2:
+     PY2 = True
+ else:
+@@ -65,24 +46,6 @@ if not PY2:
+     unicode = str
+ 
+ 
+-grass_version = os.getenv("VERSION_NUMBER", "unknown")
+-trunk_url = ""
+-addons_url = ""
+-if grass_version != "unknown":
+-    major, minor, patch = grass_version.split(".")
+-    grass_git_branch = "releasebranch_{major}_{minor}".format(
+-        major=major,
+-        minor=minor,
+-    )
+-    base_url = "https://github.com/OSGeo"
+-    trunk_url = "{base_url}/grass/tree/{branch}/".format(
+-        base_url=base_url, branch=grass_git_branch
+-    )
+-    addons_url = "{base_url}/grass-addons/tree/grass{major}/".format(
+-        base_url=base_url, major=major
+-    )
+-
+-
+ def _get_encoding():
+     encoding = locale.getdefaultlocale()[1]
+     if not encoding:
+@@ -105,151 +68,6 @@ def decode(bytes_):
+     return unicode(bytes_)
+ 
+ 
+-def urlopen(url, *args, **kwargs):
+-    """Wrapper around urlopen. Same function as 'urlopen', but with the
+-    ability to define headers.
+-    """
+-    request = urlrequest.Request(url, headers=HEADERS)
+-    return urlrequest.urlopen(request, *args, **kwargs)
+-
+-
+-def set_proxy():
+-    """Set proxy"""
+-    proxy = os.getenv("GRASS_PROXY")
+-    if proxy:
+-        proxies = {}
+-        for ptype, purl in (p.split("=") for p in proxy.split(",")):
+-            proxies[ptype] = purl
+-        urlrequest.install_opener(
+-            urlrequest.build_opener(urlrequest.ProxyHandler(proxies))
+-        )
+-
+-
+-set_proxy()
+-
+-
+-def download_git_commit(url, response_format, *args, **kwargs):
+-    """Download module/addon last commit from GitHub API
+-
+-    :param str url: url address
+-    :param str response_format: content type
+-
+-    :return urllib.request.urlopen or None response: response object or
+-                                                     None
+-    """
+-    try:
+-        response = urlopen(url, *args, **kwargs)
+-        if not response.code == 200:
+-            index = HTTP_STATUS_CODES.index(response.code)
+-            desc = HTTP_STATUS_CODES[index].description
+-            gs.fatal(
+-                _(
+-                    "Download commit from <{url}>, return status code "
+-                    "{code}, {desc}".format(
+-                        url=url,
+-                        code=response.code,
+-                        desc=desc,
+-                    ),
+-                ),
+-            )
+-        if response_format not in response.getheader("Content-Type"):
+-            gs.fatal(
+-                _(
+-                    "Wrong downloaded commit file format. "
+-                    "Check url <{url}>. Allowed file format is "
+-                    "{response_format}.".format(
+-                        url=url,
+-                        response_format=response_format,
+-                    ),
+-                ),
+-            )
+-        return response
+-    except HTTPError as err:
+-        gs.warning(
+-            _(
+-                "The download of the commit from the GitHub API "
+-                "server wasn't successful, <{}>. Commit and commit "
+-                "date will not be included in the <{}> addon html manual "
+-                "page.".format(err.msg, pgm)
+-            ),
+-        )
+-    except URLError:
+-        gs.warning(
+-            _(
+-                "Download file from <{url}>, failed. Check internet "
+-                "connection. Commit and commit date will not be included "
+-                "in the <{pgm}> addon manual page.".format(url=url, pgm=pgm)
+-            ),
+-        )
+-
+-
+-def get_last_git_commit(src_dir, is_addon, addon_path):
+-    """Get last module/addon git commit
+-
+-    :param str src_dir: module/addon source dir
+-    :param bool is_addon: True if it is addon
+-    :param str addon_path: addon path
+-
+-    :return dict git_log: dict with key commit and date, if not
+-                          possible download commit from GitHub API server
+-                          values of keys have "unknown" string
+-    """
+-    unknown = "unknown"
+-    git_log = {"commit": unknown, "date": unknown}
+-    datetime_format = "%A %b %d %H:%M:%S %Y"  # e.g. Sun Jan 16 23:09:35 2022
+-    if is_addon:
+-        grass_addons_url = (
+-            "https://api.github.com/repos/osgeo/grass-addons/commits?path={path}"
+-            "&page=1&per_page=1&sha=grass{major}".format(
+-                path=addon_path,
+-                major=major,
+-            )
+-        )  # sha=git_branch_name
+-    else:
+-        core_module_path = os.path.join(
+-            *(set(src_dir.split(os.path.sep)) ^ set(topdir.split(os.path.sep)))
+-        )
+-        grass_modules_url = (
+-            "https://api.github.com/repos/osgeo/grass/commits?path={path}"
+-            "&page=1&per_page=1&sha={branch}".format(
+-                branch=grass_git_branch,
+-                path=core_module_path,
+-            )
+-        )  # sha=git_branch_name
+-
+-    if shutil.which("git"):
+-        if os.path.exists(src_dir):
+-            git_log["date"] = time.ctime(os.path.getmtime(src_dir))
+-        stdout, stderr = subprocess.Popen(
+-            args=["git", "log", "-1", src_dir],
+-            stdout=subprocess.PIPE,
+-            stderr=subprocess.PIPE,
+-        ).communicate()
+-        stdout = decode(stdout)
+-        stderr = decode(stderr)
+-
+-        if stderr and "fatal: not a git repository" in stderr:
+-            response = download_git_commit(
+-                url=grass_addons_url if is_addon else grass_modules_url,
+-                response_format="application/json",
+-            )
+-            if response:
+-                commit = json.loads(response.read())
+-                if commit:
+-                    git_log["commit"] = commit[0]["sha"]
+-                    git_log["date"] = datetime.strptime(
+-                        commit[0]["commit"]["author"]["date"],
+-                        "%Y-%m-%dT%H:%M:%SZ",
+-                    ).strftime(datetime_format)
+-        else:
+-            if stdout:
+-                commit = stdout.splitlines()
+-                git_log["commit"] = commit[0].split(" ")[-1]
+-                commit_date = commit[2].lstrip("Date:").strip()
+-                git_log["date"] = commit_date.rsplit(" ", 1)[0]
+-    return git_log
+-
+-
+ html_page_footer_pages_path = (
+     os.getenv("HTML_PAGE_FOOTER_PAGES_PATH")
+     if os.getenv("HTML_PAGE_FOOTER_PAGES_PATH")
+@@ -261,6 +79,14 @@ pgm = sys.argv[1]
+ src_file = "%s.html" % pgm
+ tmp_file = "%s.tmp.html" % pgm
+ 
++grass_version = os.getenv("VERSION_NUMBER", "unknown")
++trunk_url = ""
++addons_url = ""
++if grass_version != "unknown":
++    major, minor, patch = grass_version.split(".")
++    trunk_url = f"https://github.com/OSGeo/grass/tree/releasebranch_{major}_{minor}/"
++    addons_url = f"https://github.com/OSGeo/grass-addons/tree/grass{major}/"
++
+ header_base = """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+ <html>
+ <head>
+@@ -295,9 +121,6 @@ sourcecode = string.Template(
+   <a href="${URL_SOURCE}">${PGM} source code</a>
+   (<a href="${URL_LOG}">history</a>)
+ </p>
+-<p>
+-  ${DATE_TAG}
+-</p>
+ """
+ )
+ 
+@@ -624,7 +447,6 @@ else:
+     source_url = addons_url
+     pgmdir = os.path.sep.join(curdir.split(os.path.sep)[-3:])
+ url_source = ""
+-addon_path = None
+ if os.getenv("SOURCE_URL", ""):
+     addon_path = get_addon_path()
+     if addon_path:
+@@ -655,23 +477,11 @@ if index_name:
+     else:
+         url_log = url_source.replace(tree, commits)
+ 
+-    git_commit = get_last_git_commit(
+-        src_dir=curdir,
+-        addon_path=addon_path if addon_path else None,
+-        is_addon=True if addon_path else False,
+-    )
+-    if git_commit["commit"] == "unknown":
+-        date_tag = "Accessed: {date}".format(date=git_commit["date"])
+-    else:
+-        date_tag = "Latest change: {date} in commit: {commit}".format(
+-            date=git_commit["date"], commit=git_commit["commit"]
+-        )
+     sys.stdout.write(
+         sourcecode.substitute(
+             URL_SOURCE=url_source,
+             PGM=pgm,
+             URL_LOG=url_log,
+-            DATE_TAG=date_tag,
+         )
+     )
+     sys.stdout.write(

diff --git a/sci-geosciences/grass/grass-8.0.0_rc2.ebuild b/sci-geosciences/grass/grass-8.0.0.ebuild
similarity index 99%
rename from sci-geosciences/grass/grass-8.0.0_rc2.ebuild
rename to sci-geosciences/grass/grass-8.0.0.ebuild
index 1a9dc30646ec..598e8b0ea52d 100644
--- a/sci-geosciences/grass/grass-8.0.0_rc2.ebuild
+++ b/sci-geosciences/grass/grass-8.0.0.ebuild
@@ -85,6 +85,7 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	# bug 746590
 	"${FILESDIR}/${PN}-flock.patch"
+	"${FILESDIR}/${PN}-${PV}-mkhtml.patch"
 )
 
 pkg_setup() {


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/files/, sci-geosciences/grass/
@ 2022-05-23 11:59 Conrad Kostecki
  0 siblings, 0 replies; 9+ messages in thread
From: Conrad Kostecki @ 2022-05-23 11:59 UTC (permalink / raw
  To: gentoo-commits

commit:     dbee876ddee6b184f5b21b877d3de462fefe6202
Author:     Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Mon May 23 10:04:35 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon May 23 11:59:23 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbee876d

sci-geosciences/grass: remove old

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/25605
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 sci-geosciences/grass/Manifest                     |   1 -
 .../grass/files/grass-8.0.0-mkhtml.patch           | 316 ---------------------
 sci-geosciences/grass/grass-8.0.0.ebuild           | 274 ------------------
 sci-geosciences/grass/grass-8.0.1.ebuild           | 281 ------------------
 4 files changed, 872 deletions(-)

diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index a0364e0e9b96..cd51431391bf 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,5 +1,4 @@
 DIST grass-7.8.6.tar.gz 66331264 BLAKE2B bb5a3387f74bc30b7ce3230765cecdc7e61ded8693d888e6cefc2d491022496409d053e170293fcef392a9c9178a41b070767e1ce90b57b448b189c9e16a2761 SHA512 6db10a20e5b70f0ce9a8fc4d6966c6f078453a88fa8f0577c1c62303f9787fa3bf3369e281f7ca864280c865e3ef022c51d8805d1258ea04da45e63cd34c27df
 DIST grass-7.8.7.tar.gz 66333084 BLAKE2B 809daed6992838cd89b7f913c92bb588db05ae933c6e05b6fbd1add135dc36238260222f338df023c402b411b6c0338a56e06268d1fb736e9d9f6779bc2e4c42 SHA512 8c890b34a64c3a52285a8d99e2a2ec61b41de0258ae5b70d1876499988a9a8229925b82f4595df6b5cf21b77ecc8529feb75f765d4e92f324a734293dffc7303
-DIST grass-8.0.0.tar.gz 64944539 BLAKE2B 61ea667321599026f2514333e5fe47313d232236a818458939e968d80ed88a511ddc29e2b51edd082bd246b614a0b121b10c09e9059ae31fd5c211e9844d89b1 SHA512 29bd57fb017937b0f3ad105790449704c6f12b56ffe79091f0aceed328f4da5293dd42cc3071158aad5386a51309f35a4f0b9bbd57221431e705f51880c2ce42
 DIST grass-8.0.1.tar.gz 64928098 BLAKE2B 81512a5e95727202705a06e11dcb243a393bb6d7b5756957ffe055c867aa18933d84a31ed5e006e8c25bff558aa3ce5acab9e90660b1537192ffa11c92cdf4cc SHA512 ec0e52bfe22179c85bb7119980ab4d5b96278fc85d1fc5c0781aea1864e89a302677fa008b65f0398d564fd6ffc05cee0da1b81affb489c89c20a3bd9f6b089f
 DIST grass-8.0.2.tar.gz 65665825 BLAKE2B 496dab376b38c74d2206096f8b1bf848888c328be3871fca5173042d7368f5c40cdbb6908ed69ec9f2c0669b25f3cfc50b4105f9bb7b375c379b9cc518ebfe8f SHA512 fc6f45f2b6ac2507c70a14baa931d5c66f0b115c914081d24c95f40afa6c266a718026df895f7a182ea837c6abf70da15b09dccba39eedd6a71ba7b6301edf7c

diff --git a/sci-geosciences/grass/files/grass-8.0.0-mkhtml.patch b/sci-geosciences/grass/files/grass-8.0.0-mkhtml.patch
deleted file mode 100644
index 1eb46012f6a4..000000000000
--- a/sci-geosciences/grass/files/grass-8.0.0-mkhtml.patch
+++ /dev/null
@@ -1,316 +0,0 @@
---- a/lib/init/variables.html
-+++ b/lib/init/variables.html
-@@ -234,12 +234,7 @@ PERMANENT
-   <dt>GRASS_PERL</dt>
-   <dd>[used during install process for generating man pages]<br>
-     set Perl with path.</dd>
--
--  <dt>GRASS_PROXY</dt>
--  <dd>[used during addon install/reinstall process for generating man
--    pages (download commit from GitHub API server and remote modules.xml file)]<br>
--    set the proxy with: <tt>GRASS_PROXY="http=&lt;value&gt;,ftp=&lt;value&gt;"</tt>.</dd>
--
-+  
-   <dt>GRASS_SKIP_MAPSET_OWNER_CHECK</dt>
-   <dd>By default it is not possible to work with MAPSETs that are
-     not owned by current user. Setting this variable to any non-empty value
---- a/scripts/g.extension/g.extension.py
-+++ b/scripts/g.extension/g.extension.py
-@@ -354,6 +354,7 @@ def download_addons_paths_file(url, response_format, *args, **kwargs):
-                 ),
-             )
-         return response
-+
-     except HTTPError as err:
-         if err.code == 403 and err.msg == "rate limit exceeded":
-             gscript.warning(
-@@ -2588,8 +2589,6 @@ def main():
-         proxy = urlrequest.ProxyHandler(PROXIES)
-         opener = urlrequest.build_opener(proxy)
-         urlrequest.install_opener(opener)
--        # Required for mkhtml.py script (get addon git commit from GitHub API server)
--        os.environ["GRASS_PROXY"] = options["proxy"]
- 
-     # define path
-     options["prefix"] = resolve_install_prefix(
---- a/utils/mkhtml.py
-+++ b/utils/mkhtml.py
-@@ -16,7 +16,6 @@
- #
- #############################################################################
- 
--import http
- import sys
- import os
- import string
-@@ -25,9 +24,6 @@ from datetime import datetime
- import locale
- import json
- import pathlib
--import shutil
--import subprocess
--import time
- 
- try:
-     # Python 2 import
-@@ -35,26 +31,11 @@ try:
- except ImportError:
-     # Python 3 import
-     from html.parser import HTMLParser
--
--from six.moves.urllib import request as urlrequest
--from six.moves.urllib.error import HTTPError, URLError
--
- try:
-     import urlparse
- except ImportError:
-     import urllib.parse as urlparse
- 
--try:
--    import grass.script as gs
--except ImportError:
--    # During compilation GRASS GIS
--    gs = None
--
--HEADERS = {
--    "User-Agent": "Mozilla/5.0",
--}
--HTTP_STATUS_CODES = list(http.HTTPStatus)
--
- if sys.version_info[0] == 2:
-     PY2 = True
- else:
-@@ -65,24 +46,6 @@ if not PY2:
-     unicode = str
- 
- 
--grass_version = os.getenv("VERSION_NUMBER", "unknown")
--trunk_url = ""
--addons_url = ""
--if grass_version != "unknown":
--    major, minor, patch = grass_version.split(".")
--    grass_git_branch = "releasebranch_{major}_{minor}".format(
--        major=major,
--        minor=minor,
--    )
--    base_url = "https://github.com/OSGeo"
--    trunk_url = "{base_url}/grass/tree/{branch}/".format(
--        base_url=base_url, branch=grass_git_branch
--    )
--    addons_url = "{base_url}/grass-addons/tree/grass{major}/".format(
--        base_url=base_url, major=major
--    )
--
--
- def _get_encoding():
-     encoding = locale.getdefaultlocale()[1]
-     if not encoding:
-@@ -105,151 +68,6 @@ def decode(bytes_):
-     return unicode(bytes_)
- 
- 
--def urlopen(url, *args, **kwargs):
--    """Wrapper around urlopen. Same function as 'urlopen', but with the
--    ability to define headers.
--    """
--    request = urlrequest.Request(url, headers=HEADERS)
--    return urlrequest.urlopen(request, *args, **kwargs)
--
--
--def set_proxy():
--    """Set proxy"""
--    proxy = os.getenv("GRASS_PROXY")
--    if proxy:
--        proxies = {}
--        for ptype, purl in (p.split("=") for p in proxy.split(",")):
--            proxies[ptype] = purl
--        urlrequest.install_opener(
--            urlrequest.build_opener(urlrequest.ProxyHandler(proxies))
--        )
--
--
--set_proxy()
--
--
--def download_git_commit(url, response_format, *args, **kwargs):
--    """Download module/addon last commit from GitHub API
--
--    :param str url: url address
--    :param str response_format: content type
--
--    :return urllib.request.urlopen or None response: response object or
--                                                     None
--    """
--    try:
--        response = urlopen(url, *args, **kwargs)
--        if not response.code == 200:
--            index = HTTP_STATUS_CODES.index(response.code)
--            desc = HTTP_STATUS_CODES[index].description
--            gs.fatal(
--                _(
--                    "Download commit from <{url}>, return status code "
--                    "{code}, {desc}".format(
--                        url=url,
--                        code=response.code,
--                        desc=desc,
--                    ),
--                ),
--            )
--        if response_format not in response.getheader("Content-Type"):
--            gs.fatal(
--                _(
--                    "Wrong downloaded commit file format. "
--                    "Check url <{url}>. Allowed file format is "
--                    "{response_format}.".format(
--                        url=url,
--                        response_format=response_format,
--                    ),
--                ),
--            )
--        return response
--    except HTTPError as err:
--        gs.warning(
--            _(
--                "The download of the commit from the GitHub API "
--                "server wasn't successful, <{}>. Commit and commit "
--                "date will not be included in the <{}> addon html manual "
--                "page.".format(err.msg, pgm)
--            ),
--        )
--    except URLError:
--        gs.warning(
--            _(
--                "Download file from <{url}>, failed. Check internet "
--                "connection. Commit and commit date will not be included "
--                "in the <{pgm}> addon manual page.".format(url=url, pgm=pgm)
--            ),
--        )
--
--
--def get_last_git_commit(src_dir, is_addon, addon_path):
--    """Get last module/addon git commit
--
--    :param str src_dir: module/addon source dir
--    :param bool is_addon: True if it is addon
--    :param str addon_path: addon path
--
--    :return dict git_log: dict with key commit and date, if not
--                          possible download commit from GitHub API server
--                          values of keys have "unknown" string
--    """
--    unknown = "unknown"
--    git_log = {"commit": unknown, "date": unknown}
--    datetime_format = "%A %b %d %H:%M:%S %Y"  # e.g. Sun Jan 16 23:09:35 2022
--    if is_addon:
--        grass_addons_url = (
--            "https://api.github.com/repos/osgeo/grass-addons/commits?path={path}"
--            "&page=1&per_page=1&sha=grass{major}".format(
--                path=addon_path,
--                major=major,
--            )
--        )  # sha=git_branch_name
--    else:
--        core_module_path = os.path.join(
--            *(set(src_dir.split(os.path.sep)) ^ set(topdir.split(os.path.sep)))
--        )
--        grass_modules_url = (
--            "https://api.github.com/repos/osgeo/grass/commits?path={path}"
--            "&page=1&per_page=1&sha={branch}".format(
--                branch=grass_git_branch,
--                path=core_module_path,
--            )
--        )  # sha=git_branch_name
--
--    if shutil.which("git"):
--        if os.path.exists(src_dir):
--            git_log["date"] = time.ctime(os.path.getmtime(src_dir))
--        stdout, stderr = subprocess.Popen(
--            args=["git", "log", "-1", src_dir],
--            stdout=subprocess.PIPE,
--            stderr=subprocess.PIPE,
--        ).communicate()
--        stdout = decode(stdout)
--        stderr = decode(stderr)
--
--        if stderr and "fatal: not a git repository" in stderr:
--            response = download_git_commit(
--                url=grass_addons_url if is_addon else grass_modules_url,
--                response_format="application/json",
--            )
--            if response:
--                commit = json.loads(response.read())
--                if commit:
--                    git_log["commit"] = commit[0]["sha"]
--                    git_log["date"] = datetime.strptime(
--                        commit[0]["commit"]["author"]["date"],
--                        "%Y-%m-%dT%H:%M:%SZ",
--                    ).strftime(datetime_format)
--        else:
--            if stdout:
--                commit = stdout.splitlines()
--                git_log["commit"] = commit[0].split(" ")[-1]
--                commit_date = commit[2].lstrip("Date:").strip()
--                git_log["date"] = commit_date.rsplit(" ", 1)[0]
--    return git_log
--
--
- html_page_footer_pages_path = (
-     os.getenv("HTML_PAGE_FOOTER_PAGES_PATH")
-     if os.getenv("HTML_PAGE_FOOTER_PAGES_PATH")
-@@ -261,6 +79,14 @@ pgm = sys.argv[1]
- src_file = "%s.html" % pgm
- tmp_file = "%s.tmp.html" % pgm
- 
-+grass_version = os.getenv("VERSION_NUMBER", "unknown")
-+trunk_url = ""
-+addons_url = ""
-+if grass_version != "unknown":
-+    major, minor, patch = grass_version.split(".")
-+    trunk_url = f"https://github.com/OSGeo/grass/tree/releasebranch_{major}_{minor}/"
-+    addons_url = f"https://github.com/OSGeo/grass-addons/tree/grass{major}/"
-+
- header_base = """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
- <html>
- <head>
-@@ -295,9 +121,6 @@ sourcecode = string.Template(
-   <a href="${URL_SOURCE}">${PGM} source code</a>
-   (<a href="${URL_LOG}">history</a>)
- </p>
--<p>
--  ${DATE_TAG}
--</p>
- """
- )
- 
-@@ -624,7 +447,6 @@ else:
-     source_url = addons_url
-     pgmdir = os.path.sep.join(curdir.split(os.path.sep)[-3:])
- url_source = ""
--addon_path = None
- if os.getenv("SOURCE_URL", ""):
-     addon_path = get_addon_path()
-     if addon_path:
-@@ -655,23 +477,11 @@ if index_name:
-     else:
-         url_log = url_source.replace(tree, commits)
- 
--    git_commit = get_last_git_commit(
--        src_dir=curdir,
--        addon_path=addon_path if addon_path else None,
--        is_addon=True if addon_path else False,
--    )
--    if git_commit["commit"] == "unknown":
--        date_tag = "Accessed: {date}".format(date=git_commit["date"])
--    else:
--        date_tag = "Latest change: {date} in commit: {commit}".format(
--            date=git_commit["date"], commit=git_commit["commit"]
--        )
-     sys.stdout.write(
-         sourcecode.substitute(
-             URL_SOURCE=url_source,
-             PGM=pgm,
-             URL_LOG=url_log,
--            DATE_TAG=date_tag,
-         )
-     )
-     sys.stdout.write(

diff --git a/sci-geosciences/grass/grass-8.0.0.ebuild b/sci-geosciences/grass/grass-8.0.0.ebuild
deleted file mode 100644
index 3ab8a5a5d5f2..000000000000
--- a/sci-geosciences/grass/grass-8.0.0.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"  # bug 572440
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools desktop python-single-r1 toolchain-funcs wxwidgets xdg
-
-MY_PM=${PN}$(ver_cut 1-2 ${PV})
-MY_PM=${MY_PM/.}
-MY_P=${P/_rc/RC}
-
-DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
-HOMEPAGE="https://grass.osgeo.org/"
-SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/8.0"
-if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="amd64 ~ppc x86"
-fi
-IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	opengl? ( X )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=app-admin/eselect-1.2
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	')
-	sci-libs/gdal:=
-	sys-libs/gdbm:=
-	sys-libs/ncurses:0=
-	sci-libs/proj:=
-	sci-libs/xdrfile
-	sys-libs/zlib
-	media-libs/libglvnd
-	media-libs/glu
-	blas? (
-		virtual/cblas[eselect-ldso(+)]
-		virtual/blas[eselect-ldso(+)]
-	)
-	fftw? ( sci-libs/fftw:3.0= )
-	geos? ( sci-libs/geos:= )
-	lapack? ( virtual/lapack[eselect-ldso(+)] )
-	liblas? ( sci-geosciences/liblas )
-	mysql? ( dev-db/mysql-connector-c:= )
-	netcdf? ( sci-libs/netcdf:= )
-	odbc? ( dev-db/unixODBC )
-	opencl? ( virtual/opencl )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng:0= )
-	postgres? ( >=dev-db/postgresql-8.4:= )
-	readline? ( sys-libs/readline:0= )
-	sqlite? ( dev-db/sqlite:3 )
-	tiff? ( media-libs/tiff:0= )
-	truetype? ( media-libs/freetype:2 )
-	X? (
-		dev-python/wxpython:4.0
-		x11-libs/cairo[X,opengl?]
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXt
-	)
-	zstd? ( app-arch/zstd )"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	X? ( dev-lang/swig )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# bug 746590
-	"${FILESDIR}/${PN}-flock.patch"
-	"${FILESDIR}/${PN}-${PV}-mkhtml.patch"
-)
-
-pkg_setup() {
-	if use lapack; then
-		local mylapack=$(eselect lapack show)
-		if [[ -z "${mylapack/.*reference.*/}" ]] && \
-			[[ -z "${mylapack/.*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
-	fi
-
-	if use blas; then
-		local myblas=$(eselect blas show)
-		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
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Fix unversioned python calls
-	sed -e "s:=python3:=${EPYTHON}:" -i "${S}/lib/init/grass.sh" || die
-	sed -e "s:= python3:= ${EPYTHON}:" -i "${S}/include/Make/Platform.make.in" || die
-
-	default
-	eautoreconf
-
-	ebegin "Fixing python shebangs"
-	python_fix_shebang -q "${S}"
-	eend $?
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	shopt -s nullglob
-	local mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	local ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	if use X; then
-		local WX_BUILD=yes
-		setup-wxwidgets
-	fi
-
-	addwrite /dev/dri/renderD128
-
-	local myeconfargs=(
-		--enable-shared
-		--disable-w11
-		--without-opendwg
-		--with-regex
-		--with-gdal="${EPREFIX}"/usr/bin/gdal-config
-		--with-proj-includes="${EPREFIX}"/usr/include/proj
-		--with-proj-libs="${EPREFIX}"/usr/$(get_libdir)
-		--with-proj-share="${EPREFIX}"/usr/share/proj/
-		$(use_with cxx)
-		$(use_with tiff)
-		$(use_with png)
-		$(use_with postgres)
-		$(use_with mysql)
-		$(use_with mysql mysql-includes "${EPREFIX}"/usr/include/mysql)
-		$(use_with sqlite)
-		$(use_with opengl)
-		$(use_with odbc)
-		$(use_with fftw)
-		$(use_with blas)
-		$(use_with lapack)
-		$(use_with X cairo)
-		$(use_with truetype freetype)
-		$(use_with truetype freetype-includes "${EPREFIX}"/usr/include/freetype2)
-		$(use_with nls)
-		$(use_with readline)
-		$(use_with threads pthread)
-		$(use_with openmp)
-		$(use_with opencl)
-		$(use_with liblas liblas "${EPREFIX}"/usr/bin/liblas-config)
-		$(use_with X wxwidgets "${WX_CONFIG}")
-		$(use_with netcdf netcdf "${EPREFIX}"/usr/bin/nc-config)
-		$(use_with geos geos "${EPREFIX}"/usr/bin/geos-config)
-		$(use_with X x)
-		$(use_with zstd)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# we don't want to link against embedded mysql lib
-	emake CC="$(tc-getCC)" MYSQLDLIB=""
-}
-
-src_install() {
-	emake DESTDIR="${ED}" \
-		INST_DIR=/usr/$(get_libdir)/${MY_PM} \
-		prefix=/usr/ BINDIR=/usr/bin \
-		install
-
-	pushd "${ED}"/usr/$(get_libdir)/${MY_PM} >/dev/null || die
-
-	local HTML_DOCS=( docs/html/. )
-	einstalldocs
-
-	# translations
-	if use nls; then
-		insinto /usr/share/locale
-		doins -r locale/.
-	fi
-
-	popd >/dev/null || die
-
-	# link libraries in the ~standard~ place
-	local f file
-	for f in "${ED}"/usr/$(get_libdir)/${MY_PM}/lib/*; do
-		file="${f##*/}"
-		dosym ${MY_PM}/lib/${file} /usr/$(get_libdir)/${file}
-	done
-
-	# link headers in the ~standard~ place
-	dodir /usr/include/
-	dosym ../$(get_libdir)/${MY_PM}/include/grass /usr/include/grass
-
-	# fix paths in addons makefile includes
-	local scriptMakeDir="${ED}"/usr/$(get_libdir)/${MY_PM}/include/Make/
-	for f in "${scriptMakeDir}"/*; do
-		file="${f##*/}"
-		echo sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die
-		sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die
-	done
-
-	# get proper folder for grass path in script
-	local gisbase=/usr/$(get_libdir)/${MY_PM}
-	sed -e "s:GISBASE = os.path.normpath(\"${D}/usr/$(get_libdir)/${MY_PM}\"):\
-GISBASE = os.path.normpath(\"${gisbase}\"):" \
-		-i "${ED}"/usr/bin/grass || die
-
-	# get proper fonts path for fontcap
-	sed -i \
-		-e "s|${ED}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \
-		"${ED}"${gisbase}/etc/fontcap || die
-
-	# set proper python interpreter
-	sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\
-os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
-		-i "${ED}"/usr/bin/grass || die
-
-	# set proper GISDBASE directory path in the demolocation .grassrc80 file
-	sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \
-		-i "${ED}"${gisbase}/demolocation/.grassrc80 || die
-
-	if use X; then
-		local GUI="-gui"
-		[[ ${WX_BUILD} == yes ]] && GUI="-wxpython"
-		make_desktop_entry "/usr/bin/grass ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
-		doicon -s 48 gui/icons/${PN}-48x48.png
-	fi
-
-	# install .pc file so other apps know where to look for grass
-	insinto /usr/$(get_libdir)/pkgconfig/
-	doins grass.pc
-
-	# fix weird +x on tcl scripts
-	find "${ED}" -name "*.tcl" -exec chmod +r-x '{}' \; || die
-}
-
-pkg_postinst() {
-	use X && xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	use X && xdg_pkg_postrm
-}

diff --git a/sci-geosciences/grass/grass-8.0.1.ebuild b/sci-geosciences/grass/grass-8.0.1.ebuild
deleted file mode 100644
index f2a791cdcee7..000000000000
--- a/sci-geosciences/grass/grass-8.0.1.ebuild
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"  # bug 572440
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools desktop python-single-r1 toolchain-funcs wxwidgets xdg
-
-DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
-HOMEPAGE="https://grass.osgeo.org/"
-
-LICENSE="GPL-2"
-SLOT="0/8.0"
-
-GVERSION=${SLOT#*/}
-MY_PM="${PN}${GVERSION}"
-MY_PM="${MY_PM/.}"
-
-if [[ ${PV} =~ "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
-else
-	MY_P="${P/_rc/RC}"
-	SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="amd64 ~ppc x86"
-	fi
-
-	S="${WORKDIR}/${MY_P}"
-fi
-
-IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	opengl? ( X )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=app-admin/eselect-1.2
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	')
-	sci-libs/gdal:=
-	sys-libs/gdbm:=
-	sys-libs/ncurses:0=
-	sci-libs/proj:=
-	sci-libs/xdrfile
-	sys-libs/zlib
-	media-libs/libglvnd
-	media-libs/glu
-	blas? (
-		virtual/cblas[eselect-ldso(+)]
-		virtual/blas[eselect-ldso(+)]
-	)
-	fftw? ( sci-libs/fftw:3.0= )
-	geos? ( sci-libs/geos:= )
-	lapack? ( virtual/lapack[eselect-ldso(+)] )
-	liblas? ( sci-geosciences/liblas )
-	mysql? ( dev-db/mysql-connector-c:= )
-	netcdf? ( sci-libs/netcdf:= )
-	odbc? ( dev-db/unixODBC )
-	opencl? ( virtual/opencl )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng:0= )
-	postgres? ( >=dev-db/postgresql-8.4:= )
-	readline? ( sys-libs/readline:0= )
-	sqlite? ( dev-db/sqlite:3 )
-	tiff? ( media-libs/tiff:0= )
-	truetype? ( media-libs/freetype:2 )
-	X? (
-		dev-python/wxpython:4.0
-		x11-libs/cairo[X,opengl?]
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXt
-	)
-	zstd? ( app-arch/zstd )"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	X? ( dev-lang/swig )"
-
-PATCHES=(
-	# bug 746590
-	"${FILESDIR}/${PN}-flock.patch"
-)
-
-pkg_setup() {
-	if use lapack; then
-		local mylapack=$(eselect lapack show)
-		if [[ -z "${mylapack/.*reference.*/}" ]] && \
-			[[ -z "${mylapack/.*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
-	fi
-
-	if use blas; then
-		local myblas=$(eselect blas show)
-		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
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Fix unversioned python calls
-	sed -e "s:=python3:=${EPYTHON}:" -i "${S}/lib/init/grass.sh" || die
-	sed -e "s:= python3:= ${EPYTHON}:" -i "${S}/include/Make/Platform.make.in" || die
-
-	default
-	eautoreconf
-
-	ebegin "Fixing python shebangs"
-	python_fix_shebang -q "${S}"
-	eend $?
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	shopt -s nullglob
-	local mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	local ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	if use X; then
-		local WX_BUILD=yes
-		setup-wxwidgets
-	fi
-
-	addwrite /dev/dri/renderD128
-
-	local myeconfargs=(
-		--enable-shared
-		--disable-w11
-		--without-opendwg
-		--with-regex
-		--with-gdal="${EPREFIX}"/usr/bin/gdal-config
-		--with-proj-includes="${EPREFIX}"/usr/include/proj
-		--with-proj-libs="${EPREFIX}"/usr/$(get_libdir)
-		--with-proj-share="${EPREFIX}"/usr/share/proj/
-		$(use_with cxx)
-		$(use_with tiff)
-		$(use_with png)
-		$(use_with postgres)
-		$(use_with mysql)
-		$(use_with mysql mysql-includes "${EPREFIX}"/usr/include/mysql)
-		$(use_with sqlite)
-		$(use_with opengl)
-		$(use_with odbc)
-		$(use_with fftw)
-		$(use_with blas)
-		$(use_with lapack)
-		$(use_with X cairo)
-		$(use_with truetype freetype)
-		$(use_with truetype freetype-includes "${EPREFIX}"/usr/include/freetype2)
-		$(use_with nls)
-		$(use_with readline)
-		$(use_with threads pthread)
-		$(use_with openmp)
-		$(use_with opencl)
-		$(use_with liblas liblas "${EPREFIX}"/usr/bin/liblas-config)
-		$(use_with X wxwidgets "${WX_CONFIG}")
-		$(use_with netcdf netcdf "${EPREFIX}"/usr/bin/nc-config)
-		$(use_with geos geos "${EPREFIX}"/usr/bin/geos-config)
-		$(use_with X x)
-		$(use_with zstd)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# we don't want to link against embedded mysql lib
-	emake CC="$(tc-getCC)" MYSQLDLIB=""
-}
-
-src_install() {
-	emake DESTDIR="${ED}" \
-		INST_DIR=/usr/$(get_libdir)/${MY_PM} \
-		prefix=/usr/ BINDIR=/usr/bin \
-		install
-
-	pushd "${ED}"/usr/$(get_libdir)/${MY_PM} >/dev/null || die
-
-	local HTML_DOCS=( docs/html/. )
-	einstalldocs
-
-	# translations
-	if use nls; then
-		insinto /usr/share/locale
-		doins -r locale/.
-	fi
-
-	popd >/dev/null || die
-
-	# link libraries in the ~standard~ place
-	local f file
-	for f in "${ED}"/usr/$(get_libdir)/${MY_PM}/lib/*; do
-		file="${f##*/}"
-		dosym ${MY_PM}/lib/${file} /usr/$(get_libdir)/${file}
-	done
-
-	# link headers in the ~standard~ place
-	dodir /usr/include/
-	dosym ../$(get_libdir)/${MY_PM}/include/grass /usr/include/grass
-
-	# fix paths in addons makefile includes
-	local scriptMakeDir="${ED}"/usr/$(get_libdir)/${MY_PM}/include/Make/
-	for f in "${scriptMakeDir}"/*; do
-		file="${f##*/}"
-		echo sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die
-		sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die
-	done
-
-	# get proper folder for grass path in script
-	local gisbase=/usr/$(get_libdir)/${MY_PM}
-	sed -e "s:GISBASE = os.path.normpath(\"${D}/usr/$(get_libdir)/${MY_PM}\"):\
-GISBASE = os.path.normpath(\"${gisbase}\"):" \
-		-i "${ED}"/usr/bin/grass || die
-
-	# get proper fonts path for fontcap
-	sed -i \
-		-e "s|${ED}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \
-		"${ED}"${gisbase}/etc/fontcap || die
-
-	# set proper python interpreter
-	sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\
-os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
-		-i "${ED}"/usr/bin/grass || die
-
-	# set proper GISDBASE directory path in the demolocation .grassrc${GVERSION//.} file
-	sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \
-		-i "${ED}"${gisbase}/demolocation/.grassrc${GVERSION//.} || die
-
-	if use X; then
-		local GUI="-gui"
-		[[ ${WX_BUILD} == yes ]] && GUI="-wxpython"
-		make_desktop_entry "/usr/bin/grass ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
-		doicon -s 48 gui/icons/${PN}-48x48.png
-	fi
-
-	# install .pc file so other apps know where to look for grass
-	insinto /usr/$(get_libdir)/pkgconfig/
-	doins grass.pc
-
-	# fix weird +x on tcl scripts
-	find "${ED}" -name "*.tcl" -exec chmod +r-x '{}' \; || die
-}
-
-pkg_postinst() {
-	use X && xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	use X && xdg_pkg_postrm
-}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/files/, sci-geosciences/grass/
@ 2022-06-20  2:53 Sam James
  0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2022-06-20  2:53 UTC (permalink / raw
  To: gentoo-commits

commit:     37de76d39fbddf96349d29aeeec9338b809052ed
Author:     Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Sat Jun 18 11:16:37 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 20 02:49:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37de76d3

sci-geosciences/grass: remove old

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/25953
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/grass/Manifest                     |   1 -
 .../grass/files/grass-8.0.1-lib_imagery.patch      |  11 -
 sci-geosciences/grass/grass-8.0.1-r1.ebuild        | 282 ---------------------
 3 files changed, 294 deletions(-)

diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 4fa939f09a8e..745b3b8081b9 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,5 +1,4 @@
 DIST grass-7.8.6.tar.gz 66331264 BLAKE2B bb5a3387f74bc30b7ce3230765cecdc7e61ded8693d888e6cefc2d491022496409d053e170293fcef392a9c9178a41b070767e1ce90b57b448b189c9e16a2761 SHA512 6db10a20e5b70f0ce9a8fc4d6966c6f078453a88fa8f0577c1c62303f9787fa3bf3369e281f7ca864280c865e3ef022c51d8805d1258ea04da45e63cd34c27df
 DIST grass-7.8.7.tar.gz 66333084 BLAKE2B 809daed6992838cd89b7f913c92bb588db05ae933c6e05b6fbd1add135dc36238260222f338df023c402b411b6c0338a56e06268d1fb736e9d9f6779bc2e4c42 SHA512 8c890b34a64c3a52285a8d99e2a2ec61b41de0258ae5b70d1876499988a9a8229925b82f4595df6b5cf21b77ecc8529feb75f765d4e92f324a734293dffc7303
-DIST grass-8.0.1.tar.gz 64928098 BLAKE2B 81512a5e95727202705a06e11dcb243a393bb6d7b5756957ffe055c867aa18933d84a31ed5e006e8c25bff558aa3ce5acab9e90660b1537192ffa11c92cdf4cc SHA512 ec0e52bfe22179c85bb7119980ab4d5b96278fc85d1fc5c0781aea1864e89a302677fa008b65f0398d564fd6ffc05cee0da1b81affb489c89c20a3bd9f6b089f
 DIST grass-8.0.2.tar.gz 65665825 BLAKE2B 496dab376b38c74d2206096f8b1bf848888c328be3871fca5173042d7368f5c40cdbb6908ed69ec9f2c0669b25f3cfc50b4105f9bb7b375c379b9cc518ebfe8f SHA512 fc6f45f2b6ac2507c70a14baa931d5c66f0b115c914081d24c95f40afa6c266a718026df895f7a182ea837c6abf70da15b09dccba39eedd6a71ba7b6301edf7c
 DIST grass-8.2.0.tar.gz 66819726 BLAKE2B e4398368dd8fd26324709202f42556033a0fea12b6bf5b300c9c416e8758472ceacf40e1d3d540b1aefea88199c0f411462a64fc5e09864582e2e4ce743d67f3 SHA512 8179b8704ea688ba412496d0e149c5a47b89fd557b613a49f3addb9721f166cd3aa23ff2549832d9940e5065893e3257ce7287e75018a3468aa7847392398930

diff --git a/sci-geosciences/grass/files/grass-8.0.1-lib_imagery.patch b/sci-geosciences/grass/files/grass-8.0.1-lib_imagery.patch
deleted file mode 100644
index 1eca86750ecd..000000000000
--- a/sci-geosciences/grass/files/grass-8.0.1-lib_imagery.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://github.com/OSGeo/grass/pull/2269
---- a/lib/imagery/Makefile
-+++ b/lib/imagery/Makefile
-@@ -7,7 +7,6 @@
- 
- include $(MODULE_TOPDIR)/include/Make/Lib.make
- include $(MODULE_TOPDIR)/include/Make/Doxygen.make
--include $(MODULE_TOPDIR)/include/Make/Grass.make
- 
- # images
- IMGSRC := $(wildcard *.png) $(wildcard *.jpg) $(wildcard *.gif)

diff --git a/sci-geosciences/grass/grass-8.0.1-r1.ebuild b/sci-geosciences/grass/grass-8.0.1-r1.ebuild
deleted file mode 100644
index 3d92d0c246f7..000000000000
--- a/sci-geosciences/grass/grass-8.0.1-r1.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"  # bug 572440
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools desktop python-single-r1 toolchain-funcs wxwidgets xdg
-
-DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
-HOMEPAGE="https://grass.osgeo.org/"
-
-LICENSE="GPL-2"
-SLOT="0/8.0"
-
-GVERSION=${SLOT#*/}
-MY_PM="${PN}${GVERSION}"
-MY_PM="${MY_PM/.}"
-
-if [[ ${PV} =~ "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
-else
-	MY_P="${P/_rc/RC}"
-	SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="amd64 ~ppc x86"
-	fi
-
-	S="${WORKDIR}/${MY_P}"
-fi
-
-IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	opengl? ( X )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=app-admin/eselect-1.2
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	')
-	sci-libs/gdal:=
-	sys-libs/gdbm:=
-	sys-libs/ncurses:0=
-	sci-libs/proj:=
-	sci-libs/xdrfile
-	sys-libs/zlib
-	media-libs/libglvnd
-	media-libs/glu
-	blas? (
-		virtual/cblas[eselect-ldso(+)]
-		virtual/blas[eselect-ldso(+)]
-	)
-	fftw? ( sci-libs/fftw:3.0= )
-	geos? ( sci-libs/geos:= )
-	lapack? ( virtual/lapack[eselect-ldso(+)] )
-	liblas? ( sci-geosciences/liblas )
-	mysql? ( dev-db/mysql-connector-c:= )
-	netcdf? ( sci-libs/netcdf:= )
-	odbc? ( dev-db/unixODBC )
-	opencl? ( virtual/opencl )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng:0= )
-	postgres? ( >=dev-db/postgresql-8.4:= )
-	readline? ( sys-libs/readline:0= )
-	sqlite? ( dev-db/sqlite:3 )
-	tiff? ( media-libs/tiff:0= )
-	truetype? ( media-libs/freetype:2 )
-	X? (
-		dev-python/wxpython:4.0
-		x11-libs/cairo[X,opengl?]
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXt
-	)
-	zstd? ( app-arch/zstd )"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	X? ( dev-lang/swig )"
-
-PATCHES=(
-	# bug 746590
-	"${FILESDIR}/${PN}-flock.patch"
-	"${FILESDIR}/${P}-lib_imagery.patch"
-)
-
-pkg_setup() {
-	if use lapack; then
-		local mylapack=$(eselect lapack show)
-		if [[ -z "${mylapack/.*reference.*/}" ]] && \
-			[[ -z "${mylapack/.*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
-	fi
-
-	if use blas; then
-		local myblas=$(eselect blas show)
-		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
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Fix unversioned python calls
-	sed -e "s:=python3:=${EPYTHON}:" -i "${S}/lib/init/grass.sh" || die
-	sed -e "s:= python3:= ${EPYTHON}:" -i "${S}/include/Make/Platform.make.in" || die
-
-	default
-	eautoreconf
-
-	ebegin "Fixing python shebangs"
-	python_fix_shebang -q "${S}"
-	eend $?
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	shopt -s nullglob
-	local mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	local ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	if use X; then
-		local WX_BUILD=yes
-		setup-wxwidgets
-	fi
-
-	addwrite /dev/dri/renderD128
-
-	local myeconfargs=(
-		--enable-shared
-		--disable-w11
-		--without-opendwg
-		--with-regex
-		--with-gdal="${EPREFIX}"/usr/bin/gdal-config
-		--with-proj-includes="${EPREFIX}"/usr/include/proj
-		--with-proj-libs="${EPREFIX}"/usr/$(get_libdir)
-		--with-proj-share="${EPREFIX}"/usr/share/proj/
-		$(use_with cxx)
-		$(use_with tiff)
-		$(use_with png)
-		$(use_with postgres)
-		$(use_with mysql)
-		$(use_with mysql mysql-includes "${EPREFIX}"/usr/include/mysql)
-		$(use_with sqlite)
-		$(use_with opengl)
-		$(use_with odbc)
-		$(use_with fftw)
-		$(use_with blas)
-		$(use_with lapack)
-		$(use_with X cairo)
-		$(use_with truetype freetype)
-		$(use_with truetype freetype-includes "${EPREFIX}"/usr/include/freetype2)
-		$(use_with nls)
-		$(use_with readline)
-		$(use_with threads pthread)
-		$(use_with openmp)
-		$(use_with opencl)
-		$(use_with liblas liblas "${EPREFIX}"/usr/bin/liblas-config)
-		$(use_with X wxwidgets "${WX_CONFIG}")
-		$(use_with netcdf netcdf "${EPREFIX}"/usr/bin/nc-config)
-		$(use_with geos geos "${EPREFIX}"/usr/bin/geos-config)
-		$(use_with X x)
-		$(use_with zstd)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# we don't want to link against embedded mysql lib
-	emake CC="$(tc-getCC)" MYSQLDLIB=""
-}
-
-src_install() {
-	emake DESTDIR="${ED}" \
-		INST_DIR=/usr/$(get_libdir)/${MY_PM} \
-		prefix=/usr/ BINDIR=/usr/bin \
-		install
-
-	pushd "${ED}"/usr/$(get_libdir)/${MY_PM} >/dev/null || die
-
-	local HTML_DOCS=( docs/html/. )
-	einstalldocs
-
-	# translations
-	if use nls; then
-		insinto /usr/share/locale
-		doins -r locale/.
-	fi
-
-	popd >/dev/null || die
-
-	# link libraries in the ~standard~ place
-	local f file
-	for f in "${ED}"/usr/$(get_libdir)/${MY_PM}/lib/*; do
-		file="${f##*/}"
-		dosym ${MY_PM}/lib/${file} /usr/$(get_libdir)/${file}
-	done
-
-	# link headers in the ~standard~ place
-	dodir /usr/include/
-	dosym ../$(get_libdir)/${MY_PM}/include/grass /usr/include/grass
-
-	# fix paths in addons makefile includes
-	local scriptMakeDir="${ED}"/usr/$(get_libdir)/${MY_PM}/include/Make/
-	for f in "${scriptMakeDir}"/*; do
-		file="${f##*/}"
-		echo sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die
-		sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die
-	done
-
-	# get proper folder for grass path in script
-	local gisbase=/usr/$(get_libdir)/${MY_PM}
-	sed -e "s:GISBASE = os.path.normpath(\"${D}/usr/$(get_libdir)/${MY_PM}\"):\
-GISBASE = os.path.normpath(\"${gisbase}\"):" \
-		-i "${ED}"/usr/bin/grass || die
-
-	# get proper fonts path for fontcap
-	sed -i \
-		-e "s|${ED}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \
-		"${ED}"${gisbase}/etc/fontcap || die
-
-	# set proper python interpreter
-	sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\
-os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
-		-i "${ED}"/usr/bin/grass || die
-
-	# set proper GISDBASE directory path in the demolocation .grassrc${GVERSION//.} file
-	sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \
-		-i "${ED}"${gisbase}/demolocation/.grassrc${GVERSION//.} || die
-
-	if use X; then
-		local GUI="-gui"
-		[[ ${WX_BUILD} == yes ]] && GUI="-wxpython"
-		make_desktop_entry "/usr/bin/grass ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
-		doicon -s 48 gui/icons/${PN}-48x48.png
-	fi
-
-	# install .pc file so other apps know where to look for grass
-	insinto /usr/$(get_libdir)/pkgconfig/
-	doins grass.pc
-
-	# fix weird +x on tcl scripts
-	find "${ED}" -name "*.tcl" -exec chmod +r-x '{}' \; || die
-}
-
-pkg_postinst() {
-	use X && xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	use X && xdg_pkg_postrm
-}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2022-06-20  2:53 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-04 21:10 [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/files/, sci-geosciences/grass/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2022-06-20  2:53 Sam James
2022-05-23 11:59 Conrad Kostecki
2022-01-29  6:20 Sam James
2022-01-02  7:05 Sam James
2021-05-29 17:46 Sam James
2019-06-27 17:21 Andreas Sturmlechner
2015-12-05 13:55 Amy Winston
2015-10-23  6:53 Ian Delaney

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox