Cleaned most of outdated stuff

26 files changed, 38 insertions, 1524 deletions

diff --git a/media-libs/gdk-pixbuf/Manifest b/media-libs/gdk-pixbuf/Manifest
deleted file mode 100644
index d9c5120..0000000
--- a/media-libs/gdk-pixbuf/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch 1157 SHA256 d3196c1666f560997bc5cd5be4787156c64f92dc0fd8dada8ad3c16793b90970 SHA512 e4aa5edc91ae1319f062a518612f6776bc03beb6db5a6a0e7b9c22b94d5f6433b26040b6a2c27fcb91b4094da45dcf1fddb7cb702bac64952ee0899b5b005a6c WHIRLPOOL 255040e3941fdc0dc16d57ef2802d1c3b8610f7eec26d4d828d120121402731f53a4427430060b1d61aef5ff007ee5c16de50877c6111e58a489c40f2bb9bdac
-AUX gdk-pixbuf-0.22.0-bmp_secure.patch 557 SHA256 1bb9330c75e8ceb927620f03717d442185b84602b9ec67bb6940518aabdff5f8 SHA512 5d9ceab886f606bb9983ed6ab21a58edbade392ac7cb57ee77ad3a1e5e2fd192739d3a0ea3f30981d637a21fdda2de3747c9fd805335072516afa727ec6e32d3 WHIRLPOOL 14f6c01d013a78de367a66223ff264d0c369eff88138e4a88f8e2ed779e69994ea6bec8015fbdd7570a06c8d19318e80791b8c98a8c692fcf09d89d6ea8f1739
-AUX gdk-pixbuf-0.22.0-loaders.patch 3589 SHA256 310824874429c26b277c985b218e133ded4e94c51de389979875de38ddb57400 SHA512 ce20cc96c7e4d540eec9f2b53c424ed8e0aaf51ae4f58f4c521380b357bf69ccff89b0865fac8b792cca9a42892602af651ab5965edb569cad7b5ecee1ea36ae WHIRLPOOL cbcf25a12b614f276b350b042f3471aefcc09cd517e4710157fe9b707ecc37ff32c0468b5d51c1d594c9343e82d5568e966a544d751d3ef9d5bd734ad484f72c
-AUX gdk-pixbuf-0.22.0-m4.patch 276 SHA256 4a62476624319a09c000d01d45689167ea5cf1665e4c7e988032ffff11920132 SHA512 b22c73982d13a0a6200e48f436cdf1a34fe8882c70da8ce0bb86a0cc1e0f7887e25ceeb6affb57222a7158d05112fb711a8f1d34c05085b47750eed04a094901 WHIRLPOOL ad974a9ba450c62f00bbd84dff3c469b2033109adb0ca09f5e5c9eb5bff3ef7487bf555363bfab691079ba6528bf1c2eff13c5f05349214938099c0bacffa7d3
-AUX gdk-pixbuf-ds-png.diff 1309 SHA256 db45815b76f01f888581e4dfe5affb45febf370ec85e0a59e4ae079adff29137 SHA512 bfd483dd030de81a3ecb1de16a9ce0d666a9dcafee0243e4bcc9b68a632d4e4739d9b9a0ce4bc61ae5615f6c2b309f22c0d9132c3e5e85ce0768e3f9c15bbce8 WHIRLPOOL a29bc0eb96c8b5326e51a4b2984f03860f2090ff27936710d683ca8a16f3d49372777d1d42d57c9665e95d22cf6a539ab25ee86d5079112de603db2fabcff6ed
-DIST gdk-pixbuf-0.22.0.tar.bz2 398208 SHA256 411f2a1c27c3afadc5d034f2213d9f6c3a37f564eb5989cf6e8a53729280ae22 SHA512 69ebc3030f978283a3014dc6037304dd67daf912e6a1eda8d6853aa2ad10a226b310c82049ce78de3665dda363083b08eb3c7942f77a7cd0fc76282d8cfc5a95 WHIRLPOOL 403d1fe50d97683f86aacb0fcb3a9cf7bb7e22568bff04dc511da22c854e3edb615bd0c8ab95d3cef06541a3ae83de6f7f15b01d7b1274fc46626264fa2218ec
-EBUILD gdk-pixbuf-0.22.0-r5.ebuild 1779 SHA256 da124f65e28024d47ee693071b14ecdd4b86cd7b1f44dfa8b5c18014bf7a4859 SHA512 f8de7c177412af76aac602d4fca180414872a759af597365b5d3d90b104930e1748b293ddf69d0627f717e4d58e8c22a1190a4622cb4014ecdd4aea58015e08b WHIRLPOOL 178d1294600757d5ba3c9fcfe7f4c56b6bc5bec3f9ea347d2451f39bd9ebc5883233d708398e8f527b385d640c7dc176485788c767773aef168206f3f3465249
-EBUILD gdk-pixbuf-0.22.0-r6.ebuild 1835 SHA256 310b5d95375290f4b0b989f884decb38d147ed431bd4b2ffd4d6660e1d9e524f SHA512 77230088acb6c2bfc1f2f3c0ca457cf7a7813949441fb15b3b0b59c1dfb1fad4d78a2080d8cb0986a095458f8f9bde8b7f6c023e75e8b89f1d5dd2176e5724d9 WHIRLPOOL 38e05d2207138451733bc7027ffc08eeccc799c4f4a0b06a2d440825ce6021a40a6ea41b583cd466181a49167e6ae232df1dda9470a211f91259fc21c321bf6f
-EBUILD gdk-pixbuf-0.22.0-r7.ebuild 1834 SHA256 ef6eed63155a9dc0754f2443d96aa64dcda56fd64a9559db9988f92e2296bc92 SHA512 e49f66688f766566483fdf8d13ec15e746ac1b2c5d440357a6f7960d20265d7c6c34f37213a1743f5217d135b071066183fb54720f2f7b65f5dc0e96fd1e47a4 WHIRLPOOL 7cd04d85aeb782b47a3a926a2523fbbed5610f1048520fe0fd467f604cc018f2b847508f0591758bb64078e3f5bf46c0302d94698b71646894935edc69434df6
diff --git a/media-libs/gdk-pixbuf/files/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch b/media-libs/gdk-pixbuf/files/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch
deleted file mode 100644
index ffb4378..0000000
--- a/media-libs/gdk-pixbuf/files/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- gdk-pixbuf-0.22.0/gdk-pixbuf/io-bmp.c	2002-09-27 23:12:40.000000000 +0200
-+++ gdk-pixbuf-0.22.0.patched/gdk-pixbuf/io-bmp.c	2005-03-30 01:33:06.000000000 +0200
-@@ -31,8 +31,6 @@
- #include "gdk-pixbuf-private.h"
- #include "gdk-pixbuf-io.h"
- 
--
--
- #if 0
- /* If these structures were unpacked, they would define the two headers of the
-  * BMP file.  After them comes the palette, and then the image data.
-@@ -206,7 +204,7 @@
- 
- 	if (State == NULL)
- 		return NULL;
--
-+ 	
- 	while (feof(f) == 0) {
- 		length = fread(membuf, 1, sizeof (membuf), f);
- 		if (length > 0)
-@@ -245,11 +243,26 @@
- static gboolean
- grow_buffer (struct bmp_progressive_state *State)
- {
--  guchar *tmp = realloc (State->buff, State->BufferSize);
-+  guchar *tmp;
-+
-+  if (State->BufferSize == 0) {
-+#if 0
-+    g_set_error (error,
-+		 GDK_PIXBUF_ERROR,
-+		 GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
-+		 _("BMP image has bogus header data"));
-+#endif
-+    State->read_state = READ_STATE_ERROR;
-+    return FALSE;
-+  }
-+
-+  tmp = realloc (State->buff, State->BufferSize);
-+
-   if (!tmp) {
-     State->read_state = READ_STATE_ERROR;
-     return FALSE;
-   }
-+
-   State->buff = tmp;
-   return TRUE;
- }
diff --git a/media-libs/gdk-pixbuf/files/gdk-pixbuf-0.22.0-bmp_secure.patch b/media-libs/gdk-pixbuf/files/gdk-pixbuf-0.22.0-bmp_secure.patch
deleted file mode 100644
index 29471f1..0000000
--- a/media-libs/gdk-pixbuf/files/gdk-pixbuf-0.22.0-bmp_secure.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: io-bmp.c
-===================================================================
-RCS file: /cvs/gnome/gtk+/gdk-pixbuf/io-bmp.c,v
-retrieving revision 1.41
-diff -u -p -r1.41 io-bmp.c
---- gdk-pixbuf/io-bmp.c	13 Aug 2004 02:26:57 -0000	1.41
-+++ gdk-pixbuf/io-bmp.c	20 Aug 2004 00:18:14 -0000
-@@ -876,8 +876,10 @@ DoCompressed(struct bmp_progressive_stat
- 	guchar c;
- 	gint idx;
- 
--	if (context->compr.y >= context->Header.height)
-+	if (context->compr.y >= context->Header.height) {
-+		context->BufferDone = 0;
- 		return TRUE;
-+	}
- 
- 	y = context->compr.y;
- 
diff --git a/media-libs/gdk-pixbuf/files/gdk-pixbuf-0.22.0-loaders.patch b/media-libs/gdk-pixbuf/files/gdk-pixbuf-0.22.0-loaders.patch
deleted file mode 100644
index 0686538..0000000
--- a/media-libs/gdk-pixbuf/files/gdk-pixbuf-0.22.0-loaders.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-diff -NurdB gdk-pixbuf-0.22.0/gdk-pixbuf/io-ico.c gdk-pixbuf-0.22.0-patched/gdk-pixbuf/io-ico.c
---- gdk-pixbuf-0.22.0/gdk-pixbuf/io-ico.c	2002-09-27 17:19:15.000000000 -0500
-+++ gdk-pixbuf-0.22.0-patched/gdk-pixbuf/io-ico.c	2005-10-27 11:28:23.000000000 -0500
-@@ -330,6 +330,9 @@
- 
- 	State->HeaderSize+=I;
- 
-+ 	if (State->HeaderSize < 0)
-+ 		return FALSE;
-+ 
-  	if (State->HeaderSize>State->BytesInHeaderBuf) {
- 		guchar *tmp=realloc(State->HeaderBuf,State->HeaderSize);
- 		if (!tmp)
-diff -NurdB gdk-pixbuf-0.22.0/gdk-pixbuf/io-xpm.c gdk-pixbuf-0.22.0-patched/gdk-pixbuf/io-xpm.c
---- gdk-pixbuf-0.22.0/gdk-pixbuf/io-xpm.c	2001-03-01 15:16:28.000000000 -0500
-+++ gdk-pixbuf-0.22.0-patched/gdk-pixbuf/io-xpm.c	2005-10-27 11:29:14.000000000 -0500
-@@ -243,8 +243,8 @@
- 			break;
- 		else {
- 			if (numnames > 0) {
--				space -= 1;
--				strcat (color, " ");
-+				strncat (color, " ", space);
-+				space -= MIN (space, 1);
- 			}
- 
- 			strncat (color, temp, space);
-@@ -281,7 +281,8 @@
- 		/* Fall through to the xpm_read_string. */
- 
- 	case op_body:
--		xpm_read_string (h->infile, &h->buffer, &h->buffer_size);
-+		if(!xpm_read_string (h->infile, &h->buffer, &h->buffer_size))
-+			return NULL;
- 		return h->buffer;
- 
- 	default:
-@@ -317,13 +318,6 @@
- 	return NULL;
- }
- 
--/* Destroy notification function for the pixbuf */
--static void
--free_buffer (guchar *pixels, gpointer data)
--{
--	free (pixels);
--}
--
- static gboolean
- xpm_color_parse (const char *spec, XColor *color)
- {
-@@ -342,7 +336,8 @@
- 	gchar pixel_str[32];
- 	GHashTable *color_hash;
- 	_XPMColor *colors, *color, *fallbackcolor;
--	guchar *pixels, *pixtmp;
-+	guchar *pixtmp;
-+	GdkPixbuf* pixbuf;
- 
- 	fallbackcolor = NULL;
- 
-@@ -352,16 +347,33 @@
- 		return NULL;
- 	}
- 	sscanf (buffer, "%d %d %d %d", &w, &h, &n_col, &cpp);
--	if (cpp >= 32) {
--		g_warning ("XPM has more than 31 chars per pixel.");
-+	if (cpp <= 0 || cpp >= 32) {
-+		g_warning ("XPM has invalid number of chars per pixel.");
- 		return NULL;
- 	}
-+	if (n_col <= 0 ||
-+	    n_col >= G_MAXINT / (cpp + 1) ||
-+	    n_col >= G_MAXINT / sizeof (_XPMColor)) {
-+		g_warning ("XPM file has invalid number of colors");
-+  		return NULL;
-+  	}
- 
- 	/* The hash is used for fast lookups of color from chars */
- 	color_hash = g_hash_table_new (g_str_hash, g_str_equal);
- 
--	name_buf = g_new (gchar, n_col * (cpp + 1));
--	colors = g_new (_XPMColor, n_col);
-+ 	name_buf = g_new (gchar, n_col * (cpp + 1));
-+ 	if (!name_buf) {
-+		g_warning ("Cannot allocate memory for loading XPM image");
-+ 		g_hash_table_destroy (color_hash);
-+ 		return NULL;
-+ 	}
-+ 	colors = g_new (_XPMColor, n_col);
-+ 	if (!colors) {
-+		g_warning ("Cannot allocate memory for loading XPM image");
-+ 		g_hash_table_destroy (color_hash);
-+ 		g_free (name_buf);
-+ 		return NULL;
-+ 	}
- 
- 	for (cnt = 0; cnt < n_col; cnt++) {
- 		gchar *color_name;
-@@ -397,12 +409,8 @@
- 			fallbackcolor = color;
- 	}
- 
--	if (is_trans)
--		pixels = malloc (w * h * 4);
--	else
--		pixels = malloc (w * h * 3);
--
--	if (!pixels) {
-+	pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, is_trans, 8, w, h);
-+	if (!pixbuf) {
- 		g_hash_table_destroy (color_hash);
- 		g_free (colors);
- 		g_free (name_buf);
-@@ -410,7 +418,7 @@
- 	}
- 
- 	wbytes = w * cpp;
--	pixtmp = pixels;
-+	pixtmp = pixbuf->pixels;
- 
- 	for (ycnt = 0; ycnt < h; ycnt++) {
- 		buffer = (*get_buf) (op_body, handle);
-@@ -443,9 +451,7 @@
- 	g_free (colors);
- 	g_free (name_buf);
- 
--	return gdk_pixbuf_new_from_data (pixels, GDK_COLORSPACE_RGB, is_trans, 8,
--					 w, h, is_trans ? (w * 4) : (w * 3),
--					 free_buffer, NULL);
-+	return pixbuf;
- }
- 
- /* Shared library entry point for file loading */
diff --git a/media-libs/gdk-pixbuf/files/gdk-pixbuf-0.22.0-m4.patch b/media-libs/gdk-pixbuf/files/gdk-pixbuf-0.22.0-m4.patch
deleted file mode 100644
index 032976d..0000000
--- a/media-libs/gdk-pixbuf/files/gdk-pixbuf-0.22.0-m4.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Fix aclocal warning:
-/usr/share/aclocal/gdk-pixbuf.m4:12: warning: underquoted definition of AM_PATH_GDK_PIXBUF
---- gdk-pixbuf-0.22.0/gdk-pixbuf.m4
-+++ gdk-pixbuf-0.22.0/gdk-pixbuf.m4
-@@ -11,3 +11,3 @@
- dnl
--AC_DEFUN(AM_PATH_GDK_PIXBUF,
-+AC_DEFUN([AM_PATH_GDK_PIXBUF],
- [dnl 
diff --git a/media-libs/gdk-pixbuf/files/gdk-pixbuf-ds-png.diff b/media-libs/gdk-pixbuf/files/gdk-pixbuf-ds-png.diff
deleted file mode 100644
index 39b4cb6..0000000
--- a/media-libs/gdk-pixbuf/files/gdk-pixbuf-ds-png.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -dPNur gdk-pixbuf-0.22.0/gdk-pixbuf/io-png.c gdk-pixbuf-0.22.0-png15/gdk-pixbuf/io-png.c
---- gdk-pixbuf-0.22.0/gdk-pixbuf/io-png.c	2001-01-24 21:59:23.000000000 +0100
-+++ gdk-pixbuf-0.22.0-png15/gdk-pixbuf/io-png.c	2012-11-16 14:32:15.000000000 +0100
-@@ -174,11 +174,12 @@
- 		png_destroy_read_struct (&png_ptr, &info_ptr, NULL);
- 		return NULL;
- 	}
--
-+/*
- 	if (setjmp (png_ptr->jmpbuf)) {
- 		png_destroy_read_struct (&png_ptr, &info_ptr, &end_info);
- 		return NULL;
- 	}
-+*/
- 
- 	png_init_io (png_ptr, f);
- 	png_read_info (png_ptr, info_ptr);
-@@ -311,12 +312,12 @@
-                 return NULL;
-         }
- 
--	if (setjmp (lc->png_read_ptr->jmpbuf)) {
-+/*	if (setjmp (lc->png_read_ptr->jmpbuf)) {
- 		if (lc->png_info_ptr)
- 			png_destroy_read_struct(&lc->png_read_ptr, NULL, NULL);
-                 g_free(lc);
-                 return NULL;
--	}
-+	}*/
- 
-         /* Create the auxiliary context struct */
- 
-@@ -366,11 +367,11 @@
-         lc->max_row_seen_in_chunk = -1;
-         
-         /* Invokes our callbacks as needed */
--	if (setjmp (lc->png_read_ptr->jmpbuf)) {
-+/*	if (setjmp (lc->png_read_ptr->jmpbuf)) {
- 		return FALSE;
--	} else {
-+	} else {*/
- 		png_process_data(lc->png_read_ptr, lc->png_info_ptr, buf, size);
--	}
-+/*	}*/
- 
-         if (lc->fatal_error_occurred)
-                 return FALSE;
diff --git a/media-libs/gdk-pixbuf/gdk-pixbuf-0.22.0-r5.ebuild b/media-libs/gdk-pixbuf/gdk-pixbuf-0.22.0-r5.ebuild
deleted file mode 100644
index d488cb0..0000000
--- a/media-libs/gdk-pixbuf/gdk-pixbuf-0.22.0-r5.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gdk-pixbuf/gdk-pixbuf-0.22.0-r5.ebuild,v 1.3 2005/11/20 06:36:49 hardave Exp $
-
-#For the sake of virtualx compatibility (DS)
-EAPI=2
-
-inherit virtualx libtool gnome.org eutils
-
-DESCRIPTION="GNOME Image Library"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
-IUSE="doc mmx"
-
-RDEPEND="media-libs/jpeg
-	media-libs/tiff
-	=x11-libs/gtk+-1.2*
-	<media-libs/libpng-1.5
-	amd64? ( sys-libs/db )
-	!amd64? ( <sys-libs/db-2 )
-	>=gnome-base/gnome-libs-1.4.1.2-r1"
-# We need gnome-libs here, else gnome support do not get compiled into
-# gdk-pixbuf (the GnomeCanvasPixbuf library )
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-m4.patch
-	# security fix (#64230)
-	epatch "${FILESDIR}"/${P}-bmp_secure.patch
-	epatch "${FILESDIR}"/${P}-loaders.patch
-	# reject corrupt bmps (#64230)
-	epatch "${FILESDIR}"/${P}-bmp_reject_corrupt.patch
-
-	#update libtool, else we get the "relink bug"
-	elibtoolize
-}
-
-src_compile() {
-	local myconf=""
-	use mmx || myconf="${myconf} --disable-mmx"
-	econf \
-		--sysconfdir=/etc/X11/gdk-pixbuf \
-		$(use_enable doc gtk-doc) \
-		${myconf} \
-		|| die
-
-	#build needs to be able to
-	#connect to an X display.
-	Xemake || die
-}
-
-src_install() {
-	einstall \
-		sysconfdir=${D}/etc/X11/gdk-pixbuf \
-		localstatedir=${D}/var/lib || die
-
-	dosed -e "s:${D}::g" /usr/bin/gdk-pixbuf-config
-	#fix permissions on the loaders
-	chmod a+rx ${D}/usr/$(get_libdir)/gdk-pixbuf/loaders
-	chmod a+r ${D}/usr/$(get_libdir)/gdk-pixbuf/loaders/*
-
-	dodoc AUTHORS ChangeLog INSTALL README NEWS TODO
-}
diff --git a/media-libs/gdk-pixbuf/gdk-pixbuf-0.22.0-r6.ebuild b/media-libs/gdk-pixbuf/gdk-pixbuf-0.22.0-r6.ebuild
deleted file mode 100644
index 09a4598..0000000
--- a/media-libs/gdk-pixbuf/gdk-pixbuf-0.22.0-r6.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gdk-pixbuf/gdk-pixbuf-0.22.0-r5.ebuild,v 1.3 2005/11/20 06:36:49 hardave Exp $
-
-#For the sake of virtualx compatibility (DS)
-EAPI=2
-
-inherit virtualx libtool gnome.org eutils
-
-DESCRIPTION="GNOME Image Library"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
-IUSE="doc mmx"
-
-RDEPEND="media-libs/jpeg
-	media-libs/tiff
-	=x11-libs/gtk+-1.2*
-	>=media-libs/libpng-1.5
-	amd64? ( sys-libs/db )
-	!amd64? ( <sys-libs/db-2 )
-	>=gnome-base/gnome-libs-1.4.1.2-r1"
-# We need gnome-libs here, else gnome support do not get compiled into
-# gdk-pixbuf (the GnomeCanvasPixbuf library )
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-m4.patch
-	# security fix (#64230)
-	epatch "${FILESDIR}"/${P}-bmp_secure.patch
-	epatch "${FILESDIR}"/${P}-loaders.patch
-	# reject corrupt bmps (#64230)
-	epatch "${FILESDIR}"/${P}-bmp_reject_corrupt.patch
-#SDS
-	epatch "${FILESDIR}"/gdk-pixbuf-ds-png.diff
-#EDS
-
-	#update libtool, else we get the "relink bug"
-	elibtoolize
-}
-
-src_compile() {
-	local myconf=""
-	use mmx || myconf="${myconf} --disable-mmx"
-	econf \
-		--sysconfdir=/etc/X11/gdk-pixbuf \
-		$(use_enable doc gtk-doc) \
-		${myconf} \
-		|| die
-
-	#build needs to be able to
-	#connect to an X display.
-	Xemake || die
-}
-
-src_install() {
-	einstall \
-		sysconfdir=${D}/etc/X11/gdk-pixbuf \
-		localstatedir=${D}/var/lib || die
-
-	dosed -e "s:${D}::g" /usr/bin/gdk-pixbuf-config
-	#fix permissions on the loaders
-	chmod a+rx ${D}/usr/$(get_libdir)/gdk-pixbuf/loaders
-	chmod a+r ${D}/usr/$(get_libdir)/gdk-pixbuf/loaders/*
-
-	dodoc AUTHORS ChangeLog INSTALL README NEWS TODO
-}
diff --git a/media-libs/gdk-pixbuf/gdk-pixbuf-0.22.0-r7.ebuild b/media-libs/gdk-pixbuf/gdk-pixbuf-0.22.0-r7.ebuild
deleted file mode 100644
index 137f850..0000000
--- a/media-libs/gdk-pixbuf/gdk-pixbuf-0.22.0-r7.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gdk-pixbuf/gdk-pixbuf-0.22.0-r5.ebuild,v 1.3 2005/11/20 06:36:49 hardave Exp $
-
-#For the sake of virtualx compatibility (DS)
-EAPI=2
-
-inherit virtualx libtool gnome.org eutils
-
-DESCRIPTION="GNOME Image Library"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
-IUSE="doc mmx"
-
-RDEPEND="virtual/jpeg:0
-	media-libs/tiff
-	=x11-libs/gtk+-1.2*
-	>=media-libs/libpng-1.5
-	amd64? ( sys-libs/db )
-	!amd64? ( <sys-libs/db-2 )
-	>=gnome-base/gnome-libs-1.4.1.2-r1"
-# We need gnome-libs here, else gnome support do not get compiled into
-# gdk-pixbuf (the GnomeCanvasPixbuf library )
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-m4.patch
-	# security fix (#64230)
-	epatch "${FILESDIR}"/${P}-bmp_secure.patch
-	epatch "${FILESDIR}"/${P}-loaders.patch
-	# reject corrupt bmps (#64230)
-	epatch "${FILESDIR}"/${P}-bmp_reject_corrupt.patch
-#SDS
-	epatch "${FILESDIR}"/gdk-pixbuf-ds-png.diff
-#EDS
-
-	#update libtool, else we get the "relink bug"
-	elibtoolize
-}
-
-src_compile() {
-	local myconf=""
-	use mmx || myconf="${myconf} --disable-mmx"
-	econf \
-		--sysconfdir=/etc/X11/gdk-pixbuf \
-		$(use_enable doc gtk-doc) \
-		${myconf} \
-		|| die
-
-	#build needs to be able to
-	#connect to an X display.
-	Xemake || die
-}
-
-src_install() {
-	einstall \
-		sysconfdir=${D}/etc/X11/gdk-pixbuf \
-		localstatedir=${D}/var/lib || die
-
-	dosed -e "s:${D}::g" /usr/bin/gdk-pixbuf-config
-	#fix permissions on the loaders
-	chmod a+rx ${D}/usr/$(get_libdir)/gdk-pixbuf/loaders
-	chmod a+r ${D}/usr/$(get_libdir)/gdk-pixbuf/loaders/*
-
-	dodoc AUTHORS ChangeLog INSTALL README NEWS TODO
-}
diff --git a/media-libs/id3lib/Manifest b/media-libs/id3lib/Manifest
index 615bfb9..452fdab 100644
--- a/media-libs/id3lib/Manifest
+++ b/media-libs/id3lib/Manifest
@@ -1,12 +1,12 @@
-AUX 1.diff 717 RMD160 525c017d38a38a80feaed8ed37b84a8586ef0a81 SHA1 43e8e5a11c5890bf5dcfa1dcc983a9ada3ca3ee2 SHA256 9b90416204e0c83f9a919e3978239e58eceebe88ba22d5d365d32b0a8988cd27
-AUX id3lib-3.8.3-autoconf259.patch 1130 RMD160 bd5205973dfa31542935daa35ad04c6709c08b9d SHA1 6006f32d29461136ec029dda2ae7339fde6df1df SHA256 ffde572cb263cce4585292143a4396ebd12592ac34b398da19d1608f1c2374f9
-AUX id3lib-3.8.3-doxyinput.patch 977 RMD160 102b5cad0637776a26505d53d3722e549a7448d3 SHA1 b92df9fe9e7b0f124eba03d43a63b0da5b3718de SHA256 e7cd2eafe39229fee1195524872be3465d247590b7ead4a9cfa2178102a3d9ea
-AUX id3lib-3.8.3-gcc-4.3.patch 2971 RMD160 686fa49e1108684a652435afcc56fd062ed516a4 SHA1 d25b5e69e633e12f929e0d656b87f3f72b4b5849 SHA256 536f6bb5dddd48df3c7fc080c04f03a2053ab11429094f2f31d6e2d5f21a987e
-AUX id3lib-3.8.3-security.patch 1601 RMD160 165fcc3773343c36394207f833b9336859ec13f4 SHA1 e9a835fc14e8a83468206eba08ca4d5e0fc5e9c1 SHA256 aa5f4e12a0a625acd58199f3e2d8d6d39290480fea7767adbbc1f8379964e01c
-AUX id3lib-3.8.3-test_io.patch 281 RMD160 773e84752a84cd746def0ff4878f4b248d6611e6 SHA1 76f6bab888f1d47e75006f7bcb44df0205693d76 SHA256 cc124f8805bcb977a1673f0b04fff368dac1af70d78c21da6f0415ce067d7687
-AUX id3lib-3.8.3-unicode16.patch 1542 RMD160 1b60e40e5cb1f172e4020ba2b87a10b557521572 SHA1 f3644a7f637b65b46afdea04195c48cde03edcd7 SHA256 71c79002d9485965a3a93e87ecbd7fed8f89f64340433b7ccd263d21385ac969
-AUX id3lib-3.8.3-zlib.patch 833 RMD160 477f5e846ef7070bd3c10203bbaaa7eeaaedf6f2 SHA1 231721feb310f5ef6d820d1c1397e3605b5689cb SHA256 0b5531089422bda659deddcccf0562fcaa96529e74778065e35c848d6cf2a502
-AUX id3lib-ds-rcc.patch 4773 RMD160 b08e67f6d900e02a3de0e31ece6e6d15ace9c3e1 SHA1 67dfcfa4028d4ebd1a1f75c76b0861aa49db3296 SHA256 e9f54621938a9ea3657ca5a601141d4c7fb9adf4af23dea41eb61df9517ea3f8
-DIST id3lib-3.8.3.tar.gz 950726 RMD160 bfa2499ec649ed40815ad0a370c78eb1517952c4 SHA1 c92c880da41d1ec0b242745a901702ae87970838 SHA256 2749cc3c0cd7280b299518b1ddf5a5bcfe2d1100614519b68702230e26c7d079
-EBUILD id3lib-3.8.3-r5.ebuild 1312 RMD160 d643251d7f9d319931cecb64539761f976e79c30 SHA1 8d31263ea96c57fe3b93dc3ebfedf79ad5f09910 SHA256 633fb7d85cf94052f71f9ebe7d9012a6b9a1264470c40dc619a7bbd7098e9d9f
-EBUILD id3lib-3.8.3-r8.ebuild 1485 RMD160 c018b53e9a81bb8aa9cf9037f163f033f5108c28 SHA1 5eb6cf089c99cdb92efa0a084b428e36ecf32983 SHA256 864341b5f608079a51af2cd51de07dad4a0870ec56bf5146e0cdcf932dfd9a89
+AUX 1.diff 717 BLAKE2B 7f20b91e3a2481810728b344969892d9b98f6713db16bb9ec11dd4e8a203456da2bb2f4d3c05509e192b181dbba19adeb75cd0ee797cab96033e9458c49ace92 SHA512 5a412e5c1c3808573568fa6bb7f6d13adfea7625d63aa0e47a03670dd39593e18008330497ef20d86afbd34c4561792102f0246010853941ec9740ae5514320d
+AUX id3lib-3.8.3-autoconf259.patch 1130 BLAKE2B e65f7693f5ac6284348aaa52bc286856a22cbd4396725c83113dda96f4637e92fb0ce453b737ae97c61e1d284910fb0894f6e4d21e5a575f1f9f99de25b1d261 SHA512 e7d15ca57889934d1956293454e6326e1fbf81116d42e42732a2f0c9fc04b067ebf43f896d28bfa2fa18978b9099fdc6a36c573da137c2ee80efcbb83cdb04ae
+AUX id3lib-3.8.3-doxyinput.patch 977 BLAKE2B 799a43e588b3c4d196521e0fc183dbc1b47b7faafe24e8225b6adcaa514446519b85fbd93a7ea7944a4394a17240fade7d7911b1e7f55ed546416e18b7f4f87e SHA512 f226281ba0afb7d0f2c49d5769ba374ab36edd228a7b4251c9775c83b50489db6b853044f442268134e2885e9d90500708597d59adccdb563c2eff2dd9af9fa8
+AUX id3lib-3.8.3-gcc-4.3.patch 2971 BLAKE2B 2eac3593420d2d73863e4fe1feff92496bf4515bf4b7a401f13ab26b54578181660fb26449f2786b116354bedb985954b3681ede17d15b0bdd92ee016abc7695 SHA512 14c5376c676d3a67c7fe92f271d0e6067f6168f16fed0c9ac4dd28a0b7280896cb993f17911baac7d8c2cfacd210f6c587c92bc38e54ef71584fbbff50e86bb5
+AUX id3lib-3.8.3-security.patch 1601 BLAKE2B f82bc17fb7e4369edfe1c7ab99e2572c03ca9d71fc78f05d0f8d3ad90db0831a397a7f224174dc53c5aae6d1880a0cb0df7540b14ae28ab8f8de43f960d2c689 SHA512 e54d3974b1f937082a99946973868c44c1eb689b0b3c66c7568f96a1ca47c9c732a359bbf0a9c416058f16695da3d13b50d10f0fbe42c41396531bf69bf2b3f1
+AUX id3lib-3.8.3-test_io.patch 281 BLAKE2B 23b6563c1398bb77d1c3af76ebb34adbc9a5012ad1e08b4fb414a2023cdda5c422ca21b0c1cd3ffb8415d59729b8f8368e8a96225d383a3f432fffa5e5748773 SHA512 41138975241980cbdc1e602a6d5ce3c3cfefe7db316b95db99ba8f10daf251e6d761716ab60bfceaa476df3e56597b18a69d0ffed171e4de25bfcb44c6fcfd1d
+AUX id3lib-3.8.3-unicode16.patch 1542 BLAKE2B 9ab2c0bcbfb19125da0b93b316628f5ce23df456b428d1e4f05e29142f2ef0b09fffbb02e33ac2f256c1cc80bee04ee9db7a7c531f77fde4ed007acb3cccaf93 SHA512 f2396475ba3b70b74fe7689318d6a80715bbef0fe6cbb9cbbc7fdd811304630fd9748f35316d569fdcd68a324588bb48cbc50ebb33a3288e5a54c1ddfc1d3c79
+AUX id3lib-3.8.3-zlib.patch 833 BLAKE2B cf45b2a69a48abe90ee40365d95b6b2aa2df600106e93c905e07ef22ef49cc48ec13785031aa2434e79d082b9c454658c7eee677b0aa49d6beabdf38ff75c4ce SHA512 61937ec6c2751467dd13179db15f06eff04b5b186f82b4327c38388f03c03ac7de277b9173b2b0326141c77335cad7fcd98234994cc5694cd1228e0d81919e53
+AUX id3lib-ds-rcc.patch 4773 BLAKE2B fca28f9f8c34f1a555bde52daa23ae815c7657c5af0671e0cade557b3d2dd38ec412a17ac29dc66b56f864ae660847cf4c0c01a529c367a46ee30a285a3d714a SHA512 f21098ea7276e64e744c4a0767cb4bc9831585f076ec63a223469b842d572b47ab3f7e801cc41e020389de3dc3c46ca638a4e83c56cdc875b92b1284cddaab45
+DIST id3lib-3.8.3.tar.gz 950726 BLAKE2B 37afb1292d598e8416251e18beb1d1b4402d11ebd971d3e9b151ae9e092884ec4b0b7f9c19bbd8296fbb7fe7320ced7ba1f733a367662d378d2d82b2b52b7bb2 SHA512 3787e261f86933c1c2f2bff2c4b349b42f5d8636e489e4f39f9d75e6dfbdc79b87009a0f4ce4b786f2fb3dbc01ca9d56c4112095b46244f897e6c9a28573adaf
+EBUILD id3lib-3.8.3-r5.ebuild 1312 BLAKE2B a086624ef963e33a58402b97295232f8e82395eb74a330b6cc4cb87d9387855386bacb001701e9e3af759806916c25fc28024516c5a7f70f003b666e386ae972 SHA512 f96fab40aa1e76661433247957c8ca34be030804c56184f0d7efc9939001705006529c550ee0390961b976af071e40bcd25880a9f7f278834e4f8533794b41c8
+EBUILD id3lib-3.8.3-r8.ebuild 1485 BLAKE2B cdea6f012848bee6f10467af217d957af4486e13536428fc8eb4af551ebb570bcc7777423d6f0c97f3d6f3d9369598407e72f57fa253683827b93b3b0c38f87b SHA512 119db58e27c4937f817c104d7287214bd645379c695502a6f1930b5a677de0c29e5a5f4422c8566e115df5347abe24b7f9097284a4aad4acebb65b3bb97fa9ec
diff --git a/media-libs/imlib/Manifest b/media-libs/imlib/Manifest
deleted file mode 100644
index 8ef9bf5..0000000
--- a/media-libs/imlib/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX imlib-1.9.15-asneeded.patch 1120 SHA256 60f8a3f9bee11c0987b663ec86d48f208d7d96f35463f9babdd43389f466ce94 SHA512 d0cb21e5b7ecb928d25a6afbedbd40e5e2374ea33a3d546efdd65b26c0877d001985710462604c71a507c30f345f7e1a316719208e2d06c4a740e640a9b07cb3 WHIRLPOOL fd8c373299dddab50acd04b232df4780d6fb90e8a095ca2d09e6f624bcaf994eb56746ad2aef52e7f7ca872d4c8560547c0b44634e68974a4203b980447e5762
-AUX imlib-1.9.15-bpp16-CVE-2007-3568.patch 457 SHA256 f0097c1db200b19a3e8f06d85765dd8b8f757dd0bc6fd9bafa0c31cd9c14d8ec SHA512 545936b5620fea74993a079db0555780d612d38865b56845330e36b7d04327fd93eb31b2d7841cd050c54ca450e305e923fb7d779c9c9948158041ec2734cf2b WHIRLPOOL 6ab4e66d57fca46c138600189a1184475cd3c2cf3af579dd569c15c979f404e1a48e90532ee8b2f2320f5f63f64eab28625c84c7096a74e9a07b98d00518fbcc
-AUX imlib-1.9.15-fix-rendering.patch 3263 SHA256 7f5f8967ec52658e776a0a60a3a3c93d367ccf877d92569a9313e78bbd510604 SHA512 4e94da8de3f18b711bdfcf4184dbc2220ef566aa61b72c6139e490e55051b3090dc5330929b218f6fab1764c8c2ee8acdd630a0c64010b56b4b4f1b8c55c3f89 WHIRLPOOL d25d7be59ad63e97a8f12baf41532d1da4ea0b8cb004074c681e08e5c8c473fa4b68d46285e5cf7361601bb99d42b523c1299ffe5bdd7c69b120d8559de48d03
-AUX imlib-1.9.15-libpng15.patch 3785 SHA256 0306f872438822888d436f9e151e4875ffa3ee1b261f7a092738ea87e4ca589b SHA512 e7a6d48ef04fbcfcab998e6968130796ab3da1fd9def14ab2ccc713e0956f1f2be3f3a8f680ded5f00cb7ac9ea31d2f94de04aaa039ec5b03cece71f36f14294 WHIRLPOOL 72bc3ce8fa6bb86cbac53e6a0e2a346bc8906cbcec6e43f2f29f56e47d8fc0a2e1c13dbd43e079e77e7c450e1b5d6bc43e10c1c369d597a7d19b5018384e26ff
-AUX imlib-1.9.15.patch 2253 SHA256 43dd12dae7913475f968f35a4fa4b1ef4670451e58c712cbd6e5460f20fc9197 SHA512 4de2fb6e28a6b9da3f474153ef618aad199d1fe6e365670d3d2070afa5b123597f108cac0972454dbcf38b8d84a9a6eb8f011d92a9d754248af41e3abd799b6d WHIRLPOOL d5417943c318d6d9371f5826ccaa6ccee9d84ac128db5ea46ae7a570e9a64fba2de7ff0fbc6a935026defc5ef0c0a45c62ca0459c0f1211c96cf1451cc653bb2
-AUX imlib-security.patch 13040 SHA256 d67a7faa2dba8d361cf25b6fc8125c1da92f25b612bffe909daacdeda577dd57 SHA512 a75537267e9e276920fbc0360cd4832f727c6c9857401889bdb1466f3088c98e5ea2ef84a94a5873a3c12dda0b9aed36a5e2039fece87e51154a3b773d97aa5c WHIRLPOOL 5f892847f9aa86896ecefc50d77575066a4ae1e573a9d631247a104a8d51d1f907cfb405a5d19f3a738912140900843c916661399e469b5f44c5ac5efdab6121
-DIST gtk-1-for-imlib.m4.bz2 2742 SHA256 e024d822d64819e23f7ad7c8283086ffd1e112b859b4669f1624dda1c56d8c47 SHA512 83708af1c7d7cf10960463b785bad096d77e985be5907dd59c73c2cb86c4b89fb5453a02ffddca1519185b91d205dbd96c4c4c1df4da4b67e64bad413cd8a40e WHIRLPOOL 5490f53e1559b9f505cd0ac4b8d0a9c74d8cb323daf4e048b4123725b1f1c12dae936595a0173cdb9d74e2377f6c8942d14e783977d91e6d920342bd5d2e724e
-DIST imlib-1.9.15.tar.bz2 683242 SHA256 4e6a270308a9ae16586bfc133c1a3dfb2e56f431edb66aaa3a80e36e5ed84ce0 SHA512 f50d9141b3c54b44921aa09c0a5ea848aefaa904efdd6da132dace42604671f8dbd3e4b71a596f054f0db4525ba2002864b5e5b21f8805cf1b5514b661ac254a WHIRLPOOL b9127c602a69eb52ab2bbe66733e8d35c8311a6decf569dd3d63dcff8d1d69ca8ed5572fac4ab795685beef46fb039a68325b70e697e7257d4ee92ad2c4edde2
-EBUILD imlib-1.9.15-r99.ebuild 1690 SHA256 7ba14afc388532d466802c01c8e3c94a125ab0436db2098c3902c47d6bfc687d SHA512 ffd39f9e7b41c9bbd9b8039f6a4a998090f000f4666a683d9589e2cd9739bbbea5c780254513d38d39767f6c637df1c98d5453bac55ecfb235139c6781f6c5f3 WHIRLPOOL 5fcda324cb359a0c0ec3f69424af1ccea63f75ab54b6934771802cbaab3a24339ef40f94aba6a8d9c9bb4cac3066b5c97ca6ee9a03ab1d851715d722cbd1ab7b
diff --git a/media-libs/imlib/files/imlib-1.9.15-asneeded.patch b/media-libs/imlib/files/imlib-1.9.15-asneeded.patch
deleted file mode 100644
index 3b7dd8a..0000000
--- a/media-libs/imlib/files/imlib-1.9.15-asneeded.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-This code is broken with the newer libtool. Just dropping it is more or less
-safe as in any case if libtool does not supports shared libraries it'll issue
-an error...
-
-Adding include is necessary for gcc-4.3.
-
---- configure.in	2008-07-16 09:18:35 +0000
-+++ configure.in	2008-07-16 09:18:43 +0000
-@@ -61,6 +61,7 @@
-   AC_TRY_RUN([
- #include <glib.h>
- #include <gmodule.h>
-+#include <stdlib.h>
- main ()
- {
-     if (g_module_supported ())
-@@ -74,21 +74,6 @@
-   CFLAGS="$oCFLAGS"
- fi
- 
--dnl Now we check to see if our libtool supports shared lib deps
--dnl (in a rather ugly way even)
--builddir=`pwd`
--if $dynworks; then
--   imlib_libtool_config="$builddir/libtool --config"
--   imlib_deplibs_check=`$imlib_libtool_config | \
--      grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
--      sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
--   if test "x$imlib_deplibs_check" = "xnone" || \
--      test "x$imlib_deplibs_check" = "xunknown" || \
--      test "x$imlib_deplibs_check" = "x"; then
--      dynworks=false
--   fi
--fi
--
- if $dynworks; then
-    AC_DEFINE(USE_GMODULE, 1, [ ])
-    GMODULE_LIBS="`glib-config --libs gmodule`"
diff --git a/media-libs/imlib/files/imlib-1.9.15-bpp16-CVE-2007-3568.patch b/media-libs/imlib/files/imlib-1.9.15-bpp16-CVE-2007-3568.patch
deleted file mode 100644
index 94595ff..0000000
--- a/media-libs/imlib/files/imlib-1.9.15-bpp16-CVE-2007-3568.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Imlib/load.c.orig	2007-08-13 23:06:20.000000000 -0300
-+++ Imlib/load.c	2007-08-13 23:06:51.000000000 -0300
-@@ -645,7 +645,7 @@
-   planes = (int)word;
-   fread(&word, 2, 1, file);
-   bpp = (int)word;
--  if (bpp != 1 && bpp != 4 && bpp != 8 && bpp && 16 && bpp != 24 && bpp != 32)
-+  if (bpp != 1 && bpp != 4 && bpp != 8 && bpp != 16 && bpp != 24 && bpp != 32)
-     {
-       fprintf(stderr, "IMLIB ERROR: unknown bitdepth in file\n");
-       return NULL;
diff --git a/media-libs/imlib/files/imlib-1.9.15-fix-rendering.patch b/media-libs/imlib/files/imlib-1.9.15-fix-rendering.patch
deleted file mode 100644
index 6212ed3..0000000
--- a/media-libs/imlib/files/imlib-1.9.15-fix-rendering.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-Michel Dänzer <daenzer AT debian.org>
-
-* The boolean value returned via the last parameter to XShmQueryVersion()
-  isn't honoured everywhere.
-* The init functions that take parameters allow the caller to enable shared
-  pixmaps when they aren't supported (or disabled by configuration files).
-
-
-These result in incorrect rendering when the MIT-SHM extension doesn't support
-shared pixmaps, e.g. using EXA with current versions of Xorg.
-
-http://bugs.gentoo.org/show_bug.cgi?id=197489
-
-diff -up -ru imlib-1.9.15.orig/gdk_imlib/misc.c imlib-1.9.15/gdk_imlib/misc.c
---- imlib-1.9.15.orig/gdk_imlib/misc.c	2002-03-04 18:06:32.000000000 +0100
-+++ imlib-1.9.15/gdk_imlib/misc.c	2007-10-28 14:00:04.000000000 +0100
-@@ -674,6 +674,10 @@ gdk_imlib_init_params(GdkImlibInitParams
-   visual = gdk_rgb_get_visual();
-   id->x.visual = GDK_VISUAL_XVISUAL(visual);	/* the visual type */
-   id->x.depth = visual->depth;	/* the depth of the screen in bpp */
-+
-+  id->x.shm = 0;
-+  id->x.shmp = 0;
-+  id->max_shm = 0;
- #ifdef HAVE_SHM
-   if (XShmQueryExtension(id->x.disp))
-     {
-@@ -689,17 +693,14 @@ gdk_imlib_init_params(GdkImlibInitParams
- 	      id->x.last_xim = NULL;
- 	      id->x.last_sxim = NULL;
- 	      id->max_shm = 0x7fffffff;
--	      if (XShmPixmapFormat(id->x.disp) == ZPixmap)
-+	      if ((XShmPixmapFormat(id->x.disp) == ZPixmap) &&
-+		  (pm == True))
- 		id->x.shmp = 1;
- 	    }
- 	}
-     }
--  else
- #endif
--    {
--      id->x.shm = 0;
--      id->x.shmp = 0;
--    }
-+
-   id->cache.on_image = 0;
-   id->cache.size_image = 0;
-   id->cache.num_image = 0;
-@@ -935,8 +936,8 @@ gdk_imlib_init_params(GdkImlibInitParams
- 	}
-       if (p->flags & PARAMS_SHAREDPIXMAPS)
- 	{
--	  if (id->x.shm)
--	    id->x.shmp = p->sharedpixmaps;
-+	  if (!p->sharedpixmaps)
-+	    id->x.shmp = 0;
- 	}
-       if (p->flags & PARAMS_PALETTEOVERRIDE)
- 	override = p->paletteoverride;
-diff -up -ru imlib-1.9.15.orig/Imlib/misc.c imlib-1.9.15/Imlib/misc.c
---- imlib-1.9.15.orig/Imlib/misc.c	2004-09-21 02:22:59.000000000 +0200
-+++ imlib-1.9.15/Imlib/misc.c	2007-10-28 14:00:23.000000000 +0100
-@@ -675,6 +675,10 @@ Imlib_init_with_params(Display * disp, I
-   id->x.root = DefaultRootWindow(disp);		/* the root window id */
-   id->x.visual = DefaultVisual(disp, id->x.screen);	/* the visual type */
-   id->x.depth = DefaultDepth(disp, id->x.screen);	/* the depth of the screen in bpp */
-+
-+  id->x.shm = 0;
-+  id->x.shmp = 0;
-+  id->max_shm = 0;
- #ifdef HAVE_SHM
-   if (XShmQueryExtension(id->x.disp))
-     {
-@@ -690,17 +694,14 @@ Imlib_init_with_params(Display * disp, I
- 	      id->x.last_xim = NULL;
- 	      id->x.last_sxim = NULL;
- 	      id->max_shm = 0x7fffffff;
--	      if (XShmPixmapFormat(id->x.disp) == ZPixmap)
-+	      if ((XShmPixmapFormat(id->x.disp) == ZPixmap &&
-+		   (pm == True)))
- 		id->x.shmp = 1;
- 	    }
- 	}
-     }
--  else
- #endif
--    {
--      id->x.shm = 0;
--      id->x.shmp = 0;
--    }
-+
-   id->cache.on_image = 0;
-   id->cache.size_image = 0;
-   id->cache.num_image = 0;
-@@ -952,8 +953,8 @@ Imlib_init_with_params(Display * disp, I
- 	}
-       if (p->flags & PARAMS_SHAREDPIXMAPS)
- 	{
--	  if (id->x.shm)
--	    id->x.shmp = p->sharedpixmaps;
-+	  if (!p->sharedpixmaps)
-+	    id->x.shmp = 0;
- 	}
-       if (p->flags & PARAMS_PALETTEOVERRIDE)
- 	override = p->paletteoverride;
diff --git a/media-libs/imlib/files/imlib-1.9.15-libpng15.patch b/media-libs/imlib/files/imlib-1.9.15-libpng15.patch
deleted file mode 100644
index 7837cd4..0000000
--- a/media-libs/imlib/files/imlib-1.9.15-libpng15.patch
+++ /dev/null
@@ -1,142 +0,0 @@
---- gdk_imlib/io-png.c
-+++ gdk_imlib/io-png.c
-@@ -40,13 +40,13 @@
-       return NULL;
-     }
- 
--  if (setjmp(png_ptr->jmpbuf))
-+  if (setjmp(png_jmpbuf(png_ptr)))
-     {
-       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-       return NULL;
-     }
- 
--  if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-+  if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
-     {
-       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-       return NULL;
-@@ -275,13 +275,13 @@
-       return NULL;
-     }
-   
--  if (setjmp(png_ptr->jmpbuf))
-+  if (setjmp(png_jmpbuf(png_ptr)))
-     {
-       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-       return NULL;
-     }
-   
--  if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-+  if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
-     {
-       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-       return NULL;
-@@ -301,6 +301,9 @@
-   /* Setup Translators */
-   if (color_type == PNG_COLOR_TYPE_PALETTE)
-     png_set_expand(png_ptr);
-+  if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
-+    png_set_expand(png_ptr);
-+
-   png_set_strip_16(png_ptr);
-   png_set_packing(png_ptr);
-   if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
-@@ -440,13 +443,13 @@
- 		return NULL;
- 	}
- 	
--	if (setjmp(png_ptr->jmpbuf))
-+	if (setjmp(png_jmpbuf(png_ptr)))
- 	{
- 		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
- 		return NULL;
- 	}
- 	
--	if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-+	if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
- 	{
- 		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
- 		return NULL;
-@@ -635,7 +638,7 @@
- 	      png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
- 	      return 0;
- 	    }
--	  if (setjmp(png_ptr->jmpbuf))
-+	  if (setjmp(png_jmpbuf(png_ptr)))
- 	    {
- 	      fclose(f);
- 	      png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
---- Imlib/load.c
-+++ Imlib/load.c
-@@ -197,12 +197,12 @@
-       png_destroy_read_struct(&png_ptr, NULL, NULL);
-       return NULL;
-     }
--  if (setjmp(png_ptr->jmpbuf))
-+  if (setjmp(png_jmpbuf(png_ptr)))
-     {
-       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-       return NULL;
-     }
--  if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-+  if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
-     {
-       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-       return NULL;
-@@ -260,7 +260,8 @@
-   png_read_image(png_ptr, lines);
-   png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-   ptr = data;
--  if (color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-+  if (color_type == PNG_COLOR_TYPE_GRAY
-+      || color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-     {
-       for (y = 0; y < *h; y++)
- 	{
-@@ -285,6 +286,7 @@
- 	    }
- 	}
-     }
-+#if 0
-   else if (color_type == PNG_COLOR_TYPE_GRAY)
-     {
-       for (y = 0; y < *h; y++)
-@@ -300,6 +302,7 @@
- 	    }
- 	}
-     }
-+#endif
-   else
-     {
-       for (y = 0; y < *h; y++)
---- Imlib/save.c
-+++ Imlib/save.c
-@@ -342,7 +342,7 @@
- 	      png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
- 	      return 0;
- 	    }
--	  if (setjmp(png_ptr->jmpbuf))
-+	  if (setjmp(png_jmpbuf(png_ptr)))
- 	    {
- 	      fclose(f);
- 	      png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
---- Imlib/utils.c
-+++ Imlib/utils.c
-@@ -1981,14 +1981,13 @@
-       png_destroy_read_struct(&png_ptr, NULL, NULL);
-       return NULL;
-     }
--  
--  if (setjmp(png_ptr->jmpbuf))
-+  if (setjmp(png_jmpbuf(png_ptr)))  
-     {
-       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-       return NULL;
-     }
-   
--  if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-+  if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
-     {
-       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-       return NULL;
diff --git a/media-libs/imlib/files/imlib-1.9.15.patch b/media-libs/imlib/files/imlib-1.9.15.patch
deleted file mode 100644
index c78aea9..0000000
--- a/media-libs/imlib/files/imlib-1.9.15.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -ur imlib-1.9.15.orig/configure.in imlib-1.9.15/configure.in
---- imlib-1.9.15.orig/configure.in	2004-09-23 04:13:45.000000000 +0300
-+++ imlib-1.9.15/configure.in	2007-02-05 23:43:18.000000000 +0200
-@@ -17,11 +17,26 @@
- dnl incase it is broken for example.
- AC_ARG_ENABLE(shm, [  --enable-shm            support shared memory if available [default=yes]], echo $enable_shm, enable_shm="yes")
- 
-+AC_ARG_ENABLE(gdk, [  --enable-gdk            enable gdk_imlib compilation [default=yes]],[
-+  if test x$enableval = xyes; then
-+    disable_gdk="no"
-+  else
-+    disable_gdk="yes"
-+  fi],disable_gdk=no)
-+
-+if test x$disable_gdk = xno; then
-+ AC_MSG_RESULT(no)
-+
- AM_PATH_GTK(1.2.1,[
-   GDK_IMLIB="gdk_imlib utils"],[
-   GDK_IMLIB="" 
-   AC_MSG_WARN([*** gdk_imlib will not be built ***])])
- 
-+else
-+  AC_MSG_RESULT(yes)
-+  GDK_IMLIB=""
-+fi
-+
- AC_MSG_CHECKING(whether to build gmodulized imlib)
- 
- AC_ARG_ENABLE(modules, [  --disable-modules       Disables dynamic module loading],[
-diff -ur imlib-1.9.15.orig/imlib-config.in imlib-1.9.15/imlib-config.in
---- imlib-1.9.15.orig/imlib-config.in	2004-08-27 19:03:11.000000000 +0300
-+++ imlib-1.9.15/imlib-config.in	2007-02-05 23:46:34.000000000 +0200
-@@ -46,15 +46,9 @@
-       echo @VERSION@
-       ;;
-     --cflags)
--      if test @includedir@ != /usr/include ; then
--        includes=-I@includedir@
--      fi
-       echo $includes @X_CFLAGS@ 
-       ;;
-     --cflags-gdk)
--      if test @includedir@ != /usr/include ; then
--        includes=-I@includedir@
--      fi
-       echo `@GTK_CONFIG@ --cflags` $includes @X_CFLAGS@
-       ;;
-     --libs)
-diff -ur imlib-1.9.15.orig/imlib.m4 imlib-1.9.15/imlib.m4
---- imlib-1.9.15.orig/imlib.m4	2004-08-27 19:03:11.000000000 +0300
-+++ imlib-1.9.15/imlib.m4	2007-02-05 23:42:57.000000000 +0200
-@@ -6,7 +6,7 @@
- dnl AM_PATH_IMLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
- dnl Test for IMLIB, and define IMLIB_CFLAGS and IMLIB_LIBS
- dnl
--AC_DEFUN(AM_PATH_IMLIB,
-+AC_DEFUN([AM_PATH_IMLIB],
- [dnl 
- dnl Get the cflags and libraries from the imlib-config script
- dnl
-@@ -164,7 +164,7 @@
- ])
- 
- # Check for gdk-imlib
--AC_DEFUN(AM_PATH_GDK_IMLIB,
-+AC_DEFUN([AM_PATH_GDK_IMLIB],
- [dnl 
- dnl Get the cflags and libraries from the imlib-config script
- dnl
diff --git a/media-libs/imlib/files/imlib-security.patch b/media-libs/imlib/files/imlib-security.patch
deleted file mode 100644
index c820270..0000000
--- a/media-libs/imlib/files/imlib-security.patch
+++ /dev/null
@@ -1,510 +0,0 @@
-diff -urN imlib-1.9.13.orig/Imlib/load.c imlib-1.9.13/Imlib/load.c
---- imlib-1.9.13.orig/Imlib/load.c	Wed Mar 13 19:06:29 2002
-+++ imlib-1.9.13/Imlib/load.c	Thu Sep 16 17:21:01 2004
-@@ -4,6 +4,8 @@
- #include "Imlib_private.h"
- #include <setjmp.h>
- 
-+#define G_MAXINT ((int) 0x7fffffff)
-+
- /*      Split the ID - damages input    */
- 
- static char        *
-@@ -41,13 +43,17 @@
- 
- /*
-  *     Make sure we don't wrap on our memory allocations
-+ *     we check G_MAXINT/4 because rend.c malloc's w * h * bpp
-+ *     + 3 is safety margin
-  */
- 
- void * _imlib_malloc_image(unsigned int w, unsigned int h)
- {
--       if( w > 32767 || h > 32767)
--               return NULL;
--       return malloc(w * h * 3);
-+       if (w <= 0 || w > 32767 ||
-+           h <= 0 || h > 32767 ||
-+           h >= (G_MAXINT/4 - 1) / w)
-+                return NULL;
-+       return malloc(w * h * 3 + 3);
- }
- 
- #ifdef HAVE_LIBJPEG
-@@ -360,7 +366,9 @@
-   npix = ww * hh;
-   *w = (int)ww;
-   *h = (int)hh;
--  if(ww > 32767 || hh > 32767)
-+  if (ww <= 0 || ww > 32767 ||
-+      hh <= 0 || hh > 32767 ||
-+      hh >= (G_MAXINT/sizeof(uint32)) / ww)
-     {
-        TIFFClose(tif);
-        return NULL;
-@@ -463,7 +471,7 @@
- 	    }
- 	  *w = gif->Image.Width;
- 	  *h = gif->Image.Height;
--	  if (*h > 32767 || *w > 32767)
-+	  if (*h <= 0 || *h > 32767 || *w <= 0 || *w > 32767)
- 	    {
- 	       return NULL;
- 	    }
-@@ -965,7 +973,12 @@
-   comment = 0;
-   quote = 0;
-   context = 0;
-+  memset(lookup, 0, sizeof(lookup));
-+
-   line = malloc(lsz);
-+  if (!line)
-+    return NULL;
-+
-   while (!done)
-     {
-       pc = c;
-@@ -994,25 +1007,25 @@
- 		{
- 		  /* Header */
- 		  sscanf(line, "%i %i %i %i", w, h, &ncolors, &cpp);
--                  if (ncolors > 32766)
-+                  if (ncolors <= 0 || ncolors > 32766)
- 		    {
- 		      fprintf(stderr, "IMLIB ERROR: XPM files wth colors > 32766 not supported\n");
- 		      free(line);
- 		      return NULL;
- 		    }
--		  if (cpp > 5)
-+		  if (cpp <= 0 || cpp > 5)
- 		    {
- 		      fprintf(stderr, "IMLIB ERROR: XPM files with characters per pixel > 5 not supported\n");
- 		      free(line);
- 		      return NULL;
- 		    }
--		  if (*w > 32767)
-+		  if (*w <= 0 || *w > 32767)
- 		    {
- 		      fprintf(stderr, "IMLIB ERROR: Image width > 32767 pixels for file\n");
- 		      free(line);
- 		      return NULL;
- 		    }
--		  if (*h > 32767)
-+		  if (*h <= 0 || *h > 32767)
- 		    {
- 		      fprintf(stderr, "IMLIB ERROR: Image height > 32767 pixels for file\n");
- 		      free(line);
-@@ -1045,11 +1058,13 @@
- 		    {
- 		      int                 slen;
- 		      int                 hascolor, iscolor;
-+		      int                 space;
- 
- 		      iscolor = 0;
- 		      hascolor = 0;
- 		      tok[0] = 0;
- 		      col[0] = 0;
-+		      space = sizeof(col) - 1;
- 		      s[0] = 0;
- 		      len = strlen(line);
- 		      strncpy(cmap[j].str, line, cpp);
-@@ -1072,10 +1087,10 @@
- 				{
- 				  if (k >= len)
- 				    {
--				      if (col[0])
--					strcat(col, " ");
--                                      if (strlen(col) + strlen(s) < sizeof(col))
--					strcat(col, s);
-+				      if (col[0] && space > 0)
-+					strcat(col, " "), space -= 1;
-+                                      if (slen <= space)
-+					strcat(col, s), space -= slen;
- 				    }
- 				  if (col[0])
- 				    {
-@@ -1105,14 +1120,17 @@
- 					    }
- 					}
- 				    }
--				  strcpy(tok, s);
-+				  if (slen < sizeof(tok));
-+				    strcpy(tok, s);
- 				  col[0] = 0;
-+				  space = sizeof(col) - 1;
- 				}
- 			      else
- 				{
--				  if (col[0])
--				    strcat(col, " ");
--				  strcat(col, s);
-+				  if (col[0] && space > 0)
-+				    strcat(col, " "), space -=1;
-+				  if (slen <= space)
-+				    strcat(col, s), space -= slen;
- 				}
- 			    }
- 			}
-@@ -1341,12 +1359,12 @@
- 	  sscanf(s, "%i %i", w, h);
- 	  a = *w;
- 	  b = *h;
--	  if (a > 32767)
-+	  if (a <= 0 || a > 32767)
- 	    {
- 	      fprintf(stderr, "IMLIB ERROR: Image width > 32767 pixels for file\n");
- 	      return NULL;
- 	    }
--	  if (b > 32767)
-+	  if (b <= 0 || b > 32767)
- 	    {
- 	      fprintf(stderr, "IMLIB ERROR: Image height > 32767 pixels for file\n");
- 	      return NULL;
-diff -urN imlib-1.9.13.orig/Imlib/utils.c imlib-1.9.13/Imlib/utils.c
---- imlib-1.9.13.orig/Imlib/utils.c	Mon Mar  4 17:45:28 2002
-+++ imlib-1.9.13/Imlib/utils.c	Thu Sep 16 17:21:15 2004
-@@ -1496,36 +1496,56 @@
-   context = 0;
-   ptr = NULL;
-   end = NULL;
-+  memset(lookup, 0, sizeof(lookup));
- 
-   while (!done)
-     {
-       line = data[count++];
-+      if (!line)
-+	break;
-+      line = strdup(line);
-+      if (!line)
-+	break;
-+      len = strlen(line);
-+      for (i = 0; i < len; ++i)
-+	{
-+	  c = line[i];
-+	  if (c < 32)
-+	    line[i] = 32;
-+	  else if (c > 127)
-+	    line[i] = 127;
-+	}
-+
-       if (context == 0)
- 	{
- 	  /* Header */
- 	  sscanf(line, "%i %i %i %i", &w, &h, &ncolors, &cpp);
--	  if (ncolors > 32766)
-+	  if (ncolors <= 0 || ncolors > 32766)
- 	    {
- 	      fprintf(stderr, "IMLIB ERROR: XPM data wth colors > 32766 not supported\n");
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
--	  if (cpp > 5)
-+	  if (cpp <= 0 || cpp > 5)
- 	    {
- 	      fprintf(stderr, "IMLIB ERROR: XPM data with characters per pixel > 5 not supported\n");
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
--	  if (w > 32767)
-+	  if (w <= 0 || w > 32767)
- 	    {
- 	      fprintf(stderr, "IMLIB ERROR: Image width > 32767 pixels for data\n");
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
--	  if (h > 32767)
-+	  if (h <= 0 || h > 32767)
- 	    {
- 	      fprintf(stderr, "IMLIB ERROR: Image height > 32767 pixels for data\n");
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
- 	  cmap = malloc(sizeof(struct _cmap) * ncolors);
-@@ -1533,6 +1553,7 @@
- 	  if (!cmap)
- 	    {
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
- 	  im->rgb_width = w;
-@@ -1542,6 +1563,7 @@
- 	    {
- 	      free(cmap);
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
- 	  im->alpha_data = NULL;
-@@ -1817,6 +1839,7 @@
- 	}
-       if ((ptr) && ((ptr - im->rgb_data) >= w * h * 3))
- 	done = 1;
-+      free(line);
-     }
-   if (!transp)
-     {
-diff -urN imlib-1.9.13.orig/gdk_imlib/io-gif.c imlib-1.9.13/gdk_imlib/io-gif.c
---- imlib-1.9.13.orig/gdk_imlib/io-gif.c	Mon Mar  4 17:26:51 2002
-+++ imlib-1.9.13/gdk_imlib/io-gif.c	Thu Sep 16 16:11:31 2004
-@@ -55,7 +55,7 @@
- 	    }
- 	  *w = gif->Image.Width;
- 	  *h = gif->Image.Height;
--	  if(*h > 32767 || *w > 32767)
-+	  if(*h <= 0 || *h > 32767 || *w <= 0 || *w > 32767)
- 	    {
- 	      return NULL;
- 	    }
-diff -urN imlib-1.9.13.orig/gdk_imlib/io-ppm.c imlib-1.9.13/gdk_imlib/io-ppm.c
---- imlib-1.9.13.orig/gdk_imlib/io-ppm.c	Mon Mar  4 17:26:51 2002
-+++ imlib-1.9.13/gdk_imlib/io-ppm.c	Thu Sep 16 16:13:13 2004
-@@ -53,12 +53,12 @@
- 	  sscanf(s, "%i %i", w, h);
- 	  a = *w;
- 	  b = *h;
--	  if (a > 32767)
-+	  if (a <= 0 || a > 32767)
- 	    {
- 	      fprintf(stderr, "gdk_imlib ERROR: Image width > 32767 pixels for file\n");
- 	      return NULL;
- 	    }
--	  if (b > 32767)
-+	  if (b <= 0 || b > 32767)
- 	    {
- 	      fprintf(stderr, "gdk_imlib ERROR: Image height > 32767 pixels for file\n");
- 	      return NULL;
-diff -urN imlib-1.9.13.orig/gdk_imlib/io-tiff.c imlib-1.9.13/gdk_imlib/io-tiff.c
---- imlib-1.9.13.orig/gdk_imlib/io-tiff.c	Mon Mar  4 17:26:51 2002
-+++ imlib-1.9.13/gdk_imlib/io-tiff.c	Thu Sep 16 16:13:57 2004
-@@ -36,7 +36,9 @@
-   npix = ww * hh;
-   *w = (int)ww;
-   *h = (int)hh;
--  if(ww > 32767 || hh > 32767)
-+  if (ww <= 0 || ww > 32767 ||
-+      hh <= 0 || hh > 32767 ||
-+      hh >= (G_MAXINT/sizeof(uint32)) / ww)
-     {
-       TIFFClose(tif);
-       return NULL;
-diff -urN imlib-1.9.13.orig/gdk_imlib/io-xpm.c imlib-1.9.13/gdk_imlib/io-xpm.c
---- imlib-1.9.13.orig/gdk_imlib/io-xpm.c	Mon Mar  4 17:26:51 2002
-+++ imlib-1.9.13/gdk_imlib/io-xpm.c	Thu Sep 16 17:08:24 2004
-@@ -40,8 +40,12 @@
-   context = 0;
-   i = j = 0;
-   cmap = NULL;
-+  memset(lookup, 0, sizeof(lookup));
- 
-   line = malloc(lsz);
-+  if (!line)
-+    return NULL;
-+
-   while (!done)
-     {
-       pc = c;
-@@ -70,25 +74,25 @@
- 		{
- 		  /* Header */
- 		  sscanf(line, "%i %i %i %i", w, h, &ncolors, &cpp);
--		  if (ncolors > 32766)
-+		  if (ncolors <= 0 || ncolors > 32766)
- 		    {
- 		      fprintf(stderr, "gdk_imlib ERROR: XPM files wth colors > 32766 not supported\n");
- 		      free(line);
- 		      return NULL;
- 		    }
--		  if (cpp > 5)
-+		  if (cpp <= 0 || cpp > 5)
- 		    {
- 		      fprintf(stderr, "gdk_imlib ERROR: XPM files with characters per pixel > 5 not supported\n");
- 		      free(line);
- 		      return NULL;
- 		    }
--		  if (*w > 32767)
-+		  if (*w <= 0 || *w > 32767)
- 		    {
- 		      fprintf(stderr, "gdk_imlib ERROR: Image width > 32767 pixels for file\n");
- 		      free(line);
- 		      return NULL;
- 		    }
--		  if (*h > 32767)
-+		  if (*h <= 0 || *h > 32767)
- 		    {
- 		      fprintf(stderr, "gdk_imlib ERROR: Image height > 32767 pixels for file\n");
- 		      free(line);
-@@ -120,11 +124,13 @@
- 		    {
- 		      int                 slen;
- 		      int                 hascolor, iscolor;
-+		      int                 space;
- 
- 		      hascolor = 0;
- 		      iscolor = 0;
- 		      tok[0] = 0;
- 		      col[0] = 0;
-+		      space = sizeof(col) - 1;
- 		      s[0] = 0;
- 		      len = strlen(line);
- 		      strncpy(cmap[j].str, line, cpp);
-@@ -147,10 +153,10 @@
- 				{
- 				  if (k >= len)
- 				    {
--				      if (col[0])
--					strcat(col, " ");
--				      if (strlen(col) + strlen(s) < sizeof(col))
--					strcat(col, s);
-+				      if (col[0] && space > 0)
-+					strncat(col, " ", space), space -= 1;
-+				      if (slen <= space)
-+					strcat(col, s), space -= slen;
- 				    }
- 				  if (col[0])
- 				    {
-@@ -180,14 +186,17 @@
- 					    }
- 					}
- 				    }
--				  strcpy(tok, s);
-+				  if (slen < sizeof(tok))
-+				    strcpy(tok, s);
- 				  col[0] = 0;
-+				  space = sizeof(col) - 1;
- 				}
- 			      else
- 				{
--				  if (col[0])
--				    strcat(col, " ");
--				  strcat(col, s);
-+				  if (col[0] && space > 0)
-+				    strcat(col, " "), space -= 1;
-+				  if (slen <= space)
-+				    strcat(col, s), space -= slen;
- 				}
- 			    }
- 			}
-diff -urN imlib-1.9.13.orig/gdk_imlib/misc.c imlib-1.9.13/gdk_imlib/misc.c
---- imlib-1.9.13.orig/gdk_imlib/misc.c	Mon Mar  4 17:26:51 2002
-+++ imlib-1.9.13/gdk_imlib/misc.c	Thu Sep 16 16:35:32 2004
-@@ -1355,11 +1355,16 @@
- 
- /*
-  *	Make sure we don't wrap on our memory allocations
-+ *	we check G_MAX_INT/4 because rend.c malloc's w * h * bpp
-+ *	+ 3 is safety margin
-  */
- 
- void *_gdk_malloc_image(unsigned int w, unsigned int h)
- {
--	if( w > 32767 || h > 32767)
-+	if (w <= 0 || w > 32767 ||
-+	    h <= 0 || h > 32767 ||
-+	    h >= (G_MAXINT/4 - 1) / w)
- 		return NULL;
--	return malloc(w * h * 3);
-+	return malloc(w * h * 3 + 3);
- }
-+
-diff -urN imlib-1.9.13.orig/gdk_imlib/utils.c imlib-1.9.13/gdk_imlib/utils.c
---- imlib-1.9.13.orig/gdk_imlib/utils.c	Mon Mar  4 17:26:51 2002
-+++ imlib-1.9.13/gdk_imlib/utils.c	Thu Sep 16 17:28:35 2004
-@@ -1236,36 +1236,56 @@
-   context = 0;
-   ptr = NULL;
-   end = NULL;
-+  memset(lookup, 0, sizeof(lookup));
- 
-   while (!done)
-     {
-       line = data[count++];
-+      if (!line)
-+	break;
-+      line = strdup(line);
-+      if (!line)
-+	break;
-+      len = strlen(line);
-+      for (i = 0; i < len; ++i)
-+        {
-+	  c = line[i];
-+	  if (c < 32)
-+	    line[i] = 32;
-+	  else if (c > 127)
-+	    line[i] = 127;
-+	}
-+
-       if (context == 0)
- 	{
- 	  /* Header */
- 	  sscanf(line, "%i %i %i %i", &w, &h, &ncolors, &cpp);
--	  if (ncolors > 32766)
-+	  if (ncolors <= 0 || ncolors > 32766)
- 	    {
- 	      fprintf(stderr, "gdk_imlib ERROR: XPM data wth colors > 32766 not supported\n");
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
--	  if (cpp > 5)
-+	  if (cpp <= 0 || cpp > 5)
- 	    {
- 	      fprintf(stderr, "gdk_imlib ERROR: XPM data with characters per pixel > 5 not supported\n");
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
--	  if (w > 32767)
-+	  if (w <= 0 || w > 32767)
- 	    {
- 	      fprintf(stderr, "gdk_imlib ERROR: Image width > 32767 pixels for data\n");
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
--	  if (h > 32767)
-+	  if (h <= 0 || h > 32767)
- 	    {
- 	      fprintf(stderr, "gdk_imlib ERROR: Image height > 32767 pixels for data\n");
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
- 	  cmap = malloc(sizeof(struct _cmap) * ncolors);
-@@ -1273,6 +1293,7 @@
- 	  if (!cmap)
- 	    {
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
- 	  im->rgb_width = w;
-@@ -1282,6 +1303,7 @@
- 	    {
- 	      free(cmap);
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
- 	  im->alpha_data = NULL;
-@@ -1355,7 +1377,7 @@
- 				  strcpy(col + colptr, " ");
- 				  colptr++;
- 				}
--			      if (colptr + ls <= sizeof(col))
-+			      if (colptr + ls < sizeof(col))
- 				{
- 				  strcpy(col + colptr, s);
- 				  colptr += ls;
-@@ -1558,6 +1580,7 @@
- 	}
-       if ((ptr) && ((ptr - im->rgb_data) >= w * h * 3))
- 	done = 1;
-+      free(line);
-     }
-   if (!transp)
-     {
diff --git a/media-libs/imlib/imlib-1.9.15-r99.ebuild b/media-libs/imlib/imlib-1.9.15-r99.ebuild
deleted file mode 100644
index 940c65f..0000000
--- a/media-libs/imlib/imlib-1.9.15-r99.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib/imlib-1.9.15-r3.ebuild,v 1.7 2011/10/11 20:19:49 ssuominen Exp $
-
-EAPI=2
-inherit autotools eutils
-
-PVP=(${PV//[-\._]/ })
-DESCRIPTION="Image loading and rendering library"
-HOMEPAGE="http://ftp.acc.umu.se/pub/GNOME/sources/imlib/1.9/"
-SRC_URI="mirror://gnome/sources/${PN}/${PVP[0]}.${PVP[1]}/${P}.tar.bz2
-	mirror://gentoo/gtk-1-for-imlib.m4.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="doc static-libs"
-
-RDEPEND=">=media-libs/tiff-3.5.5
-	>=media-libs/giflib-4.1.0
-	>=media-libs/libpng-1.2.1
-	virtual/jpeg
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# Fix aclocal underquoted definition warnings.
-	# Conditionalize gdk functions for bug 40453.
-	# Fix imlib-config for bug 3425.
-	epatch "${FILESDIR}"/${P}.patch
-	epatch "${FILESDIR}"/${PN}-security.patch #security #72681
-	epatch "${FILESDIR}"/${P}-bpp16-CVE-2007-3568.patch # security #201887
-	epatch "${FILESDIR}"/${P}-fix-rendering.patch #197489
-	epatch "${FILESDIR}"/${P}-asneeded.patch #207638
-	epatch "${FILESDIR}"/${P}-libpng15.patch #357167
-
-	mkdir m4 && cp "${WORKDIR}"/gtk-1-for-imlib.m4 m4
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/imlib \
-		$(use_enable static-libs static) \
-		--disable-gtktest
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog README
-	use doc && dohtml doc/*
-
-	# Punt unused files
-	rm -f "${D}"/usr/lib*/pkgconfig/imlibgdk.pc
-	find "${D}" -name '*.la' -exec rm -f {} +
-}
diff --git a/media-libs/libaudclient/Manifest b/media-libs/libaudclient/Manifest
index c42905f..3977fcc 100644
--- a/media-libs/libaudclient/Manifest
+++ b/media-libs/libaudclient/Manifest
@@ -1,2 +1,2 @@
-DIST libaudclient_3.5~rc2.orig.tar.bz2 91995 SHA256 57b59936adee309308bebe6d37709ea7e833e53529164cca0720a337c17f175a SHA512 8dd8e14caca7dd7d0aeb1bb710c95c487bf9c05ddb8c21ae8291cb05974d9c5875f42fd11d4f10c2e045b9dfcede87f9e8322454b07f50a8927782240896e951 WHIRLPOOL 79d15af62c3503c290d53abe85a020e7cf5e0733ad6c07979ff77cb66eb056ae4c0cf93a46f8c9336897c91303ec962e7dae1406f56eb7dcac9abb1b62300699
-EBUILD libaudclient-3.5_rc2.ebuild 497 SHA256 abad4db5cf9db6324f1bba03b2bd993c7c095c780986f18f4025ae4956287bd3 SHA512 c50e6aaa75d88304c23c3d49a3403bfef5a1fee6311e25e297da6845e8241bfeaaa45e00728840d2ec9c1ea0443e25cc87d196624475537ffd0bebe20a8adb48 WHIRLPOOL 1743fa411bf176255bd173348f2375c91c0b3ab73033007157efb71b26aad95b1999c7e34c6ef69a906f8f4ff160b1750f8600980e69edc6e1e89f0cd75b33e9
+DIST libaudclient_3.5~rc2.orig.tar.bz2 91995 BLAKE2B ffca75036bd6d6821e1b86dba1c992bf5ebbb0111151110790a166195fe31f3820f2f00e002f2eec4ab1a49846076b7c8382e62832e36fee4b971f08a94138f1 SHA512 8dd8e14caca7dd7d0aeb1bb710c95c487bf9c05ddb8c21ae8291cb05974d9c5875f42fd11d4f10c2e045b9dfcede87f9e8322454b07f50a8927782240896e951
+EBUILD libaudclient-3.5_rc2.ebuild 497 BLAKE2B 62b14cccd497e1655fa3cba1ada6ad3f556dfc5ae64aeb97ac88efe6729ffdce06cca8f6f15fd34c7079a3cb780dde6829a3d374a5ab5a72d8244a75fb46044c SHA512 c50e6aaa75d88304c23c3d49a3403bfef5a1fee6311e25e297da6845e8241bfeaaa45e00728840d2ec9c1ea0443e25cc87d196624475537ffd0bebe20a8adb48
diff --git a/media-libs/libid3tag/Manifest b/media-libs/libid3tag/Manifest
index 43abd1b..9c59ebc 100644
--- a/media-libs/libid3tag/Manifest
+++ b/media-libs/libid3tag/Manifest
@@ -1,14 +1,14 @@
-AUX 0.15.1b/libid3tag-0.15.1b-64bit-long.patch 567 RMD160 b045933419998fb569f5be661b03e7bc5d862003 SHA1 f9778590811a050384b9bf8827345b61999f0da3 SHA256 5f8b3d3419addf90977832b0a6e563acc2c8e243bb826ebb6d0ec573ec122e1b
-AUX 0.15.1b/libid3tag-0.15.1b-a_capella.patch 1365 RMD160 cc588ded6d7a1d69d91ca714854e29232954baaa SHA1 d2bd03350f13198a36a189cd1e9042aeed41a4e9 SHA256 07bb9a3fa3e0e7e74987725dc8eb29924e5177048d8d09e43bbd19b0e4ad09b8
-AUX 0.15.1b/libid3tag-0.15.1b-compat.patch 452 RMD160 e8a422004935e18c2217c9ac623d4895c17ad471 SHA1 8c179b10bf49385e4334aab141e4cf270cb02182 SHA256 88f486c3d263a4dd5bb556232dcfe2fba175b5124bcdd72aa6c30f562fc87d53
-AUX 0.15.1b/libid3tag-0.15.1b-file-write.patch 1344 RMD160 4f3179f4164559a64339ceaa522b6643d999332d SHA1 b7baae1c87f90aac64a4d17725b2eaad521e42af SHA256 eff855cabd8a51866a29246a1b257da64f46aab72d4b8e163e2a4c0d15165bf1
-AUX 0.15.1b/libid3tag-0.15.1b-fix_overflow.patch 324 RMD160 d6ecbbb97a76872791447102da61748b1ccdca7a SHA1 ed80bc74bd81caa225952f72a1a28d54300e43e3 SHA256 43ea3e0b324fb25802dae6410564c947ce1982243c781ef54b023f060c3b0ac4
-AUX 0.15.1b/libid3tag-0.15.1b-tag.patch 527 RMD160 5ec862828df4fe66e47047f135d2b52aba285a29 SHA1 b7ef9a41a31a37b8bb6d8e064b0c0ba618d3fa03 SHA256 ca7262ddad158ab0be804429d705f8c6a1bb120371dec593323fa4876c1b277f
-AUX 0.15.1b/libid3tag-0.15.1b-unknown-encoding.patch 879 RMD160 c4b4ac0a7d013fe06075ae7ebb7b7a9f93805159 SHA1 093def535edb3d2f5be6b173eedf0f93a1c0314c SHA256 8b695c9c05e3885655b2e798326b804011615bc6c831cd55cdbacc456a6b9494
-AUX 0.15.1b/libid3tag-0.15.1b-utf16.patchlibid3tag-0.15.1b-utf16.patch 753 RMD160 337a896343f79e83737048bd0e7f56bb5154eced SHA1 dcc01e31d5131c9be5a4dd7efe72b4fad46df9a5 SHA256 8d28c8cc163caebb4a7f927f2d80f317dfd6d8927e3235d19c006b3881f9447e
-AUX id3tag.pc 222 RMD160 f2ef95aaed166edc84d837854086ddbd45a7ff76 SHA1 db4be8657dc22311fa2ef63355261df26449a126 SHA256 46465c31b4e7e873f10f6e7ca3e642b55cb48a398a04dd3b0605d4fdd58d3c05
-AUX libid3tag-0.15.1b-ds-rcc.patch 7724 RMD160 0a0d3e46800c2f1652237290330adfae1e3d6d74 SHA1 6a72832d58579125f406857169f33bff1184241f SHA256 d975f85e5c5ebe52b272739f3b942738b4cc193ac2467aef054abc913bbbaee6
-DIST libid3tag-0.15.1b.tar.gz 338143 RMD160 31a69b8ad7684aefdb675acc8ebf89bd6f432095 SHA1 4d867e8a8436e73cd7762fe0e85958e35f1e4306 SHA256 63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
-EBUILD libid3tag-0.15.1b-r1.ebuild 1183 RMD160 281f90e28bbdcae932665b366e6be97ec8d44376 SHA1 cbb985b15036c40ce78cb17918d28d0a02c2cbbd SHA256 fafa7c2f99b3adfecfb6440dccb536807f30b02c5a0ae3666b978365543ff80b
-EBUILD libid3tag-0.15.1b-r3.ebuild 1320 RMD160 d3d52658a2659f7c08346a9c8feb85e3fe403921 SHA1 0a9f460b27c9f70803ad105b2515a484e19547f8 SHA256 7d31b906c7dc9e0ce03dedb72a6ca106b8587dbd732e5c3f33d551f726472c13
-EBUILD libid3tag-0.15.1b-r4.ebuild 1354 RMD160 0e78b26192098715978c8d9bfbc7494d752f7acd SHA1 98617f2bb90fafc8353a77ae4ff5b024d5bf1070 SHA256 3ccf661153e1658f3188bd9e04baeed6d4e01ad01365476e39a4342a63e8510e
+AUX 0.15.1b/libid3tag-0.15.1b-64bit-long.patch 567 BLAKE2B 1f1797d093abb56e87be3151f958d9bb06a9320cac1a441c0ebad6114d8e632e0da7ceede7ef6c218c95f4f3be8c7542e71a541f8fbaeaf358860b9fa01f17ab SHA512 f2c19dd5138d1cf58764dfb2acb58b4f36ad18749b0a29de9110f3bf81ae1c56c24701b4a906692863501c175fab81c44d486a94a7ee63ea67f552a68f14dcaa
+AUX 0.15.1b/libid3tag-0.15.1b-a_capella.patch 1365 BLAKE2B 84166df42a1620cf905a9b081a988e6737b3c7c77ad16e37294fb302260c788a63e10e8890dc1ea2022eb866f5474a80ae561025490e5ed8b15f4e4acb595e70 SHA512 496c624ad79bafb7255830bb4a9c638d837aa3d119435a1a7d16d138dad0626e9fcc50f1b6f3f7f03c346bd28e1da844be0c6e0ff38e850bf9852ad377fd0840
+AUX 0.15.1b/libid3tag-0.15.1b-compat.patch 452 BLAKE2B c43437ca0319e383e375cb7826f1afa61774f2fb3cb52136ad3a267ea17a4f6bb7532d82e0b354168464f16e69bb3e8a1ea8dd313f5895d9c2e5c8d6b928985f SHA512 91364db67a02106ebd0f8930f16adb25f078f707f95c695b0da6b42f1519e6aadd7cf181d19f2fea6454b3ed64d0388222f279bb1e5c802365b5d3faeb9f30c3
+AUX 0.15.1b/libid3tag-0.15.1b-file-write.patch 1344 BLAKE2B ba1e43314a4e286db21a6236929ef125294a1826724cf13a33c30a906a03dc2e6ec26acc66419c4007208ca8c99324178c3c932569e70c1cf699d7595c3b75ff SHA512 a24cd37eefd6dc282c71f59ea1f612c2347deb87a15bd6aa5c163a61cabe77a0cc882adabae35d5090c711f7f796fb6e3787968e506627336f0f0d4ad7957414
+AUX 0.15.1b/libid3tag-0.15.1b-fix_overflow.patch 324 BLAKE2B 229a97eb0c9d136a36a629185fde8541727d5fe5f4ecfb93c34fc8e0e70cd1024e0988d3f66f069e952d13040dfa13d1aa8b894b31b2b9dc92384a92d328548a SHA512 895d6a71540c8a60258e8900479bbce8f3eef67c9b0ff631130862778b3688568c5e363e0ba2a7b55a2e4a9109e22673eda69903e7bcaa77776de876cb09295b
+AUX 0.15.1b/libid3tag-0.15.1b-tag.patch 527 BLAKE2B 045268d964d4dddad836a1a8e2a75db9762d6fc442f95cc1155639979c120941876c35d31587378be69f0610449babb583ff41fd8d4f5c7e261a3b2ccee6590b SHA512 d610b108b896126ff721d1910e882ba06089aef1d3d8db60b6b76548b777f03962200fc5f046d96f1b655de4dff0a3031231f78094037c9506f7ad7798e01c8f
+AUX 0.15.1b/libid3tag-0.15.1b-unknown-encoding.patch 879 BLAKE2B 77541d2bc967a46a4557e614309f403ac8320fe1380117da21f99a9b80fb31b49fd06e6ba0234589102b26a733447ff17fe3a448e9400c7a904822354f7b5b97 SHA512 b5fab5bec89ac1d1180edae3871718170b442ec79ebde0536b50a70d6aba98761fd93fe79ebb81ee21a12643d5fb84085b7c7fd62c321284da1d61c48bd34809
+AUX 0.15.1b/libid3tag-0.15.1b-utf16.patchlibid3tag-0.15.1b-utf16.patch 753 BLAKE2B f40175f29ec3f890b835b4a648da6320cdb5fe0adf798312dc9b6c5849a91e67249d6b525b8be40b98e94e36be8504f79491aef0fec7817a87b8afb493d0cfa7 SHA512 d06dc1481b9dd4f541c3b94944a91a270a6c418612fb98eec3b71d04907d96f662fdcb678536dd584ee72e1451b04375969733e557c0eb00142f64affcb26697
+AUX id3tag.pc 222 BLAKE2B ba92bbe9ffc85d906b845d81f5a2e8f3044f707fb3f11ddfe8e669d10dd5660262559d1c830b1655d6b416655ea6f7d3eca1296d50562bf932f3be21508ed1a4 SHA512 09a04b6ae35bacb91291ec432aab64c785ba43dae94f3c97f8cd2c4a91d27ed80cfd438703cd8a82472251b17a0929fc7dcc821ae33fd5820d2a2eb0864aa2b6
+AUX libid3tag-0.15.1b-ds-rcc.patch 7724 BLAKE2B 20b7793331828d8c96f79b98140c509c51dc7da32eba647ba4d8c26c8911345c1a5b470257a7e4d639514b15cedc9da01a5941dddeda695518838e15a5052596 SHA512 af4b716326b61b2bf43a7b8bf0b77927c46a56bfd12fd8829f9700d2ee3487ff6c826e83b33c5703f961520caf1899a0a8ef82e932350bfb4b0ef25c9b3dee4d
+DIST libid3tag-0.15.1b.tar.gz 338143 BLAKE2B a4e4e66177eae9aaa251c71d605034488fdd9a0a207a41a41f85793ecbb763dd4a4c8f01183eb45a5c8563c4ad120e73b29578fd4c3bb8e467e39c5427b530b5 SHA512 ade7ce2a43c3646b4c9fdc642095174b9d4938b078b205cd40906d525acd17e87ad76064054a961f391edcba6495441450af2f68be69f116549ca666b069e6d3
+EBUILD libid3tag-0.15.1b-r1.ebuild 1183 BLAKE2B 8a4a260ddb5c01e22e31905cfc3651a98092ebc709ed03d7917fe42b9c95b709051de31028c93485f3f994a324ff7e0c3cc29c628a1bcddaec6dcc108623ece7 SHA512 badea955823e0fc32decd28ddb173a5c2fd1cea799a6c3dcd1c7d67644d268091fe2c13fb9d34cf6b3b951c53b0f4d0210074dd7d393b52180afb7d5c5ec8111
+EBUILD libid3tag-0.15.1b-r3.ebuild 1320 BLAKE2B b23f5636e68aa370d9fc8a625127f75d6fad18f7ae5339cfce9b696cbd0a761c1863b55a5c3e6923850133d7de329804e7173dfaf9eef55952cac71613431e6d SHA512 6380b53c7a0244cab28cae055bf2b1071157b819d1118d39001939214d83b435280414098ea6298375f67ac1fbff15b0270c1122576004f9e270f89c8d54ac13
+EBUILD libid3tag-0.15.1b-r4.ebuild 1354 BLAKE2B d790c247479e69264ccb1f4e0b295be818e712f397ed6f5677f5265f791d27e92b5f1069248e454d5211e555f0df6395f29297511a77ea8f8f4769b057229dbc SHA512 f48338a7766103172f5bd89fa03eb15de473110708edbde9ce67a388e33451038cccb80b5d9914966227c39ee476cdb5df7401812cb11fdc519ec5c5cd6d3b35
diff --git a/media-libs/mac/Manifest b/media-libs/mac/Manifest
index d15855b..8c99d4c 100644
--- a/media-libs/mac/Manifest
+++ b/media-libs/mac/Manifest
@@ -1,7 +1,7 @@
-AUX mac-3.99-u4-b5-s4-ds-fix.patch 600 RMD160 d5f9ba59fdca25213d1e09226f2e9a2d76f2c472 SHA1 456ed3d9ca86c76b0229c593e35d29fcec9afe85 SHA256 49b538c3cdf1b9955d8d77df03e7fdb09ef510f13ea81a60eae83ae3191e93c6
-AUX mac-3.99-u4-b5-s4-ds-gcc44.patch 1528 RMD160 c18e946581626d6f4446a590f8de721cfde83143 SHA1 777f4cfe380638abff85810aa4620281ec398a1e SHA256 e33426c49e3a1acd5c95771cb693d7b62ed20d50cc2b5713b8ab7fd2e6fb974d
-DIST mac-3.99-u4-b5-s4.tar.gz 427978 RMD160 986849a0f332e1d8f87f9954c34ecd90dbe4749c SHA1 fe706e1847b9c2f67f282c113d94305ac4e35bb2 SHA256 6270532925559bdc8dbc4ef4ca8befb5508c255a667e50382fc40b92a625544f
-DIST mac-3.99-u4-b5.tar.gz 421234 RMD160 34b5ba553f7ffa858249258dad9f64c60f0b6ac0 SHA1 f215c265c2cba719834c989498d5a8d2457b54de SHA256 d59ac5b1fa375a78eadbd5d9bb638ad0229185b42b562dbb04b0dab6475b6651
-EBUILD mac-3.99-r1.ebuild 875 RMD160 580f7ff0cf6cb87b6bd26800a10bc2bfdf92c28a SHA1 4141ede4d01712007bde23d5fae8201eb18b4997 SHA256 fa5830b87c76596567d410b80a56b1fa85495363e37c929870e8ca2b39573578
-EBUILD mac-3.99-r2.ebuild 937 RMD160 bdbdf7ab62d9150a52a3f795dda3ad849b84bee0 SHA1 cfe0b4abeeb26913e55b88257d9794e2d91356e6 SHA256 ec2df095b137e581b2f19b4617563927b0c13aa07fcf15dc957543d20941aeaa
-EBUILD mac-3.99.ebuild 812 RMD160 b8efc89ce4e9c817fec642bf69108ecee94cd7f5 SHA1 e74fefaee509f5b7d7377d9658dee68358683407 SHA256 67e57e0956f8f467580eea4d6f3c5b9165021b151cc285146a21aa838a7c786b
+AUX mac-3.99-u4-b5-s4-ds-fix.patch 600 BLAKE2B 1b7033973226ac598c5f434eecaf41a8b39850a346673a133b8cfa150480243ca07499c9cf0fe10e9c0976dd70775e87332d63e1e40d784d378cf7d3c1d697e2 SHA512 2544b162ce0a9471fefd2d2c027550c309b4ab592a694349f258bfe28088fd5b57dbb30617deaa6c5d05adb6434e16d944121b5a58443c799e8f67e2308605c4
+AUX mac-3.99-u4-b5-s4-ds-gcc44.patch 1528 BLAKE2B 886feba585fef43a93b62efc97cb050027fc6daecef4d355c3378edbff74e5ba12d41dd3833c279852666e2dafec0be79ea3e61e81c1128403572eaf0995b397 SHA512 aa234efbccb5331cf77e65e57068e6877354e66ca6060b3bf4fe82240524e9cf6984e574566b5ec0681bb93e740c3a3b461c8f93053020c88cdecfbf9cd15969
+DIST mac-3.99-u4-b5-s4.tar.gz 427978 BLAKE2B b4dd373444c6b7d61a969123813596800b0872335b639bcf2c8fa1506ceb06c4fb730348a636ab6fdc318cc45c75b375f15ebfbcde39dfe74b57b00aaea0aed3 SHA512 d3f1bb8369bca2cec7e0fda53279be23a2a8e84a107bf0cda17fe426f94ebb5d6822de96ce3b95bd75d93cc94fe49f77b2c007f08267486a6677523f60c460f9
+DIST mac-3.99-u4-b5.tar.gz 421234 BLAKE2B 50ea69db585eb27caad79cba14d0afa564f67de735794ad4ef3e5f898567e9090b969f8bc3d91ee86fa04bf78d9e7f52c88f5465471d883d84fd1c93f9247409 SHA512 0598e0d1985f9d15882b7af6bb90d933b92f9cc33919b21472ddd8816a8dc285fd93ae9fb15468ca371ed8eef79923189c9ed2b8c09a213b3fedf6a2fc683e41
+EBUILD mac-3.99-r1.ebuild 871 BLAKE2B ae3df723bb64ca67bdcc911e9a996f17f0a7f50fc952bdc8f87867d18ab85419491bae2e0e593e4cdd45f750a4abfa1cc0b9f5a5a80acd7c11087888a65684d5 SHA512 641e717bf8b8f9e8d1c88da98046d075a929e8f22a47f1d336beb7d04d403c02b3df99d0aac86b7d020d4cb69c4bed0dee4d3b5776b01d2a307a2db154e63472
+EBUILD mac-3.99-r2.ebuild 933 BLAKE2B 4ddaefb2a3d3352ee53c3630445965b9563153e797ed565d7722164b88abef789f89a1251ec0fec9e0d4f22d4d64ee10485b5cd29b6a22049fd2f2b1de1d65cb SHA512 ec65bca4bcaacf341312a514e6a9d7e5bf3ef55baaa3618f13ebc1bf0ba543960cb5f8a57d6f82269b449b523eae35d6d8053245062b906d19c1c1eccd40f076
+EBUILD mac-3.99.ebuild 808 BLAKE2B 130e1ec67aaea71f62b30d55165363e45af95c44ab08ea6418295c1f6f6b085281fe6e6b276d5ba91422a791cbbce292e96f5a95504f8a908fb932e26fc3a943 SHA512 1577097589516d3db6fcf3ccff44a38e709153955dc27b583d15f7c0da2d1c046fd70fe09366ebb4566c44c0a38527d4a7619547a40036dbabc7cf3f3a560565
diff --git a/media-libs/mac/mac-3.99-r1.ebuild b/media-libs/mac/mac-3.99-r1.ebuild
index 4cc5a6c..3a19caa 100644
--- a/media-libs/mac/mac-3.99-r1.ebuild
+++ b/media-libs/mac/mac-3.99-r1.ebuild
@@ -8,7 +8,7 @@ MY_P=${PV}-u4-b5-s4
 MY_F=mac-${MY_P}
 DESCRIPTION="Monkey Audio Codec  (MAC linux port)"
 HOMEPAGE="http://sourceforge.net/projects/mac-port/"
-SRC_URI="http://dside.dyndns.org/files/darklin/$MY_F.tar.gz"
+SRC_URI="http://darksoft.org/files/darklin/$MY_F.tar.gz"
 
 LICENSE="MAC"
 SLOT="0"
diff --git a/media-libs/mac/mac-3.99-r2.ebuild b/media-libs/mac/mac-3.99-r2.ebuild
index d1200aa..1b05371 100644
--- a/media-libs/mac/mac-3.99-r2.ebuild
+++ b/media-libs/mac/mac-3.99-r2.ebuild
@@ -8,7 +8,7 @@ MY_P=${PV}-u4-b5-s4
 MY_F=mac-${MY_P}
 DESCRIPTION="Monkey Audio Codec  (MAC linux port)"
 HOMEPAGE="http://sourceforge.net/projects/mac-port/"
-SRC_URI="http://dside.dyndns.org/files/darklin/$MY_F.tar.gz"
+SRC_URI="http://darksoft.org/files/darklin/$MY_F.tar.gz"
 
 LICENSE="MAC"
 SLOT="0"
diff --git a/media-libs/mac/mac-3.99.ebuild b/media-libs/mac/mac-3.99.ebuild
index d33a69e..7c038f8 100644
--- a/media-libs/mac/mac-3.99.ebuild
+++ b/media-libs/mac/mac-3.99.ebuild
@@ -8,7 +8,7 @@ MY_P=${PV}-u4-b5
 MY_F=mac-${MY_P}
 DESCRIPTION="Monkey Audio Codec  (MAC linux port)"
 HOMEPAGE="http://sourceforge.net/projects/mac-port/"
-SRC_URI="http://dside.dyndns.org/files/darklin/$MY_F.tar.gz"
+SRC_URI="http://darksoft.org/files/darklin/$MY_F.tar.gz"
 
 LICENSE="MAC"
 SLOT="0"
diff --git a/media-libs/win32codecs/Manifest b/media-libs/win32codecs/Manifest
deleted file mode 100644
index e178399..0000000
--- a/media-libs/win32codecs/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST all-20071007.tar.bz2 13864479 SHA256 7aae7fc658d7a9a1766002435fd75436fead9c2d45eac3d67588c313cde0d8da SHA512 b2ca67a8c7d87a9a62a78fce2c4bcba2a33604afdecf68275035107caea5421c03853dfbd642c915c3374fcfdb477fcb41fab051158e2aaaf61f091ada9229a2 WHIRLPOOL 50b4e2a08f6630d72ae684fd69c45929fcc37df0c442cef431ce09e7220f074f2d86b94ee6c675b0d3b8c6c15bd4983264c2c3063544cf466a3cc96239c44b07
-EBUILD win32codecs-20071007-r5.ebuild 1574 SHA256 b004ef71fba5009c6af0b9e3805172caa2c16ccd59314f410471dd374c9a36ac SHA512 9b7bcc5a3306341d748b47d6ef45c2533243834a7d8c83a2de387cb3bafd7f1c17170bea1a6f2c036c925fff5d179191cddcf453df7d4dd48b5016b6bc5593c4 WHIRLPOOL 693c7cc6656162afe9e1f46ef94dcf8e1880f956ddd31615f8c8447c75820a52343babdce8dae3a36922cdea359b0ab6fde8c17f85163264fde9629100fead82
diff --git a/media-libs/win32codecs/win32codecs-20071007-r5.ebuild b/media-libs/win32codecs/win32codecs-20071007-r5.ebuild
deleted file mode 100644
index b00d51a..0000000
--- a/media-libs/win32codecs/win32codecs-20071007-r5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/win32codecs/win32codecs-20071007-r4.ebuild,v 1.6 2013/05/03 15:35:03 ulm Exp $
-
-inherit multilib
-
-DESCRIPTION="Windows 32-bit binary codecs for video and audio playback support"
-SRC_URI="mirror://mplayer/releases/codecs/all-${PV}.tar.bz2"
-HOMEPAGE="http://www.mplayerhq.hu/"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-linux"
-IUSE="real"
-
-RDEPEND="real? ( =virtual/libstdc++-3.3* )"
-
-S="${WORKDIR}/all-${PV}"
-
-RESTRICT="mirror strip binchecks"
-
-pkg_setup() {
-	# This is a binary x86 package => ABI=x86
-	# Please keep this in future versions
-	# Daniel Gryniewicz <dang@gentoo.org>
-	has_multilib_profile && ABI="x86"
-}
-
-src_install() {
-	use prefix || EPREFIX=
-
-	insinto /usr/$(get_libdir)/win32
-	doins *.dll *.ax *.xa *.acm *.vwp *.drv *.DLL || die "Failed to install win32 codecs"
-
-	if use real
-	then
-		insinto /usr/$(get_libdir)/real
-		doins *so.6.0 || die "Failed to install realplayer codecs"
-
-		# copy newly introduced codecs from realplayer10
-		# see the ChangeLog online
-		doins *.so || die "Failed to install realplayer10 codecs"
-
-		# fix bug #80321
-		local x
-		for x in *so.6.0 *.so; do
-			dosym ../real/$x /usr/$(get_libdir)/win32 || die "Failed to make symlink to $x"
-		done
-	fi
-
-	dodoc README
-
-	cat > "${T}/50${PN}" <<EOF
-SEARCH_DIRS_MASK="${EPREFIX}/usr/$(get_libdir)/real ${EPREFIX}/usr/$(get_libdir)/win32"
-EOF
-	insinto /etc/revdep-rebuild
-	doins "${T}/50${PN}"
-}