diff --git a/app-vim/pyclewn/Manifest b/app-vim/pyclewn/Manifest
new file mode 100644
index 0000000..a75b2c3
--- /dev/null
+++ b/app-vim/pyclewn/Manifest
@@ -0,0 +1,5 @@
+AUX pyclewn_install-access-denied.patch 441 RMD160 f56834f1948c496bc8ad112a94771314e48938fe SHA1 1c303794db5e9cb984454111eaeb3255d3dacc7f SHA256 f30b84374a7237f6663eff84a6d3263872fb4e3afd2d64d2383361e864677ea6
+AUX pyclewn_install.py 5572 RMD160 f0de3312be5d7130fcbd77f9b3b3d240b844853c SHA1 9b450ea797e636c8e938c674afc891d05f199ed6 SHA256 f46ed19e6471d0c90ad1acef9b17cd0d38bc5950fb3a5016426e22cf659e9f5c
+AUX pyclewn_install.py.new 5428 RMD160 2ba3c34706b722554a6caa558334e5aef34a1524 SHA1 f3530dde3a4ccaadd96a4993135aa7c1b6a50fd1 SHA256 9541dbe4098e4e85ff9bba69aa417906719929912df4d84dd0f0fe985c25db91
+DIST pyclewn-1.7.py2.tar.gz 139408 RMD160 883cfc4505b658f6aaa07828d31650d0a7df35ce SHA1 b19be2a7929c4849879f61d12e1c42bb327d0254 SHA256 5c9abf4c7995ede2e7fa60b39d9d368c2dd3153b4ab1bcdd157e40b77d744317
+EBUILD pyclewn-1.7.ebuild 819 RMD160 6bcc8a8846631b7394c7dcf3ba33bf5330089875 SHA1 c56731a7f2fb422ade284a4d080eaff1bda31dd5 SHA256 c6b3e7cd3d1c70b1af27e001eceb9c1f6e846e6c2ef389f8aea3a422ec41f294
diff --git a/app-vim/pyclewn/files/pyclewn_install-access-denied.patch b/app-vim/pyclewn/files/pyclewn_install-access-denied.patch
new file mode 100644
index 0000000..e7f1569
--- /dev/null
+++ b/app-vim/pyclewn/files/pyclewn_install-access-denied.patch
@@ -0,0 +1,11 @@
+--- pyclewn_install.py	2011-11-23 21:14:52.000000000 +0100
++++ pyclewn_install.py.new	2011-11-23 21:19:31.000000000 +0100
+@@ -59,8 +59,6 @@
+ def build_vimhelp():
+     """Add pyclewn help to Vim help."""
+     helpdir = pathjoin(vimdir(), 'doc')
+-    print >> sys.stderr, 'running Vim help tags file generation in %s' % helpdir
+-    vim.exec_vimcmd(['helptags ' + helpdir, 'echo v:version'])
+ 
+ def unlink(filename):
+     """Delete a file."""
diff --git a/app-vim/pyclewn/files/pyclewn_install.py b/app-vim/pyclewn/files/pyclewn_install.py
new file mode 100755
index 0000000..8e37ada
--- /dev/null
+++ b/app-vim/pyclewn/files/pyclewn_install.py
@@ -0,0 +1,169 @@
+#!/usr/bin/env python
+"""Windows install scripts.
+"""
+
+import sys
+import os
+import os.path
+import string
+import distutils.sysconfig as sysconfig
+import distutils.dir_util as dir_util
+from os.path import join as pathjoin
+from distutils.file_util import copy_file
+from distutils.errors import DistutilsExecError
+
+import clewn.vim as vim
+import clewn.misc as misc
+
+ICON_NAME = 'clewn.ico'
+PYCLEWN_SHORTCUT = 'Pyclewn.lnk'
+
+def icon(vimdir):
+    """Return icon file tuple to be used as data file in distutils setup."""
+    return (vimdir, [pathjoin('images', ICON_NAME)])
+
+def vim_features():
+    """Abort if missing required Vim feature."""
+    output = vim.exec_vimcmd(['version'])
+
+    print >> sys.stderr, 'checking netbeans support in vim:',
+    try:
+        output.index('+netbeans_intg')
+    except ValueError:
+        raise DistutilsExecError, 'netbeans support in vim is required'
+    print >> sys.stderr, 'yes'
+
+    print >> sys.stderr, 'checking auto commands support in vim:',
+    try:
+        output.index('+autocmd')
+    except ValueError:
+        raise DistutilsExecError, 'auto commands support in vim is required'
+    print >> sys.stderr, 'yes'
+
+@misc.previous_evaluation
+def vimdir():
+    """Return the vim runtime files directory."""
+    if 'vimdir' in os.environ:
+        dir = os.environ['vimdir']
+    else:
+        path = vim.exec_vimcmd(['echon $VIM'])
+        path = path.strip(' \t\r\n')
+        if not os.path.isdir(path):
+            nodir = ('Invalid data files path. $VIM="%s" is returned'
+                ' by Vim, but this is not an existing directory.' % path)
+            raise DistutilsExecError, nodir
+        dir = pathjoin(path, 'vimfiles')
+    print 'Vim user data files location: "%s"' % dir
+    return dir
+
+def build_vimhelp():
+    """Add pyclewn help to Vim help."""
+    helpdir = pathjoin(vimdir(), 'doc')
+    print >> sys.stderr, 'running Vim help tags file generation in %s' % helpdir
+    vim.exec_vimcmd(['helptags ' + helpdir, 'echo v:version'])
+
+def unlink(filename):
+    """Delete a file."""
+    try:
+        os.unlink(filename)
+    except OSError:
+        pass
+
+def substitute_autoload(runtime_dir, mapping):
+    """Substitute templates in the autoload plugin."""
+    plugin = pathjoin(pathjoin(runtime_dir, 'autoload'), 'pyclewn.vim')
+    f = open(plugin)
+    content = f.read()
+    f.close()
+    content = string.Template(content).substitute(mapping)
+    f = open(plugin, 'w')
+    f.write(content)
+    f.close()
+
+def install():
+    """Write the bat file and copy the runtime files."""
+    prefix = sysconfig.get_config_var('prefix')
+    scripts = pathjoin(prefix, 'scripts')
+    vim_features()
+
+    # install runtime files
+    runtime_dir = pathjoin(prefix, 'pyclewn')
+    icon_file = pathjoin(runtime_dir, ICON_NAME)
+    copy_file(icon_file, scripts)
+    print >> sys.stderr, 'copying file %s' % icon_file
+    unlink(icon_file)
+
+    # substitute templates in the autoload plugin
+    clewnbat = pathjoin(scripts, 'pyclewn.bat')
+    mapping = {'pgm': misc.quote(clewnbat), 'start': 'start '}
+    substitute_autoload(runtime_dir, mapping)
+
+    for filename in dir_util.copy_tree(runtime_dir, vimdir()):
+        print >> sys.stderr, 'copying file %s' % filename
+    print >> sys.stderr, 'removing directory %s' % runtime_dir
+    dir_util.remove_tree(runtime_dir)
+
+    build_vimhelp()
+
+    # create pyclewn.bat
+    pyexe = pathjoin(prefix, 'python.exe')
+    scriptpy = pathjoin(scripts, 'pyclewn')
+    f = open(clewnbat, 'w')
+    f.write("@start %s %s %%*\n" % (pyexe, scriptpy))
+    f.close()
+
+    # create Windows shortcut
+    create_shortcut(
+        clewnbat,
+        'Pyclewn allows using Vim as a front end to a debugger.',
+        PYCLEWN_SHORTCUT,
+        r'--pgm=C:\mingw\bin\gdb.exe --daemon',
+        '',
+        pathjoin(scripts, ICON_NAME),
+        0)
+
+    # copy shortcut to Desktop when it does not exist
+    desktop_path = get_special_folder_path('CSIDL_DESKTOPDIRECTORY')
+    pyclewn_shortcut = pathjoin(desktop_path, PYCLEWN_SHORTCUT)
+    if not os.path.exists(pyclewn_shortcut):
+        copy_file(PYCLEWN_SHORTCUT, desktop_path)
+        print >> sys.stderr, 'copying pyclewn to the desktop: %s' % pyclewn_shortcut
+
+    # cleanup
+    unlink(PYCLEWN_SHORTCUT)
+    unlink(pathjoin(scripts, 'pyclewn_install.py'))
+    unlink(pathjoin(scripts, 'pyclewn_install.pyc'))
+    unlink(pathjoin(scripts, 'pyclewn_install.pyo'))
+
+    print >> sys.stderr, 'pyclewn postinstall completed'
+
+def uninstall():
+    """Uninstall on Windows."""
+    prefix = sysconfig.get_config_var('prefix')
+    scripts = pathjoin(prefix, 'scripts')
+
+    # remove scripts, icon and shortcut
+    unlink(pathjoin(scripts, 'pyclewn'))
+    unlink(pathjoin(scripts, 'pyclewn.bat'))
+    unlink(pathjoin(scripts, ICON_NAME))
+    unlink(pathjoin(scripts, 'pyclewn_install.py'))
+    desktop_path = get_special_folder_path('CSIDL_DESKTOPDIRECTORY')
+    unlink(pathjoin(desktop_path, PYCLEWN_SHORTCUT))
+
+    # remove vim files and rebuild vim help
+    unlink(pathjoin(pathjoin(vimdir(), 'doc'), 'pyclewn.txt'))
+    unlink(pathjoin(pathjoin(vimdir(), 'syntax'), 'dbgvar.vim'))
+    unlink(pathjoin(pathjoin(vimdir(), 'plugin'), 'pyclewn.vim'))
+    unlink(pathjoin(pathjoin(vimdir(), 'autoload'), 'pyclewn.vim'))
+    build_vimhelp()
+
+if __name__ == '__main__':
+    if os.name == 'nt':
+        try:
+            if sys.argv[1] == '-install':
+                install()
+            elif sys.argv[1] == '-remove':
+                uninstall()
+        except Exception, err:
+            # let the python installer print the error
+            print >> sys.stderr, err
diff --git a/app-vim/pyclewn/files/pyclewn_install.py.new b/app-vim/pyclewn/files/pyclewn_install.py.new
new file mode 100755
index 0000000..7aa70a8
--- /dev/null
+++ b/app-vim/pyclewn/files/pyclewn_install.py.new
@@ -0,0 +1,167 @@
+#!/usr/bin/env python
+"""Windows install scripts.
+"""
+
+import sys
+import os
+import os.path
+import string
+import distutils.sysconfig as sysconfig
+import distutils.dir_util as dir_util
+from os.path import join as pathjoin
+from distutils.file_util import copy_file
+from distutils.errors import DistutilsExecError
+
+import clewn.vim as vim
+import clewn.misc as misc
+
+ICON_NAME = 'clewn.ico'
+PYCLEWN_SHORTCUT = 'Pyclewn.lnk'
+
+def icon(vimdir):
+    """Return icon file tuple to be used as data file in distutils setup."""
+    return (vimdir, [pathjoin('images', ICON_NAME)])
+
+def vim_features():
+    """Abort if missing required Vim feature."""
+    output = vim.exec_vimcmd(['version'])
+
+    print >> sys.stderr, 'checking netbeans support in vim:',
+    try:
+        output.index('+netbeans_intg')
+    except ValueError:
+        raise DistutilsExecError, 'netbeans support in vim is required'
+    print >> sys.stderr, 'yes'
+
+    print >> sys.stderr, 'checking auto commands support in vim:',
+    try:
+        output.index('+autocmd')
+    except ValueError:
+        raise DistutilsExecError, 'auto commands support in vim is required'
+    print >> sys.stderr, 'yes'
+
+@misc.previous_evaluation
+def vimdir():
+    """Return the vim runtime files directory."""
+    if 'vimdir' in os.environ:
+        dir = os.environ['vimdir']
+    else:
+        path = vim.exec_vimcmd(['echon $VIM'])
+        path = path.strip(' \t\r\n')
+        if not os.path.isdir(path):
+            nodir = ('Invalid data files path. $VIM="%s" is returned'
+                ' by Vim, but this is not an existing directory.' % path)
+            raise DistutilsExecError, nodir
+        dir = pathjoin(path, 'vimfiles')
+    print 'Vim user data files location: "%s"' % dir
+    return dir
+
+def build_vimhelp():
+    """Add pyclewn help to Vim help."""
+    helpdir = pathjoin(vimdir(), 'doc')
+
+def unlink(filename):
+    """Delete a file."""
+    try:
+        os.unlink(filename)
+    except OSError:
+        pass
+
+def substitute_autoload(runtime_dir, mapping):
+    """Substitute templates in the autoload plugin."""
+    plugin = pathjoin(pathjoin(runtime_dir, 'autoload'), 'pyclewn.vim')
+    f = open(plugin)
+    content = f.read()
+    f.close()
+    content = string.Template(content).substitute(mapping)
+    f = open(plugin, 'w')
+    f.write(content)
+    f.close()
+
+def install():
+    """Write the bat file and copy the runtime files."""
+    prefix = sysconfig.get_config_var('prefix')
+    scripts = pathjoin(prefix, 'scripts')
+    vim_features()
+
+    # install runtime files
+    runtime_dir = pathjoin(prefix, 'pyclewn')
+    icon_file = pathjoin(runtime_dir, ICON_NAME)
+    copy_file(icon_file, scripts)
+    print >> sys.stderr, 'copying file %s' % icon_file
+    unlink(icon_file)
+
+    # substitute templates in the autoload plugin
+    clewnbat = pathjoin(scripts, 'pyclewn.bat')
+    mapping = {'pgm': misc.quote(clewnbat), 'start': 'start '}
+    substitute_autoload(runtime_dir, mapping)
+
+    for filename in dir_util.copy_tree(runtime_dir, vimdir()):
+        print >> sys.stderr, 'copying file %s' % filename
+    print >> sys.stderr, 'removing directory %s' % runtime_dir
+    dir_util.remove_tree(runtime_dir)
+
+    build_vimhelp()
+
+    # create pyclewn.bat
+    pyexe = pathjoin(prefix, 'python.exe')
+    scriptpy = pathjoin(scripts, 'pyclewn')
+    f = open(clewnbat, 'w')
+    f.write("@start %s %s %%*\n" % (pyexe, scriptpy))
+    f.close()
+
+    # create Windows shortcut
+    create_shortcut(
+        clewnbat,
+        'Pyclewn allows using Vim as a front end to a debugger.',
+        PYCLEWN_SHORTCUT,
+        r'--pgm=C:\mingw\bin\gdb.exe --daemon',
+        '',
+        pathjoin(scripts, ICON_NAME),
+        0)
+
+    # copy shortcut to Desktop when it does not exist
+    desktop_path = get_special_folder_path('CSIDL_DESKTOPDIRECTORY')
+    pyclewn_shortcut = pathjoin(desktop_path, PYCLEWN_SHORTCUT)
+    if not os.path.exists(pyclewn_shortcut):
+        copy_file(PYCLEWN_SHORTCUT, desktop_path)
+        print >> sys.stderr, 'copying pyclewn to the desktop: %s' % pyclewn_shortcut
+
+    # cleanup
+    unlink(PYCLEWN_SHORTCUT)
+    unlink(pathjoin(scripts, 'pyclewn_install.py'))
+    unlink(pathjoin(scripts, 'pyclewn_install.pyc'))
+    unlink(pathjoin(scripts, 'pyclewn_install.pyo'))
+
+    print >> sys.stderr, 'pyclewn postinstall completed'
+
+def uninstall():
+    """Uninstall on Windows."""
+    prefix = sysconfig.get_config_var('prefix')
+    scripts = pathjoin(prefix, 'scripts')
+
+    # remove scripts, icon and shortcut
+    unlink(pathjoin(scripts, 'pyclewn'))
+    unlink(pathjoin(scripts, 'pyclewn.bat'))
+    unlink(pathjoin(scripts, ICON_NAME))
+    unlink(pathjoin(scripts, 'pyclewn_install.py'))
+    desktop_path = get_special_folder_path('CSIDL_DESKTOPDIRECTORY')
+    unlink(pathjoin(desktop_path, PYCLEWN_SHORTCUT))
+
+    # remove vim files and rebuild vim help
+    unlink(pathjoin(pathjoin(vimdir(), 'doc'), 'pyclewn.txt'))
+    unlink(pathjoin(pathjoin(vimdir(), 'syntax'), 'dbgvar.vim'))
+    unlink(pathjoin(pathjoin(vimdir(), 'plugin'), 'pyclewn.vim'))
+    unlink(pathjoin(pathjoin(vimdir(), 'autoload'), 'pyclewn.vim'))
+    build_vimhelp()
+
+if __name__ == '__main__':
+    if os.name == 'nt':
+        try:
+            if sys.argv[1] == '-install':
+                install()
+            elif sys.argv[1] == '-remove':
+                uninstall()
+        except Exception, err:
+            # let the python installer print the error
+            print >> sys.stderr, err
diff --git a/app-vim/pyclewn/pyclewn-1.7.ebuild b/app-vim/pyclewn/pyclewn-1.7.ebuild
new file mode 100644
index 0000000..619d28b
--- /dev/null
+++ b/app-vim/pyclewn/pyclewn-1.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit distutils vim-doc eutils
+
+DESCRIPTION="A debugger frontend for gvim written in python"
+HOMEPAGE="http://pyclewn.wiki.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.py2.tar.gz"
+#SRC_URI="http://sourceforge.net/projects/pyclewn/files/pyclewn-1.7/pyclewn-1.7.py2.tar.gz/download"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.0[netbeans] )"
+RDEPEND="${DEPEND}
+	sys-devel/gdb"
+
+S="${WORKDIR}/${P}.py2/"
+
+src_prepare() {
+	distutils_src_prepare
+	epatch "${FILESDIR}/pyclewn_install-access-denied.patch"
+}
+
+pkg_postinst() {
+	update_vim_helptags
+	distutils_pkg_postinst
+}
diff --git a/dev-util/argouml/Manifest b/dev-util/argouml/Manifest
deleted file mode 100644
index 08160da..0000000
--- a/dev-util/argouml/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST ArgoUML-0.24.tar.gz 7096917 RMD160 816dcd6b96aff94fb367b6b638534a67e967c8d8 SHA1 7fc7a79534ec091b85603d9d6dbe8f6f648f6e5f SHA256 b99af974c644a299b89dff7e0de9adad11770b5ed09693fea40b28e5942f0f57
-DIST argomanual-0.24.pdf 3088192 RMD160 c79a20372a653bceb0210033fb5db3dfc2002c7f SHA1 2624ec66135003ef84d4f1f628ebcbc50dc1cc28 SHA256 ad14736aeba4ce71fd7523ca12cad55d601b5abe7b0e524045aab10ccc5a396e
-DIST cookbook-0.24.pdf 744388 RMD160 786ce824aa6bfc748dbb38dd951a57c0ae606568 SHA1 8cddcade0ba30404dfab7eb7aa69374d97bc30d1 SHA256 dd387bb3bd2f8efc2b122ca9364cc1dff83a0fbb2dfbc1548962cc042a5e621c
-DIST quickguide-0.24.pdf 25952 RMD160 fd52bdefd36a585ebda477fd3ba320501ced33aa SHA1 112c4e9e4eb9ccb19576b573e95a7b34f9386831 SHA256 7e525a8a498d5f3f0382dc073b18cd2a88e2e00d7fb0105b4418ee0e4f95e358
-EBUILD argouml-0.24.ebuild 1302 RMD160 42b19a1dde0e031ac106ecabc81acef0bc9be866 SHA1 c8047a815029e6553e0682f2288f5b535e58307b SHA256 15b42a03e079a3f92a409ec23eafc5c93def799d6e41d0d9879a570944d3701d
diff --git a/dev-util/argouml/argouml-0.24.ebuild b/dev-util/argouml/argouml-0.24.ebuild
deleted file mode 100644
index 8cfb7d8..0000000
--- a/dev-util/argouml/argouml-0.24.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/argouml/argouml-0.19.6.ebuild,v 1.3 2006/02/24 05:11:47 vapier Exp $
-
-inherit java-pkg
-
-DESCRIPTION="modelling tool that helps you do your design using UML"
-HOMEPAGE="http://argouml.tigris.org"
-SRC_URI="http://argouml-downloads.tigris.org/nonav/${P}/ArgoUML-${PV}.tar.gz
-	doc? ( http://argouml-downloads.tigris.org/nonav/${P}/argomanual-${PV}.pdf
-	http://argouml-downloads.tigris.org/nonav/${P}/quickguide-${PV}.pdf
-	http://argouml-downloads.tigris.org/nonav/${P}/cookbook-${PV}.pdf )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc-macos ~x86"
-IUSE="doc"
-RESTRICT="nomirror"
-
-#RDEPEND=">=virtual/jre-1.3"
-
-S=${WORKDIR}
-
-src_compile() { :; }
-
-src_install() {
-	dodir /opt/${PN}/lib/
-	cp -pPR . ${D}/opt/${PN}/lib/ || die
-	chmod -R 755 ${D}/opt/${PN}
-	touch ${D}/opt/${PN}/lib/argouml.log
-	chmod a+w ${D}/opt/${PN}/lib/argouml.log
-
-	echo "#!/bin/sh" > ${PN}
-	echo "cd /opt/${PN}/lib" >> ${PN}
-	echo 'java -jar argouml.jar' >> ${PN}
-	into /opt
-	dobin ${PN}
-
-	dodoc README.txt
-
-	if use doc ; then
-		insinto /usr/share/doc/${P}
-		doins ${DISTDIR}/argomanual-${PV}.pdf
-		doins ${DISTDIR}/quickguide-${PV}.pdf
-		doins ${DISTDIR}/cookbook-${PV}.pdf
-	fi
-}
diff --git a/games-emulation/raine/Manifest b/games-emulation/raine/Manifest
deleted file mode 100644
index eae526d..0000000
--- a/games-emulation/raine/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX raine-0.51.11-install_path.patch 378 RMD160 cbecc01ac41ef3afb0439cce6c449975693ba5f1 SHA1 47182c05cf9024b070dbe80f7d9157c11a893a5f SHA256 a927f07367db729beaafe8e7555f59289862619ea85ad78736e907aba42e9ff1
-AUX raine-0.51.11-ldflags.patch 467 RMD160 4ba047afbe3eb4e8399d5885c115cdef1ad2e10b SHA1 14fa2cad49eff9b6d715969f6194cb811098ef25 SHA256 3d71d8c5be91a80177efe54529c1c3273a81a7f15571b9ecb2e9f3498a7db04b
-AUX raine-0.51.11-libpng1.5.patch 370 RMD160 ad1baa66681d5507a35ffc7614216e2943d330c2 SHA1 681bc414278bd155e44a69e194c3887db6a28152 SHA256 6c1adf75a6d23b1fb25a641906ec87241a051c767eefe22d9c76a03e5a2fb382
-DIST raines-0.51.11.tar.bz2 2064881 RMD160 f037f91dd8663a628e73325a50831344cd5db61d SHA1 d6d6e3816f1118c667390bd6623808f516560491 SHA256 2d5aedd87195c33e7b2da298104906856c969dcc574003f9acf77005c711ba0f
-EBUILD raine-0.51.11.ebuild 1446 RMD160 833e3138dfd7075ebe77cc5b9910ef07b2f815af SHA1 3d993b3fd67ccbe7a4d3bdd035a4ebd863901a49 SHA256 dfa136a67cbf97d5cf1269030280fae475be0daf9729c249b57aa70e0eac737d
diff --git a/games-emulation/raine/files/raine-0.51.11-install_path.patch b/games-emulation/raine/files/raine-0.51.11-install_path.patch
deleted file mode 100644
index 7b6cb4b..0000000
--- a/games-emulation/raine/files/raine-0.51.11-install_path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- raine-0.51.11_orig/makefile	2011-04-29 11:02:44.000000000 +0200
-+++ raine-0.51.11/makefile	2011-10-24 17:11:09.000000000 +0200
-@@ -295,11 +295,7 @@
- endif
-    RAINE_UNIX = 1
- 
--ifdef VERBOSE
-    INSTALL = /usr/bin/install
--else
--    INSTALL = @install
--endif
-    INSTALL_BIN = $(INSTALL) -m 755
-    INSTALL_DATA = $(INSTALL) -m 644
-    RD = rmdir --ignore-fail-on-non-empty
diff --git a/games-emulation/raine/files/raine-0.51.11-ldflags.patch b/games-emulation/raine/files/raine-0.51.11-ldflags.patch
deleted file mode 100644
index c6658d5..0000000
--- a/games-emulation/raine/files/raine-0.51.11-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- raine-0.51.11_orig/makefile	2011-04-29 11:02:44.000000000 +0200
-+++ raine-0.51.11/makefile	2011-10-23 20:44:59.000000000 +0200
-@@ -1037,7 +1037,7 @@
- else
- 	@echo Linking Raine...
- endif
--	$(LDV) $(LFLAGS) -g -Wall -Wno-write-strings -o $(RAINE_EXE) $(OBJS) $(LIBS) -lstdc++
-+	$(LDV) $(LDFLAGS) $(LFLAGS) -g -Wall -Wno-write-strings -o $(RAINE_EXE) $(OBJS) $(LIBS) -lstdc++
- 
- converter: source/bonus/converter.c
- 	$(CCV) $(CFLAGS) -c $< -o $(OBJDIR)/converter.o
diff --git a/games-emulation/raine/files/raine-0.51.11-libpng1.5.patch b/games-emulation/raine/files/raine-0.51.11-libpng1.5.patch
deleted file mode 100644
index b90135f..0000000
--- a/games-emulation/raine/files/raine-0.51.11-libpng1.5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- raine-0.51.11_orig/source/savepng.c	2009-12-31 23:25:03.000000000 +0100
-+++ raine-0.51.11/source/savepng.c	2011-10-23 21:23:26.000000000 +0200
-@@ -203,7 +203,7 @@
- 	goto Error;
- 
-     /* Set error handling. */
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	/* If we get here, we had a problem reading the file. */
- 	goto Error;
-     }
diff --git a/games-emulation/raine/raine-0.51.11.ebuild b/games-emulation/raine/raine-0.51.11.ebuild
deleted file mode 100644
index 242702e..0000000
--- a/games-emulation/raine/raine-0.51.11.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/raine/raine-0.51.9.ebuild,v 1.4 2011/06/16 10:11:03 tupone Exp $
-
-EAPI=2
-inherit flag-o-matic eutils games
-
-DESCRIPTION="R A I N E  M680x0 Arcade Emulation"
-HOMEPAGE="http://rainemu.swishparty.co.uk/"
-echo ${PV}
-SRC_URI="http://rainemu.swishparty.co.uk/html/archive/raines-${PV}.tar.bz2"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-RDEPEND="dev-cpp/muParser
-	media-libs/libsdl[audio,joystick,video]
-	sys-libs/zlib
-	media-libs/sdl-image[png]
-	media-libs/sdl-ttf"
-DEPEND="${RDEPEND}
-	dev-lang/nasm
-	app-arch/unzip"
-
-src_prepare() {
-	echo > detect-cpu
-	echo > cpuinfo
-	sed -i \
-		-e "/^NEO/s:^:#:" \
-		-e "s:nasmw:nasm:" \
-		-e "/bindir/s:=.*:=\$(DESTDIR)${GAMES_BINDIR}:" \
-		-e "/sharedir =/s:=.*:=\$(DESTDIR)${GAMES_DATADIR}:" \
-		-e "/mandir/s:=.*:=\$(DESTDIR)/usr/share/man/man6:" \
-		makefile \
-		|| die "sed failed"
-	epatch "${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-libpng1.5.patch \
-		"${FILESDIR}"/${P}-install_path.patch
-	append-ldflags -Wl,-z,noexecstack
-}
-
-src_compile() {
-	local myopts
-
-	emake \
-		_MARCH="${CFLAGS}" \
-		VERBOSE=1 \
-		${myopts} || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	keepdir "${GAMES_DATADIR}"/${PN}/{roms,artwork,emudx,scripts/raine}
-	dodoc docs/readme.txt
-	prepgamesdirs
-}
diff --git a/media-libs/gdk-pixbuf/ChangeLog b/media-libs/gdk-pixbuf/ChangeLog
deleted file mode 100644
index 0f75a99..0000000
--- a/media-libs/gdk-pixbuf/ChangeLog
+++ /dev/null
@@ -1,194 +0,0 @@
-# ChangeLog for media-libs/gdk-pixbuf
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gdk-pixbuf/ChangeLog,v 1.44 2006/10/16 23:23:31 blubb Exp $
-
-  16 Oct 2006; Simon Stelling <blubb@gentoo.org>
-  gdk-pixbuf-0.22.0-r5.ebuild:
-  don't let the build system decide whether we use mmx or not
-
-  20 Nov 2005; Hardave Riar <hardave@gentoo.org>
-  gdk-pixbuf-0.22.0-r5.ebuild:
-  Stable on mips, bug #112608.
-
-*gdk-pixbuf-0.22.0-r5 (15 Nov 2005)
-
-  15 Nov 2005; Leonardo Boshell <leonardop@gentoo.org>
-  files/gdk-pixbuf-0.22.0-loaders.patch, +gdk-pixbuf-0.22.0-r5.ebuild:
-  Modified patch to fix a few more probems with the XPM loader (bug #112608).
-  Revision bump to propagate the changes, and marked stable on all arches that
-  reported back successful testing.
-
-  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
-  Change encoding to UTF-8 for GLEP 31 compliance
-
-  17 Oct 2004; Hardave Riar <hardave@gentoo.org> gdk-pixbuf-0.22.0-r3.ebuild:
-  Stable on mips, bug #64230.
-
-  09 Oct 2004; Tom Gall <tgall@gentoo.org> gdk-pixbuf-0.22.0-r3.ebuild:
-  stable on ppc64, bug #64230
-
-  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  gdk-pixbuf-0.22.0-r3.ebuild:
-  get_libdir fixes.
-
-  20 Sep 2004; Bryan Østergaard,,, <kloeri@gentoo.org>
-  gdk-pixbuf-0.22.0-r3.ebuild:
-  Stable on alpha, bug 64240.
-
-  20 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org>
-  gdk-pixbuf-0.22.0-r3.ebuild:
-  Stable on sparc wrt #64230
-
-*gdk-pixbuf-0.22.0-r3 (20 Sep 2004)
-
-  20 Sep 2004; foser <foser@gentoo.org> gdk-pixbuf-0.22.0.ebuild :
-  Add security fixes (#64230)
-
-  18 Aug 2004; Aron Griffis <agriffis@gentoo.org> gdk-pixbuf-0.22.0-r2.ebuild:
-  stable on alpha
-
-  29 Jul 2004; Tom Gall <tgall@gentoo.org> gdk-pixbuf-0.22.0-r2.ebuild:
-  stable on ppc64, bug #55676
-  
-  14 Apr 2004; Stephen P. Becker <geoman@gentoo.org>
-  gdk-pixbuf-0.22.0-r2.ebuild:
-  Marked stable on mips.
-
-  23 Mar 2004; Jon Portnoy <avenj@gentoo.org>
-  gdk-pixbuf-0.22.0-r2.ebuild :
-  Fix amd64/!amd64 DEPEND construct.
-
-  13 Mar 2004; Stephen P. Becker <geoman@gentoo.org>
-  gdk-pixbuf-0.22.0-r2.ebuild:
-  Added gnuconfig_update for mipslinux systems, and added ~mips keyword.
-
-  04 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org>
-  gdk-pixbuf-0.22.0-r2.ebuild:
-  stable on sparc
-
-  09 Jan 2004; <agriffis@gentoo.org> gdk-pixbuf-0.22.0-r2.ebuild:
-  stable on ia64
-
-*gdk-pixbuf-0.22.0-r1 (15 Sep 2003)
-
-  15 Sep 2003; Mike Gardiner <obz@gentoo.org> gdk-pixbuf-0.18.0-r1.ebuild,
-  gdk-pixbuf-0.22.0-r1.ebuild:
-  Removed older versions, but keeping keywords consistency
-
-  15 Sep 2003; Mike Gardiner <obz@gentoo.org> gdk-pixbuf-0.22.0.ebuild,
-  metadata.xml:
-  Marked stable on x86, and added metadata.xml
-
-*gdk-pixbuf-0.22.0-r2 (18 Aug 2003)
-
-  18 Aug 2003; <spider@gentoo.org> gdk-pixbuf-0.22.0-r2.ebuild:
-  support for USE="mmx" flag (thanks to Serge Matveev <serge@matveev.spb.ru>)
-
-  13 Aug 2003; <spider@gentoo.org> :
-  added a db-1 dependency (copied from gnome-libs) to get specifics.
-
-  04 Feb 2003; Aron Griffis <agriffis@gentoo.org> gdk-pixbuf-0.22.0.ebuild :
-  Mark stable on alpha
-
-*gdk-pixbuf-0.22.0 (22 Dec 2002)
-
-  04 Jul 2003; Guy Martin <gmsoft@gentoo.org> gdk-pixbuf-0.22.0.ebuild :
-  Added hppa to KEYWORDS.
-
-  22 Dec 2002; foser <foser@gentoo.org> gdk-pixbuf-0.22.0.ebuild :
-  New version, removed obsolete unpack hack
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*gdk-pixbuf-0.21.0 (07 Nov 2002)
-
-  08 Apr 2003; Todd Sunderlin <todd@gentoo.org> gdk-pixbuf-0.21.0.ebuild:
-  Marked stable for sparc.
-
-  07 Nov 2002; foser <foser@gentoo.org> gdk-pixbuf-0.21.0.ebuild :
-  New version, fixed some deps added doc USE
-
-*gdk-pixbuf-0.20.0 (01 Oct 2002)
-
-  01 Oct 2002; Spider <spider@gentoo.org> gdk-pixbuf-0.20.0.ebuild : uodated 
-  to the latest version, added fixes for the -config script. hopefully 
-  this solves the bugs with missing include dirs.
-
-*gdk-pixbuf-0.18.0-r1 (24 Jun 2002)
-
-25 Jul 2002; Spider <spider@gentoo.org> :
-  seems this needs db-1.85 or it will fail to build.
-  added dependency. per bug #5382
-
-  24 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
-
-  Convert to use libtool.eclass.
-
-*gdk-pixbuf-0.18.0 (19 Jun 2002)
-
-  19 Jun 2002; Gabriele Giorgetti <stroke@gentoo.org> gdk-pixbuf-0.18.0.ebuild:
-
-  Version bump.
-
-*gdk-pixbuf-0.17.0 (05 Jun 2002)
-
-  05 Jun 2002; Olivier R. <doctomoe@gentoo.org> gdk-pixbuf-0.17.0.ebuild:
-
-  Added media-libs/imlib as dependency, as it is needed to compile properly.
-
-*gdk-pixbuf-0.17.0 (20 Apr 2002)
-
-*gdk-pixbuf-0.16.0-r9 (12 Apr 2002)
-
-  12 Apr 2002; Seemant Kulleen <seemant@gentoo.org> gdk-pixbuf-0.16.0-r9.ebuild:
-
-  Updated to depend on the new libpng (which requires that this be recompiled
-  against that).
-
-*gdk-pixbuf-0.16.0-r8 (8 Apr 2002)
-
-  8 Apr 2002; M.Schlemmer <azarah@gentoo.org> gdk-pixbuf-0.16.0-r8.ebuild :
-
-  Change to use the "virtualx" eclass. Some cleanups.
-
-  3 Apr 2002; M.Schlemmer <azarah@gentoo.org> gdk-pixbuf-0.16.0-r7.ebuild :
-
-  Remove unneeded auto* stuff.
-
-*gdk-pixbuf-0.16.0-r7 (2 Apr 2002)
-
-  2 Apr 2002; Seemant Kulleen <seemant@gentoo.org> gdk-pixbuf-0.16.0-r7.ebuild :
-
-  For the record: blocke is a sheer genius.  His idea was to look at an RPM, so
-  I had a look at Mandrake's src.rpm, and lo! David BAUDENS 
-  <baudens@mandrakesoft.com> had a fix for compiling without the display.
-
-*gdk-pixbuf-0.16.0-r6 (31 Mar 2002)
-
-  31 Mar 2002; Seemant Kulleen <seemant@gentoo.org> gdk-pixbuf-0.16.0-r6.ebuild:
-
-  GNOME support is no longer an option -- it is built-in automatically, because
-  downstream applications tend to expect it in this package.
-
-*gdk-pixbuf-0.16.0-r5 (16 Mar 2002)
-
-  16 Mar 2002; M.Schlemmer <azarah@gentoo.org> :
-
-  Libtoolize to fix "rebuild" bug.
-
-  17 Feb 2002; M.Schlemmer <azarah@gentoo.org> gdk-pixbuf-0.16.0-r4.ebuild :
-
-  Fix the build to do the libraries in /usr/lib/gdk-pixbuf/loaders/ properly the
-  first time.  This is hackish at the moment, but seems to be a upstream
-  problem.  This should resolve the need to remerge gdk-pixbuf twice to get
-  mentioned libraries.
-
-*gdk-pixbuf-0.16.0-r1 (1 Feb 2002)
-
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
diff --git a/media-libs/gdk-pixbuf/Manifest b/media-libs/gdk-pixbuf/Manifest
deleted file mode 100644
index af4a743..0000000
--- a/media-libs/gdk-pixbuf/Manifest
+++ /dev/null
@@ -1,32 +0,0 @@
-AUX gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch 1157 RMD160 cbae52afefb9cebfb0fe262c7b1dd1300794a358 SHA1 a4ef059db072707c261275ff2e86ca9a3f30d8ab SHA256 d3196c1666f560997bc5cd5be4787156c64f92dc0fd8dada8ad3c16793b90970
-MD5 d1fb93f1ae994875158a7e0c108c36f8 files/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch 1157
-RMD160 cbae52afefb9cebfb0fe262c7b1dd1300794a358 files/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch 1157
-SHA256 d3196c1666f560997bc5cd5be4787156c64f92dc0fd8dada8ad3c16793b90970 files/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch 1157
-AUX gdk-pixbuf-0.22.0-bmp_secure.patch 557 RMD160 49e26cd7d4d190a4692bce88d65d8def2a4a6fff SHA1 7b8ceaaf9158af0cefe98a6cc509a1a0ced7d85d SHA256 1bb9330c75e8ceb927620f03717d442185b84602b9ec67bb6940518aabdff5f8
-MD5 5f59d5772b1482d885a180dbc581cf84 files/gdk-pixbuf-0.22.0-bmp_secure.patch 557
-RMD160 49e26cd7d4d190a4692bce88d65d8def2a4a6fff files/gdk-pixbuf-0.22.0-bmp_secure.patch 557
-SHA256 1bb9330c75e8ceb927620f03717d442185b84602b9ec67bb6940518aabdff5f8 files/gdk-pixbuf-0.22.0-bmp_secure.patch 557
-AUX gdk-pixbuf-0.22.0-loaders.patch 3589 RMD160 8aa0bd1f88ce8f50d1ec2a396e4f88fc3a42e4e4 SHA1 79ad22e48da40652aa9d06cb3350beffa4f20094 SHA256 310824874429c26b277c985b218e133ded4e94c51de389979875de38ddb57400
-MD5 3cf31ae0509747f72ac27a9fd96109c2 files/gdk-pixbuf-0.22.0-loaders.patch 3589
-RMD160 8aa0bd1f88ce8f50d1ec2a396e4f88fc3a42e4e4 files/gdk-pixbuf-0.22.0-loaders.patch 3589
-SHA256 310824874429c26b277c985b218e133ded4e94c51de389979875de38ddb57400 files/gdk-pixbuf-0.22.0-loaders.patch 3589
-AUX gdk-pixbuf-0.22.0-m4.patch 276 RMD160 35bf793c8eb8f3555505c7abf42822bc165da06f SHA1 3082b4fefdd4b2deadc3f77e85e7bcd95f0b83e5 SHA256 4a62476624319a09c000d01d45689167ea5cf1665e4c7e988032ffff11920132
-MD5 3edfa9fe9382fd8206d6238ec121a5af files/gdk-pixbuf-0.22.0-m4.patch 276
-RMD160 35bf793c8eb8f3555505c7abf42822bc165da06f files/gdk-pixbuf-0.22.0-m4.patch 276
-SHA256 4a62476624319a09c000d01d45689167ea5cf1665e4c7e988032ffff11920132 files/gdk-pixbuf-0.22.0-m4.patch 276
-DIST gdk-pixbuf-0.22.0.tar.bz2 398208 RMD160 0e56a0f883fd8e3fb4d49b9a38f984b95cd96ece SHA1 495324afb5abebc14567ffd5a6cd72333bcc7f5b SHA256 411f2a1c27c3afadc5d034f2213d9f6c3a37f564eb5989cf6e8a53729280ae22
-EBUILD gdk-pixbuf-0.22.0-r5.ebuild 1655 RMD160 49dbc10d6a405ac6aa33a28054459377f5763c85 SHA1 9f7562caf696ad9c4fba10d31334bef95c788829 SHA256 369645a93ad50f35bfa47463bfa2a8c357ad327cb3d4754b006bf9deb7c27368
-MD5 83c0e1e114933c83fec0959ef9f62a0c gdk-pixbuf-0.22.0-r5.ebuild 1655
-RMD160 49dbc10d6a405ac6aa33a28054459377f5763c85 gdk-pixbuf-0.22.0-r5.ebuild 1655
-SHA256 369645a93ad50f35bfa47463bfa2a8c357ad327cb3d4754b006bf9deb7c27368 gdk-pixbuf-0.22.0-r5.ebuild 1655
-MISC ChangeLog 6553 RMD160 2a328c79f3f09d3ed0f1cee4d4fcba2942ff3d6c SHA1 a29c8f4ea808d5c9f4dbd7cee92a7551182767e6 SHA256 97ec6d49d7c42ead77648767ec6e384eeeaa68259c336624b9dc4d0e0ea1d74a
-MD5 edce664ec9f193c0e8dac16dac0cd0de ChangeLog 6553
-RMD160 2a328c79f3f09d3ed0f1cee4d4fcba2942ff3d6c ChangeLog 6553
-SHA256 97ec6d49d7c42ead77648767ec6e384eeeaa68259c336624b9dc4d0e0ea1d74a ChangeLog 6553
-MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
-SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
-MD5 79304c539cdf535d0d9d22f692be926d files/digest-gdk-pixbuf-0.22.0-r5 256
-RMD160 e47e65fca37659885f77eeac116c0bdc113aacab files/digest-gdk-pixbuf-0.22.0-r5 256
-SHA256 e0d89abd734807451c72124bb2435f6dbf9517fd37714e49b6bd88691ee53a2a files/digest-gdk-pixbuf-0.22.0-r5 256
diff --git a/media-libs/gdk-pixbuf/files/digest-gdk-pixbuf-0.22.0-r5 b/media-libs/gdk-pixbuf/files/digest-gdk-pixbuf-0.22.0-r5
deleted file mode 100644
index 66085bc..0000000
--- a/media-libs/gdk-pixbuf/files/digest-gdk-pixbuf-0.22.0-r5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 05fcb68ceaa338614ab650c775efc2f2 gdk-pixbuf-0.22.0.tar.bz2 398208
-RMD160 0e56a0f883fd8e3fb4d49b9a38f984b95cd96ece gdk-pixbuf-0.22.0.tar.bz2 398208
-SHA256 411f2a1c27c3afadc5d034f2213d9f6c3a37f564eb5989cf6e8a53729280ae22 gdk-pixbuf-0.22.0.tar.bz2 398208
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/gdk-pixbuf-0.22.0-r5.ebuild b/media-libs/gdk-pixbuf/gdk-pixbuf-0.22.0-r5.ebuild
deleted file mode 100644
index dc3f330..0000000
--- a/media-libs/gdk-pixbuf/gdk-pixbuf-0.22.0-r5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2006 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.5 2006/10/16 23:23:31 blubb Exp $
-
-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 sh sparc x86"
-IUSE="doc mmx"
-
-RDEPEND="media-libs/jpeg
-	media-libs/tiff
-	=x11-libs/gtk+-1.2*
-	>=media-libs/libpng-1.2.1
-	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() {
-	econf \
-		--sysconfdir=/etc/X11/gdk-pixbuf \
-		$(use_enable doc gtk-doc) \
-		$(use_enable mmx) \
-		|| die
-
-	# build needs to be able to
-	# connect to an X display.
-	Xemake || die
-}
-
-src_install() {
-	einstall \
-		sysconfdir="${D}"/etc/X11/gdk-pixbuf || 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/metadata.xml b/media-libs/gdk-pixbuf/metadata.xml
deleted file mode 100644
index da6fd63..0000000
--- a/media-libs/gdk-pixbuf/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>gnome</herd>
-</pkgmetadata>