Bump to1.2, and do some long over due house cleaning.

(Portage version: 2.1.2_pre1-r4)
 (Unsigned Manifest commit)

12 files changed, 0 insertions, 651 deletions

diff --git a/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.11 b/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.11
deleted file mode 100644
index f53d27a3d526..000000000000
--- a/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.11
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c0de8ffb854029431e0f60bda8f34032 libgdiplus-1.1.11.tar.gz 1255643
-RMD160 45e892aaf4736070a84c71f08e274c0dd89cffb8 libgdiplus-1.1.11.tar.gz 1255643
-SHA256 a61c1443f2873f202ba7073cc4877c2cfd7f84dfa130ecc93038e7462284939e libgdiplus-1.1.11.tar.gz 1255643
diff --git a/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.13 b/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.13
deleted file mode 100644
index de2d5622b127..000000000000
--- a/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9f655b0032603d653b52ce12b6c29a50 libgdiplus-1.1.13.tar.gz 1255862
diff --git a/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.16.1 b/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.16.1
deleted file mode 100644
index 9340c80746d6..000000000000
--- a/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.16.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b81aad7dd08771f5bf2f8a8989c6f51d libgdiplus-1.1.16.1.tar.gz 1779962
-RMD160 182c9020b02305007eb0126f31a83905ea3ea5b8 libgdiplus-1.1.16.1.tar.gz 1779962
-SHA256 d9aa23a068a2edc32e89bc07d7d893d3850f52fdc28b5cc9ea1fc8febb7ed7ea libgdiplus-1.1.16.1.tar.gz 1779962
diff --git a/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.17 b/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.17
deleted file mode 100644
index 837d2ef0bc1e..000000000000
--- a/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.17
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 77f11c54b2da345776d713fcc303ed9c libgdiplus-1.1.17.tar.gz 2998913
-RMD160 8c922c676f8bf8fc781351f5a483dd5155e1ffef libgdiplus-1.1.17.tar.gz 2998913
-SHA256 af7f5966310fa6dc830c482e93192f955f290aec5f64a95db2d84b29580bd844 libgdiplus-1.1.17.tar.gz 2998913
diff --git a/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.8 b/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.8
deleted file mode 100644
index 82e6c7ad2f03..000000000000
--- a/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8b43da0990e43f2e92b7a2bdeb86f725 libgdiplus-1.1.8.tar.gz 1353269
-RMD160 ff5bd2a8213a0f256c6f3d5bef4b0347fb972b51 libgdiplus-1.1.8.tar.gz 1353269
-SHA256 8267c4a76c8775b3b4ca0cc7ec9a7e24a40f88460eb4f3614e2f7eb400ced236 libgdiplus-1.1.8.tar.gz 1353269
diff --git a/dev-dotnet/libgdiplus/files/libgdiplus-1.0.5-cairo-0.3.0-compat.diff b/dev-dotnet/libgdiplus/files/libgdiplus-1.0.5-cairo-0.3.0-compat.diff
deleted file mode 100644
index c31cde67e77f..000000000000
--- a/dev-dotnet/libgdiplus/files/libgdiplus-1.0.5-cairo-0.3.0-compat.diff
+++ /dev/null
@@ -1,400 +0,0 @@
-diff -aur libgdiplus-1.0.5/src/gdip.h libgdiplus-1.0.5-messy/src/gdip.h
---- libgdiplus-1.0.5/src/gdip.h	2004-11-13 19:28:19.000000000 -0500
-+++ libgdiplus-1.0.5-messy/src/gdip.h	2005-01-27 21:48:44.214654248 -0500
-@@ -20,9 +20,8 @@
- #include <glib.h>
- 
- #include <cairo.h>
--#ifndef CAIRO_HAS_XLIB_SURFACE
-+#include <cairo-ft.h>
- #include <cairo-xlib.h>
--#endif
- 
- /* mono/io-layer/uglify.h also has these typedefs.
-  * To avoid a dependency on mono we have copied all
-@@ -1162,7 +1161,7 @@
- int fcmp (double x1, double x2, double epsilon);
- float gdip_get_display_dpi();
- void gdip_unitConversion(Unit fromUnit, Unit toUnit, float nSrc, float* nTrg);
--int gdpi_utf8_to_glyphs (cairo_font_t* font, cairo_matrix_t matrix, const unsigned char* utf8, double	x0,
-+int gdpi_utf8_to_glyphs (cairo_font_t* font, cairo_matrix_t* matrix, const unsigned char* utf8, double	x0,
-    double y0, cairo_glyph_t** glyphs, size_t* nglyphs);
- 
- void gdip_font_drawunderline (GpGraphics *graphics, GpBrush *brush, float x, float y, float width);
-diff -aur libgdiplus-1.0.5/src/general.c libgdiplus-1.0.5-messy/src/general.c
---- libgdiplus-1.0.5/src/general.c	2004-11-13 19:28:19.000000000 -0500
-+++ libgdiplus-1.0.5-messy/src/general.c	2005-01-27 21:07:37.319679288 -0500
-@@ -269,17 +269,17 @@
- static void
- _install_font_matrix(cairo_matrix_t *matrix, FT_Face face)
- {
--    cairo_matrix_t normalized;
-+    cairo_matrix_t* normalized = cairo_matrix_create();
-     double scale_x, scale_y;
-     double xx, xy, yx, yy, tx, ty;
-     FT_Matrix mat;
- 
-     _gdip_cairo_matrix_compute_scale_factors (matrix, &scale_x, &scale_y);
- 
--    cairo_matrix_copy (&normalized, matrix);
-+    cairo_matrix_copy (normalized, matrix);
- 
--    cairo_matrix_scale (&normalized, 1.0 / scale_x, 1.0 / scale_y);
--    cairo_matrix_get_affine (&normalized,
-+    cairo_matrix_scale (normalized, 1.0 / scale_x, 1.0 / scale_y);
-+    cairo_matrix_get_affine (normalized,
-                              &xx /* 00 */ , &yx /* 01 */,
-                              &xy /* 10 */, &yy /* 11 */,
-                              &tx, &ty);
-@@ -298,7 +298,7 @@
- 
- int
- gdpi_utf8_to_glyphs (cairo_font_t	*font,
--                 cairo_matrix_t		matrix,
-+                 cairo_matrix_t		*matrix,
- 		 const unsigned char	*utf8,
- 		 double			x0,
- 		 double			y0,
-@@ -323,7 +323,7 @@
-         return 0;
-     }
- 
--    _install_font_matrix (&matrix, face);
-+    _install_font_matrix (matrix, face);
- 
-     for (i = 0; i < *nglyphs; i++)
-     {
-diff -aur libgdiplus-1.0.5/src/graphics.c libgdiplus-1.0.5-messy/src/graphics.c
---- libgdiplus-1.0.5/src/graphics.c	2004-11-13 19:28:19.000000000 -0500
-+++ libgdiplus-1.0.5-messy/src/graphics.c	2005-01-27 21:21:25.643754888 -0500
-@@ -448,7 +448,7 @@
- 	g_return_val_if_fail (graphics != NULL, InvalidParameter);
- 	g_return_val_if_fail (matrix != NULL, InvalidParameter);
- 
--        *(graphics->copy_of_ctm) = *(matrix);
-+        graphics->copy_of_ctm = matrix;
-         cairo_set_matrix (graphics->ct, graphics->copy_of_ctm);
-         return Ok;
- }
-@@ -1571,16 +1571,18 @@
- 	float			*GlyphWidths;
- 	float			TotalWidth	= 0;
- 	int			i;
--	cairo_matrix_t		matrix;
-+	cairo_matrix_t		*matrix;
- 
- #ifdef DRAWSTRING_DEBUG
- 	printf("CalculateStringSize(font, %s, %d, details) called\n", utf8, StringDetailElements);
- #endif
- 	Font=(cairo_font_t *)gdiFont->cairofnt;
- 
-+	matrix = cairo_matrix_create();
-+
- 	/* Generate Glyhps for string utf8 */
--	cairo_font_current_transform(Font, &matrix);
--	cairo_matrix_scale(&matrix, gdiFont->sizeInPixels, gdiFont->sizeInPixels);
-+	cairo_font_current_transform(Font, matrix);
-+	cairo_matrix_scale(matrix, gdiFont->sizeInPixels, gdiFont->sizeInPixels);
- 	gdpi_utf8_to_glyphs (Font, matrix, utf8, 0.0, 0.0, &Glyphs, &NumOfGlyphs);
- 
- 	/* FIXME - This check and the StringDetailElements argument can be removed after verification of Glyph:WChar=1:1 */
-@@ -1617,7 +1619,7 @@
- 	unsigned char		*String;		/* Holds the UTF8 version of our sanitized string */
- 	WCHAR			*CleanString;		/* Holds the unicode version of our sanitized string */
- 	unsigned long		StringLen;		/* Length of CleanString */
--	cairo_matrix_t		SavedMatrix;		
-+	cairo_matrix_t		*SavedMatrix;		
- 	GDIPCONST WCHAR		*Src;
- 	WCHAR	 		*Dest;
- 	GpStringFormat		*fmt;
-@@ -1683,12 +1685,13 @@
- 	/*
- 	   Get font size information; how expensive is the cairo stuff here? 
- 	*/
-+	SavedMatrix = cairo_matrix_create();
- 	cairo_save (graphics->ct);
- 	cairo_set_font (graphics->ct, (cairo_font_t*) font->cairofnt);
--	cairo_font_current_transform(font->cairofnt, &SavedMatrix);
-+	cairo_font_current_transform(font->cairofnt, SavedMatrix);
- 	cairo_scale_font (graphics->ct, font->sizeInPixels);
- 	cairo_current_font_extents (graphics->ct, &FontExtent);
--	cairo_font_set_transform(font->cairofnt, &SavedMatrix);
-+	cairo_font_set_transform(font->cairofnt, SavedMatrix);
- 	cairo_restore (graphics->ct);
- 	LineHeight=FontExtent.ascent;
- #ifdef DRAWSTRING_DEBUG
-@@ -2170,7 +2173,7 @@
- 		/* Setup cairo */
- 		/* Save the font matrix */
- 		cairo_set_font (graphics->ct, (cairo_font_t*) font->cairofnt);
--		cairo_font_current_transform(font->cairofnt, &SavedMatrix);
-+		cairo_font_current_transform(font->cairofnt, SavedMatrix);
- 
- 		if (brush) {
- 			gdip_brush_setup (graphics, (GpBrush *)brush);
-@@ -2307,7 +2310,7 @@
- 			}
- 		}
- 
--		cairo_font_set_transform(font->cairofnt, &SavedMatrix);
-+		cairo_font_set_transform(font->cairofnt, SavedMatrix);
- 		cairo_restore (graphics->ct);
- 	}
- 
-diff -aur libgdiplus-1.0.5/src/lineargradientbrush.c libgdiplus-1.0.5-messy/src/lineargradientbrush.c
---- libgdiplus-1.0.5/src/lineargradientbrush.c	2004-11-13 19:28:19.000000000 -0500
-+++ libgdiplus-1.0.5-messy/src/lineargradientbrush.c	2005-01-27 21:23:44.401660480 -0500
-@@ -1189,7 +1189,7 @@
- 	if (brush->presetColors->count >= 2)
- 		return WrongState;
- 
--	*matrix = *(brush->matrix);
-+	matrix = brush->matrix;
- 
- 	return Ok;
- }
-@@ -1200,7 +1200,9 @@
- 	g_return_val_if_fail (brush != NULL, InvalidParameter);
- 	g_return_val_if_fail (matrix != NULL, InvalidParameter);
- 
--	*(brush->matrix) = *matrix;
-+	brush->matrix = cairo_matrix_create();
-+	g_return_val_if_fail (brush->matrix != NULL, OutOfMemory);
-+	cairo_matrix_copy(brush->matrix, matrix);
- 	brush->changed = TRUE;
- 	return Ok;
- }
-diff -aur libgdiplus-1.0.5/src/matrix.c libgdiplus-1.0.5-messy/src/matrix.c
---- libgdiplus-1.0.5/src/matrix.c	2004-11-13 19:28:19.000000000 -0500
-+++ libgdiplus-1.0.5-messy/src/matrix.c	2005-01-27 21:27:43.823262864 -0500
-@@ -169,9 +169,13 @@
- GpStatus
- GdipTranslateMatrix (GpMatrix *matrix, float offsetX, float offsetY, GpMatrixOrder order)
- {
--        GpMatrix tmp;
--        cairo_matrix_set_affine (&tmp, 1, 0, 0, 1, offsetX, offsetY);
--        GpStatus s = GdipMultiplyMatrix (matrix, &tmp, order);
-+	cairo_matrix_t *tmp;
-+        GpStatus s;
-+
-+	tmp = cairo_matrix_create();
-+        cairo_matrix_set_affine (tmp, 1, 0, 0, 1, offsetX, offsetY);
-+        s = GdipMultiplyMatrix (matrix, tmp, order);
-+	cairo_matrix_destroy(tmp); 
- 
-         return s;
- }
-@@ -179,9 +183,13 @@
- GpStatus
- GdipScaleMatrix (GpMatrix *matrix, float scaleX, float scaleY, GpMatrixOrder order)
- {
--        GpMatrix tmp;
--        cairo_matrix_set_affine (&tmp, scaleX, 0, 0, scaleY, 0, 0);
--        GpStatus s = GdipMultiplyMatrix (matrix, &tmp, order);        
-+	cairo_matrix_t *tmp;
-+        GpStatus s;
-+
-+	tmp = cairo_matrix_create();
-+        cairo_matrix_set_affine (tmp, scaleX, 0, 0, scaleY, 0, 0);
-+        s = GdipMultiplyMatrix (matrix, tmp, order);        
-+	cairo_matrix_destroy(tmp);
- 
-         return s;
- }
-@@ -189,10 +197,14 @@
- GpStatus
- GdipRotateMatrix (GpMatrix *matrix, float angle, GpMatrixOrder order)
- {
--	GpMatrix tmp;
-+	cairo_matrix_t *tmp;
-+        GpStatus s;
-         float rad = angle * DEGTORAD;
--        cairo_matrix_set_affine (&tmp, cos (rad), sin (rad), -sin (rad), cos (rad), 0, 0);
--        GpStatus s = GdipMultiplyMatrix (matrix, &tmp, order);
-+
-+	tmp = cairo_matrix_create();
-+        cairo_matrix_set_affine (tmp, cos (rad), sin (rad), -sin (rad), cos (rad), 0, 0);
-+        s = GdipMultiplyMatrix (matrix, tmp, order);
-+	cairo_matrix_destroy(tmp);
- 
-         return s;
- }
-@@ -200,9 +212,13 @@
- GpStatus
- GdipShearMatrix (GpMatrix *matrix, float shearX, float shearY, GpMatrixOrder order)
- {
--        GpMatrix tmp;
--        cairo_matrix_set_affine (&tmp, 1, shearX, shearY, 1, 0, 0);
--        GpStatus s = GdipMultiplyMatrix (matrix, &tmp, order);
-+	cairo_matrix_t *tmp;
-+        GpStatus s;
-+
-+	tmp = cairo_matrix_create();
-+        cairo_matrix_set_affine (tmp, 1, shearX, shearY, 1, 0, 0);
-+        s = GdipMultiplyMatrix (matrix, tmp, order);
-+	cairo_matrix_destroy(tmp);
- 
-         return s;
- }
-diff -aur libgdiplus-1.0.5/src/pathgradientbrush.c libgdiplus-1.0.5-messy/src/pathgradientbrush.c
---- libgdiplus-1.0.5/src/pathgradientbrush.c	2004-11-13 19:28:19.000000000 -0500
-+++ libgdiplus-1.0.5-messy/src/pathgradientbrush.c	2005-01-27 23:05:13.196023040 -0500
-@@ -481,7 +481,7 @@
-     g_return_val_if_fail (brush != NULL, InvalidParameter);
-     g_return_val_if_fail (matrix != NULL, InvalidParameter);
- 
--    *matrix = *(brush->transform);
-+    cairo_matrix_copy(matrix, brush->transform);
-     return Ok;
- }
- 
-@@ -491,7 +491,7 @@
-     g_return_val_if_fail (brush != NULL, InvalidParameter);
-     g_return_val_if_fail (matrix != NULL, InvalidParameter);
- 
--    *(brush->transform) = *matrix;
-+    brush->transform = matrix;
-     return Ok;
- }
- 
-@@ -506,19 +506,22 @@
- GpStatus
- GdipMultiplyPathGradientTransform (GpPathGradient *brush, GDIPCONST GpMatrix *matrix, GpMatrixOrder order)
- {
--    cairo_matrix_t mat;
-+    cairo_matrix_t *mat;
-     g_return_val_if_fail (brush != NULL, InvalidParameter);
-     g_return_val_if_fail (matrix != NULL, InvalidParameter);
- 
-+    mat = cairo_matrix_create();
-+
-     if (order == MatrixOrderPrepend)
--        cairo_matrix_multiply (&mat, matrix, brush->transform);
-+        cairo_matrix_multiply (mat, matrix, brush->transform);
-     else if (order == MatrixOrderAppend)
--        cairo_matrix_multiply (&mat, brush->transform, matrix);
--    else
-+        cairo_matrix_multiply (mat, brush->transform, matrix);
-+    else {
-+	cairo_matrix_destroy(mat);
-         return InvalidParameter;
-+    }
- 
--    *(brush->transform) = mat;
--
-+    brush->transform = mat;
-     return Ok;
- }
- 
-@@ -530,11 +533,17 @@
-     if (order == MatrixOrderAppend) {
-         cairo_matrix_translate (brush->transform, dx, dy);
-     } else if (order == MatrixOrderPrepend) {
--        cairo_matrix_t mat, matres;
--        cairo_matrix_set_identity (&mat);
--        cairo_matrix_translate (&mat, dx, dy);
--        cairo_matrix_multiply (&matres, &mat, brush->transform);
--        *(brush->transform) = matres;
-+        cairo_matrix_t *mat, *matres;
-+
-+	mat = cairo_matrix_create();
-+	matres = cairo_matrix_create();
-+
-+        cairo_matrix_set_identity (mat);
-+        cairo_matrix_translate (mat, dx, dy);
-+        cairo_matrix_multiply (matres, mat, brush->transform);
-+        brush->transform = matres;
-+
-+	cairo_matrix_destroy(mat);
-     } else {
-         return InvalidParameter;
-     }
-@@ -550,11 +559,16 @@
-     if (order == MatrixOrderAppend) {
-         cairo_matrix_scale (brush->transform, sx, sy);
-     } else if (order == MatrixOrderPrepend) {
--        cairo_matrix_t mat, matres;
--        cairo_matrix_set_identity (&mat);
--        cairo_matrix_scale (&mat, sx, sy);
--        cairo_matrix_multiply (&matres, &mat, brush->transform);
--        *(brush->transform) = matres;
-+        cairo_matrix_t *mat, *matres;
-+
-+	mat = cairo_matrix_create();
-+	matres = cairo_matrix_create();
-+        cairo_matrix_set_identity (mat);
-+        cairo_matrix_scale (mat, sx, sy);
-+        cairo_matrix_multiply (matres, mat, brush->transform);
-+        brush->transform = matres;
-+
-+	cairo_matrix_destroy(mat);
-     } else {
-         return InvalidParameter;
-     }
-@@ -570,11 +584,17 @@
-     if (order == MatrixOrderAppend) {
-         cairo_matrix_rotate (brush->transform, angle * DEGTORAD);
-     } else if (order == MatrixOrderPrepend) {
--        cairo_matrix_t mat, matres;
--        cairo_matrix_set_identity (&mat);
--        cairo_matrix_rotate (&mat, angle * DEGTORAD);
--        cairo_matrix_multiply (&matres, &mat, brush->transform);
--        *(brush->transform) = matres;
-+        cairo_matrix_t *mat, *matres;
-+
-+	mat = cairo_matrix_create();
-+	matres  = cairo_matrix_create();
-+	
-+        cairo_matrix_set_identity (mat);
-+        cairo_matrix_rotate (mat, angle * DEGTORAD);
-+        cairo_matrix_multiply (matres, mat, brush->transform);
-+        brush->transform = matres;
-+
-+	cairo_matrix_destroy(mat);
-     } else {
-         return InvalidParameter;
-     }
-diff -aur libgdiplus-1.0.5/src/pen.c libgdiplus-1.0.5-messy/src/pen.c
---- libgdiplus-1.0.5/src/pen.c	2004-11-13 19:28:19.000000000 -0500
-+++ libgdiplus-1.0.5-messy/src/pen.c	2005-01-27 21:28:51.829924280 -0500
-@@ -543,7 +543,8 @@
- 	g_return_val_if_fail (pen != NULL, InvalidParameter);
- 	g_return_val_if_fail (matrix != NULL, InvalidParameter);
- 
--        *(pen->matrix) = *matrix;
-+        pen->matrix = cairo_matrix_create();
-+	cairo_matrix_copy(pen->matrix, matrix);
- 	pen->changed = TRUE;
-         return Ok;
- }
-@@ -554,7 +555,7 @@
- 	g_return_val_if_fail (pen != NULL, InvalidParameter);
- 	g_return_val_if_fail (matrix != NULL, InvalidParameter);
- 
--        *matrix = *(pen->matrix);
-+	cairo_matrix_copy(matrix, pen->matrix);
-         return Ok;
- }
- 
-diff -aur libgdiplus-1.0.5/src/texturebrush.c libgdiplus-1.0.5-messy/src/texturebrush.c
---- libgdiplus-1.0.5/src/texturebrush.c	2004-11-13 19:28:19.000000000 -0500
-+++ libgdiplus-1.0.5-messy/src/texturebrush.c	2005-01-27 21:44:47.726605896 -0500
-@@ -714,7 +714,7 @@
- 	g_return_val_if_fail (texture != NULL, InvalidParameter);
- 	g_return_val_if_fail (matrix != NULL, InvalidParameter);
- 
--	*matrix = *(texture->matrix);
-+	cairo_matrix_copy(matrix, texture->matrix);
- 	return Ok;
- }
- 
-@@ -724,7 +724,8 @@
- 	g_return_val_if_fail (texture != NULL, InvalidParameter);
- 	g_return_val_if_fail (matrix != NULL, InvalidParameter);
- 
--	*(texture->matrix) = *matrix;
-+        texture->matrix = cairo_matrix_create();
-+        cairo_matrix_copy(texture->matrix, matrix);
- 	texture->changed = TRUE;
- 
- 	return Ok;
diff --git a/dev-dotnet/libgdiplus/files/libgdiplus-1.0.6-giflib.diff b/dev-dotnet/libgdiplus/files/libgdiplus-1.0.6-giflib.diff
deleted file mode 100644
index eb8a790a00f4..000000000000
--- a/dev-dotnet/libgdiplus/files/libgdiplus-1.0.6-giflib.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -aur libgdiplus-1.0.6-orig/configure.in libgdiplus-1.0.6/configure.in
---- libgdiplus-1.0.6-orig/configure.in	2005-01-31 20:40:50.000000000 -0500
-+++ libgdiplus-1.0.6/configure.in	2005-04-07 19:12:59.000000000 -0400
-@@ -115,7 +115,7 @@
- AC_ARG_WITH(libtiff,
- 	[AC_HELP_STRING([--without-libtiff], [disable TIFF file IO])])
- AC_ARG_WITH(libungif,
--	[AC_HELP_STRING([--without-libungif], [disable GIF file IO])])
-+	[AC_HELP_STRING([--without-libgif], [disable GIF file IO])])
- AC_ARG_WITH(libpng,
- 	[AC_HELP_STRING([--without-libpng], [disable PNG file IO])])
- 
-@@ -172,17 +172,17 @@
- fi
- 
- dnl Test for libungif
--  if test x$with_libungif != xno && test -z "$LIBUNGIF"; then
--    AC_CHECK_LIB(ungif, DGifOpenFileName,
-+  if test x$with_libgif != xno && test -z "$LIBGIF"; then
-+    AC_CHECK_LIB(gif, DGifOpenFileName,
-       [AC_CHECK_HEADER(gif_lib.h,
--        UNGIF='ungif'; LIBUNGIF='-lungif',
--	AC_MSG_WARN(*** GIF loader will not be built (ungiflibrary not found) ***))],
--      AC_MSG_WARN(*** GIF loader will not be built (ungiflibrary not found) ***))
-+        GIF='ungif'; LIBGIF='-lgif',
-+	AC_MSG_WARN(*** GIF loader will not be built (giflibrary not found) ***))],
-+      AC_MSG_WARN(*** GIF loader will not be built (giflibrary not found) ***))
-   fi
- 
--if test x$UNGIF != x; then
--  GDIPLUS_LIBS="$GDIPLUS_LIBS $LIBUNGIF"
--  AC_DEFINE(HAVE_LIBUNGIF, 1, Define if gif support is available)
-+if test x$GIF != x; then
-+  GDIPLUS_LIBS="$GDIPLUS_LIBS $LIBGIF"
-+  AC_DEFINE(HAVE_LIBGIF, 1, Define if gif support is available)
- fi
- 
- dnl Test for libpng
-@@ -246,7 +246,7 @@
- echo $ECHO_N "      - JPEG: "
- test ! x$JPEG = x && echo yes || echo no 
- echo $ECHO_N "      - GIF: "
--test ! x$UNGIF = x && echo yes || echo no 
-+test ! x$GIF = x && echo yes || echo no 
- echo $ECHO_N "      - PNG: "
- test ! x$PNG = x && echo yes || echo no 
- echo ""
-Only in libgdiplus-1.0.6: configure.in.orig
-diff -aur libgdiplus-1.0.6-orig/src/gifcodec.c libgdiplus-1.0.6/src/gifcodec.c
---- libgdiplus-1.0.6-orig/src/gifcodec.c	2004-11-13 19:28:19.000000000 -0500
-+++ libgdiplus-1.0.6/src/gifcodec.c	2005-04-07 19:12:59.000000000 -0400
-@@ -34,7 +34,7 @@
- #include "gdipImage.h"
- #include "gifcodec.h"
- 
--#ifdef HAVE_LIBUNGIF
-+#ifdef HAVE_LIBGIF
- 
- #include <gif_lib.h>
- 
diff --git a/dev-dotnet/libgdiplus/files/libgdiplus-1.1.10-libungif-configure-fix.diff b/dev-dotnet/libgdiplus/files/libgdiplus-1.1.10-libungif-configure-fix.diff
deleted file mode 100644
index 32eba37c584f..000000000000
--- a/dev-dotnet/libgdiplus/files/libgdiplus-1.1.10-libungif-configure-fix.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -aur libgdiplus-1.1.10-orig/configure.in libgdiplus-1.1.10/configure.in
---- libgdiplus-1.1.10-orig/configure.in	2005-11-09 19:08:08.000000000 -0800
-+++ libgdiplus-1.1.10/configure.in	2005-12-22 00:53:51.000000000 -0800
-@@ -207,8 +207,8 @@
-       AC_MSG_WARN(*** GIF loader will not be built (giflibrary not found) ***))
-   fi
- 
--if ! test x$GIF != x; then
--   AC_CHECK_LIB(gif, DGifOpenFileName,
-+if test x$with_libgif != xno && ! test x$GIF != x; then
-+   AC_CHECK_LIB(ungif, DGifOpenFileName,
-       [AC_CHECK_HEADER(gif_lib.h,
- 	GIF='ungif'; LIBGIF='-lungif',
- 	AC_MSG_WARN(*** GIF loader will not be built (ungiflibrary not found) ***))],
diff --git a/dev-dotnet/libgdiplus/files/libgdiplus-1.1.4-giflib.diff b/dev-dotnet/libgdiplus/files/libgdiplus-1.1.4-giflib.diff
deleted file mode 100644
index 14ea64578846..000000000000
--- a/dev-dotnet/libgdiplus/files/libgdiplus-1.1.4-giflib.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -aur libgdiplus-1.1.4-cairo-fix-orig/configure.in libgdiplus-1.1.4-cairo-fix/configure.in
---- libgdiplus-1.1.4-cairo-fix-orig/configure.in	2005-03-20 20:58:49.000000000 -0500
-+++ libgdiplus-1.1.4-cairo-fix/configure.in	2005-03-20 20:49:51.000000000 -0500
-@@ -140,7 +140,7 @@
- AC_ARG_WITH(libtiff,
- 	[AC_HELP_STRING([--without-libtiff], [disable TIFF file IO])])
- AC_ARG_WITH(libungif,
--	[AC_HELP_STRING([--without-libungif], [disable GIF file IO])])
-+	[AC_HELP_STRING([--without-libgif], [disable GIF file IO])])
- AC_ARG_WITH(libpng,
- 	[AC_HELP_STRING([--without-libpng], [disable PNG file IO])])
- 
-@@ -197,17 +197,17 @@
- fi
- 
- dnl Test for libungif
--  if test x$with_libungif != xno && test -z "$LIBUNGIF"; then
--    AC_CHECK_LIB(ungif, DGifOpenFileName,
-+  if test x$with_libgif != xno && test -z "$LIBGIF"; then
-+    AC_CHECK_LIB(gif, DGifOpenFileName,
-       [AC_CHECK_HEADER(gif_lib.h,
--        UNGIF='ungif'; LIBUNGIF='-lungif',
--	AC_MSG_WARN(*** GIF loader will not be built (ungiflibrary not found) ***))],
--      AC_MSG_WARN(*** GIF loader will not be built (ungiflibrary not found) ***))
-+        GIF='ungif'; LIBGIF='-lgif',
-+	AC_MSG_WARN(*** GIF loader will not be built (giflibrary not found) ***))],
-+      AC_MSG_WARN(*** GIF loader will not be built (giflibrary not found) ***))
-   fi
- 
--if test x$UNGIF != x; then
--  GDIPLUS_LIBS="$GDIPLUS_LIBS $LIBUNGIF"
--  AC_DEFINE(HAVE_LIBUNGIF, 1, Define if gif support is available)
-+if test x$GIF != x; then
-+  GDIPLUS_LIBS="$GDIPLUS_LIBS $LIBGIF"
-+  AC_DEFINE(HAVE_LIBGIF, 1, Define if gif support is available)
- fi
- 
- dnl Test for libpng
-@@ -271,7 +271,7 @@
- echo $ECHO_N "      - JPEG: "
- test ! x$JPEG = x && echo yes || echo no 
- echo $ECHO_N "      - GIF: "
--test ! x$UNGIF = x && echo yes || echo no 
-+test ! x$GIF = x && echo yes || echo no 
- echo $ECHO_N "      - PNG: "
- test ! x$PNG = x && echo yes || echo no 
- echo ""
-diff -aur libgdiplus-1.1.4-cairo-fix-orig/src/gifcodec.c libgdiplus-1.1.4-cairo-fix/src/gifcodec.c
---- libgdiplus-1.1.4-cairo-fix-orig/src/gifcodec.c	2005-01-26 20:33:54.000000000 -0500
-+++ libgdiplus-1.1.4-cairo-fix/src/gifcodec.c	2005-03-20 21:13:18.000000000 -0500
-@@ -34,7 +34,7 @@
- #include "gdipImage.h"
- #include "gifcodec.h"
- 
--#ifdef HAVE_LIBUNGIF
-+#ifdef HAVE_LIBGIF
- 
- #include <gif_lib.h>
- 
diff --git a/dev-dotnet/libgdiplus/files/libgdiplus-1.1.4-included-cairo-fix.diff b/dev-dotnet/libgdiplus/files/libgdiplus-1.1.4-included-cairo-fix.diff
deleted file mode 100644
index 5c6d7ffcc3ec..000000000000
--- a/dev-dotnet/libgdiplus/files/libgdiplus-1.1.4-included-cairo-fix.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -aur libgdiplus-1.1.4/configure.in libgdiplus-1.1.4-cairo-fix/configure.in
---- libgdiplus-1.1.4/configure.in	2005-01-26 20:33:54.000000000 -0500
-+++ libgdiplus-1.1.4-cairo-fix/configure.in	2005-02-03 21:20:58.826151752 -0500
-@@ -30,6 +30,7 @@
- 	CAIRO_LIBS='$(top_builddir)/cairo/src/libcairo.la'
- 	CAIRO_CFLAGS='-I$(top_srcdir)/libpixman/src -I$(top_srcdir)/cairo/src'
- 	AC_DEFINE(USE_INCLUDED_CAIRO,1,[Use Cairo bundled in libgdiplus])
-+	AM_CONDITIONAL(USE_INCLUDED_CAIRO, true)
- else
- 	if pkg-config --exact-version 0.3.0 cairo; then
- 		echo Cairo installation OK
-@@ -39,6 +40,7 @@
- 
- 	CAIRO_LIBS="`pkg-config --libs cairo`"
- 	CAIRO_CFLAGS="`pkg-config --cflags cairo`"
-+	AM_CONDITIONAL(USE_INCLUDED_CAIRO, false)
- fi
- 
- GDIPLUS_LIBS="$CAIRO_LIBS `pkg-config --libs glib-2.0 ` `freetype-config --libs`"
-diff -aur libgdiplus-1.1.4/Makefile.am libgdiplus-1.1.4-cairo-fix/Makefile.am
---- libgdiplus-1.1.4/Makefile.am	2005-01-25 14:43:11.000000000 -0500
-+++ libgdiplus-1.1.4-cairo-fix/Makefile.am	2005-02-03 21:15:22.270316016 -0500
-@@ -1,4 +1,9 @@
--SUBDIRS = libpixman cairo src tests
-+SUBDIRS = 
-+if USE_INCLUDED_CAIRO
-+SUBDIRS += libpixman cairo
-+endif
-+
-+SUBDIRS += src tests
- 
- pkgconfigdir = $(libdir)/pkgconfig
- 
diff --git a/dev-dotnet/libgdiplus/files/libgdiplus-1.1.5-nogif.diff b/dev-dotnet/libgdiplus/files/libgdiplus-1.1.5-nogif.diff
deleted file mode 100644
index 19d8dc402308..000000000000
--- a/dev-dotnet/libgdiplus/files/libgdiplus-1.1.5-nogif.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur libgdiplus-1.1.5-orig/src/gifcodec.c libgdiplus-1.1.5/src/gifcodec.c
---- libgdiplus-1.1.5-orig/src/gifcodec.c	2005-03-17 13:45:44.000000000 -0500
-+++ libgdiplus-1.1.5/src/gifcodec.c	2005-03-30 15:47:51.000000000 -0500
-@@ -511,7 +511,7 @@
- }
- 
- GpStatus 
--gdip_save_gif_image_to_file (unsigned char *filename, GpImage *image)
-+gdip_save_gif_image_to_file (char *filename, GpImage *image)
- {
- 	return UnknownImageFormat;
- }
diff --git a/dev-dotnet/libgdiplus/files/libgdiplus-1.1.8-giflib.diff b/dev-dotnet/libgdiplus/files/libgdiplus-1.1.8-giflib.diff
deleted file mode 100644
index 2b8f1553a532..000000000000
--- a/dev-dotnet/libgdiplus/files/libgdiplus-1.1.8-giflib.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -aur libgdiplus-1.1.8-orig/configure.in libgdiplus-1.1.8/configure.in
---- libgdiplus-1.1.8-orig/configure.in	2005-06-10 12:12:34.000000000 -0400
-+++ libgdiplus-1.1.8/configure.in	2005-06-21 19:23:45.000000000 -0400
-@@ -138,7 +138,7 @@
- AC_ARG_WITH(libtiff,
- 	[AC_HELP_STRING([--without-libtiff], [disable TIFF file IO])])
- AC_ARG_WITH(libungif,
--	[AC_HELP_STRING([--without-libungif], [disable GIF file IO])])
-+	[AC_HELP_STRING([--without-libgif], [disable GIF file IO])])
- AC_ARG_WITH(libpng,
- 	[AC_HELP_STRING([--without-libpng], [disable PNG file IO])])
- 
-@@ -195,17 +195,17 @@
- fi
- 
- dnl Test for libungif
--  if test x$with_libungif != xno && test -z "$LIBUNGIF"; then
--    AC_CHECK_LIB(ungif, DGifOpenFileName,
-+  if test x$with_libgif != xno && test -z "$LIBGIF"; then
-+    AC_CHECK_LIB(gif, DGifOpenFileName,
-       [AC_CHECK_HEADER(gif_lib.h,
--        UNGIF='ungif'; LIBUNGIF='-lungif',
--	AC_MSG_WARN(*** GIF loader will not be built (ungiflibrary not found) ***))],
--      AC_MSG_WARN(*** GIF loader will not be built (ungiflibrary not found) ***))
-+        GIF='ungif'; LIBGIF='-lgif',
-+	AC_MSG_WARN(*** GIF loader will not be built (giflibrary not found) ***))],
-+      AC_MSG_WARN(*** GIF loader will not be built (giflibrary not found) ***))
-   fi
- 
--if test x$UNGIF != x; then
--  GDIPLUS_LIBS="$GDIPLUS_LIBS $LIBUNGIF"
--  AC_DEFINE(HAVE_LIBUNGIF, 1, Define if gif support is available)
-+if test x$GIF != x; then
-+  GDIPLUS_LIBS="$GDIPLUS_LIBS $LIBGIF"
-+  AC_DEFINE(HAVE_LIBGIF, 1, Define if gif support is available)
- fi
- 
- dnl Test for libpng
-@@ -276,7 +276,7 @@
- echo $ECHO_N "      - JPEG: "
- test ! x$JPEG = x && echo yes || echo "no (Get it from http://freshmeat.net/projects/libjpeg)"
- echo $ECHO_N "      - GIF: "
--test ! x$UNGIF = x && echo yes || echo "no (See http://sourceforge.net/projects/libungif)"
-+test ! x$GIF = x && echo yes || echo "no (See http://sourceforge.net/projects/libungif)"
- echo $ECHO_N "      - PNG: "
- test ! x$PNG = x && echo yes || echo "no (See http://www.libpng.org/pub/png/libpng.html)"
- echo ""
-diff -aur libgdiplus-1.1.8-orig/src/gifcodec.c libgdiplus-1.1.8/src/gifcodec.c
---- libgdiplus-1.1.8-orig/src/gifcodec.c	2005-06-13 15:17:10.000000000 -0400
-+++ libgdiplus-1.1.8/src/gifcodec.c	2005-06-21 19:23:02.000000000 -0400
-@@ -35,7 +35,7 @@
- #include "gdipImage.h"
- #include "gifcodec.h"
- 
--#ifdef HAVE_LIBUNGIF
-+#ifdef HAVE_LIBGIF
- 
- #include <gif_lib.h>
- 
-Only in libgdiplus-1.1.8/src: gifcodec.c.orig