clean up

101 files changed, 0 insertions, 6978 deletions

diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
deleted file mode 100644
index 5322a86..0000000
--- a/app-emulation/vmware-modules/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX 238-3.1.0.patch 10003 RMD160 98cc751409e0ee40d0d9ff526598cb12ac1fe263 SHA1 6a28170a0cc158fd70dcf71ec1cd8315e6207e4b SHA256 4b2e1967865d33ad15b51302e4c123a9cf3df9d7facadd8c1936637a21807db2
-AUX 238-jobserver.patch 2899 RMD160 0a90332d966245e11f1ecee5a60e47779a746ccb SHA1 b6b36a98cf626f3fb5c7044b1c72f4ac917c5bd1 SHA256 131c606fdafe80f10151c667796270101f3b06ee70a1b872862e15bcfb4ee46d
-AUX 238-makefile-include.patch 2791 RMD160 8665507d2b565931dc13a5f49eec6e33205d42fb SHA1 d48ca9316e65d536e50d07dfe945a6ff195be7cd SHA256 ac676433ca499268bd6a1f0d7d904a44095bb1a777ad31d055e8c4990eea586c
-AUX 238-makefile-kernel-dir.patch 2201 RMD160 22b81e2c3c347ac6bad3afef15eea31250c34f2a SHA1 033160ded8fda76e6f016040cc4bb3f4ca0dd603 SHA256 780b79fcc6e8e836632f4542ac6c3da2d475b3ad1e2e88e1c51aea849a5172c7
-AUX 238-sema.patch 3621 RMD160 c1710c17094f21bdc31190975a29421055cb85a8 SHA1 960475b3c91a2850554170afbb810ff0d23ef08b SHA256 b56a5b6aa655f830f93424ec23cedd7dde7304f214357cde05bc89574600cbe0
-AUX 238-unlocked_ioctl.patch 1114 RMD160 9e837ff627f539e70fd0c110b17d5dd606dea9ea SHA1 0b1f11171a9d76a42ebf768557dc2e28152bc77a SHA256 d3ea574000ab0ccacad75534fc76b482ef78a47a7804e9f2abeb406ceccbb458
-EBUILD vmware-modules-238.5-r1.ebuild 1990 RMD160 f74b617e114ec42bc08ac27136781339c99f2082 SHA1 3fad091a947ef83a82954c057804c8c84835e6ce SHA256 77a32b01c90965825f244216ec1b3fe945a2ae9c2ecddc6a5b152606ec8df006
diff --git a/app-emulation/vmware-modules/files/238-3.1.0.patch b/app-emulation/vmware-modules/files/238-3.1.0.patch
deleted file mode 100644
index 9a0b903..0000000
--- a/app-emulation/vmware-modules/files/238-3.1.0.patch
+++ /dev/null
@@ -1,285 +0,0 @@
-diff -u -r source-orig/vmblock-only/linux/dentry.c source/vmblock-only/linux/dentry.c
---- source-orig/vmblock-only/linux/dentry.c	2011-03-26 04:03:06.000000000 +0100
-+++ source/vmblock-only/linux/dentry.c	2011-05-27 07:32:17.000000000 +0200
-@@ -104,7 +104,11 @@
-       return actualDentry->d_op->d_revalidate(actualDentry, nd);
-    }
- 
--   if (path_lookup(iinfo->name, 0, &actualNd)) {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
-+   if (compat_path_lookup(iinfo->name, 0, &actualNd)) {
-+#else
-+   if (kern_path(iinfo->name, 0, &(actualNd.path))) {
-+#endif
-       LOG(4, "DentryOpRevalidate: [%s] no longer exists\n", iinfo->name);
-       return 0;
-    }
-diff -u -r source-orig/vmblock-only/linux/filesystem.c source/vmblock-only/linux/filesystem.c
---- source-orig/vmblock-only/linux/filesystem.c	2011-03-26 04:03:06.000000000 +0100
-+++ source/vmblock-only/linux/filesystem.c	2011-05-30 10:20:50.000000000 +0200
-@@ -44,9 +44,14 @@
- /* File system operations */
- 
- #if defined(VMW_GETSB_2618)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
- static int FsOpGetSb(struct file_system_type *fsType, int flags,
-                      const char *devName, void *rawData, struct vfsmount *mnt);
- #else
-+static struct dentry *FsOpMount(struct file_system_type *fsType, int flags,
-+                     const char *devName, void *rawData);
-+#endif
-+#else
- static struct super_block *FsOpGetSb(struct file_system_type *fsType, int flags,
-                                      const char *devName, void *rawData);
- #endif
-@@ -66,7 +71,11 @@
- static struct file_system_type fsType = {
-    .owner = THIS_MODULE,
-    .name = VMBLOCK_FS_NAME,
-+   #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
-    .get_sb = FsOpGetSb,
-+   #else
-+   .mount = FsOpMount,
-+   #endif
-    .kill_sb = kill_anon_super,
- };
- 
-@@ -336,7 +345,11 @@
-       goto error_inode;
-    }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
-    if (compat_path_lookup(iinfo->name, 0, &actualNd)) {
-+#else
-+   if (kern_path(iinfo->name, 0, &(actualNd.path))) {
-+#endif
-       /*
-        * This file does not exist, so we create an inode that doesn't know
-        * about its underlying file.  Operations that create files and
-@@ -533,18 +546,17 @@
-    return 0;
- }
- 
--
- #if defined(VMW_GETSB_2618)
- /*
-  *-----------------------------------------------------------------------------
-  *
-- * FsOpGetSb --
-+ * FsOpGetSb/FsOpMount --
-  *
-  *    Invokes generic kernel code to prepare superblock for
-  *    deviceless filesystem.
-  *
-  * Results:
-- *    0 on success
-+ *    0/dentry on success
-  *    negative error code on failure
-  *
-  * Side effects:
-@@ -552,7 +564,7 @@
-  *
-  *-----------------------------------------------------------------------------
-  */
--
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
- static int
- FsOpGetSb(struct file_system_type *fs_type, // IN: file system type of mount
-           int flags,                        // IN: mount flags
-@@ -563,6 +575,16 @@
-    return get_sb_nodev(fs_type, flags, rawData, FsOpReadSuper, mnt);
- }
- #else
-+struct dentry *
-+FsOpMount(struct file_system_type *fs_type, // IN: file system type of mount
-+          int flags,                        // IN: mount flags
-+          const char *dev_name,             // IN: device mounting on
-+          void *rawData)                    // IN: mount arguments
-+{
-+   return mount_nodev(fs_type, flags, rawData, FsOpReadSuper);
-+}
-+#endif
-+#else
- /*
-  *-----------------------------------------------------------------------------
-  *
-diff -u -r source-orig/vmci-only/linux/driver.c source/vmci-only/linux/driver.c
---- source-orig/vmci-only/linux/driver.c	2011-03-26 06:37:32.000000000 +0100
-+++ source/vmci-only/linux/driver.c	2011-04-02 13:32:12.000000000 +0200
-@@ -42,7 +42,6 @@
- #include <linux/miscdevice.h>
- #include <linux/poll.h>
- #include <linux/smp.h>
--#include <linux/smp_lock.h>
- 
- #include "compat_file.h"
- #include "compat_highmem.h"
-diff -u -r source-orig/vmmon-only/linux/driver.c source/vmmon-only/linux/driver.c
---- source-orig/vmmon-only/linux/driver.c	2011-03-26 06:37:28.000000000 +0100
-+++ source/vmmon-only/linux/driver.c	2011-04-02 13:26:59.000000000 +0200
-@@ -780,7 +780,7 @@
- 
- 
- #define POLLQUEUE_MAX_TASK 1000
--static spinlock_t pollQueueLock __attribute__((unused)) = SPIN_LOCK_UNLOCKED;
-+static DEFINE_SPINLOCK(pollQueueLock);
- static void *pollQueue[POLLQUEUE_MAX_TASK];
- static unsigned int pollQueueCount = 0;
- 
-@@ -1041,7 +1041,8 @@
- 		* but unfortunately there is no way how to detect that
- 		* we are building for RedHat's kernel...
- 		*/
--	       static spinlock_t timerLock = SPIN_LOCK_UNLOCKED;
-+
-+	       static DEFINE_SPINLOCK(timerLock);
- 
- 	       spin_lock(&timerLock);
- 	       mod_timer(&linuxState.pollTimer, jiffies + 1);
-diff -u -r source-orig/vmmon-only/linux/hostif.c source/vmmon-only/linux/hostif.c
---- source-orig/vmmon-only/linux/hostif.c	2011-03-26 06:37:27.000000000 +0100
-+++ source/vmmon-only/linux/hostif.c	2011-04-02 13:27:58.000000000 +0200
-@@ -46,7 +46,6 @@
- #include <linux/mman.h>
- 
- #include <linux/smp.h>
--#include <linux/smp_lock.h>
- 
- #include <asm/io.h>
- #include <linux/mc146818rtc.h>
-diff -u -r source-orig/vmmon-only/linux/iommu.c source/vmmon-only/linux/iommu.c
---- source-orig/vmmon-only/linux/iommu.c	2011-03-26 06:37:27.000000000 +0100
-+++ source/vmmon-only/linux/iommu.c	2011-04-02 13:28:58.000000000 +0200
-@@ -44,7 +44,7 @@
- 
- 
- static LIST_HEAD(passthruDeviceList);
--static spinlock_t passthruDeviceListLock = SPIN_LOCK_UNLOCKED;
-+static DEFINE_SPINLOCK(passthruDeviceListLock);
- static void *pciHolePage = NULL;
- 
- /*
-diff -u -r source-orig/vmnet-only/compat_netdevice.h source/vmnet-only/compat_netdevice.h
---- source-orig/vmnet-only/compat_netdevice.h	2011-03-26 06:37:29.000000000 +0100
-+++ source/vmnet-only/compat_netdevice.h	2011-08-10 08:17:57.000000000 +0200
-@@ -47,6 +47,19 @@
- #   define net_device device
- #endif
- 
-+/* it looks like these have been removed from the kernel 3.1
-+ * probably because the "transition" is considered complete.
-+ * so to keep this source compatible we just redefine them like they were
-+ * previously
-+ */
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 41, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0)) || LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0)
-+#define HAVE_ALLOC_NETDEV		/* feature macro: alloc_xxxdev
-+					   functions are available. */
-+#define HAVE_FREE_NETDEV		/* free_netdev() */
-+#define HAVE_NETDEV_PRIV		/* netdev_priv() */
-+#define HAVE_NETIF_QUEUE
-+#define HAVE_NET_DEVICE_OPS
-+#endif
- 
- /*
-  * SET_MODULE_OWNER appeared sometime during 2.3.x. It was setting
-diff -u -r source-orig/vmnet-only/driver.c source/vmnet-only/driver.c
---- source-orig/vmnet-only/driver.c	2011-03-26 06:37:29.000000000 +0100
-+++ source/vmnet-only/driver.c	2011-04-02 14:14:57.000000000 +0200
-@@ -28,7 +28,6 @@
- #include <linux/poll.h>
- 
- #include <linux/smp.h>
--#include <linux/smp_lock.h>
- 
- #include <linux/netdevice.h>
- #include <linux/etherdevice.h>
-@@ -105,7 +104,7 @@
-  * not have vnetStructureMutex already acquired,
-  * it is most certainly a bug.
-  */
--static rwlock_t vnetPeerLock = RW_LOCK_UNLOCKED;
-+static DEFINE_RWLOCK(vnetPeerLock);
- 
- /*
-  * All concurrent changes to the network structure are
-@@ -115,6 +114,7 @@
-  * vnetStructureMutex and vnetPeerLock for write.
-  */
- compat_define_mutex(vnetStructureMutex);
-+compat_define_mutex(vnetMutex);
- 
- #if defined(VM_X86_64) && !defined(HAVE_COMPAT_IOCTL)
- /*
-@@ -264,11 +264,11 @@
- 			    struct file * filp)  // IN:
- {
-    int ret = -ENOTTY;
--   lock_kernel();
-+   compat_mutex_lock(&vnetMutex);
-    if (filp && filp->f_op && filp->f_op->ioctl == VNetFileOpIoctl) {
-       ret = VNetFileOpIoctl(filp->f_dentry->d_inode, filp, iocmd, ioarg);
-    }
--   unlock_kernel();
-+   compat_mutex_unlock(&vnetMutex);
-    return ret;
- }
- 
-@@ -1134,9 +1134,9 @@
-    if (filp && filp->f_dentry) {
-       inode = filp->f_dentry->d_inode;
-    }
--   lock_kernel();
-+   compat_mutex_lock(&vnetMutex);
-    err = VNetFileOpIoctl(inode, filp, iocmd, ioarg);
--   unlock_kernel();
-+   compat_mutex_unlock(&vnetMutex);
-    return err;
- }
- #endif
-diff -u -r source-orig/vmnet-only/filter.c source/vmnet-only/filter.c
---- source-orig/vmnet-only/filter.c	2011-03-26 06:37:29.000000000 +0100
-+++ source/vmnet-only/filter.c	2011-04-02 14:16:50.000000000 +0200
-@@ -85,7 +85,7 @@
-  * callbacks can be concurrently executing on multiple threads on multiple
-  * CPUs, so we should revisit locking for allowing for that in the future.
-  */
--spinlock_t activeRuleLock = SPIN_LOCK_UNLOCKED;
-+DEFINE_SPINLOCK(activeRuleLock);
- 
- /*
-  * Logging.
-diff -u -r source-orig/vmnet-only/hub.c source/vmnet-only/hub.c
---- source-orig/vmnet-only/hub.c	2011-03-26 06:37:29.000000000 +0100
-+++ source/vmnet-only/hub.c	2011-04-02 14:15:56.000000000 +0200
-@@ -81,7 +81,7 @@
-  * so we use __attribute__((unused)) to quiet the compiler.
-  */
- 
--static spinlock_t vnetHubLock __attribute__((unused)) = SPIN_LOCK_UNLOCKED;
-+static DEFINE_SPINLOCK(vnetHubLock);
- 
- 
- /*
-diff -u -r source-orig/vsock-only/linux/af_vsock.c source/vsock-only/linux/af_vsock.c
---- source-orig/vsock-only/linux/af_vsock.c	2011-03-26 04:03:08.000000000 +0100
-+++ source/vsock-only/linux/af_vsock.c	2011-04-02 13:33:39.000000000 +0200
-@@ -102,7 +102,6 @@
- #include <linux/miscdevice.h>
- #include <linux/poll.h>
- #include <linux/smp.h>
--#include <linux/smp_lock.h>
- #include <asm/io.h>
- #if defined(__x86_64__) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12)
- #   if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
-diff -u -r source-orig/vsock-only/linux/util.c source/vsock-only/linux/util.c
---- source-orig/vsock-only/linux/util.c	2011-03-26 04:03:08.000000000 +0100
-+++ source/vsock-only/linux/util.c	2011-04-02 13:35:45.000000000 +0200
-@@ -34,7 +34,7 @@
- struct list_head vsockBindTable[VSOCK_HASH_SIZE + 1];
- struct list_head vsockConnectedTable[VSOCK_HASH_SIZE];
- 
--spinlock_t vsockTableLock = SPIN_LOCK_UNLOCKED;
-+DEFINE_SPINLOCK(vsockTableLock);
- 
- /*
-  * snprintf() wasn't exported until 2.4.10: fall back on sprintf in those
diff --git a/app-emulation/vmware-modules/files/238-jobserver.patch b/app-emulation/vmware-modules/files/238-jobserver.patch
deleted file mode 100644
index 59a6ccc..0000000
--- a/app-emulation/vmware-modules/files/238-jobserver.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -ru a/work/vmblock-only/Makefile b/work/vmblock-only/Makefile
---- a/work/vmblock-only/Makefile	2011-01-22 08:59:15.907152002 -0500
-+++ b/work/vmblock-only/Makefile	2011-01-22 09:13:55.894938002 -0500
-@@ -123,9 +123,9 @@
- postbuild:: ;
- 
- $(DRIVER_KO): prebuild
--	make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) modules
--	make -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild
- endif
- 
-diff -ru a/work/vmci-only/Makefile b/work/vmci-only/Makefile
---- a/work/vmci-only/Makefile	2011-01-22 08:59:15.907152002 -0500
-+++ b/work/vmci-only/Makefile	2011-01-22 09:13:55.898936002 -0500
-@@ -123,9 +123,9 @@
- postbuild:: ;
- 
- $(DRIVER_KO): prebuild
--	make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) modules
--	make -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild
- endif
- 
-diff -ru a/work/vmmon-only/Makefile b/work/vmmon-only/Makefile
---- a/work/vmmon-only/Makefile	2011-01-22 08:59:15.907152002 -0500
-+++ b/work/vmmon-only/Makefile	2011-01-22 09:13:55.894938002 -0500
-@@ -123,9 +123,9 @@
- postbuild:: ;
- 
- $(DRIVER_KO): prebuild
--	make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) modules
--	make -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild
- endif
- 
-diff -ru a/work/vmnet-only/Makefile b/work/vmnet-only/Makefile
---- a/work/vmnet-only/Makefile	2011-01-22 08:59:15.911150002 -0500
-+++ b/work/vmnet-only/Makefile	2011-01-22 09:13:55.898936002 -0500
-@@ -123,9 +123,9 @@
- postbuild:: ;
- 
- $(DRIVER_KO): prebuild
--	make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) modules
--	make -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild
- endif
- 
-diff -ru a/work/vsock-only/Makefile b/work/vsock-only/Makefile
---- a/work/vsock-only/Makefile	2011-01-22 08:59:15.911150002 -0500
-+++ b/work/vsock-only/Makefile	2011-01-22 09:13:55.894938002 -0500
-@@ -123,9 +123,9 @@
- postbuild:: ;
- 
- $(DRIVER_KO): prebuild
--	make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) modules
--	make -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
-+	$(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
- 	  MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild
- endif
- 
diff --git a/app-emulation/vmware-modules/files/238-makefile-include.patch b/app-emulation/vmware-modules/files/238-makefile-include.patch
deleted file mode 100644
index 777a3fd..0000000
--- a/app-emulation/vmware-modules/files/238-makefile-include.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/work/vmblock-only/Makefile.kernel b/work/vmblock-only/Makefile.kernel
-index 9d7c5ca..92cefff 100644
---- a/work/vmblock-only/Makefile.kernel
-+++ b/work/vmblock-only/Makefile.kernel
-@@ -19,7 +19,7 @@
- 
- INCLUDE += -I$(SRCROOT)/include
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- 
- EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/setnice.c, -DVMW_HAVE_SET_USER_NICE, )
- EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/epoll.c,   -DVMW_HAVE_EPOLL, )
-diff --git a/work/vmci-only/Makefile.kernel b/work/vmci-only/Makefile.kernel
-index 22dc232..67e709f 100644
---- a/work/vmci-only/Makefile.kernel
-+++ b/work/vmci-only/Makefile.kernel
-@@ -21,7 +21,7 @@ CC_OPTS += -DVMCI
- 
- INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- 
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/epoll.c,   -DVMW_HAVE_EPOLL, )
- 
-diff --git a/work/vmmon-only/Makefile.kernel b/work/vmmon-only/Makefile.kernel
-index a7e26ea..befaca7 100644
---- a/work/vmmon-only/Makefile.kernel
-+++ b/work/vmmon-only/Makefile.kernel
-@@ -22,7 +22,7 @@ CC_OPTS += -DVMMON -DVMCORE
- INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux \
- 	   -I$(SRCROOT)/vmcore
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- 
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/nopage1.c, -DVMW_NOPAGE_261, )
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/skas1.c,   -DVMW_SKAS_MMAP, )
-diff --git a/work/vmnet-only/Makefile.kernel b/work/vmnet-only/Makefile.kernel
-index 4b16d06..0e252a6 100644
---- a/work/vmnet-only/Makefile.kernel
-+++ b/work/vmnet-only/Makefile.kernel
-@@ -19,7 +19,7 @@
- 
- INCLUDE := -I$(SRCROOT)
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/epoll.c,   -DVMW_HAVE_EPOLL, )
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/sk_alloc.c,-DVMW_HAVE_SK_ALLOC_WITH_PROTO, )
- EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_net.c,-DVMW_NETDEV_HAS_NET, )
-diff --git a/work/vsock-only/Makefile.kernel b/work/vsock-only/Makefile.kernel
-index 47ef5f3..b3539ef 100644
---- a/work/vsock-only/Makefile.kernel
-+++ b/work/vsock-only/Makefile.kernel
-@@ -25,7 +25,7 @@ INCLUDE += -I$(SRCROOT)/include
- INCLUDE += -I$(SRCROOT)/linux
- INCLUDE += -I$(SRCROOT)/common
- 
--EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
-+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
- EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/epoll.c,   -DVMW_HAVE_EPOLL, )
- EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/setnice.c, -DVMW_HAVE_SET_USER_NICE, )
- 
diff --git a/app-emulation/vmware-modules/files/238-makefile-kernel-dir.patch b/app-emulation/vmware-modules/files/238-makefile-kernel-dir.patch
deleted file mode 100644
index d4bd6d1..0000000
--- a/app-emulation/vmware-modules/files/238-makefile-kernel-dir.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff --git a/work/vmblock-only/Makefile b/work/vmblock-only/Makefile
-index 0bd0e74..27c3ede 100644
---- a/work/vmblock-only/Makefile
-+++ b/work/vmblock-only/Makefile
-@@ -46,9 +46,9 @@ endif
- VM_UNAME = $(shell uname -r)
- 
- # Header directory for the running kernel
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR) 
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vmblock
- PRODUCT := tools
-diff --git a/work/vmci-only/Makefile b/work/vmci-only/Makefile
-index 7babb8a..fbc5878 100644
---- a/work/vmci-only/Makefile
-+++ b/work/vmci-only/Makefile
-@@ -46,9 +46,9 @@ endif
- VM_UNAME = $(shell uname -r)
- 
- # Header directory for the running kernel
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR)
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vmci
- PRODUCT := @@PRODUCT@@
-diff --git a/work/vmmon-only/Makefile b/work/vmmon-only/Makefile
-index 4b4eb3e..1bb35ef 100644
---- a/work/vmmon-only/Makefile
-+++ b/work/vmmon-only/Makefile
-@@ -46,9 +46,9 @@ endif
- VM_UNAME = $(shell uname -r)
- 
- # Header directory for the running kernel
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR)
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vmmon
- PRODUCT := @@PRODUCT@@
-diff --git a/work/vmnet-only/Makefile b/work/vmnet-only/Makefile
-index 06856e7..fd53bf8 100644
---- a/work/vmnet-only/Makefile
-+++ b/work/vmnet-only/Makefile
-@@ -46,9 +46,9 @@ endif
- VM_UNAME = $(shell uname -r)
- 
- # Header directory for the running kernel
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR)
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vmnet
- PRODUCT := @@PRODUCT@@
-diff --git a/work/vsock-only/Makefile b/work/vsock-only/Makefile
-index e02adb0..210e502 100644
---- a/work/vsock-only/Makefile
-+++ b/work/vsock-only/Makefile
-@@ -46,9 +46,9 @@ endif
- VM_UNAME = $(shell uname -r)
- 
- # Header directory for the running kernel
--HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
-+HEADER_DIR = $(KERNEL_DIR)
- 
--BUILD_DIR = $(HEADER_DIR)/..
-+BUILD_DIR = $(KBUILD_OUTPUT)
- 
- DRIVER := vsock
- PRODUCT := ws
diff --git a/app-emulation/vmware-modules/files/238-sema.patch b/app-emulation/vmware-modules/files/238-sema.patch
deleted file mode 100644
index 1ebdab7..0000000
--- a/app-emulation/vmware-modules/files/238-sema.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -ru original//vmci-only/include/compat_semaphore.h patched//vmci-only/include/compat_semaphore.h
---- original//vmci-only/include/compat_semaphore.h	2010-11-11 15:37:25.000000000 -0500
-+++ patched//vmci-only/include/compat_semaphore.h	2010-11-20 10:11:56.000000000 -0500
-@@ -28,7 +28,7 @@
- #endif
- 
- 
--#if defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)
-+#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
-    /*
-     * The -rt patch series changes the name of semaphore/mutex initialization
-     * routines (across the entire kernel).  Probably to identify locations that
-@@ -41,7 +41,7 @@
-       #define DECLARE_MUTEX(_m)  DEFINE_SEMAPHORE(_m)
-    #endif
-    #ifndef init_MUTEX
--      #define init_MUTEX(_m) semaphore_init(_m)
-+      #define init_MUTEX(_m) sema_init(_m,1)
-    #endif
- #endif
- 
-diff -ru original//vmmon-only/linux/driver.c patched//vmmon-only/linux/driver.c
---- original//vmmon-only/linux/driver.c	2010-11-11 15:37:22.000000000 -0500
-+++ patched//vmmon-only/linux/driver.c	2010-11-29 23:09:16.000000000 -0500
-@@ -145,7 +145,7 @@
- #endif
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) && \
-     (defined(CONFIG_SMP) || defined(CONFIG_PREEMPT))
--#  define kernel_locked_by_current() kernel_locked()
-+#  define kernel_locked_by_current() (current->lock_depth >= 0)
- #else
- #  define kernel_locked_by_current() 0
- #endif
-@@ -170,6 +170,7 @@
- static int LinuxDriver_Ioctl(struct inode *inode, struct file *filp,
-                            u_int iocmd, unsigned long ioarg);
- #if defined(HAVE_UNLOCKED_IOCTL) || defined(HAVE_COMPAT_IOCTL)
-+#define VMW_HAVE_UNLOCKED_IOCTL
- static long LinuxDriver_UnlockedIoctl(struct file *filp,
-                            u_int iocmd, unsigned long ioarg);
- #endif
-diff -ru original//vmnet-only/compat_semaphore.h patched//vmnet-only/compat_semaphore.h
---- original//vmnet-only/compat_semaphore.h	2010-11-11 15:37:23.000000000 -0500
-+++ patched//vmnet-only/compat_semaphore.h	2010-11-20 10:11:56.000000000 -0500
-@@ -28,7 +28,7 @@
- #endif
- 
- 
--#if defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)
-+#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
-    /*
-     * The -rt patch series changes the name of semaphore/mutex initialization
-     * routines (across the entire kernel).  Probably to identify locations that
-@@ -41,7 +41,7 @@
-       #define DECLARE_MUTEX(_m)  DEFINE_SEMAPHORE(_m)
-    #endif
-    #ifndef init_MUTEX
--      #define init_MUTEX(_m) semaphore_init(_m)
-+      #define init_MUTEX(_m) sema_init(_m,1)
-    #endif
- #endif
- 
-diff -ru original//vsock-only/shared/compat_semaphore.h patched//vsock-only/shared/compat_semaphore.h
---- original//vsock-only/shared/compat_semaphore.h	2010-11-11 13:04:44.000000000 -0500
-+++ patched//vsock-only/shared/compat_semaphore.h	2010-11-20 10:11:56.000000000 -0500
-@@ -28,7 +28,7 @@
- #endif
- 
- 
--#if defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)
-+#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
-    /*
-     * The -rt patch series changes the name of semaphore/mutex initialization
-     * routines (across the entire kernel).  Probably to identify locations that
-@@ -41,7 +41,7 @@
-       #define DECLARE_MUTEX(_m)  DEFINE_SEMAPHORE(_m)
-    #endif
-    #ifndef init_MUTEX
--      #define init_MUTEX(_m) semaphore_init(_m)
-+      #define init_MUTEX(_m) sema_init(_m,1)
-    #endif
- #endif
- 
diff --git a/app-emulation/vmware-modules/files/238-unlocked_ioctl.patch b/app-emulation/vmware-modules/files/238-unlocked_ioctl.patch
deleted file mode 100644
index 3f1cd03..0000000
--- a/app-emulation/vmware-modules/files/238-unlocked_ioctl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c
-index 1a0e753..089aba3 100644
---- a/vmmon-only/linux/driver.c
-+++ b/vmmon-only/linux/driver.c
-@@ -170,6 +170,7 @@ static int LinuxDriver_Open(struct inode *inode, struct file *filp);
- static int LinuxDriver_Ioctl(struct inode *inode, struct file *filp,
-                            u_int iocmd, unsigned long ioarg);
- #if defined(HAVE_UNLOCKED_IOCTL) || defined(HAVE_COMPAT_IOCTL)
-+#define VMW_HAVE_UNLOCKED_IOCTL
- static long LinuxDriver_UnlockedIoctl(struct file *filp,
-                            u_int iocmd, unsigned long ioarg);
- #endif
-diff --git a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
-index 5847323..9042b97 100644
---- a/vmmon-only/linux/hostif.c
-+++ b/vmmon-only/linux/hostif.c
-@@ -3702,7 +3702,7 @@ HostIFDoIoctl(struct file *filp,
-    if (filp->f_op->unlocked_ioctl) {
-       return filp->f_op->unlocked_ioctl(filp, iocmd, ioarg);
-    }
--#endif
-+#else
-    if (filp->f_op->ioctl) {
-       long err;
- 
-@@ -3712,6 +3712,7 @@ HostIFDoIoctl(struct file *filp,
- 
-       return err;
-    }
-+#endif
- 
-    return -ENOIOCTLCMD;
- }
diff --git a/app-emulation/vmware-modules/vmware-modules-238.5-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-238.5-r1.ebuild
deleted file mode 100644
index 50ed1c1..0000000
--- a/app-emulation/vmware-modules/vmware-modules-238.5-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-238.5.ebuild,v 1.1 2011/10/08 18:04:57 vadimk Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic linux-info linux-mod versionator
-
-PV_MAJOR=$(get_major_version)
-PV_MINOR=$(get_version_component_range 2)
-
-DESCRIPTION="VMware kernel modules"
-HOMEPAGE="http://www.vmware.com/"
-
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	|| ( =app-emulation/vmware-player-3.1.${PV_MINOR}*
-		 =app-emulation/vmware-workstation-7.1.${PV_MINOR}* )"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	CONFIG_CHECK="~HIGH_RES_TIMERS"
-	if kernel_is ge 2 6 37 && kernel_is lt 2 6 39; then
-		CONFIG_CHECK="${CONFIG_CHECK} BKL"
-	fi
-
-	linux-info_pkg_setup
-
-	linux-mod_pkg_setup
-
-	VMWARE_GROUP=${VMWARE_GROUP:-vmware}
-
-	VMWARE_MODULE_LIST="vmblock vmci vmmon vmnet vsock"
-	VMWARE_MOD_DIR="${PN}-${PVR}"
-
-	BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
-
-	enewgroup "${VMWARE_GROUP}"
-	filter-flags -mfpmath=sse
-
-	for mod in ${VMWARE_MODULE_LIST}; do
-		MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
-	done
-}
-
-src_unpack() {
-	cd "${S}"
-	for mod in ${VMWARE_MODULE_LIST}; do
-		tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
-	done
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-jobserver.patch"
-	kernel_is ge 2 6 37 && epatch "${FILESDIR}/${PV_MAJOR}-sema.patch"
-	kernel_is ge 2 6 39 && epatch "${FILESDIR}/${PV_MAJOR}-3.1.0.patch"
-}
-
-src_install() {
-	linux-mod_src_install
-	local udevrules="${T}/60-vmware.rules"
-	cat > "${udevrules}" <<-EOF
-		KERNEL=="vmci",  GROUP="vmware", MODE=660
-		KERNEL=="vmmon", GROUP="vmware", MODE=660
-		KERNEL=="vsock", GROUP="vmware", MODE=660
-	EOF
-	insinto /etc/udev/rules.d/
-	doins "${udevrules}"
-}
diff --git a/app-pda/ipheth-pair/Manifest b/app-pda/ipheth-pair/Manifest
deleted file mode 100644
index 51f83af..0000000
--- a/app-pda/ipheth-pair/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-AUX Makefile.patch 599 RMD160 bcafed0d2452d76df214ad9043d9ea3dc1624b07 SHA1 41ee0f0bfa4aaeb457453b674b71037873cfd200 SHA256 5a9f0b45bfe397501d5503ff94fed6f275f9d7567051dd9a8fd60feeeaa519d2
-EBUILD ipheth-pair-9999.ebuild 705 RMD160 d83726bba4e8559f86fa2c1f1283f3b823fcbb8d SHA1 f933bdd7fd3a231bac6dd023d8ad3f74f466559b SHA256 a957a2f159e044d6c3961ab74aa1f66f848bdc0bcf74d98e5ea726f7a3a3b42b
diff --git a/app-pda/ipheth-pair/files/Makefile.patch b/app-pda/ipheth-pair/files/Makefile.patch
deleted file mode 100644
index 6ec0cd4..0000000
--- a/app-pda/ipheth-pair/files/Makefile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ipheth-pair/Makefile.orig	2010-02-23 10:35:56.000000000 +0200
-+++ ipheth-pair/Makefile	2010-02-23 10:37:02.099913826 +0200
-@@ -1,4 +1,3 @@
--CFLAGS += -Wall -O2
- LDLIBS += -limobiledevice
- 
- all: ipheth-pair
-@@ -6,9 +5,8 @@
- ipheth-pair: ipheth-pair.o
- 
- install:
--	install -m 0755 ipheth-pair /lib/udev/
--	install -m 0644 90-iphone-tether.rules /etc/udev/rules.d
--	/sbin/udevadm control --reload-rules
-+	install -D -m 0755 ipheth-pair ${DESTDIR}/lib/udev/ipeth-pair
-+	install -D -m 0644 90-iphone-tether.rules ${DESTDIR}/etc/udev/rules.d/90-iphone-tether.rules
- 
- clean:
- 	rm -f *.o ipheth-pair
diff --git a/app-pda/ipheth-pair/ipheth-pair-9999.ebuild b/app-pda/ipheth-pair/ipheth-pair-9999.ebuild
deleted file mode 100644
index b404a96..0000000
--- a/app-pda/ipheth-pair/ipheth-pair-9999.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit git autotools
-
-DESCRIPTION="iPhone USB Ethernet Driver for Linux pairing helper"
-HOMEPAGE="http://giagio.com/wiki/moin.cgi/iPhoneEthernetDriver"
-EGIT_REPO_URI="git://github.com/dgiagio/ipheth.git/"
-EGIT_PROJECT="ipheth"
-
-EGIT_PATCHES="${FILESDIR}/Makefile.patch"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 amd64 x86"
-IUSE=""
-
-RDEPEND="app-pda/libimobiledevice"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	emake -C ipheth-pair || die
-}
-
-src_install() {
-	emake -C ipheth-pair DESTDIR="${D}" install || die
-}
-
-pkg_postinst() {
-	udevadm control --reload-rules && udevadm trigger
-}
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
deleted file mode 100644
index 5f8c463..0000000
--- a/dev-java/icedtea/Manifest
+++ /dev/null
@@ -1,18 +0,0 @@
-AUX 7.1.14-checksums.patch 1499 RMD160 a3ac2b97034edc86348f4bc4a64c9e42618e08e7 SHA1 7b0925bf477bd7358c3aa2bbfd5fde6cdf8a0dc6 SHA256 00db70fd27fd581600552cb5261190cda0476e20a095c575b27766f83d91ab49
-AUX 7.1.14-forest.patch 483 RMD160 01c7f75d9a3d9110ec4a1a507013a1f12be75a62 SHA1 83e7153d9c50c585a41260698705c5b7f5b832ad SHA256 801a89dac50ac1d7ccfeb2c1029580d45dfc5e59a1d55a5befd9bc27cea0c505
-AUX generate-cacerts.pl 11051 RMD160 9b874c62ffa0afe16353f1e7b32f124f1d31356f SHA1 65e55b84506ecf14711db0996eccf3cfba2fe9e3 SHA256 6ee6fb155e3fa85d0a7e9015b53ebd55948c6599d100fdb69b574b6d11f73433
-AUX icedtea.env 1022 RMD160 661cf56fdb3f2ef0be76f881003aec519b1a705d SHA1 c45e176a47777b254133bc8173546349466238c8 SHA256 256c8696ab00200d7efddcb9ead817ff8358a4ba4e7b66a7205c10016bdb5911
-DIST 1571aa7abe47.tar.gz 42987989 RMD160 4e4c013702530f1f6f24d249260862d8b921e330 SHA1 d4b08c72fdfd0864a4f4a5e4c7274a85b6a54f3b SHA256 450db2362bc8c0bdd22b3f60c963a58d5fdb76577b3bc8793225266e14371e2c
-DIST 1c2f25bf36b1.tar.gz 50888 RMD160 f4ad289d8f0f6694a889dd8ef85b5400195cae5d SHA1 8fba63411419ec3c0932b84c43338db975efc57b SHA256 91b65e352002079045dc1dee1c2a1af92db74a589b11b0a01777760adca80c64
-DIST 339c2d381d80.tar.gz 51683 RMD160 da60bf388ff9c72849ee351e1058d47f65ee92b5 SHA1 54bcba2fae8485330e2a5f5cf5dc83c39cfe529f SHA256 01747b77f40ffe554a3ee0ff8b902db0d743a1f8f6260c9141a1fb3d1c6cc230
-DIST 591c7dc0b2ee.tar.gz 8562501 RMD160 f873be49c2588ef8ed272acb1dce24e069a80f1a SHA1 0db6138b456e7b9815d015d45a6ff4507f0fe08d SHA256 b4da76f4c0f99b7a989c98239e2f1afac60f6a9df8e633670c949d32a31038b6
-DIST 8e26c4aee63c.tar.gz 2210652 RMD160 0096e3edf047ceb7ec78d053db49bc0af754c116 SHA1 25c7056a5bfbe5a755e64b353cd9661533202b0d SHA256 e7384d93ac86c5b91b767bbbcb58a7037089446943935292d0d7706d16becc9f
-DIST b62418551e20.tar.gz 1432911 RMD160 44d309382764ccd4b26ad8578a5f68da58d46e59 SHA1 4ee4bdc1f58d9443b07da26ede93bab0b5e1e6fe SHA256 82eebaa8a248e18a4e4a0552716453c1f7877135ea73b51f3056fdec850267f9
-DIST d4aea1a51d62.tar.gz 113454 RMD160 91478cd6ee9e029e0c57011282ec0861cdfd0254 SHA1 262afc5029ebc2758ac02e81e508860e733ad7d2 SHA256 7143dc00cad9b7f8a653e8e22aec9fd3fa354325eaf79007326b16b887b6fbe6
-DIST d6264eb66506.tar.bz2 3151004 RMD160 f1cd1b2015fe9d0229a90d5d60740be949d12299 SHA1 ac9c202bb8a082aac3c26e54d1b73902e7b7a1d0 SHA256 e915ff8f500e7dd7bd4616cc68047ac6158e4d3312b20c07bb1cf84c9bafe909
-DIST icedtea-1.14.tar.gz 4546837 RMD160 31fec3442f02811ec535be9430b888fd30a68ea2 SHA1 8561a0230b1c00e2109f7a229b85938680df3c0c SHA256 4df2c20d4379468436c60779cba89209ad25f884588f8b638647ad210a6ae9a8
-DIST jamvm-2e52a601883dda84c824b43363c02881def3e06d.tar.gz 289743 RMD160 864b5096fd48c8d1b182159b0967982a6978da81 SHA1 2f1192b6150e7506dadb968f68504be92dc8df0b SHA256 b26bc67ddfb50c98761aa4939254470ec9a8f88e9a22628b858603099a784af8
-DIST jaxp-1_4_5-dev1.zip 6428902 RMD160 eaed0007402e348d2da8c764fe5332f6436bded1 SHA1 bb9cb47870534c6fc72e58f3ce5056e5b32d355e SHA256 050cba755c2632dc5ec5ffcdb17f2f4d36a018306c357fdd5c8996d877954de5
-DIST jdk7-jaf-2010_08_19.zip 70613 RMD160 fbadfbb781dc2aa8cfa384b8d5cd618522e55128 SHA1 63ea970dcf129fbbba39a132d8f71add19fbf1f0 SHA256 e6aefedfdbb4673e8019583d1344fb162b94e1b10382c362364dbbfd5889c09e
-DIST jdk7-jaxws2_2_2-2010_12_14.zip 5795244 RMD160 53a6c24fbc0b81101ec41a7f35ec9a4f86295d71 SHA1 c4184509955e0611f423f394ba145f1d39f7d372 SHA256 ef3115dde8ed9a7129e65aab8b1499e11621e343559e6e5a8df9c4542848fb9b
-EBUILD icedtea-7.1.14-r1.ebuild 11115 RMD160 0d28f53c65c766b6872973ce8707f1b034c1118a SHA1 4e56d21ee294a391dc1434ca0869be77e403bd90 SHA256 1a73ca5d0613b1c9debd4d8bfd36f1264d0fe7a2ca335d7d797281108fc786b7
diff --git a/dev-java/icedtea/files/7.1.14-checksums.patch b/dev-java/icedtea/files/7.1.14-checksums.patch
deleted file mode 100644
index 553e3fc..0000000
--- a/dev-java/icedtea/files/7.1.14-checksums.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- Makefile.am~	2011-05-25 19:59:26.000000000 +0100
-+++ Makefile.am	2011-06-08 13:50:12.000000000 +0100
-@@ -10,13 +10,13 @@
- LANGTOOLS_CHANGESET = 8e26c4aee63c
- OPENJDK_CHANGESET = d4aea1a51d62
- 
--CORBA_SHA256SUM = 60f8494b1ebf58db75fe8871dcbee1f6e4bd1d8d6c9b6ce49dad7a6a6340c4ac
--HOTSPOT_SHA256SUM = 6b2c5c9f5c1c603f742ddabb567d4abac23b91186ead4c1fc9d9643a07798e82
--JAXP_SHA256SUM = 9db874ee86a073776674b138c3bcd0b1b2bc90d31ed48d59f88021e93ac8a8d0
--JAXWS_SHA256SUM = 078ad45ced056d147344418e72dce6dca65e01c4ebf2b7008b74733774bcb24c
--JDK_SHA256SUM = 6d12de7cecd01c4ddef1a28fc393dfe5f8d66dea80b7d1484e028e8b921ac219
--LANGTOOLS_SHA256SUM = e1beab78534a3a0fb18404c3c200e8866da275c7c656172c9f295f11203e5f39
--OPENJDK_SHA256SUM = 856b791751e56f64cc10e4826eefc9af9882969b179595c9642f7c9771965e7d
-+CORBA_SHA256SUM = 82eebaa8a248e18a4e4a0552716453c1f7877135ea73b51f3056fdec850267f9
-+HOTSPOT_SHA256SUM = b4da76f4c0f99b7a989c98239e2f1afac60f6a9df8e633670c949d32a31038b6
-+JAXP_SHA256SUM = 91b65e352002079045dc1dee1c2a1af92db74a589b11b0a01777760adca80c64
-+JAXWS_SHA256SUM = 01747b77f40ffe554a3ee0ff8b902db0d743a1f8f6260c9141a1fb3d1c6cc230
-+JDK_SHA256SUM = 450db2362bc8c0bdd22b3f60c963a58d5fdb76577b3bc8793225266e14371e2c
-+LANGTOOLS_SHA256SUM = e7384d93ac86c5b91b767bbbcb58a7037089446943935292d0d7706d16becc9f
-+OPENJDK_SHA256SUM = 7143dc00cad9b7f8a653e8e22aec9fd3fa354325eaf79007326b16b887b6fbe6
- 
- CACAO_VERSION = d6264eb66506
- CACAO_SHA256SUM = 94ea7899e806ccbc33a732b5113a8f969d8b1f4ce7ffd27cf04577054f65f63c
diff --git a/dev-java/icedtea/files/7.1.14-forest.patch b/dev-java/icedtea/files/7.1.14-forest.patch
deleted file mode 100644
index 8d225e4..0000000
--- a/dev-java/icedtea/files/7.1.14-forest.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am~	2011-06-08 13:53:25.000000000 +0100
-+++ Makefile.am	2011-06-08 13:54:51.000000000 +0100
-@@ -40,7 +40,7 @@
- JAXP_DROP_ZIP = jaxp-1_4_5-dev1.zip
- JAXP_DROP_SHA256SUM = 050cba755c2632dc5ec5ffcdb17f2f4d36a018306c357fdd5c8996d877954de5
- 
--ICEDTEA_PREFIX = icedtea7-forest
-+ICEDTEA_PREFIX = jdk7
- ICEDTEA_HG_URL = http://icedtea.classpath.org/hg/$(ICEDTEA_PREFIX)
- OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk7/jdk7
- CVMI_HG_URL = http://hg.openjdk.java.net/cvmi/cvmi/
diff --git a/dev-java/icedtea/files/generate-cacerts.pl b/dev-java/icedtea/files/generate-cacerts.pl
deleted file mode 100644
index 17d29b3..0000000
--- a/dev-java/icedtea/files/generate-cacerts.pl
+++ /dev/null
@@ -1,358 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright (C) 2007, 2008 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# generate-cacerts.pl generates a JKS keystore named 'cacerts' from
-# OpenSSL's certificate bundle using OpenJDK's keytool.
-
-# First extract each of OpenSSL's bundled certificates into its own
-# aliased filename.
-
-# Downloaded from http://cvs.fedoraproject.org/viewvc/rpms/ca-certificates/F-12/generate-cacerts.pl?revision=1.2
-# Check and prevention of duplicate aliases added by Vlastimil Babka <caster@gentoo.org>
-
-$file = $ARGV[1];
-open(CERTS, $file);
-@certs = <CERTS>;
-close(CERTS);
-
-$pem_file_count = 0;
-$in_cert_block = 0;
-$write_current_cert = 1;
-foreach $cert (@certs)
-{
-    if ($cert =~ /Issuer: /)
-    {
-        $_ = $cert;
-        if ($cert =~ /personal-freemail/)
-        {
-            $cert_alias = "thawtepersonalfreemailca";
-        }
-        elsif ($cert =~ /personal-basic/)
-        {
-            $cert_alias = "thawtepersonalbasicca";
-        }
-        elsif ($cert =~ /personal-premium/)
-        {
-            $cert_alias = "thawtepersonalpremiumca";
-        }
-        elsif ($cert =~ /server-certs/)
-        {
-            $cert_alias = "thawteserverca";
-        }
-        elsif ($cert =~ /premium-server/)
-        {
-            $cert_alias = "thawtepremiumserverca";
-        }
-        elsif ($cert =~ /Class 1 Public Primary Certification Authority$/)
-        {
-            $cert_alias = "verisignclass1ca";
-        }
-        elsif ($cert =~ /Class 1 Public Primary Certification Authority - G2/)
-        {
-            $cert_alias = "verisignclass1g2ca";
-        }
-        elsif ($cert =~
-               /VeriSign Class 1 Public Primary Certification Authority - G3/)
-        {
-            $cert_alias = "verisignclass1g3ca";
-        }
-        elsif ($cert =~ /Class 2 Public Primary Certification Authority$/)
-        {
-            $cert_alias = "verisignclass2ca";
-        }
-        elsif ($cert =~ /Class 2 Public Primary Certification Authority - G2/)
-        {
-            $cert_alias = "verisignclass2g2ca";
-        }
-        elsif ($cert =~
-               /VeriSign Class 2 Public Primary Certification Authority - G3/)
-        {
-            $cert_alias = "verisignclass2g3ca";
-        }
-        elsif ($cert =~ /Class 3 Public Primary Certification Authority$/)
-        {
-            $cert_alias = "verisignclass3ca";
-        }
-        # Version 1 of Class 3 Public Primary Certification Authority
-        # - G2 is added.  Version 3 is excluded.  See below.
-        elsif ($cert =~
-               /VeriSign Class 3 Public Primary Certification Authority - G3/)
-        {
-            $cert_alias = "verisignclass3g3ca";
-        }
-        elsif ($cert =~
-               /RSA Data Security.*Secure Server Certification Authority/)
-        {
-            $cert_alias = "verisignserverca";
-        }
-        elsif ($cert =~ /GTE CyberTrust Global Root/)
-        {
-            $cert_alias = "gtecybertrustglobalca";
-        }
-        elsif ($cert =~ /Baltimore CyberTrust Root/)
-        {
-            $cert_alias = "baltimorecybertrustca";
-        }
-        elsif ($cert =~ /www.entrust.net\/Client_CA_Info\/CPS/)
-        {
-            $cert_alias = "entrustclientca";
-        }
-        elsif ($cert =~ /www.entrust.net\/GCCA_CPS/)
-        {
-            $cert_alias = "entrustglobalclientca";
-        }
-        elsif ($cert =~ /www.entrust.net\/CPS_2048/)
-        {
-            $cert_alias = "entrust2048ca";
-        }
-        elsif ($cert =~ /www.entrust.net\/CPS /)
-        {
-            $cert_alias = "entrustsslca";
-        }
-        elsif ($cert =~ /www.entrust.net\/SSL_CPS/)
-        {
-            $cert_alias = "entrustgsslca";
-        }
-        elsif ($cert =~ /The Go Daddy Group/)
-        {
-            $cert_alias = "godaddyclass2ca";
-        }
-        elsif ($cert =~ /Starfield Class 2 Certification Authority/)
-        {
-            $cert_alias = "starfieldclass2ca";
-        }
-        elsif ($cert =~ /ValiCert Class 2 Policy Validation Authority/)
-        {
-            $cert_alias = "valicertclass2ca";
-        }
-        elsif ($cert =~ /GeoTrust Global CA$/)
-        {
-            $cert_alias = "geotrustglobalca";
-        }
-        elsif ($cert =~ /Equifax Secure Certificate Authority/)
-        {
-            $cert_alias = "equifaxsecureca";
-        }
-        elsif ($cert =~ /Equifax Secure eBusiness CA-1/)
-        {
-            $cert_alias = "equifaxsecureebusinessca1";
-        }
-        elsif ($cert =~ /Equifax Secure eBusiness CA-2/)
-        {
-            $cert_alias = "equifaxsecureebusinessca2";
-        }
-        elsif ($cert =~ /Equifax Secure Global eBusiness CA-1/)
-        {
-            $cert_alias = "equifaxsecureglobalebusinessca1";
-        }
-        elsif ($cert =~ /Sonera Class1 CA/)
-        {
-            $cert_alias = "soneraclass1ca";
-        }
-        elsif ($cert =~ /Sonera Class2 CA/)
-        {
-            $cert_alias = "soneraclass2ca";
-        }
-        elsif ($cert =~ /AAA Certificate Services/)
-        {
-            $cert_alias = "comodoaaaca";
-        }
-        elsif ($cert =~ /AddTrust Class 1 CA Root/)
-        {
-            $cert_alias = "addtrustclass1ca";
-        }
-        elsif ($cert =~ /AddTrust External CA Root/)
-        {
-            $cert_alias = "addtrustexternalca";
-        }
-        elsif ($cert =~ /AddTrust Qualified CA Root/)
-        {
-            $cert_alias = "addtrustqualifiedca";
-        }
-        elsif ($cert =~ /UTN-USERFirst-Hardware/)
-        {
-            $cert_alias = "utnuserfirsthardwareca";
-        }
-        elsif ($cert =~ /UTN-USERFirst-Client Authentication and Email/)
-        {
-            $cert_alias = "utnuserfirstclientauthemailca";
-        }
-        elsif ($cert =~ /UTN - DATACorp SGC/)
-        {
-            $cert_alias = "utndatacorpsgcca";
-        }
-        elsif ($cert =~ /UTN-USERFirst-Object/)
-        {
-            $cert_alias = "utnuserfirstobjectca";
-        }
-        elsif ($cert =~ /America Online Root Certification Authority 1/)
-        {
-            $cert_alias = "aolrootca1";
-        }
-        elsif ($cert =~ /DigiCert Assured ID Root CA/)
-        {
-            $cert_alias = "digicertassuredidrootca";
-        }
-        elsif ($cert =~ /DigiCert Global Root CA/)
-        {
-            $cert_alias = "digicertglobalrootca";
-        }
-        elsif ($cert =~ /DigiCert High Assurance EV Root CA/)
-        {
-            $cert_alias = "digicerthighassuranceevrootca";
-        }
-        elsif ($cert =~ /GlobalSign Root CA$/)
-        {
-            $cert_alias = "globalsignca";
-        }
-        elsif ($cert =~ /GlobalSign Root CA - R2/)
-        {
-            $cert_alias = "globalsignr2ca";
-        }
-        elsif ($cert =~ /Elektronik.*Kas.*2005/)
-        {
-            $cert_alias = "extra-elektronikkas2005";
-        }
-        elsif ($cert =~ /Elektronik/)
-        {
-            $cert_alias = "extra-elektronik2005";
-        }
-        # Mozilla does not provide these certificates:
-        #   baltimorecodesigningca
-        #   gtecybertrust5ca
-        #   trustcenterclass2caii
-        #   trustcenterclass4caii
-        #   trustcenteruniversalcai
-        else
-        {
-            # Generate an alias using the OU and CN attributes of the
-            # Issuer field if both are present, otherwise use only the
-            # CN attribute.  The Issuer field must have either the OU
-            # or the CN attribute.
-            $_ = $cert;
-            if ($cert =~ /OU=/)
-            {
-                s/Issuer:.*?OU=//;
-                # Remove other occurrences of OU=.
-                s/OU=.*CN=//;
-                # Remove CN= if there were not other occurrences of OU=.
-                s/CN=//;
-                s/\/emailAddress.*//;
-                s/Certificate Authority/ca/g;
-                s/Certification Authority/ca/g;
-            }
-            elsif ($cert =~ /CN=/)
-            {
-                s/Issuer:.*CN=//;
-                s/\/emailAddress.*//;
-                s/Certificate Authority/ca/g;
-                s/Certification Authority/ca/g;
-            }
-            s/\W//g;
-            tr/A-Z/a-z/;
-            $cert_alias = "extra-$_";
-
-        }
-        while (-e "$cert_alias.pem")
-        {
-            $cert_alias = "$cert_alias" . "_";
-        }
-    }
-    # When it attempts to parse:
-    #
-    # Class 3 Public Primary Certification Authority - G2, Version 3
-    #
-    # keytool says:
-    #
-    # #2: ObjectId: 1.3.6.1.5.5.7.1.1 Criticality=false
-    # Unparseable AuthorityInfoAccess extension due to
-    # java.io.IOException: Invalid encoding of URI
-    #
-    # If we do not exclude this file
-    # openjdk/jdk/test/lib/security/cacerts/VerifyCACerts.java fails
-    # on this cert, printing:
-    #
-    # Couldn't verify: java.security.SignatureException: Signature
-    # does not match.
-    #
-    elsif ($cert =~
-           /A6:0F:34:C8:62:6C:81:F6:8B:F7:7D:A9:F6:67:58:8A:90:3F:7D:36/)
-    {
-        $write_current_cert = 0;
-        $pem_file_count--;
-    }
-    elsif ($cert eq "-----BEGIN CERTIFICATE-----\n")
-    {
-        if ($in_cert_block != 0)
-        {
-            die "$file is malformed.";
-        }
-        $in_cert_block = 1;
-        if ($write_current_cert == 1)
-        {
-            $pem_file_count++;
-            if (-e "$cert_alias.pem")
-            {
-                print "$cert_alias";
-                die "already exists"
-            }
-            open(PEM, ">$cert_alias.pem");
-            print PEM $cert;
-        }
-    }
-    elsif ($cert eq "-----END CERTIFICATE-----\n")
-    {
-        $in_cert_block = 0;
-        if ($write_current_cert == 1)
-        {
-            print PEM $cert;
-            close(PEM);
-        }
-        $write_current_cert = 1
-    }
-    else
-    {
-        if ($in_cert_block == 1 && $write_current_cert == 1)
-        {
-            print PEM $cert;
-        }
-    }
-}
-
-# Check that the correct number of .pem files were produced.
-@pem_files = <*.pem>;
-if (@pem_files != $pem_file_count)
-{
-    print "$pem_file_count";
-    die "Number of .pem files produced does not match".
-        " number of certs read from $file.";
-}
-
-# Now store each cert in the 'cacerts' file using keytool.
-$certs_written_count = 0;
-foreach $pem_file (@pem_files)
-{
-    system "$ARGV[0] -noprompt -import".
-        " -alias `basename $pem_file .pem`".
-        " -keystore cacerts -storepass 'changeit' -file $pem_file";
-    unlink($pem_file);
-    $certs_written_count++;
-}
-
-# Check that the correct number of certs were added to the keystore.
-if ($certs_written_count != $pem_file_count)
-{
-    die "Number of certs added to keystore does not match".
-        " number of certs read from $file.";
-}
diff --git a/dev-java/icedtea/files/icedtea.env b/dev-java/icedtea/files/icedtea.env
deleted file mode 100644
index e3b4689..0000000
--- a/dev-java/icedtea/files/icedtea.env
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.6.env,v 1.3 2007/04/30 11:03:14 betelgeuse Exp $
-
-VERSION="OpenJDK@SLOT@/IcedTea@SLOT@ @PV@"
-JAVA_HOME=/usr/@LIBDIR@/icedtea@SLOT@
-JDK_HOME=/usr/@LIBDIR@/icedtea@SLOT@
-JAVAC=${JAVA_HOME}/bin/javac
-PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
-MANPATH="/usr/@LIBDIR@/icedtea@SLOT@/man"
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="1.@SLOT@"
-# Taken from sun.boot.class.path property
-BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/icedtea/icedtea-7.1.14-r1.ebuild b/dev-java/icedtea/icedtea-7.1.14-r1.ebuild
deleted file mode 100644
index d0ffef1..0000000
--- a/dev-java/icedtea/icedtea-7.1.14-r1.ebuild
+++ /dev/null
@@ -1,327 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
-# *********************************************************
-
-EAPI="2"
-
-inherit autotools flag-o-matic java-pkg-2 java-vm-2 pax-utils versionator
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-SLOT="7"
-#KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-ICEDTEA_VER="$(get_version_component_range 2-3)"
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-OPENJDK_TARBALL="d4aea1a51d62.tar.gz"
-LANGTOOLS_TARBALL="8e26c4aee63c.tar.gz"
-JAXP_TARBALL="1c2f25bf36b1.tar.gz"
-JAXWS_TARBALL="339c2d381d80.tar.gz"
-CORBA_TARBALL="b62418551e20.tar.gz"
-JDK_TARBALL="1571aa7abe47.tar.gz"
-HOTSPOT_TARBALL="591c7dc0b2ee.tar.gz"
-CACAO_TARBALL="d6264eb66506.tar.bz2"
-JAMVM_TARBALL="2e52a601883dda84c824b43363c02881def3e06d.tar.gz"
-JAXP_DROP="jaxp-1_4_5-dev1.zip"
-JAXWS_DROP="jdk7-jaxws2_2_2-2010_12_14.zip"
-JAF_DROP="jdk7-jaf-2010_08_19.zip"
-SRC_URI="http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
-		 http://hg.openjdk.java.net/icedtea/jdk7/archive/${OPENJDK_TARBALL}
-		 http://hg.openjdk.java.net/icedtea/jdk7/corba/archive/${CORBA_TARBALL}
-		 http://hg.openjdk.java.net/icedtea/jdk7/jaxp/archive/${JAXP_TARBALL}
-		 http://hg.openjdk.java.net/icedtea/jdk7/jaxws/archive/${JAXWS_TARBALL}
-		 http://hg.openjdk.java.net/icedtea/jdk7/jdk/archive/${JDK_TARBALL}
-		 http://hg.openjdk.java.net/icedtea/jdk7/hotspot/archive/${HOTSPOT_TARBALL}
-		 http://hg.openjdk.java.net/icedtea/jdk7/langtools/archive/${LANGTOOLS_TARBALL}
-		 http://icedtea.classpath.org/download/drops/${JAXP_DROP}
-		 http://icedtea.classpath.org/download/drops/${JAXWS_DROP}
-		 http://icedtea.classpath.org/download/drops/${JAF_DROP}
-		 cacao? ( http://mips.complang.tuwien.ac.at/hg/cacao/archive/${CACAO_TARBALL} )
-		 jamvm? ( http://icedtea.classpath.org/download/drops/jamvm/jamvm-${JAMVM_TARBALL} )"
-HOMEPAGE="http://icedtea.classpath.org"
-S=${WORKDIR}/${ICEDTEA_PKG}
-
-# Missing options:
-# shark - needs adding
-IUSE="cacao debug doc examples jamvm javascript +nsplugin pulseaudio systemtap +webstart +xrender zero"
-
-RDEPEND=">=net-print/cups-1.2.12
-	 >=x11-libs/libX11-1.1.3
-	 >=media-libs/freetype-2.3.5
-	 >=media-libs/alsa-lib-1.0
-	 >=x11-libs/gtk+-2.8:2
-	 >=x11-libs/libXinerama-1.0.2
-	 >=x11-libs/libXp-1.0.0
-	 >=x11-libs/libXi-1.1.3
-	 >=x11-libs/libXau-1.0.3
-	 >=x11-libs/libXdmcp-1.0.2
-	 >=x11-libs/libXtst-1.0.3
-	 virtual/jpeg
-	 >=media-libs/libpng-1.2
-	 >=media-libs/giflib-4.1.6
-	 >=media-libs/lcms-2.2
-	 >=sys-libs/zlib-1.2.3
-	 x11-proto/inputproto
-	 x11-proto/xineramaproto
-	 pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
-	 javascript? ( dev-java/rhino:1.6 )
-	 zero? ( virtual/libffi )
-	 xrender? ( >=x11-libs/libXrender-0.9.4 )
-	 systemtap? ( >=dev-util/systemtap-1 )
-	 !dev-java/icedtea:0"
-
-# Additional dependencies for building:
-#   zip: extract OpenJDK tarball, and needed by configure
-#   ant, ecj, jdk: required to build Java code
-# Only ant-core-1.7.1-r2 and later contain a version of Ant that
-# properly respects environment variables, if the build
-# sets some environment variables.
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-# xext headers have two variants depending on version - bug #288855
-# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
-DEPEND="${RDEPEND}
-	|| (
-		>=dev-java/gcj-jdk-4.3
-		>=dev-java/cacao-0.99.2
-		dev-java/icedtea:7
-		dev-java/icedtea6-bin
-		dev-java/icedtea:6
-		dev-java/icedtea6
-	)
-	app-arch/zip
-	>=dev-libs/libxslt-1.1.26
-	>=dev-java/ant-core-1.7.1-r2
-	dev-java/ant-nodeps
-	app-misc/ca-certificates
-	dev-lang/perl
-	dev-libs/openssl
-	sys-apps/lsb-release
-	 || ( >=sys-devel/autoconf-2.65:2.5 <sys-devel/autoconf-2.64:2.5 )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:7 )
-	nsplugin? ( dev-java/icedtea-web:7[nsplugin] )"
-
-# a bit of hack so the VM switching is triggered without causing dependency troubles
-JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.5"
-JAVA_PKG_WANT_SOURCE="1.5"
-JAVA_PKG_WANT_TARGET="1.5"
-
-pkg_setup() {
-# Shark support disabled for now - still experimental and needs sys-devel/llvm
-#	if use shark ; then
-#	  if ( ! use x86 && ! use sparc && ! use ppc ) ; then
-#		eerror "The Shark JIT has known issues on 64-bit platforms.  Please rebuild"
-#		errror "without the shark USE flag turned on."
-#		die "Rebuild without the shark USE flag on."
-#	  fi
-#	  if ( ! use zero ) ; then
-#		eerror "The use of the Shark JIT is only applicable when used with the zero assembler port.";
-#		die "Rebuild without the shark USE flag on or with the zero USE flag turned on."
-#	  fi
-#	fi
-
-	if use nsplugin && ! use webstart ; then
-		eerror "WebStart is required if building the plugin."
-		die 'Re-try with USE="webstart"'
-		elog "Note that the nsplugin flag implies the webstart flag. Enable it to remove this message."
-	fi
-
-	# quite a hack since java-config does not provide a way for a package
-	# to limit supported VM's for building and their preferred order
-	if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
-		einfo "Honoring user-set JAVA_PKG_FORCE_VM"
-	#elif has_version dev-java/icedtea:7; then
-	#	JAVA_PKG_FORCE_VM="icedtea7"
-	elif has_version dev-java/icedtea:6; then
-		JAVA_PKG_FORCE_VM="icedtea6"
-	elif has_version dev-java/icedtea:0; then
-		JAVA_PKG_FORCE_VM="icedtea"
-	elif has_version dev-java/gcj-jdk; then
-		JAVA_PKG_FORCE_VM="gcj-jdk"
-	elif has_version dev-java/icedtea6; then
-		JAVA_PKG_FORCE_VM="icedtea6"
-	elif has_version dev-java/icedtea6-bin; then
-		JAVA_PKG_FORCE_VM="icedtea6-bin"
-	elif has_version dev-java/cacao; then
-		JAVA_PKG_FORCE_VM="cacao"
-	else
-		JAVA_PKG_FORCE_VM=""
-		# don't die just yet if merging a binpkg - bug #258423
-		DIE_IF_NOT_BINPKG=true
-	fi
-
-	# if the previous failed, don't even run java eclasses pkg_setup
-	# as it might also die when no VM is present
-	if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
-		einfo "Forced vm ${JAVA_PKG_FORCE_VM}"
-		java-vm-2_pkg_setup
-		java-pkg-2_pkg_setup
-	fi
-
-	VMHANDLE="icedtea${SLOT}"
-}
-
-src_unpack() {
-	if [[ -n ${DIE_IF_NOT_BINPKG} ]]; then
-		die "Unable to find a supported VM for building"
-	fi
-	unpack ${ICEDTEA_PKG}.tar.gz
-}
-
-unset_vars() {
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-checksums.patch"
-	epatch "${FILESDIR}/${PV}-forest.patch"
-	eautoreconf
-}
-
-src_configure() {
-	local config procs rhino_jar
-	local vm=$(java-pkg_get-current-vm)
-
-	if [[ "${vm}" == "icedtea6" || "${vm}" == "icedtea" ]] || [[ "${vm}" == "icedtea7" ]] || [[ "${vm}" == "icedtea6-bin" ]] ; then
-		# We can't currently bootstrap with a Sun-based JVM :(
-		config="${config} --disable-bootstrap"
-	elif [[ "${vm}" != "gcj-jdk" && "${vm}" != "cacao" ]] ; then
-		eerror "IcedTea must be built with either a JDK based on GNU Classpath or an existing build of IcedTea."
-		die "Install a GNU Classpath JDK (gcj-jdk, cacao)"
-	fi
-
-	# OpenJDK-specific parallelism support.
-	procs=$(echo ${MAKEOPTS} | sed -r 's/.*-j\W*([0-9]+).*/\1/')
-	if [[ -n ${procs} ]] ; then
-		config="${config} --with-parallel-jobs=${procs}";
-		einfo "Configuring using --with-parallel-jobs=${procs}"
-	fi
-
-	if use_zero ; then
-		config="${config} --enable-zero"
-	else
-		config="${config} --disable-zero"
-	fi
-
-	if use javascript ; then
-		rhino_jar=$(java-pkg_getjar rhino:1.6 js.jar);
-	fi
-
-	if use cacao ; then
-		config="${config} --with-cacao-src-zip=${DISTDIR}/${CACAO_TARBALL}";
-	fi
-
-	if use jamvm ; then
-		config="${config} --with-jamvm-src-zip=${DISTDIR}/${JAMVM_TARBALL}";
-	fi
-
-	unset_vars
-
-	econf ${config} \
-		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
-		--with-corba-src-zip="${DISTDIR}/${CORBA_TARBALL}" \
-		--with-jaxp-src-zip="${DISTDIR}/${JAXP_TARBALL}" \
-		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_TARBALL}" \
-		--with-jdk-src-zip="${DISTDIR}/${JDK_TARBALL}" \
-		--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_TARBALL}" \
-		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_TARBALL}" \
-		--with-jaxp-drop-zip="${DISTDIR}/${JAXP_DROP}" \
-		--with-jaxws-drop-zip="${DISTDIR}/${JAXWS_DROP}" \
-		--with-jaf-drop-zip="${DISTDIR}/${JAF_DROP}" \
-		--with-jdk-home="$(java-config -O)" \
-		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
-		--disable-jdk-tests \
-		$(use_enable !debug optimizations) \
-		$(use_enable doc docs) \
-		$(use_with javascript rhino ${rhino_jar}) \
-		$(use_enable zero) \
-		$(use_enable pulseaudio pulse-java) \
-		$(use_enable xrender) \
-		$(use_enable systemtap) \
-		|| die "configure failed"
-}
-
-src_compile() {
-	# Newer versions of Gentoo's ant add
-	# an environment variable so it works properly...
-	export ANT_RESPECT_JAVA_HOME=TRUE
-
-	# ant -diagnostics in Ant 1.8.0 fails without xerces+xalan
-	# otherwise we try to load the least that's needed to avoid possible classpath collisions
-	export ANT_TASKS="xerces-2 xalan ant-nodeps"
-
-	#enable compiling on every linux
-	export DISABLE_HOTSPOT_OS_VERSION_CHECK=ok
-
-	# Paludis does not respect unset from src_configure
-	unset_vars
-	emake -j 1  || die "make failed"
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-	local ddest="${D}/${dest}"
-	dodir "${dest}" || die
-
-	local arch=${ARCH}
-
-	dodoc README NEWS AUTHORS || die
-	dosym "/usr/share/doc/${PF}" "/usr/share/doc/${PN}${SLOT}"
-
-	cd "${S}/openjdk.build/j2sdk-image" || die
-
-	if use doc ; then
-		# java-pkg_dohtml needed for package-list #302654
-		java-pkg_dohtml -r ../docs/* || die "Failed to install documentation"
-	fi
-
-	# doins can't handle symlinks.
-	cp -vRP bin include jre lib man "${ddest}" || die "failed to copy"
-
-	# Set PaX markings on all JDK/JRE executables to allow code-generation on
-	# the heap by the JIT compiler.
-	pax-mark m $(list-paxables "${ddest}"{,/jre}/bin/*)
-
-	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README || die
-
-	if use examples; then
-		dodir "${dest}/share";
-		cp -vRP demo sample "${ddest}/share/" || die
-	fi
-
-	cp src.zip "${ddest}" || die
-
-	# Fix the permissions.
-	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
-	# We need to generate keystore - bug #273306
-	einfo "Generating cacerts file from certificates in /usr/share/ca-certificates/"
-	mkdir "${T}/certgen" && cd "${T}/certgen" || die
-	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
-	for c in /usr/share/ca-certificates/*/*.crt; do
-		openssl x509 -text -in "${c}" >> all.crt || die
-	done
-	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
-	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
-	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
-	sed -e "s#@SLOT@#${SLOT}#g" \
-		-e "s#@PV@#${ICEDTEA_VER}#g" \
-		-e "s#@LIBDIR@#$(get_libdir)#g" \
-		< "${FILESDIR}/icedtea.env" > "${T}/icedtea.env"
-	set_java_env "${T}/icedtea.env"
-}
-
-use_zero() {
-	use zero || ( ! use amd64 && ! use x86 && ! use sparc )
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-}
diff --git a/games-fps/doom3-gpl/Manifest b/games-fps/doom3-gpl/Manifest
deleted file mode 100644
index 121d754..0000000
--- a/games-fps/doom3-gpl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-EBUILD doom3-gpl-9999.ebuild 1967 RMD160 4ed48993bb645bdd78196366dffca59cceb5cabf SHA1 27b6d3eb40b71e0dcd1d7277a36dccaf8077b1db SHA256 8d3f2826762caa742a425d41595d0c259e7a6467c13fb0e0469f101dcd6fc2ef
diff --git a/games-fps/doom3-gpl/doom3-gpl-9999.ebuild b/games-fps/doom3-gpl/doom3-gpl-9999.ebuild
deleted file mode 100644
index 1d5d5ce..0000000
--- a/games-fps/doom3-gpl/doom3-gpl-9999.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit scons-utils toolchain-funcs games git-2
-
-DESCRIPTION="3rd installment of the classic iD 3D first-person shooter"
-HOMEPAGE="https://github.com/TTimo/doom3.gpl"
-EGIT_REPO_URI="git://github.com/TTimo/doom3.gpl.git"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="alsa debug dedicated opengl"
-
-RDEPEND="
-	opengl? (
-		virtual/opengl
-		alsa? ( media-libs/alsa-lib )
-		amd64? ( app-emulation/emul-linux-x86-xlibs[opengl] )
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/m4
-"
-
-dir=$(games_get_libdir)/${PN}
-
-src_configure() {
-	S+="/neo"
-
-	myesconsargs=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-	)
-		# FIXME build fails with JOBS=3
-		#JOBS="$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/")"
-
-	if use debug; then
-		myesconsargs+=( BUILD="debug-all" )
-	else
-		myesconsargs+=( BUILD="release" )
-	fi
-
-	if use dedicated; then
-		if use opengl; then
-			myesconsargs+=( DEDICATED="2" )
-		else
-			myesconsargs+=( DEDICATED="1" )
-		fi
-	else
-		# TODO use EAPI4
-		use !opengl && die "Nothing to build"
-		myesconsargs+=( DEDICATED="0" )
-	fi
-
-	# FIXME needs 32-bit libz.a
-	myesconsargs+=( NOCURL="1" )
-}
-
-src_compile() {
-	escons
-}
-
-src_install() {
-	exeinto "${dir}"
-	doexe gamex86-base.so || die
-	doexe gamex86-d3xp.so || die
-
-	if use dedicated; then
-		doexe doomded.x86 || die
-	fi
-
-	if use opengl; then
-		doexe doom.x86 || die
-		doexe sys/linux/setup/image/openurl.sh || die
-		games_make_wrapper ${PN} ./doom.x86 "${dir}" "${dir}"
-		newicon sys/linux/setup/image/doom3.png ${PN}.png || die
-		make_desktop_entry ${PN} "Doom III GPL"
-	fi
-
-	prepgamesdirs
-
-	dodoc sys/linux/setup/image/README || die
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	elog "You need to copy 'base' directory"
-	elog "from either your installation media or your hard drive to"
-	elog "${dir}/ before running the game."
-	echo
-	elog "To play the game, run:"
-	elog " ${PN}"
-	echo
-}
diff --git a/games-strategy/0ad-data/0ad-data-11339_alpha9.ebuild b/games-strategy/0ad-data/0ad-data-11339_alpha9.ebuild
deleted file mode 100644
index b702108..0000000
--- a/games-strategy/0ad-data/0ad-data-11339_alpha9.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit games
-
-MY_PV="r${PV%_*}-alpha"
-MY_PN=${PN%-data}
-MY_P=${MY_PN}-${MY_PV}
-
-DESCRIPTION="Data files for 0ad"
-HOMEPAGE="http://wildfiregames.com/0ad/"
-SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz"
-
-LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	insinto "${GAMES_DATADIR}"/${MY_PN}
-	doins -r binaries/data/* || die
-	prepgamesdirs
-}
diff --git a/games-strategy/0ad-data/Manifest b/games-strategy/0ad-data/Manifest
deleted file mode 100644
index 3c02d8c..0000000
--- a/games-strategy/0ad-data/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST 0ad-r11339-alpha-unix-data.tar.xz 294663484 RMD160 0955d2cc141f16bb1b0cbd58265e72e2b906cb7d SHA1 9178093bd71251b27bc2c85189f657a91c4e34b5 SHA256 ac4cb17478eed633e1b0c975b052706797628fac399147d6301c4001100170b4
-EBUILD 0ad-data-11339_alpha9.ebuild 563 RMD160 1979c73f79198c3a0720173c983ea2ab43d112af SHA1 9685a40f59b7077474ee061f06c5f4db5b9ad339 SHA256 e5c7f1da1ed3594ef05919c09033071d4942b9ba769519d241c4a54d7bb6a947
diff --git a/games-strategy/0ad/0ad-10803.ebuild b/games-strategy/0ad/0ad-10803.ebuild
deleted file mode 100644
index ef5061b..0000000
--- a/games-strategy/0ad/0ad-10803.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit eutils wxwidgets games
-
-MY_P="0ad-r${PV}-alpha"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="0 A.D. is a free, real-time strategy game currently under development by Wildfire Games."
-HOMEPAGE="http://wildfiregames.com/0ad/"
-SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-build.tar.xz
-	mirror://sourceforge/zero-ad/${MY_P}-unix-data.tar.xz"
-
-LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug editor pch test"
-
-RDEPEND=">=dev-lang/spidermonkey-1.8.5
-	dev-libs/boost
-	dev-libs/libxml2
-	media-libs/devil
-	media-libs/openal
-	media-libs/libogg
-	media-libs/libpng
-	media-libs/libsdl[joystick]
-	media-libs/libvorbis
-	net-libs/enet:1.3
-	net-misc/curl
-	sys-libs/zlib
-	virtual/fam
-	virtual/jpeg
-	virtual/opengl
-	editor? ( x11-libs/wxGTK:2.8 )"
-
-DEPEND="${RDEPEND}
-	app-arch/zip
-	dev-lang/nasm
-	dev-util/cmake"
-
-RESTRICT="strip mirror"
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-
-pkg_setup() {
-	games_pkg_setup
-	if use editor ; then
-		WX_GTK_VER=2.8 need-wxwidgets unicode
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/premake-archless.patch
-	epatch "${FILESDIR}"/premake-script-archless.patch
-}
-
-src_compile() {
-	UPDATE_ARGS="--with-system-enet --with-system-mozjs185"
-
-	if ! use editor ; then
-		UPDATE_ARGS="${UPDATE_ARGS} --disable-atlas"
-	fi
-
-	cd "${S}/build/workspaces"
-	einfo "Running update-workspaces.sh with ${UPDATE_ARGS}"
-	./update-workspaces.sh ${UPDATE_ARGS} || die "update-workspaces.sh failed"
-	cd gcc
-
-	TARGETS="pyrogenesis Collada"
-	if use test ; then
-		TARGETS="${TARGETS} test"
-	fi
-	if use editor ; then
-		TARGETS="${TARGETS} AtlasUI"
-	fi
-	if use debug ; then
-		CONFIG=Debug
-	else
-		CONFIG=Release
-	fi
-	CONFIG=${CONFIG} emake ${TARGETS} || die "Can't build"
-}
-
-src_test() {
-	cd "${S}/binaries/system"
-	if use debug ; then
-		./test_dbg || die "Tests failed"
-	else
-		./test || die "Tests failed"
-	fi
-}
-
-src_install() {
-	cd "${S}"/binaries
-	insinto "${dir}"
-	doins -r data || die "doins -r failed"
-
-	insinto "${dir}"/system
-
-	doins "${S}"/binaries/system/libnvcore.so || die "doins failed"
-	doins "${S}"/binaries/system/libnvimage.so || die "doins failed"
-	doins "${S}"/binaries/system/libnvmath.so || die "doins failed"
-	doins "${S}"/binaries/system/libnvtt.so || die "doins failed"
-
-	if use debug ; then
-#		doins "${S}"/binaries/system/libmozjs185-ps-debug.so.1.0 || die "doins failed"
-		doins "${S}"/binaries/system/libCollada_dbg.so || die "doins failed"
-		if use editor ; then
-			doins "${S}"/binaries/system/libAtlasUI_dbg.so || die "doins failed"
-		fi
-		EXE_NAME=pyrogenesis_dbg
-	else
-#		doins "${S}"/binaries/system/libmozjs185-ps-release.so.1.0 || die "doins failed"
-		doins "${S}"/binaries/system/libCollada.so || die "doins failed"
-		if use editor ; then
-			doins "${S}"/binaries/system/libAtlasUI.so || die "doins failed"
-		fi
-		EXE_NAME=pyrogenesis
-	fi
-
-	exeinto "${dir}"/system
-	doexe "${S}"/binaries/system/${EXE_NAME} || die "doexe failed"
-
-	games_make_wrapper ${PN} ./system/${EXE_NAME} ${dir}
-	doicon "${S}"/build/resources/0ad.png
-	make_desktop_entry "${dir}"/system/${EXE_NAME} "0 A.D."
-
-	prepgamesdirs
-}
diff --git a/games-strategy/0ad/0ad-11339_alpha9.ebuild b/games-strategy/0ad/0ad-11339_alpha9.ebuild
deleted file mode 100644
index 529b43a..0000000
--- a/games-strategy/0ad/0ad-11339_alpha9.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-WX_GTK_VER="2.8"
-
-inherit eutils wxwidgets games
-
-MY_PV="r${PV%_*}-alpha"
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="A free, real-time strategy game"
-HOMEPAGE="http://wildfiregames.com/0ad/"
-SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1 MIT CCPL-Attribution-ShareAlike-3.0 as-is"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+audio +editor fam pch test"
-
-RDEPEND="
-	>=dev-lang/spidermonkey-1.8.5
-	dev-libs/boost
-	dev-libs/libxml2
-	~games-strategy/0ad-data-${PV}
-	media-libs/libpng:0
-	media-libs/libsdl[X,audio?,opengl,video]
-	net-libs/enet:1.3
-	net-misc/curl
-	sys-libs/zlib
-	virtual/jpeg
-	virtual/opengl
-	audio? ( media-libs/libogg
-		media-libs/libvorbis
-		media-libs/openal )
-	editor? ( x11-libs/wxGTK:2.8[X] )
-	fam? ( virtual/fam )
-	"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	test? ( dev-lang/perl )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# respect flags for 3rd party fcollada
-	epatch "${FILESDIR}"/11339_alpha9-fcollada-makefile.patch
-}
-
-src_configure() {
-	cd build/workspaces || die
-
-	# custom configure script
-	local myconf
-	myconf="--without-nvtt"
-	use fam || myconf="${myconf} --without-fam"
-	use pch || myconf="${myconf} --without-pch"
-	use test || myconf="${myconf} --without-tests"
-	use audio || myconf="${myconf} --without-audio"
-
-	# don't use bundled sources
-	./update-workspaces.sh \
-		--with-system-nvtt \
-		--with-system-enet \
-		--with-system-mozjs185 \
-		$(use_enable editor atlas) \
-		--bindir="${GAMES_BINDIR}" \
-		--libdir="$(games_get_libdir)"/${PN} \
-		--datadir="${GAMES_DATADIR}"/${PN} \
-		${myconf} || die
-}
-
-src_compile() {
-	cd build/workspaces/gcc || die
-
-	emake CONFIG=Release verbose=1 || die
-}
-
-src_test() {
-	cd binaries/system || die
-
-	if use nvtt ; then
-		./test || die "test phase failed"
-	else
-		ewarn "Skipping tests because USE nvtt is disabled"
-	fi
-}
-
-src_install() {
-	# bin
-	dogamesbin binaries/system/pyrogenesis || die
-
-	# libs
-	exeinto "$(games_get_libdir)"/${PN}
-	doexe binaries/system/libCollada.so || die
-	if use editor ; then
-		doexe binaries/system/libAtlasUI.so || die
-	fi
-
-	# other
-	dodoc binaries/system/readme.txt || die
-	doicon build/resources/${PN}.png || die
-	games_make_wrapper ${PN} "${GAMES_BINDIR}/pyrogenesis"
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	# permissions
-	prepgamesdirs
-}
diff --git a/games-strategy/0ad/0ad-99999.ebuild b/games-strategy/0ad/0ad-99999.ebuild
deleted file mode 100644
index 0143b1d..0000000
--- a/games-strategy/0ad/0ad-99999.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-WX_GTK_VER="2.8"
-
-inherit eutils subversion wxwidgets games
-
-MY_PV="r${PV%_*}-alpha"
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="A free, real-time strategy game"
-HOMEPAGE="http://wildfiregames.com/0ad/"
-ESVN_REPO_URI="http://svn.wildfiregames.com/public/ps/trunk"
-
-LICENSE="GPL-2 LGPL-2.1 MIT CCPL-Attribution-ShareAlike-3.0 as-is"
-SLOT="0"
-KEYWORDS=""
-IUSE="+audio +editor fam +pch test"
-
-RDEPEND="
-	>=dev-lang/spidermonkey-1.8.5
-	dev-libs/boost
-	dev-libs/libxml2
-	!games-strategy/0ad-data
-	media-libs/libpng:0
-	media-libs/libsdl[X,audio?,opengl,video]
-	net-libs/enet:1.3
-	net-misc/curl
-	sys-libs/zlib
-	virtual/jpeg
-	virtual/opengl
-	audio? ( media-libs/libogg
-		media-libs/libvorbis
-		media-libs/openal )
-	editor? ( x11-libs/wxGTK:2.8[X] )
-	fam? ( virtual/fam )
-	"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	test? ( dev-lang/perl )"
-
-S=${WORKDIR}/trunk
-
-pkg_setup() {
-	games_pkg_setup
-
-	if ! use pch ; then
-		eerror "pch useflag is potentially broken"
-		eerror "see http://trac.wildfiregames.com/ticket/1313"
-	fi
-}
-
-src_unpack() {
-	subversion_src_unpack
-}
-
-src_prepare() {
-	# respect flags for 3rd party fcollada
-	epatch "${FILESDIR}"/11339_alpha9-fcollada-makefile.patch
-}
-
-src_configure() {
-	cd build/workspaces || die
-
-	# custom configure script
-	local myconf
-	myconf="--without-nvtt"
-	use fam || myconf="${myconf} --without-fam"
-	use pch || myconf="${myconf} --without-pch"
-	use test || myconf="${myconf} --without-tests"
-	use audio || myconf="${myconf} --without-audio"
-
-	# don't use bundled sources
-	./update-workspaces.sh \
-		--with-system-nvtt \
-		--with-system-enet \
-		--with-system-mozjs185 \
-		$(use_enable editor atlas) \
-		--bindir="${GAMES_BINDIR}" \
-		--libdir="$(games_get_libdir)"/${PN} \
-		--datadir="${GAMES_DATADIR}"/${PN} \
-		${myconf} || die
-}
-
-src_compile() {
-	cd build/workspaces/gcc || die
-
-	emake CONFIG=Release verbose=1 || die
-}
-
-src_test() {
-	cd binaries/system || die
-
-	if use nvtt ; then
-		./test || die "test phase failed"
-	else
-		ewarn "Skipping tests because USE nvtt is disabled"
-	fi
-}
-
-src_install() {
-	# data
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r binaries/data/* || die
-
-	# bin
-	dogamesbin binaries/system/pyrogenesis || die
-
-	# libs
-	exeinto "$(games_get_libdir)"/${PN}
-	doexe binaries/system/libCollada.so || die
-	if use editor ; then
-		doexe binaries/system/libAtlasUI.so || die
-	fi
-
-	# other
-	dodoc binaries/system/readme.txt || die
-	doicon build/resources/${PN}.png || die
-	games_make_wrapper ${PN} "${GAMES_BINDIR}/pyrogenesis"
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	# permissions
-	prepgamesdirs
-}
diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
deleted file mode 100644
index fa5fc35..0000000
--- a/games-strategy/0ad/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX 11339_alpha9-fcollada-makefile.patch 1069 RMD160 d9155d60bd47eb83876f3b65c92d6c2384f87bdc SHA1 a04d8aea0c8ea6e13d0c123c5590eaf3b45d10cf SHA256 11ed3a1d83c2784d590ec047750cd1cc56932ad2e10203f70f72d19fe879464f
-DIST 0ad-r10803-alpha-unix-build.tar.xz 8609092 RMD160 bab976f5f4b04c6256418293758a19fc6471fc40 SHA1 9c9ee04bf1327bfd9161f51b18180ec8d3c6547b SHA256 fbf91d8482267384f8fb3fdd8a71e79ed71d73489c531f814fca70840043b928
-DIST 0ad-r10803-alpha-unix-data.tar.xz 264532800 RMD160 5dcdc8c2e01c6880b4a695e5380bc6824b8ecc42 SHA1 98d17a118d0a5cfe79140ddb2a24bfd3a376c28a SHA256 cb4d2b4c4ce1eadff4d34127664a6de02f9b062007275507d80d9ee6ebbae7d9
-DIST 0ad-r11339-alpha-unix-build.tar.xz 8593664 RMD160 5e7fc6449f7bde30611880ac2575c7cd2ef021d2 SHA1 e44f8484ca7082b1a9f2761a48aa8f54c8e833d1 SHA256 1e69bc02c1af1bfbe30244467761d13e1aaff164fe583d962cc8e13faf4a56cb
-EBUILD 0ad-10803.ebuild 3188 RMD160 cc08c1d288b3cb903d2ee5c9df1fe33b38cb7e3d SHA1 28c466764e7d3d4b20845a887d28781568365774 SHA256 d0997f7857468b5a68655ae327242f7e2392234ec3d40ff788f030be6e0a28f8
-EBUILD 0ad-11339_alpha9.ebuild 2398 RMD160 beb996e92b1f19975464ae9f85cdfac1ef0818b3 SHA1 99cbae548eb1d790cd0fa39911c284b3a301cab8 SHA256 9e12c630db167088d27afc6716dbc932228fb9d7cc3d25386821af46d37c7a61
-EBUILD 0ad-99999.ebuild 2666 RMD160 7023a0334f8f2584a7d98c19e7edcba06788bec6 SHA1 57ddc702b47bde6c753a894de57e47d8b830115e SHA256 69f8428f42ec755c7323d6f540b9ebb473dc1ce73be9d02a5cd3dbcf085fe479
diff --git a/games-strategy/0ad/files/11339_alpha9-fcollada-makefile.patch b/games-strategy/0ad/files/11339_alpha9-fcollada-makefile.patch
deleted file mode 100644
index e397e86..0000000
--- a/games-strategy/0ad/files/11339_alpha9-fcollada-makefile.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: hasufell <julian.ospald@googlemail.com>
-Date: Wed Apr 11 14:45:32 UTC 2012
-
-FCollada Makefile does not respect CXX and flags
-
---- libraries/fcollada/src/Makefile
-+++ libraries/fcollada/src/Makefile
-@@ -7,14 +7,14 @@
- PIC_FLAGS ?= -fpic
- endif
- 
--CXX := g++
--CXXFLAGS := -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS)
-+CXX ?= g++
-+CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS)
- CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL
- CXXFLAGS_RELEASE := -O1 -DNDEBUG -DRETAIL
- # (-O2 with gcc 4.3 causes linker errors when using this library, for unknown reasons, so stick with -O1)
- CXXFLAGS_TEST := -O0 -g -D_DEBUG
--LIBS := `pkg-config libxml-2.0 --libs`
--INCLUDES := -IFCollada `pkg-config libxml-2.0 --cflags`
-+LIBS += `pkg-config libxml-2.0 --libs`
-+INCLUDES += -IFCollada `pkg-config libxml-2.0 --cflags`
- INCLUDES_TEST := -IFCollada/FColladaTest $(INCLUDES)
- 
- # FCollada is not aliasing-safe, so disallow dangerous optimisations
diff --git a/gnome-base/emperor/Manifest b/gnome-base/emperor/Manifest
deleted file mode 100644
index 275cb10..0000000
--- a/gnome-base/emperor/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-EBUILD emperor-9999.ebuild 762 RMD160 f535bca88471f44b7976422e1a810229890c2aa2 SHA1 4927ea398a73b0612106af8f8aa5d5a15c5fafd4 SHA256 6fde164be753bf29a0c7abfc9836532634a9b03aecf26e351456631fe11fea60
diff --git a/gnome-base/emperor/emperor-9999.ebuild b/gnome-base/emperor/emperor-9999.ebuild
deleted file mode 100644
index 0a7b980..0000000
--- a/gnome-base/emperor/emperor-9999.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.7.4.ebuild,v 1.6 2011/03/21 22:19:52 nirbheek Exp $
-
-EAPI=2
-
-GCONF_DEBUG=no
-
-inherit eutils git
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Filemanager"
-HOMEPAGE="http://code.jollybox.de/emperor.xhtml"
-EGIT_REPO_URI="git://github.com/tjol/emperor.git"
-SRC_URI=""
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="libnotify"
-
-RDEPEND=">=x11-libs/gtk+-3.0.0
-	>=dev-libs/libxml2-2.6.27:2
-	>=dev-libs/libgee-0.7
-	libnotify? ( >=x11-libs/libnotify-0.7 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig"
-
-DOCS=""
-
-S=${WORKDIR}/${MY_P}
-
-#pkg_setup() {
-#}
-
-src_prepare() {
-	./bootstrap.sh
-}
-
-#src_install() {
-#}
diff --git a/gnome-extra/battery-status/Manifest b/gnome-extra/battery-status/Manifest
deleted file mode 100644
index 517e5aa..0000000
--- a/gnome-extra/battery-status/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-EBUILD battery-status-9999.ebuild 422 RMD160 454f8a5c8b4928368329db280da6734481784c58 SHA1 b3618122368101429078e5698a164662e35448d5 SHA256 93141aab7809795745c99ec5b90893c31ffc55ab116b8689d4e9f38a9cc289cf
diff --git a/gnome-extra/battery-status/battery-status-9999.ebuild b/gnome-extra/battery-status/battery-status-9999.ebuild
deleted file mode 100644
index 9ba864f..0000000
--- a/gnome-extra/battery-status/battery-status-9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit distutils git
-
-
-DESCRIPTION="Battery applet/indicator for the GNOME"
-HOMEPAGE="https://github.com/ia/battery-status"
-EGIT_REPO_URI="https://github.com/ia/battery-status.git"
-SRC_URI=""
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
deleted file mode 100644
index bc4dcc6..0000000
--- a/gnome-extra/cinnamon/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX cinnamon-1.1.3-automagic-gnome-bluetooth.patch 1841 RMD160 4b57dfeb42f299ef74799409132778b60ddc7a09 SHA1 4acf93b0bda58660b6c7ed5c8fdb6b06df86c035 SHA256 df5f86858b8abc08225ffb7679e829250e05a419b439b2ecad0f02bd93b670b2
-AUX cinnamon-1.3.1-optional-networkmanager.patch 6649 RMD160 458403c896c245240207d034b74218031d71331d SHA1 2207b02f60694f267d4511fb4538565618873750 SHA256 37bb34e61dbf4700d1a7ff92a47b1544a35edf3fc4eb5d863c295e2372613f01
-AUX cinnamon-1.4-notification.patch 4214 RMD160 8cc8d5f1c64fbdb7b780255c21d2a43ccc6a2db9 SHA1 c9753919f012a04cf41d810e7302bac00f4a273b SHA256 3c88fc9ab18ab5d9203b631f3986ee54ef44a1963480aaa141eab16dc260c578
-DIST cinnamon-1.4.tar.gz 2639153 RMD160 2282c0adb00d199f8dbf11f9e5a35600784aa795 SHA1 405db74662f23e99cc5646e74d2b5581adc860b5 SHA256 26fa922bfd73d3b8f4c954e6b79b97450bd6be4875680acafd823814bfd6d20f
-EBUILD cinnamon-1.4-r1.ebuild 8072 RMD160 840ac6a74372abe0620e44b1ea1219dc4d493125 SHA1 e59b65149390d4ddb334d3f492dc4905a96b2a19 SHA256 6309d98f611ed502e7878cab81ab6f191dc8fb0f74f8f4780d2874623fc10b74
diff --git a/gnome-extra/cinnamon/cinnamon-1.4-r1.ebuild b/gnome-extra/cinnamon/cinnamon-1.4-r1.ebuild
deleted file mode 100644
index 62b28a3..0000000
--- a/gnome-extra/cinnamon/cinnamon-1.4-r1.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.4.ebuild,v 1.1 2012/03/15 06:05:24 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="xml"
-
-inherit autotools eutils gnome2 multilib pax-utils python
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-
-SRC_URI="https://github.com/linuxmint/Cinnamon/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+bluetooth +networkmanager"
-KEYWORDS="~amd64 ~x86"
-
-# gnome-desktop-2.91.2 is needed due to header changes, db82a33 in gnome-desktop
-# latest gsettings-desktop-schemas is needed due to commit 602fa1c6
-# latest g-c-c is needed due to https://bugs.gentoo.org/show_bug.cgi?id=360057
-# libXfixes-5.0 needed for pointer barriers
-# gnome-menus-3.2.0.1-r1 needed for new 10-xdg-menu-gnome
-COMMON_DEPEND=">=dev-libs/glib-2.29.10:2
-	>=dev-libs/gjs-1.29.18
-	>=dev-libs/gobject-introspection-0.10.1
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.0.0:3[introspection]
-	>=media-libs/clutter-1.7.5:1.0[introspection]
-	app-misc/ca-certificates
-	>=dev-libs/folks-0.5.2
-	>=dev-libs/json-glib-0.13.2
-	>=gnome-base/gnome-desktop-2.91.2:3[introspection]
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	>=gnome-extra/evolution-data-server-2.91.6
-	>=media-libs/gstreamer-0.10.16:0.10
-	>=media-libs/gst-plugins-base-0.10.16:0.10
-	>=net-im/telepathy-logger-0.2.4[introspection]
-	net-libs/libsoup:2.4[introspection]
-	>=net-libs/telepathy-glib-0.15.5[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	>=x11-wm/muffin-1.0.2[introspection]
-
-	dev-libs/dbus-glib
-	dev-libs/libxml2:2
-	x11-libs/pango[introspection]
-	>=dev-libs/libcroco-0.6.2:0.6
-
-	gnome-base/gconf:2[introspection]
-	>=gnome-base/gnome-menus-3.2.0.1-r1:3[introspection]
-	gnome-base/librsvg
-	media-libs/libcanberra
-	media-sound/pulseaudio
-
-	>=x11-libs/startup-notification-0.11
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	x11-apps/mesa-progs
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] )
-	networkmanager? (
-		gnome-base/libgnome-keyring
-		>=net-misc/networkmanager-0.8.999[introspection] )"
-# Runtime-only deps are probably incomplete and approximate.
-# Each block:
-# 2. Introspection stuff + dconf needed via imports.gi.*
-# 3. gnome-session is needed for gnome-session-quit
-# 4. Control shell settings
-# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
-#    user switching with gdm-3.1.x)
-# 6. caribou needed for on-screen keyboard
-# 7. xdg-utils needed for xdg-open, used by extension tool
-# 8. gconf-python needed for cinnamon-settings
-# 9. gnome-icon-theme-symbolic needed for various icons
-# 10. pygtk and gnome-menus:0 needed for menu editor
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/libgnomekbd-2.91.4[introspection]
-	sys-power/upower[introspection]
-
-	>=gnome-base/gnome-session-3.2.1-r1
-
-	>=gnome-base/gnome-settings-daemon-2.91
-	>=gnome-base/gnome-control-center-2.91.92-r1
-
-	>=sys-apps/accountsservice-0.6.14[introspection]
-
-	>=app-accessibility/caribou-0.3
-
-	x11-misc/xdg-utils
-
-	dev-python/dbus-python
-	dev-python/gconf-python:2
-
-	x11-themes/gnome-icon-theme-symbolic
-
-	dev-python/pygtk
-	gnome-base/gnome-menus:0[python]
-
-	networkmanager? (
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data )"
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/gettext-0.17
-	>=dev-util/pkgconfig-0.22
-	>=dev-util/intltool-0.40
-	gnome-base/gnome-common
-	!!=dev-lang/spidermonkey-1.8.2*"
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
-# https://bugs.gentoo.org/show_bug.cgi?id=360413
-
-S="${WORKDIR}/linuxmint-Cinnamon-a8b1a03"
-
-pkg_setup() {
-	DOCS="AUTHORS NEWS README"
-	# Don't error out on warnings
-	G2CONF="${G2CONF}
-		--enable-compile-warnings=maximum
-		--disable-schemas-compile
-		--disable-jhbuild-wrapper-script
-		$(use_with bluetooth)
-		$(use_enable networkmanager)
-		--with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
-		BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	epatch "${FILESDIR}/${PN}-1.1.3-automagic-gnome-bluetooth.patch"
-
-	# Make networkmanager optional, bug #398593
-	epatch "${FILESDIR}/${PN}-1.3.1-optional-networkmanager.patch"
-
-	# Fix notification issue
-	epatch "${FILESDIR}/${PN}-1.4-notification.patch"
-
-	# Gentoo uses /usr/libexec
-	sed -e "s:/usr/lib/gnome-session/gnome-session-check-accelerated:${EPREFIX}/usr/libexec/gnome-session-check-accelerated:" \
-		-i "files/usr/share/gnome-session/sessions/cinnamon.session" || die "sed 1 failed"
-
-	# Gentoo uses /usr/$(get_libdir), not /usr/lib even for python
-	sed -e "s:/usr/lib/:/usr/$(get_libdir)/:" \
-		-e 's:"/usr/lib":"/usr/'"$(get_libdir)"'":' \
-		-i files/usr/bin/cinnamon-menu-editor \
-		-i files/usr/bin/cinnamon-settings \
-		-i files/usr/lib/cinnamon-menu-editor/Alacarte/config.py \
-		-i files/usr/lib/cinnamon-settings/cinnamon-settings.py \
-		-i files/generate_desktop_files || die "sed 2 failed"
-	if [[ "$(get_libdir)" != lib ]]; then
-		mv files/usr/lib "files/usr/$(get_libdir)" || die "mv failed"
-	fi
-
-	if ! use bluetooth; then
-		rm -rv files/usr/share/cinnamon/applets/bluetooth@cinnamon.org || die
-	fi
-
-	if ! use networkmanager; then
-		rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
-	fi
-
-	eautoreconf
-	gnome2_src_prepare
-
-	# Drop G_DISABLE_DEPRECATED for sanity on glib upgrades; bug #384765
-	# Note: sed Makefile.in because it is generated from several Makefile.ams
-	sed -e 's/-DG_DISABLE_DEPRECATED//g' \
-		-i src/Makefile.in browser-plugin/Makefile.in || die "sed 3 failed"
-}
-
-src_install() {
-	gnome2_src_install
-	python_convert_shebangs 2 "${ED}usr/bin/cinnamon-extension-tool" \
-		"${ED}usr/bin/cinnamon-menu-editor" \
-		"${ED}usr/bin/cinnamon-settings" \
-		"${ED}usr/$(get_libdir)/cinnamon-settings/cinnamon-settings.py"
-
-	# Required for gnome-shell on hardened/PaX, bug #398941
-	pax-mark mr "${ED}usr/bin/cinnamon"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_mod_optimize "/usr/$(get_libdir)/"cinnamon-{menu-editor,settings}
-
-	if ! has_version '>=media-libs/gst-plugins-good-0.10.23' || \
-	   ! has_version 'media-plugins/gst-plugins-vp8'; then
-		ewarn "To make use of Cinnamon's built-in screen recording utility,"
-		ewarn "you need to either install >=media-libs/gst-plugins-good-0.10.23"
-		ewarn "and media-plugins/gst-plugins-vp8, or use dconf-editor to change"
-		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version ">=x11-base/xorg-server-1.11"; then
-		ewarn "If you use multiple screens, it is highly recommended that you"
-		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
-		ewarn "pointer barriers which will make it easier to use hot corners."
-	fi
-
-	if has_version "<x11-drivers/ati-drivers-12"; then
-		ewarn "Cinnamon has been reported to show graphical corruption under"
-		ewarn "x11-drivers/ati-drivers-11.*; you may want to use GNOME in"
-		ewarn "fallback mode, or switch to open-source drivers."
-	fi
-
-	if has_version "media-libs/mesa[video_cards_radeon]"; then
-		elog "Cinnamon is unstable under classic-mode r300/r600 mesa drivers."
-		elog "Make sure that gallium architecture for r300 and r600 drivers is"
-		elog "selected using 'eselect mesa'."
-		if ! has_version "media-libs/mesa[gallium]"; then
-			ewarn "You will need to emerge media-libs/mesa with USE=gallium."
-		fi
-	fi
-
-	if has_version "media-libs/mesa[video_cards_intel]"; then
-		elog "Cinnamon is unstable under gallium-mode i915/i965 mesa drivers."
-		elog "Make sure that classic architecture for i915 and i965 drivers is"
-		elog "selected using 'eselect mesa'."
-		if ! has_version "media-libs/mesa[classic]"; then
-			ewarn "You will need to emerge media-libs/mesa with USE=classic."
-		fi
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup "/usr/$(get_libdir)/"cinnamon-{menu-editor,settings}
-}
diff --git a/gnome-extra/cinnamon/files/cinnamon-1.1.3-automagic-gnome-bluetooth.patch b/gnome-extra/cinnamon/files/cinnamon-1.1.3-automagic-gnome-bluetooth.patch
deleted file mode 100644
index ae23a6c..0000000
--- a/gnome-extra/cinnamon/files/cinnamon-1.1.3-automagic-gnome-bluetooth.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 84568fa9454f279ff519a2a11174e112786e46db Mon Sep 17 00:00:00 2001
-From: root <admin@catmur.co.uk>
-Date: Sun, 8 Jan 2012 13:55:05 +0000
-Subject: [PATCH] Fix automagic gnome-bluetooth dependency
-
-https://bugs.gentoo.org/show_bug.cgi?id=398145
-
-Ed Catmur 2012-01-08 13:46:22 UTC
-libgnome-bluetooth-applet is a private library so they shouldn't be linking
-against it anyway.  I tried to work out how to tell libtool to add it to rpath
-but got totally lost.
-
-I'll see if I can work out how to fix the automagic gnome-bluetooth dependency
-so I can at least merge USE=-bluetooth.
----
- configure.ac |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1c64122..a699838 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -127,6 +127,8 @@ PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0)
- PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 0.1.7)
- 
- AC_MSG_CHECKING([for bluetooth support])
-+AC_ARG_WITH([bluetooth], AS_HELP_STRING([--without-bluetooth], [Build without gnome-bluetooth library (default: auto)]))
-+AS_IF([test "x$with_bluetooth" != "xno"], [
- PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
-         [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0`
- 	 BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0`
-@@ -138,6 +140,9 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
- 	[AC_DEFINE([HAVE_BLUETOOTH],[0])
- 	 AC_SUBST([HAVE_BLUETOOTH],[0])
- 	 AC_MSG_RESULT([no])])
-+], [AC_DEFINE([HAVE_BLUETOOTH],[0])
-+	 AC_SUBST([HAVE_BLUETOOTH],[0])
-+	 AC_MSG_RESULT([no])])
- 
- PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION libedataserver-1.2 >= $LIBEDATASERVER_MIN_VERSION libedataserverui-3.0 >= $LIBEDATASERVERUI_MIN_VERSION gio-2.0)
- AC_SUBST(CALENDAR_SERVER_CFLAGS)
--- 
-1.7.8.2
-
diff --git a/gnome-extra/cinnamon/files/cinnamon-1.3.1-optional-networkmanager.patch b/gnome-extra/cinnamon/files/cinnamon-1.3.1-optional-networkmanager.patch
deleted file mode 100644
index 6e2d431..0000000
--- a/gnome-extra/cinnamon/files/cinnamon-1.3.1-optional-networkmanager.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-From aebde5fad2f477f40b62c96118128011bd821be0 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Wed, 25 Jan 2012 01:58:07 -0500
-Subject: [PATCH] Make NM optional
-
-Derived from a patch for gnome-shell by Michael Biebl <biebl@debian.org>
-(see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=652482#29)
----
- configure.ac         |   48 ++++++++++++++++++++++++++++++++++++++++++++++--
- js/misc/config.js.in |    2 ++
- js/ui/main.js        |    7 +++++--
- src/Makefile.am      |   13 ++++++++-----
- 4 files changed, 61 insertions(+), 9 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 49b5401..508a8cd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -94,8 +94,40 @@ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION
- 			       libcanberra
-                                telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
-                                telepathy-logger-0.2 >= $TELEPATHY_LOGGER_MIN_VERSION
--                               polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
--                               libnm-glib libnm-util gnome-keyring-1)
-+                               polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes)
-+
-+##########################
-+# Check for NetworkManager
-+##########################
-+NM_MIN_VERSION=0.9
-+AC_ARG_ENABLE(networkmanager,
-+              AS_HELP_STRING([--disable-networkmanager],
-+                             [disable NetworkManager support @<:@default=auto@:>@]),,
-+              [enable_networkmanager=auto])
-+
-+if test "x$enable_networkmanager" != "xno"; then
-+   PKG_CHECK_MODULES(NETWORKMANAGER,
-+                     [libnm-glib libnm-util gnome-keyring-1],
-+                     [have_networkmanager=yes],
-+                     [have_networkmanager=no])
-+
-+   CINNAMON_CFLAGS="$CINNAMON_CFLAGS $NETWORKMANAGER_CFLAGS"
-+   CINNAMON_LIBS="$CINNAMON_LIBS $NETWORKMANAGER_LIBS"
-+else
-+   have_networkmanager="no  (disabled)"
-+fi
-+
-+if test "x$have_networkmanager" = "xyes"; then
-+   AC_DEFINE(HAVE_NETWORKMANAGER, [1], [Define if we have NetworkManager])
-+   AC_SUBST([HAVE_NETWORKMANAGER], [1])
-+else
-+   if test "x$enable_networkmanager" = "xyes"; then
-+      AC_MSG_ERROR([Couldn't find NetworkManager.])
-+   fi
-+   AC_SUBST([HAVE_NETWORKMANAGER], [0])
-+fi
-+
-+AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes")
- 
- PKG_CHECK_MODULES(CINNAMON_PERF_HELPER, gtk+-3.0 gio-2.0)
- 
-@@ -250,3 +282,15 @@ AC_CONFIG_FILES([
-   files/Makefile
- ])
- AC_OUTPUT
-+
-+echo "
-+Build configuration:
-+
-+	Prefix:                                 ${prefix}
-+	Source code location:                   ${srcdir}
-+	Compiler:                               ${CC}
-+	Compiler Warnings:                      $enable_compile_warnings
-+
-+	Support for NetworkManager:             $have_networkmanager
-+	Support for GStreamer recording:        $build_recorder
-+"
-diff --git a/js/misc/config.js.in b/js/misc/config.js.in
-index 704989b..df7e014 100644
---- a/js/misc/config.js.in
-+++ b/js/misc/config.js.in
-@@ -8,5 +8,7 @@ const PACKAGE_VERSION = '@PACKAGE_VERSION@';
- const GJS_VERSION = '@GJS_VERSION@';
- /* 1 if gnome-bluetooth is available, 0 otherwise */
- const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
-+/* 1 if networkmanager is available, 0 otherwise */
-+const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@;
- /* The system TLS CA list */
- const CINNAMON_SYSTEM_CA_FILE = '@CINNAMON_SYSTEM_CA_FILE@';
-diff --git a/js/ui/main.js b/js/ui/main.js
-index ae15997..803e6f4 100644
---- a/js/ui/main.js
-+++ b/js/ui/main.js
-@@ -14,6 +14,7 @@ const St = imports.gi.St;
- 
- const AutomountManager = imports.ui.automountManager;
- const AutorunManager = imports.ui.autorunManager;
-+const Config = imports.misc.config;
- const EndSessionDialog = imports.ui.endSessionDialog;
- const PolkitAuthenticationAgent = imports.ui.polkitAuthenticationAgent;
- const Environment = imports.ui.environment;
-@@ -27,7 +28,7 @@ const PlacesManager = imports.ui.placesManager;
- const RunDialog = imports.ui.runDialog;
- const Layout = imports.ui.layout;
- const LookingGlass = imports.ui.lookingGlass;
--const NetworkAgent = imports.ui.networkAgent;
-+const NetworkAgent = Config.HAVE_NETWORKMANAGER ? imports.ui.networkAgent : null;
- const NotificationDaemon = imports.ui.notificationDaemon;
- const WindowAttentionHandler = imports.ui.windowAttentionHandler;
- const Scripting = imports.ui.scripting;
-@@ -88,7 +89,9 @@ function _createUserSession() {
-     placesManager = new PlacesManager.PlacesManager();    
-     automountManager = new AutomountManager.AutomountManager();
-     autorunManager = new AutorunManager.AutorunManager();
--    networkAgent = new NetworkAgent.NetworkAgent();
-+    if (Config.HAVE_NETWORKMANAGER) {
-+        networkAgent = new NetworkAgent.NetworkAgent();
-+    }
- }
- 
- function _createGDMSession() {
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 182bf17..54770e7 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -108,9 +108,7 @@ cinnamon_public_headers_h =		\
- 	cinnamon-generic-container.h	\
- 	cinnamon-gtk-embed.h		\
- 	cinnamon-global.h			\
--	cinnamon-mobile-providers.h	\
- 	cinnamon-mount-operation.h		\
--	cinnamon-network-agent.h		\
- 	cinnamon-perf-log.h		\
- 	cinnamon-slicer.h			\
- 	cinnamon-stack.h			\
-@@ -145,9 +143,7 @@ libcinnamon_la_SOURCES =		\
- 	cinnamon-generic-container.c	\
- 	cinnamon-gtk-embed.c		\
- 	cinnamon-global.c			\
--	cinnamon-mobile-providers.c	\
- 	cinnamon-mount-operation.c		\
--	cinnamon-network-agent.c		\
- 	cinnamon-perf-log.c		\
- 	cinnamon-polkit-authentication-agent.h	\
- 	cinnamon-polkit-authentication-agent.c	\
-@@ -161,6 +157,10 @@ libcinnamon_la_SOURCES =		\
- 	cinnamon-wm.c			\
- 	cinnamon-xfixes-cursor.c
- 
-+if HAVE_NETWORKMANAGER
-+libcinnamon_la_SOURCES += cinnamon-mobile-providers.h cinnamon-mobile-providers.c cinnamon-network-agent.h cinnamon-network-agent.c
-+endif
-+
- libcinnamon_la_gir_sources = \
- 	$(filter-out %-private.h $(cinnamon_recorder_non_gir_sources), $(cinnamon_public_headers_h) $(libcinnamon_la_SOURCES))
- 
-@@ -272,7 +272,10 @@ libcinnamon_la_LIBADD =		\
- libcinnamon_la_CPPFLAGS = $(cinnamon_cflags)
- 
- Cinnamon-0.1.gir: libcinnamon.la St-1.0.gir
--Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0 Folks-0.6
-+Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 Folks-0.6
-+if HAVE_NETWORKMANAGER
-+Cinnamon_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0
-+endif
- Cinnamon_0_1_gir_CFLAGS = $(libcinnamon_la_CPPFLAGS) -I $(srcdir)
- Cinnamon_0_1_gir_LIBS = libcinnamon.la
- Cinnamon_0_1_gir_FILES = $(libcinnamon_la_gir_sources)
--- 
-1.7.8.4
-
diff --git a/gnome-extra/cinnamon/files/cinnamon-1.4-notification.patch b/gnome-extra/cinnamon/files/cinnamon-1.4-notification.patch
deleted file mode 100644
index 83d6938..0000000
--- a/gnome-extra/cinnamon/files/cinnamon-1.4-notification.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From 3af53231970861564c01c5f64fe18fe128d2e246 Mon Sep 17 00:00:00 2001
-From: Lukas Elsner <open@mindrunner.de>
-Date: Sun, 15 Apr 2012 14:33:34 +0200
-Subject: [PATCH] implemented rat4's patch
-
----
- data/org.cinnamon.gschema.xml    |    6 ++++
- data/org.cinnamon.gschema.xml.in |    5 ++++
- js/ui/windowAttentionHandler.js  |   48 +++++++++++++++++++++++++++++++++++--
- 3 files changed, 56 insertions(+), 3 deletions(-)
-
-diff --git a/data/org.cinnamon.gschema.xml b/data/org.cinnamon.gschema.xml
-index a413619..28ad28b 100644
---- a/data/org.cinnamon.gschema.xml
-+++ b/data/org.cinnamon.gschema.xml
-@@ -127,6 +127,12 @@
-       <description>Layout styles: traditional (1 panel at the bottom), flipped (1 panel on top), classic (1 panel on top, 1 panel at the bottom)</description>
-     </key>
-     
-+    <key type="i" name="notification-style">
-+      <range min="0" max="2"/>
-+      <default>2</default>
-+      <summary>Notification style</summary>
-+    </key>
-+    
-     <key type="s" name="date-format">
-       <default>"YYYY-MM-DD"</default>
-       <summary>Auto-hide panel</summary>
-diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in
-index c496c3d..e598146 100644
---- a/data/org.cinnamon.gschema.xml.in
-+++ b/data/org.cinnamon.gschema.xml.in
-@@ -175,6 +175,11 @@
-       </_description>
-     </key>
-     
-+    <key type="i" name="notification-style">
-+      <default>2</default>
-+      <_summary>Notification style</_summary>
-+    </key>
-+    
-     <key name="date-format" type="s">
-       <default>"YYYY-MM-DD"</default>
-       <_summary>Auto-hide panel</_summary>
-diff --git a/js/ui/windowAttentionHandler.js b/js/ui/windowAttentionHandler.js
-index a81f10c..7594ed0 100644
---- a/js/ui/windowAttentionHandler.js
-+++ b/js/ui/windowAttentionHandler.js
-@@ -12,8 +12,18 @@ function WindowAttentionHandler() {
- 
- WindowAttentionHandler.prototype = {
-     _init : function() {
--        this._tracker = Cinnamon.WindowTracker.get_default();
--        global.display.connect('window-demands-attention', Lang.bind(this, this._onWindowDemandsAttention));
-+      this.notification_style = global.settings.get_int("notification-style");
-+      global.settings.connect("changed::notification-style", Lang.bind(this, function() {
-+        this.notification_style = global.settings.get_int("notification-style");
-+      }));
-+      this._tracker = Cinnamon.WindowTracker.get_default();
-+      global.display.connect('window-demands-attention', Lang.bind(this, this._onWindowDemandsAttention));
-+    },
-+
-+    _getTitleAndBanner: function(app, window) {
-+        let title = app.get_name();
-+        let banner = _("'%s' is ready").format(window.get_title());
-+        return [title, banner]
-     },
- 
-     _onWindowDemandsAttention : function(display, window) {
-@@ -28,9 +38,41 @@ WindowAttentionHandler.prototype = {
-         if (!window || window.has_focus() || window.is_skip_taskbar())
-             return;
- 
--        if (this._tracker.is_window_interesting(window)) {
-+        switch (this.notification_style) {
-+            case 0:
-+                break;
-+            case 1:
-+                this.bringToFront(window);
-+                break;
-+            case 2:
-+                this.showBanner(window);
-+                break;
-+            default:
-+                global.log('Unknown notification style: ' + this.notification_style);
-+        }
-+
-+    },
-+
-+    bringToFront : function(window) {
-+         if (this._tracker.is_window_interesting(window)) {
-             window.activate(global.get_current_time());
-         }
-+    },
-+
-+    showBanner : function(window) {
-+        let app = this._tracker.get_window_app(window);
-+        let source = new Source(app, window);
-+        if (Main.messageTray) Main.messageTray.add(source);
-+
-+        let [title, banner] = this._getTitleAndBanner(app, window);
-+
-+        let notification = new MessageTray.Notification(source, title, banner);
-+        source.notify(notification);
-+
-+        source.signalIDs.push(window.connect('notify::title', Lang.bind(this, function() {
-+            let [title, banner] = this._getTitleAndBanner(app, window);
-+            notification.update(title, banner);
-+        })));
-     }
- };
- 
--- 
-1.7.8.5
-
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
deleted file mode 100644
index 3b3f433..0000000
--- a/gnome-extra/libgda/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
-AUX libgda-4.2.0-fix-build-order.patch 1260 RMD160 45d51d47cc3e7117e80d30f360d6bf5988330153 SHA1 15ebfd96457e72b9c04f4b94e615576eb7a590ff SHA256 e7cf87eece86ecdbb1ee8a877b757b5cff05a8efe309f7551b865a01a07b75ab
-AUX libgda-4.2.0-missing-include-in-keyword_hash-generator.patch 897 RMD160 2a879a730831b7d6c05bf3a48df542cbf025adc4 SHA1 d76018f2b545290174cce55be7c4561edf7772bc SHA256 7cc133de8931b1dc86a08ee7a620e8b9218071723549734ea2290440318a7b8f
-AUX libgda-4.2.2-fix-build-order.patch 738 RMD160 b17874c3aab6b50b342e612e24bc706f4b6a077d SHA1 f72ecb1dd74a776decfb8fc6c7de1b0ceec90d43 SHA256 d8a293598d8277b766f5971066b27aeab45e2ead491b2250b5d700577c44a0e1
-AUX libgda-4.2.5-missing-m4.patch 359 RMD160 495d1eb184ffeb1d529a385291b61b41fccff445 SHA1 55c70bfdbaf9411a10ddf6f63b71f6e12b315703 SHA256 ed03d29bdb6454d6a54bd21cb1844ecd294e2d58593ec58496deb09953176b2f
-AUX libgda-4.2.8-ldap.patch 900 RMD160 aa2bb0c3972cbc06408b3905cea97ecde7b4d3c8 SHA1 c343c8f054706738691a3691b1db601b3d7df20a SHA256 fe2ca3407626b87b9daca3f20293ba91de7faeb099312ee0a1b627561f19f07f
-AUX libgda-4.2.8-sandbox-fix.patch 1884 RMD160 8f22b90ed93c634a01f9d2e3883ab346181c5131 SHA1 885cb7fc5d4cd899df1d9d28a9f70496f11b2120 SHA256 9eb945c021309a2ebd1d1f5f92c44a787b9e60519929f0c954e814a134e9ae0a
-AUX libgda-4.99.1-control-center-icon-collision.patch 4936 RMD160 09a5e9d06384f38512ec6efcdb030db4840657b7 SHA1 195bcd2a4c31517e0c12df8b144e7b79b19c59cc SHA256 d9d77e140b9c59f8e5e5afdb2103e1be18e1cc3e798824385bfc440a8b6a4c78
-AUX libgda-4.99.1-gda-browser-doc-collision.patch 1847 RMD160 b103d8a8eb0e44318afe78191f0a6041b7364aa0 SHA1 b38ae8cdda23c6abd16d3aa1017b0bccd0d689b5 SHA256 54afb7f259dad0d3fd7a4de057113f788e64c212c4c3c25b8987a9223540dea0
-AUX libgda-4.99.1-gda-browser-help-collision.patch 1270 RMD160 e7675db0e35b98d4f94b22b204b806c9938051c1 SHA1 1ba6f0587f82a66f7062cc48fff05b024b8bdc4d SHA256 b9d20506fe89fd0219f3d737450bbba0a98e5b850cf152e570ca8a6a66740994
-AUX libgda-4.99.4-disable-broken-tests.patch 363 RMD160 3c2559b32d5a01b9377782f7130980b68ca85f8a SHA1 360074a84e6eadc7480a8e1adeceedce344af0d7 SHA256 cbc8b5bbd5577538f68d1625616f3812ebb1976d05b356b13feb491eb1174f5c
-AUX libgda-4.99.4-statement-rewriting-fix.patch 17054 RMD160 b8b5a084b9e548b913595ae94defa9320b17febe SHA1 e702517de6d0fb128f46513a7d9bd839d20930ba SHA256 81c6089b0899ef43428e5e6f182df153c85730e879f2ecefa7c769b0073c756d
-AUX libgda-9999-disable-broken-tests.patch 363 RMD160 3c2559b32d5a01b9377782f7130980b68ca85f8a SHA1 360074a84e6eadc7480a8e1adeceedce344af0d7 SHA256 cbc8b5bbd5577538f68d1625616f3812ebb1976d05b356b13feb491eb1174f5c
-AUX libgda-9999-fix-build-order.patch 372 RMD160 31346346a53beed118f4131ec1eafd5cb3f3ee71 SHA1 ccdb903ba680c6acf614498c612b317be5a696d8 SHA256 3979cbcc1f0fd2943fd426bde591fdf12c614f72ac43582e4c25900e13154142
-DIST libgda-4.99.4.tar.xz 11621632 RMD160 a786eb9c5ab4798fe7fadabf60989060b7380616 SHA1 773f137df3e54cc55d210e810e8708538c1c495c SHA256 efef38c0318d156ba3263416355847af961f561660793cb670633e056018beac
-EBUILD libgda-4.99.4-r1.ebuild 5036 RMD160 6665d4ee62ae5fb8cf2b8a42d048f92214ac9024 SHA1 f38ab8af3e28bff78dbfcea3a68f60ae041cfac2 SHA256 ff46cb3111cf95255ffd17d5f2874b9182a24f726de99acf6defbf4ed60602bb
diff --git a/gnome-extra/libgda/files/libgda-4.2.0-fix-build-order.patch b/gnome-extra/libgda/files/libgda-4.2.0-fix-build-order.patch
deleted file mode 100644
index 4c1aca0..0000000
--- a/gnome-extra/libgda/files/libgda-4.2.0-fix-build-order.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From f39858f84155d0346d31a2607997257a54e246ff Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 29 Sep 2010 23:45:46 +0200
-Subject: [PATCH] fix build order for xml_embedded.h
-
----
- libgda/sqlite/Makefile.am |    9 +++++----
- 1 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/libgda/sqlite/Makefile.am b/libgda/sqlite/Makefile.am
-index 1d2df2c..ecce04b 100644
---- a/libgda/sqlite/Makefile.am
-+++ b/libgda/sqlite/Makefile.am
-@@ -58,9 +58,9 @@ sqlitesources = \
- 	gda-sqlite.h \
- 	keywords_hash.h \
- 	gda-symbols-util.h \
--	gda-symbols-util.c
--
--$(libgda_sqlite_la_OBJECTS): xml_embedded.h keywords_hash.c
-+	gda-symbols-util.c \
-+	xml_embedded.h \
-+	keywords_hash.c
- 
- libgda_sqlite_la_SOURCES = $(sqlitesources)
- libgda_sqlite_la_CFLAGS = -DPNAME=\""SQLite"\" -DCLASS_PREFIX=\""GdaSqlite"\" -DSEARCH_LIB_PATH=\""$(SQLITE_PATH)"\"
-@@ -85,4 +85,5 @@ gdainclude_HEADERS=$(sqliteheaders)
- 
- EXTRA_DIST = gen_emb_string.c mkkeywordhash.c keywords.list
- 
--CLEANFILES = gen_emb_string$(EXEEXT_FOR_BUILD) xml_embedded.h mkkeywordhash$(EXEEXT_FOR_BUILD) keywords_hash.c
-+CLEANFILES = gen_emb_string$(EXEEXT_FOR_BUILD) mkkeywordhash$(EXEEXT_FOR_BUILD) $(BUILT_SOURCES)
-+BUILT_SOURCES = xml_embedded.h keywords_hash.c
--- 
-1.7.3
-
diff --git a/gnome-extra/libgda/files/libgda-4.2.0-missing-include-in-keyword_hash-generator.patch b/gnome-extra/libgda/files/libgda-4.2.0-missing-include-in-keyword_hash-generator.patch
deleted file mode 100644
index 5e7dd61..0000000
--- a/gnome-extra/libgda/files/libgda-4.2.0-missing-include-in-keyword_hash-generator.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 9f219a98731085ef9588622ecdc9d7ba93de92bb Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 29 Sep 2010 23:53:54 +0200
-Subject: [PATCH] Fix missing include in keyword_hash generator
-
----
- libgda/sqlite/mkkeywordhash.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/libgda/sqlite/mkkeywordhash.c b/libgda/sqlite/mkkeywordhash.c
-index dc6ce89..28f4f83 100644
---- a/libgda/sqlite/mkkeywordhash.c
-+++ b/libgda/sqlite/mkkeywordhash.c
-@@ -370,6 +370,10 @@ main (int argc, char **argv)
- 	}
- 
- 	/* Begin generating code */
-+	printf("#include <stdio.h>\n");
-+	printf("#include <string.h>\n");
-+	printf("#include <glib.h>\n");
-+
- 	printf("/* Hash score: %d */\n", bestCount);
- 	printf("static int %skeywordCode(const char *z, int n){\n", prefix ? prefix : "");
- 	printf("  /* zText[] encodes %d bytes of keywords in %d bytes */\n",
--- 
-1.7.3
-
diff --git a/gnome-extra/libgda/files/libgda-4.2.2-fix-build-order.patch b/gnome-extra/libgda/files/libgda-4.2.2-fix-build-order.patch
deleted file mode 100644
index ac31089..0000000
--- a/gnome-extra/libgda/files/libgda-4.2.2-fix-build-order.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- libgda/sqlite/Makefile.am.orig	2010-12-04 11:33:12.000000000 +0100
-+++ libgda/sqlite/Makefile.am	2010-12-04 11:34:50.000000000 +0100
-@@ -58,9 +58,9 @@
- 	gda-sqlite.h \
- 	keywords_hash.h \
- 	gda-symbols-util.h \
--	gda-symbols-util.c
--
--BUILT_SOURCES = xml_embedded.h keywords_hash.c
-+	gda-symbols-util.c \
-+	xml_embedded.h \
-+	keywords_hash.c
- 
- libgda_sqlite_la_SOURCES = $(sqlitesources)
- libgda_sqlite_la_CFLAGS = -DPNAME=\""SQLite"\" -DCLASS_PREFIX=\""GdaSqlite"\" -DSEARCH_LIB_PATH=\""$(SQLITE_PATH)"\"
-@@ -86,3 +86,4 @@
- EXTRA_DIST = gen_emb_string.c mkkeywordhash.c keywords.list
- 
- CLEANFILES = gen_emb_string$(EXEEXT_FOR_BUILD) mkkeywordhash$(EXEEXT_FOR_BUILD) $(BUILT_SOURCES)
-+BUILT_SOURCES = xml_embedded.h keywords_hash.c
diff --git a/gnome-extra/libgda/files/libgda-4.2.5-missing-m4.patch b/gnome-extra/libgda/files/libgda-4.2.5-missing-m4.patch
deleted file mode 100644
index bea88cf..0000000
--- a/gnome-extra/libgda/files/libgda-4.2.5-missing-m4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 7ce16f8..3f5ae10 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -5,6 +5,7 @@ m4_define([gda_stable],
- 	m4_if(m4_eval(minor % 2), [0], [yes], [no]))
- AC_CONFIG_MACRO_DIR([m4])
- m4_include(m4/introspection.m4)
-+m4_include(m4/dk-warn.m4)
- m4_include(m4/mdbtools.m4)
- m4_include(m4/bdb.m4)
- m4_include(m4/mysql.m4)
diff --git a/gnome-extra/libgda/files/libgda-4.2.8-ldap.patch b/gnome-extra/libgda/files/libgda-4.2.8-ldap.patch
deleted file mode 100644
index b8f6d31..0000000
--- a/gnome-extra/libgda/files/libgda-4.2.8-ldap.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f8042173c2139f65c69502a393fb44e00124ecc6 Mon Sep 17 00:00:00 2001
-From: Daniel Espinosa <esodan@gmail.com>
-Date: Thu, 02 Jun 2011 15:51:52 +0000
-Subject: Added checks for LDAP on table-columns for GdaBrowser
-
----
-diff --git a/tools/browser/schema-browser/table-columns.c b/tools/browser/schema-browser/table-columns.c
-index 80cdaee..26ad771 100644
---- a/tools/browser/schema-browser/table-columns.c
-+++ b/tools/browser/schema-browser/table-columns.c
-@@ -117,12 +117,14 @@ table_columns_show_all (GtkWidget *widget)
- {
- 	TableColumns *tcolumns = (TableColumns *) widget;
-         GTK_WIDGET_CLASS (parent_class)->show_all (widget);
-+#ifdef HAVE_LDAP
- 	if (browser_connection_is_ldap (tcolumns->priv->bcnc)) {
- 		if (! tcolumns->priv->ldap_props_shown) {
- 			gtk_widget_hide (tcolumns->priv->ldap_header);
- 			gtk_widget_hide (tcolumns->priv->ldap_text);
- 		}
- 	}
-+#endif
- }
- 
- GType
---
-cgit v0.9
diff --git a/gnome-extra/libgda/files/libgda-4.2.8-sandbox-fix.patch b/gnome-extra/libgda/files/libgda-4.2.8-sandbox-fix.patch
deleted file mode 100644
index 8d24430..0000000
--- a/gnome-extra/libgda/files/libgda-4.2.8-sandbox-fix.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 9c1a1809650321c3d752a143f87089d325c49237 Mon Sep 17 00:00:00 2001
-From: Vivien Malerba <malerba@gnome-db.org>
-Date: Mon, 06 Jun 2011 18:42:19 +0000
-Subject: Correction for bug #651922 - libgda-4.2.8 wants to write on /etc/libgda-4.0/config during compilation with --enable-gtk-doc
-
----
-diff --git a/libgda/gda-config.c b/libgda/gda-config.c
-index e1b65c0..e0a51c7 100644
---- a/libgda/gda-config.c
-+++ b/libgda/gda-config.c
-@@ -20,6 +20,7 @@
-  * Boston, MA 02111-1307, USA.
-  */
- 
-+#include <unistd.h>
- #include <stdio.h>
- #include <gmodule.h>
- #include <libgda/gda-config.h>
-@@ -630,12 +631,34 @@ gda_config_constructor (GType type,
- 										    LIBGDA_ABI_NAME, "config", NULL);
- 		unique_instance->priv->system_config_allowed = FALSE;
- 		if (unique_instance->priv->system_file) {
-+#ifdef G_OS_WIN32
-+
- 			FILE *file;
-                         file = fopen (unique_instance->priv->system_file, "a");  /* Flawfinder: ignore */
-                         if (file) {
-                                 unique_instance->priv->system_config_allowed = TRUE;
-                                 fclose (file);
-                         }
-+#else
-+			struct stat stbuf;
-+			if (stat (unique_instance->priv->system_file, &stbuf) == 0) {
-+				/* use effective user and group IDs */
-+				uid_t euid;
-+				gid_t egid;
-+				euid = geteuid ();
-+				egid = getegid ();
-+				if (euid == stbuf.st_uid) {
-+					if ((stbuf.st_mode & S_IWUSR) && (stbuf.st_mode & S_IRUSR))
-+						unique_instance->priv->system_config_allowed = TRUE;
-+				}
-+				else if (egid == stbuf.st_gid) {
-+					if ((stbuf.st_mode & S_IWGRP) && (stbuf.st_mode & S_IRGRP))
-+						unique_instance->priv->system_config_allowed = TRUE;
-+				}
-+				else if ((stbuf.st_mode & S_IWOTH) && (stbuf.st_mode & S_IROTH))
-+					unique_instance->priv->system_config_allowed = TRUE;
-+			}
-+#endif
- 		}
- 
- 		/* Setup file monitoring */
---
-cgit v0.9
diff --git a/gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch b/gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch
deleted file mode 100644
index 06166e6..0000000
--- a/gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 6ec47f4cf542ad9f7c4d30d557e4813b5c6f31d5 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Sat, 4 Jun 2011 05:45:35 -0400
-Subject: [PATCH] Prevent file collision with gda-control-center-4.0's icons
-
----
- control-center/data/Makefile.am                    |   12 ++++++------
- ... hicolor_apps_16x16_gda-control-center-5.0.png} |  Bin 833 -> 833 bytes
- ... hicolor_apps_22x22_gda-control-center-5.0.png} |  Bin 1157 -> 1157 bytes
- ... hicolor_apps_24x24_gda-control-center-5.0.png} |  Bin 1144 -> 1144 bytes
- ...icolor_apps_256x256_gda-control-center-5.0.png} |  Bin 33543 -> 33543 bytes
- ... hicolor_apps_32x32_gda-control-center-5.0.png} |  Bin 1867 -> 1867 bytes
- ... hicolor_apps_48x48_gda-control-center-5.0.png} |  Bin 3144 -> 3144 bytes
- control-center/gda-control-center-5.0.desktop.in   |    2 +-
- 8 files changed, 7 insertions(+), 7 deletions(-)
- rename control-center/data/{hicolor_apps_16x16_gda-control-center.png => hicolor_apps_16x16_gda-control-center-5.0.png} (100%)
- rename control-center/data/{hicolor_apps_22x22_gda-control-center.png => hicolor_apps_22x22_gda-control-center-5.0.png} (100%)
- rename control-center/data/{hicolor_apps_24x24_gda-control-center.png => hicolor_apps_24x24_gda-control-center-5.0.png} (100%)
- rename control-center/data/{hicolor_apps_256x256_gda-control-center.png => hicolor_apps_256x256_gda-control-center-5.0.png} (100%)
- rename control-center/data/{hicolor_apps_32x32_gda-control-center.png => hicolor_apps_32x32_gda-control-center-5.0.png} (100%)
- rename control-center/data/{hicolor_apps_48x48_gda-control-center.png => hicolor_apps_48x48_gda-control-center-5.0.png} (100%)
-
-diff --git a/control-center/data/Makefile.am b/control-center/data/Makefile.am
-index 03fa362..862ec88 100644
---- a/control-center/data/Makefile.am
-+++ b/control-center/data/Makefile.am
-@@ -5,12 +5,12 @@ public_icons_themes = \
- 	$(NULL)
- 
- public_icons = \
--	hicolor_apps_16x16_gda-control-center.png \
--	hicolor_apps_22x22_gda-control-center.png \
--	hicolor_apps_24x24_gda-control-center.png \
--	hicolor_apps_256x256_gda-control-center.png \
--	hicolor_apps_32x32_gda-control-center.png \
--	hicolor_apps_48x48_gda-control-center.png \
-+	hicolor_apps_16x16_gda-control-center-5.0.png \
-+	hicolor_apps_22x22_gda-control-center-5.0.png \
-+	hicolor_apps_24x24_gda-control-center-5.0.png \
-+	hicolor_apps_256x256_gda-control-center-5.0.png \
-+	hicolor_apps_32x32_gda-control-center-5.0.png \
-+	hicolor_apps_48x48_gda-control-center-5.0.png \
- 	$(NULL)
- 
- private_icons = \
-diff --git a/control-center/data/hicolor_apps_16x16_gda-control-center.png b/control-center/data/hicolor_apps_16x16_gda-control-center-5.0.png
-similarity index 100%
-rename from control-center/data/hicolor_apps_16x16_gda-control-center.png
-rename to control-center/data/hicolor_apps_16x16_gda-control-center-5.0.png
-diff --git a/control-center/data/hicolor_apps_22x22_gda-control-center.png b/control-center/data/hicolor_apps_22x22_gda-control-center-5.0.png
-similarity index 100%
-rename from control-center/data/hicolor_apps_22x22_gda-control-center.png
-rename to control-center/data/hicolor_apps_22x22_gda-control-center-5.0.png
-diff --git a/control-center/data/hicolor_apps_24x24_gda-control-center.png b/control-center/data/hicolor_apps_24x24_gda-control-center-5.0.png
-similarity index 100%
-rename from control-center/data/hicolor_apps_24x24_gda-control-center.png
-rename to control-center/data/hicolor_apps_24x24_gda-control-center-5.0.png
-diff --git a/control-center/data/hicolor_apps_256x256_gda-control-center.png b/control-center/data/hicolor_apps_256x256_gda-control-center-5.0.png
-similarity index 100%
-rename from control-center/data/hicolor_apps_256x256_gda-control-center.png
-rename to control-center/data/hicolor_apps_256x256_gda-control-center-5.0.png
-diff --git a/control-center/data/hicolor_apps_32x32_gda-control-center.png b/control-center/data/hicolor_apps_32x32_gda-control-center-5.0.png
-similarity index 100%
-rename from control-center/data/hicolor_apps_32x32_gda-control-center.png
-rename to control-center/data/hicolor_apps_32x32_gda-control-center-5.0.png
-diff --git a/control-center/data/hicolor_apps_48x48_gda-control-center.png b/control-center/data/hicolor_apps_48x48_gda-control-center-5.0.png
-similarity index 100%
-rename from control-center/data/hicolor_apps_48x48_gda-control-center.png
-rename to control-center/data/hicolor_apps_48x48_gda-control-center-5.0.png
-diff --git a/control-center/gda-control-center-5.0.desktop.in b/control-center/gda-control-center-5.0.desktop.in
-index 6fd5b58..429787d 100644
---- a/control-center/gda-control-center-5.0.desktop.in
-+++ b/control-center/gda-control-center-5.0.desktop.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Database access control center
- _Comment=Configure your database access environment
--Icon=gda-control-center
-+Icon=gda-control-center-5.0
- Exec=gda-control-center-5.0
- Terminal=false
- Type=Application
--- 
-1.7.5.3
-
diff --git a/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch b/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch
deleted file mode 100644
index 9616a42..0000000
--- a/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From bfb0d952d111929174c3326dbc69ab65a808a235 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Sat, 4 Jun 2011 05:59:46 -0400
-Subject: [PATCH] Prevent file collision with gda-browser-4.0's gtk-doc files
-
----
- tools/browser/doc/Makefile.am                      |    2 +-
- ...browser-docs.sgml => gda-browser-5.0-docs.sgml} |    0
- ...r-sections.txt => gda-browser-5.0-sections.txt} |    0
- .../{gda-browser.types => gda-browser-5.0.types}   |    0
- 4 files changed, 1 insertions(+), 1 deletions(-)
- rename tools/browser/doc/{gda-browser-docs.sgml => gda-browser-5.0-docs.sgml} (100%)
- rename tools/browser/doc/{gda-browser-sections.txt => gda-browser-5.0-sections.txt} (100%)
- rename tools/browser/doc/{gda-browser.types => gda-browser-5.0.types} (100%)
-
-diff --git a/tools/browser/doc/Makefile.am b/tools/browser/doc/Makefile.am
-index 971fa79..cf6637a 100644
---- a/tools/browser/doc/Makefile.am
-+++ b/tools/browser/doc/Makefile.am
-@@ -3,7 +3,7 @@
- AUTOMAKE_OPTIONS = 1.6
- 
- # The name of the module.
--DOC_MODULE=gda-browser
-+DOC_MODULE=gda-browser-5.0
- 
- # The top-level SGML file.
- DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
-diff --git a/tools/browser/doc/gda-browser-docs.sgml b/tools/browser/doc/gda-browser-5.0-docs.sgml
-similarity index 100%
-rename from tools/browser/doc/gda-browser-docs.sgml
-rename to tools/browser/doc/gda-browser-5.0-docs.sgml
-diff --git a/tools/browser/doc/gda-browser-sections.txt b/tools/browser/doc/gda-browser-5.0-sections.txt
-similarity index 100%
-rename from tools/browser/doc/gda-browser-sections.txt
-rename to tools/browser/doc/gda-browser-5.0-sections.txt
-diff --git a/tools/browser/doc/gda-browser.types b/tools/browser/doc/gda-browser-5.0.types
-similarity index 100%
-rename from tools/browser/doc/gda-browser.types
-rename to tools/browser/doc/gda-browser-5.0.types
--- 
-1.7.5.3
-
diff --git a/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-help-collision.patch b/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-help-collision.patch
deleted file mode 100644
index 46e7282..0000000
--- a/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-help-collision.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 01b13e22b215647c2343ec5f633b51d3c2b37824 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Sat, 4 Jun 2011 01:59:14 -0400
-Subject: [PATCH] Prevent file collision with gda-browser-4.0's help files
-
----
- tools/browser/help/Makefile.am |    2 +-
- tools/browser/support.c        |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/browser/help/Makefile.am b/tools/browser/help/Makefile.am
-index 93acaf8..48fcdc4 100644
---- a/tools/browser/help/Makefile.am
-+++ b/tools/browser/help/Makefile.am
-@@ -1,6 +1,6 @@
- include $(top_srcdir)/gnome-doc-utils.make
- 
--DOC_ID = gda-browser
-+DOC_ID = gda-browser-5.0
- 
- DOC_INCLUDES = legal.xml
- DOC_FIGURES = \
-diff --git a/tools/browser/support.c b/tools/browser/support.c
-index 5b1b4e6..f462efc 100644
---- a/tools/browser/support.c
-+++ b/tools/browser/support.c
-@@ -223,7 +223,7 @@ browser_show_help (GtkWindow *parent, const gchar *topic)
- 		if (strchr (lang, '.'))
- 			continue;
- 
--		uri = gda_gbr_get_file_path (GDA_DATA_DIR, "gnome", "help", "gda-browser", lang, NULL);
-+		uri = gda_gbr_get_file_path (GDA_DATA_DIR, "gnome", "help", "gda-browser-5.0", lang, NULL);
- 
- 		/*g_print ("TST URI [%s]\n", uri);*/
- 		if (g_file_test (uri, G_FILE_TEST_EXISTS)) {
--- 
-1.7.5.3
-
diff --git a/gnome-extra/libgda/files/libgda-4.99.4-disable-broken-tests.patch b/gnome-extra/libgda/files/libgda-4.99.4-disable-broken-tests.patch
deleted file mode 100644
index 1add00a..0000000
--- a/gnome-extra/libgda/files/libgda-4.99.4-disable-broken-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/tests/value-holders/check_holder.c b/tests/value-holders/check_holder.c
-index d014131..289a9ca 100644
---- a/tests/value-holders/check_holder.c
-+++ b/tests/value-holders/check_holder.c
-@@ -38,8 +38,8 @@ static gboolean test13 (GError **error);
- TestFunc tests[] = {
- 	test1,
- 	test2,
--	test3,
--	test4,
-+//	test3,
-+//	test4,
- 	test5,
- 	test6,
- 	test7,
diff --git a/gnome-extra/libgda/files/libgda-4.99.4-statement-rewriting-fix.patch b/gnome-extra/libgda/files/libgda-4.99.4-statement-rewriting-fix.patch
deleted file mode 100644
index 07077e5..0000000
--- a/gnome-extra/libgda/files/libgda-4.99.4-statement-rewriting-fix.patch
+++ /dev/null
@@ -1,465 +0,0 @@
-From 7d7742477ad03f19a168c763b988a7807421e9ca Mon Sep 17 00:00:00 2001
-From: Vivien Malerba <malerba@gnome-db.org>
-Date: Sat, 17 Sep 2011 14:26:09 +0000
-Subject: Fixed nasty bug introduced in commit #036420a459b0bb241716cd9a14c3dd1eb2b21f63
-
-which "Improved statement rewriting for NULL parameters", and in other
-commits for each provider
----
-diff --git a/libgda/sqlite/gda-sqlite-provider.c b/libgda/sqlite/gda-sqlite-provider.c
-index afeab3c..69ccd16 100644
---- a/libgda/sqlite/gda-sqlite-provider.c
-+++ b/libgda/sqlite/gda-sqlite-provider.c
-@@ -2935,7 +2935,33 @@ gda_sqlite_provider_statement_execute (GdaServerProvider *provider, GdaConnectio
- 			else if (!rstmt)
- 				return NULL;
- 			else {
-+				/* The strategy here is to execute @rstmt using the prepared
-+				 * statement associcted to @stmt, but adapted to @rstmt, so all
-+				 * the column names, etc remain the same.
-+				 *
-+				 * The adaptation consists to replace SQLite specific information
-+				 * in the GdaSqlitePStmt object.
-+				 *
-+				 * The trick is to adapt @ps, then associate @ps with @rstmt, then
-+				 * execute @rstmt, and then undo the trick */
- 				GObject *obj;
-+				GdaSqlitePStmt *tps;
-+				if (!gda_sqlite_provider_statement_prepare (provider, cnc,
-+									    rstmt, error))
-+					return NULL;
-+				tps = (GdaSqlitePStmt *)
-+					gda_connection_get_prepared_statement (cnc, rstmt);
-+
-+				/* adapt @ps with @tps's SQLite specific information */
-+				GdaSqlitePStmt hps;
-+				hps.sqlite_stmt = ps->sqlite_stmt; /* save */
-+				ps->sqlite_stmt = tps->sqlite_stmt; /* override */
-+				hps.stmt_used = ps->stmt_used; /* save */
-+				ps->stmt_used = tps->stmt_used; /* override */
-+				g_object_ref (tps);
-+				gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) ps);
-+
-+				/* execute rstmt (it will use @ps) */
- 				obj = gda_sqlite_provider_statement_execute (provider, cnc,
- 									     rstmt, params,
- 									     model_usage,
-@@ -2943,15 +2969,14 @@ gda_sqlite_provider_statement_execute (GdaServerProvider *provider, GdaConnectio
- 									     last_inserted_row,
- 									     task_id, async_cb,
- 									     cb_data, error);
-+
-+				/* revert adaptations */
-+				ps->sqlite_stmt = hps.sqlite_stmt;
-+				ps->stmt_used = hps.stmt_used;
-+				gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) tps);
-+				g_object_unref (tps);
- 				g_object_unref (rstmt);
--				if (GDA_IS_DATA_SELECT (obj)) {
--					GdaPStmt *pstmt;
--					g_object_get (obj, "prepared-stmt", &pstmt, NULL);
--					if (pstmt) {
--						gda_pstmt_set_gda_statement (pstmt, stmt);
--						g_object_unref (pstmt);
--					}
--				}
-+
- 				if (new_ps)
- 					g_object_unref (ps);
- 				pending_blobs_free_list (blobs_list);
-diff --git a/providers/jdbc/gda-jdbc-provider.c b/providers/jdbc/gda-jdbc-provider.c
-index 164e67f..c1192fb 100644
---- a/providers/jdbc/gda-jdbc-provider.c
-+++ b/providers/jdbc/gda-jdbc-provider.c
-@@ -1429,9 +1429,49 @@ gda_jdbc_provider_statement_execute (GdaServerProvider *provider, GdaConnection
- 			else if (!rstmt)
- 				return NULL;
- 			else {
--				GObject *obj;
--				g_object_unref (ps);
- 				_gda_jdbc_release_jenv (jni_detach);
-+
-+				/* The strategy here is to execute @rstmt using the prepared
-+				 * statement associcted to @stmt, but adapted to @rstmt, so all
-+				 * the column names, etc remain the same.
-+				 *
-+				 * The adaptation consists to replace Jdbc specific information
-+				 * in the GdaJdbcPStmt object.
-+				 *
-+				 * The trick is to adapt @ps, then associate @ps with @rstmt, then
-+				 * execute @rstmt, and then undo the trick */
-+				GObject *obj;
-+				GdaJdbcPStmt *tps;
-+				if (!gda_jdbc_provider_statement_prepare (provider, cnc,
-+									    rstmt, error)) {
-+					g_object_unref (ps);
-+					return NULL;
-+				}
-+				tps = (GdaJdbcPStmt *)
-+					gda_connection_get_prepared_statement (cnc, rstmt);
-+
-+				/* adapt @ps with @tps's Jdbc specific information */
-+				GdaJdbcPStmt hps;
-+				hps.pstmt_obj = ps->pstmt_obj; /* save */
-+				ps->pstmt_obj = tps->pstmt_obj; /* override */
-+				g_object_ref (tps);
-+				gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) ps);
-+
-+				/* execute rstmt (it will use @ps) */
-+				obj = gda_jdbc_provider_statement_execute (provider, cnc,
-+									     rstmt, params,
-+									     model_usage,
-+									     col_types,
-+									     last_inserted_row,
-+									     task_id, async_cb,
-+									     cb_data, error);
-+
-+				/* revert adaptations */
-+				ps->pstmt_obj = hps.pstmt_obj;
-+				gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) tps);
-+				g_object_unref (tps);
-+				g_object_unref (rstmt);
-+
- 				obj = gda_jdbc_provider_statement_execute (provider, cnc,
- 									   rstmt, params,
- 									   model_usage,
-@@ -1440,14 +1480,7 @@ gda_jdbc_provider_statement_execute (GdaServerProvider *provider, GdaConnection
- 									   task_id, async_cb,
- 									   cb_data, error);
- 				g_object_unref (rstmt);
--				if (GDA_IS_DATA_SELECT (obj)) {
--					GdaPStmt *pstmt;
--					g_object_get (obj, "prepared-stmt", &pstmt, NULL);
--					if (pstmt) {
--						gda_pstmt_set_gda_statement (pstmt, stmt);
--						g_object_unref (pstmt);
--					}
--				}
-+				g_object_unref (ps);
- 				return obj;
- 			}
- 		}
-diff --git a/providers/mysql/gda-mysql-provider.c b/providers/mysql/gda-mysql-provider.c
-index d581828..8baf0a3 100644
---- a/providers/mysql/gda-mysql-provider.c
-+++ b/providers/mysql/gda-mysql-provider.c
-@@ -2304,8 +2304,35 @@ gda_mysql_provider_statement_execute (GdaServerProvider               *provider,
- 			else if (!rstmt)
- 				return NULL;
- 			else {
--				GObject *obj;
- 				free_bind_param_data (mem_to_free);
-+
-+				/* The strategy here is to execute @rstmt using the prepared
-+				 * statement associcted to @stmt, but adapted to @rstmt, so all
-+				 * the column names, etc remain the same.
-+				 *
-+				 * The adaptation consists to replace MySQL specific information
-+				 * in the GdaMysqlPStmt object.
-+				 *
-+				 * The trick is to adapt @ps, then associate @ps with @rstmt, then
-+				 * execute @rstmt, and then undo the trick */
-+				GObject *obj;
-+				GdaMysqlPStmt *tps;
-+				if (!gda_mysql_provider_statement_prepare (provider, cnc,
-+									    rstmt, error))
-+					return NULL;
-+				tps = (GdaMysqlPStmt *)
-+					gda_connection_get_prepared_statement (cnc, rstmt);
-+
-+				/* adapt @ps with @tps's Mysql specific information */
-+				GdaMysqlPStmt hps;
-+				hps.mysql_stmt = ps->mysql_stmt; /* save */
-+				ps->mysql_stmt = tps->mysql_stmt; /* override */
-+				hps.stmt_used = ps->stmt_used; /* save */
-+				ps->stmt_used = tps->stmt_used; /* override */
-+				g_object_ref (tps);
-+				gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) ps);
-+
-+				/* execute rstmt (it will use @ps) */
- 				obj = gda_mysql_provider_statement_execute (provider, cnc,
- 									    rstmt, params,
- 									    model_usage,
-@@ -2313,15 +2340,13 @@ gda_mysql_provider_statement_execute (GdaServerProvider               *provider,
- 									    last_inserted_row,
- 									    task_id, async_cb,
- 									    cb_data, error);
-+
-+				/* revert adaptations */
-+				ps->mysql_stmt = hps.mysql_stmt;
-+				ps->stmt_used = hps.stmt_used;
-+				gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) tps);
-+				g_object_unref (tps);
- 				g_object_unref (rstmt);
--				if (GDA_IS_DATA_SELECT (obj)) {
--					GdaPStmt *pstmt;
--					g_object_get (obj, "prepared-stmt", &pstmt, NULL);
--					if (pstmt) {
--						gda_pstmt_set_gda_statement (pstmt, stmt);
--						g_object_unref (pstmt);
--					}
--				}
- 				return obj;
- 			}
- 		}
-diff --git a/providers/oracle/gda-oracle-provider.c b/providers/oracle/gda-oracle-provider.c
-index 1d40105..9d0f485 100644
---- a/providers/oracle/gda-oracle-provider.c
-+++ b/providers/oracle/gda-oracle-provider.c
-@@ -1931,8 +1931,35 @@ gda_oracle_provider_statement_execute (GdaServerProvider *provider, GdaConnectio
- 			else if (!rstmt)
- 				return NULL;
- 			else {
-+				/* The strategy here is to execute @rstmt using the prepared
-+				 * statement associcted to @stmt, but adapted to @rstmt, so all
-+				 * the column names, etc remain the same.
-+				 *
-+				 * The adaptation consists to replace Oracle specific information
-+				 * in the GdaOraclePStmt object.
-+				 *
-+				 * The trick is to adapt @ps, then associate @ps with @rstmt, then
-+				 * execute @rstmt, and then undo the trick */
- 				GObject *obj;
--				g_object_unref (ps);
-+				GdaOraclePStmt *tps;
-+				if (!gda_oracle_provider_statement_prepare (provider, cnc,
-+									    rstmt, error)) {
-+					g_object_unref (ps);
-+					return NULL;
-+				}
-+				tps = (GdaOraclePStmt *)
-+					gda_connection_get_prepared_statement (cnc, rstmt);
-+
-+				/* adapt @ps with @tps's Oracle specific information */
-+				GdaOraclePStmt hps;
-+				hps.hstmt = ps->hstmt; /* save */
-+				ps->hstmt = tps->hstmt; /* override */
-+				hps.ora_values = ps->ora_values; /* save */
-+				ps->ora_values = tps->ora_values; /* override */
-+				g_object_ref (tps);
-+				gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) ps);
-+
-+				/* execute rstmt (it will use @ps) */
- 				obj = gda_oracle_provider_statement_execute (provider, cnc,
- 									     rstmt, params,
- 									     model_usage,
-@@ -1940,15 +1967,14 @@ gda_oracle_provider_statement_execute (GdaServerProvider *provider, GdaConnectio
- 									     last_inserted_row,
- 									     task_id, async_cb,
- 									     cb_data, error);
-+				
-+				/* revert adaptations */
-+				ps->hstmt = hps.hstmt;
-+				ps->ora_values = hps.ora_values;
-+				gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) tps);
-+				g_object_unref (tps);
- 				g_object_unref (rstmt);
--				if (GDA_IS_DATA_SELECT (obj)) {
--					GdaPStmt *pstmt;
--					g_object_get (obj, "prepared-stmt", &pstmt, NULL);
--					if (pstmt) {
--						gda_pstmt_set_gda_statement (pstmt, stmt);
--						g_object_unref (pstmt);
--					}
--				}
-+				g_object_unref (ps);
- 				return obj;
- 			}
- 		}
-diff --git a/providers/postgres/gda-postgres-provider.c b/providers/postgres/gda-postgres-provider.c
-index 6adca14..85db58e 100644
---- a/providers/postgres/gda-postgres-provider.c
-+++ b/providers/postgres/gda-postgres-provider.c
-@@ -2017,13 +2017,39 @@ gda_postgres_provider_statement_execute (GdaServerProvider *provider, GdaConnect
- 			else if (!rstmt)
- 				return NULL;
- 			else {
--				GObject *obj;
- 				params_freev (param_values, param_mem, nb_params);
- 				g_free (param_lengths);
- 				g_free (param_formats);
- 				if (transaction_started)
- 					gda_connection_rollback_transaction (cnc, NULL, NULL);
- 
-+				/* The strategy here is to execute @rstmt using the prepared
-+				 * statement associcted to @stmt, but adapted to @rstmt, so all
-+				 * the column names, etc remain the same.
-+				 *
-+				 * The adaptation consists to replace Postgresql specific information
-+				 * in the GdaPostgresPStmt object.
-+				 *
-+				 * The trick is to adapt @ps, then associate @ps with @rstmt, then
-+				 * execute @rstmt, and then undo the trick */
-+				GObject *obj;
-+				GdaPostgresPStmt *tps;
-+				if (!gda_postgres_provider_statement_prepare (provider, cnc,
-+									      rstmt, error))
-+					return NULL;
-+				tps = (GdaPostgresPStmt *)
-+					gda_connection_get_prepared_statement (cnc, rstmt);
-+
-+				/* adapt @ps with @tps's SQLite specific information */
-+				GdaPostgresPStmt hps;
-+				hps.pconn = ps->pconn; /* save */
-+				ps->pconn = tps->pconn; /* override */
-+				hps.prep_name = ps->prep_name; /* save */
-+				ps->prep_name = tps->prep_name; /* override */
-+				g_object_ref (tps);
-+				gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) ps);
-+
-+				/* execute rstmt (it will use @ps) */
- 				obj = gda_postgres_provider_statement_execute (provider, cnc,
- 									       rstmt, params,
- 									       model_usage,
-@@ -2031,15 +2057,13 @@ gda_postgres_provider_statement_execute (GdaServerProvider *provider, GdaConnect
- 									       last_inserted_row,
- 									       task_id, async_cb,
- 									       cb_data, error);
-+
-+				/* revert adaptations */
-+				ps->pconn = hps.pconn;
-+				ps->prep_name = hps.prep_name;
-+				gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) tps);
-+				g_object_unref (tps);
- 				g_object_unref (rstmt);
--				if (GDA_IS_DATA_SELECT (obj)) {
--					GdaPStmt *pstmt;
--					g_object_get (obj, "prepared-stmt", &pstmt, NULL);
--					if (pstmt) {
--						gda_pstmt_set_gda_statement (pstmt, stmt);
--						g_object_unref (pstmt);
--					}
--				}
- 				return obj;
- 			}
- 		}
-diff --git a/providers/skel-implementation/capi/gda-capi-provider.c b/providers/skel-implementation/capi/gda-capi-provider.c
-index 653f9ea..764d027 100644
---- a/providers/skel-implementation/capi/gda-capi-provider.c
-+++ b/providers/skel-implementation/capi/gda-capi-provider.c
-@@ -1181,7 +1181,31 @@ gda_capi_provider_statement_execute (GdaServerProvider *provider, GdaConnection
- 			else if (!rstmt)
- 				return NULL;
- 			else {
-+				/* The strategy here is to execute @rstmt using the prepared
-+				 * statement associcted to @stmt, but adapted to @rstmt, so all
-+				 * the column names, etc remain the same.
-+				 *
-+				 * The adaptation consists to replace Capi specific information
-+				 * in the GdaCapiPStmt object.
-+				 *
-+				 * The trick is to adapt @ps, then associate @ps with @rstmt, then
-+				 * execute @rstmt, and then undo the trick */
- 				GObject *obj;
-+				GdaCapiPStmt *tps;
-+				if (!gda_capi_provider_statement_prepare (provider, cnc,
-+									    rstmt, error))
-+					return NULL;
-+				tps = (GdaCapiPStmt *)
-+					gda_connection_get_prepared_statement (cnc, rstmt);
-+
-+				/* adapt @ps with @tps's Capi specific information */
-+				GdaCapiPStmt hps;
-+				/* TO ADD: hps.capi_stmt = ps->capi_stmt;*/ /* save */
-+				/* TO_ADD: ps->capi_stmt = tps->capi_stmt;*/ /* override */
-+				g_object_ref (tps);
-+				gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) ps);
-+
-+				/* execute rstmt (it will use @ps) */
- 				obj = gda_capi_provider_statement_execute (provider, cnc,
- 									   rstmt, params,
- 									   model_usage,
-@@ -1189,15 +1213,13 @@ gda_capi_provider_statement_execute (GdaServerProvider *provider, GdaConnection
- 									   last_inserted_row,
- 									   task_id, async_cb,
- 									   cb_data, error);
-+
-+				/* revert adaptations */
-+				/* TO_ADD: ps->capi_stmt = hps.capi_stmt; */
-+
-+				gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) tps);
-+				g_object_unref (tps);
- 				g_object_unref (rstmt);
--				if (GDA_IS_DATA_SELECT (obj)) {
--					GdaPStmt *pstmt;
--					g_object_get (obj, "prepared-stmt", &pstmt, NULL);
--					if (pstmt) {
--						gda_pstmt_set_gda_statement (pstmt, stmt);
--						g_object_unref (pstmt);
--					}
--				}
- 				return obj;
- 			}
- 		}
-diff --git a/providers/web/gda-web-provider.c b/providers/web/gda-web-provider.c
-index 4500f01..9061126 100644
---- a/providers/web/gda-web-provider.c
-+++ b/providers/web/gda-web-provider.c
-@@ -1572,25 +1572,49 @@ gda_web_provider_statement_execute (GdaServerProvider *provider, GdaConnection *
- 			else if (!rstmt)
- 				return NULL;
- 			else {
--				GObject *obj;
--				g_object_unref (ps);
- 				xmlFreeDoc (doc);
-+
-+				/* The strategy here is to execute @rstmt using the prepared
-+				 * statement associcted to @stmt, but adapted to @rstmt, so all
-+				 * the column names, etc remain the same.
-+				 *
-+				 * The adaptation consists to replace Web specific information
-+				 * in the GdaWebPStmt object.
-+				 *
-+				 * The trick is to adapt @ps, then associate @ps with @rstmt, then
-+				 * execute @rstmt, and then undo the trick */
-+				GObject *obj;
-+				GdaWebPStmt *tps;
-+				if (!gda_web_provider_statement_prepare (provider, cnc,
-+									 rstmt, error)) {
-+					g_object_unref (ps);
-+					return NULL;
-+				}
-+				tps = (GdaWebPStmt *)
-+					gda_connection_get_prepared_statement (cnc, rstmt);
-+
-+				/* adapt @ps with @tps's Web specific information */
-+				GdaWebPStmt hps;
-+				hps.pstmt_hash = ps->pstmt_hash; /* save */
-+				ps->pstmt_hash = tps->pstmt_hash; /* override */
-+				g_object_ref (tps);
-+				gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) ps);
-+
-+				/* execute rstmt (it will use @ps) */
- 				obj = gda_web_provider_statement_execute (provider, cnc,
--									  rstmt, params,
--									  model_usage,
--									  col_types,
--									  last_inserted_row,
--									  task_id, async_cb,
--									  cb_data, error);
-+									     rstmt, params,
-+									     model_usage,
-+									     col_types,
-+									     last_inserted_row,
-+									     task_id, async_cb,
-+									     cb_data, error);
-+
-+				/* revert adaptations */
-+				ps->pstmt_hash = hps.pstmt_hash;
-+				gda_connection_add_prepared_statement (cnc, rstmt, (GdaPStmt *) tps);
-+				g_object_unref (tps);
- 				g_object_unref (rstmt);
--				if (GDA_IS_DATA_SELECT (obj)) {
--					GdaPStmt *pstmt;
--					g_object_get (obj, "prepared-stmt", &pstmt, NULL);
--					if (pstmt) {
--						gda_pstmt_set_gda_statement (pstmt, stmt);
--						g_object_unref (pstmt);
--					}
--				}
-+				g_object_unref (ps);
- 				return obj;
- 			}
- 		}
---
-cgit v0.9.0.2
diff --git a/gnome-extra/libgda/files/libgda-9999-disable-broken-tests.patch b/gnome-extra/libgda/files/libgda-9999-disable-broken-tests.patch
deleted file mode 100644
index 1add00a..0000000
--- a/gnome-extra/libgda/files/libgda-9999-disable-broken-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/tests/value-holders/check_holder.c b/tests/value-holders/check_holder.c
-index d014131..289a9ca 100644
---- a/tests/value-holders/check_holder.c
-+++ b/tests/value-holders/check_holder.c
-@@ -38,8 +38,8 @@ static gboolean test13 (GError **error);
- TestFunc tests[] = {
- 	test1,
- 	test2,
--	test3,
--	test4,
-+//	test3,
-+//	test4,
- 	test5,
- 	test6,
- 	test7,
diff --git a/gnome-extra/libgda/files/libgda-9999-fix-build-order.patch b/gnome-extra/libgda/files/libgda-9999-fix-build-order.patch
deleted file mode 100644
index cd2fbb5..0000000
--- a/gnome-extra/libgda/files/libgda-9999-fix-build-order.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/libgda/sqlite/Makefile.am b/libgda/sqlite/Makefile.am
-index b3bf302..c7be5e1 100644
---- a/libgda/sqlite/Makefile.am
-+++ b/libgda/sqlite/Makefile.am
-@@ -58,7 +58,8 @@ sqlitesources = \
- 	gda-sqlite.h \
- 	keywords_hash.h \
- 	gda-symbols-util.h \
--	gda-symbols-util.c
-+	gda-symbols-util.c \
-+	$(BUILT_SOURCES)
- 
- BUILT_SOURCES = xml_embedded.h keywords_hash.c
- 
diff --git a/gnome-extra/libgda/libgda-4.99.4-r1.ebuild b/gnome-extra/libgda/libgda-4.99.4-r1.ebuild
deleted file mode 100644
index acca81f..0000000
--- a/gnome-extra/libgda/libgda-4.99.4-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.99.4.ebuild,v 1.1 2011/09/30 19:27:46 nirbheek Exp $
-
-EAPI="3"
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="yes"
-GNOME_TARBALL_SUFFIX="xz" # remove when python eclass supports EAPI 4
-PYTHON_DEPEND="2"
-
-inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python
-
-DESCRIPTION="Gnome Database Access Library"
-HOMEPAGE="http://www.gnome-db.org/"
-LICENSE="GPL-2 LGPL-2"
-
-IUSE="berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl"
-SLOT="5"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-# FIXME: sqlite is automagic, but maybe it is a hard-dep
-# FIXME: autoconf is a hell of inconsistencies
-RDEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.16:2
-	>=dev-libs/libxml2-2
-	dev-libs/libxslt
-	dev-libs/libunique:3
-	sys-libs/readline
-	sys-libs/ncurses
-	berkdb?   ( sys-libs/db )
-	!bindist? ( firebird? ( dev-db/firebird ) )
-	gtk? (
-		>=x11-libs/gtk+-3.0.0:3
-		canvas? ( x11-libs/goocanvas:2.0 )
-		sourceview? ( x11-libs/gtksourceview:3.0 )
-		graphviz? ( media-gfx/graphviz )
-	)
-	gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) )
-	http? ( >=net-libs/libsoup-2.24:2.4 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.5 )
-	json?     ( dev-libs/json-glib )
-	ldap?     ( net-nds/openldap )
-	mdb?      ( >app-office/mdbtools-0.5 )
-	mysql?    ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	ssl?      ( dev-libs/openssl )
-	>=dev-db/sqlite-3.6.22:3"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.18
-	>=dev-util/intltool-0.35.5
-	>=app-text/gnome-doc-utils-0.9
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-# XXX: some tests fail when run from portage (but pass when building by hand)
-RESTRICT="test"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-
-	if use canvas || use graphviz || use sourceview; then
-		if ! use gtk; then
-			ewarn "You must enable USE=gtk to make use of canvas, graphivz or sourceview USE flag."
-			ewarn "Disabling for now."
-			G2CONF="${G2CONF} --without-goocanvas --without-graphivz --without-gtksourceview"
-		else
-			G2CONF="${G2CONF}
-				$(use_with canvas goocanvas)
-				$(use_with graphviz)
-				$(use_with sourceview gtksourceview)"
-		fi
-	fi
-
-	G2CONF="${G2CONF}
-		--with-unique
-		--disable-scrollkeeper
-		--disable-static
-		--enable-system-sqlite
-		$(use_with berkdb bdb /usr)
-		$(use_with gnome-keyring)
-		$(use_with gtk ui)
-		$(use_with http libsoup)
-		$(use_enable introspection)
-		$(use_with java java $JAVA_HOME)
-		$(use_enable json)
-		$(use_with ldap)
-		$(use_with mdb mdb /usr)
-		$(use_with mysql mysql /usr)
-		$(use_with postgres postgres /usr)
-		$(use_enable ssl crypto)"
-
-	if use bindist; then
-		# firebird license is not GPL compatible
-		G2CONF="${G2CONF} --without-firebird"
-	else
-		G2CONF="${G2CONF} $(use_with firebird firebird /usr)"
-	fi
-
-	use berkdb && append-cppflags "-I$(db_includedir)"
-	use oci8 || G2CONF="${G2CONF} --without-oracle"
-
-	# Not in portage
-	G2CONF="${G2CONF}
-		--disable-default-binary"
-
-	export XDG_DATA_HOME="${T}/.local"
-}
-
-src_prepare() {
-	# Fix build order for generated content, upstream #630958
-	#epatch "${FILESDIR}/${PN}-9999-fix-build-order.patch"
-
-	# Fix compilation failure of keyword_hash.c, upstream #630959
-	#epatch "${FILESDIR}/${PN}-4.2.0-missing-include-in-keyword_hash-generator.patch"
-
-	# Upstream patch to fix a serious statement rewriting bug, in next release
-	epatch "${FILESDIR}/${PN}-4.99.4-statement-rewriting-fix.patch"
-
-	# Disable broken tests so we can check the others
-	epatch "${FILESDIR}/${PN}-4.99.4-disable-broken-tests.patch"
-
-	# Prevent file collisions with libgda:4
-	epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-help-collision.patch"
-	epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
-	epatch "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch"
-	# Move files with mv (since epatch can't handle rename diffs) and
-	# update pre-generated gtk-doc files
-	local f
-	for f in tools/browser/doc/gda-browser* ; do
-		mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
-	done
-	for f in tools/browser/doc/html/gda-browser.devhelp* ; do
-		sed -e 's:name="gda-browser":name="gda-browser-5.0":' \
-			-i ${f} || die "sed ${f} failed"
-		mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
-	done
-	for f in control-center/data/*_gda-control-center.png ; do
-		mv ${f} ${f/_gda-control-center.png/_gda-control-center-5.0.png} ||
-			die "mv ${f} failed"
-	done
-
-	python_convert_shebangs -r 2 libgda-report/RML/trml2{html,pdf}
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_test() {
-	emake check XDG_DATA_HOME="${T}/.local" || die "tests failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	local d
-	for d in /usr/share/libgda-5.0/gda_trml2{html,pdf} ; do
-		python_mod_optimize ${d}
-	done
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	local d
-	for d in /usr/share/libgda-5.0/gda_trml2{html,pdf} ; do
-		python_mod_cleanup ${d}
-	done
-}
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
deleted file mode 100644
index 7ebc20e..0000000
--- a/media-sound/spotify/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST spotify-client_0.8.3.278.g21c7566.632-1_amd64.deb 33346436 RMD160 4946d70c461895408f1d4f6e57cd45b6ae253b2d SHA1 146931f7c2df76e446b6704c5c043aa166c3f8e0 SHA256 a37a13b1c1a8088a811054c732d85b9d6ccf0bd92ad4da75bfee6d70dc344b5e
-DIST spotify-client_0.8.3.278.g21c7566.632-1_i386.deb 29783606 RMD160 7a909ab6e555785a5cebb026499d06c7d9daaf66 SHA1 62cec802f3530b95d0cd81e01ef0fe978a55400d SHA256 7f587585365498c5182bd7f3beafaf511d883102f5cece66cf84f4f94077765b
-EBUILD spotify-0.8.3.278.ebuild 2616 RMD160 69decc91253963d9c477e83ea75416f9cb31ab0d SHA1 59c59dd27de2432318ea09eb4b1e56c52b869e36 SHA256 607b7a54051aa9be73b96520b13dd3f3ff7aad07630eebbb794a751b6d7b2266
diff --git a/media-sound/spotify/spotify-0.8.3.278.ebuild b/media-sound/spotify/spotify-0.8.3.278.ebuild
deleted file mode 100644
index ac1f064..0000000
--- a/media-sound/spotify/spotify-0.8.3.278.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-DESCRIPTION="Spotify is a social music platform"
-HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
-
-MY_PV="${PV}.g21c7566.632-1"
-MY_P="${PN}-client_${MY_PV}"
-SRC_BASE="http://repository.spotify.com/pool/non-free/${PN:0:1}/${PN}/"
-#SRC_BASE="http://download.spotify.com/preview/"
-SRC_URI="
-	x86?   ( ${SRC_BASE}${MY_P}_i386.deb )
-	amd64? ( ${SRC_BASE}${MY_P}_amd64.deb )
-	"
-LICENSE="Spotify"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pulseaudio"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXScrnSaver
-		x11-libs/gdk-pixbuf
-		x11-libs/qt-core:4
-		x11-libs/qt-gui:4
-		x11-libs/qt-webkit:4
-		x11-libs/qt-dbus:4
-		x11-libs/gtk+:2
-		x11-libs/cairo
-		x11-libs/pango
-		dev-libs/atk
-		dev-libs/libgcrypt
-		dev-libs/glib:2
-		dev-libs/nspr
-		dev-libs/nss
-		dev-libs/openssl
-		gnome-base/gconf:2
-		media-libs/alsa-lib
-		media-libs/freetype
-		media-libs/fontconfig
-		media-libs/libpng:1.2
-		net-print/cups
-		sys-apps/dbus
-		sys-libs/zlib
-		pulseaudio? ( >=media-sound/pulseaudio-0.9.21 )"
-
-RESTRICT="mirror strip"
-
-src_unpack() {
-	mkdir "${P}"
-	cd "${P}"
-	unpack ${A}
-	unpack ./data.tar.gz
-}
-
-src_prepare() {
-	# link against openssl-1.0.0 as it crashes with 0.9.8
-	sed -i \
-		-e 's/\(lib\(ssl\|crypto\).so\).0.9.8/\1.1.0.0/g' \
-		usr/share/spotify/spotify || die "sed failed"
-	# different NSPR / NSS library names for some reason
-	sed -i \
-		-e 's/\(lib\(nss3\|nssutil3\|smime3\).so\).1d/\1.12/g' \
-		-e 's/\(lib\(plc4\|nspr4\).so\).0d\(.\)/\1.9\3\3/g' \
-		usr/share/spotify/libcef.so || die "sed failed"
-}
-
-src_install() {
-	dodoc usr/share/doc/spotify-client/changelog.Debian.gz
-	dodoc usr/share/doc/spotify-client/copyright
-	insinto /usr/share/applications
-	doins usr/share/applications/*.desktop
-	insinto /usr/share/pixmaps
-	doins usr/share/pixmaps/*.png
-
-	# install in /opt/spotify
-	SPOTIFY_HOME=/opt/spotify
-	dodir ${SPOTIFY_HOME}
-	insinto ${SPOTIFY_HOME}
-	doins -r usr/share/spotify/*
-	fperms +x ${SPOTIFY_HOME}/spotify
-	dodir /usr/bin
-	dosym ../share/spotify/spotify /usr/bin/spotify
-	dodir /usr/share
-	dosym ${SPOTIFY_HOME} /usr/share/spotify
-
-	# revdep-rebuild produces a false positive because of symbol versioning
-	dodir /etc/revdep-rebuild
-	cat <<-EOF >"${D}"/etc/revdep-rebuild/10${PN}
-		SEARCH_DIRS_MASK="${SPOTIFY_HOME}"
-	EOF
-}
-
-pkg_postinst() {
-	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
-	ewarn "To remove the cache:"
-	ewarn "rm -rf ~/.cache/spotify"
-}
diff --git a/net-ftp/fxp-one/Manifest b/net-ftp/fxp-one/Manifest
deleted file mode 100644
index e9107a7..0000000
--- a/net-ftp/fxp-one/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST fxp-one-1.9.tar.gz 567177 RMD160 f82bb71c11f0a4789d628a6556908055a9d10b68 SHA1 a95d9d6cb58eeffddd4a7664dd1a4edec4544550 SHA256 a9db121c0d4c9dbb6dcd62f1be1e8a18a77cb638b6d47228b8a0043d9bb0cb36
-EBUILD fxp-one-1.9.ebuild 867 RMD160 505794c02f27459efe09bb32afcde73925c2d011 SHA1 34ea99c610e378b930c16151cdc390bdd5c2095e SHA256 726267cbe8888c4f004875b98c85c2b7950ba9855dd14064fb714158e9b0c9a8
diff --git a/net-ftp/fxp-one/fxp-one-1.9.ebuild b/net-ftp/fxp-one/fxp-one-1.9.ebuild
deleted file mode 100644
index 4b5e6c4..0000000
--- a/net-ftp/fxp-one/fxp-one-1.9.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ncftp-3.2.1.ebuild,v 1.9 2008/05/11 08:35:57 solar Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="FXP.One is a very flexible FTP/FXP engine."
-HOMEPAGE="http://www.lundman.net/wiki/index.php/FXP.One"
-SRC_URI="http://www.lundman.net/ftp/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ncurses"
-
-DEPEND="
-	dev-libs/openssl
-	ncurses? ( >=dev-libs/cdk-5.0.20060507 )
-"
-
-src_compile() {
-	# this is an ugly hack around fxp.one's automagic deps on cdk/ncurses
-	use ncurses || export ac_cv_cdk_dir=no cdk_found=no ac_cv_curses_dir=no curses_found=no
-	econf || die "econf died"
-	emake DESTDIR="${D}" || die "emake died"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc README.txt
-}
diff --git a/net-im/jitsi/Manifest b/net-im/jitsi/Manifest
deleted file mode 100644
index 3cb3d5d..0000000
--- a/net-im/jitsi/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST jitsi-src-1.1-nightly.latest.zip 57064708 SHA256 46ada70ed4e6f6cff13e2d8fda1c4b5f28ab56bd3508c84032a8fd13f32afd2d SHA512 ca6e18cb0802302429557ac02cdc2f9cd2427f4a6757647b08ed4020c065fcecf89f2452794aa442f1926035c6f700320ba26333a235c985a2167397e5e26986 WHIRLPOOL 3e96dd169c5ca84657919a27ec08fd0cf5f9e5f7d4ecd206bdd4c99576cde8c9d1c3534c6ca772e1dc6e86a9f1b53652e79f11f4cbd7b16537e54f8d23d38a76
-EBUILD jitsi-1.1_rc1.ebuild 1690 SHA256 c2e96446d8a5b1f9ad1848e961eaac97080635f36f2f97ccc0819e361babb647 SHA512 7ece8048e34cbdfaa13a1bb49f9f4ed76045983d8f0007e64940f73522157cf7d9174395cdb47ce4ea1403f3a8fc671c9d281ed0ffcc1d89a3feacab405c207b WHIRLPOOL 1eec6bbdc1538daa4d93c53f542cc791ef88b4dfde77b97ec594eafc38af4a463014f775059c27c6e27a3ec44f26c27b077b79e3f66c5113d2137526b189c270
diff --git a/net-im/jitsi/jitsi-1.1_rc1.ebuild b/net-im/jitsi/jitsi-1.1_rc1.ebuild
deleted file mode 100644
index 6896715..0000000
--- a/net-im/jitsi/jitsi-1.1_rc1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="An audio/video SIP VoIP phone and instant messenger written in Java"
-HOMEPAGE="http://www.jitsi.org/"
-SRC_URI="https://download.jitsi.org/jitsi/nightly/src/jitsi-src-1.1-nightly.latest.zip"
-# this download comes with 30 Mb of useless jars
-# svn access is available but requires an account at java.net
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="virtual/jre:1.6"
-DEPEND="virtual/jre:1.6
-		dev-java/sun-jre-bin:1.6
-		dev-java/xalan
-		dev-java/ant-nodeps"
-
-S="${WORKDIR}/jitsi"
-
-src_compile() {
-	ant rebuild || die
-}
-
-src_install() {
-	insinto /usr/lib/jitsi/sc-bundles
-	doins sc-bundles/*.jar sc-bundles/os-specific/linux/*.jar
-
-	insinto /usr/lib/jitsi/lib
-	doins lib/* lib/os-specific/linux/*
-	doins -r lib/bundle
-
-	insinto /usr/lib/jitsi/lib/native
-	# WARNING: foreign binaries
-	if [ `uname -m` = x86_64 ]; then
-		doins lib/native/linux-64/*
-	else
-		doins lib/native/linux/*
-	fi
-
-	insinto /usr/share/pixmaps
-	doins resources/install/debian/sip-communicator.svg
-	#newins resources/install/debian/sip-communicator-32.xpm sip-communicator.xpm
-	make_desktop_entry jitsi Jitsi sip-communicator "AudioVideo;Network;InstantMessaging;Chat;Telephony;VideoConference;Java;"
-
-	sed -e 's/_PACKAGE_NAME_/jitsi/g' -e 's/_APP_NAME_/Jitsi/g' <resources/install/debian/sip-communicator.1.tmpl >jitsi.1
-	doman jitsi.1
-
-	cat resources/install/debian/sip-communicator.sh.tmpl | sed -e 's/exec $COMMAND $\*/GENTOO_VM=sun-jre-bin-1.6 exec $COMMAND $*/' | sed -e 's/_PACKAGE_NAME_/jitsi/g' > jitsi
-	dobin jitsi
-}
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
deleted file mode 100644
index 8e0938e..0000000
--- a/net-misc/dropbox/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dropbox-lnx.x86-1.3.14.tar.gz 17240936 RMD160 2cd028bd23d6a4df25afd6d71982b173adacb51e SHA1 729a42b64906bbd7e66b6893544a749ee04c3533 SHA256 9b1e53371e3200ca8d286f0901bfa96f10b546c97d3e81740982da3a4795833c
-DIST dropbox-lnx.x86_64-1.3.14.tar.gz 18049634 RMD160 bc69ba4d1c5d35c5253673395e87e758517ff228 SHA1 c7a8743e8f12a186be19fe430b4cf29f4bdccca2 SHA256 675ea3438d5d861468c21230402bdd6b5cac057eba822be5fcb446759ec94b0c
-EBUILD dropbox-1.3.14.ebuild 1287 RMD160 faf09906a462d31e732f63343dab4deb11b60536 SHA1 485c02af2060dd2a88e63d555665879d96d97aad SHA256 1d6d87585dc4654a48d4ba7092bafb13cceee29947b5ef0ba31e2ac6f5645d9d
diff --git a/net-misc/dropbox/dropbox-1.3.14.ebuild b/net-misc/dropbox/dropbox-1.3.14.ebuild
deleted file mode 100644
index d691dc7..0000000
--- a/net-misc/dropbox/dropbox-1.3.14.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-inherit gnome2-utils
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)."
-HOMEPAGE="http://dropbox.com/"
-SRC_URI="x86? ( http://dl-web.dropbox.com/u/17/dropbox-lnx.x86-${PV}.tar.gz )
-	amd64? ( http://dl-web.dropbox.com/u/17/dropbox-lnx.x86_64-${PV}.tar.gz )"
-
-LICENSE="CCPL-Attribution-NoDerivs-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror strip"
-
-QA_DT_HASH="opt/${PN}/.*"
-QA_EXECSTACK_x86="opt/dropbox/_ctypes.so"
-QA_EXECSTACK_amd64="opt/dropbox/_ctypes.so"
-
-DEPEND=""
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND=">=sys-devel/gcc-4.2.0
-	net-misc/wget"
-
-src_unpack() {
-	unpack ${A}
-	mv "${WORKDIR}/.dropbox-dist" "${S}" || die
-	rm "${S}"/libstdc++.so.6
-}
-
-src_install() {
-	dodoc README ACKNOWLEDGEMENTS
-	rm README ACKNOWLEDGEMENTS || die
-
-	local targetdir="/opt/dropbox"
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}/dropbox"
-	fperms a+x "${targetdir}/dropboxd"
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	insinto /usr/share
-	doins -r icons
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest
deleted file mode 100644
index be2651f..0000000
--- a/net-news/liferea/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX max-items.patch 630 RMD160 6a6172a9237eb7ed847a8d35625b1c53cc27fc57 SHA1 539821b9931ad3db95b8b35f045b05a55328f362 SHA256 a5ed05a53767d8c01f52601ab6e7a84a05abbee6bab4456c26e19cb8a8b9f457
-DIST liferea-1.7.6.tar.gz 1833906 RMD160 30d6ec6033184dccbfdfd49bf4c482bd3835790f SHA1 083d99c4fc7d4ebbbb0857e397f8a5936a3de5d5 SHA256 8bd4eda206bfeccc766a15e015e5c4a7f9d1872e4dd06d3523d342a21b095275
-EBUILD liferea-1.7.6.ebuild 1598 RMD160 ee212c956cb8a8d5cc910db4d99b8e6198f70092 SHA1 057e13fc70647912606710d6a305531a999104e8 SHA256 c64ab2d540dd9f6a788c33d161b4a2eadbcebf3343690408ba76f936d2a8bda8
-EBUILD liferea-9999.ebuild 1626 RMD160 5792274bb316c6b0bf7a1a235d711ffd8a528903 SHA1 1c054c4652ea55b7f8c80f5f5361fdc5ce744056 SHA256 b9b4fc30a66672c4e43e6fad0b9832621afd86bd6c10de9baa993d8eff8a8f2a
diff --git a/net-news/liferea/files/max-items.patch b/net-news/liferea/files/max-items.patch
deleted file mode 100644
index 044dc7a..0000000
--- a/net-news/liferea/files/max-items.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/fl_sources/google_source_feed.c	2009-05-02 04:53:16.000000000 +1000
-+++ b/src/fl_sources/google_source_feed.c	2010-02-24 18:56:06.249297068 +1100
-@@ -343,7 +343,7 @@
- 
- 	if (!g_str_equal (request->source, GOOGLE_READER_BROADCAST_FRIENDS_URL)) { 
- 		gchar* source_escaped = g_uri_escape_string(request->source, NULL, TRUE);
--		gchar* newUrl = g_strdup_printf ("http://www.google.com/reader/atom/feed/%s", source_escaped);
-+		gchar* newUrl = g_strdup_printf ("http://www.google.com/reader/atom/feed/%s?n=50", source_escaped);
- 		update_request_set_source (request, newUrl);
- 		g_free (newUrl);
- 		g_free (source_escaped);
diff --git a/net-news/liferea/liferea-1.7.6.ebuild b/net-news/liferea/liferea-1.7.6.ebuild
deleted file mode 100644
index a1b719c..0000000
--- a/net-news/liferea/liferea-1.7.6.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.7.4.ebuild,v 1.6 2011/03/21 22:19:52 nirbheek Exp $
-
-EAPI=2
-
-GCONF_DEBUG=no
-
-inherit eutils gnome2 pax-utils
-
-MY_P=${P/_/-}
-
-DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo/etc feeds"
-HOMEPAGE="http://liferea.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="dbus libnotify networkmanager maxitems"
-
-RDEPEND=">=x11-libs/gtk+-2.18.0:2
-	>=dev-libs/glib-2.16.0:2
-	>=x11-libs/pango-1.4.0
-	gnome-base/gconf:2
-	dev-libs/libunique:1
-	>=dev-libs/libxml2-2.6.27:2
-	>=dev-libs/libxslt-1.1.19
-	>=dev-db/sqlite-3.6.10:3
-	>=net-libs/libsoup-2.28.2:2.4
-	>=net-libs/webkit-gtk-1.1.11:2
-	libnotify? ( >=x11-libs/libnotify-0.3.2 )
-	dbus? ( >=dev-libs/dbus-glib-0.71 )
-	networkmanager? ( net-misc/networkmanager dev-libs/dbus-glib )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS ChangeLog README"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--enable-sm
-		--disable-schemas-install
-		$(use_enable dbus)
-		$(use_enable networkmanager nm)
-		$(use_enable libnotify)"
-}
-
-src_prepare() {
-	if use maxitems; then
-		epatch "${FILESDIR}/max-items.patch"
-	fi
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	# bug #338213
-	# Uses webkit's JIT. Needs mmap('rwx') to generate code in runtime.
-	# MPROTECT policy violation. Will sit here until webkit will
-	# get optional JIT.
-	pax-mark m "${D}"/usr/bin/liferea
-}
diff --git a/net-news/liferea/liferea-9999.ebuild b/net-news/liferea/liferea-9999.ebuild
deleted file mode 100644
index 96acb3f..0000000
--- a/net-news/liferea/liferea-9999.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.7.4.ebuild,v 1.6 2011/03/21 22:19:52 nirbheek Exp $
-
-EAPI=2
-
-GCONF_DEBUG=no
-
-inherit eutils gnome2 pax-utils git
-
-MY_P=${P/_/-}
-
-DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo/etc feeds"
-HOMEPAGE="http://liferea.sourceforge.net/"
-EGIT_REPO_URI="git://liferea.git.sourceforge.net/gitroot/liferea/liferea"
-SRC_URI=""
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="dbus libnotify networkmanager maxitems"
-
-RDEPEND=">=x11-libs/gtk+-2.18.0:2
-	>=dev-libs/glib-2.16.0:2
-	>=x11-libs/pango-1.4.0
-	gnome-base/gconf:2
-	dev-libs/libunique:1
-	>=dev-libs/libxml2-2.6.27:2
-	>=dev-libs/libxslt-1.1.19
-	>=dev-db/sqlite-3.6.10:3
-	>=net-libs/libsoup-2.28.2:2.4
-	>=net-libs/webkit-gtk-1.1.11:2
-	libnotify? ( >=x11-libs/libnotify-0.3.2 )
-	dbus? ( >=dev-libs/dbus-glib-0.71 )
-	networkmanager? ( net-misc/networkmanager dev-libs/dbus-glib )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS ChangeLog README"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--enable-sm
-		--disable-schemas-install
-		$(use_enable dbus)
-		$(use_enable networkmanager nm)
-		$(use_enable libnotify)"
-}
-
-src_prepare() {
-	if use maxitems; then
-		epatch "${FILESDIR}/max-items.patch"
-	fi
-	./autogen.sh
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	# bug #338213
-	# Uses webkit's JIT. Needs mmap('rwx') to generate code in runtime.
-	# MPROTECT policy violation. Will sit here until webkit will
-	# get optional JIT.
-	pax-mark m "${D}"/usr/bin/liferea
-}
diff --git a/sys-fs/mtpfs/Manifest b/sys-fs/mtpfs/Manifest
deleted file mode 100644
index a90ffa6..0000000
--- a/sys-fs/mtpfs/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST mtpfs-1.0.tar.gz 104242 RMD160 b0be57ca5f82cb3c4e957f51d386e63f8bc6d701 SHA1 7731bbf7b4f22f5757485810353c3d242a497a0e SHA256 879ccf929a7ce395af30ae81314850a5cb55a0056107477016121b9392c49c13
-EBUILD mtpfs-1.0.ebuild 1060 RMD160 61f1abccdb5f841e5c0e2e6e74921a9a0c3fa8a7 SHA1 4d97723a1055acf23eea7705e3b228cb8f9cbdd1 SHA256 702528517c1c6668cba81d8168d61a76734c85586241a4d81a001065e54fb61d
diff --git a/sys-fs/mtpfs/mtpfs-1.0.ebuild b/sys-fs/mtpfs/mtpfs-1.0.ebuild
deleted file mode 100644
index 2ad285e..0000000
--- a/sys-fs/mtpfs/mtpfs-1.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtpfs/mtpfs-0.9.ebuild,v 1.1 2011/06/30 10:16:21 xarthisius Exp $
-
-EAPI=4
-
-inherit base
-
-DESCRIPTION="A FUSE filesystem providing access to MTP devices"
-HOMEPAGE="http://www.adebenham.com/mtpfs/"
-SRC_URI="http://www.adebenham.com/debian/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="dev-libs/glib:2
-	media-libs/libid3tag
-	media-libs/libmad
-	media-libs/libmtp
-	sys-fs/fuse"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P}
-
-#PATCHES=( "${FILESDIR}"/${P}-overflow.patch )
-DOCS=(AUTHORS NEWS README)
-
-src_configure() {
-	econf $(use_enable debug)
-}
-
-pkg_postinst() {
-	einfo "To mount your MTP device, issue:"
-	einfo "    /usr/bin/mtpfs <mountpoint>"
-	echo
-	einfo "To unmount your MTP device, issue:"
-	einfo "    /usr/bin/fusermount -u <mountpoint>"
-
-	if use debug; then
-		echo
-		einfo "You have enabled debugging output."
-		einfo "Please make sure you run mtpfs with the -d flag."
-	fi
-}
diff --git a/sys-kernel/next-sources/Manifest b/sys-kernel/next-sources/Manifest
deleted file mode 100644
index a4769bd..0000000
--- a/sys-kernel/next-sources/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-EBUILD next-sources-9999.ebuild 549 RMD160 7d72c89833d85230c85f42f2f6d15057eeca1843 SHA1 2a20af8fd66e85c149d405feba6ffc5fdff679f6 SHA256 eccf08da3bd6ce1e6ec15020c93ea3c7084a765e00c7df38b4418172cdeed507
diff --git a/sys-kernel/next-sources/next-sources-9999.ebuild b/sys-kernel/next-sources/next-sources-9999.ebuild
deleted file mode 100644
index ad2ed28..0000000
--- a/sys-kernel/next-sources/next-sources-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-SLOT="0"
-ETYPE="sources"
-
-CKV=`date +%F`
-
-inherit kernel-2 git-2
-detect_version
-
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_SECURITY_UNSUPPORTED="1"
-
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git"
-EGIT_PROJECT="linux-next"
-EGIT_MASTER="master"
-
-DESCRIPTION="The linux-next integration testing tree"
-HOMEPAGE="http://www.kernel.org"
-SRC_URI=""
-
-KEYWORDS="~amd64 ~x86"
-IUSE="deblob"
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
deleted file mode 100644
index 108bca1..0000000
--- a/www-client/chromium/Manifest
+++ /dev/null
@@ -1,20 +0,0 @@
-AUX chromium-browser.xml 407 RMD160 457374ff72561648d9777ffb3270ad10d864a6be SHA1 65543bfff7d0350d40ba258e61061b0c5579e1f2 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff
-AUX chromium-cups-r0.patch 1237 RMD160 601fc9a46027580a1817a77abfb47b2b59e212ca SHA1 9826e90746229c7c12d767bb3b6cbdbc5c300041 SHA256 594af80456d977a19949909a7c79cae706964f7ced47634c9c9b19478dc089a2
-AUX chromium-ffmpeg-build-r0.patch 774 RMD160 a11ebd15927195fb047a366b1f9ab412a35d1262 SHA1 1972826179eed503f70a1499521072eb99c1fd16 SHA256 205a136035d09fb88549dfe4dbb97508e43a46f35ca791efa79d6c401aea5d84
-AUX chromium-glibc-2.14-r0.patch 1508 RMD160 6f8e88858cb02b825e512d1f030e681dbe1699b3 SHA1 c70e6dc5379f934ce726aa9ee46cd9db1ffefbbb SHA256 c434606b1599a47d8905d33c22dd65dd950d322108860572c55532189434a8ee
-AUX chromium-launcher-r1.sh 680 RMD160 17fdc3576819c41d9320fab4b2dde3b8dc3c251b SHA1 5be5d25be14906458eb93cd7275c47f73c55fce4 SHA256 fa9cd53ee929ac77a52abc09eb65bb605b72b384533ba52fb90a905c72c3c208
-AUX chromium-launcher-r2.sh 940 RMD160 7a64e597998a8f95a7e3d1c26377842ff8106f89 SHA1 9630a36af707a810cbd646f3bac5deba984439f6 SHA256 842e121bbfa33513ca964744f0ba8401401946e672cd6a0a95bc80a28212e87e
-AUX chromium-libgcrypt-r0.patch 436 RMD160 855ecc89bd61f95378dc5aa5726b48cac7ede92c SHA1 3346e667a6581f7f62020ebc16fbf608c3a47cb6 SHA256 a81c598f544278a5638f3707db8a2fab85173e93b9a3ff097648babe58b665b0
-AUX chromium-linux-3.0-r0.patch 830 RMD160 6ca1c723e5d3e1248781af9f4cc55ce44568f7dc SHA1 a337580315ce132e4a98778eadc2c0568cb1e477 SHA256 41a8397c142fa610f01ccafa5ca2775b6e646bda0be5a1744ccfa26e53635395
-AUX chromium-perl-5.14-r0.patch 1062 RMD160 3e3205f298ae15bfc886160611508da975764edc SHA1 c23076b04b1a1f12c31cd203077c3c93e407840f SHA256 3e4f19cfd21a6f5526bb7fd2e7ecf6f78f55d2b9f5536ec926b78d44f7765975
-AUX chromium-system-vpx-r3.patch 1168 RMD160 3f59b6dfff335be21b55de70ccd9a77b008f5cd0 SHA1 09d1d4a6b0b031839d002abc62ec4efef6faef71 SHA256 c46f61559bdbd7e29bb47607f0b152647f73e2cc3e836f53c67bb2925e8957d7
-AUX chromium-system-vpx-r4.patch 476 RMD160 ff7feff7dff9de28bdc4c80b43c9574d7769a288 SHA1 b87516b0dac8f65431fdce86f26a3c92cfc313af SHA256 6bf0801a8d4ff208f558fa5740adfbed6178d391314297c80e0c3a058910a10e
-AUX chromium-system-zlib-r0.patch 1318 RMD160 2debfc4f179a57119d5022305134307f4cbbe04d SHA1 036e7573b04046ee0275abcb99a7e7a8b490e47b SHA256 79668fbf6206cd958db328798298a0514d3a95683b41affd3a607a0ac95453e3
-AUX chromium.default 147 RMD160 4c0669585499b94c225e34e985e615d0299b66fb SHA1 1cdcbcd4a3517f70ba67c749da95c2a307971846 SHA256 de16d72d77ac9fe04f781df4f50dfb714ba33574755932df950c1d9472b589d9
-AUX chromium.xml 407 RMD160 457374ff72561648d9777ffb3270ad10d864a6be SHA1 65543bfff7d0350d40ba258e61061b0c5579e1f2 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff
-AUX dot-gclient 253 RMD160 a768770d8e6f5b73395451277beea1cc9240fc3a SHA1 3eaf2074da58cfe4f2af3d08f59b27a16fe13dad SHA256 8c5750251ff681044cc584ef3768fe39c56c7877ade5fb9107298734126e62cf
-DIST chromium-14.0.814.0.tar.bz2 201797447 RMD160 1faf919cfdb4f52ef386db55bdfaa6c0bb8100eb SHA1 223f7ac1015779c60edab89816c3a6b3967c9880 SHA256 4432bd0fec023ca701adce135c71f4248b3b1f83e41730fe110725cfcf8225f6
-DIST chromium-14.0.825.0.tar.bz2 202446439 RMD160 7ddecf1714910e2780a683e547ac409cf65bb7ff SHA1 998488b13966be72764442509d915613bb4949d8 SHA256 d4e12b545cb52ec9074a9278eb7e9fbd35f1460b4a5fcd1443616e5dfea12269
-EBUILD chromium-14.0.814.0-r1.ebuild 13071 RMD160 6cdd7b7b42ca6e04bbc46d0cb27e509b68c4b2f8 SHA1 f8c1a3a47e6ba4ee8ba3b047814c98fe2a9c8804 SHA256 a8cab57c2ad2d29574d5626b27449fc4e8ae7d77e3d500af8f2e869153a183b1
-EBUILD chromium-14.0.825.0-r1.ebuild 13078 RMD160 67c34423504008e3c391144aad94b4079125f259 SHA1 f0dbcfb2e6e3b8a1d2c8da990c2894328f3ffc67 SHA256 d8582643770f3fd341564835b540170f21142397e7ff5786f86ae43f7585f6b1
-MISC metadata.xml 267 RMD160 3a166415fec415d539c1b7c32ed40b188488b9fb SHA1 5c3d71a9cea27175cbe8c98369b42b79c8643c6c SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8
diff --git a/www-client/chromium/chromium-14.0.814.0-r1.ebuild b/www-client/chromium/chromium-14.0.814.0-r1.ebuild
deleted file mode 100644
index b3e032c..0000000
--- a/www-client/chromium/chromium-14.0.814.0-r1.ebuild
+++ /dev/null
@@ -1,430 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-14.0.814.0.ebuild,v 1.1 2011/07/17 00:25:26 phajdan.jr Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.6"
-
-inherit eutils fdo-mime flag-o-matic gnome2-utils linux-info multilib \
-	pax-utils portability python toolchain-funcs versionator virtualx
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="http://build.chromium.org/official/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cups gnome gnome-keyring kerberos xinerama"
-
-# en_US is ommitted on purpose from the list below. It must always be available.
-LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr
-hu id it ja kn ko lt lv ml mr nb nl pl pt_BR pt_PT ro ru sk sl sr sv sw ta te th
-tr uk vi zh_CN zh_TW"
-for lang in ${LANGS}; do
-	IUSE+=" linguas_${lang}"
-done
-
-RDEPEND="app-arch/bzip2
-	dev-libs/dbus-glib
-	>=dev-libs/icu-4.4.1
-	>=dev-libs/libevent-1.4.13
-	dev-libs/libxml2[icu]
-	dev-libs/libxslt
-	>=dev-libs/nss-3.12.3
-	gnome? ( >=gnome-base/gconf-2.24.0 )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 )
-	>=media-libs/alsa-lib-1.0.19
-	media-libs/flac
-	virtual/jpeg
-	media-libs/libpng
-	>=media-libs/libvpx-0.9.5
-	>=media-libs/libwebp-0.1.2
-	media-libs/speex
-	cups? ( >=net-print/cups-1.3.11 )
-	sys-libs/zlib
-	x11-libs/gtk+:2
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-lang/yasm
-	>=dev-util/gperf-3.0.3
-	>=dev-util/pkgconfig-0.23
-	sys-devel/flex
-	>=sys-devel/make-3.81-r2
-	x11-libs/libXinerama
-	test? (
-		dev-python/pyftpdlib
-		dev-python/simplejson
-		virtual/krb5
-	)"
-RDEPEND+="
-	kerberos? ( virtual/krb5 )
-	xinerama? ( x11-libs/libXinerama )
-	x11-misc/xdg-utils
-	virtual/ttf-fonts"
-
-gyp_use() {
-	if [[ $# -lt 2 ]]; then
-		echo "!!! usage: gyp_use <USEFLAG> <GYPFLAG>" >&2
-		return 1
-	fi
-	if use "$1"; then echo "-D$2=1"; else echo "-D$2=0"; fi
-}
-
-egyp() {
-	set -- build/gyp_chromium --depth=. "${@}"
-	echo "${@}" >&2
-	"${@}"
-}
-
-# Chromium uses different names for some langs,
-# return Chromium name corresponding to a Gentoo lang.
-chromium_lang() {
-	if [[ "$1" == "es_LA" ]]; then
-		echo "es_419"
-	else
-		echo "$1"
-	fi
-}
-
-pkg_setup() {
-	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX RANLIB
-
-	# Make sure the build system will use the right python, bug #344367.
-	python_set_active_version 2
-	python_pkg_setup
-
-	# Prevent user problems like bug #348235.
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		ewarn "You have enabled debug info (probably have -g or -ggdb in your \$C{,XX}FLAGS)."
-		ewarn "You may experience really long compilation times and/or increased memory usage."
-		ewarn "If compilation fails, please try removing -g{,gdb} before reporting a bug."
-	fi
-	eshopts_pop
-
-	# Warn if the kernel doesn't support features useful for sandboxing,
-	# bug #363907.
-	CONFIG_CHECK="~PID_NS ~NET_NS"
-	check_extra_config
-}
-
-src_prepare() {
-	
-	epatch "${FILESDIR}/${PN}-linux-3.0-r0.patch"
-	
-	
-	# Make sure we don't use bundled libvpx headers.
-	epatch "${FILESDIR}/${PN}-system-vpx-r4.patch"
-
-	# Fix build without libgcrypt, bug #373079.
-	epatch "${FILESDIR}/${PN}-libgcrypt-r0.patch"
-
-	# Remove most bundled libraries. Some are still needed.
-	find third_party -type f \! -iname '*.gyp*' \
-		\! -path 'third_party/WebKit/*' \
-		\! -path 'third_party/angle/*' \
-		\! -path 'third_party/cacheinvalidation/*' \
-		\! -path 'third_party/cld/*' \
-		\! -path 'third_party/expat/*' \
-		\! -path 'third_party/ffmpeg/*' \
-		\! -path 'third_party/flac/flac.h' \
-		\! -path 'third_party/gpsd/*' \
-		\! -path 'third_party/harfbuzz/*' \
-		\! -path 'third_party/hunspell/*' \
-		\! -path 'third_party/iccjpeg/*' \
-		\! -path 'third_party/launchpad_translations/*' \
-		\! -path 'third_party/leveldb/*' \
-		\! -path 'third_party/libjingle/*' \
-		\! -path 'third_party/libphonenumber/*' \
-		\! -path 'third_party/libvpx/libvpx.h' \
-		\! -path 'third_party/mesa/*' \
-		\! -path 'third_party/modp_b64/*' \
-		\! -path 'third_party/npapi/*' \
-		\! -path 'third_party/openmax/*' \
-		\! -path 'third_party/ots/*' \
-		\! -path 'third_party/protobuf/*' \
-		\! -path 'third_party/skia/*' \
-		\! -path 'third_party/speex/speex.h' \
-		\! -path 'third_party/sqlite/*' \
-		\! -path 'third_party/tcmalloc/*' \
-		\! -path 'third_party/tlslite/*' \
-		\! -path 'third_party/undoview/*' \
-		\! -path 'third_party/icu/*' \
-		\! -path 'third_party/zlib/contrib/minizip/*' \
-		-delete || die
-
-
-
-
-	# Make sure the build system will use the right python, bug #344367.
-	# Only convert directories that need it, to save time.
-	python_convert_shebangs -q -r 2 build tools
-}
-
-src_configure() {
-	local myconf=""
-
-	# Never tell the build system to "enable" SSE2, it has a few unexpected
-	# additions, bug #336871.
-	myconf+=" -Ddisable_sse2=1"
-
-	# Use system-provided libraries.
-	# TODO: use_system_ffmpeg (bug #71931). That makes yasm unneeded.
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-	myconf+="
-		-Duse_system_bzip2=1
-		-Duse_system_flac=1
-		-Duse_system_icu=0
-		-Duse_system_libevent=1
-		-Duse_system_libjpeg=1
-		-Duse_system_libpng=1
-		-Duse_system_libwebp=1
-		-Duse_system_libxml=1
-		-Duse_system_speex=1
-		-Duse_system_vpx=1
-		-Duse_system_xdg_utils=1
-		-Duse_system_yasm=1
-		-Duse_system_zlib=1"
-
-	# Optional dependencies.
-	myconf+="
-		$(gyp_use cups use_cups)
-		$(gyp_use gnome use_gconf)
-		$(gyp_use gnome-keyring use_gnome_keyring)
-		$(gyp_use gnome-keyring linux_link_gnome_keyring)"
-
-	# Enable sandbox.
-	myconf+="
-		-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
-		-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
-
-	if host-is-pax; then
-		# Prevent the build from failing (bug #301880). The performance
-		# difference is very small.
-		myconf+=" -Dv8_use_snapshot=0"
-	fi
-
-	# Our system ffmpeg should support more codecs than the bundled one
-	# for Chromium.
-	# TODO: uncomment when bug #371931 is fixed.
-	# myconf+=" -Dproprietary_codecs=1"
-
-	local myarch="$(tc-arch)"
-	if [[ $myarch = amd64 ]] ; then
-		myconf+=" -Dtarget_arch=x64"
-	elif [[ $myarch = x86 ]] ; then
-		myconf+=" -Dtarget_arch=ia32"
-	elif [[ $myarch = arm ]] ; then
-		# TODO: check this again after
-		# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed.
-		append-flags -fno-tree-sink
-
-		myconf+=" -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf+=" -Dwerror="
-
-	# Avoid a build error with -Os, bug #352457.
-	replace-flags "-Os" "-O2"
-
-	egyp ${myconf} || die
-}
-
-src_compile() {
-	emake chrome chrome_sandbox BUILDTYPE=Release V=1 || die
-	pax-mark m out/Release/chrome
-	if use test; then
-		emake {base,crypto,googleurl,net}_unittests BUILDTYPE=Release V=1 || die
-		pax-mark m out/Release/{base,crypto,googleurl,net}_unittests
-	fi
-}
-
-src_test() {
-	# For more info see bug #350349.
-	local mylocale='en_US.utf8'
-	if ! locale -a | grep -q "$mylocale"; then
-		eerror "${PN} requires ${mylocale} locale for tests"
-		eerror "Please read the following guides for more information:"
-		eerror "  http://www.gentoo.org/doc/en/guide-localization.xml"
-		eerror "  http://www.gentoo.org/doc/en/utf-8.xml"
-		die "locale ${mylocale} is not supported"
-	fi
-
-	# For more info see bug #370957.
-	if [[ $UID -eq 0 ]]; then
-		die "Tests must be run as non-root. Please use FEATURES=userpriv."
-	fi
-
-	# For more info see bug #350347.
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \
-		'--gtest_filter=-ICUStringConversionsTest.*'
-
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/crypto_unittests virtualmake
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/googleurl_unittests virtualmake
-
-	# NetUtilTest: bug #361885.
-	# UDP: unstable, active development. We should revisit this later.
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/net_unittests virtualmake \
-		'--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:*UDP*'
-}
-
-src_install() {
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-	doexe out/Release/chrome_sandbox || die
-	fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
-
-	# Install Native Client files on platforms that support it.
-	insinto "${CHROMIUM_HOME}"
-	case "$(tc-arch)" in
-		amd64)
-			doins native_client/irt_binaries/nacl_irt_x86_64.nexe || die
-			doins out/Release/libppGoogleNaClPluginChrome.so || die
-		;;
-		x86)
-			doins native_client/irt_binaries/nacl_irt_x86_32.nexe || die
-			doins out/Release/libppGoogleNaClPluginChrome.so || die
-		;;
-	esac
-
-	newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser || die
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium || die
-
-	# Allow users to override command-line options, bug #357629.
-	dodir /etc/chromium || die
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default" || die
-
-	# Support LINGUAS, bug #332751.
-	local pak
-	for pak in out/Release/locales/*.pak; do
-		local pakbasename="$(basename ${pak})"
-		local pakname="${pakbasename%.pak}"
-		local langname="${pakname//-/_}"
-
-		# Do not issue warning for en_US locale. This is the fallback
-		# locale so it should always be installed.
-		if [[ "${langname}" == "en_US" ]]; then
-			continue
-		fi
-
-		local found=false
-		local lang
-		for lang in ${LANGS}; do
-			local crlang="$(chromium_lang ${lang})"
-			if [[ "${langname}" == "${crlang}" ]]; then
-				found=true
-				break
-			fi
-		done
-		if ! $found; then
-			ewarn "LINGUAS warning: no ${langname} in LANGS"
-		fi
-	done
-	local lang
-	for lang in ${LANGS}; do
-		local crlang="$(chromium_lang ${lang})"
-		local pakfile="out/Release/locales/${crlang//_/-}.pak"
-		if [ ! -f "${pakfile}" ]; then
-			ewarn "LINGUAS warning: no .pak file for ${lang} (${pakfile} not found)"
-		fi
-		if ! use linguas_${lang}; then
-			rm "${pakfile}" || die
-		fi
-	done
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/chrome.pak || die
-	doins out/Release/resources.pak || die
-
-	doins -r out/Release/locales || die
-	doins -r out/Release/resources || die
-
-	newman out/Release/chrome.1 chromium.1 || die
-	newman out/Release/chrome.1 chromium-browser.1 || die
-
-	# Chromium looks for these in its folder
-	# See media_posix.cc and base_paths_linux.cc
-	# TODO: uncomment when bug #371931 is fixed.
-	#dosym /usr/$(get_libdir)/libavcodec.so.52 "${CHROMIUM_HOME}" || die
-	#dosym /usr/$(get_libdir)/libavformat.so.52 "${CHROMIUM_HOME}" || die
-	#dosym /usr/$(get_libdir)/libavutil.so.50 "${CHROMIUM_HOME}" || die
-	doexe out/Release/ffmpegsumo_nolink || die
-	doexe out/Release/libffmpegsumo.so || die
-
-	# Install icons and desktop entry.
-	for SIZE in 16 22 24 32 48 64 128 256 ; do
-		insinto /usr/share/icons/hicolor/${SIZE}x${SIZE}/apps
-		newins chrome/app/theme/chromium/product_logo_${SIZE}.png \
-			chromium-browser.png || die
-	done
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	make_desktop_entry chromium-browser "Chromium" chromium-browser \
-		"Network;WebBrowser"
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop || die
-
-	# Install GNOME default application entry (bug #303100).
-	if use gnome; then
-		dodir /usr/share/gnome-control-center/default-apps || die
-		insinto /usr/share/gnome-control-center/default-apps
-		doins "${FILESDIR}"/chromium-browser.xml || die
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-
-	# For more info see bug #292201, bug #352263, bug #361859.
-	elog
-	elog "Depending on your desktop environment, you may need"
-	elog "to install additional packages to get icons on the Downloads page."
-	elog
-	elog "For KDE, the required package is kde-base/oxygen-icons."
-	elog
-	elog "For other desktop environments, try one of the following:"
-	elog " - x11-themes/gnome-icon-theme"
-	elog " - x11-themes/tango-icon-theme"
-
-	# For more info see bug #359153.
-	elog
-	elog "Some web pages may require additional fonts to display properly."
-	elog "Try installing some of the following packages if some characters"
-	elog "are not displayed properly:"
-	elog " - media-fonts/arphicfonts"
-	elog " - media-fonts/bitstream-cyberbit"
-	elog " - media-fonts/droid"
-	elog " - media-fonts/ipamonafont"
-	elog " - media-fonts/ja-ipafonts"
-	elog " - media-fonts/takao-fonts"
-	elog " - media-fonts/wqy-microhei"
-	elog " - media-fonts/wqy-zenhei"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/www-client/chromium/chromium-14.0.825.0-r1.ebuild b/www-client/chromium/chromium-14.0.825.0-r1.ebuild
deleted file mode 100644
index 0e11fbe..0000000
--- a/www-client/chromium/chromium-14.0.825.0-r1.ebuild
+++ /dev/null
@@ -1,426 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-14.0.825.0.ebuild,v 1.1 2011/07/19 16:42:46 phajdan.jr Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.6"
-
-inherit eutils fdo-mime flag-o-matic gnome2-utils linux-info multilib \
-	pax-utils portability python toolchain-funcs versionator virtualx
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="http://build.chromium.org/official/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cups gnome gnome-keyring kerberos xinerama"
-
-# en_US is ommitted on purpose from the list below. It must always be available.
-LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr
-hu id it ja kn ko lt lv ml mr nb nl pl pt_BR pt_PT ro ru sk sl sr sv sw ta te th
-tr uk vi zh_CN zh_TW"
-for lang in ${LANGS}; do
-	IUSE+=" linguas_${lang}"
-done
-
-RDEPEND="app-arch/bzip2
-	dev-libs/dbus-glib
-	>=dev-libs/icu-4.4.1
-	>=dev-libs/libevent-1.4.13
-	dev-libs/libxml2[icu]
-	dev-libs/libxslt
-	>=dev-libs/nss-3.12.3
-	gnome? ( >=gnome-base/gconf-2.24.0 )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 )
-	>=media-libs/alsa-lib-1.0.19
-	media-libs/flac
-	virtual/jpeg
-	media-libs/libpng
-	>=media-libs/libvpx-0.9.5
-	>=media-libs/libwebp-0.1.2
-	media-libs/speex
-	cups? ( >=net-print/cups-1.3.11 )
-	sys-libs/zlib
-	x11-libs/gtk+:2
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-lang/yasm
-	>=dev-util/gperf-3.0.3
-	>=dev-util/pkgconfig-0.23
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	>=sys-devel/make-3.81-r2
-	x11-libs/libXinerama
-	test? (
-		dev-python/pyftpdlib
-		dev-python/simplejson
-		virtual/krb5
-	)"
-RDEPEND+="
-	kerberos? ( virtual/krb5 )
-	xinerama? ( x11-libs/libXinerama )
-	x11-misc/xdg-utils
-	virtual/ttf-fonts"
-
-gyp_use() {
-	if [[ $# -lt 2 ]]; then
-		echo "!!! usage: gyp_use <USEFLAG> <GYPFLAG>" >&2
-		return 1
-	fi
-	if use "$1"; then echo "-D$2=1"; else echo "-D$2=0"; fi
-}
-
-egyp() {
-	set -- build/gyp_chromium --depth=. "${@}"
-	echo "${@}" >&2
-	"${@}"
-}
-
-# Chromium uses different names for some langs,
-# return Chromium name corresponding to a Gentoo lang.
-chromium_lang() {
-	if [[ "$1" == "es_LA" ]]; then
-		echo "es_419"
-	else
-		echo "$1"
-	fi
-}
-
-pkg_setup() {
-	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX RANLIB
-
-	# Make sure the build system will use the right python, bug #344367.
-	python_set_active_version 2
-	python_pkg_setup
-
-	# Prevent user problems like bug #348235.
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		ewarn "You have enabled debug info (probably have -g or -ggdb in your \$C{,XX}FLAGS)."
-		ewarn "You may experience really long compilation times and/or increased memory usage."
-		ewarn "If compilation fails, please try removing -g{,gdb} before reporting a bug."
-	fi
-	eshopts_pop
-
-	# Warn if the kernel doesn't support features useful for sandboxing,
-	# bug #363907.
-	CONFIG_CHECK="~PID_NS ~NET_NS"
-	check_extra_config
-}
-
-src_prepare() {
-	
-	# Make sure we don't use bundled libvpx headers.
-	epatch "${FILESDIR}/${PN}-system-vpx-r4.patch"
-
-	# Fix build without libgcrypt, bug #373079.
-	epatch "${FILESDIR}/${PN}-libgcrypt-r0.patch"
-
-	# Remove most bundled libraries. Some are still needed.
-	find third_party -type f \! -iname '*.gyp*' \
-		\! -path 'third_party/WebKit/*' \
-		\! -path 'third_party/angle/*' \
-		\! -path 'third_party/cacheinvalidation/*' \
-		\! -path 'third_party/cld/*' \
-		\! -path 'third_party/expat/*' \
-		\! -path 'third_party/ffmpeg/*' \
-		\! -path 'third_party/flac/flac.h' \
-		\! -path 'third_party/gpsd/*' \
-		\! -path 'third_party/harfbuzz/*' \
-		\! -path 'third_party/hunspell/*' \
-		\! -path 'third_party/iccjpeg/*' \
-		\! -path 'third_party/launchpad_translations/*' \
-		\! -path 'third_party/leveldb/*' \
-		\! -path 'third_party/libjingle/*' \
-		\! -path 'third_party/libphonenumber/*' \
-		\! -path 'third_party/libvpx/libvpx.h' \
-		\! -path 'third_party/mesa/*' \
-		\! -path 'third_party/modp_b64/*' \
-		\! -path 'third_party/npapi/*' \
-		\! -path 'third_party/openmax/*' \
-		\! -path 'third_party/ots/*' \
-		\! -path 'third_party/protobuf/*' \
-		\! -path 'third_party/skia/*' \
-		\! -path 'third_party/speex/speex.h' \
-		\! -path 'third_party/sqlite/*' \
-		\! -path 'third_party/tcmalloc/*' \
-		\! -path 'third_party/tlslite/*' \
-		\! -path 'third_party/undoview/*' \
-		\! -path 'third_party/webrtc/*' \
-		\! -path 'third_party/icu/*' \
-		\! -path 'third_party/zlib/contrib/minizip/*' \
-		-delete || die
-
-	# Make sure the build system will use the right python, bug #344367.
-	# Only convert directories that need it, to save time.
-	python_convert_shebangs -q -r 2 build tools
-}
-
-src_configure() {
-	local myconf=""
-
-	# Never tell the build system to "enable" SSE2, it has a few unexpected
-	# additions, bug #336871.
-	myconf+=" -Ddisable_sse2=1"
-
-	# Use system-provided libraries.
-	# TODO: use_system_ffmpeg (bug #71931). That makes yasm unneeded.
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-	myconf+="
-		-Duse_system_bzip2=1
-		-Duse_system_flac=1
-		-Duse_system_icu=0
-		-Duse_system_libevent=1
-		-Duse_system_libjpeg=1
-		-Duse_system_libpng=1
-		-Duse_system_libwebp=1
-		-Duse_system_libxml=1
-		-Duse_system_speex=1
-		-Duse_system_vpx=1
-		-Duse_system_xdg_utils=1
-		-Duse_system_yasm=1
-		-Duse_system_zlib=1"
-
-	# Optional dependencies.
-	myconf+="
-		$(gyp_use cups use_cups)
-		$(gyp_use gnome use_gconf)
-		$(gyp_use gnome-keyring use_gnome_keyring)
-		$(gyp_use gnome-keyring linux_link_gnome_keyring)"
-
-	# Enable sandbox.
-	myconf+="
-		-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
-		-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
-
-	if host-is-pax; then
-		# Prevent the build from failing (bug #301880). The performance
-		# difference is very small.
-		myconf+=" -Dv8_use_snapshot=0"
-	fi
-
-	# Our system ffmpeg should support more codecs than the bundled one
-	# for Chromium.
-	# TODO: uncomment when bug #371931 is fixed.
-	# myconf+=" -Dproprietary_codecs=1"
-
-	local myarch="$(tc-arch)"
-	if [[ $myarch = amd64 ]] ; then
-		myconf+=" -Dtarget_arch=x64"
-	elif [[ $myarch = x86 ]] ; then
-		myconf+=" -Dtarget_arch=ia32"
-	elif [[ $myarch = arm ]] ; then
-		# TODO: check this again after
-		# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed.
-		append-flags -fno-tree-sink
-
-		myconf+=" -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf+=" -Dwerror="
-
-	# Avoid a build error with -Os, bug #352457.
-	replace-flags "-Os" "-O2"
-
-	egyp ${myconf} || die
-}
-
-src_compile() {
-	emake chrome chrome_sandbox BUILDTYPE=Release V=1 || die
-	pax-mark m out/Release/chrome
-	if use test; then
-		emake {base,crypto,googleurl,net}_unittests BUILDTYPE=Release V=1 || die
-		pax-mark m out/Release/{base,crypto,googleurl,net}_unittests
-	fi
-}
-
-src_test() {
-	# For more info see bug #350349.
-	local mylocale='en_US.utf8'
-	if ! locale -a | grep -q "$mylocale"; then
-		eerror "${PN} requires ${mylocale} locale for tests"
-		eerror "Please read the following guides for more information:"
-		eerror "  http://www.gentoo.org/doc/en/guide-localization.xml"
-		eerror "  http://www.gentoo.org/doc/en/utf-8.xml"
-		die "locale ${mylocale} is not supported"
-	fi
-
-	# For more info see bug #370957.
-	if [[ $UID -eq 0 ]]; then
-		die "Tests must be run as non-root. Please use FEATURES=userpriv."
-	fi
-
-	# For more info see bug #350347.
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \
-		'--gtest_filter=-ICUStringConversionsTest.*'
-
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/crypto_unittests virtualmake
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/googleurl_unittests virtualmake
-
-	# NetUtilTest: bug #361885.
-	# UDP: unstable, active development. We should revisit this later.
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/net_unittests virtualmake \
-		'--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:*UDP*'
-}
-
-src_install() {
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-	doexe out/Release/chrome_sandbox || die
-	fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
-
-	# Install Native Client files on platforms that support it.
-	insinto "${CHROMIUM_HOME}"
-	case "$(tc-arch)" in
-		amd64)
-			doins native_client/irt_binaries/nacl_irt_x86_64.nexe || die
-			doins out/Release/libppGoogleNaClPluginChrome.so || die
-		;;
-		x86)
-			doins native_client/irt_binaries/nacl_irt_x86_32.nexe || die
-			doins out/Release/libppGoogleNaClPluginChrome.so || die
-		;;
-	esac
-
-	newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser || die
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium || die
-
-	# Allow users to override command-line options, bug #357629.
-	dodir /etc/chromium || die
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default" || die
-
-	# Support LINGUAS, bug #332751.
-	local pak
-	for pak in out/Release/locales/*.pak; do
-		local pakbasename="$(basename ${pak})"
-		local pakname="${pakbasename%.pak}"
-		local langname="${pakname//-/_}"
-
-		# Do not issue warning for en_US locale. This is the fallback
-		# locale so it should always be installed.
-		if [[ "${langname}" == "en_US" ]]; then
-			continue
-		fi
-
-		local found=false
-		local lang
-		for lang in ${LANGS}; do
-			local crlang="$(chromium_lang ${lang})"
-			if [[ "${langname}" == "${crlang}" ]]; then
-				found=true
-				break
-			fi
-		done
-		if ! $found; then
-			ewarn "LINGUAS warning: no ${langname} in LANGS"
-		fi
-	done
-	local lang
-	for lang in ${LANGS}; do
-		local crlang="$(chromium_lang ${lang})"
-		local pakfile="out/Release/locales/${crlang//_/-}.pak"
-		if [ ! -f "${pakfile}" ]; then
-			ewarn "LINGUAS warning: no .pak file for ${lang} (${pakfile} not found)"
-		fi
-		if ! use linguas_${lang}; then
-			rm "${pakfile}" || die
-		fi
-	done
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/chrome.pak || die
-	doins out/Release/resources.pak || die
-
-	doins -r out/Release/locales || die
-	doins -r out/Release/resources || die
-
-	newman out/Release/chrome.1 chromium.1 || die
-	newman out/Release/chrome.1 chromium-browser.1 || die
-
-	# Chromium looks for these in its folder
-	# See media_posix.cc and base_paths_linux.cc
-	# TODO: uncomment when bug #371931 is fixed.
-	#dosym /usr/$(get_libdir)/libavcodec.so.52 "${CHROMIUM_HOME}" || die
-	#dosym /usr/$(get_libdir)/libavformat.so.52 "${CHROMIUM_HOME}" || die
-	#dosym /usr/$(get_libdir)/libavutil.so.50 "${CHROMIUM_HOME}" || die
-	doexe out/Release/ffmpegsumo_nolink || die
-	doexe out/Release/libffmpegsumo.so || die
-
-	# Install icons and desktop entry.
-	for SIZE in 16 22 24 32 48 64 128 256 ; do
-		insinto /usr/share/icons/hicolor/${SIZE}x${SIZE}/apps
-		newins chrome/app/theme/chromium/product_logo_${SIZE}.png \
-			chromium-browser.png || die
-	done
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	make_desktop_entry chromium-browser "Chromium" chromium-browser \
-		"Network;WebBrowser"
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop || die
-
-	# Install GNOME default application entry (bug #303100).
-	if use gnome; then
-		dodir /usr/share/gnome-control-center/default-apps || die
-		insinto /usr/share/gnome-control-center/default-apps
-		doins "${FILESDIR}"/chromium-browser.xml || die
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-
-	# For more info see bug #292201, bug #352263, bug #361859.
-	elog
-	elog "Depending on your desktop environment, you may need"
-	elog "to install additional packages to get icons on the Downloads page."
-	elog
-	elog "For KDE, the required package is kde-base/oxygen-icons."
-	elog
-	elog "For other desktop environments, try one of the following:"
-	elog " - x11-themes/gnome-icon-theme"
-	elog " - x11-themes/tango-icon-theme"
-
-	# For more info see bug #359153.
-	elog
-	elog "Some web pages may require additional fonts to display properly."
-	elog "Try installing some of the following packages if some characters"
-	elog "are not displayed properly:"
-	elog " - media-fonts/arphicfonts"
-	elog " - media-fonts/bitstream-cyberbit"
-	elog " - media-fonts/droid"
-	elog " - media-fonts/ipamonafont"
-	elog " - media-fonts/ja-ipafonts"
-	elog " - media-fonts/takao-fonts"
-	elog " - media-fonts/wqy-microhei"
-	elog " - media-fonts/wqy-zenhei"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/www-client/chromium/files/chromium-browser.xml b/www-client/chromium/files/chromium-browser.xml
deleted file mode 100644
index 2c95a55..0000000
--- a/www-client/chromium/files/chromium-browser.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE default-apps SYSTEM "gnome-da-list.dtd">
-<default-apps>
-  <web-browsers>
-    <web-browser>
-      <name>Chromium</name>
-      <executable>chromium-browser</executable>
-      <command>chromium-browser %s</command>
-      <icon-name>chromium-browser</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </web-browser>
-  </web-browsers>
-</default-apps>
diff --git a/www-client/chromium/files/chromium-cups-r0.patch b/www-client/chromium/files/chromium-cups-r0.patch
deleted file mode 100644
index 5d0808c..0000000
--- a/www-client/chromium/files/chromium-cups-r0.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- chrome/browser/ui/webui/print_preview_handler.cc.orig	2011-04-23 09:05:25.000000000 +0200
-+++ chrome/browser/ui/webui/print_preview_handler.cc	2011-04-23 09:13:07.000000000 +0200
-@@ -28,7 +28,7 @@
- #include "printing/metafile_impl.h"
- #include "printing/print_job_constants.h"
- 
--#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
-+#if defined(CP_PRINT_SYSTEM_AVAILABLE)
- #include <cups/cups.h>
- 
- #include "base/file_util.h"
-@@ -42,7 +42,7 @@
- const char kDisableColorOption[] = "disableColorOption";
- const char kSetColorAsDefault[] = "setColorAsDefault";
- 
--#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
-+#if defined(CP_PRINT_SYSTEM_AVAILABLE)
- const char kColorDevice[] = "ColorDevice";
- #endif
- 
-@@ -131,7 +131,7 @@
-       return;
-     }
- 
--  #if defined(OS_POSIX) && !defined(OS_CHROMEOS)
-+#if defined(CP_PRINT_SYSTEM_AVAILABLE)
-     FilePath ppd_file_path;
-     if (!file_util::CreateTemporaryFile(&ppd_file_path))
-       return;
-@@ -153,9 +153,9 @@
-       ppdClose(ppd);
-     }
-     file_util::Delete(ppd_file_path, false);
--  #elif defined(OS_WIN) || defined(OS_CHROMEOS)
-+#else
-     NOTIMPLEMENTED();
--  #endif
-+#endif
- 
-     DictionaryValue settings_info;
-     settings_info.SetBoolean(kDisableColorOption, !supports_color);
diff --git a/www-client/chromium/files/chromium-ffmpeg-build-r0.patch b/www-client/chromium/files/chromium-ffmpeg-build-r0.patch
deleted file mode 100644
index b46017d..0000000
--- a/www-client/chromium/files/chromium-ffmpeg-build-r0.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: media/ffmpeg/ffmpeg_common.h
-diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h
-index ac1774a5b1dc7a80aee96e7e35fa2f5366e8f589..46dbe07bf5dad14e897b21b7f479776127ff7ef7 100644
---- a/media/ffmpeg/ffmpeg_common.h
-+++ b/media/ffmpeg/ffmpeg_common.h
-@@ -19,11 +19,15 @@ extern "C" {
- // TODO(scherkus): fix and upstream the compiler warnings.
- MSVC_PUSH_DISABLE_WARNING(4244);
- #include <libavcodec/avcodec.h>
--#include <libavcore/samplefmt.h>
- #include <libavformat/avformat.h>
- #include <libavformat/avio.h>
- #include <libavutil/avutil.h>
- #include <libavutil/log.h>
-+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(50, 38, 0)
-+#include <libavutil/samplefmt.h>
-+#else
-+#include <libavcore/samplefmt.h>
-+#endif
- MSVC_POP_WARNING();
- }  // extern "C"
- 
diff --git a/www-client/chromium/files/chromium-glibc-2.14-r0.patch b/www-client/chromium/files/chromium-glibc-2.14-r0.patch
deleted file mode 100644
index be7fdcd..0000000
--- a/www-client/chromium/files/chromium-glibc-2.14-r0.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- third_party/tcmalloc/chromium/src/tcmalloc.cc.orig	2011-06-23 13:45:05.000000000 +0200
-+++ third_party/tcmalloc/chromium/src/tcmalloc.cc	2011-06-23 13:47:51.000000000 +0200
-@@ -135,6 +135,10 @@
- # define WIN32_DO_PATCHING 1
- #endif
- 
-+#if !defined(__MALLOC_HOOK_VOLATILE)
-+#define __MALLOC_HOOK_VOLATILE
-+#endif
-+
- using std::max;
- using tcmalloc::PageHeap;
- using tcmalloc::SizeMap;
-@@ -375,7 +379,7 @@
-   return tc_malloc(size);
- }
- 
--void* (*__malloc_hook)(
-+void* (*__MALLOC_HOOK_VOLATILE __malloc_hook)(
-     size_t size, const void* caller) = tc_ptmalloc_malloc_hook;
- 
- static void* tc_ptmalloc_realloc_hook(
-@@ -383,14 +387,14 @@
-   return tc_realloc(ptr, size);
- }
- 
--void* (*__realloc_hook)(
-+void* (*__MALLOC_HOOK_VOLATILE __realloc_hook)(
-     void* ptr, size_t size, const void* caller) = tc_ptmalloc_realloc_hook;
- 
- static void tc_ptmalloc_free_hook(void* ptr, const void* caller) {
-   tc_free(ptr);
- }
- 
--void (*__free_hook)(void* ptr, const void* caller) = tc_ptmalloc_free_hook;
-+void (*__MALLOC_HOOK_VOLATILE __free_hook)(void* ptr, const void* caller) = tc_ptmalloc_free_hook;
- 
- #endif
- 
-@@ -1584,7 +1588,7 @@
-   MallocHook::InvokeNewHook(result, size);
-   return result;
- }
--void *(*__memalign_hook)(size_t, size_t, const void *) = MemalignOverride;
-+void *(*__MALLOC_HOOK_VOLATILE __memalign_hook)(size_t, size_t, const void *) = MemalignOverride;
- #endif  // #ifndef TCMALLOC_FOR_DEBUGALLOCATION
- 
- // ---Double free() debugging implementation -----------------------------------
diff --git a/www-client/chromium/files/chromium-launcher-r1.sh b/www-client/chromium/files/chromium-launcher-r1.sh
deleted file mode 100644
index 761e561..0000000
--- a/www-client/chromium/files/chromium-launcher-r1.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2009 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# Let the wrapped binary know that it has been run through the wrapper
-export CHROME_WRAPPER="`readlink -f "$0"`"
-
-PROGDIR="`dirname "$CHROME_WRAPPER"`"
-
-case ":$PATH:" in
-  *:$PROGDIR:*)
-    # $PATH already contains $PROGDIR
-    ;;
-  *)
-    # Append $PROGDIR to $PATH
-    export PATH="$PATH:$PROGDIR"
-    ;;
-esac
-
-# Set the .desktop file name
-export CHROME_DESKTOP="chromium-browser-chromium.desktop"
-
-exec -a "chromium-browser" "$PROGDIR/chrome" --extra-plugin-dir=/usr/lib/nsbrowser/plugins "$@"
diff --git a/www-client/chromium/files/chromium-launcher-r2.sh b/www-client/chromium/files/chromium-launcher-r2.sh
deleted file mode 100644
index e20bcea..0000000
--- a/www-client/chromium/files/chromium-launcher-r2.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-# Allow the user to override command-line flags, bug #357629.
-# This is based on Debian's chromium-browser package, and is intended
-# to be consistent with Debian.
-if [ -f /etc/chromium/default ] ; then
-	. /etc/chromium/default
-fi
-
-# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system
-# default CHROMIUM_FLAGS (from /etc/chromium/default).
-CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-"$CHROMIUM_FLAGS"}
-
-# Let the wrapped binary know that it has been run through the wrapper
-export CHROME_WRAPPER="`readlink -f "$0"`"
-
-PROGDIR="`dirname "$CHROME_WRAPPER"`"
-
-case ":$PATH:" in
-  *:$PROGDIR:*)
-    # $PATH already contains $PROGDIR
-    ;;
-  *)
-    # Append $PROGDIR to $PATH
-    export PATH="$PATH:$PROGDIR"
-    ;;
-esac
-
-# Set the .desktop file name
-export CHROME_DESKTOP="chromium-browser-chromium.desktop"
-
-exec -a "chromium-browser" "$PROGDIR/chrome" --extra-plugin-dir=/usr/lib/nsbrowser/plugins ${CHROMIUM_FLAGS} "$@"
diff --git a/www-client/chromium/files/chromium-libgcrypt-r0.patch b/www-client/chromium/files/chromium-libgcrypt-r0.patch
deleted file mode 100644
index d75a06a..0000000
--- a/www-client/chromium/files/chromium-libgcrypt-r0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/linux/system.gyp.orig	2011-06-28 07:58:51.000000000 +0000
-+++ build/linux/system.gyp	2011-06-28 08:00:05.000000000 +0000
-@@ -314,7 +314,7 @@
-       'target_name': 'libgcrypt',
-       'type': 'settings',
-       'conditions': [
--        ['_toolset=="target"', {
-+        ['_toolset=="target" and use_cups==1', {
-           'direct_dependent_settings': {
-             'cflags': [
-               '<!@(libgcrypt-config --cflags)',
diff --git a/www-client/chromium/files/chromium-linux-3.0-r0.patch b/www-client/chromium/files/chromium-linux-3.0-r0.patch
deleted file mode 100644
index 757d5a9..0000000
--- a/www-client/chromium/files/chromium-linux-3.0-r0.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 7ee4806f0ca260a411b682b49ccadd3c1c77c3ae Mon Sep 17 00:00:00 2001
-From: Lukas Elsner <lukas.elsner@freifalt.com>
-Date: Sun, 17 Jul 2011 10:40:54 +0200
-Subject: [PATCH] fixed linux-3.0 bug
-
----
- tools/gyp/pylib/gyp/__init__.py |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/tools/gyp/pylib/gyp/__init__.py b/tools/gyp/pylib/gyp/__init__.py
-index adbc565..7829ac1 100644
---- a/tools/gyp/pylib/gyp/__init__.py
-+++ b/tools/gyp/pylib/gyp/__init__.py
-@@ -319,6 +319,7 @@ def main(args):
-                            'freebsd7': 'make',
-                            'freebsd8': 'make',
-                            'linux2':   'make',
-+                           'linux3':   'make',
-                            'openbsd4': 'make',
-                            'sunos5':   'make',}[sys.platform] ]
- 
--- 
-1.7.6
-
diff --git a/www-client/chromium/files/chromium-perl-5.14-r0.patch b/www-client/chromium/files/chromium-perl-5.14-r0.patch
deleted file mode 100644
index 40d6ea3..0000000
--- a/www-client/chromium/files/chromium-perl-5.14-r0.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: third_party/WebKit/Source/WebCore/make-hash-tools.pl
-===================================================================
---- third_party/WebKit/Source/WebCore/make-hash-tools.pl	(revision 72664)
-+++ third_party/WebKit/Source/WebCore/make-hash-tools.pl	(revision 89265)
-@@ -21,5 +21,4 @@
- 
- use strict;
--use Switch;
- use File::Basename;
- 
-@@ -29,7 +28,5 @@
- 
- 
--switch ($option) {
--
--case "DocTypeStrings" {
-+if ($option eq "DocTypeStrings") {
- 
-     my $docTypeStringsGenerated    = "$outdir/DocTypeStrings.cpp";
-@@ -39,7 +36,5 @@
-     system("gperf --key-positions=\"*\" -s 2 $docTypeStringsGperf > $docTypeStringsGenerated") == 0 || die "calling gperf failed: $?";
- 
--} # case "DocTypeStrings"
--
--case "ColorData" {
-+} elsif ($option eq "ColorData") {
- 
-     my $colorDataGenerated         = "$outdir/ColorData.cpp";
-@@ -49,5 +44,5 @@
-     system("gperf --key-positions=\"*\" -D -s 2 $colorDataGperf > $colorDataGenerated") == 0 || die "calling gperf failed: $?";
- 
--} # case "ColorData"
--
--} # switch ($option)
-+} else {
-+    die "Unknown option.";
-+}
diff --git a/www-client/chromium/files/chromium-system-vpx-r3.patch b/www-client/chromium/files/chromium-system-vpx-r3.patch
deleted file mode 100644
index de15909..0000000
--- a/www-client/chromium/files/chromium-system-vpx-r3.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- remoting/remoting.gyp.orig	2011-03-10 14:43:29.000000000 +0000
-+++ remoting/remoting.gyp	2011-03-10 14:44:50.000000000 +0000
-@@ -127,6 +127,7 @@
-         '../ui/gfx/gfx.gyp:gfx',
-         '../media/media.gyp:media',
-         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
-+        '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
-         '../third_party/libvpx/libvpx.gyp:libvpx_include',
-         '../third_party/zlib/zlib.gyp:zlib',
-         'chromoting_jingle_glue',
---- third_party/ffmpeg/ffmpeg.gyp.orig	2011-03-10 15:39:13.000000000 +0000
-+++ third_party/ffmpeg/ffmpeg.gyp	2011-03-10 15:39:41.000000000 +0000
-@@ -728,11 +728,14 @@
-                 '../libvpx/include',
-               ],
-             }, { # use_system_vpx != 0
-+              'defines': [
-+                'USE_SYSTEM_VPX',
-+              ],
-               'direct_dependent_settings': {
-+                'defines': [
-+                  'USE_SYSTEM_VPX',
-+                ],
-                 'link_settings': {
--                  'defines': [
--                    'USE_SYSTEM_VPX',
--                  ],
-                   'libraries': [
-                     '-lvpx',
-                   ],
diff --git a/www-client/chromium/files/chromium-system-vpx-r4.patch b/www-client/chromium/files/chromium-system-vpx-r4.patch
deleted file mode 100644
index 3550065..0000000
--- a/www-client/chromium/files/chromium-system-vpx-r4.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- remoting/remoting.gyp.orig	2011-03-10 14:43:29.000000000 +0000
-+++ remoting/remoting.gyp	2011-03-10 14:44:50.000000000 +0000
-@@ -127,6 +127,7 @@
-         '../ui/gfx/gfx.gyp:gfx',
-         '../media/media.gyp:media',
-         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
-+        '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
-         '../third_party/libvpx/libvpx.gyp:libvpx_include',
-         '../third_party/zlib/zlib.gyp:zlib',
-         'chromoting_jingle_glue',
diff --git a/www-client/chromium/files/chromium-system-zlib-r0.patch b/www-client/chromium/files/chromium-system-zlib-r0.patch
deleted file mode 100644
index 894525d..0000000
--- a/www-client/chromium/files/chromium-system-zlib-r0.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- content/browser/renderer_host/clipboard_message_filter.cc.orig	2011-04-21 12:29:49.000000000 +0200
-+++ content/browser/renderer_host/clipboard_message_filter.cc	2011-04-21 12:31:14.000000000 +0200
-@@ -4,6 +4,12 @@
- 
- #include "content/browser/renderer_host/clipboard_message_filter.h"
- 
-+#if defined(USE_SYSTEM_ZLIB)
-+#include <zlib.h>
-+#else
-+#include "third_party/zlib/zlib.h"
-+#endif
-+
- #include "base/stl_util-inl.h"
- #include "chrome/browser/browser_process.h"
- #include "chrome/browser/clipboard_dispatcher.h"
-@@ -11,7 +17,6 @@
- #include "googleurl/src/gurl.h"
- #include "ipc/ipc_message_macros.h"
- #include "third_party/skia/include/core/SkBitmap.h"
--#include "third_party/zlib/zlib.h"
- #include "ui/gfx/codec/png_codec.h"
- #include "ui/gfx/size.h"
- 
---- content/content_browser.gypi.orig	2011-04-21 12:32:18.000000000 +0200
-+++ content/content_browser.gypi	2011-04-21 12:32:56.000000000 +0200
-@@ -13,7 +13,8 @@
-         '../ppapi/ppapi.gyp:ppapi_proxy',
-         '../skia/skia.gyp:skia',
-         '../third_party/flac/flac.gyp:libflac',
--        '../third_party/speex/speex.gyp:libspeex',
-+        '../third_party/speex/speex.gyp:libspeex',	
-+        '../third_party/zlib/zlib.gyp:zlib',
-         '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
-         '../ui/ui.gyp:ui_base',
-       ],
diff --git a/www-client/chromium/files/chromium.default b/www-client/chromium/files/chromium.default
deleted file mode 100644
index 45f1f38..0000000
--- a/www-client/chromium/files/chromium.default
+++ /dev/null
@@ -1,5 +0,0 @@
-# Default settings for chromium. This file is sourced by /bin/bash from
-# the chromium launcher.
-
-# Options to pass to chromium.
-CHROMIUM_FLAGS=""
diff --git a/www-client/chromium/files/chromium.xml b/www-client/chromium/files/chromium.xml
deleted file mode 100644
index 2c95a55..0000000
--- a/www-client/chromium/files/chromium.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE default-apps SYSTEM "gnome-da-list.dtd">
-<default-apps>
-  <web-browsers>
-    <web-browser>
-      <name>Chromium</name>
-      <executable>chromium-browser</executable>
-      <command>chromium-browser %s</command>
-      <icon-name>chromium-browser</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </web-browser>
-  </web-browsers>
-</default-apps>
diff --git a/www-client/chromium/files/dot-gclient b/www-client/chromium/files/dot-gclient
deleted file mode 100644
index f3e0fce..0000000
--- a/www-client/chromium/files/dot-gclient
+++ /dev/null
@@ -1,9 +0,0 @@
-solutions = [
-  { "name"        : "src",
-    "url"         : "http://src.chromium.org/svn/trunk/src",
-    "custom_deps" : {
-        "src/third_party/WebKit/LayoutTests": None,
-    },
-    "safesync_url": "http://chromium-status.appspot.com/lkgr",
-  },
-]
diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml
deleted file mode 100644
index 47002a4..0000000
--- a/www-client/chromium/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>chromium</herd>
-	<longdescription>Chromium is the open-source web browser project behind Google Chrome</longdescription>
-</pkgmetadata>
diff --git a/www-plugins/google-talkplugin/Manifest b/www-plugins/google-talkplugin/Manifest
deleted file mode 100644
index 42cb315..0000000
--- a/www-plugins/google-talkplugin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST google-talkplugin_current_amd64.deb 7725788 RMD160 0a4a9489c3b67d5b0d108efb1d9da0e33525a40a SHA1 ffe93e503690b3c11e5749c961388567823cab88 SHA256 42a70d6cff75b0730e9cafa6a412b593329c2cd8dd9fcf161f807e6b99f08cb7
-DIST google-talkplugin_current_i386.deb 6710628 RMD160 93ad1b6f150b64f04e814b4026326837371116b1 SHA1 8755d35cee0995c4fe11df75f1c5bd3029799624 SHA256 807de17e32c306e67a5186f1d809022dd8141f654d4d5de335559537077d83f4
-EBUILD google-talkplugin-9999.ebuild 3354 RMD160 3213f25211c771bf640e77575f94504a71a18329 SHA1 7dc7c8986bf51e02dae02da7a408edccbcbdcfba SHA256 6034eaf8a8cf8452e8051dfda735844471f294f2e1f9a132e18383f0e6f3a7a7
diff --git a/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild b/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild
deleted file mode 100644
index 5f93962..0000000
--- a/www-plugins/google-talkplugin/google-talkplugin-9999.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-2.1.6.0.ebuild,v 1.1 2011/06/14 19:43:20 ottxor Exp $
-
-EAPI=3
-
-inherit nsplugins
-
-if [ "${PV}" != "9999" ]; then
-	DEB_PATCH="1"
-	#http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-i386/Packages
-	MY_URL="http://dl.google.com/linux/talkplugin/deb/poo/main/${P:0:1}/${PN}"
-	MY_PKG="${PN}_${PV}-${DEB_PATCH}_i386.deb"
-else
-	MY_URL="http://dl.google.com/linux/direct"
-	MY_PKG="${PN}_current_i386.deb"
-fi
-
-DESCRIPTION="Video chat browser plug-in for Google Talk"
-SRC_URI="x86? ( ${MY_URL}/${MY_PKG} )
-	amd64? ( ${MY_URL}/${MY_PKG/i386/amd64} )"
-
-HOMEPAGE="http://www.google.com/chat/video"
-IUSE="libnotify +system-libCg"
-SLOT="0"
-
-KEYWORDS="-* ~amd64 ~x86"
-#GoogleTalkPlugin binary contains openssl
-LICENSE="google-talkplugin openssl"
-RESTRICT="strip mirror"
-
-#to get these run:
-#for i in $(scanelf -n /opt/google/talkplugin/* | awk '/^ET/{gsub(/,/,"\n",$2);print $2}' | sort -u)
-#do
-#  find /lib /usr/lib -maxdepth 1 -name $i -exec qfile -S {} \;
-#done |  awk '{print $1}' | sort -u
-#also see debian control file
-NATIVE_DEPS="|| ( media-sound/pulseaudio media-libs/alsa-lib )
-	dev-libs/glib:2
-	system-libCg? ( media-gfx/nvidia-cg-toolkit )
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/libpng:1.2
-	>=sys-libs/glibc-2.4
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	sys-apps/lsb-release
-	virtual/opengl
-	libnotify? ( x11-libs/libnotify )"
-
-DEPEND=""
-
-EMUL_DEPS=">=app-emulation/emul-linux-x86-baselibs-20100220
-	app-emulation/emul-linux-x86-gtklibs
-	app-emulation/emul-linux-x86-soundlibs
-	app-emulation/emul-linux-x86-xlibs"
-
-#amd64 always needs EMUL_DEPS GoogleTalkPlugin is always a 32-bit binary
-RDEPEND="x86? ( ${NATIVE_DEPS} )
-	amd64? ( ${NATIVE_DEPS} ${EMUL_DEPS} )"
-
-INSTALL_BASE="/opt/google/talkplugin"
-
-[ "${ARCH}" = "amd64" ] && SO_SUFFIX="64" || SO_SUFFIX=""
-
-QA_EXECSTACK="${INSTALL_BASE#/}/GoogleTalkPlugin"
-
-QA_TEXTRELS="${INSTALL_BASE#/}/libnpgtpo3dautoplugin.so
-	${INSTALL_BASE#/}/libnpgoogletalk${SO_SUFFIX}.so"
-
-QA_DT_HASH="${INSTALL_BASE#/}/libnpgtpo3dautoplugin.so
-	${INSTALL_BASE#/}/libnpgoogletalk${SO_SUFFIX}.so
-	${INSTALL_BASE#/}/GoogleTalkPlugin"
-
-# nofetch means upstream bumped and thus needs version bump
-pkg_nofetch() {
-	einfo "This version is no longer available from Google."
-	einfo "Note that Gentoo cannot mirror the distfiles due to license reasons, so we have to follow the bump."
-	einfo "Please file a version bump bug on http://bugs.gentoo.org (search	existing bugs for ${PN} first!)."
-}
-
-src_unpack() {
-	unpack ${A} ./data.tar.gz ./usr/share/doc/google-talkplugin/changelog.Debian.gz || die
-}
-
-src_install() {
-	dodoc ./usr/share/doc/google-talkplugin/changelog.Debian
-
-	cd "./${INSTALL_BASE#/}" || die
-	exeinto "${INSTALL_BASE}" || die
-	doexe GoogleTalkPlugin libnpgtpo3dautoplugin.so	libnpgoogletalk"${SO_SUFFIX}".so || die
-	inst_plugin "${INSTALL_BASE}"/libnpgtpo3dautoplugin.so || die
-	inst_plugin "${INSTALL_BASE}"/libnpgoogletalk"${SO_SUFFIX}".so || die
-
-	#install bundled libCg
-	if ! use system-libCg; then
-		cd lib || die
-		exeinto "${INSTALL_BASE}/lib" || die
-		doexe *.so || die
-	fi
-}
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
deleted file mode 100644
index e5ddc7a..0000000
--- a/x11-drivers/ati-drivers/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX amd-drivers-3.2.7.1.patch 560 SHA256 7cc315754a47fbda6bf36bcee01780da7c19535c4f6ec1cccc556e9a7b32d263 SHA512 bcdc89e7a7148f5eb5450364298de6fb95dcad0d3c8d7091e9236d4f4b9cff0be24d59e8ed4ccdde0c8e94985ab8b4e7d5848e1e0e7102c699edb9230dbe57ce WHIRLPOOL 85ef893cd8bffa0d41b99eccd8b6e1ed713f69cc683dee52268ea0d6bc6fd4a77b3fdab31dd1e35ec3bbd21b399725286289c9fb3a276eff3922c1f8cf0746a2
-AUX ati-drivers-12.2-redefine-WARN.patch 1316 SHA256 f7d8ad3307823925cf8b4c6540db17a51553e48dd008793fc026803bb2aa1ced SHA512 1ee5f7fb5dc629f186754dc83a7d718a6a8acda836dadb2b87bd616c424db0aba067fb833d966cf79425ad78d94ab3f7c4014bbe2356f394630b0761625e74ab WHIRLPOOL 75987965689042342a923d4542a3f1b5eb4ba8ce3fc1ede82be8aeffaa2154a0dc75c507a4772bc00ef510eee7f4b47a51a2ea43aadce6e742e842e348c15b40
-AUX ati-drivers-do_mmap.patch 1405 SHA256 3fc9bae50d25d3bfe76a3a1e89c8d025674a4cb9afd16d3a5d8b3c25a66f536d SHA512 1a2f8fe7f2506037d6d158e5c2efffa39c503566284d8f516cb2d84db546eced24df5dcb8d74ac84911589efb4547d7f8610d78ad29703f9ed0a9890576c51b7 WHIRLPOOL 86daa957d7569b26fdf92929e5b04a32379af067a208628eab1a4541fdebfb51fa4bfedeec63f4685c6258adcba2ddc4223b69dca329ecbebd4ba13167f66f82
-AUX ati-drivers-old_rsp.patch 989 SHA256 dd222de89b515046c6cbfef172a3ec8d4bc48664799b3bbfff648091c6d54b49 SHA512 b86a230f126950d309b899ab3445154cf38cb8127b7686d0a467df6d3561a1785747e9522c00b55a294961c1157fe41833a5a85d4737775ae68bdb4099b0ee37 WHIRLPOOL cd06422ee90587c5c7485074b03ccaaef921134c721c0d0f6f678a9c968aae6417523c77d6dfcccc856cb5d125579197cd3c6a5b1c8557ce621784eabd0c43fa
-AUX ati-powermode-opt-path-2.patch 1634 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1 SHA512 7fc91789157d6211726d26be066e3984871eb579c77c422bde27f489f72215e66dbfb5d477ea6882d46ed6d0c63b9f01fdd5ee196fd6a2809bfc3ca22badc859 WHIRLPOOL a3d6f9335c748192a65bb3493a1dd2f604ef6b1270760908bb541d10ac9c4eb8009d7d5fb145b37c6fbfc1512a70ecda3c79f6f56396f8424f072fb92059e0a2
-AUX atieventsd.init 533 SHA256 20010ebc5cb286149f3c4c9c099b6470463ccdb8fd47cea054b783dc2ad1fff3 SHA512 9f8990bb5619f99524e0759a1c4b41b0b2c081c6eecb3916ab60df8e6b59d99e3615af61e0ba5b71d003ccaaf41e2143237b26f36f64f00a47e0fe94f83473dd WHIRLPOOL 21979818a19bc27e3527958c66bf45654df4a307862897530bc02be6616f45ee210590a9d1bcab84336c6061482034010efbb251770bfaf023f20ffae8212ecd
-AUX switchlibGL 1349 SHA256 a4aa2107fdb903da77fea432bc809a1155e213db460fdec72fd1c3c7cc0d13a0 SHA512 51d2912aa6ec2002b096c0483be69650d682feec54486ed5226b91988bc1516f718c71d9f58a2b28e0dbc512c0300ea271f9a97885776dd045fe324f1549b85d WHIRLPOOL d335ea9c57a28f8450423089bbf798da77cc72fff6bad1221989412808abcd6bcb7afa41aa2b04231feff3dac6eaaff58a7595173e53b6cf0f5d3d591997b43d
-DIST amd-driver-installer-12-6-x86.x86_64.run 106660241 SHA256 b5c6070dc75e9296d0f04e7e0b3c6697f6c21872d50b1dcf4d7b3b0ab7ce7155 SHA512 920b4613844afeffe1493f6c1811722734bb878817945077a46d3922be2e9bad85eb3c02bfeec57b55371cfd81d87332b9c7845dd9a079744e491979ef02f4d7 WHIRLPOOL a7b722ed9fed881498e91c5bb706b973eade890f9dfd49862c46cc2822417cf1b80011db79d4a449331c9b191e6e7ff98aa8f3fcb6bc90ebda3125f46f6d2800
-EBUILD ati-drivers-12.6-r1.ebuild 20167 SHA256 72f726c516ed0677441b0b3c164cbda8213475d860b440d24493defe5c5d0f28 SHA512 f97617f9facf452a731e3df2960721ccafa1e6a5279f8e8f0e36a23963caf6370b65cc99a9e7795ad3167ec047aa6058864f07054542e3516fa9d93559fcd646 WHIRLPOOL 9e433c3ff39f3061f21e0375e25fb8a27dc6e8bf89474c3f6b74e67da6d04cc33e1cd333e8ef069006eac37db539945f622663f69ffa850d747aac3cede6047e
diff --git a/x11-drivers/ati-drivers/ati-drivers-12.6-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-12.6-r1.ebuild
deleted file mode 100644
index e368032..0000000
--- a/x11-drivers/ati-drivers/ati-drivers-12.6-r1.ebuild
+++ /dev/null
@@ -1,627 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-12.6.ebuild,v 1.1 2012/06/30 09:17:19 scarabeus Exp $
-
-EAPI=4
-
-inherit eutils multilib linux-info linux-mod toolchain-funcs versionator
-
-DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets"
-HOMEPAGE="http://www.amd.com"
-MY_V=( $(get_version_components) )
-if [[ ${MY_V[2]} != beta ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/amd-driver-installer-${PV/./-}-x86.x86_64.run"
-	FOLDER_PREFIX="common/"
-else
-	#SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	SRC_URI="http://www2.ati.com/drivers/hotfix/catalyst_12.6_hotfixes/amd-driver-installer-8.98-x86.x86_64.zip"
-	FOLDER_PREFIX="common/"
-fi
-IUSE="debug +modules multilib pax_kernel qt4 static-libs"
-
-LICENSE="AMD GPL-2 QPL-1.0 as-is"
-KEYWORDS="amd64 x86"
-SLOT="1"
-
-RESTRICT="bindist"
-
-RDEPEND="
-	<=x11-base/xorg-server-1.12.49[-minimal]
-	>=app-admin/eselect-opengl-1.0.7
-	app-admin/eselect-opencl
-	sys-power/acpid
-	x11-apps/xauth
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	multilib? (
-			app-emulation/emul-linux-x86-opengl
-			app-emulation/emul-linux-x86-xlibs
-	)
-	qt4? (
-			x11-libs/libICE
-			x11-libs/libSM
-			x11-libs/libXcursor
-			x11-libs/libXfixes
-			x11-libs/libXxf86vm
-			x11-libs/qt-core
-			x11-libs/qt-gui
-	)
-"
-
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xineramaproto
-	x11-libs/libXtst
-	sys-apps/findutils
-	app-misc/pax-utils
-"
-
-EMULTILIB_PKG="true"
-
-S="${WORKDIR}"
-
-# QA Silencing
-QA_TEXTRELS="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/libatiadlxx.so
-	usr/lib*/xorg/modules/glesx.so
-	usr/lib*/libaticaldd.so
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_EXECSTACK="
-	opt/bin/atiode
-	opt/bin/amdcccle
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_WX_LOAD="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_PRESTRIPPED="
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-"
-
-QA_SONAME="
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
-"
-
-QA_DT_HASH="
-	opt/bin/amdcccle
-	opt/bin/aticonfig
-	opt/bin/atiodcli
-	opt/bin/atiode
-	opt/bin/clinfo
-	opt/bin/fglrxinfo
-	opt/sbin/atieventsd
-	opt/sbin/amdnotifyui
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libatiuki.so.1.0
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so
-	usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\)\?.so
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1
-"
-
-_check_kernel_config() {
-	local failed=0
-	local error=""
-	if ! kernel_is ge 2 6; then
-		eerror "You need a 2.6 linux kernel to compile against!"
-		die "No 2.6 Kernel found"
-	fi
-
-	if ! linux_chkconfig_present MTRR; then
-		ewarn "You don't have MTRR support enabled in the kernel."
-		ewarn "Direct rendering will not work."
-	fi
-
-	if linux_chkconfig_builtin DRM; then
-		ewarn "You have DRM support built in to the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! linux_chkconfig_present AGP && \
-		! linux_chkconfig_present PCIEPORTBUS; then
-		ewarn "You don't have AGP and/or PCIe support enabled in the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	if ! linux_chkconfig_present ACPI; then
-		eerror "${P} requires the ACPI support in the kernel"
-		eerror "Please enable it:"
-		eerror "    CONFIG_ACPI=y"
-		eerror "in /usr/src/linux/.config or"
-		eerror "    Power management and ACPI options --->"
-		eerror "        [*] Power Management support"
-		eerror "in the 'menuconfig'"
-		error+=" CONFIG_ACPI disabled;"
-		failed=1
-	fi
-
-	if ! linux_chkconfig_present PCI_MSI; then
-		eerror "${P} requires MSI in the kernel."
-		eerror "Please enable it:"
-		eerror "    CONFIG_PCI_MSI=y"
-		eerror "in /usr/src/linux/.config or"
-		eerror "    Bus options (PCI etc.)  --->"
-		eerror "        [*] Message Signaled Interrupts (MSI and MSI-X)"
-		eerror "in the kernel config."
-		error+=" CONFIG_PCI_MSI disabled;"
-		failed=1
-	fi
-
-	if linux_chkconfig_present LOCKDEP; then
-		eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel."
-		eerror "Unfortunately, this option exports the symbol lock_acquire as GPL-only."
-		eerror "This prevents ${P} from compiling with an error like this:"
-		eerror "FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
-		eerror "Please make sure the following options have been unset:"
-		eerror "    Kernel hacking  --->"
-		eerror "        [ ] Lock debugging: detect incorrect freeing of live locks"
-		eerror "        [ ] Lock debugging: prove locking correctness"
-		eerror "        [ ] Lock usage statistics"
-		eerror "in 'menuconfig'"
-		error+=" LOCKDEP enabled;"
-		failed=1
-	fi
-
-	use amd64 && if ! linux_chkconfig_present COMPAT; then
-		eerror "${P} requires COMPAT."
-		eerror "Please enable the 32 bit emulation:"
-		eerror "Executable file formats / Emulations  --->"
-		eerror "    [*] IA32 Emulation"
-		eerror "in the kernel config."
-		eerror "if this doesn't enable CONFIG_COMPAT add"
-		eerror "    CONFIG_COMPAT=y"
-		eerror "in /usr/src/linux/.config"
-		error+=" COMPAT disabled;"
-		failed=1
-	fi
-
-	kernel_is ge 2 6 37 && kernel_is le 2 6 38 && if ! linux_chkconfig_present BKL ; then
-		eerror "${P} requires BKL."
-		eerror "Please enable the Big Kernel Lock:"
-		eerror "Kernel hacking  --->"
-		eerror "    [*] Big Kernel Lock"
-		eerror "in the kernel config."
-		eerror "or add"
-		eerror "    CONFIG_BKL=y"
-		eerror "in /usr/src/linux/.config"
-		error+=" BKL disabled;"
-		failed=1
-	fi
-
-	if linux_chkconfig_present X86_X32; then
-		eerror "You've enabled x32 in the kernel."
-		eerror "Unfortunately, this option is not supported yet and prevents the fglrx"
-		eerror "kernel module from loading."
-		error+=" X86_32 enabled;"
-		failed=1
-	fi
-
-	[[ ${failed} -ne 0 ]] && die "${error}"
-}
-
-pkg_pretend() {
-	# workaround until bug 365543 is solved
-	if use modules; then
-		linux-info_pkg_setup
-		require_configured_kernel
-		_check_kernel_config
-	fi
-}
-
-pkg_setup() {
-	if use modules; then
-		MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod/2.6.x)"
-		BUILD_TARGETS="kmod_build"
-		linux-mod_pkg_setup
-		BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}"
-		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\""
-		if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then
-			BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
-		else
-			BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
-		fi
-	fi
-	# Define module dir.
-	MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod"
-	# get the xorg-server version and set BASE_DIR for that
-	BASE_DIR="${S}/xpic"
-
-	# amd64/x86
-	if use amd64 ; then
-		MY_BASE_DIR="${BASE_DIR}_64a"
-		PKG_LIBDIR=lib64
-		ARCH_DIR="${S}/arch/x86_64"
-	else
-		MY_BASE_DIR="${BASE_DIR}"
-		PKG_LIBDIR=lib
-		ARCH_DIR="${S}/arch/x86"
-	fi
-
-	elog
-	elog "Please note that this driver supports only graphic cards based on"
-	elog "Evergreen chipset and newer."
-	elog "This represent the AMD Radeon HD 5400+ series at this moment."
-	elog
-	elog "If your card is older then use ${CATEGORY}/xf86-video-ati"
-	elog "For migration informations please reffer to:"
-	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
-	einfo
-}
-
-src_unpack() {
-	if [[ ${MY_V[2]} == beta ]]; then
-		unpack ${A}
-		RUN="${S}/${A/%.zip/.run}"
-	else
-		RUN="${DISTDIR}/${A}"
-	fi
-	sh ${RUN} --extract "${S}" # 2>&1 > /dev/null || die
-}
-
-src_prepare() {
-	# All kernel options for prepare are ment to be in here
-	if use modules; then
-		# version patches
-		# epatch "${FILESDIR}"/kernel/${PV}-*.patch
-		if use debug; then
-			sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
-				"${MODULE_DIR}/firegl_public.c" \
-				|| die "Failed to enable debug output."
-		fi
-	fi
-
-	# These are the userspace utilities that we also have source for.
-	# We rebuild these later.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \
-		|| die "bin rm failed"
-
-	# in this version amdcccle isn't static, thus we depend on qt4
-	use qt4 || rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle
-
-	# ACPI fixups
-	sed -i \
-		-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
-		-e "s:/var/lib/gdm/:/var/gdm/:" \
-		"${S}/${FOLDER_PREFIX}etc/ati/authatieventsd.sh" \
-		|| die "sed failed."
-
-	# Since "who" is in coreutils, we're using that one instead of "finger".
-	sed -i -e 's:finger:who:' \
-		"${S}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
-		|| die "Replacing 'finger' with 'who' failed."
-	# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
-	# add function to detect default state.
-	epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch
-
-	# fix needed for at least hardened-sources, see bug #392753
-	use pax_kernel && epatch "${FILESDIR}"/ati-drivers-12.2-redefine-WARN.patch
-
-	# see http://ati.cchtml.com/show_bug.cgi?id=495
-	epatch "${FILESDIR}"/ati-drivers-old_rsp.patch
-	
-	epatch "${FILESDIR}"/ati-drivers-do_mmap.patch
-
-	cd "${MODULE_DIR}"
-
-	# bugged fglrx build system, this file should be copied by hand
-	cp ${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x
-
-	convert_to_m 2.6.x/Makefile || die "convert_to_m failed"
-
-	# When built with ati's make.sh it defines a bunch of macros if
-	# certain .config values are set, falling back to less reliable
-	# detection methods if linux/autoconf.h is not available. We
-	# simply use the linux/autoconf.h settings directly, bypassing the
-	# detection script.
-	sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed"
-	sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \
-		|| die "MODVERSIONS sed failed"
-	cd "${S}"
-
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-
-	# Get rid of watermark. Oldest known reference:
-	# http://phoronix.com/forums/showthread.php?19875-Unsupported-Hardware-watermark
-	ebegin "Disabling watermark"
-	driver="${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
-	for x in $(objdump -d ${driver}|awk '/call/&&/EnableLogo/{print "\\x"$2"\\x"$3"\\x"$4"\\x"$5"\\x"$6}'); do
-		sed -i "s/${x}/\x90\x90\x90\x90\x90/g" ${driver} || break 1
-	done
-	eend $? || die "Disabling watermark failed"
-}
-
-src_compile() {
-	use modules && linux-mod_src_compile
-
-	ebegin "Building fgl_glxgears"
-	cd "${S}"/extra/fgl_glxgears
-	# These extra libs/utils either have an Imakefile that does not
-	# work very well without tweaking or a Makefile ignoring CFLAGS
-	# and the like. We bypass those.
-	# The -DUSE_GLU is needed to compile using nvidia headers
-	# according to a comment in ati-drivers-extra-8.33.6.ebuild.
-	"$(tc-getCC)" -o fgl_glxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \
-		-I"${S}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-	eend $?
-}
-
-src_test() { :; } # no tests present
-
-src_install() {
-	use modules && linux-mod_src_install
-
-	# We can do two things here, and neither of them is very nice.
-
-	# For direct rendering libGL has to be able to load one or more
-	# dri modules (files ending in _dri.so, like fglrx_dri.so).
-	# Gentoo's mesa looks for these files in the location specified by
-	# LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded
-	# location /usr/$(get_libdir)/dri. Ati's libGL does the same
-	# thing, but the hardcoded location is /usr/X11R6/lib/modules/dri
-	# on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64
-	# 64bit. So we can either put the .so files in that (unusual,
-	# compared to "normal" mesa libGL) location or set
-	# LIBGL_DRIVERS_PATH. We currently do the latter. See also bug
-	# 101539.
-
-	# The problem with this approach is that LIBGL_DRIVERS_PATH
-	# *overrides* the default hardcoded location, it does not extend
-	# it. So if ati-drivers is merged but a non-ati libGL is selected
-	# and its hardcoded path does not match our LIBGL_DRIVERS_PATH
-	# (because it changed in a newer mesa or because it was compiled
-	# for a different set of multilib abis than we are) stuff breaks.
-
-	# We create one file per ABI to work with "native" multilib, see
-	# below.
-
-	echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep"
-	doenvd "${T}/03ati-colon-sep" || die
-
-	# All libraries that we have a 32 bit and 64 bit version of on
-	# amd64 are installed in src_install-libs. Everything else
-	# (including libraries only available in native 64bit on amd64)
-	# goes in here.
-
-	# There used to be some code here that tried to detect running
-	# under a "native multilib" portage ((precursor of)
-	# http://dev.gentoo.org/~kanaka/auto-multilib/). I removed that, it
-	# should just work (only doing some duplicate work). --marienz
-	if has_multilib_profile; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	# This is sorted by the order the files occur in the source tree.
-
-	# X modules.
-	exeinto /usr/$(get_libdir)/xorg/modules/drivers
-	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
-	exeinto /usr/$(get_libdir)/xorg/modules/linux
-	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so
-	exeinto /usr/$(get_libdir)/xorg/modules
-	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{glesx.so,amdxmm.so}
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	use qt4 && dosbin "${ARCH_DIR}"/usr/sbin/amdnotifyui
-	dobin "${ARCH_DIR}"/usr/bin/clinfo
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	exeinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
-	doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh
-
-	# include.
-	insinto /usr
-	doins -r ${FOLDER_PREFIX}usr/include
-	insinto /usr/include/X11/extensions
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin ${FOLDER_PREFIX}usr/sbin/*
-
-	# data files for the control panel.
-	if use qt4 ; then
-		insinto /usr/share
-		doins -r ${FOLDER_PREFIX}usr/share/ati
-		insinto /usr/share/pixmaps
-		doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm
-		make_desktop_entry amdcccle 'AMD Catalyst Control Center' \
-			ccc_large System
-	fi
-
-	# doc.
-	dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx
-
-	doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8
-
-	pushd ${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi > /dev/null
-
-	exeinto /etc/acpi
-	doexe ati-powermode.sh
-	insinto /etc/acpi/events
-	doins events/*
-
-	popd > /dev/null
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_glxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	# Gentoo-specific stuff:
-	newinitd "${FILESDIR}"/atieventsd.init atieventsd
-	echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-	newconfd "${T}"/atieventsd.conf atieventsd
-
-	# PowerXpress stuff
-	exeinto /usr/$(get_libdir)/fglrx
-	doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed"
-	cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx
-	doexe "${T}"/switchlibglx || die "doexe switchlibglx failed"
-}
-
-src_install-libs() {
-	if [[ "${ABI}" == "amd64" ]]; then
-		local EX_BASE_DIR="${BASE_DIR}_64a"
-		local pkglibdir=lib64
-		local MY_ARCH_DIR="${S}/arch/x86_64"
-		local oclsuffix=64
-	else
-		local EX_BASE_DIR="${BASE_DIR}"
-		local pkglibdir=lib
-		local MY_ARCH_DIR="${S}/arch/x86"
-		local oclsuffix=32
-	fi
-	einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system"
-
-	local ATI_ROOT=/usr/$(get_libdir)/opengl/ati
-	# To make sure we do not miss a spot when these change.
-	local libmajor=1 libminor=2
-	local libver=${libmajor}.${libminor}
-
-	# The GLX libraries
-	# (yes, this really is "lib" even on amd64/multilib --marienz)
-	exeinto ${ATI_ROOT}/lib
-	newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \
-		libGL.so.${libver}
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor}
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so
-
-	exeinto ${ATI_ROOT}/extensions
-	doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/fglrx/fglrx-libglx.so
-	mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so
-
-	# other libs
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed some row above
-	doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	# AMD Cal and OpenCL libraries
-	exeinto /usr/$(get_libdir)/OpenCL/vendors/amd
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so*
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so*
-	dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so
-	exeinto /usr/$(get_libdir)
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
-
-	# OpenCL vendor files
-	insinto /etc/OpenCL/vendors/
-	cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF
-		/usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so
-	EOF
-	doins "${T}"/amdocl${oclsuffix}.icd
-
-	local envname="${T}"/04ati-dri-path
-	if [[ -n ${ABI} ]]; then
-		envname="${envname}-${ABI}"
-	fi
-	echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
-	doenvd "${envname}"
-
-	# Silence the QA notice by creating missing soname symlinks
-	for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9])
-	do
-		local soname=${so##*/}
-		## let's keep also this alternative way ;)
-		#dosym ${soname} /usr/$(get_libdir)/${soname%.[0-9]}
-		dosym ${soname} /usr/$(get_libdir)/$(scanelf -qF "#f%S" ${so})
-	done
-
-	#remove static libs if not wanted
-	use static-libs || rm -rf "${D}"/usr/$(get_libdir)/libfglrx_dm.a
-}
-
-pkg_postinst() {
-	elog "To switch to AMD OpenGL, run \"eselect opengl set ati\""
-	elog "To change your xorg.conf you can use the bundled \"aticonfig\""
-	elog
-	elog "If you experience unexplained segmentation faults and kernel crashes"
-	elog "with this driver and multi-threaded applications such as wine,"
-	elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
-	elog
-	elog "Fully rebooting the system after an ${PN} update is recommended"
-	elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg"
-	elog "might not work"
-	elog
-	elog "Some cards need acpid running to handle events"
-	elog "Please add it to boot runlevel with rc-update add acpid boot"
-	elog
-
-	use modules && linux-mod_pkg_postinst
-	"${ROOT}"/usr/bin/eselect opengl set --use-old ati
-	"${ROOT}"/usr/bin/eselect opencl set --use-old amd
-}
-
-pkg_preinst() {
-	use modules && linux-mod_pkg_preinst
-}
-
-pkg_prerm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	use modules && linux-mod_pkg_postrm
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/ati-drivers/files/amd-drivers-3.2.7.1.patch b/x11-drivers/ati-drivers/files/amd-drivers-3.2.7.1.patch
deleted file mode 100644
index 104c878..0000000
--- a/x11-drivers/ati-drivers/files/amd-drivers-3.2.7.1.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -5797,10 +5797,16 @@ void ATI_API_CALL KCL_fpu_begin(void)
- #ifdef CONFIG_X86_64
-     kernel_fpu_begin();
- #else
-+#ifndef TS_USEDFPU
-+    preempt_disable();
-+    if (__thread_has_fpu(current))
-+        __save_init_fpu(current);
-+#else
-     struct thread_info *cur_task = current_thread_info();
-     preempt_disable();
-     if (cur_task->status & TS_USEDFPU)
-         __save_init_fpu(cur_task->task);
-+#endif
-     else
-         clts();
- #endif
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-12.2-redefine-WARN.patch b/x11-drivers/ati-drivers/files/ati-drivers-12.2-redefine-WARN.patch
deleted file mode 100644
index f4fab43..0000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-12.2-redefine-WARN.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- common/lib/modules/fglrx/build_mod/kcl_debug.h.orig	2012-03-08 19:30:38.195025328 +0100
-+++ common/lib/modules/fglrx/build_mod/kcl_debug.h	2012-03-08 19:31:24.976024507 +0100
-@@ -85,8 +85,8 @@
- #ifdef ERROR
- #undef ERROR
- #endif
--#ifdef WARN
--#undef WARN
-+#ifdef AMD_WARN
-+#undef AMD_WARN
- #endif
- #ifdef INFO
- #undef INFO
-@@ -122,7 +122,7 @@
- {
-     SPECIAL = 0,
-     ERROR  ,
--    WARN  ,
-+    AMD_WARN  ,
-     INFO ,
-     INFOEX,
-     TRACE,
-@@ -160,7 +160,7 @@
- }log_map;
- 
- 
--#define DEFAULT_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX) |___BIT(ERROR) |___BIT(WARN) | ___BIT(TRACE)| ___BIT(SPECIAL)  ))
-+#define DEFAULT_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX) |___BIT(ERROR) |___BIT(AMD_WARN) | ___BIT(TRACE)| ___BIT(SPECIAL)  ))
- #define INFO_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX)))
- extern const log_map module_log_map[];
- extern const module_map module_type_map[];
---- common/lib/modules/fglrx/build_mod/kcl_debug.c.orig	2012-03-08 19:36:18.244019310 +0100
-+++ common/lib/modules/fglrx/build_mod/kcl_debug.c	2012-03-08 19:36:36.197018973 +0100
-@@ -69,7 +69,7 @@
- {
-     {SPECIAL        ,   'S'},
-     {ERROR          ,   'E'},
--    {WARN           ,   'W'},
-+    {AMD_WARN           ,   'W'},
-     {INFO           ,   'I'},
-     {INFOEX         ,   'X'},
-     {TRACE          ,   'T'},
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-do_mmap.patch b/x11-drivers/ati-drivers/files/ati-drivers-do_mmap.patch
deleted file mode 100644
index 04248eb..0000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-do_mmap.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-06-15 18:30:13.483762070 +0200
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-06-17 17:47:36.543041869 +0200
-@@ -2106,6 +2106,12 @@
-     }
- }
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
-+# define NO_DO_MMAP
-+# define do_mmap(a,b,c,d,e,f) vm_mmap(a, b, c, d, e, f)
-+# define do_munmap(a,b,c) vm_munmap(b, c)
-+#endif
-+
- unsigned long ATI_API_CALL KCL_MEM_AllocLinearAddrInterval(
-                                         KCL_IO_FILE_Handle file,
-                                         unsigned long addr,
-@@ -2117,10 +2123,13 @@
- 
-     flags = MAP_SHARED;
-     prot  = PROT_READ|PROT_WRITE;
--
-+#ifdef NO_DO_MMAP
-+    vaddr = (void *) vm_mmap(file, 0, len, prot, flags, pgoff);
-+#else
-     down_write(&current->mm->mmap_sem);
-     vaddr = (void *) do_mmap(file, 0, len, prot, flags, pgoff);
-     up_write(&current->mm->mmap_sem);
-+#endif
-     if (IS_ERR(vaddr))
-        return 0;
-     else
-@@ -2131,7 +2140,9 @@
- {
-     int retcode = 0;
- 
-+#ifndef NO_DO_MMAP
-     down_write(&current->mm->mmap_sem);
-+#endif
- #ifdef FGL_LINUX_RHEL_MUNMAP_API
-     retcode = do_munmap(current->mm,
-                         addr,
-@@ -2142,7 +2153,9 @@
-                         addr,
-                         len);
- #endif                        
-+#ifndef NO_DO_MMAP
-     up_write(&current->mm->mmap_sem);
-+#endif
-     return retcode;
- }
- 
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-old_rsp.patch b/x11-drivers/ati-drivers/files/ati-drivers-old_rsp.patch
deleted file mode 100644
index 0456bd6..0000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-old_rsp.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-05-26 18:33:25.044695179 +0200

-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-05-26 18:28:39.692699095 +0200

-@@ -4154,7 +4154,7 @@

- {

-     unsigned int p;

-     KCL_DEBUG5(FN_FIREGL_KAS, "%d\n", level_init);

--    for_each_cpu_mask(p, cpu_possible_map)

-+    for_each_possible_cpu(p)

-     {

-         KCL_DEBUG1(FN_FIREGL_KAS,"Setting initial execution level for CPU # %d\n", p);

-         preempt_disable();

---- a/common/lib/modules/fglrx/build_mod/kcl_ioctl.c	2012-05-26 19:11:03.402987821 +0200

-+++ b/common/lib/modules/fglrx/build_mod/kcl_ioctl.c	2012-05-26 19:13:00.273986422 +0200

-@@ -217,6 +217,10 @@

-  *  \param size [in] Number of bytes to allocate

-  *  \return Pointer to allocated memory

-  */

-+#ifndef CONFIG_X86_X32

-+DEFINE_PER_CPU(unsigned long, old_rsp);

-+#endif

-+

- void* ATI_API_CALL KCL_IOCTL_AllocUserSpace32(long size)

- {

-     void __user *ret = COMPAT_ALLOC_USER_SPACE(size);
\ No newline at end of file
diff --git a/x11-drivers/ati-drivers/files/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/ati-powermode-opt-path-2.patch
deleted file mode 100644
index f5a35a3..0000000
--- a/x11-drivers/ati-drivers/files/ati-powermode-opt-path-2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh
---- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2006-07-28 04:22:36.000000000 +0100
-+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2006-08-04 12:19:42.000000000 +0100
-@@ -4,6 +4,8 @@
- # Control script for ACPI lid state and AC adapter state
- #
- 
-+aticonfig='/opt/bin/aticonfig'
-+
- getXuser() {
-         user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'`
-         if [ x"$user" = x"" ]; then
-@@ -47,7 +49,7 @@
- done
- 
- #If PPLIB is enabled
--su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB
-+su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB
- if [ $? = 0 ]; then
-    echo "Has PPLIB"
-    has_pplib=1
-@@ -61,15 +63,15 @@
- if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then
-     echo "Low power"
-     if [ ${has_pplib} -eq 1 ]; then
--        su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"'
-+        su $user -c '$aticonfig --pplib-cmd="notify psrc dc"'
-     else
--        su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now"
-+        su $user -c "$aticonfig --set-powerstate=1"
-     fi
- else
-     echo "high power"
-     if [ ${has_pplib} -eq 1 ]; then
--        su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"'
-+        su $user -c '$aticonfig --pplib-cmd="notify psrc ac"'
-     else
--        su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now"
-+	su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)"
-     fi
- fi
-
diff --git a/x11-drivers/ati-drivers/files/atieventsd.init b/x11-drivers/ati-drivers/files/atieventsd.init
deleted file mode 100644
index 73139ce..0000000
--- a/x11-drivers/ati-drivers/files/atieventsd.init
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/files/atieventsd.init,v 1.3 2007/05/18 23:58:01 marienz Exp $
-
-depend() {
-    need acpid
-}
-
-start() {
-    ebegin "Starting ${SVCNAME}"
-    start-stop-daemon --start --exec /opt/sbin/atieventsd -- ${ATIEVENTSDOPTS}
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping ${SVCNAME}"
-    start-stop-daemon --stop --quiet --exec /opt/sbin/atieventsd
-    eend $?
-}
\ No newline at end of file
diff --git a/x11-drivers/ati-drivers/files/switchlibGL b/x11-drivers/ati-drivers/files/switchlibGL
deleted file mode 100644
index a6aa4fc..0000000
--- a/x11-drivers/ati-drivers/files/switchlibGL
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-#  switchlibGL
-#
-#  Copyright (c) 2011 Advanced Micro Devices, Inc.
-#
-#  Purpose:
-#    For switch between AMD and Intel graphic driver library.
-#
-#  Usage:
-#  switchlibGL   amd|intel|query
-#    amd:   switches to the AMD version of libGL.
-#    intel: switches to the open-source version of libGL .
-#    query: checks, which version is currently active and prints either "amd"
-#    or "intel" or "unknown" on the standard output.
-#    must be root to execute this script
-
-ARCH=`uname -m`
-E_ERR=1
-
-# Check if root
-if [ "`whoami`" != "root" ]; then
-  echo "Must be root to run this script." 1>&2
-  exit $E_ERR
-fi
-
-# One parameter
-if [ $# -ne 1 ]; then
-  echo "Usage: `basename $0` amd|intel|query " 1>&2
-  echo "Please choose one parameter " 1>&2
-  exit $E_ERR
-fi
-
-current=$(eselect opengl show)
-# Switch to right mode
-case "$1" in
-	"amd" )
-		if [ $current != ati ] ; then
-			eselect opengl set ati || return 1
-		fi
-	;;
-	"intel" )
-		if [ $current != xorg-x11 ] ; then
-			eselect opengl set xorg-x11 || return 1
-		fi
-	;;
-	"query" )
-		case "$current" in
-			"ati" )
-				echo "amd"
-			;;
-			"xorg-x11" )
-				echo "intel"
-			;;
-		esac
-	;;
-	* ) echo "Usage: `basename $0` amd|intel|query" 1>&2; exit $E_ERR;;
-	# other than amd|intel|query parameter report an error
-esac
-
-#  A zero return value from the script upon exit indicates success.
-exit 0
diff --git a/x11-drivers/ati-userspace/Manifest b/x11-drivers/ati-userspace/Manifest
deleted file mode 100644
index e08ab59..0000000
--- a/x11-drivers/ati-userspace/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1
-AUX signature 227 RMD160 f5989b79d1875bd4eeb0f11bedd79d86b7274fce SHA1 f81344f704e8cdf0c304d90e31321ab057abf457 SHA256 19991b3d979a7a40329fc431c891d4034f80b5445d02a3ed6893f00786e5b7ab
-AUX switchlibGL 1349 RMD160 d3c9f36fabf65b21f26456e303d8127779fd1bd2 SHA1 277a549afd62fdeae9f09022a8e55ceabf180f9f SHA256 a4aa2107fdb903da77fea432bc809a1155e213db460fdec72fd1c3c7cc0d13a0
-DIST amd-driver-installer-8.98-x86.x86_64.zip 105066414 RMD160 dedddeb4ee8fde791686ede5f5bf0943cac4f9f6 SHA1 c29f47c9c77d3c44e30ee7cf7e6c339e5c56d61e SHA256 9d1480910592942c1ee3c7d2156d43c0f1d5f49607c35cc2955f4e8cfd3c7daa
-EBUILD ati-userspace-12.6_beta-r1.ebuild 13326 RMD160 84b78e58c985a3522893839f4d6602397163c914 SHA1 5d6584d2b564228d36af202d9bbdede4eba998a1 SHA256 aa9038222713948742ed1a0e19f7a874b4b82da15a3fbc96a9a4e63aea6cf5d7
diff --git a/x11-drivers/ati-userspace/ati-userspace-12.6_beta-r1.ebuild b/x11-drivers/ati-userspace/ati-userspace-12.6_beta-r1.ebuild
deleted file mode 100644
index 738d7af..0000000
--- a/x11-drivers/ati-userspace/ati-userspace-12.6_beta-r1.ebuild
+++ /dev/null
@@ -1,424 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils multilib toolchain-funcs versionator
-
-DESCRIPTION="AMD X11 drivers for radeon r600 (HD Series) and newer chipsets"
-HOMEPAGE="http://www.amd.com"
-# 8.ble will be used for beta releases.
-if [[ $(get_major_version) -gt 8 ]]; then
-	ATI_URL="http://www2.ati.com/drivers/hotfix/catalyst_12.6_hotfixes"
-	ZIP_NAME="amd-driver-installer-8.98-x86.x86_64.zip"
-	SRC_URI="${ATI_URL}/${ZIP_NAME}"
-	FOLDER_PREFIX="common/"
-else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
-fi
-IUSE="debug multilib static-libs"
-
-LICENSE="AMD GPL-2 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="<=x11-base/xorg-server-1.13.49[-minimal]
-	!x11-drivers/ati-drivers:0
-	!x11-apps/ati-drivers-extra
-	>=app-admin/eselect-opengl-1.0.7
-	app-admin/eselect-opencl
-	x11-apps/xauth
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	multilib? (
-			app-emulation/emul-linux-x86-opengl
-			app-emulation/emul-linux-x86-xlibs
-	)
-	!<x11-drivers/ati-userspace-${PV}
-	!>x11-drivers/ati-userspace-${PV}"
-
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	x11-proto/inputproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xineramaproto
-	x11-libs/libXtst"
-
-EMULTILIB_PKG="true"
-
-S="${WORKDIR}"
-
-# QA Silencing
-QA_TEXTRELS="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/libatiadlxx.so
-	usr/lib*/xorg/modules/glesx.so
-	usr/lib*/libaticaldd.so
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_EXECSTACK="
-	opt/bin/atiode
-	opt/bin/amdcccle
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_WX_LOAD="
-	usr/lib*/opengl/ati/lib/libGL.so.1.2
-	usr/lib*/dri/fglrx_dri.so
-"
-
-QA_PRESTRIPPED="
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-"
-
-QA_SONAME="
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
-"
-
-QA_DT_HASH="
-	opt/bin/amdcccle
-	opt/bin/aticonfig
-	opt/bin/atiodcli
-	opt/bin/atiode
-	opt/bin/clinfo
-	opt/bin/fglrxinfo
-	opt/sbin/atieventsd
-	opt/sbin/amdnotifyui
-	usr/lib\(32\|64\)\?/libaticalcl.so
-	usr/lib\(32\|64\)\?/libaticalrt.so
-	usr/lib\(32\|64\)\?/libatiuki.so.1.0
-	usr/lib\(32\|64\)\?/libatiadlxx.so
-	usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0
-	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
-	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
-	usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so
-	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
-	usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so
-	usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so
-	usr/lib\(32\|64\)\?/libaticaldd.so
-	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so
-	usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\)\?.so
-	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1
-"
-
-pkg_setup() {
-	# get the xorg-server version and set BASE_DIR for that
-	BASE_DIR="${S}/xpic"
-
-	# amd64/x86
-	if use amd64 ; then
-		MY_BASE_DIR="${BASE_DIR}_64a"
-		PKG_LIBDIR=lib64
-		ARCH_DIR="${S}/arch/x86_64"
-	else
-		MY_BASE_DIR="${BASE_DIR}"
-		PKG_LIBDIR=lib
-		ARCH_DIR="${S}/arch/x86"
-	fi
-}
-
-src_unpack() {
-	if [[ $(get_major_version) -gt 8 ]]; then
-		unpack ${A}
-		# Switching to a standard way to extract the files since otherwise no signature file
-		# would be created
-		local src="${S}/${ZIP_NAME/.zip/.run}"
-		sh "${src}" --extract "${S}"  2&>1 /dev/null
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# These are the userspace utilities that we also have source for.
-	# We rebuild these later.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \
-		|| die "bin rm failed"
-
-        # amdcccle is shipped separately
-        rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle || die "cannot rm amdcccle"
-
-	# ACPI fixups
-	sed -i \
-		-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
-		-e "s:/var/lib/gdm/:/var/gdm/:" \
-		"${S}/${FOLDER_PREFIX}etc/ati/authatieventsd.sh" \
-		|| die "sed failed."
-
-	# Since "who" is in coreutils, we're using that one instead of "finger".
-	sed -i -e 's:finger:who:' \
-		"${S}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
-		|| die "Replacing 'finger' with 'who' failed."
-	# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
-	# add function to detect default state.
-	epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch
-
-	cd "${S}"
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-}
-
-src_compile() {
-	ebegin "Building fgl_glxgears"
-	cd "${S}"/extra/fgl_glxgears
-	# These extra libs/utils either have an Imakefile that does not
-	# work very well without tweaking or a Makefile ignoring CFLAGS
-	# and the like. We bypass those.
-
-	# The -DUSE_GLU is needed to compile using nvidia headers
-	# according to a comment in ati-drivers-extra-8.33.6.ebuild.
-	"$(tc-getCC)" -o fgl_glxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \
-		-I"${S}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-	eend $?
-}
-
-src_install() {
-	# We can do two things here, and neither of them is very nice.
-
-	# For direct rendering libGL has to be able to load one or more
-	# dri modules (files ending in _dri.so, like fglrx_dri.so).
-	# Gentoo's mesa looks for these files in the location specified by
-	# LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded
-	# location /usr/$(get_libdir)/dri. Ati's libGL does the same
-	# thing, but the hardcoded location is /usr/X11R6/lib/modules/dri
-	# on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64
-	# 64bit. So we can either put the .so files in that (unusual,
-	# compared to "normal" mesa libGL) location or set
-	# LIBGL_DRIVERS_PATH. We currently do the latter. See also bug
-	# 101539.
-
-	# The problem with this approach is that LIBGL_DRIVERS_PATH
-	# *overrides* the default hardcoded location, it does not extend
-	# it. So if ati-drivers is merged but a non-ati libGL is selected
-	# and its hardcoded path does not match our LIBGL_DRIVERS_PATH
-	# (because it changed in a newer mesa or because it was compiled
-	# for a different set of multilib abis than we are) stuff breaks.
-
-	# We create one file per ABI to work with "native" multilib, see
-	# below.
-
-	echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep"
-	doenvd "${T}/03ati-colon-sep" || die
-
-	# All libraries that we have a 32 bit and 64 bit version of on
-	# amd64 are installed in src_install-libs. Everything else
-	# (including libraries only available in native 64bit on amd64)
-	# goes in here.
-
-	# There used to be some code here that tried to detect running
-	# under a "native multilib" portage ((precursor of)
-	# http://dev.gentoo.org/~kanaka/auto-multilib/). I removed that, it
-	# should just work (only doing some duplicate work). --marienz
-	if has_multilib_profile; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	# This is sorted by the order the files occur in the source tree.
-
-	# X modules.
-	exeinto /usr/$(get_libdir)/xorg/modules/drivers
-	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
-	exeinto /usr/$(get_libdir)/xorg/modules/linux
-	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so
-	exeinto /usr/$(get_libdir)/xorg/modules
-	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{glesx.so,amdxmm.so}
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	dobin "${ARCH_DIR}"/usr/bin/clinfo
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	exeinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
-	doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh
-
-	# include.
-	insinto /usr
-	doins -r ${FOLDER_PREFIX}usr/include
-	insinto /usr/include/X11/extensions
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin ${FOLDER_PREFIX}usr/sbin/*
-
-	# doc.
-	dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx
-
-	doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8
-
-	pushd ${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi > /dev/null
-
-	exeinto /etc/acpi
-	doexe ati-powermode.sh
-	insinto /etc/acpi/events
-	doins events/*
-
-	popd > /dev/null
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_glxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	# Gentoo-specific stuff:
-	newinitd "${FILESDIR}"/atieventsd.init atieventsd
-	echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-	newconfd "${T}"/atieventsd.conf atieventsd
-
-	# PowerXpress stuff
-	exeinto /usr/$(get_libdir)/fglrx
-	doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed"
-	cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx
-	doexe "${T}"/switchlibglx || die "doexe switchlibglx failed"
-
-	# Required by upstream AMD
-	touch "${D}/etc/ati/atiapfuser.blb" || die
-	insinto /etc/ati
-	doins "${FOLDER_PREFIX}etc/ati/atiapfxx.blb"
-	cp "${FILESDIR}"/signature "${D}/etc/ati/signature"
-}
-
-src_install-libs() {
-	if [[ "${ABI}" == "amd64" ]]; then
-		local EX_BASE_DIR="${BASE_DIR}_64a"
-		local pkglibdir=lib64
-		local MY_ARCH_DIR="${S}/arch/x86_64"
-		local oclsuffix=64
-	else
-		local EX_BASE_DIR="${BASE_DIR}"
-		local pkglibdir=lib
-		local MY_ARCH_DIR="${S}/arch/x86"
-		local oclsuffix=32
-	fi
-	einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system"
-
-	local ATI_ROOT=/usr/$(get_libdir)/opengl/ati
-	# To make sure we do not miss a spot when these change.
-	local libmajor=1 libminor=2
-	local libver=${libmajor}.${libminor}
-
-	# The GLX libraries
-	# (yes, this really is "lib" even on amd64/multilib --marienz)
-	exeinto ${ATI_ROOT}/lib
-	newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \
-		libGL.so.${libver}
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor}
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so
-
-	exeinto ${ATI_ROOT}/extensions
-	doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/fglrx/fglrx-libglx.so
-	# PowerXpress stuff
-	mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so
-
-	# lib.
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed in src_install-libs.
-	doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	# AMD Cal and OpenCL libraries
-	exeinto /usr/$(get_libdir)/OpenCL/vendors/amd
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so*
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so*
-	dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so
-	exeinto /usr/$(get_libdir)
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
-
-	# OpenCL vendor files
-	insinto /etc/OpenCL/vendors/
-	cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF
-		/usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so
-	EOF
-	doins "${T}"/amdocl${oclsuffix}.icd
-
-	local envname="${T}"/04ati-dri-path
-	if [[ -n ${ABI} ]]; then
-		envname="${envname}-${ABI}"
-	fi
-	echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
-	doenvd "${envname}"
-
-	# Silence the QA notice by creating missing soname symlinks
-	for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9])
-	do
-		local soname=${so##*/}
-		## let's keep also this alternative way ;)
-		#dosym ${soname} /usr/$(get_libdir)/${soname%.[0-9]}
-		dosym ${soname} /usr/$(get_libdir)/$(scanelf -qF "#f%S" ${so})
-	done
-
-	#remove static libs if not wanted
-	use static-libs || rm -rf "${D}"/usr/$(get_libdir)/libfglrx_dm.a
-}
-
-pkg_postinst() {
-	elog "To switch to AMD OpenGL, run \"eselect opengl set ati\""
-	elog "To change your xorg.conf you can use the bundled \"aticonfig\""
-	elog
-	elog "If you experience unexplained segmentation faults and kernel crashes"
-	elog "with this driver and multi-threaded applications such as wine,"
-	elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
-	elog
-	elog "Fully rebooting the system after an ${PN} update is recommended"
-	elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg"
-	elog "might not work"
-	elog
-	elog "Some cards need acpid running to handle events"
-	elog "Please add it to boot runlevel with rc-update add acpid boot"
-
-	"${ROOT}"/usr/bin/eselect opengl set --use-old ati
-	"${ROOT}"/usr/bin/eselect opencl set --use-old amd
-}
-
-pkg_prerm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/ati-userspace/files/ati-powermode-opt-path-2.patch b/x11-drivers/ati-userspace/files/ati-powermode-opt-path-2.patch
deleted file mode 100644
index f5a35a3..0000000
--- a/x11-drivers/ati-userspace/files/ati-powermode-opt-path-2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh
---- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2006-07-28 04:22:36.000000000 +0100
-+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2006-08-04 12:19:42.000000000 +0100
-@@ -4,6 +4,8 @@
- # Control script for ACPI lid state and AC adapter state
- #
- 
-+aticonfig='/opt/bin/aticonfig'
-+
- getXuser() {
-         user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'`
-         if [ x"$user" = x"" ]; then
-@@ -47,7 +49,7 @@
- done
- 
- #If PPLIB is enabled
--su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB
-+su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB
- if [ $? = 0 ]; then
-    echo "Has PPLIB"
-    has_pplib=1
-@@ -61,15 +63,15 @@
- if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then
-     echo "Low power"
-     if [ ${has_pplib} -eq 1 ]; then
--        su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"'
-+        su $user -c '$aticonfig --pplib-cmd="notify psrc dc"'
-     else
--        su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now"
-+        su $user -c "$aticonfig --set-powerstate=1"
-     fi
- else
-     echo "high power"
-     if [ ${has_pplib} -eq 1 ]; then
--        su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"'
-+        su $user -c '$aticonfig --pplib-cmd="notify psrc ac"'
-     else
--        su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now"
-+	su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)"
-     fi
- fi
-
diff --git a/x11-drivers/ati-userspace/files/signature b/x11-drivers/ati-userspace/files/signature
deleted file mode 100644
index f119036..0000000
--- a/x11-drivers/ati-userspace/files/signature
+++ /dev/null
@@ -1 +0,0 @@
-b8d2c8686837dc90bc1099e298aca6ff:80fcff5f591aeda08c28abd7f98197cf8ce7fe5d2b1a9dc4f530acdaae9b90cc:80e2ae0b0e51e9f68929a883fdc8c7cf80b1fa500955b8a7da29a1d3a19bc59980b1ad5f0e52e9f48e72a883a1c8c5cbdee7fb580954b8f1dd75a080a19cc59c
diff --git a/x11-drivers/ati-userspace/files/switchlibGL b/x11-drivers/ati-userspace/files/switchlibGL
deleted file mode 100644
index a6aa4fc..0000000
--- a/x11-drivers/ati-userspace/files/switchlibGL
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-#  switchlibGL
-#
-#  Copyright (c) 2011 Advanced Micro Devices, Inc.
-#
-#  Purpose:
-#    For switch between AMD and Intel graphic driver library.
-#
-#  Usage:
-#  switchlibGL   amd|intel|query
-#    amd:   switches to the AMD version of libGL.
-#    intel: switches to the open-source version of libGL .
-#    query: checks, which version is currently active and prints either "amd"
-#    or "intel" or "unknown" on the standard output.
-#    must be root to execute this script
-
-ARCH=`uname -m`
-E_ERR=1
-
-# Check if root
-if [ "`whoami`" != "root" ]; then
-  echo "Must be root to run this script." 1>&2
-  exit $E_ERR
-fi
-
-# One parameter
-if [ $# -ne 1 ]; then
-  echo "Usage: `basename $0` amd|intel|query " 1>&2
-  echo "Please choose one parameter " 1>&2
-  exit $E_ERR
-fi
-
-current=$(eselect opengl show)
-# Switch to right mode
-case "$1" in
-	"amd" )
-		if [ $current != ati ] ; then
-			eselect opengl set ati || return 1
-		fi
-	;;
-	"intel" )
-		if [ $current != xorg-x11 ] ; then
-			eselect opengl set xorg-x11 || return 1
-		fi
-	;;
-	"query" )
-		case "$current" in
-			"ati" )
-				echo "amd"
-			;;
-			"xorg-x11" )
-				echo "intel"
-			;;
-		esac
-	;;
-	* ) echo "Usage: `basename $0` amd|intel|query" 1>&2; exit $E_ERR;;
-	# other than amd|intel|query parameter report an error
-esac
-
-#  A zero return value from the script upon exit indicates success.
-exit 0