* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapserver/, sci-geosciences/mapserver/files/
@ 2016-02-27 12:22 Amy Winston
0 siblings, 0 replies; 9+ messages in thread
From: Amy Winston @ 2016-02-27 12:22 UTC (permalink / raw
To: gentoo-commits
commit: 238b62dfa764bfcc95ed52b1c29e5b19dc6b2be7
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 27 12:18:18 2016 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 12:18:18 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=238b62df
sci-geosciences/mapserver: version bump 7.0.0 bug #471250
Package-Manager: portage-2.2.26
sci-geosciences/mapserver/Manifest | 1 +
.../files/mapserver-7.0.0-OGREscapeSQLParam.patch | 22 +
.../mapserver-7.0.0-correct-min-max-calls.patch | 511 +++++++++++++++++++++
.../files/mapserver-7.0.0-disabled-ogr.patch | 56 +++
.../mapserver/files/mapserver-7.0.0-giflib51.patch | 35 ++
.../mapserver-7.0.0-mapwcs-disabled-libxml2.patch | 20 +
.../files/mapserver-7.0.0-no-applicable-code.patch | 34 ++
.../files/mapserver-7.0.0-sec-format.patch | 13 +
sci-geosciences/mapserver/mapserver-7.0.0.ebuild | 177 +++++++
9 files changed, 869 insertions(+)
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index d294b0b..c981436 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1 +1,2 @@
DIST mapserver-6.0.1.tar.gz 2430064 SHA256 dd6821917aa7030381442f5e092e4f46f44b9deb9425ec92729e5819e9b61d65 SHA512 0fd9da9d6452fbfbaf0c815e6d15309e185119a4ab33cab2f1c6839bfb8c3a75ce6e7e7779b0eb2aa6e80d1a623ca6e0e58a02049b0db0bfa3f7b0f29117d5dc WHIRLPOOL e4846d40b93c22f7b5dcce1c242b4d88db253be9185194b45c4acddf9066d10c2ec2fbe667941dfe15702838690517a0e57719b1937169e55517e43ed1c225b8
+DIST mapserver-7.0.0.tar.gz 2495028 SHA256 b306b8111e0718a577ce595640c2d3224f913745af732a1b75f6f5cb3dddce45 SHA512 1e4d15f6c42cdf0b00533e2aa26c1b65f84bdbb3a91538d6addde3aa0e8874deed4969146cf7045858bcab2880e4d7429965660c5985d175bd19ce018ae90652 WHIRLPOOL f18f0679b70da795d0585df2dbcc07fda0f8533c9ef7972280301446e5d521d9f24f0ff482d8e5497954e3b67436f2f9f2576516f6f088dc388046314817a46b
diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-OGREscapeSQLParam.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-OGREscapeSQLParam.patch
new file mode 100644
index 0000000..6ea6d92
--- /dev/null
+++ b/sci-geosciences/mapserver/files/mapserver-7.0.0-OGREscapeSQLParam.patch
@@ -0,0 +1,22 @@
+diff --git a/mapogr.cpp b/mapogr.cpp
+index 1708d1c..217239b 100755
+--- a/mapogr.cpp
++++ b/mapogr.cpp
+@@ -1311,6 +1311,8 @@ static int msOGRFileClose(layerObj *layer, msOGRFileInfo *psInfo )
+ return MS_SUCCESS;
+ }
+
++#endif
++
+ /************************************************************************/
+ /* msOGREscapeSQLParam */
+ /************************************************************************/
+@@ -1337,6 +1339,8 @@ static char *msOGREscapeSQLParam(layerObj *layer, const char *pszString)
+ #endif /* USE_OGR */
+ }
+
++#ifdef USE_OGR
++
+ /**********************************************************************
+ * msOGRTranslateMsExpressionToOGRSQL()
+ *
diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-correct-min-max-calls.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-correct-min-max-calls.patch
new file mode 100644
index 0000000..7383457
--- /dev/null
+++ b/sci-geosciences/mapserver/files/mapserver-7.0.0-correct-min-max-calls.patch
@@ -0,0 +1,511 @@
+diff --git a/mapcontour.c b/mapcontour.c
+index ae52fc6..74cf7d1 100644
+--- a/mapcontour.c
++++ b/mapcontour.c
+@@ -345,11 +345,11 @@ static int msContourLayerReadRaster(layerObj *layer, rectObj rect)
+ ury = floor(ury / virtual_grid_step_y) * virtual_grid_step_y - (virtual_grid_step_x*5);
+ lly = ceil(lly / virtual_grid_step_y) * virtual_grid_step_y + (virtual_grid_step_x*5);
+
+- src_xoff = MAX(0,(int) floor(llx+0.5));
+- src_yoff = MAX(0,(int) floor(ury+0.5));
+- src_xsize = MIN(MAX(0,(int) (urx - llx + 0.5)),
++ src_xoff = MS_MAX(0,(int) floor(llx+0.5));
++ src_yoff = MS_MAX(0,(int) floor(ury+0.5));
++ src_xsize = MS_MIN(MS_MAX(0,(int) (urx - llx + 0.5)),
+ GDALGetRasterXSize(clinfo->hOrigDS) - src_xoff);
+- src_ysize = MIN(MAX(0,(int) (lly - ury + 0.5)),
++ src_ysize = MS_MIN(MS_MAX(0,(int) (lly - ury + 0.5)),
+ GDALGetRasterYSize(clinfo->hOrigDS) - src_yoff);
+
+ /* Update the geographic extent (buffer added) */
+@@ -386,8 +386,8 @@ static int msContourLayerReadRaster(layerObj *layer, rectObj rect)
+ } else {
+ src_xoff = 0;
+ src_yoff = 0;
+- dst_xsize = src_xsize = MIN(map->width,src_xsize);
+- dst_ysize = src_ysize = MIN(map->height,src_ysize);
++ dst_xsize = src_xsize = MS_MIN(map->width,src_xsize);
++ dst_ysize = src_ysize = MS_MIN(map->height,src_ysize);
+ copyRect.minx = copyRect.miny = 0;
+ copyRect.maxx = map->width;
+ copyRect.maxy = map->height;
+@@ -436,7 +436,7 @@ static int msContourLayerReadRaster(layerObj *layer, rectObj rect)
+ adfGeoTransform[4] = 0;
+ adfGeoTransform[5] = -dst_cellsize_y;
+
+- clinfo->cellsize = MAX(dst_cellsize_x, dst_cellsize_y);
++ clinfo->cellsize = MS_MAX(dst_cellsize_x, dst_cellsize_y);
+ {
+ char buf[64];
+ sprintf(buf, "%lf", clinfo->cellsize);
+diff --git a/mapdrawgdal.c b/mapdrawgdal.c
+index e843318..f90f2ac 100644
+--- a/mapdrawgdal.c
++++ b/mapdrawgdal.c
+@@ -217,21 +217,21 @@ int msDrawRasterLayerGDAL(mapObj *map, layerObj *layer, imageObj *image,
+ urx = GEO_TRANS(adfInvGeoTransform+0,copyRect.maxx,copyRect.maxy);
+ ury = GEO_TRANS(adfInvGeoTransform+3,copyRect.maxx,copyRect.maxy);
+
+- src_xoff = MAX(0,(int) floor(llx+0.5));
+- src_yoff = MAX(0,(int) floor(ury+0.5));
+- src_xsize = MIN(MAX(0,(int) (urx - llx + 0.5)),
++ src_xoff = MS_MAX(0,(int) floor(llx+0.5));
++ src_yoff = MS_MAX(0,(int) floor(ury+0.5));
++ src_xsize = MS_MIN(MS_MAX(0,(int) (urx - llx + 0.5)),
+ GDALGetRasterXSize(hDS) - src_xoff);
+- src_ysize = MIN(MAX(0,(int) (lly - ury + 0.5)),
++ src_ysize = MS_MIN(MS_MAX(0,(int) (lly - ury + 0.5)),
+ GDALGetRasterYSize(hDS) - src_yoff);
+
+ /* We want very small windows to use at least one source pixel (#4172) */
+ if( src_xsize == 0 && (urx - llx) > 0.0 ) {
+ src_xsize = 1;
+- src_xoff = MIN(src_xoff,GDALGetRasterXSize(hDS)-1);
++ src_xoff = MS_MIN(src_xoff,GDALGetRasterXSize(hDS)-1);
+ }
+ if( src_ysize == 0 && (lly - ury) > 0.0 ) {
+ src_ysize = 1;
+- src_yoff = MIN(src_yoff,GDALGetRasterYSize(hDS)-1);
++ src_yoff = MS_MIN(src_yoff,GDALGetRasterYSize(hDS)-1);
+ }
+
+ if( src_xsize == 0 || src_ysize == 0 ) {
+@@ -251,11 +251,11 @@ int msDrawRasterLayerGDAL(mapObj *map, layerObj *layer, imageObj *image,
+
+ dst_lrx = (int) ((copyRect.maxx - mapRect.minx) / map->cellsize + 0.5);
+ dst_lry = (int) ((mapRect.maxy - copyRect.miny) / map->cellsize + 0.5);
+- dst_lrx = MAX(0,MIN(image->width,dst_lrx));
+- dst_lry = MAX(0,MIN(image->height,dst_lry));
++ dst_lrx = MS_MAX(0,MS_MIN(image->width,dst_lrx));
++ dst_lry = MS_MAX(0,MS_MIN(image->height,dst_lry));
+
+- dst_xsize = MAX(0,MIN(image->width,dst_lrx - dst_xoff));
+- dst_ysize = MAX(0,MIN(image->height,dst_lry - dst_yoff));
++ dst_xsize = MS_MAX(0,MS_MIN(image->width,dst_lrx - dst_xoff));
++ dst_ysize = MS_MAX(0,MS_MIN(image->height,dst_lry - dst_yoff));
+
+ if( dst_xsize == 0 || dst_ysize == 0 ) {
+ if( layer->debug )
+@@ -290,8 +290,8 @@ int msDrawRasterLayerGDAL(mapObj *map, layerObj *layer, imageObj *image,
+ else {
+ dst_xoff = src_xoff = 0;
+ dst_yoff = src_yoff = 0;
+- dst_xsize = src_xsize = MIN(image->width,src_xsize);
+- dst_ysize = src_ysize = MIN(image->height,src_ysize);
++ dst_xsize = src_xsize = MS_MIN(image->width,src_xsize);
++ dst_ysize = src_ysize = MS_MIN(image->height,src_ysize);
+ }
+
+ /*
+@@ -533,7 +533,7 @@ int msDrawRasterLayerGDAL(mapObj *map, layerObj *layer, imageObj *image,
+ return -1;
+ }
+
+- color_count = MIN(256,GDALGetColorEntryCount(hColorMap));
++ color_count = MS_MIN(256,GDALGetColorEntryCount(hColorMap));
+ for(i=0; i < color_count; i++) {
+ colorObj pixel;
+ int colormap_index;
+@@ -598,7 +598,7 @@ int msDrawRasterLayerGDAL(mapObj *map, layerObj *layer, imageObj *image,
+ cmap_set = TRUE;
+ #endif
+
+- color_count = MIN(256,GDALGetColorEntryCount(hColorMap));
++ color_count = MS_MIN(256,GDALGetColorEntryCount(hColorMap));
+
+ for(i=0; i < color_count; i++) {
+ GDALColorEntry sEntry;
+@@ -889,8 +889,8 @@ static int ParseDefaultLUT( const char *lut_def, GByte *lut )
+ lut_read++;
+ }
+
+- this_in = MAX(0,MIN(255,this_in));
+- this_out = MAX(0,MIN(255,this_out));
++ this_in = MS_MAX(0,MS_MIN(255,this_in));
++ this_out = MS_MAX(0,MS_MIN(255,this_out));
+
+ /* apply linear values from last in:out to this in:out */
+ for( lut_i = last_in; lut_i <= this_in; lut_i++ ) {
+@@ -1275,8 +1275,8 @@ LoadGDALImages( GDALDatasetH hDS, int band_numbers[4], int band_count,
+ bMinMaxSet = TRUE;
+ }
+
+- dfScaleMin = MIN(dfScaleMin,pafRawData[i]);
+- dfScaleMax = MAX(dfScaleMax,pafRawData[i]);
++ dfScaleMin = MS_MIN(dfScaleMin,pafRawData[i]);
++ dfScaleMax = MS_MAX(dfScaleMax,pafRawData[i]);
+ }
+
+ if( dfScaleMin == dfScaleMax )
+@@ -1768,8 +1768,8 @@ msDrawRasterLayerGDAL_16BitClassification(
+ fDataMin = fDataMax = pafRawData[i];
+ bGotFirstValue = TRUE;
+ } else {
+- fDataMin = MIN(fDataMin,pafRawData[i]);
+- fDataMax = MAX(fDataMax,pafRawData[i]);
++ fDataMin = MS_MIN(fDataMin,pafRawData[i]);
++ fDataMax = MS_MAX(fDataMax,pafRawData[i]);
+ }
+ }
+
+@@ -2018,7 +2018,7 @@ int *msGetGDALBandList( layerObj *layer, void *hDS,
+ /* -------------------------------------------------------------------- */
+ if( CSLFetchNameValue( layer->processing, "BANDS" ) == NULL ) {
+ if( max_bands > 0 )
+- *band_count = MIN(file_bands,max_bands);
++ *band_count = MS_MIN(file_bands,max_bands);
+ else
+ *band_count = file_bands;
+
+diff --git a/maprasterquery.c b/maprasterquery.c
+index 80accfa..06f0ece 100644
+--- a/maprasterquery.c
++++ b/maprasterquery.c
+@@ -330,11 +330,11 @@ static void msRasterQueryAddPixel( layerObj *layer, pointObj *location,
+ /* -------------------------------------------------------------------- */
+ else {
+ if( rlinfo->band_count >= 3 ) {
+- red = (int) MAX(0,MIN(255,values[0]));
+- green = (int) MAX(0,MIN(255,values[1]));
+- blue = (int) MAX(0,MIN(255,values[2]));
++ red = (int) MS_MAX(0,MS_MIN(255,values[0]));
++ green = (int) MS_MAX(0,MS_MIN(255,values[1]));
++ blue = (int) MS_MAX(0,MS_MIN(255,values[2]));
+ } else {
+- red = green = blue = (int) MAX(0,MIN(255,values[0]));
++ red = green = blue = (int) MS_MAX(0,MS_MIN(255,values[0]));
+ }
+ }
+
+@@ -454,35 +454,35 @@ msRasterQueryByRectLow(mapObj *map, layerObj *layer, GDALDatasetH hDS,
+ /* top right */
+ dfX = GEO_TRANS(adfInvGeoTransform , searchrect.maxx, searchrect.maxy);
+ dfY = GEO_TRANS(adfInvGeoTransform+3, searchrect.maxx, searchrect.maxy);
+- dfXMin = MIN(dfXMin,dfX);
+- dfXMax = MAX(dfXMax,dfX);
+- dfYMin = MIN(dfYMin,dfY);
+- dfYMax = MAX(dfYMax,dfY);
++ dfXMin = MS_MIN(dfXMin,dfX);
++ dfXMax = MS_MAX(dfXMax,dfX);
++ dfYMin = MS_MIN(dfYMin,dfY);
++ dfYMax = MS_MAX(dfYMax,dfY);
+
+ /* bottom left */
+ dfX = GEO_TRANS(adfInvGeoTransform , searchrect.minx, searchrect.miny);
+ dfY = GEO_TRANS(adfInvGeoTransform+3, searchrect.minx, searchrect.miny);
+- dfXMin = MIN(dfXMin,dfX);
+- dfXMax = MAX(dfXMax,dfX);
+- dfYMin = MIN(dfYMin,dfY);
+- dfYMax = MAX(dfYMax,dfY);
++ dfXMin = MS_MIN(dfXMin,dfX);
++ dfXMax = MS_MAX(dfXMax,dfX);
++ dfYMin = MS_MIN(dfYMin,dfY);
++ dfYMax = MS_MAX(dfYMax,dfY);
+
+ /* bottom right */
+ dfX = GEO_TRANS(adfInvGeoTransform , searchrect.maxx, searchrect.miny);
+ dfY = GEO_TRANS(adfInvGeoTransform+3, searchrect.maxx, searchrect.miny);
+- dfXMin = MIN(dfXMin,dfX);
+- dfXMax = MAX(dfXMax,dfX);
+- dfYMin = MIN(dfYMin,dfY);
+- dfYMax = MAX(dfYMax,dfY);
++ dfXMin = MS_MIN(dfXMin,dfX);
++ dfXMax = MS_MAX(dfXMax,dfX);
++ dfYMin = MS_MIN(dfYMin,dfY);
++ dfYMax = MS_MAX(dfYMax,dfY);
+
+ /* -------------------------------------------------------------------- */
+ /* Trim the rectangle to the area of the file itself, but out */
+ /* to the edges of the touched edge pixels. */
+ /* -------------------------------------------------------------------- */
+- dfXMin = MAX(0.0,MIN(nRXSize,floor(dfXMin)));
+- dfYMin = MAX(0.0,MIN(nRYSize,floor(dfYMin)));
+- dfXMax = MAX(0.0,MIN(nRXSize,ceil(dfXMax)));
+- dfYMax = MAX(0.0,MIN(nRYSize,ceil(dfYMax)));
++ dfXMin = MS_MAX(0.0,MS_MIN(nRXSize,floor(dfXMin)));
++ dfYMin = MS_MAX(0.0,MS_MIN(nRYSize,floor(dfYMin)));
++ dfXMax = MS_MAX(0.0,MS_MIN(nRXSize,ceil(dfXMax)));
++ dfYMax = MS_MAX(0.0,MS_MIN(nRYSize,ceil(dfYMax)));
+
+ /* -------------------------------------------------------------------- */
+ /* Convert to integer offset/size values. */
+diff --git a/mapresample.c b/mapresample.c
+index 26b253e..532b6a8 100644
+--- a/mapresample.c
++++ b/mapresample.c
+@@ -34,8 +34,8 @@
+
+
+ #ifndef MAX
+-# define MIN(a,b) ((a<b) ? a : b)
+-# define MAX(a,b) ((a>b) ? a : b)
++# define MS_MIN(a,b) ((a<b) ? a : b)
++# define MS_MAX(a,b) ((a>b) ? a : b)
+ #endif
+
+ #define SKIP_MASK(x,y) (mask_rb && !*(mask_rb->data.rgba.a+(y)*mask_rb->data.rgba.row_step+(x)*mask_rb->data.rgba.pixel_step))
+@@ -319,7 +319,7 @@ msBilinearRasterResampler( imageObj *psSrcImage, rasterBufferObj *src_rb,
+ int nSrcYSize = psSrcImage->height;
+ int nFailedPoints = 0, nSetPoints = 0;
+ double *padfPixelSum;
+- int bandCount = MAX(4,psSrcImage->format->bands);
++ int bandCount = MS_MAX(4,psSrcImage->format->bands);
+
+ padfPixelSum = (double *) msSmallMalloc(sizeof(double) * bandCount);
+
+@@ -369,10 +369,10 @@ msBilinearRasterResampler( imageObj *psSrcImage, rasterBufferObj *src_rb,
+ continue;
+
+ /* Trim in stuff one pixel off the edge */
+- nSrcX = MAX(nSrcX,0);
+- nSrcY = MAX(nSrcY,0);
+- nSrcX2 = MIN(nSrcX2,nSrcXSize-1);
+- nSrcY2 = MIN(nSrcY2,nSrcYSize-1);
++ nSrcX = MS_MAX(nSrcX,0);
++ nSrcY = MS_MAX(nSrcY,0);
++ nSrcX2 = MS_MIN(nSrcX2,nSrcXSize-1);
++ nSrcY2 = MS_MIN(nSrcY2,nSrcYSize-1);
+
+ memset( padfPixelSum, 0, sizeof(double) * bandCount);
+
+@@ -407,10 +407,10 @@ msBilinearRasterResampler( imageObj *psSrcImage, rasterBufferObj *src_rb,
+ int dst_rb_off = nDstX * dst_rb->data.rgba.pixel_step + nDstY * dst_rb->data.rgba.row_step;
+ unsigned char red, green, blue, alpha;
+
+- red = (unsigned char) MAX(0,MIN(255,padfPixelSum[0]));
+- green = (unsigned char) MAX(0,MIN(255,padfPixelSum[1]));
+- blue = (unsigned char) MAX(0,MIN(255,padfPixelSum[2]));
+- alpha = (unsigned char)MAX(0,MIN(255,255.5*dfWeightSum));
++ red = (unsigned char) MS_MAX(0,MS_MIN(255,padfPixelSum[0]));
++ green = (unsigned char) MS_MAX(0,MS_MIN(255,padfPixelSum[1]));
++ blue = (unsigned char) MS_MAX(0,MS_MIN(255,padfPixelSum[2]));
++ alpha = (unsigned char)MS_MAX(0,MS_MIN(255,255.5*dfWeightSum));
+
+ msAlphaBlendPM( red, green, blue, alpha,
+ dst_rb->data.rgba.r + dst_rb_off,
+@@ -436,7 +436,7 @@ msBilinearRasterResampler( imageObj *psSrcImage, rasterBufferObj *src_rb,
+ = (float) padfPixelSum[band];
+ } else if( psSrcImage->format->imagemode == MS_IMAGEMODE_BYTE ) {
+ psDstImage->img.raw_byte[dst_off]
+- = (unsigned char)MAX(0,MIN(255,padfPixelSum[band]));
++ = (unsigned char)MS_MAX(0,MS_MIN(255,padfPixelSum[band]));
+ }
+
+ dst_off += psDstImage->width*psDstImage->height;
+@@ -489,14 +489,14 @@ msAverageSample( imageObj *psSrcImage, rasterBufferObj *src_rb,
+ for( iY = nYMin; iY < nYMax; iY++ ) {
+ double dfYCellMin, dfYCellMax;
+
+- dfYCellMin = MAX(iY,dfYMin);
+- dfYCellMax = MIN(iY+1,dfYMax);
++ dfYCellMin = MS_MAX(iY,dfYMin);
++ dfYCellMax = MS_MIN(iY+1,dfYMax);
+
+ for( iX = nXMin; iX < nXMax; iX++ ) {
+ double dfXCellMin, dfXCellMax, dfWeight;
+
+- dfXCellMin = MAX(iX,dfXMin);
+- dfXCellMax = MIN(iX+1,dfXMax);
++ dfXCellMin = MS_MAX(iX,dfXMin);
++ dfXCellMax = MS_MIN(iX+1,dfXMax);
+
+ dfWeight = (dfXCellMax-dfXCellMin) * (dfYCellMax-dfYCellMin);
+
+@@ -537,7 +537,7 @@ msAverageRasterResampler( imageObj *psSrcImage, rasterBufferObj *src_rb,
+ int nFailedPoints = 0, nSetPoints = 0;
+ double *padfPixelSum;
+
+- int bandCount = MAX(4,psSrcImage->format->bands);
++ int bandCount = MS_MAX(4,psSrcImage->format->bands);
+
+ padfPixelSum = (double *) msSmallMalloc(sizeof(double) * bandCount);
+
+@@ -573,19 +573,19 @@ msAverageRasterResampler( imageObj *psSrcImage, rasterBufferObj *src_rb,
+ continue;
+ }
+
+- dfXMin = MIN(MIN(x1[nDstX],x1[nDstX+1]),
+- MIN(x2[nDstX],x2[nDstX+1]));
+- dfYMin = MIN(MIN(y1[nDstX],y1[nDstX+1]),
+- MIN(y2[nDstX],y2[nDstX+1]));
+- dfXMax = MAX(MAX(x1[nDstX],x1[nDstX+1]),
+- MAX(x2[nDstX],x2[nDstX+1]));
+- dfYMax = MAX(MAX(y1[nDstX],y1[nDstX+1]),
+- MAX(y2[nDstX],y2[nDstX+1]));
++ dfXMin = MS_MIN(MS_MIN(x1[nDstX],x1[nDstX+1]),
++ MS_MIN(x2[nDstX],x2[nDstX+1]));
++ dfYMin = MS_MIN(MS_MIN(y1[nDstX],y1[nDstX+1]),
++ MS_MIN(y2[nDstX],y2[nDstX+1]));
++ dfXMax = MS_MAX(MS_MAX(x1[nDstX],x1[nDstX+1]),
++ MS_MAX(x2[nDstX],x2[nDstX+1]));
++ dfYMax = MS_MAX(MS_MAX(y1[nDstX],y1[nDstX+1]),
++ MS_MAX(y2[nDstX],y2[nDstX+1]));
+
+- dfXMin = MIN(MAX(dfXMin,0),psSrcImage->width+1);
+- dfYMin = MIN(MAX(dfYMin,0),psSrcImage->height+1);
+- dfXMax = MIN(MAX(-1,dfXMax),psSrcImage->width);
+- dfYMax = MIN(MAX(-1,dfYMax),psSrcImage->height);
++ dfXMin = MS_MIN(MS_MAX(dfXMin,0),psSrcImage->width+1);
++ dfYMin = MS_MIN(MS_MAX(dfYMin,0),psSrcImage->height+1);
++ dfXMax = MS_MIN(MS_MAX(-1,dfXMax),psSrcImage->width);
++ dfYMax = MS_MIN(MS_MAX(-1,dfYMax),psSrcImage->height);
+
+ memset( padfPixelSum, 0, sizeof(double)*bandCount );
+
+@@ -605,13 +605,13 @@ msAverageRasterResampler( imageObj *psSrcImage, rasterBufferObj *src_rb,
+ unsigned char red, green, blue, alpha;
+
+ red = (unsigned char)
+- MAX(0,MIN(255,padfPixelSum[0]+0.5));
++ MS_MAX(0,MS_MIN(255,padfPixelSum[0]+0.5));
+ green = (unsigned char)
+- MAX(0,MIN(255,padfPixelSum[1]+0.5));
++ MS_MAX(0,MS_MIN(255,padfPixelSum[1]+0.5));
+ blue = (unsigned char)
+- MAX(0,MIN(255,padfPixelSum[2]+0.5));
++ MS_MAX(0,MS_MIN(255,padfPixelSum[2]+0.5));
+ alpha = (unsigned char)
+- MAX(0,MIN(255,255*dfAlpha01+0.5));
++ MS_MAX(0,MS_MIN(255,255*dfAlpha01+0.5));
+
+ RB_MIX_PIXEL(dst_rb,nDstX,nDstY,
+ red, green, blue, alpha );
+@@ -1121,10 +1121,10 @@ static int msTransformMapToSource( int nDstXSize, int nDstYSize,
+ psSrcExtent->miny = psSrcExtent->maxy = y_out;
+ bOutInit = 1;
+ } else {
+- psSrcExtent->minx = MIN(psSrcExtent->minx, x_out);
+- psSrcExtent->maxx = MAX(psSrcExtent->maxx, x_out);
+- psSrcExtent->miny = MIN(psSrcExtent->miny, y_out);
+- psSrcExtent->maxy = MAX(psSrcExtent->maxy, y_out);
++ psSrcExtent->minx = MS_MIN(psSrcExtent->minx, x_out);
++ psSrcExtent->maxx = MS_MAX(psSrcExtent->maxx, x_out);
++ psSrcExtent->miny = MS_MIN(psSrcExtent->miny, y_out);
++ psSrcExtent->maxy = MS_MAX(psSrcExtent->maxy, y_out);
+ }
+ }
+
+@@ -1141,10 +1141,10 @@ static int msTransformMapToSource( int nDstXSize, int nDstYSize,
+ int nGrowAmountY = (int)
+ (psSrcExtent->maxy - psSrcExtent->miny)/EDGE_STEPS + 1;
+
+- psSrcExtent->minx = MAX(psSrcExtent->minx - nGrowAmountX,0);
+- psSrcExtent->miny = MAX(psSrcExtent->miny - nGrowAmountY,0);
+- psSrcExtent->maxx = MIN(psSrcExtent->maxx + nGrowAmountX,nSrcXSize);
+- psSrcExtent->maxy = MIN(psSrcExtent->maxy + nGrowAmountY,nSrcYSize);
++ psSrcExtent->minx = MS_MAX(psSrcExtent->minx - nGrowAmountX,0);
++ psSrcExtent->miny = MS_MAX(psSrcExtent->miny - nGrowAmountY,0);
++ psSrcExtent->maxx = MS_MIN(psSrcExtent->maxx + nGrowAmountX,nSrcXSize);
++ psSrcExtent->maxy = MS_MIN(psSrcExtent->maxy + nGrowAmountY,nSrcYSize);
+ }
+
+ return MS_TRUE;
+@@ -1342,10 +1342,10 @@ int msResampleGDALToMap( mapObj *map, layerObj *layer, imageObj *image,
+ sSrcExtent.maxy = ceil (sSrcExtent.maxy+1.0);
+ }
+
+- sSrcExtent.minx = MAX(0,sSrcExtent.minx);
+- sSrcExtent.maxx = MIN(sSrcExtent.maxx, nSrcXSize );
+- sSrcExtent.miny = MAX(sSrcExtent.miny, 0 );
+- sSrcExtent.maxy = MIN(sSrcExtent.maxy, nSrcYSize );
++ sSrcExtent.minx = MS_MAX(0,sSrcExtent.minx);
++ sSrcExtent.maxx = MS_MIN(sSrcExtent.maxx, nSrcXSize );
++ sSrcExtent.miny = MS_MAX(sSrcExtent.miny, 0 );
++ sSrcExtent.maxy = MS_MIN(sSrcExtent.maxy, nSrcYSize );
+
+ if( sSrcExtent.maxx <= sSrcExtent.minx
+ || sSrcExtent.maxy <= sSrcExtent.miny ) {
+@@ -1383,9 +1383,9 @@ int msResampleGDALToMap( mapObj *map, layerObj *layer, imageObj *image,
+ else
+ sDummyMap.cellsize = dfNominalCellSize;
+
+- nLoadImgXSize = MAX(1, (int) (sSrcExtent.maxx - sSrcExtent.minx)
++ nLoadImgXSize = MS_MAX(1, (int) (sSrcExtent.maxx - sSrcExtent.minx)
+ * (dfNominalCellSize / sDummyMap.cellsize));
+- nLoadImgYSize = MAX(1, (int) (sSrcExtent.maxy - sSrcExtent.miny)
++ nLoadImgYSize = MS_MAX(1, (int) (sSrcExtent.maxy - sSrcExtent.miny)
+ * (dfNominalCellSize / sDummyMap.cellsize));
+
+ /*
+diff --git a/mapstring.c b/mapstring.c
+index ea5b67f..82ee82a 100644
+--- a/mapstring.c
++++ b/mapstring.c
+@@ -135,7 +135,7 @@ char *strrstr(char *string, char *find)
+ * Appends src to string dst of size siz (unlike strncat, siz is the
+ * full size of dst, not space left). At most siz-1 characters
+ * will be copied. Always NUL terminates (unless siz <= strlen(dst)).
+- * Returns strlen(src) + MIN(siz, strlen(initial dst)).
++ * Returns strlen(src) + MS_MIN(siz, strlen(initial dst)).
+ * If retval >= siz, truncation occurred.
+ */
+ size_t strlcat(char *dst, const char *src, size_t siz)
+diff --git a/mapwcs20.c b/mapwcs20.c
+index 347e9b7..266a07d 100644
+--- a/mapwcs20.c
++++ b/mapwcs20.c
+@@ -4189,8 +4189,8 @@ this request. Check wcs/ows_enable_request settings.", "msWCSGetCoverage20()", p
+ + (orig_bbox.maxx+1) * cm.geotransform[1]
+ + (orig_bbox.maxy+1) * cm.geotransform[2];
+
+- subsets.minx = MIN(x_1, x_2);
+- subsets.maxx = MAX(x_1, x_2);
++ subsets.minx = MS_MIN(x_1, x_2);
++ subsets.maxx = MS_MAX(x_1, x_2);
+ }
+ if(subsets.miny != -DBL_MAX || subsets.maxy != DBL_MAX) {
+ y_1 = cm.geotransform[3]
+@@ -4201,8 +4201,8 @@ this request. Check wcs/ows_enable_request settings.", "msWCSGetCoverage20()", p
+ + orig_bbox.minx * cm.geotransform[4]
+ + orig_bbox.miny * cm.geotransform[5];
+
+- subsets.miny = MIN(y_1, y_2);
+- subsets.maxy = MAX(y_1, y_2);
++ subsets.miny = MS_MIN(y_1, y_2);
++ subsets.maxy = MS_MAX(y_1, y_2);
+ }
+ } else { /* if crs is not the 'imageCRS' */
+ projectionObj subsetProj;
+@@ -4241,10 +4241,10 @@ this request. Check wcs/ows_enable_request settings.", "msWCSGetCoverage20()", p
+ }
+
+ /* write combined bounding box */
+- bbox.minx = MAX(subsets.minx, map->extent.minx);
+- bbox.miny = MAX(subsets.miny, map->extent.miny);
+- bbox.maxx = MIN(subsets.maxx, map->extent.maxx);
+- bbox.maxy = MIN(subsets.maxy, map->extent.maxy);
++ bbox.minx = MS_MAX(subsets.minx, map->extent.minx);
++ bbox.miny = MS_MAX(subsets.miny, map->extent.miny);
++ bbox.maxx = MS_MIN(subsets.maxx, map->extent.maxx);
++ bbox.maxy = MS_MIN(subsets.maxy, map->extent.maxy);
+
+ /* check if we are overspecified */
+ if ((params->width != 0 && params->resolutionX != MS_WCS20_UNBOUNDED)
+@@ -4620,10 +4620,10 @@ this request. Check wcs/ows_enable_request settings.", "msWCSGetCoverage20()", p
+ tmpCm.xresolution = map->gt.geotransform[1];
+ tmpCm.yresolution = map->gt.geotransform[5];
+
+- tmpCm.extent.minx = MIN(map->gt.geotransform[0], map->gt.geotransform[0] + map->width * tmpCm.xresolution);
+- tmpCm.extent.miny = MIN(map->gt.geotransform[3], map->gt.geotransform[3] + map->height * tmpCm.yresolution);
+- tmpCm.extent.maxx = MAX(map->gt.geotransform[0], map->gt.geotransform[0] + map->width * tmpCm.xresolution);
+- tmpCm.extent.maxy = MAX(map->gt.geotransform[3], map->gt.geotransform[3] + map->height * tmpCm.yresolution);
++ tmpCm.extent.minx = MS_MIN(map->gt.geotransform[0], map->gt.geotransform[0] + map->width * tmpCm.xresolution);
++ tmpCm.extent.miny = MS_MIN(map->gt.geotransform[3], map->gt.geotransform[3] + map->height * tmpCm.yresolution);
++ tmpCm.extent.maxx = MS_MAX(map->gt.geotransform[0], map->gt.geotransform[0] + map->width * tmpCm.xresolution);
++ tmpCm.extent.maxy = MS_MAX(map->gt.geotransform[3], map->gt.geotransform[3] + map->height * tmpCm.yresolution);
+
+ swapAxes = msWCSSwapAxes20(srs_uri);
+ msFree(srs_uri);
+diff --git a/mapwmslayer.c b/mapwmslayer.c
+index 42a44f1..3e4747d 100644
+--- a/mapwmslayer.c
++++ b/mapwmslayer.c
+@@ -698,7 +698,7 @@ msBuildWMSLayerURL(mapObj *map, layerObj *lp, int nRequestType,
+ else {
+ double cellsize_x = (bbox.maxx-bbox.minx) / bbox_width;
+ double cellsize_y = (bbox.maxy-bbox.miny) / bbox_height;
+- double cellsize = MIN(cellsize_x,cellsize_y);
++ double cellsize = MS_MIN(cellsize_x,cellsize_y);
+
+ msRectIntersect( &bbox, &layer_rect );
+
diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-disabled-ogr.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-disabled-ogr.patch
new file mode 100644
index 0000000..088e37b
--- /dev/null
+++ b/sci-geosciences/mapserver/files/mapserver-7.0.0-disabled-ogr.patch
@@ -0,0 +1,56 @@
+From ab2a6129435ca37d02730a6faf85593afa0daf9b Mon Sep 17 00:00:00 2001
+From: Thomas Bonfort <thomas.bonfort@gmail.com>
+Date: Mon, 16 Nov 2015 16:56:02 +0100
+Subject: [PATCH] Fix build issues with OGR disabled
+
+---
+ mapimageio.c | 2 +-
+ mapogcfilter.c | 1 +
+ mapogr.cpp | 2 ++
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/mapimageio.c b/mapimageio.c
+index 771188b..95feda2 100644
+--- a/mapimageio.c
++++ b/mapimageio.c
+@@ -210,7 +210,7 @@ int saveAsJPEG(mapObj *map, rasterBufferObj *rb, streamInfo *info,
+ /* If the user doesn't provide a value for JPEGMEM, we want to be sure */
+ /* that at least the image size will be used before creating the temporary file */
+ cinfo.mem->max_memory_to_use =
+- MAX(cinfo.mem->max_memory_to_use, cinfo.input_components * rb->width * rb->height);
++ MS_MAX(cinfo.mem->max_memory_to_use, cinfo.input_components * rb->width * rb->height);
+ }
+ }
+
+diff --git a/mapogcfilter.c b/mapogcfilter.c
+index 50e2e7b..05f017a 100644
+--- a/mapogcfilter.c
++++ b/mapogcfilter.c
+@@ -40,6 +40,7 @@
+ #include "mapowscommon.h"
+ #include "maptime.h"
+ #include "mapows.h"
++#include <ctype.h>
+
+ static int FLTHasUniqueTopLevelDuringFilter(FilterEncodingNode *psFilterNode);
+
+diff --git a/mapogr.cpp b/mapogr.cpp
+index 07acdba..80f032b 100644
+--- a/mapogr.cpp
++++ b/mapogr.cpp
+@@ -1318,6 +1318,7 @@ static int msOGRFileClose(layerObj *layer, msOGRFileInfo *psInfo )
+
+ return MS_SUCCESS;
+ }
++#endif /* USE_OGR */
+
+ /************************************************************************/
+ /* msOGREscapeSQLParam */
+@@ -1345,6 +1346,7 @@ static char *msOGREscapeSQLParam(layerObj *layer, const char *pszString)
+ #endif /* USE_OGR */
+ }
+
++#ifdef USE_OGR
+ /**********************************************************************
+ * msOGRTranslateMsExpressionToOGRSQL()
+ *
diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-giflib51.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-giflib51.patch
new file mode 100644
index 0000000..1fa7710
--- /dev/null
+++ b/sci-geosciences/mapserver/files/mapserver-7.0.0-giflib51.patch
@@ -0,0 +1,35 @@
+From 0101157d4edd5d837d17356c66c7d25af7e020ac Mon Sep 17 00:00:00 2001
+From: Sander Jansen <s.jansen@gmail.com>
+Date: Wed, 19 Aug 2015 16:51:13 -0500
+Subject: [PATCH] Fix compilation with gif_lib 5.1
+
+---
+ mapimageio.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/mapimageio.c b/mapimageio.c
+index e6bdcb5..5eed924 100644
+--- a/mapimageio.c
++++ b/mapimageio.c
+@@ -1058,6 +1058,13 @@ int readGIF(char *path, rasterBufferObj *rb)
+
+ } while (recordType != TERMINATE_RECORD_TYPE);
+
++
++#if defined GIFLIB_MAJOR && GIFLIB_MINOR && ((GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1) || (GIFLIB_MAJOR > 5))
++ if (DGifCloseFile(image, &errcode) == GIF_ERROR) {
++ msSetError(MS_MISCERR,"failed to close gif after loading: %s","readGIF()", gif_error_msg(errcode));
++ return MS_FAILURE;
++ }
++#else
+ if (DGifCloseFile(image) == GIF_ERROR) {
+ #if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5
+ msSetError(MS_MISCERR,"failed to close gif after loading: %s","readGIF()", gif_error_msg(image->Error));
+@@ -1066,6 +1073,7 @@ int readGIF(char *path, rasterBufferObj *rb)
+ #endif
+ return MS_FAILURE;
+ }
++#endif
+
+ return MS_SUCCESS;
+ }
diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-mapwcs-disabled-libxml2.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-mapwcs-disabled-libxml2.patch
new file mode 100644
index 0000000..5625746
--- /dev/null
+++ b/sci-geosciences/mapserver/files/mapserver-7.0.0-mapwcs-disabled-libxml2.patch
@@ -0,0 +1,20 @@
+diff --git a/mapwcs20.c b/mapwcs20.c
+index ac2fb89..9560a25 100755
+--- a/mapwcs20.c
++++ b/mapwcs20.c
+@@ -700,6 +700,7 @@ static int msWCSParseScaleExtentString20(char *string, char *outAxis,
+ return MS_SUCCESS;
+ }
+
++#if defined(USE_LIBXML2)
+ /*
+ Utility function to get the first child of a node with a given node name
+ */
+@@ -739,6 +740,7 @@ xmlNodePtr msLibXml2GetFirstChildNs(xmlNodePtr parent, const char *name, xmlNsPt
+ }
+ return NULL;
+ }
++#endif /* defined(USE_LIBXML2) */
+
+ /************************************************************************/
+ /* msWCSParseRequest20_XMLGetCapabilities() */
diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-no-applicable-code.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-no-applicable-code.patch
new file mode 100644
index 0000000..f438bec
--- /dev/null
+++ b/sci-geosciences/mapserver/files/mapserver-7.0.0-no-applicable-code.patch
@@ -0,0 +1,34 @@
+diff --git a/mapwfs11.c b/mapwfs11.c
+index 20ab164..4dc15fc 100755
+--- a/mapwfs11.c
++++ b/mapwfs11.c
+@@ -29,12 +29,12 @@
+
+ #include "mapserver.h"
+ #include "mapows.h"
++#include "mapowscommon.h"
+
+
+
+ #if defined(USE_WFS_SVR) && defined(USE_LIBXML2)
+ #include "maplibxml2.h"
+-#include "mapowscommon.h"
+ #include "mapogcfilter.h"
+
+ /************************************************************************/
+diff --git a/mapwfs20.c b/mapwfs20.c
+index 710d444..cf69ee3 100755
+--- a/mapwfs20.c
++++ b/mapwfs20.c
+@@ -29,10 +29,10 @@
+
+ #include "mapserver.h"
+ #include "mapows.h"
++#include "mapowscommon.h"
+
+ #if defined(USE_WFS_SVR) && defined(USE_LIBXML2)
+ #include "maplibxml2.h"
+-#include "mapowscommon.h"
+ #include "mapogcfilter.h"
+
+ #define MS_OWS_11_NAMESPACE_PREFIX MS_OWSCOMMON_OWS_NAMESPACE_PREFIX
diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-sec-format.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-sec-format.patch
new file mode 100644
index 0000000..17016c6
--- /dev/null
+++ b/sci-geosciences/mapserver/files/mapserver-7.0.0-sec-format.patch
@@ -0,0 +1,13 @@
+diff --git a/apache/mod_mapserver.c b/apache/mod_mapserver.c
+index 7949ddf..c8dbde6 100644
+--- a/apache/mod_mapserver.c
++++ b/apache/mod_mapserver.c
+@@ -40,7 +40,7 @@ static int
+ msIO_apacheError (void *cbData, void *data, int byteCount)
+ {
+ /* error reporting is done through the log file... */
+- ap_log_error (APLOG_MARK, APLOG_ERR, 0, NULL, (char*) data);
++ ap_log_error (APLOG_MARK, APLOG_ERR, 0, NULL, "%s", (char*) data);
+ return strlen ((char*) data);
+ }
+
diff --git a/sci-geosciences/mapserver/mapserver-7.0.0.ebuild b/sci-geosciences/mapserver/mapserver-7.0.0.ebuild
new file mode 100644
index 0000000..da2eb5d
--- /dev/null
+++ b/sci-geosciences/mapserver/mapserver-7.0.0.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P="${PN}-${PV/_/-}"
+
+PHP_EXT_OPTIONAL_USE="php"
+PHP_EXT_NAME="php_mapscript"
+PHP_EXT_S="${WORKDIR}/${MY_P}/mapscript/php/"
+PHP_EXT_SKIP_PHPIZE="no"
+USE_PHP="php5-4 php5-5"
+
+PYTHON_COMPAT=( python2_7 )
+
+#USE_RUBY="ruby18 ruby19"
+#RUBY_OPTIONAL="yes"
+
+WEBAPP_MANUAL_SLOT=yes
+
+inherit eutils depend.apache webapp distutils-r1 flag-o-matic perl-module php-ext-source-r2 multilib cmake-utils # ruby-ng
+
+DESCRIPTION="Development environment for building spatially enabled webapps"
+HOMEPAGE="http://mapserver.org/"
+SRC_URI="http://download.osgeo.org/mapserver/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="bidi cairo gdal geos mysql opengl perl php postgis proj python threads tiff xml xslt" # ruby php tcl
+
+REQUIRED_USE="php? ( ^^ ( php_targets_php5-4 php_targets_php5-5 ) )
+ xslt? ( xml )"
+
+RDEPEND="
+ dev-libs/expat
+ dev-libs/fcgi
+ >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib]
+ media-libs/giflib
+ net-misc/curl
+ virtual/jpeg:=
+ virtual/libiconv
+ x11-libs/agg
+ bidi? ( dev-libs/fribidi
+ media-libs/harfbuzz )
+ cairo? ( x11-libs/cairo )
+ gdal? ( >=sci-libs/gdal-1.8.0 )
+ geos? ( sci-libs/geos )
+ mysql? ( virtual/mysql )
+ opengl? (
+ media-libs/ftgl
+ media-libs/mesa
+ )
+ perl? ( dev-lang/perl:= )
+ postgis? ( dev-db/postgis )
+ proj? ( sci-libs/proj net-misc/curl )
+ tiff? (
+ media-libs/tiff:=
+ sci-libs/libgeotiff
+ )
+ xml? ( dev-libs/libxml2:2 )
+ xslt? ( dev-libs/libxslt[crypt] )
+"
+DEPEND="${RDEPEND}
+ perl? ( >=dev-lang/swig-2.0 )
+ python? ( >=dev-lang/swig-2.0 )"
+
+need_apache2
+
+PATCHES=(
+ "${FILESDIR}/${P}-giflib51.patch" # see https://github.com/mapserver/mapserver/pull/5144
+ "${FILESDIR}/${P}-disabled-ogr.patch" # see https://github.com/mapserver/mapserver/commit/ab2a6129435ca37d02730a6faf85593afa0daf9b
+ "${FILESDIR}/${P}-correct-min-max-calls.patch" # see https://github.com/mapserver/mapserver/pull/5251
+ "${FILESDIR}/${P}-sec-format.patch" # see https://github.com/mapserver/mapserver/pull/5248
+ "${FILESDIR}/${P}-mapwcs-disabled-libxml2.patch"
+ "${FILESDIR}/${P}-no-applicable-code.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ webapp_pkg_setup
+ use perl && perl_set_version
+ #use ruby && ruby-ng_pkg_setup
+}
+
+src_unpack() {
+ # unpack A and then copy the php thingies into workdir/php-slot
+ php-ext-source-r2_src_unpack
+ # HACK: and then remove it and replace by symlink
+ for slot in $(php_get_slots); do
+ rm -rf "${WORKDIR}/${slot}" || die
+ ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die
+ done
+}
+
+src_prepare() {
+ local glibdir="${EPREFIX}/usr/include/glib-2.0"
+ local usrglibdir="${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
+
+ sed -e "s:^include_directories(:&${glibdir})\ninclude_directories(:" \
+ -i "${S}/CMakeLists.txt" || die
+ sed -e "s:include_directories(:&${usrglibdir})\ninclude_directories(:" \
+ -i "${S}/CMakeLists.txt" || die
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ "-DCMAKE_SKIP_RPATH=ON"
+ "-DWITH_ORACLESPATIAL=OFF"
+ "-DWITH_SDE=OFF"
+ "-DWITH_APACHE_MODULE=ON"
+ "-DWITH_ICONV=ON"
+ "-DWITH_GD=ON"
+ "-DWITH_GIF=ON"
+ "-DWITH_CURL=ON"
+ "-DWITH_FCGI=ON"
+ "-DWITH_PROJ=$(usex proj ON OFF)"
+ "-DWITH_WMS=$(usex proj ON OFF)"
+ "-DWITH_KML=$(usex xml ON OFF)"
+ "-DWITH_GEOS=$(usex geos ON OFF)"
+ "-DWITH_GDAL=$(usex gdal ON OFF)"
+ "-DWITH_OGR=$(usex gdal ON OFF)"
+ "-DWITH_POSTGIS=$(usex postgis ON OFF)"
+ "-DWITH_MYSQL=$(usex mysql ON OFF)"
+ "-DWITH_LIBXML2=$(usex xml ON OFF)"
+ "-DWITH_XMLMAPFILE=$(usex xslt ON OFF)"
+ "-DWITH_FRIBIDI=$(usex bidi ON OFF)"
+ "-DWITH_HARFBUZZ=$(usex bidi ON OFF)"
+ "-DWITH_CAIRO=$(usex cairo ON OFF)"
+ "-DWITH_PHP=$(usex php ON OFF)"
+ "-DWITH_PYTHON=$(usex python ON OFF)"
+ "-DWITH_PERL=$(usex perl ON OFF)"
+ )
+
+ if use gdal && use proj ; then
+ mycmakeargs+=( "-DWITH_WFS=ON"
+ "-DWITH_WCS=ON"
+ "-DWITH_CLIENT_WMS=ON"
+ "-DWITH_CLIENT_WFS=ON"
+ "-DWITH_SOS=$(usex xml ON OFF)"
+ )
+ else
+ mycmakeargs+=( "-DWITH_WFS=OFF"
+ "-DWITH_WCS=OFF"
+ "-DWITH_CLIENT_WMS=OFF"
+ "-DWITH_CLIENT_WFS=OFF"
+ "-DWITH_SOS=OFF"
+ )
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ webapp_src_preinst
+ exeinto "${MY_CGIBINDIR}"
+ doexe "${S}_build/mapserv"
+ webapp_src_install
+}
+
+pkg_postinst() {
+ webapp_pkg_postinst
+}
+
+pkg_prerm() {
+ webapp_pkg_prerm
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapserver/, sci-geosciences/mapserver/files/
@ 2016-07-15 14:22 Brian Evans
0 siblings, 0 replies; 9+ messages in thread
From: Brian Evans @ 2016-07-15 14:22 UTC (permalink / raw
To: gentoo-commits
commit: 24b35d81ec7058021adfdbcfd6170b8527e45c46
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 14:21:59 2016 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 14:21:59 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24b35d81
sci-geosciences/mapserver: Drop broken versions and associated patches
Requested by Amynka on IRC
Package-Manager: portage-2.3.0
sci-geosciences/mapserver/Manifest | 1 -
.../mapserver-7.0.0-correct-min-max-calls.patch | 511 ---------------------
.../files/mapserver-7.0.0-disabled-ogr.patch | 56 ---
.../mapserver/files/mapserver-7.0.0-giflib51.patch | 35 --
.../mapserver-7.0.0-mapwcs-disabled-libxml2.patch | 20 -
sci-geosciences/mapserver/mapserver-7.0.0.ebuild | 177 -------
sci-geosciences/mapserver/mapserver-7.0.1.ebuild | 174 -------
7 files changed, 974 deletions(-)
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 918b376..c4d472d 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,2 +1 @@
-DIST mapserver-7.0.0.tar.gz 2495028 SHA256 b306b8111e0718a577ce595640c2d3224f913745af732a1b75f6f5cb3dddce45 SHA512 1e4d15f6c42cdf0b00533e2aa26c1b65f84bdbb3a91538d6addde3aa0e8874deed4969146cf7045858bcab2880e4d7429965660c5985d175bd19ce018ae90652 WHIRLPOOL f18f0679b70da795d0585df2dbcc07fda0f8533c9ef7972280301446e5d521d9f24f0ff482d8e5497954e3b67436f2f9f2576516f6f088dc388046314817a46b
DIST mapserver-7.0.1.tar.gz 2606929 SHA256 2c9567e59ae3ebd99bb645740485be6a25798b8b57f93ca3413a3e0369a1bd8f SHA512 10cf58920a3083280a748efa087f105ed2e29650d10b56b7d457c46fd7fc4670a021db1aa27186997aaa3ea1b6a5b2772f2ffc5d8de48130f5ebed654215f2df WHIRLPOOL 0ef70bd312aba706c19ebc8d324e9ac2bc72bb400cbdb539c20ca0ea383744f363425dbc2dc1b70f8e133b0e84409645505a880f2e5689345e8c7bd7c5e952d5
diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-correct-min-max-calls.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-correct-min-max-calls.patch
deleted file mode 100644
index 7383457..0000000
--- a/sci-geosciences/mapserver/files/mapserver-7.0.0-correct-min-max-calls.patch
+++ /dev/null
@@ -1,511 +0,0 @@
-diff --git a/mapcontour.c b/mapcontour.c
-index ae52fc6..74cf7d1 100644
---- a/mapcontour.c
-+++ b/mapcontour.c
-@@ -345,11 +345,11 @@ static int msContourLayerReadRaster(layerObj *layer, rectObj rect)
- ury = floor(ury / virtual_grid_step_y) * virtual_grid_step_y - (virtual_grid_step_x*5);
- lly = ceil(lly / virtual_grid_step_y) * virtual_grid_step_y + (virtual_grid_step_x*5);
-
-- src_xoff = MAX(0,(int) floor(llx+0.5));
-- src_yoff = MAX(0,(int) floor(ury+0.5));
-- src_xsize = MIN(MAX(0,(int) (urx - llx + 0.5)),
-+ src_xoff = MS_MAX(0,(int) floor(llx+0.5));
-+ src_yoff = MS_MAX(0,(int) floor(ury+0.5));
-+ src_xsize = MS_MIN(MS_MAX(0,(int) (urx - llx + 0.5)),
- GDALGetRasterXSize(clinfo->hOrigDS) - src_xoff);
-- src_ysize = MIN(MAX(0,(int) (lly - ury + 0.5)),
-+ src_ysize = MS_MIN(MS_MAX(0,(int) (lly - ury + 0.5)),
- GDALGetRasterYSize(clinfo->hOrigDS) - src_yoff);
-
- /* Update the geographic extent (buffer added) */
-@@ -386,8 +386,8 @@ static int msContourLayerReadRaster(layerObj *layer, rectObj rect)
- } else {
- src_xoff = 0;
- src_yoff = 0;
-- dst_xsize = src_xsize = MIN(map->width,src_xsize);
-- dst_ysize = src_ysize = MIN(map->height,src_ysize);
-+ dst_xsize = src_xsize = MS_MIN(map->width,src_xsize);
-+ dst_ysize = src_ysize = MS_MIN(map->height,src_ysize);
- copyRect.minx = copyRect.miny = 0;
- copyRect.maxx = map->width;
- copyRect.maxy = map->height;
-@@ -436,7 +436,7 @@ static int msContourLayerReadRaster(layerObj *layer, rectObj rect)
- adfGeoTransform[4] = 0;
- adfGeoTransform[5] = -dst_cellsize_y;
-
-- clinfo->cellsize = MAX(dst_cellsize_x, dst_cellsize_y);
-+ clinfo->cellsize = MS_MAX(dst_cellsize_x, dst_cellsize_y);
- {
- char buf[64];
- sprintf(buf, "%lf", clinfo->cellsize);
-diff --git a/mapdrawgdal.c b/mapdrawgdal.c
-index e843318..f90f2ac 100644
---- a/mapdrawgdal.c
-+++ b/mapdrawgdal.c
-@@ -217,21 +217,21 @@ int msDrawRasterLayerGDAL(mapObj *map, layerObj *layer, imageObj *image,
- urx = GEO_TRANS(adfInvGeoTransform+0,copyRect.maxx,copyRect.maxy);
- ury = GEO_TRANS(adfInvGeoTransform+3,copyRect.maxx,copyRect.maxy);
-
-- src_xoff = MAX(0,(int) floor(llx+0.5));
-- src_yoff = MAX(0,(int) floor(ury+0.5));
-- src_xsize = MIN(MAX(0,(int) (urx - llx + 0.5)),
-+ src_xoff = MS_MAX(0,(int) floor(llx+0.5));
-+ src_yoff = MS_MAX(0,(int) floor(ury+0.5));
-+ src_xsize = MS_MIN(MS_MAX(0,(int) (urx - llx + 0.5)),
- GDALGetRasterXSize(hDS) - src_xoff);
-- src_ysize = MIN(MAX(0,(int) (lly - ury + 0.5)),
-+ src_ysize = MS_MIN(MS_MAX(0,(int) (lly - ury + 0.5)),
- GDALGetRasterYSize(hDS) - src_yoff);
-
- /* We want very small windows to use at least one source pixel (#4172) */
- if( src_xsize == 0 && (urx - llx) > 0.0 ) {
- src_xsize = 1;
-- src_xoff = MIN(src_xoff,GDALGetRasterXSize(hDS)-1);
-+ src_xoff = MS_MIN(src_xoff,GDALGetRasterXSize(hDS)-1);
- }
- if( src_ysize == 0 && (lly - ury) > 0.0 ) {
- src_ysize = 1;
-- src_yoff = MIN(src_yoff,GDALGetRasterYSize(hDS)-1);
-+ src_yoff = MS_MIN(src_yoff,GDALGetRasterYSize(hDS)-1);
- }
-
- if( src_xsize == 0 || src_ysize == 0 ) {
-@@ -251,11 +251,11 @@ int msDrawRasterLayerGDAL(mapObj *map, layerObj *layer, imageObj *image,
-
- dst_lrx = (int) ((copyRect.maxx - mapRect.minx) / map->cellsize + 0.5);
- dst_lry = (int) ((mapRect.maxy - copyRect.miny) / map->cellsize + 0.5);
-- dst_lrx = MAX(0,MIN(image->width,dst_lrx));
-- dst_lry = MAX(0,MIN(image->height,dst_lry));
-+ dst_lrx = MS_MAX(0,MS_MIN(image->width,dst_lrx));
-+ dst_lry = MS_MAX(0,MS_MIN(image->height,dst_lry));
-
-- dst_xsize = MAX(0,MIN(image->width,dst_lrx - dst_xoff));
-- dst_ysize = MAX(0,MIN(image->height,dst_lry - dst_yoff));
-+ dst_xsize = MS_MAX(0,MS_MIN(image->width,dst_lrx - dst_xoff));
-+ dst_ysize = MS_MAX(0,MS_MIN(image->height,dst_lry - dst_yoff));
-
- if( dst_xsize == 0 || dst_ysize == 0 ) {
- if( layer->debug )
-@@ -290,8 +290,8 @@ int msDrawRasterLayerGDAL(mapObj *map, layerObj *layer, imageObj *image,
- else {
- dst_xoff = src_xoff = 0;
- dst_yoff = src_yoff = 0;
-- dst_xsize = src_xsize = MIN(image->width,src_xsize);
-- dst_ysize = src_ysize = MIN(image->height,src_ysize);
-+ dst_xsize = src_xsize = MS_MIN(image->width,src_xsize);
-+ dst_ysize = src_ysize = MS_MIN(image->height,src_ysize);
- }
-
- /*
-@@ -533,7 +533,7 @@ int msDrawRasterLayerGDAL(mapObj *map, layerObj *layer, imageObj *image,
- return -1;
- }
-
-- color_count = MIN(256,GDALGetColorEntryCount(hColorMap));
-+ color_count = MS_MIN(256,GDALGetColorEntryCount(hColorMap));
- for(i=0; i < color_count; i++) {
- colorObj pixel;
- int colormap_index;
-@@ -598,7 +598,7 @@ int msDrawRasterLayerGDAL(mapObj *map, layerObj *layer, imageObj *image,
- cmap_set = TRUE;
- #endif
-
-- color_count = MIN(256,GDALGetColorEntryCount(hColorMap));
-+ color_count = MS_MIN(256,GDALGetColorEntryCount(hColorMap));
-
- for(i=0; i < color_count; i++) {
- GDALColorEntry sEntry;
-@@ -889,8 +889,8 @@ static int ParseDefaultLUT( const char *lut_def, GByte *lut )
- lut_read++;
- }
-
-- this_in = MAX(0,MIN(255,this_in));
-- this_out = MAX(0,MIN(255,this_out));
-+ this_in = MS_MAX(0,MS_MIN(255,this_in));
-+ this_out = MS_MAX(0,MS_MIN(255,this_out));
-
- /* apply linear values from last in:out to this in:out */
- for( lut_i = last_in; lut_i <= this_in; lut_i++ ) {
-@@ -1275,8 +1275,8 @@ LoadGDALImages( GDALDatasetH hDS, int band_numbers[4], int band_count,
- bMinMaxSet = TRUE;
- }
-
-- dfScaleMin = MIN(dfScaleMin,pafRawData[i]);
-- dfScaleMax = MAX(dfScaleMax,pafRawData[i]);
-+ dfScaleMin = MS_MIN(dfScaleMin,pafRawData[i]);
-+ dfScaleMax = MS_MAX(dfScaleMax,pafRawData[i]);
- }
-
- if( dfScaleMin == dfScaleMax )
-@@ -1768,8 +1768,8 @@ msDrawRasterLayerGDAL_16BitClassification(
- fDataMin = fDataMax = pafRawData[i];
- bGotFirstValue = TRUE;
- } else {
-- fDataMin = MIN(fDataMin,pafRawData[i]);
-- fDataMax = MAX(fDataMax,pafRawData[i]);
-+ fDataMin = MS_MIN(fDataMin,pafRawData[i]);
-+ fDataMax = MS_MAX(fDataMax,pafRawData[i]);
- }
- }
-
-@@ -2018,7 +2018,7 @@ int *msGetGDALBandList( layerObj *layer, void *hDS,
- /* -------------------------------------------------------------------- */
- if( CSLFetchNameValue( layer->processing, "BANDS" ) == NULL ) {
- if( max_bands > 0 )
-- *band_count = MIN(file_bands,max_bands);
-+ *band_count = MS_MIN(file_bands,max_bands);
- else
- *band_count = file_bands;
-
-diff --git a/maprasterquery.c b/maprasterquery.c
-index 80accfa..06f0ece 100644
---- a/maprasterquery.c
-+++ b/maprasterquery.c
-@@ -330,11 +330,11 @@ static void msRasterQueryAddPixel( layerObj *layer, pointObj *location,
- /* -------------------------------------------------------------------- */
- else {
- if( rlinfo->band_count >= 3 ) {
-- red = (int) MAX(0,MIN(255,values[0]));
-- green = (int) MAX(0,MIN(255,values[1]));
-- blue = (int) MAX(0,MIN(255,values[2]));
-+ red = (int) MS_MAX(0,MS_MIN(255,values[0]));
-+ green = (int) MS_MAX(0,MS_MIN(255,values[1]));
-+ blue = (int) MS_MAX(0,MS_MIN(255,values[2]));
- } else {
-- red = green = blue = (int) MAX(0,MIN(255,values[0]));
-+ red = green = blue = (int) MS_MAX(0,MS_MIN(255,values[0]));
- }
- }
-
-@@ -454,35 +454,35 @@ msRasterQueryByRectLow(mapObj *map, layerObj *layer, GDALDatasetH hDS,
- /* top right */
- dfX = GEO_TRANS(adfInvGeoTransform , searchrect.maxx, searchrect.maxy);
- dfY = GEO_TRANS(adfInvGeoTransform+3, searchrect.maxx, searchrect.maxy);
-- dfXMin = MIN(dfXMin,dfX);
-- dfXMax = MAX(dfXMax,dfX);
-- dfYMin = MIN(dfYMin,dfY);
-- dfYMax = MAX(dfYMax,dfY);
-+ dfXMin = MS_MIN(dfXMin,dfX);
-+ dfXMax = MS_MAX(dfXMax,dfX);
-+ dfYMin = MS_MIN(dfYMin,dfY);
-+ dfYMax = MS_MAX(dfYMax,dfY);
-
- /* bottom left */
- dfX = GEO_TRANS(adfInvGeoTransform , searchrect.minx, searchrect.miny);
- dfY = GEO_TRANS(adfInvGeoTransform+3, searchrect.minx, searchrect.miny);
-- dfXMin = MIN(dfXMin,dfX);
-- dfXMax = MAX(dfXMax,dfX);
-- dfYMin = MIN(dfYMin,dfY);
-- dfYMax = MAX(dfYMax,dfY);
-+ dfXMin = MS_MIN(dfXMin,dfX);
-+ dfXMax = MS_MAX(dfXMax,dfX);
-+ dfYMin = MS_MIN(dfYMin,dfY);
-+ dfYMax = MS_MAX(dfYMax,dfY);
-
- /* bottom right */
- dfX = GEO_TRANS(adfInvGeoTransform , searchrect.maxx, searchrect.miny);
- dfY = GEO_TRANS(adfInvGeoTransform+3, searchrect.maxx, searchrect.miny);
-- dfXMin = MIN(dfXMin,dfX);
-- dfXMax = MAX(dfXMax,dfX);
-- dfYMin = MIN(dfYMin,dfY);
-- dfYMax = MAX(dfYMax,dfY);
-+ dfXMin = MS_MIN(dfXMin,dfX);
-+ dfXMax = MS_MAX(dfXMax,dfX);
-+ dfYMin = MS_MIN(dfYMin,dfY);
-+ dfYMax = MS_MAX(dfYMax,dfY);
-
- /* -------------------------------------------------------------------- */
- /* Trim the rectangle to the area of the file itself, but out */
- /* to the edges of the touched edge pixels. */
- /* -------------------------------------------------------------------- */
-- dfXMin = MAX(0.0,MIN(nRXSize,floor(dfXMin)));
-- dfYMin = MAX(0.0,MIN(nRYSize,floor(dfYMin)));
-- dfXMax = MAX(0.0,MIN(nRXSize,ceil(dfXMax)));
-- dfYMax = MAX(0.0,MIN(nRYSize,ceil(dfYMax)));
-+ dfXMin = MS_MAX(0.0,MS_MIN(nRXSize,floor(dfXMin)));
-+ dfYMin = MS_MAX(0.0,MS_MIN(nRYSize,floor(dfYMin)));
-+ dfXMax = MS_MAX(0.0,MS_MIN(nRXSize,ceil(dfXMax)));
-+ dfYMax = MS_MAX(0.0,MS_MIN(nRYSize,ceil(dfYMax)));
-
- /* -------------------------------------------------------------------- */
- /* Convert to integer offset/size values. */
-diff --git a/mapresample.c b/mapresample.c
-index 26b253e..532b6a8 100644
---- a/mapresample.c
-+++ b/mapresample.c
-@@ -34,8 +34,8 @@
-
-
- #ifndef MAX
--# define MIN(a,b) ((a<b) ? a : b)
--# define MAX(a,b) ((a>b) ? a : b)
-+# define MS_MIN(a,b) ((a<b) ? a : b)
-+# define MS_MAX(a,b) ((a>b) ? a : b)
- #endif
-
- #define SKIP_MASK(x,y) (mask_rb && !*(mask_rb->data.rgba.a+(y)*mask_rb->data.rgba.row_step+(x)*mask_rb->data.rgba.pixel_step))
-@@ -319,7 +319,7 @@ msBilinearRasterResampler( imageObj *psSrcImage, rasterBufferObj *src_rb,
- int nSrcYSize = psSrcImage->height;
- int nFailedPoints = 0, nSetPoints = 0;
- double *padfPixelSum;
-- int bandCount = MAX(4,psSrcImage->format->bands);
-+ int bandCount = MS_MAX(4,psSrcImage->format->bands);
-
- padfPixelSum = (double *) msSmallMalloc(sizeof(double) * bandCount);
-
-@@ -369,10 +369,10 @@ msBilinearRasterResampler( imageObj *psSrcImage, rasterBufferObj *src_rb,
- continue;
-
- /* Trim in stuff one pixel off the edge */
-- nSrcX = MAX(nSrcX,0);
-- nSrcY = MAX(nSrcY,0);
-- nSrcX2 = MIN(nSrcX2,nSrcXSize-1);
-- nSrcY2 = MIN(nSrcY2,nSrcYSize-1);
-+ nSrcX = MS_MAX(nSrcX,0);
-+ nSrcY = MS_MAX(nSrcY,0);
-+ nSrcX2 = MS_MIN(nSrcX2,nSrcXSize-1);
-+ nSrcY2 = MS_MIN(nSrcY2,nSrcYSize-1);
-
- memset( padfPixelSum, 0, sizeof(double) * bandCount);
-
-@@ -407,10 +407,10 @@ msBilinearRasterResampler( imageObj *psSrcImage, rasterBufferObj *src_rb,
- int dst_rb_off = nDstX * dst_rb->data.rgba.pixel_step + nDstY * dst_rb->data.rgba.row_step;
- unsigned char red, green, blue, alpha;
-
-- red = (unsigned char) MAX(0,MIN(255,padfPixelSum[0]));
-- green = (unsigned char) MAX(0,MIN(255,padfPixelSum[1]));
-- blue = (unsigned char) MAX(0,MIN(255,padfPixelSum[2]));
-- alpha = (unsigned char)MAX(0,MIN(255,255.5*dfWeightSum));
-+ red = (unsigned char) MS_MAX(0,MS_MIN(255,padfPixelSum[0]));
-+ green = (unsigned char) MS_MAX(0,MS_MIN(255,padfPixelSum[1]));
-+ blue = (unsigned char) MS_MAX(0,MS_MIN(255,padfPixelSum[2]));
-+ alpha = (unsigned char)MS_MAX(0,MS_MIN(255,255.5*dfWeightSum));
-
- msAlphaBlendPM( red, green, blue, alpha,
- dst_rb->data.rgba.r + dst_rb_off,
-@@ -436,7 +436,7 @@ msBilinearRasterResampler( imageObj *psSrcImage, rasterBufferObj *src_rb,
- = (float) padfPixelSum[band];
- } else if( psSrcImage->format->imagemode == MS_IMAGEMODE_BYTE ) {
- psDstImage->img.raw_byte[dst_off]
-- = (unsigned char)MAX(0,MIN(255,padfPixelSum[band]));
-+ = (unsigned char)MS_MAX(0,MS_MIN(255,padfPixelSum[band]));
- }
-
- dst_off += psDstImage->width*psDstImage->height;
-@@ -489,14 +489,14 @@ msAverageSample( imageObj *psSrcImage, rasterBufferObj *src_rb,
- for( iY = nYMin; iY < nYMax; iY++ ) {
- double dfYCellMin, dfYCellMax;
-
-- dfYCellMin = MAX(iY,dfYMin);
-- dfYCellMax = MIN(iY+1,dfYMax);
-+ dfYCellMin = MS_MAX(iY,dfYMin);
-+ dfYCellMax = MS_MIN(iY+1,dfYMax);
-
- for( iX = nXMin; iX < nXMax; iX++ ) {
- double dfXCellMin, dfXCellMax, dfWeight;
-
-- dfXCellMin = MAX(iX,dfXMin);
-- dfXCellMax = MIN(iX+1,dfXMax);
-+ dfXCellMin = MS_MAX(iX,dfXMin);
-+ dfXCellMax = MS_MIN(iX+1,dfXMax);
-
- dfWeight = (dfXCellMax-dfXCellMin) * (dfYCellMax-dfYCellMin);
-
-@@ -537,7 +537,7 @@ msAverageRasterResampler( imageObj *psSrcImage, rasterBufferObj *src_rb,
- int nFailedPoints = 0, nSetPoints = 0;
- double *padfPixelSum;
-
-- int bandCount = MAX(4,psSrcImage->format->bands);
-+ int bandCount = MS_MAX(4,psSrcImage->format->bands);
-
- padfPixelSum = (double *) msSmallMalloc(sizeof(double) * bandCount);
-
-@@ -573,19 +573,19 @@ msAverageRasterResampler( imageObj *psSrcImage, rasterBufferObj *src_rb,
- continue;
- }
-
-- dfXMin = MIN(MIN(x1[nDstX],x1[nDstX+1]),
-- MIN(x2[nDstX],x2[nDstX+1]));
-- dfYMin = MIN(MIN(y1[nDstX],y1[nDstX+1]),
-- MIN(y2[nDstX],y2[nDstX+1]));
-- dfXMax = MAX(MAX(x1[nDstX],x1[nDstX+1]),
-- MAX(x2[nDstX],x2[nDstX+1]));
-- dfYMax = MAX(MAX(y1[nDstX],y1[nDstX+1]),
-- MAX(y2[nDstX],y2[nDstX+1]));
-+ dfXMin = MS_MIN(MS_MIN(x1[nDstX],x1[nDstX+1]),
-+ MS_MIN(x2[nDstX],x2[nDstX+1]));
-+ dfYMin = MS_MIN(MS_MIN(y1[nDstX],y1[nDstX+1]),
-+ MS_MIN(y2[nDstX],y2[nDstX+1]));
-+ dfXMax = MS_MAX(MS_MAX(x1[nDstX],x1[nDstX+1]),
-+ MS_MAX(x2[nDstX],x2[nDstX+1]));
-+ dfYMax = MS_MAX(MS_MAX(y1[nDstX],y1[nDstX+1]),
-+ MS_MAX(y2[nDstX],y2[nDstX+1]));
-
-- dfXMin = MIN(MAX(dfXMin,0),psSrcImage->width+1);
-- dfYMin = MIN(MAX(dfYMin,0),psSrcImage->height+1);
-- dfXMax = MIN(MAX(-1,dfXMax),psSrcImage->width);
-- dfYMax = MIN(MAX(-1,dfYMax),psSrcImage->height);
-+ dfXMin = MS_MIN(MS_MAX(dfXMin,0),psSrcImage->width+1);
-+ dfYMin = MS_MIN(MS_MAX(dfYMin,0),psSrcImage->height+1);
-+ dfXMax = MS_MIN(MS_MAX(-1,dfXMax),psSrcImage->width);
-+ dfYMax = MS_MIN(MS_MAX(-1,dfYMax),psSrcImage->height);
-
- memset( padfPixelSum, 0, sizeof(double)*bandCount );
-
-@@ -605,13 +605,13 @@ msAverageRasterResampler( imageObj *psSrcImage, rasterBufferObj *src_rb,
- unsigned char red, green, blue, alpha;
-
- red = (unsigned char)
-- MAX(0,MIN(255,padfPixelSum[0]+0.5));
-+ MS_MAX(0,MS_MIN(255,padfPixelSum[0]+0.5));
- green = (unsigned char)
-- MAX(0,MIN(255,padfPixelSum[1]+0.5));
-+ MS_MAX(0,MS_MIN(255,padfPixelSum[1]+0.5));
- blue = (unsigned char)
-- MAX(0,MIN(255,padfPixelSum[2]+0.5));
-+ MS_MAX(0,MS_MIN(255,padfPixelSum[2]+0.5));
- alpha = (unsigned char)
-- MAX(0,MIN(255,255*dfAlpha01+0.5));
-+ MS_MAX(0,MS_MIN(255,255*dfAlpha01+0.5));
-
- RB_MIX_PIXEL(dst_rb,nDstX,nDstY,
- red, green, blue, alpha );
-@@ -1121,10 +1121,10 @@ static int msTransformMapToSource( int nDstXSize, int nDstYSize,
- psSrcExtent->miny = psSrcExtent->maxy = y_out;
- bOutInit = 1;
- } else {
-- psSrcExtent->minx = MIN(psSrcExtent->minx, x_out);
-- psSrcExtent->maxx = MAX(psSrcExtent->maxx, x_out);
-- psSrcExtent->miny = MIN(psSrcExtent->miny, y_out);
-- psSrcExtent->maxy = MAX(psSrcExtent->maxy, y_out);
-+ psSrcExtent->minx = MS_MIN(psSrcExtent->minx, x_out);
-+ psSrcExtent->maxx = MS_MAX(psSrcExtent->maxx, x_out);
-+ psSrcExtent->miny = MS_MIN(psSrcExtent->miny, y_out);
-+ psSrcExtent->maxy = MS_MAX(psSrcExtent->maxy, y_out);
- }
- }
-
-@@ -1141,10 +1141,10 @@ static int msTransformMapToSource( int nDstXSize, int nDstYSize,
- int nGrowAmountY = (int)
- (psSrcExtent->maxy - psSrcExtent->miny)/EDGE_STEPS + 1;
-
-- psSrcExtent->minx = MAX(psSrcExtent->minx - nGrowAmountX,0);
-- psSrcExtent->miny = MAX(psSrcExtent->miny - nGrowAmountY,0);
-- psSrcExtent->maxx = MIN(psSrcExtent->maxx + nGrowAmountX,nSrcXSize);
-- psSrcExtent->maxy = MIN(psSrcExtent->maxy + nGrowAmountY,nSrcYSize);
-+ psSrcExtent->minx = MS_MAX(psSrcExtent->minx - nGrowAmountX,0);
-+ psSrcExtent->miny = MS_MAX(psSrcExtent->miny - nGrowAmountY,0);
-+ psSrcExtent->maxx = MS_MIN(psSrcExtent->maxx + nGrowAmountX,nSrcXSize);
-+ psSrcExtent->maxy = MS_MIN(psSrcExtent->maxy + nGrowAmountY,nSrcYSize);
- }
-
- return MS_TRUE;
-@@ -1342,10 +1342,10 @@ int msResampleGDALToMap( mapObj *map, layerObj *layer, imageObj *image,
- sSrcExtent.maxy = ceil (sSrcExtent.maxy+1.0);
- }
-
-- sSrcExtent.minx = MAX(0,sSrcExtent.minx);
-- sSrcExtent.maxx = MIN(sSrcExtent.maxx, nSrcXSize );
-- sSrcExtent.miny = MAX(sSrcExtent.miny, 0 );
-- sSrcExtent.maxy = MIN(sSrcExtent.maxy, nSrcYSize );
-+ sSrcExtent.minx = MS_MAX(0,sSrcExtent.minx);
-+ sSrcExtent.maxx = MS_MIN(sSrcExtent.maxx, nSrcXSize );
-+ sSrcExtent.miny = MS_MAX(sSrcExtent.miny, 0 );
-+ sSrcExtent.maxy = MS_MIN(sSrcExtent.maxy, nSrcYSize );
-
- if( sSrcExtent.maxx <= sSrcExtent.minx
- || sSrcExtent.maxy <= sSrcExtent.miny ) {
-@@ -1383,9 +1383,9 @@ int msResampleGDALToMap( mapObj *map, layerObj *layer, imageObj *image,
- else
- sDummyMap.cellsize = dfNominalCellSize;
-
-- nLoadImgXSize = MAX(1, (int) (sSrcExtent.maxx - sSrcExtent.minx)
-+ nLoadImgXSize = MS_MAX(1, (int) (sSrcExtent.maxx - sSrcExtent.minx)
- * (dfNominalCellSize / sDummyMap.cellsize));
-- nLoadImgYSize = MAX(1, (int) (sSrcExtent.maxy - sSrcExtent.miny)
-+ nLoadImgYSize = MS_MAX(1, (int) (sSrcExtent.maxy - sSrcExtent.miny)
- * (dfNominalCellSize / sDummyMap.cellsize));
-
- /*
-diff --git a/mapstring.c b/mapstring.c
-index ea5b67f..82ee82a 100644
---- a/mapstring.c
-+++ b/mapstring.c
-@@ -135,7 +135,7 @@ char *strrstr(char *string, char *find)
- * Appends src to string dst of size siz (unlike strncat, siz is the
- * full size of dst, not space left). At most siz-1 characters
- * will be copied. Always NUL terminates (unless siz <= strlen(dst)).
-- * Returns strlen(src) + MIN(siz, strlen(initial dst)).
-+ * Returns strlen(src) + MS_MIN(siz, strlen(initial dst)).
- * If retval >= siz, truncation occurred.
- */
- size_t strlcat(char *dst, const char *src, size_t siz)
-diff --git a/mapwcs20.c b/mapwcs20.c
-index 347e9b7..266a07d 100644
---- a/mapwcs20.c
-+++ b/mapwcs20.c
-@@ -4189,8 +4189,8 @@ this request. Check wcs/ows_enable_request settings.", "msWCSGetCoverage20()", p
- + (orig_bbox.maxx+1) * cm.geotransform[1]
- + (orig_bbox.maxy+1) * cm.geotransform[2];
-
-- subsets.minx = MIN(x_1, x_2);
-- subsets.maxx = MAX(x_1, x_2);
-+ subsets.minx = MS_MIN(x_1, x_2);
-+ subsets.maxx = MS_MAX(x_1, x_2);
- }
- if(subsets.miny != -DBL_MAX || subsets.maxy != DBL_MAX) {
- y_1 = cm.geotransform[3]
-@@ -4201,8 +4201,8 @@ this request. Check wcs/ows_enable_request settings.", "msWCSGetCoverage20()", p
- + orig_bbox.minx * cm.geotransform[4]
- + orig_bbox.miny * cm.geotransform[5];
-
-- subsets.miny = MIN(y_1, y_2);
-- subsets.maxy = MAX(y_1, y_2);
-+ subsets.miny = MS_MIN(y_1, y_2);
-+ subsets.maxy = MS_MAX(y_1, y_2);
- }
- } else { /* if crs is not the 'imageCRS' */
- projectionObj subsetProj;
-@@ -4241,10 +4241,10 @@ this request. Check wcs/ows_enable_request settings.", "msWCSGetCoverage20()", p
- }
-
- /* write combined bounding box */
-- bbox.minx = MAX(subsets.minx, map->extent.minx);
-- bbox.miny = MAX(subsets.miny, map->extent.miny);
-- bbox.maxx = MIN(subsets.maxx, map->extent.maxx);
-- bbox.maxy = MIN(subsets.maxy, map->extent.maxy);
-+ bbox.minx = MS_MAX(subsets.minx, map->extent.minx);
-+ bbox.miny = MS_MAX(subsets.miny, map->extent.miny);
-+ bbox.maxx = MS_MIN(subsets.maxx, map->extent.maxx);
-+ bbox.maxy = MS_MIN(subsets.maxy, map->extent.maxy);
-
- /* check if we are overspecified */
- if ((params->width != 0 && params->resolutionX != MS_WCS20_UNBOUNDED)
-@@ -4620,10 +4620,10 @@ this request. Check wcs/ows_enable_request settings.", "msWCSGetCoverage20()", p
- tmpCm.xresolution = map->gt.geotransform[1];
- tmpCm.yresolution = map->gt.geotransform[5];
-
-- tmpCm.extent.minx = MIN(map->gt.geotransform[0], map->gt.geotransform[0] + map->width * tmpCm.xresolution);
-- tmpCm.extent.miny = MIN(map->gt.geotransform[3], map->gt.geotransform[3] + map->height * tmpCm.yresolution);
-- tmpCm.extent.maxx = MAX(map->gt.geotransform[0], map->gt.geotransform[0] + map->width * tmpCm.xresolution);
-- tmpCm.extent.maxy = MAX(map->gt.geotransform[3], map->gt.geotransform[3] + map->height * tmpCm.yresolution);
-+ tmpCm.extent.minx = MS_MIN(map->gt.geotransform[0], map->gt.geotransform[0] + map->width * tmpCm.xresolution);
-+ tmpCm.extent.miny = MS_MIN(map->gt.geotransform[3], map->gt.geotransform[3] + map->height * tmpCm.yresolution);
-+ tmpCm.extent.maxx = MS_MAX(map->gt.geotransform[0], map->gt.geotransform[0] + map->width * tmpCm.xresolution);
-+ tmpCm.extent.maxy = MS_MAX(map->gt.geotransform[3], map->gt.geotransform[3] + map->height * tmpCm.yresolution);
-
- swapAxes = msWCSSwapAxes20(srs_uri);
- msFree(srs_uri);
-diff --git a/mapwmslayer.c b/mapwmslayer.c
-index 42a44f1..3e4747d 100644
---- a/mapwmslayer.c
-+++ b/mapwmslayer.c
-@@ -698,7 +698,7 @@ msBuildWMSLayerURL(mapObj *map, layerObj *lp, int nRequestType,
- else {
- double cellsize_x = (bbox.maxx-bbox.minx) / bbox_width;
- double cellsize_y = (bbox.maxy-bbox.miny) / bbox_height;
-- double cellsize = MIN(cellsize_x,cellsize_y);
-+ double cellsize = MS_MIN(cellsize_x,cellsize_y);
-
- msRectIntersect( &bbox, &layer_rect );
-
diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-disabled-ogr.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-disabled-ogr.patch
deleted file mode 100644
index 088e37b..0000000
--- a/sci-geosciences/mapserver/files/mapserver-7.0.0-disabled-ogr.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From ab2a6129435ca37d02730a6faf85593afa0daf9b Mon Sep 17 00:00:00 2001
-From: Thomas Bonfort <thomas.bonfort@gmail.com>
-Date: Mon, 16 Nov 2015 16:56:02 +0100
-Subject: [PATCH] Fix build issues with OGR disabled
-
----
- mapimageio.c | 2 +-
- mapogcfilter.c | 1 +
- mapogr.cpp | 2 ++
- 3 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/mapimageio.c b/mapimageio.c
-index 771188b..95feda2 100644
---- a/mapimageio.c
-+++ b/mapimageio.c
-@@ -210,7 +210,7 @@ int saveAsJPEG(mapObj *map, rasterBufferObj *rb, streamInfo *info,
- /* If the user doesn't provide a value for JPEGMEM, we want to be sure */
- /* that at least the image size will be used before creating the temporary file */
- cinfo.mem->max_memory_to_use =
-- MAX(cinfo.mem->max_memory_to_use, cinfo.input_components * rb->width * rb->height);
-+ MS_MAX(cinfo.mem->max_memory_to_use, cinfo.input_components * rb->width * rb->height);
- }
- }
-
-diff --git a/mapogcfilter.c b/mapogcfilter.c
-index 50e2e7b..05f017a 100644
---- a/mapogcfilter.c
-+++ b/mapogcfilter.c
-@@ -40,6 +40,7 @@
- #include "mapowscommon.h"
- #include "maptime.h"
- #include "mapows.h"
-+#include <ctype.h>
-
- static int FLTHasUniqueTopLevelDuringFilter(FilterEncodingNode *psFilterNode);
-
-diff --git a/mapogr.cpp b/mapogr.cpp
-index 07acdba..80f032b 100644
---- a/mapogr.cpp
-+++ b/mapogr.cpp
-@@ -1318,6 +1318,7 @@ static int msOGRFileClose(layerObj *layer, msOGRFileInfo *psInfo )
-
- return MS_SUCCESS;
- }
-+#endif /* USE_OGR */
-
- /************************************************************************/
- /* msOGREscapeSQLParam */
-@@ -1345,6 +1346,7 @@ static char *msOGREscapeSQLParam(layerObj *layer, const char *pszString)
- #endif /* USE_OGR */
- }
-
-+#ifdef USE_OGR
- /**********************************************************************
- * msOGRTranslateMsExpressionToOGRSQL()
- *
diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-giflib51.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-giflib51.patch
deleted file mode 100644
index 1fa7710..0000000
--- a/sci-geosciences/mapserver/files/mapserver-7.0.0-giflib51.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 0101157d4edd5d837d17356c66c7d25af7e020ac Mon Sep 17 00:00:00 2001
-From: Sander Jansen <s.jansen@gmail.com>
-Date: Wed, 19 Aug 2015 16:51:13 -0500
-Subject: [PATCH] Fix compilation with gif_lib 5.1
-
----
- mapimageio.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/mapimageio.c b/mapimageio.c
-index e6bdcb5..5eed924 100644
---- a/mapimageio.c
-+++ b/mapimageio.c
-@@ -1058,6 +1058,13 @@ int readGIF(char *path, rasterBufferObj *rb)
-
- } while (recordType != TERMINATE_RECORD_TYPE);
-
-+
-+#if defined GIFLIB_MAJOR && GIFLIB_MINOR && ((GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1) || (GIFLIB_MAJOR > 5))
-+ if (DGifCloseFile(image, &errcode) == GIF_ERROR) {
-+ msSetError(MS_MISCERR,"failed to close gif after loading: %s","readGIF()", gif_error_msg(errcode));
-+ return MS_FAILURE;
-+ }
-+#else
- if (DGifCloseFile(image) == GIF_ERROR) {
- #if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5
- msSetError(MS_MISCERR,"failed to close gif after loading: %s","readGIF()", gif_error_msg(image->Error));
-@@ -1066,6 +1073,7 @@ int readGIF(char *path, rasterBufferObj *rb)
- #endif
- return MS_FAILURE;
- }
-+#endif
-
- return MS_SUCCESS;
- }
diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-mapwcs-disabled-libxml2.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-mapwcs-disabled-libxml2.patch
deleted file mode 100644
index 5625746..0000000
--- a/sci-geosciences/mapserver/files/mapserver-7.0.0-mapwcs-disabled-libxml2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/mapwcs20.c b/mapwcs20.c
-index ac2fb89..9560a25 100755
---- a/mapwcs20.c
-+++ b/mapwcs20.c
-@@ -700,6 +700,7 @@ static int msWCSParseScaleExtentString20(char *string, char *outAxis,
- return MS_SUCCESS;
- }
-
-+#if defined(USE_LIBXML2)
- /*
- Utility function to get the first child of a node with a given node name
- */
-@@ -739,6 +740,7 @@ xmlNodePtr msLibXml2GetFirstChildNs(xmlNodePtr parent, const char *name, xmlNsPt
- }
- return NULL;
- }
-+#endif /* defined(USE_LIBXML2) */
-
- /************************************************************************/
- /* msWCSParseRequest20_XMLGetCapabilities() */
diff --git a/sci-geosciences/mapserver/mapserver-7.0.0.ebuild b/sci-geosciences/mapserver/mapserver-7.0.0.ebuild
deleted file mode 100644
index da2eb5d..0000000
--- a/sci-geosciences/mapserver/mapserver-7.0.0.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_P="${PN}-${PV/_/-}"
-
-PHP_EXT_OPTIONAL_USE="php"
-PHP_EXT_NAME="php_mapscript"
-PHP_EXT_S="${WORKDIR}/${MY_P}/mapscript/php/"
-PHP_EXT_SKIP_PHPIZE="no"
-USE_PHP="php5-4 php5-5"
-
-PYTHON_COMPAT=( python2_7 )
-
-#USE_RUBY="ruby18 ruby19"
-#RUBY_OPTIONAL="yes"
-
-WEBAPP_MANUAL_SLOT=yes
-
-inherit eutils depend.apache webapp distutils-r1 flag-o-matic perl-module php-ext-source-r2 multilib cmake-utils # ruby-ng
-
-DESCRIPTION="Development environment for building spatially enabled webapps"
-HOMEPAGE="http://mapserver.org/"
-SRC_URI="http://download.osgeo.org/mapserver/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="bidi cairo gdal geos mysql opengl perl php postgis proj python threads tiff xml xslt" # ruby php tcl
-
-REQUIRED_USE="php? ( ^^ ( php_targets_php5-4 php_targets_php5-5 ) )
- xslt? ( xml )"
-
-RDEPEND="
- dev-libs/expat
- dev-libs/fcgi
- >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib]
- media-libs/giflib
- net-misc/curl
- virtual/jpeg:=
- virtual/libiconv
- x11-libs/agg
- bidi? ( dev-libs/fribidi
- media-libs/harfbuzz )
- cairo? ( x11-libs/cairo )
- gdal? ( >=sci-libs/gdal-1.8.0 )
- geos? ( sci-libs/geos )
- mysql? ( virtual/mysql )
- opengl? (
- media-libs/ftgl
- media-libs/mesa
- )
- perl? ( dev-lang/perl:= )
- postgis? ( dev-db/postgis )
- proj? ( sci-libs/proj net-misc/curl )
- tiff? (
- media-libs/tiff:=
- sci-libs/libgeotiff
- )
- xml? ( dev-libs/libxml2:2 )
- xslt? ( dev-libs/libxslt[crypt] )
-"
-DEPEND="${RDEPEND}
- perl? ( >=dev-lang/swig-2.0 )
- python? ( >=dev-lang/swig-2.0 )"
-
-need_apache2
-
-PATCHES=(
- "${FILESDIR}/${P}-giflib51.patch" # see https://github.com/mapserver/mapserver/pull/5144
- "${FILESDIR}/${P}-disabled-ogr.patch" # see https://github.com/mapserver/mapserver/commit/ab2a6129435ca37d02730a6faf85593afa0daf9b
- "${FILESDIR}/${P}-correct-min-max-calls.patch" # see https://github.com/mapserver/mapserver/pull/5251
- "${FILESDIR}/${P}-sec-format.patch" # see https://github.com/mapserver/mapserver/pull/5248
- "${FILESDIR}/${P}-mapwcs-disabled-libxml2.patch"
- "${FILESDIR}/${P}-no-applicable-code.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- webapp_pkg_setup
- use perl && perl_set_version
- #use ruby && ruby-ng_pkg_setup
-}
-
-src_unpack() {
- # unpack A and then copy the php thingies into workdir/php-slot
- php-ext-source-r2_src_unpack
- # HACK: and then remove it and replace by symlink
- for slot in $(php_get_slots); do
- rm -rf "${WORKDIR}/${slot}" || die
- ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die
- done
-}
-
-src_prepare() {
- local glibdir="${EPREFIX}/usr/include/glib-2.0"
- local usrglibdir="${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
-
- sed -e "s:^include_directories(:&${glibdir})\ninclude_directories(:" \
- -i "${S}/CMakeLists.txt" || die
- sed -e "s:include_directories(:&${usrglibdir})\ninclude_directories(:" \
- -i "${S}/CMakeLists.txt" || die
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- "-DCMAKE_SKIP_RPATH=ON"
- "-DWITH_ORACLESPATIAL=OFF"
- "-DWITH_SDE=OFF"
- "-DWITH_APACHE_MODULE=ON"
- "-DWITH_ICONV=ON"
- "-DWITH_GD=ON"
- "-DWITH_GIF=ON"
- "-DWITH_CURL=ON"
- "-DWITH_FCGI=ON"
- "-DWITH_PROJ=$(usex proj ON OFF)"
- "-DWITH_WMS=$(usex proj ON OFF)"
- "-DWITH_KML=$(usex xml ON OFF)"
- "-DWITH_GEOS=$(usex geos ON OFF)"
- "-DWITH_GDAL=$(usex gdal ON OFF)"
- "-DWITH_OGR=$(usex gdal ON OFF)"
- "-DWITH_POSTGIS=$(usex postgis ON OFF)"
- "-DWITH_MYSQL=$(usex mysql ON OFF)"
- "-DWITH_LIBXML2=$(usex xml ON OFF)"
- "-DWITH_XMLMAPFILE=$(usex xslt ON OFF)"
- "-DWITH_FRIBIDI=$(usex bidi ON OFF)"
- "-DWITH_HARFBUZZ=$(usex bidi ON OFF)"
- "-DWITH_CAIRO=$(usex cairo ON OFF)"
- "-DWITH_PHP=$(usex php ON OFF)"
- "-DWITH_PYTHON=$(usex python ON OFF)"
- "-DWITH_PERL=$(usex perl ON OFF)"
- )
-
- if use gdal && use proj ; then
- mycmakeargs+=( "-DWITH_WFS=ON"
- "-DWITH_WCS=ON"
- "-DWITH_CLIENT_WMS=ON"
- "-DWITH_CLIENT_WFS=ON"
- "-DWITH_SOS=$(usex xml ON OFF)"
- )
- else
- mycmakeargs+=( "-DWITH_WFS=OFF"
- "-DWITH_WCS=OFF"
- "-DWITH_CLIENT_WMS=OFF"
- "-DWITH_CLIENT_WFS=OFF"
- "-DWITH_SOS=OFF"
- )
- fi
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
-
- webapp_src_preinst
- exeinto "${MY_CGIBINDIR}"
- doexe "${S}_build/mapserv"
- webapp_src_install
-}
-
-pkg_postinst() {
- webapp_pkg_postinst
-}
-
-pkg_prerm() {
- webapp_pkg_prerm
-}
diff --git a/sci-geosciences/mapserver/mapserver-7.0.1.ebuild b/sci-geosciences/mapserver/mapserver-7.0.1.ebuild
deleted file mode 100644
index 30abc85..0000000
--- a/sci-geosciences/mapserver/mapserver-7.0.1.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_P="${PN}-${PV/_/-}"
-
-PHP_EXT_OPTIONAL_USE="php"
-PHP_EXT_NAME="php_mapscript"
-PHP_EXT_S="${WORKDIR}/${MY_P}/mapscript/php/"
-PHP_EXT_SKIP_PHPIZE="no"
-USE_PHP="php5-4 php5-5"
-
-PYTHON_COMPAT=( python2_7 )
-
-#USE_RUBY="ruby18 ruby19"
-#RUBY_OPTIONAL="yes"
-
-WEBAPP_MANUAL_SLOT=yes
-
-inherit eutils depend.apache webapp distutils-r1 flag-o-matic perl-module php-ext-source-r2 multilib cmake-utils # ruby-ng
-
-DESCRIPTION="Development environment for building spatially enabled webapps"
-HOMEPAGE="http://mapserver.org/"
-SRC_URI="http://download.osgeo.org/mapserver/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="bidi cairo gdal geos mysql opengl perl php postgis proj python threads tiff xml xslt" # ruby php tcl
-
-REQUIRED_USE="php? ( ^^ ( php_targets_php5-4 php_targets_php5-5 ) )
- xslt? ( xml )"
-
-RDEPEND="
- dev-libs/expat
- dev-libs/fcgi
- >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib]
- media-libs/giflib
- net-misc/curl
- virtual/jpeg:=
- virtual/libiconv
- x11-libs/agg
- bidi? ( dev-libs/fribidi
- media-libs/harfbuzz )
- cairo? ( x11-libs/cairo )
- gdal? ( >=sci-libs/gdal-1.8.0 )
- geos? ( sci-libs/geos )
- mysql? ( virtual/mysql )
- opengl? (
- media-libs/ftgl
- media-libs/mesa
- )
- perl? ( dev-lang/perl:= )
- postgis? ( dev-db/postgis )
- proj? ( sci-libs/proj net-misc/curl )
- tiff? (
- media-libs/tiff:=
- sci-libs/libgeotiff
- )
- xml? ( dev-libs/libxml2:2 )
- xslt? ( dev-libs/libxslt[crypt] )
-"
-DEPEND="${RDEPEND}
- perl? ( >=dev-lang/swig-2.0 )
- python? ( >=dev-lang/swig-2.0 )"
-
-need_apache2
-
-PATCHES=(
- "${FILESDIR}/${PN}-7.0.0-sec-format.patch" # see https://github.com/mapserver/mapserver/pull/5248
- "${FILESDIR}/${PN}-7.0.0-no-applicable-code.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- webapp_pkg_setup
- use perl && perl_set_version
- #use ruby && ruby-ng_pkg_setup
-}
-
-src_unpack() {
- # unpack A and then copy the php thingies into workdir/php-slot
- php-ext-source-r2_src_unpack
- # HACK: and then remove it and replace by symlink
- for slot in $(php_get_slots); do
- rm -rf "${WORKDIR}/${slot}" || die
- ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die
- done
-}
-
-src_prepare() {
- local glibdir="${EPREFIX}/usr/include/glib-2.0"
- local usrglibdir="${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
-
- sed -e "s:^include_directories(:&${glibdir})\ninclude_directories(:" \
- -i "${S}/CMakeLists.txt" || die
- sed -e "s:include_directories(:&${usrglibdir})\ninclude_directories(:" \
- -i "${S}/CMakeLists.txt" || die
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- "-DCMAKE_SKIP_RPATH=ON"
- "-DWITH_ORACLESPATIAL=OFF"
- "-DWITH_SDE=OFF"
- "-DWITH_APACHE_MODULE=ON"
- "-DWITH_ICONV=ON"
- "-DWITH_GD=ON"
- "-DWITH_GIF=ON"
- "-DWITH_CURL=ON"
- "-DWITH_FCGI=ON"
- "-DINSTALL_LIB_DIR=$(get_libdir)"
- "-DWITH_PROJ=$(usex proj ON OFF)"
- "-DWITH_WMS=$(usex proj ON OFF)"
- "-DWITH_KML=$(usex xml ON OFF)"
- "-DWITH_GEOS=$(usex geos ON OFF)"
- "-DWITH_GDAL=$(usex gdal ON OFF)"
- "-DWITH_OGR=$(usex gdal ON OFF)"
- "-DWITH_POSTGIS=$(usex postgis ON OFF)"
- "-DWITH_MYSQL=$(usex mysql ON OFF)"
- "-DWITH_LIBXML2=$(usex xml ON OFF)"
- "-DWITH_XMLMAPFILE=$(usex xslt ON OFF)"
- "-DWITH_FRIBIDI=$(usex bidi ON OFF)"
- "-DWITH_HARFBUZZ=$(usex bidi ON OFF)"
- "-DWITH_CAIRO=$(usex cairo ON OFF)"
- "-DWITH_PHP=$(usex php ON OFF)"
- "-DWITH_PYTHON=$(usex python ON OFF)"
- "-DWITH_PERL=$(usex perl ON OFF)"
- )
-
- if use gdal && use proj ; then
- mycmakeargs+=( "-DWITH_WFS=ON"
- "-DWITH_WCS=ON"
- "-DWITH_CLIENT_WMS=ON"
- "-DWITH_CLIENT_WFS=ON"
- "-DWITH_SOS=$(usex xml ON OFF)"
- )
- else
- mycmakeargs+=( "-DWITH_WFS=OFF"
- "-DWITH_WCS=OFF"
- "-DWITH_CLIENT_WMS=OFF"
- "-DWITH_CLIENT_WFS=OFF"
- "-DWITH_SOS=OFF"
- )
- fi
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
-
- webapp_src_preinst
- exeinto "${MY_CGIBINDIR}"
- doexe "${S}_build/mapserv"
- webapp_src_install
-}
-
-pkg_postinst() {
- webapp_pkg_postinst
-}
-
-pkg_prerm() {
- webapp_pkg_prerm
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapserver/, sci-geosciences/mapserver/files/
@ 2019-05-26 8:54 Amy Liffey
0 siblings, 0 replies; 9+ messages in thread
From: Amy Liffey @ 2019-05-26 8:54 UTC (permalink / raw
To: gentoo-commits
commit: 738cb929ab90549b8def4e7ac04ae99df141a298
Author: Marco Genasci <fedeliallalinea <AT> gmail <DOT> com>
AuthorDate: Thu May 16 09:57:43 2019 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Sun May 26 08:54:04 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=738cb929
sci-geosciences/mapserver: bump to version 7.0.7
- apache support not mandatory
- add oracle support
- fix compilation with proj-6.0.0
Bug: https://bugs.gentoo.org/674480
Signed-off-by: Marco Genasci <fedeliallalinea <AT> gmail.com>
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
sci-geosciences/mapserver/Manifest | 1 +
.../files/mapserver-7.0.0-missing-nzz18.patch | 13 ++
.../files/mapserver-7.0.7-missing-macro.patch | 19 ++
sci-geosciences/mapserver/mapserver-7.0.7.ebuild | 217 +++++++++++++++++++++
sci-geosciences/mapserver/metadata.xml | 1 +
5 files changed, 251 insertions(+)
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 47f5601db65..3a462cc3776 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1 +1,2 @@
DIST mapserver-7.0.5.tar.gz 2631454 BLAKE2B 88467d7d8ae90be73d6629619410f114081588d214eea3cd1752f0f97a5d934aa8e39bc2ce6a59ab969a4ac5eb2df15b60bd78f34c18356befb490a211de830f SHA512 18485ace6e3b198e19acc3dda2ba44b136c55c4a783e472cb4c8f7a0615ed676b9bcdcaedc348227a7929d0ccf6199c90aead572bf8243e7902a5a2051a20753
+DIST mapserver-7.0.7.tar.gz 2634698 BLAKE2B fadde68803d7f74b116aa23c05c25f9c52c67e0a8ea69eace2c865843d7f223c24d8c42cbed54578f2eb631cb58bae3652075872f76e9b88238d76e044d4314b SHA512 94225dbe64edf6623bb5e92649d505809f70f86c24ca06675f6277ac4a161c40c369fd1973db649e6c864fa5e2e4a8a93cbd36d1524297a0e47b96ab59c0941c
diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-missing-nzz18.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-missing-nzz18.patch
new file mode 100644
index 00000000000..a22fcf4de6a
--- /dev/null
+++ b/sci-geosciences/mapserver/files/mapserver-7.0.0-missing-nzz18.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/FindOracle.cmake b/cmake/FindOracle.cmake
+index 18055f7..2568b5e 100644
+--- a/cmake/FindOracle.cmake
++++ b/cmake/FindOracle.cmake
+@@ -37,7 +37,7 @@ if(DEFINED ENV{ORACLE_HOME})
+ ${ORACLE_HOME}/OCI/include) # Oracle XE on Windows
+
+ set(ORACLE_OCI_NAMES clntsh libclntsh oci)
+- set(ORACLE_NNZ_NAMES nnz10 libnnz10 nnz11 libnnz11 nnz12 libnnz12 ociw32)
++ set(ORACLE_NNZ_NAMES nnz10 libnnz10 nnz11 libnnz11 nnz12 libnnz12 nnz18 libnnz18 ociw32)
+ set(ORACLE_OCCI_NAMES libocci occi oraocci10 oraocci11 oraocci12)
+
+ set(ORACLE_LIB_DIR
diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.7-missing-macro.patch b/sci-geosciences/mapserver/files/mapserver-7.0.7-missing-macro.patch
new file mode 100644
index 00000000000..daf5ab1ebc7
--- /dev/null
+++ b/sci-geosciences/mapserver/files/mapserver-7.0.7-missing-macro.patch
@@ -0,0 +1,19 @@
+diff --git a/mapserver.h b/mapserver.h
+index df7eeb9..9516a6c 100644
+--- a/mapserver.h
++++ b/mapserver.h
+@@ -55,6 +55,14 @@
+ #include <unistd.h>
+ #endif
+
++#ifndef TRUE
++#define TRUE 1
++#endif
++
++#ifndef FALSE
++#define FALSE 0
++#endif
++
+ #if defined(_WIN32) && !defined(__CYGWIN__)
+ # define MS_DLL_EXPORT __declspec(dllexport)
+ #define USE_MSFREE
diff --git a/sci-geosciences/mapserver/mapserver-7.0.7.ebuild b/sci-geosciences/mapserver/mapserver-7.0.7.ebuild
new file mode 100644
index 00000000000..3d9b414957e
--- /dev/null
+++ b/sci-geosciences/mapserver/mapserver-7.0.7.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${PN}-${PV/_/-}"
+
+PHP_EXT_OPTIONAL_USE="php"
+PHP_EXT_NAME="php_mapscript"
+PHP_EXT_S="${WORKDIR}/${MY_P}/mapscript/php/"
+PHP_EXT_SKIP_PHPIZE="no"
+USE_PHP="php5-6"
+
+PYTHON_COMPAT=( python2_7 )
+
+#USE_RUBY="ruby18 ruby19"
+#RUBY_OPTIONAL="yes"
+
+WEBAPP_MANUAL_SLOT=yes
+WEBAPP_OPTIONAL=yes
+
+inherit cmake-utils depend.apache distutils-r1 eutils flag-o-matic multilib perl-module php-ext-source-r3 webapp # ruby-ng
+
+DESCRIPTION="Development environment for building spatially enabled webapps"
+HOMEPAGE="https://mapserver.org/"
+SRC_URI="https://download.osgeo.org/mapserver/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="apache bidi cairo gdal geos mysql opengl oracle perl php postgis proj python threads tiff xml xslt" # ruby php tcl
+
+REQUIRED_USE="
+ php? ( php_targets_php5-6 )
+ xslt? ( xml )"
+
+RDEPEND="
+ dev-libs/expat
+ >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib]
+ media-libs/giflib
+ net-misc/curl
+ virtual/jpeg:=
+ virtual/libiconv
+ x11-libs/agg
+ apache? (
+ dev-libs/fcgi
+ app-admin/webapp-config
+ )
+ bidi? ( dev-libs/fribidi
+ media-libs/harfbuzz )
+ cairo? ( x11-libs/cairo )
+ gdal? ( sci-libs/gdal:=[oracle?] )
+ geos? ( sci-libs/geos )
+ mysql? ( virtual/mysql )
+ opengl? (
+ media-libs/ftgl
+ media-libs/mesa
+ )
+ oracle? (
+ dev-db/oracle-instantclient:=
+ )
+ perl? ( dev-lang/perl:= )
+ postgis? ( dev-db/postgis )
+ proj? ( sci-libs/proj net-misc/curl )
+ tiff? (
+ media-libs/tiff:=
+ sci-libs/libgeotiff
+ )
+ xml? ( dev-libs/libxml2:2 )
+ xslt? ( dev-libs/libxslt[crypt] )
+"
+DEPEND="${RDEPEND}
+ perl? ( >=dev-lang/swig-2.0 )
+ python? ( >=dev-lang/swig-2.0 )"
+
+want_apache2 apache
+
+PATCHES=(
+ "${FILESDIR}/${PN}-7.0.0-sec-format.patch" # see https://github.com/mapserver/mapserver/pull/5248
+ "${FILESDIR}/${PN}-7.0.0-no-applicable-code.patch"
+ "${FILESDIR}/${PN}-7.0.0-missing-nzz18.patch"
+ "${FILESDIR}/${P}-missing-macro.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ if use apache ; then
+ webapp_pkg_setup
+ fi
+ use perl && perl_set_version
+ #use ruby && ruby-ng_pkg_setup
+}
+
+src_unpack() {
+ default
+ # HACK: Make symlinks for php targets
+ local slot
+ for slot in $(php_get_slots); do
+ ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die
+ done
+}
+
+src_prepare() {
+ local glibdir="${EPREFIX}/usr/include/glib-2.0"
+ local usrglibdir="${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
+
+ sed -e "s:^include_directories(:&${glibdir})\ninclude_directories(:" \
+ -i "${S}/CMakeLists.txt" || die
+ sed -e "s:include_directories(:&${usrglibdir})\ninclude_directories(:" \
+ -i "${S}/CMakeLists.txt" || die
+
+ # For enable compilation with proj-6
+ if use proj ; then
+ append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1
+ fi
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ "-DCMAKE_SKIP_RPATH=ON"
+ "-DWITH_SDE=OFF"
+ "-DWITH_ICONV=ON"
+ "-DWITH_GD=ON"
+ "-DWITH_GIF=ON"
+ "-DWITH_CURL=ON"
+ "-DINSTALL_LIB_DIR=${ROOT}usr/$(get_libdir)"
+ "-DWITH_APACHE_MODULE=$(usex apache ON OFF)"
+ "-DWITH_PROJ=$(usex proj ON OFF)"
+ "-DWITH_WMS=$(usex proj ON OFF)"
+ "-DWITH_KML=$(usex xml ON OFF)"
+ "-DWITH_FCGI=$(usex apache ON OFF)"
+ "-DWITH_GEOS=$(usex geos ON OFF)"
+ "-DWITH_GDAL=$(usex gdal ON OFF)"
+ "-DWITH_OGR=$(usex gdal ON OFF)"
+ "-DWITH_ORACLESPATIAL=$(usex oracle ON OFF)"
+ "-DWITH_POSTGIS=$(usex postgis ON OFF)"
+ "-DWITH_MYSQL=$(usex mysql ON OFF)"
+ "-DWITH_LIBXML2=$(usex xml ON OFF)"
+ "-DWITH_XMLMAPFILE=$(usex xslt ON OFF)"
+ "-DWITH_FRIBIDI=$(usex bidi ON OFF)"
+ "-DWITH_HARFBUZZ=$(usex bidi ON OFF)"
+ "-DWITH_CAIRO=$(usex cairo ON OFF)"
+ "-DWITH_PHP=$(usex php ON OFF)"
+ "-DWITH_PYTHON=$(usex python ON OFF)"
+ "-DWITH_PERL=$(usex perl ON OFF)"
+ )
+
+ if use gdal && use proj ; then
+ mycmakeargs+=( "-DWITH_WFS=ON"
+ "-DWITH_WCS=ON"
+ "-DWITH_CLIENT_WMS=ON"
+ "-DWITH_CLIENT_WFS=ON"
+ "-DWITH_SOS=$(usex xml ON OFF)"
+ )
+ else
+ mycmakeargs+=( "-DWITH_WFS=OFF"
+ "-DWITH_WCS=OFF"
+ "-DWITH_CLIENT_WMS=OFF"
+ "-DWITH_CLIENT_WFS=OFF"
+ "-DWITH_SOS=OFF"
+ )
+ fi
+
+ if use php ; then
+ local slot
+ for slot in $(php_get_slots); do
+ local php_config="${EPREFIX}/usr/$(get_libdir)/${slot}/bin/php-config"
+ [[ -x ${php_config} ]] \
+ || die "php-config '${php_config}' not valid or not executable"
+
+ local php_include_dir=$(${php_config} --include-dir)
+ [[ -d ${php_include_dir} ]] || die "PHP Include dir not found or not valid"
+
+ mycmakeargs+=(
+ -DPHP5_CONFIG_EXECUTABLE="${php_config}"
+ -DPHP5_INCLUDES="${php_include_dir}"
+ )
+ done
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_install() {
+ if use apache ; then
+ webapp_src_preinst
+ fi
+
+ cmake-utils_src_install
+
+ if use php ; then
+ php-ext-source-r3_createinifiles
+ fi
+
+ if use apache ; then
+ webapp_src_install
+ fi
+}
+
+pkg_postinst() {
+ if use apache ; then
+ webapp_pkg_postinst
+ fi
+}
+
+pkg_prerm() {
+ if use apache ; then
+ webapp_pkg_prerm
+ fi
+}
diff --git a/sci-geosciences/mapserver/metadata.xml b/sci-geosciences/mapserver/metadata.xml
index c7d7490388e..bc9652c1add 100644
--- a/sci-geosciences/mapserver/metadata.xml
+++ b/sci-geosciences/mapserver/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Geosciences Project</name>
</maintainer>
<use>
+ <flag name="apache">Enable mapserver to run under apache</flag>
<flag name="gdal">Enable <pkg>sci-libs/gdal</pkg> library support</flag>
<flag name="geos">Enable <pkg>sci-libs/geos</pkg> library support</flag>
<flag name="postgis">Enable <pkg>dev-db/postgis</pkg> support</flag>
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapserver/, sci-geosciences/mapserver/files/
@ 2020-02-13 21:28 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2020-02-13 21:28 UTC (permalink / raw
To: gentoo-commits
commit: 2a8a7487de3a98d0793fe2cfda0492e91ce9ef2b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 12 23:29:23 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 13 21:20:23 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a8a7487
sci-geosciences/mapserver: Drop 7.0.5 and 7.0.7
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-geosciences/mapserver/Manifest | 2 -
.../files/mapserver-7.0.0-sec-format.patch | 13 --
.../files/mapserver-7.0.5-missing-macro.patch | 21 --
.../files/mapserver-7.0.7-missing-macro.patch | 19 --
sci-geosciences/mapserver/mapserver-7.0.5.ebuild | 194 ------------------
sci-geosciences/mapserver/mapserver-7.0.7.ebuild | 217 ---------------------
6 files changed, 466 deletions(-)
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 55e7e461d6e..15ab00e5aff 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,3 +1 @@
-DIST mapserver-7.0.5.tar.gz 2631454 BLAKE2B 88467d7d8ae90be73d6629619410f114081588d214eea3cd1752f0f97a5d934aa8e39bc2ce6a59ab969a4ac5eb2df15b60bd78f34c18356befb490a211de830f SHA512 18485ace6e3b198e19acc3dda2ba44b136c55c4a783e472cb4c8f7a0615ed676b9bcdcaedc348227a7929d0ccf6199c90aead572bf8243e7902a5a2051a20753
-DIST mapserver-7.0.7.tar.gz 2634698 BLAKE2B fadde68803d7f74b116aa23c05c25f9c52c67e0a8ea69eace2c865843d7f223c24d8c42cbed54578f2eb631cb58bae3652075872f76e9b88238d76e044d4314b SHA512 94225dbe64edf6623bb5e92649d505809f70f86c24ca06675f6277ac4a161c40c369fd1973db649e6c864fa5e2e4a8a93cbd36d1524297a0e47b96ab59c0941c
DIST mapserver-7.2.2.tar.gz 2677800 BLAKE2B 3f26517f634098fd7f005aa5a1f71fc8ba9b831b9bd0385a64272db6705ad3bd7563848bea1532c08f28177c51b104b1185fe6aa319de8c4ed95ec649a1bf7f4 SHA512 8c66a52ec04741495e0cf2bf5ec28f8e3cafac9834ab314ef998d6cf8d50b893dcc66a05d4b30f29694c357cd175a1cb28712c94bf15da4c8bcb9bfd98f0d2af
diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-sec-format.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-sec-format.patch
deleted file mode 100644
index 17016c66e67..00000000000
--- a/sci-geosciences/mapserver/files/mapserver-7.0.0-sec-format.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/apache/mod_mapserver.c b/apache/mod_mapserver.c
-index 7949ddf..c8dbde6 100644
---- a/apache/mod_mapserver.c
-+++ b/apache/mod_mapserver.c
-@@ -40,7 +40,7 @@ static int
- msIO_apacheError (void *cbData, void *data, int byteCount)
- {
- /* error reporting is done through the log file... */
-- ap_log_error (APLOG_MARK, APLOG_ERR, 0, NULL, (char*) data);
-+ ap_log_error (APLOG_MARK, APLOG_ERR, 0, NULL, "%s", (char*) data);
- return strlen ((char*) data);
- }
-
diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.5-missing-macro.patch b/sci-geosciences/mapserver/files/mapserver-7.0.5-missing-macro.patch
deleted file mode 100644
index ee8da6ca1fe..00000000000
--- a/sci-geosciences/mapserver/files/mapserver-7.0.5-missing-macro.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 7e4be3d354053bca65838c2c481a61d4d5c24a3b
-Author: Ettore Di Giacinto <mudler@gentoo.org>
-Date: Tue May 23 20:12:20 2017 +0200
-
- Fix mapserver to build when TRUE macro is not defined
-
-diff --git a/mapserver.h b/mapserver.h
-index 32182fa0..19b1075c 100644
---- a/mapserver.h
-+++ b/mapserver.h
-@@ -78,6 +78,10 @@
- #include <stdint.h>
- #endif
-
-+#ifndef TRUE
-+#define TRUE 1
-+#endif
-+
- #ifdef _WIN32
- #ifndef SIZE_MAX
- #ifdef _WIN64
diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.7-missing-macro.patch b/sci-geosciences/mapserver/files/mapserver-7.0.7-missing-macro.patch
deleted file mode 100644
index daf5ab1ebc7..00000000000
--- a/sci-geosciences/mapserver/files/mapserver-7.0.7-missing-macro.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/mapserver.h b/mapserver.h
-index df7eeb9..9516a6c 100644
---- a/mapserver.h
-+++ b/mapserver.h
-@@ -55,6 +55,14 @@
- #include <unistd.h>
- #endif
-
-+#ifndef TRUE
-+#define TRUE 1
-+#endif
-+
-+#ifndef FALSE
-+#define FALSE 0
-+#endif
-+
- #if defined(_WIN32) && !defined(__CYGWIN__)
- # define MS_DLL_EXPORT __declspec(dllexport)
- #define USE_MSFREE
diff --git a/sci-geosciences/mapserver/mapserver-7.0.5.ebuild b/sci-geosciences/mapserver/mapserver-7.0.5.ebuild
deleted file mode 100644
index e0d969774e1..00000000000
--- a/sci-geosciences/mapserver/mapserver-7.0.5.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-${PV/_/-}"
-
-PHP_EXT_OPTIONAL_USE="php"
-PHP_EXT_NAME="php_mapscript"
-PHP_EXT_S="${WORKDIR}/${MY_P}/mapscript/php/"
-PHP_EXT_SKIP_PHPIZE="no"
-USE_PHP="php5-6"
-
-PYTHON_COMPAT=( python2_7 )
-
-#USE_RUBY="ruby18 ruby19"
-#RUBY_OPTIONAL="yes"
-
-WEBAPP_MANUAL_SLOT=yes
-
-inherit eutils depend.apache webapp distutils-r1 flag-o-matic perl-module php-ext-source-r3 multilib cmake-utils # ruby-ng
-
-DESCRIPTION="Development environment for building spatially enabled webapps"
-HOMEPAGE="https://mapserver.org/"
-SRC_URI="https://download.osgeo.org/mapserver/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="bidi cairo gdal geos mysql opengl perl php postgis proj python threads tiff xml xslt" # ruby php tcl
-
-REQUIRED_USE="
- php? ( php_targets_php5-6 )
- xslt? ( xml )"
-
-RDEPEND="
- dev-libs/expat
- dev-libs/fcgi
- >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib]
- media-libs/giflib
- net-misc/curl
- virtual/jpeg:=
- virtual/libiconv
- x11-libs/agg
- bidi? ( dev-libs/fribidi
- media-libs/harfbuzz )
- cairo? ( x11-libs/cairo )
- gdal? ( >=sci-libs/gdal-1.8.0 )
- geos? ( sci-libs/geos )
- mysql? ( virtual/mysql )
- opengl? (
- media-libs/ftgl
- media-libs/mesa[X(+)]
- )
- perl? ( dev-lang/perl:= )
- postgis? ( dev-db/postgis )
- proj? ( sci-libs/proj net-misc/curl )
- tiff? (
- media-libs/tiff:=
- sci-libs/libgeotiff
- )
- xml? ( dev-libs/libxml2:2 )
- xslt? ( dev-libs/libxslt[crypt] )
-"
-DEPEND="${RDEPEND}
- perl? ( >=dev-lang/swig-2.0 )
- python? ( >=dev-lang/swig-2.0 )"
-
-need_apache2
-
-PATCHES=(
- "${FILESDIR}/${PN}-7.0.0-sec-format.patch" # see https://github.com/mapserver/mapserver/pull/5248
- "${FILESDIR}/${PN}-7.0.0-no-applicable-code.patch"
- "${FILESDIR}/${P}-missing-macro.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- webapp_pkg_setup
- use perl && perl_set_version
- #use ruby && ruby-ng_pkg_setup
-}
-
-src_unpack() {
- default
- # HACK: Make symlinks for php targets
- local slot
- for slot in $(php_get_slots); do
- ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die
- done
-}
-
-src_prepare() {
- local glibdir="${EPREFIX}/usr/include/glib-2.0"
- local usrglibdir="${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
-
- sed -e "s:^include_directories(:&${glibdir})\ninclude_directories(:" \
- -i "${S}/CMakeLists.txt" || die
- sed -e "s:include_directories(:&${usrglibdir})\ninclude_directories(:" \
- -i "${S}/CMakeLists.txt" || die
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- "-DCMAKE_SKIP_RPATH=ON"
- "-DWITH_ORACLESPATIAL=OFF"
- "-DWITH_SDE=OFF"
- "-DWITH_APACHE_MODULE=ON"
- "-DWITH_ICONV=ON"
- "-DWITH_GD=ON"
- "-DWITH_GIF=ON"
- "-DWITH_CURL=ON"
- "-DWITH_FCGI=ON"
- "-DINSTALL_LIB_DIR=${ROOT}usr/$(get_libdir)"
- "-DWITH_PROJ=$(usex proj ON OFF)"
- "-DWITH_WMS=$(usex proj ON OFF)"
- "-DWITH_KML=$(usex xml ON OFF)"
- "-DWITH_GEOS=$(usex geos ON OFF)"
- "-DWITH_GDAL=$(usex gdal ON OFF)"
- "-DWITH_OGR=$(usex gdal ON OFF)"
- "-DWITH_POSTGIS=$(usex postgis ON OFF)"
- "-DWITH_MYSQL=$(usex mysql ON OFF)"
- "-DWITH_LIBXML2=$(usex xml ON OFF)"
- "-DWITH_XMLMAPFILE=$(usex xslt ON OFF)"
- "-DWITH_FRIBIDI=$(usex bidi ON OFF)"
- "-DWITH_HARFBUZZ=$(usex bidi ON OFF)"
- "-DWITH_CAIRO=$(usex cairo ON OFF)"
- "-DWITH_PHP=$(usex php ON OFF)"
- "-DWITH_PYTHON=$(usex python ON OFF)"
- "-DWITH_PERL=$(usex perl ON OFF)"
- )
-
- if use gdal && use proj ; then
- mycmakeargs+=( "-DWITH_WFS=ON"
- "-DWITH_WCS=ON"
- "-DWITH_CLIENT_WMS=ON"
- "-DWITH_CLIENT_WFS=ON"
- "-DWITH_SOS=$(usex xml ON OFF)"
- )
- else
- mycmakeargs+=( "-DWITH_WFS=OFF"
- "-DWITH_WCS=OFF"
- "-DWITH_CLIENT_WMS=OFF"
- "-DWITH_CLIENT_WFS=OFF"
- "-DWITH_SOS=OFF"
- )
- fi
-
- if use php ; then
- local slot
- for slot in $(php_get_slots); do
- local php_config="${EPREFIX}/usr/$(get_libdir)/${slot}/bin/php-config"
- [[ -x ${php_config} ]] \
- || die "php-config '${php_config}' not valid or not executable"
-
- local php_include_dir=$(${php_config} --include-dir)
- [[ -d ${php_include_dir} ]] || die "PHP Include dir not found or not valid"
-
- mycmakeargs+=(
- -DPHP5_CONFIG_EXECUTABLE="${php_config}"
- -DPHP5_INCLUDES="${php_include_dir}"
- )
- done
- fi
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use php ; then
- php-ext-source-r3_createinifiles
- fi
- webapp_src_preinst
- exeinto "${MY_CGIBINDIR}"
- doexe "${S}_build/mapserv"
- webapp_src_install
-}
-
-pkg_postinst() {
- webapp_pkg_postinst
-}
-
-pkg_prerm() {
- webapp_pkg_prerm
-}
diff --git a/sci-geosciences/mapserver/mapserver-7.0.7.ebuild b/sci-geosciences/mapserver/mapserver-7.0.7.ebuild
deleted file mode 100644
index 27ff52df21b..00000000000
--- a/sci-geosciences/mapserver/mapserver-7.0.7.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-${PV/_/-}"
-
-PHP_EXT_OPTIONAL_USE="php"
-PHP_EXT_NAME="php_mapscript"
-PHP_EXT_S="${WORKDIR}/${MY_P}/mapscript/php/"
-PHP_EXT_SKIP_PHPIZE="no"
-USE_PHP="php5-6"
-
-PYTHON_COMPAT=( python2_7 )
-
-#USE_RUBY="ruby18 ruby19"
-#RUBY_OPTIONAL="yes"
-
-WEBAPP_MANUAL_SLOT=yes
-WEBAPP_OPTIONAL=yes
-
-inherit cmake-utils depend.apache distutils-r1 eutils flag-o-matic multilib perl-module php-ext-source-r3 webapp # ruby-ng
-
-DESCRIPTION="Development environment for building spatially enabled webapps"
-HOMEPAGE="https://mapserver.org/"
-SRC_URI="https://download.osgeo.org/mapserver/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="apache bidi cairo gdal geos mysql opengl oracle perl php postgis proj python threads tiff xml xslt" # ruby php tcl
-
-REQUIRED_USE="
- php? ( php_targets_php5-6 )
- xslt? ( xml )"
-
-RDEPEND="
- dev-libs/expat
- >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib]
- media-libs/giflib
- net-misc/curl
- virtual/jpeg:=
- virtual/libiconv
- x11-libs/agg
- apache? (
- dev-libs/fcgi
- app-admin/webapp-config
- )
- bidi? ( dev-libs/fribidi
- media-libs/harfbuzz )
- cairo? ( x11-libs/cairo )
- gdal? ( sci-libs/gdal:=[oracle?] )
- geos? ( sci-libs/geos )
- mysql? ( virtual/mysql )
- opengl? (
- media-libs/ftgl
- media-libs/mesa[X(+)]
- )
- oracle? (
- dev-db/oracle-instantclient:=
- )
- perl? ( dev-lang/perl:= )
- postgis? ( dev-db/postgis )
- proj? ( sci-libs/proj net-misc/curl )
- tiff? (
- media-libs/tiff:=
- sci-libs/libgeotiff
- )
- xml? ( dev-libs/libxml2:2 )
- xslt? ( dev-libs/libxslt[crypt] )
-"
-DEPEND="${RDEPEND}
- perl? ( >=dev-lang/swig-2.0 )
- python? ( >=dev-lang/swig-2.0 )"
-
-want_apache2 apache
-
-PATCHES=(
- "${FILESDIR}/${PN}-7.0.0-sec-format.patch" # see https://github.com/mapserver/mapserver/pull/5248
- "${FILESDIR}/${PN}-7.0.0-no-applicable-code.patch"
- "${FILESDIR}/${PN}-7.0.0-missing-nzz18.patch"
- "${FILESDIR}/${P}-missing-macro.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- if use apache ; then
- webapp_pkg_setup
- fi
- use perl && perl_set_version
- #use ruby && ruby-ng_pkg_setup
-}
-
-src_unpack() {
- default
- # HACK: Make symlinks for php targets
- local slot
- for slot in $(php_get_slots); do
- ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die
- done
-}
-
-src_prepare() {
- local glibdir="${EPREFIX}/usr/include/glib-2.0"
- local usrglibdir="${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
-
- sed -e "s:^include_directories(:&${glibdir})\ninclude_directories(:" \
- -i "${S}/CMakeLists.txt" || die
- sed -e "s:include_directories(:&${usrglibdir})\ninclude_directories(:" \
- -i "${S}/CMakeLists.txt" || die
-
- # For enable compilation with proj-6
- if use proj ; then
- append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1
- fi
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- "-DCMAKE_SKIP_RPATH=ON"
- "-DWITH_SDE=OFF"
- "-DWITH_ICONV=ON"
- "-DWITH_GD=ON"
- "-DWITH_GIF=ON"
- "-DWITH_CURL=ON"
- "-DINSTALL_LIB_DIR=${ROOT}usr/$(get_libdir)"
- "-DWITH_APACHE_MODULE=$(usex apache ON OFF)"
- "-DWITH_PROJ=$(usex proj ON OFF)"
- "-DWITH_WMS=$(usex proj ON OFF)"
- "-DWITH_KML=$(usex xml ON OFF)"
- "-DWITH_FCGI=$(usex apache ON OFF)"
- "-DWITH_GEOS=$(usex geos ON OFF)"
- "-DWITH_GDAL=$(usex gdal ON OFF)"
- "-DWITH_OGR=$(usex gdal ON OFF)"
- "-DWITH_ORACLESPATIAL=$(usex oracle ON OFF)"
- "-DWITH_POSTGIS=$(usex postgis ON OFF)"
- "-DWITH_MYSQL=$(usex mysql ON OFF)"
- "-DWITH_LIBXML2=$(usex xml ON OFF)"
- "-DWITH_XMLMAPFILE=$(usex xslt ON OFF)"
- "-DWITH_FRIBIDI=$(usex bidi ON OFF)"
- "-DWITH_HARFBUZZ=$(usex bidi ON OFF)"
- "-DWITH_CAIRO=$(usex cairo ON OFF)"
- "-DWITH_PHP=$(usex php ON OFF)"
- "-DWITH_PYTHON=$(usex python ON OFF)"
- "-DWITH_PERL=$(usex perl ON OFF)"
- )
-
- if use gdal && use proj ; then
- mycmakeargs+=( "-DWITH_WFS=ON"
- "-DWITH_WCS=ON"
- "-DWITH_CLIENT_WMS=ON"
- "-DWITH_CLIENT_WFS=ON"
- "-DWITH_SOS=$(usex xml ON OFF)"
- )
- else
- mycmakeargs+=( "-DWITH_WFS=OFF"
- "-DWITH_WCS=OFF"
- "-DWITH_CLIENT_WMS=OFF"
- "-DWITH_CLIENT_WFS=OFF"
- "-DWITH_SOS=OFF"
- )
- fi
-
- if use php ; then
- local slot
- for slot in $(php_get_slots); do
- local php_config="${EPREFIX}/usr/$(get_libdir)/${slot}/bin/php-config"
- [[ -x ${php_config} ]] \
- || die "php-config '${php_config}' not valid or not executable"
-
- local php_include_dir=$(${php_config} --include-dir)
- [[ -d ${php_include_dir} ]] || die "PHP Include dir not found or not valid"
-
- mycmakeargs+=(
- -DPHP5_CONFIG_EXECUTABLE="${php_config}"
- -DPHP5_INCLUDES="${php_include_dir}"
- )
- done
- fi
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-src_install() {
- if use apache ; then
- webapp_src_preinst
- fi
-
- cmake-utils_src_install
-
- if use php ; then
- php-ext-source-r3_createinifiles
- fi
-
- if use apache ; then
- webapp_src_install
- fi
-}
-
-pkg_postinst() {
- if use apache ; then
- webapp_pkg_postinst
- fi
-}
-
-pkg_prerm() {
- if use apache ; then
- webapp_pkg_prerm
- fi
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapserver/, sci-geosciences/mapserver/files/
@ 2020-07-12 23:07 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2020-07-12 23:07 UTC (permalink / raw
To: gentoo-commits
commit: 1a978c51583a22031f007f5c5d22719b0360e9f4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 12 19:27:51 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 12 23:07:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a978c51
sci-geosciences/mapserver: Drop 7.2.2
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-geosciences/mapserver/Manifest | 1 -
.../files/mapserver-7.0.0-missing-nzz18.patch | 13 --
.../files/mapserver-7.0.0-no-applicable-code.patch | 34 ----
sci-geosciences/mapserver/mapserver-7.2.2.ebuild | 220 ---------------------
sci-geosciences/mapserver/metadata.xml | 3 -
5 files changed, 271 deletions(-)
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index a8b03ed7f07..0eb1e410b4a 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,2 +1 @@
-DIST mapserver-7.2.2.tar.gz 2677800 BLAKE2B 3f26517f634098fd7f005aa5a1f71fc8ba9b831b9bd0385a64272db6705ad3bd7563848bea1532c08f28177c51b104b1185fe6aa319de8c4ed95ec649a1bf7f4 SHA512 8c66a52ec04741495e0cf2bf5ec28f8e3cafac9834ab314ef998d6cf8d50b893dcc66a05d4b30f29694c357cd175a1cb28712c94bf15da4c8bcb9bfd98f0d2af
DIST mapserver-7.6.0.tar.gz 2713965 BLAKE2B 35e81b470afba58b1cf8cc63f70e6cc230a338c4066d38e8aa57d34a55e7414e9e3eeb6cc9c6d54ac8f60d076b90d25e23354f33f35c235d3d1d85d4f19979e7 SHA512 6e8a4639a025d3bdeaa74599ea10b58fbd20fc87367d39ccc9c29586a599d47ee4c45f6fe16dc76d593b3d7c51e26f8ca9d8656c5c3a3636181824d3aa26db36
diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-missing-nzz18.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-missing-nzz18.patch
deleted file mode 100644
index a22fcf4de6a..00000000000
--- a/sci-geosciences/mapserver/files/mapserver-7.0.0-missing-nzz18.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/FindOracle.cmake b/cmake/FindOracle.cmake
-index 18055f7..2568b5e 100644
---- a/cmake/FindOracle.cmake
-+++ b/cmake/FindOracle.cmake
-@@ -37,7 +37,7 @@ if(DEFINED ENV{ORACLE_HOME})
- ${ORACLE_HOME}/OCI/include) # Oracle XE on Windows
-
- set(ORACLE_OCI_NAMES clntsh libclntsh oci)
-- set(ORACLE_NNZ_NAMES nnz10 libnnz10 nnz11 libnnz11 nnz12 libnnz12 ociw32)
-+ set(ORACLE_NNZ_NAMES nnz10 libnnz10 nnz11 libnnz11 nnz12 libnnz12 nnz18 libnnz18 ociw32)
- set(ORACLE_OCCI_NAMES libocci occi oraocci10 oraocci11 oraocci12)
-
- set(ORACLE_LIB_DIR
diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-no-applicable-code.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-no-applicable-code.patch
deleted file mode 100644
index f438bec9f12..00000000000
--- a/sci-geosciences/mapserver/files/mapserver-7.0.0-no-applicable-code.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/mapwfs11.c b/mapwfs11.c
-index 20ab164..4dc15fc 100755
---- a/mapwfs11.c
-+++ b/mapwfs11.c
-@@ -29,12 +29,12 @@
-
- #include "mapserver.h"
- #include "mapows.h"
-+#include "mapowscommon.h"
-
-
-
- #if defined(USE_WFS_SVR) && defined(USE_LIBXML2)
- #include "maplibxml2.h"
--#include "mapowscommon.h"
- #include "mapogcfilter.h"
-
- /************************************************************************/
-diff --git a/mapwfs20.c b/mapwfs20.c
-index 710d444..cf69ee3 100755
---- a/mapwfs20.c
-+++ b/mapwfs20.c
-@@ -29,10 +29,10 @@
-
- #include "mapserver.h"
- #include "mapows.h"
-+#include "mapowscommon.h"
-
- #if defined(USE_WFS_SVR) && defined(USE_LIBXML2)
- #include "maplibxml2.h"
--#include "mapowscommon.h"
- #include "mapogcfilter.h"
-
- #define MS_OWS_11_NAMESPACE_PREFIX MS_OWSCOMMON_OWS_NAMESPACE_PREFIX
diff --git a/sci-geosciences/mapserver/mapserver-7.2.2.ebuild b/sci-geosciences/mapserver/mapserver-7.2.2.ebuild
deleted file mode 100644
index 7d9720fe06c..00000000000
--- a/sci-geosciences/mapserver/mapserver-7.2.2.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-${PV/_/-}"
-
-PHP_EXT_OPTIONAL_USE="php"
-PHP_EXT_NAME="php_mapscript"
-PHP_EXT_S="${WORKDIR}/${MY_P}/mapscript/php/"
-PHP_EXT_SKIP_PHPIZE="no"
-USE_PHP="php5-6"
-
-PYTHON_COMPAT=( python2_7 )
-
-#USE_RUBY="ruby18 ruby19"
-#RUBY_OPTIONAL="yes"
-
-WEBAPP_MANUAL_SLOT=yes
-WEBAPP_OPTIONAL=yes
-
-inherit cmake-utils depend.apache distutils-r1 eutils flag-o-matic multilib perl-module php-ext-source-r3 webapp # ruby-ng
-
-DESCRIPTION="Development environment for building spatially enabled webapps"
-HOMEPAGE="https://mapserver.org/"
-SRC_URI="https://download.osgeo.org/mapserver/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-# force default gdal and proj if not cause compilation problem
-IUSE="apache bidi cairo +gdal geos mysql opengl oracle perl php postgis +proj python threads tiff xml xslt" # ruby php tcl
-
-REQUIRED_USE="
- php? ( php_targets_php5-6 )
- xslt? ( xml )"
-
-RDEPEND="
- dev-libs/expat
- >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib]
- media-libs/giflib
- net-misc/curl
- virtual/jpeg:=
- virtual/libiconv
- x11-libs/agg
- apache? (
- dev-libs/fcgi
- app-admin/webapp-config
- )
- bidi? ( dev-libs/fribidi
- media-libs/harfbuzz )
- cairo? ( x11-libs/cairo )
- gdal? (
- sci-libs/gdal:=[oracle?]
- dev-libs/protobuf-c
- )
- geos? ( sci-libs/geos )
- mysql? ( virtual/mysql )
- opengl? (
- media-libs/ftgl
- media-libs/mesa[X(+)]
- )
- oracle? (
- dev-db/oracle-instantclient:=
- )
- perl? ( dev-lang/perl:= )
- postgis? ( dev-db/postgis )
- proj? ( sci-libs/proj net-misc/curl )
- tiff? (
- media-libs/tiff:=
- sci-libs/libgeotiff
- )
- xml? ( dev-libs/libxml2:2 )
- xslt? ( dev-libs/libxslt[crypt] )
-"
-DEPEND="${RDEPEND}
- perl? ( >=dev-lang/swig-2.0 )
- python? ( >=dev-lang/swig-2.0 )"
-
-want_apache2 apache
-
-PATCHES=(
- "${FILESDIR}/${PN}-7.0.0-no-applicable-code.patch"
- "${FILESDIR}/${PN}-7.0.0-missing-nzz18.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- if use apache ; then
- webapp_pkg_setup
- fi
- use perl && perl_set_version
- #use ruby && ruby-ng_pkg_setup
-}
-
-src_unpack() {
- default
- # HACK: Make symlinks for php targets
- local slot
- for slot in $(php_get_slots); do
- ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die
- done
-}
-
-src_prepare() {
- local glibdir="${EPREFIX}/usr/include/glib-2.0"
- local usrglibdir="${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
-
- sed -e "s:^include_directories(:&${glibdir})\ninclude_directories(:" \
- -i "${S}/CMakeLists.txt" || die
- sed -e "s:include_directories(:&${usrglibdir})\ninclude_directories(:" \
- -i "${S}/CMakeLists.txt" || die
-
- # For enable compilation with proj-6
- if use proj ; then
- append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1
- fi
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- "-DCMAKE_SKIP_RPATH=ON"
- "-DWITH_SDE=OFF"
- "-DWITH_ICONV=ON"
- "-DWITH_GD=ON"
- "-DWITH_GIF=ON"
- "-DWITH_CURL=ON"
- "-DINSTALL_LIB_DIR=${ROOT}usr/$(get_libdir)"
- "-DWITH_APACHE_MODULE=$(usex apache ON OFF)"
- "-DWITH_PROJ=$(usex proj ON OFF)"
- "-DWITH_WMS=$(usex proj ON OFF)"
- "-DWITH_KML=$(usex xml ON OFF)"
- "-DWITH_FCGI=$(usex apache ON OFF)"
- "-DWITH_GEOS=$(usex geos ON OFF)"
- "-DWITH_GDAL=$(usex gdal ON OFF)"
- "-DWITH_OGR=$(usex gdal ON OFF)"
- "-DWITH_ORACLESPATIAL=$(usex oracle ON OFF)"
- "-DWITH_POSTGIS=$(usex postgis ON OFF)"
- "-DWITH_MYSQL=$(usex mysql ON OFF)"
- "-DWITH_LIBXML2=$(usex xml ON OFF)"
- "-DWITH_XMLMAPFILE=$(usex xslt ON OFF)"
- "-DWITH_FRIBIDI=$(usex bidi ON OFF)"
- "-DWITH_HARFBUZZ=$(usex bidi ON OFF)"
- "-DWITH_CAIRO=$(usex cairo ON OFF)"
- "-DWITH_PHP=$(usex php ON OFF)"
- "-DWITH_PYTHON=$(usex python ON OFF)"
- "-DWITH_PERL=$(usex perl ON OFF)"
- "-DWITH_PROTOBUFC=$(usex gdal ON OFF)"
- )
-
- if use gdal && use proj ; then
- mycmakeargs+=( "-DWITH_WFS=ON"
- "-DWITH_WCS=ON"
- "-DWITH_CLIENT_WMS=ON"
- "-DWITH_CLIENT_WFS=ON"
- "-DWITH_SOS=$(usex xml ON OFF)"
- )
- else
- mycmakeargs+=( "-DWITH_WFS=OFF"
- "-DWITH_WCS=OFF"
- "-DWITH_CLIENT_WMS=OFF"
- "-DWITH_CLIENT_WFS=OFF"
- "-DWITH_SOS=OFF"
- )
- fi
-
- if use php ; then
- local slot
- for slot in $(php_get_slots); do
- local php_config="${EPREFIX}/usr/$(get_libdir)/${slot}/bin/php-config"
- [[ -x ${php_config} ]] \
- || die "php-config '${php_config}' not valid or not executable"
-
- local php_include_dir=$(${php_config} --include-dir)
- [[ -d ${php_include_dir} ]] || die "PHP Include dir not found or not valid"
-
- mycmakeargs+=(
- -DPHP5_CONFIG_EXECUTABLE="${php_config}"
- -DPHP5_INCLUDES="${php_include_dir}"
- )
- done
- fi
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-src_install() {
- if use apache ; then
- webapp_src_preinst
- fi
-
- cmake-utils_src_install
-
- if use php ; then
- php-ext-source-r3_createinifiles
- fi
-
- if use apache ; then
- webapp_src_install
- fi
-}
-
-pkg_postinst() {
- if use apache ; then
- webapp_pkg_postinst
- fi
-}
-
-pkg_prerm() {
- if use apache ; then
- webapp_pkg_prerm
- fi
-}
diff --git a/sci-geosciences/mapserver/metadata.xml b/sci-geosciences/mapserver/metadata.xml
index fbe0a42676c..5844269c69d 100644
--- a/sci-geosciences/mapserver/metadata.xml
+++ b/sci-geosciences/mapserver/metadata.xml
@@ -7,10 +7,7 @@
</maintainer>
<use>
<flag name="apache">Enable mapserver to run under apache</flag>
- <flag name="gdal" restrict="<=sci-geosciences/mapserver-7.6.0">Enable <pkg>sci-libs/gdal</pkg> library support; deprecated</flag>
<flag name="geos">Enable <pkg>sci-libs/geos</pkg> library support</flag>
<flag name="postgis">Enable <pkg>dev-db/postgis</pkg> support</flag>
- <flag name="proj" restrict="<=sci-geosciences/mapserver-7.6.0">Enable <pkg>sci-libs/proj</pkg> library support (geographic projections); deprecated</flag>
- <flag name="xslt" restrict="<=sci-geosciences/mapserver-7.6.0">Enable xslt and exslt support xml-mapfile support; deprecated</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapserver/, sci-geosciences/mapserver/files/
@ 2021-03-09 22:33 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2021-03-09 22:33 UTC (permalink / raw
To: gentoo-commits
commit: f2ae830cc5e16dc6079dbbaf546047a4a936f751
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 9 22:32:34 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 9 22:33:09 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2ae830c
sci-geosciences/mapserver: update EAPI 6 -> 7, proj 8 patch
* Port from EAPI 6 to 7 now that depend.apache supports it
* Add a simple PROJ 8 patch to detect its presence
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../mapserver/files/mapserver-7.6.2-proj8.patch | 19 ++++++++++++
sci-geosciences/mapserver/mapserver-7.6.2.ebuild | 36 +++++++++++-----------
2 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/sci-geosciences/mapserver/files/mapserver-7.6.2-proj8.patch b/sci-geosciences/mapserver/files/mapserver-7.6.2-proj8.patch
new file mode 100644
index 00000000000..24a5066c01c
--- /dev/null
+++ b/sci-geosciences/mapserver/files/mapserver-7.6.2-proj8.patch
@@ -0,0 +1,19 @@
+https://github.com/MapServer/MapServer/issues/6249
+
+From e56a020789c024f985c61e49d66f3eb92d350232 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Mon, 8 Mar 2021 15:19:50 +0100
+Subject: [PATCH] FindProj.cmake: allow finding PROJ 8 that has no longer
+ proj_api.h (fixes #6249)
+
+--- a/cmake/FindProj.cmake
++++ b/cmake/FindProj.cmake
+@@ -6,7 +6,7 @@
+ # PROJ_LIBRARY
+
+
+-FIND_PATH(PROJ_INCLUDE_DIR proj_api.h)
++FIND_PATH(PROJ_INCLUDE_DIR NAMES proj.h proj_api.h)
+
+ FIND_LIBRARY(PROJ_LIBRARY NAMES proj proj_i)
+
diff --git a/sci-geosciences/mapserver/mapserver-7.6.2.ebuild b/sci-geosciences/mapserver/mapserver-7.6.2.ebuild
index 1c0f539edc5..0e9c7aabc65 100644
--- a/sci-geosciences/mapserver/mapserver-7.6.2.ebuild
+++ b/sci-geosciences/mapserver/mapserver-7.6.2.ebuild
@@ -1,9 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# NOTE: We have to stick with EAPI 6 for now because of the
-# depend.apache eclass.
-EAPI=6
+EAPI=7
# Variables for the miscellaneous bindings we provide
PHP_EXT_OPTIONAL_USE="php"
@@ -16,8 +14,7 @@ PYTHON_COMPAT=( python3_{7,8,9} )
WEBAPP_MANUAL_SLOT=yes
WEBAPP_OPTIONAL=yes
-# NOTE: Similarly, we cannot go cmake-utils -> cmake until we're on EAPI 7
-inherit cmake-utils depend.apache eapi7-ver perl-functions php-ext-source-r3 python-r1 webapp
+inherit cmake depend.apache perl-functions php-ext-source-r3 python-r1 webapp
DESCRIPTION="Development environment for building spatially enabled webapps"
HOMEPAGE="https://mapserver.org/"
@@ -77,9 +74,8 @@ RDEPEND="
)
python? ( ${PYTHON_DEPS} )
"
-
-DEPEND="
- ${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
virtual/pkgconfig
perl? ( >=dev-lang/swig-4.0 )
php? ( >=dev-lang/swig-4.0 )
@@ -89,6 +85,10 @@ DEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}"/${P}-proj8.patch
+)
+
want_apache2 apache
pkg_setup() {
@@ -97,7 +97,7 @@ pkg_setup() {
}
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
use php && php-ext-source-r3_src_prepare
use python && python_copy_sources
@@ -163,7 +163,7 @@ src_configure() {
use perl && mycmakeargs+=( "-DCUSTOM_PERL_SITE_ARCH_DIR=$(perl_get_raw_vendorlib)" )
# Configure the standard build first
- cmake-utils_src_configure
+ cmake_src_configure
# Minimal build for bindings
# Note that we use _generate_cmake_args to get a clean config each time, then add
@@ -174,7 +174,7 @@ src_configure() {
"-DWITH_PYTHON=ON"
)
- python_foreach_impl cmake-utils_src_configure
+ python_foreach_impl cmake_src_configure
python_foreach_impl python_optimize
fi
@@ -193,7 +193,7 @@ src_configure() {
"-DPHP_INCLUDES=${PHPPREFIX}"
)
- BUILD_DIR="${S}/php${slot}" cmake-utils_src_configure
+ BUILD_DIR="${S}/php${slot}" cmake_src_configure
# Return to where we left off, in case we add more
# to this phase.
@@ -203,10 +203,10 @@ src_configure() {
}
src_compile() {
- cmake-utils_src_compile
+ cmake_src_compile
if use python ; then
- python_foreach_impl cmake-utils_src_compile
+ python_foreach_impl cmake_src_compile
fi
if use php ; then
@@ -216,7 +216,7 @@ src_compile() {
php_init_slot_env "${slot}"
# Force cmake to build in it
- BUILD_DIR="${S}/php${slot}" cmake-utils_src_compile
+ BUILD_DIR="${S}/php${slot}" cmake_src_compile
# Return to where we left off, in case we add more
# to this phase.
@@ -230,7 +230,7 @@ src_install() {
use apache && webapp_src_preinst
if use python ; then
- python_foreach_impl cmake-utils_src_install
+ python_foreach_impl cmake_src_install
python_foreach_impl python_optimize
fi
@@ -241,14 +241,14 @@ src_install() {
for slot in $(php_get_slots) ; do
php_init_slot_env "${slot}"
- BUILD_DIR="${S}/php${slot}" cmake-utils_src_install
+ BUILD_DIR="${S}/php${slot}" cmake_src_install
cd "${S}" || die
done
fi
# Install this last because this build is the most "fully-featured"
- cmake-utils_src_install
+ cmake_src_install
if use apache ; then
# We need a mapserver symlink available in cgi-bin
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapserver/, sci-geosciences/mapserver/files/
@ 2022-01-31 14:17 Andrew Ammerlaan
0 siblings, 0 replies; 9+ messages in thread
From: Andrew Ammerlaan @ 2022-01-31 14:17 UTC (permalink / raw
To: gentoo-commits
commit: 28e6a8e2f30713703d5658eec46216b9596a76ae
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 31 14:17:47 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Jan 31 14:17:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28e6a8e2
sci-geosciences/mapserver: cleanup old
Bug: https://bugs.gentoo.org/798129
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-geosciences/mapserver/Manifest | 1 -
.../mapserver/files/mapserver-7.6.2-proj8.patch | 19 --
.../mapserver/mapserver-7.6.2-r1.ebuild | 291 ---------------------
3 files changed, 311 deletions(-)
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 5464718b7562..f71ac13a5ac5 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,2 +1 @@
-DIST mapserver-7.6.2.tar.gz 2715806 BLAKE2B 230e4f52c526d72ac7f46cfe4ef8e547d7ae74c01d75637ad301d4e69b90d301f02ecb8fe7d838c9ee15c022ed7980aa2f9236e08a6daedafb65a2499a9473e5 SHA512 842c2cf891df6c8dc630fac5419caa31701d732a748264f7d5b6cceaf192fa420f1863fdd18cc791a417dcdc800fed5c3e5c43ac688142f32a1a6edda4c9f791
DIST mapserver-7.6.4.tar.gz 2718735 BLAKE2B 4d9fc6d215a55af32e0cc125f6119e0e477ddc5a5b2dbea6df1cc7e1ffaf6319f3a855329749aa07f1bca88e79a71c67cb2e8bd62e30bd60e44ecc1b8283d4ce SHA512 ccca87b650df3c1784ba82ca4a58960585d72fb4004fcea43c0dcabf03b9617ba51870bc63dbb2238a7eeb8d4337b6ff152587150912a74eeaf4a3e3d2d584ce
diff --git a/sci-geosciences/mapserver/files/mapserver-7.6.2-proj8.patch b/sci-geosciences/mapserver/files/mapserver-7.6.2-proj8.patch
deleted file mode 100644
index 24a5066c01c9..000000000000
--- a/sci-geosciences/mapserver/files/mapserver-7.6.2-proj8.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://github.com/MapServer/MapServer/issues/6249
-
-From e56a020789c024f985c61e49d66f3eb92d350232 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Mon, 8 Mar 2021 15:19:50 +0100
-Subject: [PATCH] FindProj.cmake: allow finding PROJ 8 that has no longer
- proj_api.h (fixes #6249)
-
---- a/cmake/FindProj.cmake
-+++ b/cmake/FindProj.cmake
-@@ -6,7 +6,7 @@
- # PROJ_LIBRARY
-
-
--FIND_PATH(PROJ_INCLUDE_DIR proj_api.h)
-+FIND_PATH(PROJ_INCLUDE_DIR NAMES proj.h proj_api.h)
-
- FIND_LIBRARY(PROJ_LIBRARY NAMES proj proj_i)
-
diff --git a/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild b/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild
deleted file mode 100644
index 412784bd8b54..000000000000
--- a/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Variables for the miscellaneous bindings we provide
-PHP_EXT_OPTIONAL_USE="php"
-PHP_EXT_NAME="php_mapscriptng"
-PHP_EXT_SKIP_PHPIZE="yes"
-PHP_EXT_SKIP_PATCHES="yes"
-
-USE_PHP="php7-3 php7-4"
-PYTHON_COMPAT=( python3_{8..10} )
-
-WEBAPP_MANUAL_SLOT=yes
-WEBAPP_OPTIONAL=yes
-
-inherit cmake depend.apache perl-functions php-ext-source-r3 python-r1 webapp
-
-DESCRIPTION="Development environment for building spatially enabled webapps"
-HOMEPAGE="https://mapserver.org/"
-SRC_URI="https://download.osgeo.org/mapserver/${P}.tar.gz"
-
-LICENSE="Boost-1.0 BSD BSD-2 ISC MIT tcltk"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-# NOTE: opengl removed for now as no support for it in upstream CMake
-IUSE="apache bidi cairo geos mysql oracle perl php postgis python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Tests:
-# Included tests (tests/*) are seriously outdated
-# Upstream's main test suite (msautotest/*) is not in the release tarball,
-# and upstream sets 'export-ignore' for that directory.
-#
-# The eclasses used normally try to run test suites themselves,
-# or skip if nothing was found.
-# However, because of the php-ext-* eclass usage, this fails and would
-# cause errors running non-existent tests, so we have to restrict here.
-RESTRICT="test"
-
-RDEPEND="
- >=dev-libs/expat-2.2.8
- dev-libs/libxml2:2=
- dev-libs/libxslt[crypt]
- >=dev-libs/protobuf-c-1.3.2:=
- >=media-libs/freetype-2.9.1-r3
- >=media-libs/gd-2.0.12:=[truetype,jpeg,png,zlib]
- >=media-libs/giflib-5.2.1:=
- >=media-libs/libpng-1.6.37:=
- >=net-misc/curl-7.69.1
- >=sci-libs/gdal-3.0.4:=[oracle?]
- >=sci-libs/proj-6.2.1:=
- virtual/jpeg
- virtual/libiconv
- >=x11-libs/agg-2.5-r3
- apache? (
- app-admin/webapp-config
- dev-libs/fcgi
- )
- bidi? (
- dev-libs/fribidi
- media-libs/harfbuzz:=
- )
- cairo? ( x11-libs/cairo )
- geos? ( sci-libs/geos )
- mysql? ( dev-db/mysql-connector-c:= )
- oracle? ( dev-db/oracle-instantclient:= )
- perl? ( dev-lang/perl:= )
- postgis? (
- dev-db/postgis
- dev-db/postgresql:=
- )
- python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
- perl? ( >=dev-lang/swig-4.0 )
- php? ( >=dev-lang/swig-4.0 )
- python? (
- >=dev-lang/swig-4.0
- >=dev-python/setuptools-44.1.0
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-proj8.patch
- "${FILESDIR}"/${PN}-oracle21.patch
-)
-
-want_apache2 apache
-
-pkg_setup() {
- use apache && webapp_pkg_setup
- use perl && perl_set_version
-}
-
-src_prepare() {
- cmake_src_prepare
-
- use php && php-ext-source-r3_src_prepare
- use python && python_copy_sources
-}
-
-_generate_cmake_args() {
- # Provides a simple, bare config for bindings to build upon
- # Need WITH_WMS=ON or build fails
- local args=(
- "-DCMAKE_SKIP_RPATH=ON"
- "-DINSTALL_LIB_DIR=/usr/$(get_libdir)"
- "-DWITH_CAIRO=OFF"
- "-DWITH_FCGI=OFF"
- "-DWITH_FRIBIDI=OFF"
- "-DWITH_GEOS=OFF"
- "-DWITH_GIF=OFF"
- "-DWITH_HARFBUZZ=OFF"
- "-DWITH_ICONV=OFF"
- "-DWITH_PROTOBUFC=OFF"
- "-DWITH_POSTGIS=OFF"
- "-DWITH_WMS=ON"
- "-DWITH_WCS=OFF"
- "-DWITH_WFS=OFF"
- )
-
- echo "${args[@]}"
-}
-
-src_configure() {
- # NOTE: We could make this based on _generate_cmake_args, but
- # then we wouldn't be as-explicit about what is enabled/not,
- # and reliant on defaults not changing.
- # Readability and maintainability is better this way.
- local mycmakeargs=(
- "-DCMAKE_SKIP_RPATH=ON"
- "-DINSTALL_LIB_DIR=/usr/$(get_libdir)"
- "-DWITH_CLIENT_WMS=ON"
- "-DWITH_CLIENT_WFS=ON"
- "-DWITH_CURL=ON"
- "-DWITH_GIF=ON"
- "-DWITH_ICONV=ON"
- "-DWITH_KML=ON"
- "-DWITH_LIBXML2=ON"
- "-DWITH_PHPNG=OFF"
- "-DWITH_PROTOBUFC=ON"
- "-DWITH_SOS=ON"
- "-DWITH_WMS=ON"
- "-DWITH_WFS=ON"
- "-DWITH_WCS=ON"
- "-DWITH_XMLMAPFILE=ON"
- "-DWITH_APACHE_MODULE=$(usex apache ON OFF)"
- "-DWITH_CAIRO=$(usex cairo ON OFF)"
- "-DWITH_FCGI=$(usex apache ON OFF)"
- "-DWITH_GEOS=$(usex geos ON OFF)"
- "-DWITH_ORACLESPATIAL=$(usex oracle ON OFF)"
- "-DWITH_MYSQL=$(usex mysql ON OFF)"
- "-DWITH_FRIBIDI=$(usex bidi ON OFF)"
- "-DWITH_HARFBUZZ=$(usex bidi ON OFF)"
- "-DWITH_POSTGIS=$(usex postgis ON OFF)"
- "-DWITH_PERL=$(usex perl ON OFF)"
- )
-
- use perl && mycmakeargs+=( "-DCUSTOM_PERL_SITE_ARCH_DIR=$(perl_get_raw_vendorlib)" )
-
- # Configure the standard build first
- cmake_src_configure
-
- # Minimal build for bindings
- # Note that we use _generate_cmake_args to get a clean config each time, then add
- # in options as appropriate. Otherwise we'd get contamination between bindings.
- if use python ; then
- mycmakeargs=(
- $(_generate_cmake_args)
- "-DWITH_PYTHON=ON"
- )
-
- python_foreach_impl cmake_src_configure
- python_foreach_impl python_optimize
- fi
-
- if use php ; then
- local slot=
- for slot in $(php_get_slots) ; do
- # Switch to the slot's build dir
- php_init_slot_env "${slot}"
-
- # Take a blank config each time
- # Add in only *this* slot's PHP includes dir, etc
- mycmakeargs=(
- $(_generate_cmake_args)
- "-DWITH_PHPNG=ON"
- "-DPHP_CONFIG_EXECUTABLE=${PHPCONFIG}"
- "-DPHP_INCLUDES=${PHPPREFIX}"
- )
-
- BUILD_DIR="${S}/php${slot}" cmake_src_configure
-
- # Return to where we left off, in case we add more
- # to this phase.
- cd "${S}" || die
- done
- fi
-}
-
-src_compile() {
- cmake_src_compile
-
- if use python ; then
- python_foreach_impl cmake_src_compile
- fi
-
- if use php ; then
- local slot=
- for slot in $(php_get_slots) ; do
- # Switch to the slot's build dir
- php_init_slot_env "${slot}"
-
- # Force cmake to build in it
- BUILD_DIR="${S}/php${slot}" cmake_src_compile
-
- # Return to where we left off, in case we add more
- # to this phase.
- cd "${S}" || die
- done
- fi
-}
-
-src_install() {
- # Needs to be first
- use apache && webapp_src_preinst
-
- if use python ; then
- python_foreach_impl cmake_src_install
- python_foreach_impl python_optimize
- fi
-
- if use php ; then
- php-ext-source-r3_createinifiles
-
- local slot=
- for slot in $(php_get_slots) ; do
- php_init_slot_env "${slot}"
-
- BUILD_DIR="${S}/php${slot}" cmake_src_install
-
- cd "${S}" || die
- done
- fi
-
- # Install this last because this build is the most "fully-featured"
- cmake_src_install
-
- if use apache ; then
- # We need a mapserver symlink available in cgi-bin
- dosym ../../../../../../../usr/bin/mapserv /usr/share/webapps/${PN}/${PV}/hostroot/cgi-bin/mapserv
- webapp_src_install
- fi
-}
-
-pkg_preinst() {
- # We need to cache the value here of HAD_PHP because we want the
- # original package version, not the result of us installing a new one
- HAD_PHP=
- has_version 'sci-geosciences/mapserver[php]' && HAD_PHP=1
-}
-
-pkg_postinst() {
- use apache && webapp_pkg_postinst
-
- # Let upgrading (from a pre-rewrite version) users know that the PHP module changed
- local replacing_version=
- for replacing_version in ${REPLACING_VERSIONS} ; do
- if ver_test "7.6.0" -gt "${replacing_version}" ; then
- if use php && [[ ${HAD_PHP} -eq 1 ]] ; then
- elog "Note that MapServer has deprecated the old PHP extension"
- elog "You can read more at: "
- elog "URL: https://mapserver.org/MIGRATION_GUIDE.html#mapserver-7-2-to-7-4-migration"
- elog "This may involve porting some of your PHP scripts to use the new module."
- fi
-
- # Only show the message once
- break
- fi
- done
-}
-
-pkg_prerm() {
- use apache && webapp_pkg_prerm
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapserver/, sci-geosciences/mapserver/files/
@ 2023-01-30 9:51 Andrew Ammerlaan
0 siblings, 0 replies; 9+ messages in thread
From: Andrew Ammerlaan @ 2023-01-30 9:51 UTC (permalink / raw
To: gentoo-commits
commit: 2b24ca5a9e9050d5346033478c6e58f15219f87d
Author: Marco Genasci <fedeliallalinea <AT> gmail <DOT> com>
AuthorDate: Mon Dec 5 08:26:16 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Jan 30 09:50:45 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b24ca5a
sci-geosciences/mapserver: version bump to 8.0.0
Signed-off-by: Marco Genasci <fedeliallalinea <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28544
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-geosciences/mapserver/Manifest | 1 +
.../files/mapserver-8.0.0-wfs-paging.patch | 12 +
sci-geosciences/mapserver/mapserver-8.0.0.ebuild | 291 +++++++++++++++++++++
3 files changed, 304 insertions(+)
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index f71ac13a5ac5..2306a474faa7 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1 +1,2 @@
DIST mapserver-7.6.4.tar.gz 2718735 BLAKE2B 4d9fc6d215a55af32e0cc125f6119e0e477ddc5a5b2dbea6df1cc7e1ffaf6319f3a855329749aa07f1bca88e79a71c67cb2e8bd62e30bd60e44ecc1b8283d4ce SHA512 ccca87b650df3c1784ba82ca4a58960585d72fb4004fcea43c0dcabf03b9617ba51870bc63dbb2238a7eeb8d4337b6ff152587150912a74eeaf4a3e3d2d584ce
+DIST mapserver-8.0.0.tar.gz 2945524 BLAKE2B b67fb10f62e3c8cf4ae6d69863ef841fd2dd4106de55fd08dfc8146191bed1f18f12003455462503afcdb49e45d1368d89be591c152dcabba2b18587d27efaef SHA512 b9275f5e3399efb3cb189472ed28d081055e79da9aa35f7c9b8567b2d2d3cfc425ea7750b36a40db9ab537261c099356dc923e7b91941919d79c38f740327b97
diff --git a/sci-geosciences/mapserver/files/mapserver-8.0.0-wfs-paging.patch b/sci-geosciences/mapserver/files/mapserver-8.0.0-wfs-paging.patch
new file mode 100644
index 000000000000..ff78c7f2372e
--- /dev/null
+++ b/sci-geosciences/mapserver/files/mapserver-8.0.0-wfs-paging.patch
@@ -0,0 +1,12 @@
+diff --git a/maporaclespatial.c b/maporaclespatial.c
+index e7a50319e..5558f0231 100644
+--- a/maporaclespatial.c
++++ b/maporaclespatial.c
+@@ -2086,6 +2086,7 @@ int msOracleSpatialLayerWhichShapes( layerObj *layer, rectObj rect, int isQuery)
+ msFree(tmp1_str);
+
+ tmp_str = msStringConcatenate(tmp_str, query_str2);
++ memset(query_str,0,strlen(query_str));
+ query_str = msStringConcatenate(query_str, tmp_str);
+ msFree(tmp_str);
+ }
diff --git a/sci-geosciences/mapserver/mapserver-8.0.0.ebuild b/sci-geosciences/mapserver/mapserver-8.0.0.ebuild
new file mode 100644
index 000000000000..fa0e3a656b30
--- /dev/null
+++ b/sci-geosciences/mapserver/mapserver-8.0.0.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Variables for the miscellaneous bindings we provide
+PHP_EXT_OPTIONAL_USE="php"
+PHP_EXT_NAME="php_mapscriptng"
+PHP_EXT_SKIP_PHPIZE="yes"
+PHP_EXT_SKIP_PATCHES="yes"
+
+USE_PHP="php7-4"
+PYTHON_COMPAT=( python3_{9..11} )
+
+WEBAPP_MANUAL_SLOT=yes
+WEBAPP_OPTIONAL=yes
+
+inherit cmake depend.apache perl-functions php-ext-source-r3 python-r1 webapp
+
+DESCRIPTION="Development environment for building spatially enabled webapps"
+HOMEPAGE="https://mapserver.org/"
+SRC_URI="https://download.osgeo.org/mapserver/${P}.tar.gz"
+
+LICENSE="Boost-1.0 BSD BSD-2 ISC MIT tcltk"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+# NOTE: opengl removed for now as no support for it in upstream CMake
+IUSE="apache bidi cairo geos mysql oracle perl php postgis python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Tests:
+# Included tests (tests/*) are seriously outdated
+# Upstream's main test suite (msautotest/*) is not in the release tarball,
+# and upstream sets 'export-ignore' for that directory.
+#
+# The eclasses used normally try to run test suites themselves,
+# or skip if nothing was found.
+# However, because of the php-ext-* eclass usage, this fails and would
+# cause errors running non-existent tests, so we have to restrict here.
+RESTRICT="test"
+
+RDEPEND="
+ >=dev-libs/expat-2.2.8
+ dev-libs/libxml2:2=
+ dev-libs/libxslt[crypt]
+ >=dev-libs/protobuf-c-1.3.2:=
+ >=media-libs/freetype-2.9.1-r3
+ >=media-libs/gd-2.0.12:=[truetype,jpeg,png,zlib]
+ >=media-libs/giflib-5.2.1:=
+ media-libs/libjpeg-turbo
+ >=media-libs/libpng-1.6.37:=
+ >=net-misc/curl-7.69.1
+ >=sci-libs/gdal-3.0.4:=[oracle?]
+ >=sci-libs/proj-6.2.1:=
+ virtual/libiconv
+ >=x11-libs/agg-2.5-r3
+ apache? (
+ app-admin/webapp-config
+ dev-libs/fcgi
+ )
+ bidi? (
+ dev-libs/fribidi
+ media-libs/harfbuzz:=
+ )
+ cairo? ( x11-libs/cairo )
+ geos? ( sci-libs/geos )
+ mysql? ( dev-db/mysql-connector-c:= )
+ oracle? ( dev-db/oracle-instantclient:= )
+ perl? ( dev-lang/perl:= )
+ postgis? (
+ dev-db/postgis
+ dev-db/postgresql:=
+ )
+ python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ perl? ( >=dev-lang/swig-4.0 )
+ php? ( >=dev-lang/swig-4.0 )
+ python? (
+ >=dev-lang/swig-4.0
+ >=dev-python/setuptools-44.1.0
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-wfs-paging.patch
+)
+
+want_apache2 apache
+
+pkg_setup() {
+ use apache && webapp_pkg_setup
+ use perl && perl_set_version
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ use php && php-ext-source-r3_src_prepare
+ use python && python_copy_sources
+}
+
+_generate_cmake_args() {
+ # Provides a simple, bare config for bindings to build upon
+ # Need WITH_WMS=ON or build fails
+ local args=(
+ "-DCMAKE_SKIP_RPATH=ON"
+ "-DINSTALL_LIB_DIR=/usr/$(get_libdir)"
+ "-DWITH_CAIRO=OFF"
+ "-DWITH_FCGI=OFF"
+ "-DWITH_FRIBIDI=OFF"
+ "-DWITH_GEOS=OFF"
+ "-DWITH_GIF=OFF"
+ "-DWITH_HARFBUZZ=OFF"
+ "-DWITH_ICONV=OFF"
+ "-DWITH_PROTOBUFC=OFF"
+ "-DWITH_POSTGIS=OFF"
+ "-DWITH_WMS=ON"
+ "-DWITH_WCS=OFF"
+ "-DWITH_WFS=OFF"
+ "-DWITH_OGCAPI=OFF"
+ )
+
+ echo "${args[@]}"
+}
+
+src_configure() {
+ # NOTE: We could make this based on _generate_cmake_args, but
+ # then we wouldn't be as-explicit about what is enabled/not,
+ # and reliant on defaults not changing.
+ # Readability and maintainability is better this way.
+ local mycmakeargs=(
+ "-DCMAKE_SKIP_RPATH=ON"
+ "-DINSTALL_LIB_DIR=/usr/$(get_libdir)"
+ "-DWITH_CLIENT_WMS=ON"
+ "-DWITH_CLIENT_WFS=ON"
+ "-DWITH_CURL=ON"
+ "-DWITH_GIF=ON"
+ "-DWITH_ICONV=ON"
+ "-DWITH_KML=ON"
+ "-DWITH_LIBXML2=ON"
+ "-DWITH_PHPNG=OFF"
+ "-DWITH_PROTOBUFC=ON"
+ "-DWITH_SOS=ON"
+ "-DWITH_WMS=ON"
+ "-DWITH_WFS=ON"
+ "-DWITH_WCS=ON"
+ "-DWITH_XMLMAPFILE=ON"
+ "-DWITH_APACHE_MODULE=$(usex apache ON OFF)"
+ "-DWITH_CAIRO=$(usex cairo ON OFF)"
+ "-DWITH_FCGI=$(usex apache ON OFF)"
+ "-DWITH_GEOS=$(usex geos ON OFF)"
+ "-DWITH_ORACLESPATIAL=$(usex oracle ON OFF)"
+ "-DWITH_MYSQL=$(usex mysql ON OFF)"
+ "-DWITH_FRIBIDI=$(usex bidi ON OFF)"
+ "-DWITH_HARFBUZZ=$(usex bidi ON OFF)"
+ "-DWITH_POSTGIS=$(usex postgis ON OFF)"
+ "-DWITH_PERL=$(usex perl ON OFF)"
+ )
+
+ use perl && mycmakeargs+=( "-DCUSTOM_PERL_SITE_ARCH_DIR=$(perl_get_raw_vendorlib)" )
+
+ # Configure the standard build first
+ cmake_src_configure
+
+ # Minimal build for bindings
+ # Note that we use _generate_cmake_args to get a clean config each time, then add
+ # in options as appropriate. Otherwise we'd get contamination between bindings.
+ if use python ; then
+ mycmakeargs=(
+ $(_generate_cmake_args)
+ "-DWITH_PYTHON=ON"
+ )
+
+ python_foreach_impl cmake_src_configure
+ python_foreach_impl python_optimize
+ fi
+
+ if use php ; then
+ local slot=
+ for slot in $(php_get_slots) ; do
+ # Switch to the slot's build dir
+ php_init_slot_env "${slot}"
+
+ # Take a blank config each time
+ # Add in only *this* slot's PHP includes dir, etc
+ mycmakeargs=(
+ $(_generate_cmake_args)
+ "-DWITH_PHPNG=ON"
+ "-DPHP_CONFIG_EXECUTABLE=${PHPCONFIG}"
+ "-DPHP_INCLUDES=${PHPPREFIX}"
+ )
+
+ BUILD_DIR="${S}/php${slot}" cmake_src_configure
+
+ # Return to where we left off, in case we add more
+ # to this phase.
+ cd "${S}" || die
+ done
+ fi
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use python ; then
+ python_foreach_impl cmake_src_compile
+ fi
+
+ if use php ; then
+ local slot=
+ for slot in $(php_get_slots) ; do
+ # Switch to the slot's build dir
+ php_init_slot_env "${slot}"
+
+ # Force cmake to build in it
+ BUILD_DIR="${S}/php${slot}" cmake_src_compile
+
+ # Return to where we left off, in case we add more
+ # to this phase.
+ cd "${S}" || die
+ done
+ fi
+}
+
+src_install() {
+ # Needs to be first
+ use apache && webapp_src_preinst
+
+ if use python ; then
+ python_foreach_impl cmake_src_install
+ python_foreach_impl python_optimize
+ fi
+
+ if use php ; then
+ php-ext-source-r3_createinifiles
+
+ local slot=
+ for slot in $(php_get_slots) ; do
+ php_init_slot_env "${slot}"
+
+ BUILD_DIR="${S}/php${slot}" cmake_src_install
+
+ cd "${S}" || die
+ done
+ fi
+
+ # Install this last because this build is the most "fully-featured"
+ cmake_src_install
+
+ if use apache ; then
+ # We need a mapserver symlink available in cgi-bin
+ dosym ../../../../../../../usr/bin/mapserv /usr/share/webapps/${PN}/${PV}/hostroot/cgi-bin/mapserv
+ webapp_src_install
+ fi
+}
+
+pkg_preinst() {
+ # We need to cache the value here of HAD_PHP because we want the
+ # original package version, not the result of us installing a new one
+ HAD_PHP=
+ has_version 'sci-geosciences/mapserver[php]' && HAD_PHP=1
+}
+
+pkg_postinst() {
+ use apache && webapp_pkg_postinst
+
+ # Let upgrading (from a pre-rewrite version) users know that the PHP module changed
+ local replacing_version=
+ for replacing_version in ${REPLACING_VERSIONS} ; do
+ if ver_test "7.6.0" -gt "${replacing_version}" ; then
+ if use php && [[ ${HAD_PHP} -eq 1 ]] ; then
+ elog "Note that MapServer has deprecated the old PHP extension"
+ elog "You can read more at: "
+ elog "URL: https://mapserver.org/MIGRATION_GUIDE.html#mapserver-7-2-to-7-4-migration"
+ elog "This may involve porting some of your PHP scripts to use the new module."
+ fi
+
+ # Only show the message once
+ break
+ fi
+ done
+}
+
+pkg_prerm() {
+ use apache && webapp_pkg_prerm
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapserver/, sci-geosciences/mapserver/files/
@ 2023-07-27 19:42 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2023-07-27 19:42 UTC (permalink / raw
To: gentoo-commits
commit: a6cf85e2724af408f933fe6c7dd6a74599abee15
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 27 18:48:32 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 27 19:42:39 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6cf85e2
sci-geosciences/mapserver: drop 7.6.4, 8.0.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-geosciences/mapserver/Manifest | 2 -
.../files/mapserver-8.0.0-wfs-paging.patch | 12 -
.../mapserver/files/mapserver-oracle21.patch | 12 -
sci-geosciences/mapserver/mapserver-7.6.4.ebuild | 290 --------------------
sci-geosciences/mapserver/mapserver-8.0.0.ebuild | 291 ---------------------
5 files changed, 607 deletions(-)
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index f57397f89b33..8f0bfa381bf8 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,3 +1 @@
-DIST mapserver-7.6.4.tar.gz 2718735 BLAKE2B 4d9fc6d215a55af32e0cc125f6119e0e477ddc5a5b2dbea6df1cc7e1ffaf6319f3a855329749aa07f1bca88e79a71c67cb2e8bd62e30bd60e44ecc1b8283d4ce SHA512 ccca87b650df3c1784ba82ca4a58960585d72fb4004fcea43c0dcabf03b9617ba51870bc63dbb2238a7eeb8d4337b6ff152587150912a74eeaf4a3e3d2d584ce
-DIST mapserver-8.0.0.tar.gz 2945524 BLAKE2B b67fb10f62e3c8cf4ae6d69863ef841fd2dd4106de55fd08dfc8146191bed1f18f12003455462503afcdb49e45d1368d89be591c152dcabba2b18587d27efaef SHA512 b9275f5e3399efb3cb189472ed28d081055e79da9aa35f7c9b8567b2d2d3cfc425ea7750b36a40db9ab537261c099356dc923e7b91941919d79c38f740327b97
DIST mapserver-8.0.1.tar.gz 2950164 BLAKE2B 5b14006d513aa4422dfe33b1991a685936084c1fda8c736fb97e25d54f1d1bf30278b6f0ce3c8a1907eeecd7bd1554076065d3824e2055265dfcbc0de2b899e1 SHA512 dae14a7eb6b09f5461c19bff83ca8ed6c21ae84d451b2c854794efb25b144b7edbf2a33479dc53e78aa646e5196e81219b4a1f393ff824db4508204a2d0301d1
diff --git a/sci-geosciences/mapserver/files/mapserver-8.0.0-wfs-paging.patch b/sci-geosciences/mapserver/files/mapserver-8.0.0-wfs-paging.patch
deleted file mode 100644
index ff78c7f2372e..000000000000
--- a/sci-geosciences/mapserver/files/mapserver-8.0.0-wfs-paging.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/maporaclespatial.c b/maporaclespatial.c
-index e7a50319e..5558f0231 100644
---- a/maporaclespatial.c
-+++ b/maporaclespatial.c
-@@ -2086,6 +2086,7 @@ int msOracleSpatialLayerWhichShapes( layerObj *layer, rectObj rect, int isQuery)
- msFree(tmp1_str);
-
- tmp_str = msStringConcatenate(tmp_str, query_str2);
-+ memset(query_str,0,strlen(query_str));
- query_str = msStringConcatenate(query_str, tmp_str);
- msFree(tmp_str);
- }
diff --git a/sci-geosciences/mapserver/files/mapserver-oracle21.patch b/sci-geosciences/mapserver/files/mapserver-oracle21.patch
deleted file mode 100644
index e77da3ee02a9..000000000000
--- a/sci-geosciences/mapserver/files/mapserver-oracle21.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naru a/cmake/FindOracle.cmake b/cmake/FindOracle.cmake
---- a/cmake/FindOracle.cmake 2021-10-20 17:50:27.817205162 +0200
-+++ b/cmake/FindOracle.cmake 2021-10-20 17:52:04.977205742 +0200
-@@ -37,7 +37,7 @@
- ${ORACLE_HOME}/OCI/include) # Oracle XE on Windows
-
- set(ORACLE_OCI_NAMES clntsh libclntsh oci)
-- set(ORACLE_NNZ_NAMES nnz10 libnnz10 nnz11 libnnz11 nnz12 libnnz12 nnz18 libnnz18 ociw32 nnz19 libnnz19)
-+ set(ORACLE_NNZ_NAMES nnz10 libnnz10 nnz11 libnnz11 nnz12 libnnz12 nnz18 libnnz18 ociw32 nnz19 libnnz19 nnz21 libnnz21)
- set(ORACLE_OCCI_NAMES libocci occi oraocci10 oraocci11 oraocci12)
-
- set(ORACLE_LIB_DIR
diff --git a/sci-geosciences/mapserver/mapserver-7.6.4.ebuild b/sci-geosciences/mapserver/mapserver-7.6.4.ebuild
deleted file mode 100644
index bd674e14babe..000000000000
--- a/sci-geosciences/mapserver/mapserver-7.6.4.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Variables for the miscellaneous bindings we provide
-PHP_EXT_OPTIONAL_USE="php"
-PHP_EXT_NAME="php_mapscriptng"
-PHP_EXT_SKIP_PHPIZE="yes"
-PHP_EXT_SKIP_PATCHES="yes"
-
-USE_PHP="php7-3 php7-4"
-PYTHON_COMPAT=( python3_{9..10} )
-
-WEBAPP_MANUAL_SLOT=yes
-WEBAPP_OPTIONAL=yes
-
-inherit cmake depend.apache perl-functions php-ext-source-r3 python-r1 webapp
-
-DESCRIPTION="Development environment for building spatially enabled webapps"
-HOMEPAGE="https://mapserver.org/"
-SRC_URI="https://download.osgeo.org/mapserver/${P}.tar.gz"
-
-LICENSE="Boost-1.0 BSD BSD-2 ISC MIT tcltk"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-# NOTE: opengl removed for now as no support for it in upstream CMake
-IUSE="apache bidi cairo geos mysql oracle perl php postgis python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Tests:
-# Included tests (tests/*) are seriously outdated
-# Upstream's main test suite (msautotest/*) is not in the release tarball,
-# and upstream sets 'export-ignore' for that directory.
-#
-# The eclasses used normally try to run test suites themselves,
-# or skip if nothing was found.
-# However, because of the php-ext-* eclass usage, this fails and would
-# cause errors running non-existent tests, so we have to restrict here.
-RESTRICT="test"
-
-RDEPEND="
- >=dev-libs/expat-2.2.8
- dev-libs/libxml2:2=
- dev-libs/libxslt[crypt]
- >=dev-libs/protobuf-c-1.3.2:=
- >=media-libs/freetype-2.9.1-r3
- >=media-libs/gd-2.0.12:=[truetype,jpeg,png,zlib]
- >=media-libs/giflib-5.2.1:=
- >=media-libs/libpng-1.6.37:=
- >=net-misc/curl-7.69.1
- >=sci-libs/gdal-3.0.4:=[oracle?]
- >=sci-libs/proj-6.2.1:=
- virtual/jpeg
- virtual/libiconv
- >=x11-libs/agg-2.5-r3
- apache? (
- app-admin/webapp-config
- dev-libs/fcgi
- )
- bidi? (
- dev-libs/fribidi
- media-libs/harfbuzz:=
- )
- cairo? ( x11-libs/cairo )
- geos? ( sci-libs/geos )
- mysql? ( dev-db/mysql-connector-c:= )
- oracle? ( dev-db/oracle-instantclient:= )
- perl? ( dev-lang/perl:= )
- postgis? (
- dev-db/postgis
- dev-db/postgresql:=
- )
- python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
- perl? ( >=dev-lang/swig-4.0 )
- php? ( >=dev-lang/swig-4.0 )
- python? (
- >=dev-lang/swig-4.0
- >=dev-python/setuptools-44.1.0
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-oracle21.patch
-)
-
-want_apache2 apache
-
-pkg_setup() {
- use apache && webapp_pkg_setup
- use perl && perl_set_version
-}
-
-src_prepare() {
- cmake_src_prepare
-
- use php && php-ext-source-r3_src_prepare
- use python && python_copy_sources
-}
-
-_generate_cmake_args() {
- # Provides a simple, bare config for bindings to build upon
- # Need WITH_WMS=ON or build fails
- local args=(
- "-DCMAKE_SKIP_RPATH=ON"
- "-DINSTALL_LIB_DIR=/usr/$(get_libdir)"
- "-DWITH_CAIRO=OFF"
- "-DWITH_FCGI=OFF"
- "-DWITH_FRIBIDI=OFF"
- "-DWITH_GEOS=OFF"
- "-DWITH_GIF=OFF"
- "-DWITH_HARFBUZZ=OFF"
- "-DWITH_ICONV=OFF"
- "-DWITH_PROTOBUFC=OFF"
- "-DWITH_POSTGIS=OFF"
- "-DWITH_WMS=ON"
- "-DWITH_WCS=OFF"
- "-DWITH_WFS=OFF"
- )
-
- echo "${args[@]}"
-}
-
-src_configure() {
- # NOTE: We could make this based on _generate_cmake_args, but
- # then we wouldn't be as-explicit about what is enabled/not,
- # and reliant on defaults not changing.
- # Readability and maintainability is better this way.
- local mycmakeargs=(
- "-DCMAKE_SKIP_RPATH=ON"
- "-DINSTALL_LIB_DIR=/usr/$(get_libdir)"
- "-DWITH_CLIENT_WMS=ON"
- "-DWITH_CLIENT_WFS=ON"
- "-DWITH_CURL=ON"
- "-DWITH_GIF=ON"
- "-DWITH_ICONV=ON"
- "-DWITH_KML=ON"
- "-DWITH_LIBXML2=ON"
- "-DWITH_PHPNG=OFF"
- "-DWITH_PROTOBUFC=ON"
- "-DWITH_SOS=ON"
- "-DWITH_WMS=ON"
- "-DWITH_WFS=ON"
- "-DWITH_WCS=ON"
- "-DWITH_XMLMAPFILE=ON"
- "-DWITH_APACHE_MODULE=$(usex apache ON OFF)"
- "-DWITH_CAIRO=$(usex cairo ON OFF)"
- "-DWITH_FCGI=$(usex apache ON OFF)"
- "-DWITH_GEOS=$(usex geos ON OFF)"
- "-DWITH_ORACLESPATIAL=$(usex oracle ON OFF)"
- "-DWITH_MYSQL=$(usex mysql ON OFF)"
- "-DWITH_FRIBIDI=$(usex bidi ON OFF)"
- "-DWITH_HARFBUZZ=$(usex bidi ON OFF)"
- "-DWITH_POSTGIS=$(usex postgis ON OFF)"
- "-DWITH_PERL=$(usex perl ON OFF)"
- )
-
- use perl && mycmakeargs+=( "-DCUSTOM_PERL_SITE_ARCH_DIR=$(perl_get_raw_vendorlib)" )
-
- # Configure the standard build first
- cmake_src_configure
-
- # Minimal build for bindings
- # Note that we use _generate_cmake_args to get a clean config each time, then add
- # in options as appropriate. Otherwise we'd get contamination between bindings.
- if use python ; then
- mycmakeargs=(
- $(_generate_cmake_args)
- "-DWITH_PYTHON=ON"
- )
-
- python_foreach_impl cmake_src_configure
- python_foreach_impl python_optimize
- fi
-
- if use php ; then
- local slot=
- for slot in $(php_get_slots) ; do
- # Switch to the slot's build dir
- php_init_slot_env "${slot}"
-
- # Take a blank config each time
- # Add in only *this* slot's PHP includes dir, etc
- mycmakeargs=(
- $(_generate_cmake_args)
- "-DWITH_PHPNG=ON"
- "-DPHP_CONFIG_EXECUTABLE=${PHPCONFIG}"
- "-DPHP_INCLUDES=${PHPPREFIX}"
- )
-
- BUILD_DIR="${S}/php${slot}" cmake_src_configure
-
- # Return to where we left off, in case we add more
- # to this phase.
- cd "${S}" || die
- done
- fi
-}
-
-src_compile() {
- cmake_src_compile
-
- if use python ; then
- python_foreach_impl cmake_src_compile
- fi
-
- if use php ; then
- local slot=
- for slot in $(php_get_slots) ; do
- # Switch to the slot's build dir
- php_init_slot_env "${slot}"
-
- # Force cmake to build in it
- BUILD_DIR="${S}/php${slot}" cmake_src_compile
-
- # Return to where we left off, in case we add more
- # to this phase.
- cd "${S}" || die
- done
- fi
-}
-
-src_install() {
- # Needs to be first
- use apache && webapp_src_preinst
-
- if use python ; then
- python_foreach_impl cmake_src_install
- python_foreach_impl python_optimize
- fi
-
- if use php ; then
- php-ext-source-r3_createinifiles
-
- local slot=
- for slot in $(php_get_slots) ; do
- php_init_slot_env "${slot}"
-
- BUILD_DIR="${S}/php${slot}" cmake_src_install
-
- cd "${S}" || die
- done
- fi
-
- # Install this last because this build is the most "fully-featured"
- cmake_src_install
-
- if use apache ; then
- # We need a mapserver symlink available in cgi-bin
- dosym ../../../../../../../usr/bin/mapserv /usr/share/webapps/${PN}/${PV}/hostroot/cgi-bin/mapserv
- webapp_src_install
- fi
-}
-
-pkg_preinst() {
- # We need to cache the value here of HAD_PHP because we want the
- # original package version, not the result of us installing a new one
- HAD_PHP=
- has_version 'sci-geosciences/mapserver[php]' && HAD_PHP=1
-}
-
-pkg_postinst() {
- use apache && webapp_pkg_postinst
-
- # Let upgrading (from a pre-rewrite version) users know that the PHP module changed
- local replacing_version=
- for replacing_version in ${REPLACING_VERSIONS} ; do
- if ver_test "7.6.0" -gt "${replacing_version}" ; then
- if use php && [[ ${HAD_PHP} -eq 1 ]] ; then
- elog "Note that MapServer has deprecated the old PHP extension"
- elog "You can read more at: "
- elog "URL: https://mapserver.org/MIGRATION_GUIDE.html#mapserver-7-2-to-7-4-migration"
- elog "This may involve porting some of your PHP scripts to use the new module."
- fi
-
- # Only show the message once
- break
- fi
- done
-}
-
-pkg_prerm() {
- use apache && webapp_pkg_prerm
-}
diff --git a/sci-geosciences/mapserver/mapserver-8.0.0.ebuild b/sci-geosciences/mapserver/mapserver-8.0.0.ebuild
deleted file mode 100644
index fa0e3a656b30..000000000000
--- a/sci-geosciences/mapserver/mapserver-8.0.0.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Variables for the miscellaneous bindings we provide
-PHP_EXT_OPTIONAL_USE="php"
-PHP_EXT_NAME="php_mapscriptng"
-PHP_EXT_SKIP_PHPIZE="yes"
-PHP_EXT_SKIP_PATCHES="yes"
-
-USE_PHP="php7-4"
-PYTHON_COMPAT=( python3_{9..11} )
-
-WEBAPP_MANUAL_SLOT=yes
-WEBAPP_OPTIONAL=yes
-
-inherit cmake depend.apache perl-functions php-ext-source-r3 python-r1 webapp
-
-DESCRIPTION="Development environment for building spatially enabled webapps"
-HOMEPAGE="https://mapserver.org/"
-SRC_URI="https://download.osgeo.org/mapserver/${P}.tar.gz"
-
-LICENSE="Boost-1.0 BSD BSD-2 ISC MIT tcltk"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-# NOTE: opengl removed for now as no support for it in upstream CMake
-IUSE="apache bidi cairo geos mysql oracle perl php postgis python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Tests:
-# Included tests (tests/*) are seriously outdated
-# Upstream's main test suite (msautotest/*) is not in the release tarball,
-# and upstream sets 'export-ignore' for that directory.
-#
-# The eclasses used normally try to run test suites themselves,
-# or skip if nothing was found.
-# However, because of the php-ext-* eclass usage, this fails and would
-# cause errors running non-existent tests, so we have to restrict here.
-RESTRICT="test"
-
-RDEPEND="
- >=dev-libs/expat-2.2.8
- dev-libs/libxml2:2=
- dev-libs/libxslt[crypt]
- >=dev-libs/protobuf-c-1.3.2:=
- >=media-libs/freetype-2.9.1-r3
- >=media-libs/gd-2.0.12:=[truetype,jpeg,png,zlib]
- >=media-libs/giflib-5.2.1:=
- media-libs/libjpeg-turbo
- >=media-libs/libpng-1.6.37:=
- >=net-misc/curl-7.69.1
- >=sci-libs/gdal-3.0.4:=[oracle?]
- >=sci-libs/proj-6.2.1:=
- virtual/libiconv
- >=x11-libs/agg-2.5-r3
- apache? (
- app-admin/webapp-config
- dev-libs/fcgi
- )
- bidi? (
- dev-libs/fribidi
- media-libs/harfbuzz:=
- )
- cairo? ( x11-libs/cairo )
- geos? ( sci-libs/geos )
- mysql? ( dev-db/mysql-connector-c:= )
- oracle? ( dev-db/oracle-instantclient:= )
- perl? ( dev-lang/perl:= )
- postgis? (
- dev-db/postgis
- dev-db/postgresql:=
- )
- python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
- perl? ( >=dev-lang/swig-4.0 )
- php? ( >=dev-lang/swig-4.0 )
- python? (
- >=dev-lang/swig-4.0
- >=dev-python/setuptools-44.1.0
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-wfs-paging.patch
-)
-
-want_apache2 apache
-
-pkg_setup() {
- use apache && webapp_pkg_setup
- use perl && perl_set_version
-}
-
-src_prepare() {
- cmake_src_prepare
-
- use php && php-ext-source-r3_src_prepare
- use python && python_copy_sources
-}
-
-_generate_cmake_args() {
- # Provides a simple, bare config for bindings to build upon
- # Need WITH_WMS=ON or build fails
- local args=(
- "-DCMAKE_SKIP_RPATH=ON"
- "-DINSTALL_LIB_DIR=/usr/$(get_libdir)"
- "-DWITH_CAIRO=OFF"
- "-DWITH_FCGI=OFF"
- "-DWITH_FRIBIDI=OFF"
- "-DWITH_GEOS=OFF"
- "-DWITH_GIF=OFF"
- "-DWITH_HARFBUZZ=OFF"
- "-DWITH_ICONV=OFF"
- "-DWITH_PROTOBUFC=OFF"
- "-DWITH_POSTGIS=OFF"
- "-DWITH_WMS=ON"
- "-DWITH_WCS=OFF"
- "-DWITH_WFS=OFF"
- "-DWITH_OGCAPI=OFF"
- )
-
- echo "${args[@]}"
-}
-
-src_configure() {
- # NOTE: We could make this based on _generate_cmake_args, but
- # then we wouldn't be as-explicit about what is enabled/not,
- # and reliant on defaults not changing.
- # Readability and maintainability is better this way.
- local mycmakeargs=(
- "-DCMAKE_SKIP_RPATH=ON"
- "-DINSTALL_LIB_DIR=/usr/$(get_libdir)"
- "-DWITH_CLIENT_WMS=ON"
- "-DWITH_CLIENT_WFS=ON"
- "-DWITH_CURL=ON"
- "-DWITH_GIF=ON"
- "-DWITH_ICONV=ON"
- "-DWITH_KML=ON"
- "-DWITH_LIBXML2=ON"
- "-DWITH_PHPNG=OFF"
- "-DWITH_PROTOBUFC=ON"
- "-DWITH_SOS=ON"
- "-DWITH_WMS=ON"
- "-DWITH_WFS=ON"
- "-DWITH_WCS=ON"
- "-DWITH_XMLMAPFILE=ON"
- "-DWITH_APACHE_MODULE=$(usex apache ON OFF)"
- "-DWITH_CAIRO=$(usex cairo ON OFF)"
- "-DWITH_FCGI=$(usex apache ON OFF)"
- "-DWITH_GEOS=$(usex geos ON OFF)"
- "-DWITH_ORACLESPATIAL=$(usex oracle ON OFF)"
- "-DWITH_MYSQL=$(usex mysql ON OFF)"
- "-DWITH_FRIBIDI=$(usex bidi ON OFF)"
- "-DWITH_HARFBUZZ=$(usex bidi ON OFF)"
- "-DWITH_POSTGIS=$(usex postgis ON OFF)"
- "-DWITH_PERL=$(usex perl ON OFF)"
- )
-
- use perl && mycmakeargs+=( "-DCUSTOM_PERL_SITE_ARCH_DIR=$(perl_get_raw_vendorlib)" )
-
- # Configure the standard build first
- cmake_src_configure
-
- # Minimal build for bindings
- # Note that we use _generate_cmake_args to get a clean config each time, then add
- # in options as appropriate. Otherwise we'd get contamination between bindings.
- if use python ; then
- mycmakeargs=(
- $(_generate_cmake_args)
- "-DWITH_PYTHON=ON"
- )
-
- python_foreach_impl cmake_src_configure
- python_foreach_impl python_optimize
- fi
-
- if use php ; then
- local slot=
- for slot in $(php_get_slots) ; do
- # Switch to the slot's build dir
- php_init_slot_env "${slot}"
-
- # Take a blank config each time
- # Add in only *this* slot's PHP includes dir, etc
- mycmakeargs=(
- $(_generate_cmake_args)
- "-DWITH_PHPNG=ON"
- "-DPHP_CONFIG_EXECUTABLE=${PHPCONFIG}"
- "-DPHP_INCLUDES=${PHPPREFIX}"
- )
-
- BUILD_DIR="${S}/php${slot}" cmake_src_configure
-
- # Return to where we left off, in case we add more
- # to this phase.
- cd "${S}" || die
- done
- fi
-}
-
-src_compile() {
- cmake_src_compile
-
- if use python ; then
- python_foreach_impl cmake_src_compile
- fi
-
- if use php ; then
- local slot=
- for slot in $(php_get_slots) ; do
- # Switch to the slot's build dir
- php_init_slot_env "${slot}"
-
- # Force cmake to build in it
- BUILD_DIR="${S}/php${slot}" cmake_src_compile
-
- # Return to where we left off, in case we add more
- # to this phase.
- cd "${S}" || die
- done
- fi
-}
-
-src_install() {
- # Needs to be first
- use apache && webapp_src_preinst
-
- if use python ; then
- python_foreach_impl cmake_src_install
- python_foreach_impl python_optimize
- fi
-
- if use php ; then
- php-ext-source-r3_createinifiles
-
- local slot=
- for slot in $(php_get_slots) ; do
- php_init_slot_env "${slot}"
-
- BUILD_DIR="${S}/php${slot}" cmake_src_install
-
- cd "${S}" || die
- done
- fi
-
- # Install this last because this build is the most "fully-featured"
- cmake_src_install
-
- if use apache ; then
- # We need a mapserver symlink available in cgi-bin
- dosym ../../../../../../../usr/bin/mapserv /usr/share/webapps/${PN}/${PV}/hostroot/cgi-bin/mapserv
- webapp_src_install
- fi
-}
-
-pkg_preinst() {
- # We need to cache the value here of HAD_PHP because we want the
- # original package version, not the result of us installing a new one
- HAD_PHP=
- has_version 'sci-geosciences/mapserver[php]' && HAD_PHP=1
-}
-
-pkg_postinst() {
- use apache && webapp_pkg_postinst
-
- # Let upgrading (from a pre-rewrite version) users know that the PHP module changed
- local replacing_version=
- for replacing_version in ${REPLACING_VERSIONS} ; do
- if ver_test "7.6.0" -gt "${replacing_version}" ; then
- if use php && [[ ${HAD_PHP} -eq 1 ]] ; then
- elog "Note that MapServer has deprecated the old PHP extension"
- elog "You can read more at: "
- elog "URL: https://mapserver.org/MIGRATION_GUIDE.html#mapserver-7-2-to-7-4-migration"
- elog "This may involve porting some of your PHP scripts to use the new module."
- fi
-
- # Only show the message once
- break
- fi
- done
-}
-
-pkg_prerm() {
- use apache && webapp_pkg_prerm
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2023-07-27 19:42 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-30 9:51 [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapserver/, sci-geosciences/mapserver/files/ Andrew Ammerlaan
-- strict thread matches above, loose matches on Subject: below --
2023-07-27 19:42 Andreas Sturmlechner
2022-01-31 14:17 Andrew Ammerlaan
2021-03-09 22:33 Sam James
2020-07-12 23:07 Andreas Sturmlechner
2020-02-13 21:28 Andreas Sturmlechner
2019-05-26 8:54 Amy Liffey
2016-07-15 14:22 Brian Evans
2016-02-27 12:22 Amy Winston
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox