sci-astronomy/scamp: modified to work with EAPI6 and new repo

4 files changed, 14 insertions, 852 deletions

diff --git a/sci-astronomy/scamp/Manifest b/sci-astronomy/scamp/Manifest
deleted file mode 100644
index 0477bf47b..000000000
--- a/sci-astronomy/scamp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST scamp-1.7.0.tar.gz 9214695 SHA256 b8451bd34946fa33c26ea60a12b40ec3c2fa22987564aaaa05205df0728b4d54 SHA512 b5eec73c3a645defeec0f1cf6daa1b0df9e7c009d86764321fc11c003240a85b86544e33fbe2f4337263fe3152120e91efaeabf46b69dd3a1e47b56a594fa6e7 WHIRLPOOL d4dc734fe04b81ecd1e1755ec6ff50a6b53b97001225a01ef6c8c2a64c5d1367f4a2320349509729923f7d12326758cad3d9ed01c4c342567371865951570717
diff --git a/sci-astronomy/scamp/files/scamp-1.7.0-plplot599.patch b/sci-astronomy/scamp/files/scamp-1.7.0-plplot599.patch
deleted file mode 100644
index 687b11406..000000000
--- a/sci-astronomy/scamp/files/scamp-1.7.0-plplot599.patch
+++ /dev/null
@@ -1,769 +0,0 @@
-diff -U 3 -H -d -r -N -x '*.kdev4' -- scamp-1.7.0/src/astrcplot.c scamp-1.7.0-r2/src/astrcplot.c
---- scamp-1.7.0/src/astrcplot.c	2009-09-10 15:10:02.000000000 +0200
-+++ scamp-1.7.0-r2/src/astrcplot.c	2012-01-01 20:23:46.809506421 +0100
-@@ -87,7 +87,7 @@
-   plfont(2);
-   plschr(0.0, 0.3);
-   plwid(0);
--  plcol(7);
-+  plcol0(7);
-   mark[0] = 500;
-   space[0] = 500;
-   for (wcspos[0] = -180.0; wcspos[0]<=180.0; wcspos[0]+=14.999)
-@@ -138,7 +138,7 @@
-     {
-     field = fgroups[g]->field;
-     nfield = fgroups[g]->nfield;
--    plcol(15);
-+    plcol0(15);
-     for (f=0; f<nfield; f++)
-       {
-       set = field[f]->set;
-@@ -172,7 +172,7 @@
-       x[i] = rawpos2[0];
-       y[i] = rawpos2[1];
-       }
--    plcol(3);
-+    plcol0(3);
-     plline(37, x,y);
-     }
- 
-@@ -814,7 +814,7 @@
-     psize = 1.0;
- 
-   plfont(2);
--  plcol(15);
-+  plcol0(15);
-   plschr(0.0, 0.67);
-   lwid = plotaaflag? ((CPLOT_AAFAC+1)/2) : 1;
-   plwid(lwid);
-@@ -851,9 +851,9 @@
-     }
-   plssym(0.0, psize);
-   plwid(lsize);
--  plcol(3);
-+  plcol0(3);
-   plpoin((PLINT)npoint, x,y, 11);
--  plcol(1);
-+  plcol0(1);
-   plpoin((PLINT)(nsamp-npoint), x2,y2, 0);
-   free(x);
-   free(y);
-@@ -888,12 +888,12 @@
-             *(yt++) = (PLFLT)samp->projpos[lat];
-             }
-         plwid(lsize);
--        plcol(8);
-+        plcol0(8);
-         if (lsize)
-           plpoin((PLINT)(xt-x), x,y, 17);
-         else
-           plpoin((PLINT)(xt-x), x,y, 1);
--        plcol(4);
-+        plcol0(4);
-         plpoin((PLINT)(x+nsamp-x2t), x2t,y2t, 2);
-         free(x);
-         free(y);
-@@ -901,7 +901,7 @@
-       plwid(2*lwid);
-       if (field->cplot_colour==15)
-         {
--        plcol(15);
-+        plcol0(15);
-         cplot_drawbounds(set->wcs, wcs);
-         }
-       }
-@@ -914,7 +914,7 @@
-     if (field->cplot_colour!=15)
-       {
-       plwid(3*lwid);
--      plcol(field->cplot_colour);
-+      plcol0(field->cplot_colour);
-       for (s=0; s<field->nset; s++)
-         {
-         set = field->set[s];
-@@ -923,7 +923,7 @@
-       }
-     }
- 
--  plcol(7);
-+  plcol0(7);
-   plwid(lwid);
-   cplot_drawcoordgrid(wcs, xmin, xmax, ymin, ymax);
-   plflush();
-@@ -1025,16 +1025,16 @@
-   lwid = plotaaflag? ((CPLOT_AAFAC+1)/2) : 1;
-   plwid(lwid);
-   plfont(2);
--  plcol(15);
-+  plcol0(15);
-   plenv((PLFLT)xmin, (PLFLT)xmax, (PLFLT)ymin, (PLFLT)ymax, 1, -1);
-   sprintf(str, "#uInstrument A%d: distortion map", field->astromlabel+1);
-   pllab("","", str);
-   plwid(0);
--  plcol(7);
-+  plcol0(7);
-   cplot_drawloccoordgrid(wcs, xmin, xmax, ymin, ymax);
- 
-   pllsty(1);
--  plcol(15);
-+  plcol0(15);
-   plscmap1n(256);
- 
-   scalemin = BIG;
-@@ -1104,7 +1104,7 @@
- 
-     wcsptr[0] = set->wcs;
-     wcsptr[1] = wcs;
--    plshades(scale, CPLOT_NDISTGRID, CPLOT_NDISTGRID, NULL,
-+    plshades((const PLFLT **)scale, CPLOT_NDISTGRID, CPLOT_NDISTGRID, NULL,
- 	     xstep/2.0+0.5, set->wcs->naxisn[lng]-xstep/2.0+0.5,
-              ystep/2.0+0.5, set->wcs->naxisn[lat]-ystep/2.0+0.5,
- 	     clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1, distort_map, wcsptr);
-@@ -1112,7 +1112,7 @@
-     plwid(0);
-     cplot_drawfgrids(set->wcs, wcs);
- */
--    plcol(7);
-+    plcol0(7);
-     plwid(lwid);
-     cplot_drawbounds(set->wcs, wcs);
-     }
-@@ -1126,10 +1126,10 @@
- 
-   plvpor(0.91,0.935,0.115,0.885);
-   plwind(0.0,1.0,scalemin*DEG/ARCSEC,scalemax*DEG/ARCSEC);
--  plshades(scale, 2, CPLOT_NSHADES, NULL, 0.0, 1.0,
-+  plshades((const PLFLT **)scale, 2, CPLOT_NSHADES, NULL, 0.0, 1.0,
- 	   scalemin*DEG/ARCSEC,scalemax*DEG/ARCSEC, clevel,
- 	   CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
--  plcol(15);
-+  plcol0(15);
-   plschr(0.0, 0.5);
-   plbox("bc", 0.0, 0, "bnstv", 0.0, 0);
-   sprintf(str, "%s", mscale < 0.09*ARCSEC/DEG?
-@@ -1304,19 +1304,19 @@
-   lwid = plotaaflag? ((CPLOT_AAFAC+1)/2) : 1;
-   plwid(lwid);
-   plfont(2);
--  plcol(15);
-+  plcol0(15);
-   plenv((PLFLT)xmin, (PLFLT)xmax, (PLFLT)ymin, (PLFLT)ymax, 1, -1);
-   sprintf(str, "#uInstrument A%d: map of astrometric systematics (internal)", 
- 	field0->astromlabel+1);
-   pllab("","", str);
-   plwid(0);
--  plcol(7);
-+  plcol0(7);
-   cplot_drawloccoordgrid(wcs0, xmin, xmax, ymin, ymax);
-   y[0] = y[1] = 3.0;
-   x[0] = 7.0;
-   x[1] = x[0] + scalel;
-   pllsty(1);
--  plcol(15);
-+  plcol0(15);
-   plwid(lwid*3);
-   plline(2,x,y);
-   plwid(lwid);
-@@ -1333,7 +1333,7 @@
-   for (s=0; s<nset; s++)
-     {
-     set0 = field0->set[s];
--    plcol(7);
-+    plcol0(7);
-     cplot_drawbounds(set0->wcs, wcs0);
-     lng = set0->lng;
-     lat = set0->lat;
-@@ -1455,9 +1455,9 @@
-           y[0] = vecpos[lat];
-           y[1] = vecpos2[lat] + minscale*(vecpos2[lat] - vecpos[lat]);
-           plwid(lwid*2);
--          plcol(3);
-+          plcol0(3);
-           plline(2, x,y);
--          plcol(15);
-+          plcol0(15);
-           plpoin(1,x,y,1);
-           plwid(lwid);
-           }
-@@ -1618,20 +1618,20 @@
-   lwid = plotaaflag? ((CPLOT_AAFAC+1)/2) : 1;
-   plwid(lwid);
-   plfont(2);
--  plcol(15);
-+  plcol0(15);
-   plenv((PLFLT)xmin, (PLFLT)xmax, (PLFLT)ymin, (PLFLT)ymax, 1, -1);
-   plschr(0.0, 0.8);
-   sprintf(str, "#uInstrument A%d: map of astrometric systematics (reference)",
- 	field0->astromlabel+1);
-   pllab("","", str);
-   plwid(0);
--  plcol(7);
-+  plcol0(7);
-   cplot_drawloccoordgrid(wcs0, xmin, xmax, ymin, ymax);
-   y[0] = y[1] = 3.0;
-   x[0] = 7.0;
-   x[1] = x[0] + scalel;
-   pllsty(1);
--  plcol(15);
-+  plcol0(15);
-   plwid(lwid*3);
-   plline(2,x,y);
-   plwid(lwid);
-@@ -1648,7 +1648,7 @@
-   for (s=0; s<nset; s++)
-     {
-     set0 = field0->set[s];
--    plcol(7);
-+    plcol0(7);
-     cplot_drawbounds(set0->wcs, wcs0);
-     lng = set0->lng;
-     lat = set0->lat;
-@@ -1759,9 +1759,9 @@
-           y[0] = vecpos[lat];
-           y[1] = vecpos2[lat] + minscale*(vecpos2[lat] - vecpos[lat]);
-           plwid(lwid*2);
--          plcol(1);
-+          plcol0(1);
-           plline(2, x,y);
--          plcol(15);
-+          plcol0(15);
-           plpoin(1,x,y,1);
-           plwid(lwid);
-           }
-@@ -1833,7 +1833,7 @@
- 
- /*-- Now plot! */
- /* Internal chi2/d.o.f. first */
--  plcol(15);
-+  plcol0(15);
-   plschr(0.0,0.5);
-   lwid = plotaaflag? ((CPLOT_AAFAC+1)/2) : 1;
-   plwid(lwid);
-@@ -1971,7 +1971,7 @@
- 
- /*-- Now plot! */
- /* Internal chi2/d.o.f. first */
--  plcol(15);
-+  plcol0(15);
-   plschr(0.0,0.5);
-   lwid = plotaaflag? ((CPLOT_AAFAC+1)/2) : 1;
-   plwid(lwid);
-@@ -2217,13 +2217,13 @@
-         r[0] = 0.96; g[0] = 1.0; b[0] = 0.96;
-         r[1] = 0.2; g[1] = 0.3; b[1] = 0.2;
-         plscmap1l(1, 2, cpoint, r, g, b, NULL);
--        plshades(histo[d3], CPLOT_ADERR1DNX, CPLOT_ADERR1DNY, NULL,
--		fgroup->projposmin[d2], fgroup->projposmax[d2], -maxlim, maxlim,
--		clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
-+        plshades((const PLFLT **)histo[d3], CPLOT_ADERR1DNX, CPLOT_ADERR1DNY,
-+		NULL, fgroup->projposmin[d2], fgroup->projposmax[d2], -maxlim,
-+		maxlim, clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
-         }
-       else
-         {
--        plcol(1);
-+        plcol0(1);
-         plptex((fgroup->projposmin[d2] - margin + fgroup->projposmax[d2])/2.0,
- 		maxlim/2.0, 1.0, 0.0, 0.5, "No overlapping detections!");
-         }
-@@ -2232,23 +2232,24 @@
-         r[0] = 0.0; g[0] = 0.0; b[0] = 0.0;
-         r[1] = 0.7; g[1] = 0.7; b[1] = 0.7;
-         plscmap1l(1, 2, cpoint, r, g, b, NULL);
--        plimage(histo_hsn[d3], CPLOT_ADERR1DNX_HSN, CPLOT_ADERR1DNY_HSN,
--		fgroup->projposmin[d2], fgroup->projposmax[d2], -maxlim, maxlim,
--		0.5, zmax_hsn[d3],
--		fgroup->projposmin[d2], fgroup->projposmax[d2], -maxlim, maxlim);
-+        plimage((const PLFLT **)histo_hsn[d3], CPLOT_ADERR1DNX_HSN,
-+		CPLOT_ADERR1DNY_HSN, fgroup->projposmin[d2],
-+		fgroup->projposmax[d2], -maxlim, maxlim, 
-+		0.5, zmax_hsn[d3], fgroup->projposmin[d2], 
-+		fgroup->projposmax[d2], -maxlim, maxlim);
-         }
-       sprintf(xlabel, "AXIS%d [pixels]", d2+1);
-       sprintf(ylabel, "#gDAXIS%d [\"]", d+1);
-       plscolbg(255,255,255);	/* Force the background colour to white */
-       plscol0(15, 0,0,0);	/* Force the foreground colour to black */
- /* 1D histograms */
--      plcol(3);
-+      plcol0(3);
-       plwid(2*lwid);
-       plline(CPLOT_NADERRHISTBIN, cuty[d3], cutbin);
--      plcol(7);
-+      plcol0(7);
-       plline(CPLOT_NADERRHISTBIN, cuty_hsn[d3], cutbin);
-       plwid(lwid);
--      plcol(15);
-+      plcol0(15);
-       plwid(lwid);
-       xl[0] = fgroup->projposmin[d2] - margin;
-       xl[1] = fgroup->projposmax[d2];
-@@ -2459,13 +2460,13 @@
-     r[0] = 0.96; g[0] = 1.0; b[0] = 0.96;
-     r[1] = 0.2; g[1] = 0.3; b[1] = 0.2;
-     plscmap1l(1, 2, cpoint, r, g, b, NULL);
--    plshades(histo, CPLOT_ADERR2DN, CPLOT_ADERR2DN, NULL,
-+    plshades((const PLFLT **)histo, CPLOT_ADERR2DN, CPLOT_ADERR2DN, NULL,
- 	-maxlim,maxlim, -maxlim,maxlim,
- 	clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
-     }
-   else
-     {
--    plcol(1);
-+    plcol0(1);
-     plptex(0.0, maxlim/2.0, 1.0, 0.0, 0.5, "No overlapping detections!");
-     }
- 
-@@ -2474,7 +2475,7 @@
-     r[0] = 0.0; g[0] = 0.0; b[0] = 0.0;
-     r[1] = 0.8; g[1] = 0.8; b[1] = 0.8;
-     plscmap1l(1, 2, cpoint, r, g, b, NULL);
--    plimage(histo_hsn, CPLOT_ADERR2DN_HSN, CPLOT_ADERR2DN_HSN,
-+    plimage((const PLFLT **)histo_hsn, CPLOT_ADERR2DN_HSN, CPLOT_ADERR2DN_HSN,
- 	-maxlim,maxlim, -maxlim, maxlim,
- 	0.5, zmax_hsn,
- 	-maxlim, maxlim, -maxlim, maxlim);
-@@ -2484,7 +2485,7 @@
-   plscol0(15, 0,0,0);		/* Force the foreground colour to black */
-   plschr(0.0,0.5);
- /* Pixel footprint */
--  plcol(15);
-+  plcol0(15);
-   pllsty(3);
-   xl[0] = xl[1] = xl[4] = pixscale[0]/2.0;
-   yl[0] = yl[3] = yl[4] = pixscale[1]/2.0;
-@@ -2493,15 +2494,15 @@
-   plline(5, xl, yl);
-   pllsty(1);
- /* 1D histograms */
--  plcol(3);
-+  plcol0(3);
-   plwid(2*lwid);
-   plline(CPLOT_NADERRHISTBIN, cutbin, cutx);
-   plline(CPLOT_NADERRHISTBIN, cuty, cutbin);
--  plcol(7);
-+  plcol0(7);
-   plline(CPLOT_NADERRHISTBIN, cutbin, cutx_hsn);
-   plline(CPLOT_NADERRHISTBIN, cuty_hsn, cutbin);
-   plwid(lwid);
--  plcol(15);
-+  plcol0(15);
-   plbox("bcnst", 0.0, 0.0, "bcnst", 0.0, 0.0);
-   sprintf(str, "Group ##%d: 2D internal astrometric errors", fgroup->no);
-   pllab( "#gDAXIS1 [\"]", "#gDAXIS2 [\"]", str);
-@@ -2725,13 +2726,13 @@
-         r[0] = 1.0; g[0] = 0.98; b[0] = 0.98;
-         r[1] = 0.6; g[1] = 0.1; b[1] = 0.1;
-         plscmap1l(1, 2, cpoint, r, g, b, NULL);
--        plshades(histo[d3], CPLOT_ADERR1DNX, CPLOT_ADERR1DNY, NULL,
--		fgroup->projposmin[d2], fgroup->projposmax[d2], -maxlim, maxlim,
--		clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
-+        plshades((const PLFLT **)histo[d3], CPLOT_ADERR1DNX, CPLOT_ADERR1DNY,
-+		NULL, fgroup->projposmin[d2], fgroup->projposmax[d2], -maxlim,
-+		maxlim,	clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
-         }
-       else
-         {
--        plcol(1);
-+        plcol0(1);
-         plptex((fgroup->projposmin[d2] - margin + fgroup->projposmax[d2])/2.0,
- 		maxlim/2.0, 1.0, 0.0, 0.5, "No match with a reference!");
-         }
-@@ -2740,23 +2741,24 @@
-         r[0] = 0.0; g[0] = 0.0; b[0] = 0.0;
-         r[1] = 0.8; g[1] = 0.8; b[1] = 0.8;
-         plscmap1l(1, 2, cpoint, r, g, b, NULL);
--        plimage(histo_hsn[d3], CPLOT_ADERR1DNX_HSN, CPLOT_ADERR1DNY_HSN,
--		fgroup->projposmin[d2], fgroup->projposmax[d2], -maxlim, maxlim,
--		0.5, zmax_hsn[d3],
--		fgroup->projposmin[d2], fgroup->projposmax[d2], -maxlim, maxlim);
-+        plimage((const PLFLT **)histo_hsn[d3], CPLOT_ADERR1DNX_HSN, 
-+		CPLOT_ADERR1DNY_HSN, fgroup->projposmin[d2], 
-+		fgroup->projposmax[d2], -maxlim, maxlim, 
-+		0.5, zmax_hsn[d3], fgroup->projposmin[d2], 
-+		fgroup->projposmax[d2], -maxlim, maxlim);
-         }
-       plscolbg(255,255,255);	/* Force the background colour to white */
-       plscol0(15, 0,0,0);	/* Force the foreground colour to black */
-       sprintf(xlabel, "AXIS%d [pixels]", d2+1);
-       sprintf(ylabel, "#gDAXIS%d [\"]", d+1);
- /*---- 1D histograms */
--      plcol(1);
-+      plcol0(1);
-       plwid(2*lwid);
-       plline(CPLOT_NREFERRHISTBIN, cuty[d3], cutbin);
--      plcol(7);
-+      plcol0(7);
-       plline(CPLOT_NREFERRHISTBIN, cuty_hsn[d3], cutbin);
-       plwid(lwid);
--      plcol(15);
-+      plcol0(15);
-       plwid(lwid);
-       xl[0] = fgroup->projposmin[d2] - margin;
-       xl[1] = fgroup->projposmax[d2];
-@@ -2964,13 +2966,13 @@
-     r[0] = 1.0; g[0] = 0.98; b[0] = 0.98;
-     r[1] = 0.6; g[1] = 0.1; b[1] = 0.1;
-     plscmap1l(1, 2, cpoint, r, g, b, NULL);
--    plshades(histo, CPLOT_REFERR2DN, CPLOT_REFERR2DN, NULL,
-+    plshades((const PLFLT **)histo, CPLOT_REFERR2DN, CPLOT_REFERR2DN, NULL,
- 	-maxlim,maxlim, -maxlim,maxlim,
- 	clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
-     }
-   else
-     {
--    plcol(1);
-+    plcol0(1);
-     plptex(0.0, maxlim/2.0, 1.0, 0.0, 0.5, "No match with a reference!");
-     }
-   if (zmax_hsn>=1.0)
-@@ -2978,16 +2980,15 @@
-     r[0] = 0.0; g[0] = 0.0; b[0] = 0.0;
-     r[1] = 0.8; g[1] = 0.8; b[1] = 0.8;
-     plscmap1l(1, 2, cpoint, r, g, b, NULL);
--    plimage(histo_hsn, CPLOT_REFERR2DN_HSN, CPLOT_REFERR2DN_HSN,
--	-maxlim,maxlim, -maxlim, maxlim,
--	0.5, zmax_hsn,
--	-maxlim, maxlim, -maxlim, maxlim);
-+    plimage((const PLFLT **)histo_hsn, CPLOT_REFERR2DN_HSN, 
-+	CPLOT_REFERR2DN_HSN, -maxlim,maxlim, -maxlim, maxlim,
-+	0.5, zmax_hsn, -maxlim, maxlim, -maxlim, maxlim);
-     }
-   plscolbg(255,255,255);	/* Force the background colour to white */
-   plscol0(15, 0,0,0);		/* Force the foreground colour to black */
-   plschr(0.0,0.5);
- /* Pixel footprint */
--  plcol(15);
-+  plcol0(15);
-   pllsty(3);
-   xl[0] = xl[1] = xl[4] = pixscale[0]/2.0;
-   yl[0] = yl[3] = yl[4] = pixscale[1]/2.0;
-@@ -2996,15 +2997,15 @@
-   plline(5, xl, yl);
-   pllsty(1);
- /* 1D histograms */
--  plcol(1);
-+  plcol0(1);
-   plwid(2*lwid);
-   plline(CPLOT_NREFERRHISTBIN, cutbin, cutx);
-   plline(CPLOT_NREFERRHISTBIN, cuty, cutbin);
--  plcol(7);
-+  plcol0(7);
-   plline(CPLOT_NREFERRHISTBIN, cutbin, cutx_hsn);
-   plline(CPLOT_NREFERRHISTBIN, cuty_hsn, cutbin);
-   plwid(lwid);
--  plcol(15);
-+  plcol0(15);
-   plbox("bcnst", 0.0, 0.0, "bcnst", 0.0, 0.0);
-   sprintf(str, "Group ##%d: 2D reference astrometric errors", fgroup->no);
-   pllab( "#gDAXIS1 [\"]", "#gDAXIS2 [\"]", str);
-@@ -3317,7 +3318,7 @@
-         }
-       else
-         {
--        plcol(1);
-+        plcol0(1);
-         plptex(-margin/2.0, maxlim/2.0, 1.0, 0.0, 0.5,
- 		"No overlapping detections!");
-         }
-@@ -3326,36 +3327,35 @@
-         r[0] = 0.0; g[0] = 0.0; b[0] = 0.0;
-         r[1] = 0.7; g[1] = 0.7; b[1] = 0.7;
-         plscmap1l(1, 2, cpoint, r, g, b, NULL);
--        plimage(histo_hsn[d3], CPLOT_PIXERR1DNX_HSN, CPLOT_PIXERR1DNY_HSN,
--		0.5, maxwidth, -maxlim, maxlim,
--		0.5, zmax_hsn[d3],
--		0.5, maxwidth, -maxlim, maxlim);
-+        plimage((const PLFLT **)histo_hsn[d3], CPLOT_PIXERR1DNX_HSN, 
-+		CPLOT_PIXERR1DNY_HSN, 0.5, maxwidth, -maxlim, maxlim,
-+		0.5, zmax_hsn[d3], 0.5, maxwidth, -maxlim, maxlim);
-         }
-       sprintf(xlabel, "AXIS%d [pixels]", d2+1);
-       sprintf(ylabel, "#gDAXIS%d [pixels]", d+1);
-       plscolbg(255,255,255);	/* Force the background colour to white */
-       plscol0(15, 0,0,0);	/* Force the foreground colour to black */
- /* 1D histograms */
--      plcol(3);
-+      plcol0(3);
-       plwid(2*lwid);
-       plline(CPLOT_NPIXERRHISTBIN, cuty[d3], cutbin);
--      plcol(7);
-+      plcol0(7);
-       plline(CPLOT_NPIXERRHISTBIN, cuty_hsn[d3], cutbin);
-       if (zmax[d3]>=1.0)
-         {
--        plcol(15);
-+        plcol0(15);
-         for (i=0; i<CPLOT_PIXERR1DNX+1; i++)
-           if (weight[d3][i]>0.0)
-             line[d3][i] /= weight[d3][i];
-         plwid(6*lwid);
--        plcol(15);
-+        plcol0(15);
-         plline(CPLOT_PIXERR1DNX+1, cutx, line[d3]);
-         plwid(3*lwid);
--        plcol(3);
-+        plcol0(3);
-         plline(CPLOT_PIXERR1DNX+1, cutx, line[d3]);
-         }
-       plwid(lwid);
--      plcol(15);
-+      plcol0(15);
-       plwid(lwid);
-       xl[0] = 0.5 - margin;
-       xl[1] = maxwidth;
-@@ -3659,7 +3659,7 @@
-         }
-       else
-         {
--        plcol(1);
-+        plcol0(1);
-         plptex(-margin/2.0, maxlim/2.0, 1.0, 0.0, 0.5,
- 		"No overlapping detections!");
-         }
-@@ -3668,7 +3668,7 @@
-         r[0] = 0.0; g[0] = 0.0; b[0] = 0.0;
-         r[1] = 0.7; g[1] = 0.7; b[1] = 0.7;
-         plscmap1l(1, 2, cpoint, r, g, b, NULL);
--        plimage(histo_hsn[d3], CPLOT_SUBPIXERR1DNX_HSN,
-+        plimage((const PLFLT **)histo_hsn[d3], CPLOT_SUBPIXERR1DNX_HSN,
- 		CPLOT_SUBPIXERR1DNY_HSN,
- 		-0.5, 0.5, -maxlim, maxlim,
- 		0.5, zmax_hsn[d3],
-@@ -3679,27 +3679,27 @@
-       plscolbg(255,255,255);	/* Force the background colour to white */
-       plscol0(15, 0,0,0);	/* Force the foreground colour to black */
- /* 1D histograms */
--      plcol(3);
-+      plcol0(3);
-       plwid(2*lwid);
-       plline(CPLOT_NSUBPIXERRHISTBIN, cuty[d3], cutbin);
--      plcol(7);
-+      plcol0(7);
-       plline(CPLOT_NSUBPIXERRHISTBIN, cuty_hsn[d3], cutbin);
-       if (zmax[d3]>=1.0)
-         {
--        plcol(15);
-+        plcol0(15);
-         for (i=0; i<CPLOT_SUBPIXERR1DNX; i++)
-           if (weight[d3][i]>0.0)
-             line[d3][i] /= weight[d3][i];
-         line[d3][CPLOT_SUBPIXERR1DNX] = line[d3][0];
-         plwid(6*lwid);
--        plcol(15);
-+        plcol0(15);
-         plline(CPLOT_SUBPIXERR1DNX+1, cutx, line[d3]);
-         plwid(3*lwid);
--        plcol(3);
-+        plcol0(3);
-         plline(CPLOT_SUBPIXERR1DNX+1, cutx, line[d3]);
-         }
-       plwid(lwid);
--      plcol(15);
-+      plcol0(15);
-       plwid(lwid);
-       xl[0] = -0.5 - margin;
-       xl[1] = 0.5;
-@@ -4012,13 +4012,14 @@
-           r[0] = 1.0; g[0] = 0.96; b[0] = 1.0;
-           r[1] = 0.3; g[1] = 0.2; b[1] = 0.3;
-           plscmap1l(1, 2, cpoint, r, g, b, NULL);
--          plshades(histo[d], CPLOT_ASTRCOLSHIFT1DNX, CPLOT_ASTRCOLSHIFT1DNY,
--		NULL, dmagmin, dmagmax, -maxlim, maxlim,
--		clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
-+          plshades((const PLFLT **)histo[d], CPLOT_ASTRCOLSHIFT1DNX, 
-+		CPLOT_ASTRCOLSHIFT1DNY,	NULL, dmagmin, dmagmax, -maxlim,
-+		maxlim,	clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1,
-+		NULL, NULL);
-           }
-         else
-           {
--          plcol(1);
-+          plcol0(1);
-           plptex((PLFLT)mdmag, maxlim/2.0, 1.0, 0.0, 0.5,
- 		"No overlapping detections!");
-           }
-@@ -4027,7 +4028,7 @@
-           r[0] = 0.0; g[0] = 0.0; b[0] = 0.0;
-           r[1] = 0.7; g[1] = 0.7; b[1] = 0.7;
-           plscmap1l(1, 2, cpoint, r, g, b, NULL);
--          plimage(histo_hsn[d], CPLOT_ASTRCOLSHIFT1DNX_HSN,
-+          plimage((const PLFLT **)histo_hsn[d], CPLOT_ASTRCOLSHIFT1DNX_HSN,
- 		CPLOT_ASTRCOLSHIFT1DNY_HSN,
- 		dmagmin, dmagmax, -maxlim, maxlim, 0.5, zmax_hsn[d],
- 		dmagmin, dmagmax, -maxlim, maxlim);
-@@ -4037,13 +4038,13 @@
-         plscolbg(255,255,255);	/* Force the background colour to white */
-         plscol0(15, 0,0,0);	/* Force the foreground colour to black */
- /*------ 1D histograms */
--        plcol(13);
-+        plcol0(13);
-         plwid(2*lwid);
-         plline(CPLOT_NADERRHISTBIN, cuty[d], cutbin);
--        plcol(7);
-+        plcol0(7);
-         plline(CPLOT_NADERRHISTBIN, cuty_hsn[d], cutbin);
-         plwid(lwid);
--        plcol(15);
-+        plcol0(15);
-         plwid(lwid);
-         xl[0] = dmagmin;
-         xl[1] = dmagmax;
-@@ -4250,13 +4251,13 @@
-       r[0] = 1.0; g[0] = 0.96; b[0] = 1.0;
-       r[1] = 0.3; g[1] = 0.2; b[1] = 0.3;
-       plscmap1l(1, 2, cpoint, r, g, b, NULL);
--      plshades(histo[d], CPLOT_REFPROPN, CPLOT_REFPROPN, NULL,
-+      plshades((const PLFLT **)histo[d], CPLOT_REFPROPN, CPLOT_REFPROPN, NULL,
- 	-maxlim,maxlim, -maxlim,maxlim,
- 	clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
-       }
-     else
-       {
--      plcol(1);
-+      plcol0(1);
-       plptex(0.0, maxlim/2.0, 1.0, 0.0, 0.5, "No match with a reference!");
-       }
-     if (zmax_hsn[d]>=1.0)
-@@ -4264,14 +4265,13 @@
-       r[0] = 0.0; g[0] = 0.0; b[0] = 0.0;
-       r[1] = 0.8; g[1] = 0.8; b[1] = 0.8;
-       plscmap1l(1, 2, cpoint, r, g, b, NULL);
--      plimage(histo_hsn[d], CPLOT_REFERR2DN_HSN, CPLOT_REFERR2DN_HSN,
--	-maxlim,maxlim, -maxlim, maxlim,
--	0.5, zmax_hsn[d],
--	-maxlim, maxlim, -maxlim, maxlim);
-+      plimage((const PLFLT **)histo_hsn[d], CPLOT_REFERR2DN_HSN, 
-+	CPLOT_REFERR2DN_HSN, -maxlim,maxlim, -maxlim, maxlim,
-+	0.5, zmax_hsn[d], -maxlim, maxlim, -maxlim, maxlim);
-       }
-     plscolbg(255,255,255);	/* Force the background colour to white */
-     plscol0(15, 0,0,0);		/* Force the foreground colour to black */
--    plcol(15);
-+    plcol0(15);
-     plbox("bcnst", 0.0, 0.0, "bcnst", 0.0, 0.0);
-     pllab(d?"#gm#d#gd#u(ref) [mas/yr]":"#gm#d#ga#u(ref) [mas/yr]",
- 	d?"#gm#d#gd#u(SCAMP) [mas/yr]":"#gm#d#ga#u(SCAMP) [mas/yr]", "");
-diff -U 3 -H -d -r -N -x '*.kdev4' -- scamp-1.7.0/src/photcplot.c scamp-1.7.0-r2/src/photcplot.c
---- scamp-1.7.0/src/photcplot.c	2009-09-10 15:11:14.000000000 +0200
-+++ scamp-1.7.0-r2/src/photcplot.c	2012-01-01 20:55:00.358169400 +0100
-@@ -182,7 +182,7 @@
- /*-- Now plot! */
-     firstflag = 1;
-     yl[0] = yl[1] = 0.0;
--    plcol(15);
-+    plcol0(15);
-     plschr(0.0,0.5);
-     lwid = plotaaflag? ((CPLOT_AAFAC+1)/2) : 1;
-     plwid(lwid);
-@@ -204,9 +204,9 @@
-       if (fields[f]->photomlabel == instru)
-         {
-         if (fields[f]->photomflag==1)
-- 	  plcol(9);
-+ 	  plcol0(9);
-         else
-- 	  plcol(8);
-+ 	  plcol0(8);
-         plpoin((PLINT)1, x+n,y+n, 5);
-         plptex(x[n],y[n], 0.0, -1.0, -0.1, fields[f]->rfilename);
-         n++;
-@@ -214,7 +214,7 @@
-     xl[0] = 0.0;
-     xl[1] = npointmax+1.0;
-     pllsty(2);
--    plcol(15);
-+    plcol0(15);
-     plline(2, xl, yl);
-     pllsty(1);
-     firstflag = 0;
-@@ -443,13 +443,14 @@
-         r[0] = 0.98; g[0] = 0.98; b[0] = 1.0;
-         r[1] = 0.3; g[1] = 0.3; b[1] = 0.4;
-         plscmap1l(1, 2, cpoint, r, g, b, NULL);
--        plshades(histo[d], CPLOT_PHOTERRNX, CPLOT_PHOTERRNY, NULL,
--		fgroup->projposmin[d], fgroup->projposmax[d], -maxlim, maxlim,
--		clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
-+        plshades((const PLFLT **)histo[d], CPLOT_PHOTERRNX, CPLOT_PHOTERRNY, 
-+		NULL, fgroup->projposmin[d], fgroup->projposmax[d], -maxlim,
-+		maxlim, clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1,
-+		NULL, NULL);
-         }
-       else
-         {
--        plcol(1);
-+        plcol0(1);
-         plptex((fgroup->projposmin[d] - margin + fgroup->projposmax[d])/2.0,
- 		maxlim/2.0, 1.0, 0.0, 0.5, "No overlapping detections!");
-         }
-@@ -458,20 +459,20 @@
-         r[0] = 0.0; g[0] = 0.0; b[0] = 0.0;
-         r[1] = 0.8; g[1] = 0.8; b[1] = 0.8;
-         plscmap1l(1, 2, cpoint, r, g, b, NULL);
--       plimage(histo_hsn[d], CPLOT_PHOTERRNX_HSN, CPLOT_PHOTERRNY_HSN,
--		fgroup->projposmin[d], fgroup->projposmax[d], -maxlim, maxlim,
--		0.5, zmax_hsn[d],
-+       plimage((const PLFLT **)histo_hsn[d], CPLOT_PHOTERRNX_HSN, 
-+		CPLOT_PHOTERRNY_HSN, fgroup->projposmin[d], 
-+		fgroup->projposmax[d], -maxlim, maxlim, 0.5, zmax_hsn[d],
- 		fgroup->projposmin[d], fgroup->projposmax[d], -maxlim, maxlim);
-         }
-       plscolbg(255,255,255);	/* Force the background colour to white */
-       plscol0(15, 0,0,0);	/* Force the foreground colour to black */
--      plcol(9);
-+      plcol0(9);
-       plwid(2*lwid);
-       plline(CPLOT_NADERRHISTBIN, cuty[d], cutbin);
--      plcol(7);
-+      plcol0(7);
-       plline(CPLOT_NADERRHISTBIN, cuty_hsn[d], cutbin);
-       plwid(lwid);
--      plcol(15);
-+      plcol0(15);
-       xl[0] = fgroup->projposmin[d] - margin;
-       xl[1] = fgroup->projposmax[d];
-       pllsty(2);
-@@ -728,13 +729,13 @@
-       r[0] = 0.98; g[0] = 0.98; b[0] = 1.0;
-       r[1] = 0.3; g[1] = 0.3; b[1] = 0.4;
-       plscmap1l(1, 2, cpoint, r, g, b, NULL);
--      plshades(histo, CPLOT_PHOTERRNX, CPLOT_PHOTERRNY, NULL,
-+      plshades((const PLFLT **)histo, CPLOT_PHOTERRNX, CPLOT_PHOTERRNY, NULL,
- 		xoffset, magmax, -maxlim, maxlim,
- 		clevel, CPLOT_NSHADES, 1, 0, 0, plfill, 1, NULL, NULL);
-       }
-     else
-       {
--      plcol(1);
-+      plcol0(1);
-       plptex((xoffset - margin + magmax)/2.0,
- 		maxlim/2.0, 1.0, 0.0, 0.5, "No overlapping detections!");
-       }
-@@ -743,20 +744,19 @@
-       r[0] = 0.0; g[0] = 0.0; b[0] = 0.0;
-       r[1] = 0.8; g[1] = 0.8; b[1] = 0.8;
-       plscmap1l(1, 2, cpoint, r, g, b, NULL);
--     plimage(histo_hsn, CPLOT_PHOTERRNX_HSN, CPLOT_PHOTERRNY_HSN,
--		xoffset, magmax, -maxlim, maxlim,
--		0.5, zmax_hsn,
--		xoffset, magmax, -maxlim, maxlim);
-+     plimage((const PLFLT **)histo_hsn, CPLOT_PHOTERRNX_HSN,
-+		CPLOT_PHOTERRNY_HSN, xoffset, magmax, -maxlim, maxlim,
-+		0.5, zmax_hsn, xoffset, magmax, -maxlim, maxlim);
-       }
-     plscolbg(255,255,255);	/* Force the background colour to white */
-     plscol0(15, 0,0,0);	/* Force the foreground colour to black */
--    plcol(9);
-+    plcol0(9);
-     plwid(2*lwid);
-     plline(CPLOT_NADERRHISTBIN, cuty, cutbin);
--    plcol(7);
-+    plcol0(7);
-     plline(CPLOT_NADERRHISTBIN, cuty_hsn, cutbin);
-     plwid(lwid);
--    plcol(15);
-+    plcol0(15);
-     xl[0] = xoffset - margin;
-     xl[1] = magmax;
-     pllsty(2);
diff --git a/sci-astronomy/scamp/scamp-1.7.0-r2.ebuild b/sci-astronomy/scamp/scamp-1.7.0-r2.ebuild
deleted file mode 100644
index 4caf6885b..000000000
--- a/sci-astronomy/scamp/scamp-1.7.0-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit eutils autotools-utils multilib
-
-DESCRIPTION="Astrometric and photometric solutions for astronomical images"
-HOMEPAGE="http://www.astromatic.net/software/scamp"
-SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
-
-LICENSE="CeCILL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc threads plplot"
-
-RDEPEND=">=sci-astronomy/cdsclient-3.4
-	sci-libs/atlas[lapack,threads=]
-	sci-libs/fftw:3.0
-	plplot? ( sci-libs/plplot:= )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	local mycblas=atlcblas  myclapack=atlclapack
-	if use threads; then
-		[[ -e ${EPREFIX}/usr/$(get_libdir)/libptcblas.so ]] && \
-			mycblas=ptcblas
-		[[ -e ${EPREFIX}/usr/$(get_libdir)/libptclapack.so ]] &&
-		myclapack=ptclapack
-	fi
-	# fix the configure and not the acx_atlas.m4. the eautoreconf will
-	# produce a configure giving  a wrong install Makefile target (to fix)
-	sed -i \
-		-e "s/-lcblas/-l${mycblas}/g" \
-		-e "s/AC_CHECK_LIB(cblas/AC_CHECK_LIB(${mycblas}/g" \
-		-e "s/-llapack/-l${myclapack}/g" \
-		-e "s/AC_CHECK_LIB(lapack/AC_CHECK_LIB(${myclapack}/g" \
-		 acx_atlas.m4 || die
-	epatch "${FILESDIR}"/${P}-plplot599.patch
-	sed -i -e 's/doc//' Makefile.am || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-atlas-incdir="${EPREFIX}/usr/include/atlas"
-		$(use_with plplot)
-		$(use_enable threads)
-	)
-	autotools-utils_src_configure
-}
-
-src_install () {
-	autotools-utils_src_install
-	use doc && dodoc doc/*
-}
diff --git a/sci-astronomy/scamp/scamp-9999.ebuild b/sci-astronomy/scamp/scamp-9999.ebuild
index 5500ba87f..0964de745 100644
--- a/sci-astronomy/scamp/scamp-9999.ebuild
+++ b/sci-astronomy/scamp/scamp-9999.ebuild
@@ -1,23 +1,15 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-if [[ ${PV} == "9999" ]] ; then
-	_SVN=subversion
-	ESVN_REPO_URI="https://astromatic.net/pubsvn/software/${PN}/trunk"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
+inherit subversion autotools
 
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit ${_SVN} autotools-utils multilib
+ESVN_REPO_URI="https://astromatic.net/pubsvn/software/${PN}/trunk"
+ESVN_OPTIONS="--trust-server-cert-failures=unknown-ca"
+SRC_URI=""
+KEYWORDS=""
 
 DESCRIPTION="Astrometric and photometric solutions for astronomical images"
 HOMEPAGE="http://www.astromatic.net/software/scamp"
@@ -34,6 +26,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 src_prepare() {
+	default
 	local mycblas=atlcblas myclapack=atlclapack
 	if use threads; then
 		[[ -e "${EPREFIX}"/usr/$(get_libdir)/libptcblas.so ]] && \
@@ -48,19 +41,18 @@ src_prepare() {
 		-e "s/\(lapack_lib=\).*/\1${myclapack}/g" \
 		-e "s/AC_CHECK_LIB(lapack/AC_CHECK_LIB(${myclapack}/g" \
 		acx_atlas.m4 || die
-	autotools-utils_src_prepare
+	eautoreconf
+	subversion_src_prepare
 }
 
 src_configure() {
-	local myeconfargs=(
-		--with-atlas-incdir="${EPREFIX}/usr/include/atlas"
-		$(use_enable plplot)
+	econf \
+		--with-atlas-incdir="${EPREFIX}/usr/include/atlas" \
+		$(use_enable plplot) \
 		$(use_enable threads)
-	)
-	autotools-utils_src_configure
 }
 
 src_install () {
-	autotools-utils_src_install
+	default
 	use doc && dodoc doc/*
 }