From: Felix Bechstein <f@ub0r.de>
Date: Tue, 16 Jun 2009 13:28:26 +0000 (+0200)
Subject: cleanup
X-Git-Url: https://repo.or.cz/w/ub0rlay.git/commitdiff_plain/86146f39833881601eb3d91ae283df96ac592309

cleanup
---

diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
deleted file mode 100644
index 1042e7b..0000000
--- a/app-crypt/ccid/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX defs-0.patch 387 RMD160 a3469fddfe31329724fb19942d44ec40fd97056f SHA1 2198bdb87ca9ebfa31d8cca812d48445137b358b SHA256 a7c06934702a9a7d0c5b09a39d1c9e7619a24c7b22e841fc86339832f46d4e2d
-DIST ccid-1.3.8.tar.bz2 436222 RMD160 d616cf788e0d71358998ecd5c08e3f363a83d97b SHA1 ee8a1e328d2ff286a953877f6da8c063b8438f04 SHA256 8cb892ef36321069eff7826aa732f1481715fe54bf96346fae1d25565b44c536
-EBUILD ccid-1.3.8.ebuild 1066 RMD160 5e62a0446e953933dfc9161b2c7efb38f6d9193a SHA1 0cc8159ac5e86dafe68dc9918b4cd57fda912d84 SHA256 3690def64f5d326a88cf20becb6d65b2a9e13cbf336f1ee2208d4239f40a40ef
diff --git a/app-crypt/ccid/ccid-1.3.8.ebuild b/app-crypt/ccid/ccid-1.3.8.ebuild
deleted file mode 100644
index c91a2fe..0000000
--- a/app-crypt/ccid/ccid-1.3.8.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ccid-1.3.5.ebuild,v 1.2 2008/05/11 13:40:40 alonbl Exp $
-
-inherit eutils
-
-STUPID_NUM="2482"
-DESCRIPTION="CCID free software driver"
-HOMEPAGE="http://pcsclite.alioth.debian.org/ccid.html"
-SRC_URI="http://alioth.debian.org/download.php/${STUPID_NUM}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="twinserial nousb"
-RDEPEND=">=sys-apps/pcsc-lite-1.3.3
-	>=dev-libs/libusb-0.1.4"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/defs-0.patch
-}
-
-src_compile() {
-	local myconf
-
-	use nousb && myconf="${myconf} --disable-pcsclite"
-
-	econf \
-		LEX=: \
-		--docdir="/usr/share/doc/${PF}" \
-		--enable-udev \
-		${myconf} \
-		$(use_enable twinserial) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "Cannot install"
-	dodoc README AUTHORS
-	insinto /etc/udev/rules.d
-	newins src/pcscd_ccid.rules 60-pcscd_ccid.rules
-}
diff --git a/app-crypt/ccid/files/defs-0.patch b/app-crypt/ccid/files/defs-0.patch
deleted file mode 100644
index ed37caa..0000000
--- a/app-crypt/ccid/files/defs-0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/defs.h	2008-05-28 20:48:09.000000000 +0200
-+++ src/defs.h	2008-06-13 22:41:01.000000000 +0200
-@@ -63,7 +63,7 @@
- #define MASK_POWERFLAGS_PDWN 0x02
- 
- /* Communication buffer size (max=adpu+Lc+data+Le) */
--#define CMD_BUF_SIZE (4+1+256+1)
-+#define CMD_BUF_SIZE (4+1+256+1+100)
- /* Larger communication buffer size (max=reader status+data+sw) */
- #define RESP_BUF_SIZE (1+256+2)
- 
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
deleted file mode 100644
index b1e8733..0000000
--- a/dev-java/icedtea-bin/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX icedtea-bin-1.7.env 861 RMD160 e4f0df5ef2177def19855eb31cda077d8f83270e SHA1 74a064bbdaa807214ff3762765d9470adf8ab23d SHA256 d462c96614276e3d9d683f11e577c38c974ab4247320133741596033ee71544d
-DIST java-1.7.0-icedtea-1.7.0.0-0.19.b21.snapshot.fc8.x86_64.rpm 29320041 RMD160 c072e09c10a705e6245f675f6fab0ae7872a7fc3 SHA1 aea0005cb4abb70bd93ce6f4f0dc5839e3523c27 SHA256 d01171de2c40639894cde927c21d5e75cdd2cc36222944057f56fdbf285dc177
-DIST java-1.7.0-icedtea-devel-1.7.0.0-0.19.b21.snapshot.fc8.x86_64.rpm 9303801 RMD160 9ea3bbd0da5f0be3f24579198c45de5d992cf8cd SHA1 92a8d76061e2e30073a2b514f3c1660b34c38599 SHA256 f4284309d8b3d7a1387e4739273135e222ca58108a54e739b95f71934ec5e4d3
-DIST java-1.7.0-icedtea-plugin-1.7.0.0-0.19.b21.snapshot.fc8.x86_64.rpm 21807 RMD160 05b4e57873c116260c068befff85bc64524864f1 SHA1 f6eb097df1059ecd65a3a4a66676b942009bd29d SHA256 3fdcbf6c415bd8e7d0df62755125e88373b3474936792adb22b708727285b60c
-EBUILD icedtea-bin-1.7.0.ebuild 1341 RMD160 9da2b6f24ec52002ccb5e037d7ce79e4e80bcbaa SHA1 5f4e72ef486d52e0ffffc446cb872c1c9e21f626 SHA256 79e82a5b74462d38aa5ff85d5cc2c59da699a3775a00da9fb22ea3449046138b
diff --git a/dev-java/icedtea-bin/files/icedtea-bin-1.7.env b/dev-java/icedtea-bin/files/icedtea-bin-1.7.env
deleted file mode 100644
index c91c4cd..0000000
--- a/dev-java/icedtea-bin/files/icedtea-bin-1.7.env
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-VERSION="IcedTea JDK @PV@"
-JAVA_HOME=/usr/lib/jvm/java-@PV@-icedtea-@PV@.0.x86_64
-JDK_HOME=/usr/lib/jvm/java-@PV@-icedtea-@PV@.0.x86_64
-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/amd64/:${JAVA_HOME}/jre/lib/amd64/native_threads/:${JAVA_HOME}/jre/lib/amd64/xawt/:${JAVA_HOME}/jre/lib/amd64/server/"
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="1.7"
-# 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"
diff --git a/dev-java/icedtea-bin/icedtea-bin-1.7.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-1.7.0.ebuild
deleted file mode 100644
index 0428bbc..0000000
--- a/dev-java/icedtea-bin/icedtea-bin-1.7.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils java-pkg-2 java-vm-2 rpm toolchain-funcs
-
-DESCRIPTION="Java Plugin for 64 Bit Browsers"
-HOMEPAGE="http://icedtea.classpath.org"
-FEDORA_V="1.7.0.0-0.19.b21.snapshot.fc8.x86_64"
-BASE_URI="http://fedora.tu-chemnitz.de/pub/linux/fedora/linux/releases/8/Fedora/x86_64/os/Packages"
-SRC_URI="${BASE_URI}/java-${PV}-icedtea-${FEDORA_V}.rpm
-        ${BASE_URI}/java-${PV}-icedtea-devel-${FEDORA_V}.rpm
-	        nsplugin? ( ${BASE_URI}/java-${PV}-icedtea-plugin-${FEDORA_V}.rpm )"
-SLOT="1.7"
-LICENSE="OSGPL-0.0"
-KEYWORDS="-* ~amd64"
-IUSE="nsplugin"
-
-RDEPEND=">=sys-devel/gcc-4.2"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-    java-vm-2_pkg_setup
-    java-pkg-2_pkg_setup
-
-    if [ $(gcc-version) != "4.2" ]; then
-	ewarn "${P} is a binary package, and needs gcc-4.2 to be installed and"
-	ewarn "set as currently active compiler!"
-	sleep 5
-    fi
-}
-
-src_unpack() {
-    rpm_src_unpack
-}
-	
-src_compile() {
-    elog "We install a Fedora binary distribution. Nothing to compile."
-}
-
-src_install() {
-    dodir /usr/lib64
-    cp -a usr/lib/jvm* ${D}/usr/lib64
-
-    if use nsplugin; then
-        install_mozilla_plugin \
-        /usr/lib64/jvm/java-${PV}-icedtea-${PV}.0.x86_64/jre/lib/amd64/gcjwebplugin.so
-    fi
-
-    set_java_env
-}
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
deleted file mode 100644
index baf75ce..0000000
--- a/dev-java/icedtea/Manifest
+++ /dev/null
@@ -1,25 +0,0 @@
-AUX icedtea-1.4-gentoo.patch 8642 RMD160 526292e60ded78e1208a03c68d602f88a8098ad2 SHA1 3cd1a51cfe9d1541da3bb2a710566845349a6a33 SHA256 01628204534ceeea08ccef4bb5e526ffca978a73728cd002ffa8b8fa6c76bf1e
-MD5 2674c1cc9e330abf67dde22067bd66af files/icedtea-1.4-gentoo.patch 8642
-RMD160 526292e60ded78e1208a03c68d602f88a8098ad2 files/icedtea-1.4-gentoo.patch 8642
-SHA256 01628204534ceeea08ccef4bb5e526ffca978a73728cd002ffa8b8fa6c76bf1e files/icedtea-1.4-gentoo.patch 8642
-AUX icedtea-1.4-no-werror.patch 479 RMD160 24aed1d622a7c357b90747b86644838ef3899cbd SHA1 5849e1c1850de168cf4949151092879709840e0a SHA256 447735c054cb3f7c09fb980dde000bcb561d77bbced656e324ffd2daa01bba92
-MD5 94dce30f8ca7539b617048af5efe1fb6 files/icedtea-1.4-no-werror.patch 479
-RMD160 24aed1d622a7c357b90747b86644838ef3899cbd files/icedtea-1.4-no-werror.patch 479
-SHA256 447735c054cb3f7c09fb980dde000bcb561d77bbced656e324ffd2daa01bba92 files/icedtea-1.4-no-werror.patch 479
-AUX icedtea-1.4-xulrunner.patch 7024 RMD160 2095aba807256dd69d68f94ddd8d24eaec00f5c1 SHA1 471c7de138ef7af9b216c4fcaf04033866aee305 SHA256 88dcab95e7b604355ecaabad461c1e6ec0c37471e04545edac195005398ea793
-MD5 dba38ced8800ac29c5ecf76bbdd6587c files/icedtea-1.4-xulrunner.patch 7024
-RMD160 2095aba807256dd69d68f94ddd8d24eaec00f5c1 files/icedtea-1.4-xulrunner.patch 7024
-SHA256 88dcab95e7b604355ecaabad461c1e6ec0c37471e04545edac195005398ea793 files/icedtea-1.4-xulrunner.patch 7024
-AUX icedtea-1.7.env 795 RMD160 960383752532f9d63ae4c0c90b08fc5bd9fc610f SHA1 7f42cca31348daeef35547299d7fd2cca91ff081 SHA256 a645bebeee3038c9f17a89fc30a65fac2d809d8b333ec924fb5a6cc85c883a82
-MD5 09efea15c8477567f93cb4ec0bebe600 files/icedtea-1.7.env 795
-RMD160 960383752532f9d63ae4c0c90b08fc5bd9fc610f files/icedtea-1.7.env 795
-SHA256 a645bebeee3038c9f17a89fc30a65fac2d809d8b333ec924fb5a6cc85c883a82 files/icedtea-1.7.env 795
-DIST icedtea-1.4.tar.gz 904888 RMD160 9273f4d2ef473e671b55225c4438201d8df5bc1a SHA1 bab9285794034c648d33a2e28d8b2c6bd7bf1a49 SHA256 6a09c4f6736541cdcd58bf6ed2836b120aed31049fcb109462f322793b44a967
-DIST openjdk-7-ea-src-b21-27_sep_2007.zip 84922445 RMD160 49ba429be9edce7c89b5647abb923ac68f1a51a9 SHA1 711aa2cab4c45fe45f9b33a80898e82f3ae0cd6e SHA256 c8e4a4d57299e5af6f03947b76185bf54106d549f9b64327f2be9e8e0730b97e
-EBUILD icedtea-1.4.ebuild 4777 RMD160 89c01033f3ad72f2afc125d8b7c26a9ca44f8551 SHA1 74175970b7868bbe0537828a878434880950fdc7 SHA256 db7beb896fa7a511d5603bc8c491af0b1afa9a3c404f6bb62d8a4ee460b3cc11
-MD5 2732875c2b5b3e69880c5084f42e3b90 icedtea-1.4.ebuild 4777
-RMD160 89c01033f3ad72f2afc125d8b7c26a9ca44f8551 icedtea-1.4.ebuild 4777
-SHA256 db7beb896fa7a511d5603bc8c491af0b1afa9a3c404f6bb62d8a4ee460b3cc11 icedtea-1.4.ebuild 4777
-MD5 f0bfffb0ec12687cf1a82c21c256e6da files/digest-icedtea-1.4 530
-RMD160 61e6490f4c0c9b301d3ba55b4203f5867a30c6cb files/digest-icedtea-1.4 530
-SHA256 92ab5bb0c25076bd28c3fbae3d28a3fd832e17e9b89a3a53c875e72017cbe49d files/digest-icedtea-1.4 530
diff --git a/dev-java/icedtea/files/digest-icedtea-1.4 b/dev-java/icedtea/files/digest-icedtea-1.4
deleted file mode 100644
index b4c89ef..0000000
--- a/dev-java/icedtea/files/digest-icedtea-1.4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 82d0e7d696577c0c480f343b9f85dd08 icedtea-1.4.tar.gz 904888
-RMD160 9273f4d2ef473e671b55225c4438201d8df5bc1a icedtea-1.4.tar.gz 904888
-SHA256 6a09c4f6736541cdcd58bf6ed2836b120aed31049fcb109462f322793b44a967 icedtea-1.4.tar.gz 904888
-MD5 64ac356cd24af5e52cf9fd1217e234da openjdk-7-ea-src-b21-27_sep_2007.zip 84922445
-RMD160 49ba429be9edce7c89b5647abb923ac68f1a51a9 openjdk-7-ea-src-b21-27_sep_2007.zip 84922445
-SHA256 c8e4a4d57299e5af6f03947b76185bf54106d549f9b64327f2be9e8e0730b97e openjdk-7-ea-src-b21-27_sep_2007.zip 84922445
diff --git a/dev-java/icedtea/files/icedtea-1.4-gentoo.patch b/dev-java/icedtea/files/icedtea-1.4-gentoo.patch
deleted file mode 100644
index fe48108..0000000
--- a/dev-java/icedtea/files/icedtea-1.4-gentoo.patch
+++ /dev/null
@@ -1,189 +0,0 @@
---- ./openjdk/j2se/make/common/Release.gmk.orig	2007-12-21 18:58:57.000000000 +0000
-+++ ./openjdk/j2se/make/common/Release.gmk	2007-12-21 19:03:26.000000000 +0000
-@@ -952,7 +952,7 @@
- 	@# lib/ct.sym
- 	@#
- 	$(MKDIR) -p $(OUTPUTDIR)/symbols/META-INF/sym
--	$(JAVAC_CMD) -XDprocess.packages -proc:only \
-+	$(JAVAC_CMD) -bootclasspath $(ABS_OUTPUTDIR) $(JAVAC_JVM_FLAGS) -XDprocess.packages -proc:only \
- 	    -processor com.sun.tools.javac.sym.CreateSymbols \
- 	    -Acom.sun.tools.javac.sym.Jar=$(RT_JAR) \
- 	    -Acom.sun.tools.javac.sym.Dest=$(OUTPUTDIR)/symbols/META-INF/sym/rt.jar \
---- ./openjdk/j2se/make/common/BuildToolJar.gmk.orig	2007-12-21 18:14:24.000000000 +0000
-+++ ./openjdk/j2se/make/common/BuildToolJar.gmk	2007-12-21 18:16:29.000000000 +0000
-@@ -42,7 +42,7 @@
-     $(BUILDTOOL_ALL_FILES:%=$(BUILDTOOL_SOURCE_ROOT)/%)
- 	@$(prep-target)
- 	@$(MKDIR) -p $(BUILDTOOLCLASSDIR)
--	$(BOOT_JAVAC_CMD) -d $(BUILDTOOLCLASSDIR) \
-+	$(BOOT_JAVAC_CMD) -cp "$(ABS_OUTPUTDIR)/classes" -d $(BUILDTOOLCLASSDIR) \
- 	    -sourcepath $(BUILDTOOL_SOURCE_ROOT) $(BUILDTOOL_MAIN_SOURCE_FILE)
- 	$(BOOT_JAR_CMD) cfm $@ $(BUILDTOOL_MANIFEST_FILE) \
- 	    -C $(BUILDTOOLCLASSDIR) $(PKGDIR) \
---- ./openjdk/j2se/make/common/Rules.gmk.orig	2007-12-21 04:43:54.000000000 +0000
-+++ ./openjdk/j2se/make/common/Rules.gmk	2007-12-21 16:15:33.000000000 +0000
-@@ -229,14 +229,14 @@
- # Make sure all newer sources are compiled (in a batch)
- classes : $(CLASSES_INIT) .delete.classlist .compile.classlist
- 
--.compile.classlist : $(JAVA_SOURCE_LIST)
-+.compile.classlist : $(JAVA_SOURCE_LIST) 
- 	@$(MKDIR) -p $(CLASSDESTDIR)
- 	@if [ `$(CAT) $(JAVA_SOURCE_LIST) | $(WC) -l` -ge 1 ] ; then \
- 	  $(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \
- 	  $(CAT) $(JAVA_SOURCE_LIST); \
- 	  $(ECHO) "# Running javac:"; \
--	  $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
--	  $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
-+	  $(ECHO) $(JAVAC_CMD) $(JAVAC_JVM_FLAGS) -cp "$(ABS_OUTPUTDIR)/classes" -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
-+	  $(JAVAC_CMD) $(JAVAC_JVM_FLAGS) -cp "$(ABS_OUTPUTDIR)/classes" -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
- 	fi
- 	@$(java-vm-cleanup)
- 
---- ./openjdk/j2se/make/common/shared/Defs-java.gmk.orig	2007-12-21 14:53:56.000000000 +0000
-+++ ./openjdk/j2se/make/common/shared/Defs-java.gmk	2007-12-22 04:52:11.000000000 +0000
-@@ -115,6 +115,7 @@
- JAVACFLAGS  += $(CLASS_VERSION)
- JAVACFLAGS  += -encoding ascii
- JAVACFLAGS  += "-Xbootclasspath:$(CLASSBINDIR)"
-+JAVACFLAGS  += -cp "$(ABS_OUTPUTDIR)/classes" 
- JAVACFLAGS  += $(OTHER_JAVACFLAGS)
- 
- # Needed for javah
-@@ -128,20 +129,26 @@
-   DOCLETS_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/doclets.jar
-   JAVAC_CMD   = $(BOOT_JAVA_CMD) \
- 		"-Xbootclasspath/p:$(JAVAC_JAR)" \
-+		-cp "$(ABS_OUTPUTDIR)/classes" \
- 		-jar $(JAVAC_JAR) $(JAVACFLAGS)
-   JAVAH_CMD   = $(BOOT_JAVA_CMD) \
- 		"-Xbootclasspath/p:$(JAVAH_JAR)$(CLASSPATH_SEPARATOR)$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)"  \
-+		-cp "$(ABS_OUTPUTDIR)/classes" \
- 		-jar $(JAVAH_JAR) $(JAVAHFLAGS)
-   JAVADOC_CMD = $(BOOT_JAVA_CMD) \
- 		"-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \
-+		-cp "$(ABS_OUTPUTDIR)/classes" \
- 		-jar $(JAVADOC_JAR)
- else
-   # If no explicit tools, use boot tools (add VM flags in this case)
-   JAVAC_CMD     = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
-+  		  -cp "$(ABS_OUTPUTDIR)/classes" \
- 		  $(JAVACFLAGS)
-   JAVAH_CMD     = $(JAVA_TOOLS_DIR)/javah \
-+  		  -cp "$(ABS_OUTPUTDIR)/classes" \
- 		  $(JAVAHFLAGS)
--  JAVADOC_CMD   = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%)
-+  JAVADOC_CMD   = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%) \
-+  		  -cp "$(ABS_OUTPUTDIR)/classes"
- endif
- 
- # Override of what javac to use (see deploy workspace)
---- ./openjdk/j2se/make/common/Demo.gmk.orig	2007-12-21 17:48:51.000000000 +0000
-+++ ./openjdk/j2se/make/common/Demo.gmk	2007-12-21 18:04:06.000000000 +0000
-@@ -247,7 +247,7 @@
-     $(DEMO_RESOURCES:%=$(DEMO_JAR_IMAGE)/%)
- 	@$(prep-target)
- 	$(MKDIR) -p $(DEMO_JAR_IMAGE)
--	$(JAVAC_CMD) -d $(DEMO_JAR_IMAGE) -sourcepath $(DEMO_BUILD_SRCDIR) \
-+	$(JAVAC_CMD) $(JAVAC_JVM_FLAGS) -cp $(subst j2se,control,$(ABS_OUTPUTDIR))/classes -d $(DEMO_JAR_IMAGE) -sourcepath $(DEMO_BUILD_SRCDIR) \
- 	    @$(DEMO_JAVAC_INPUT)
- 	$(BOOT_JAR_CMD) -cfm $@ $(DEMO_MANIFEST) \
- 	     -C $(DEMO_JAR_IMAGE) . \
---- ./openjdk/j2se/make/Makefile.orig	2007-12-22 05:09:44.000000000 +0000
-+++ ./openjdk/j2se/make/Makefile	2007-12-22 05:11:39.000000000 +0000
-@@ -247,7 +247,7 @@
- #
- # Docs
- #
--OTHERSUBDIRS = docs
-+OTHERSUBDIRS =
- docs:: sanity-docs post-sanity-docs
- 	$(OTHERSUBDIRS-loop)
- 
---- ./openjdk/hotspot/src/share/vm/adlc/adlc.hpp.orig	2007-12-20 19:52:37.000000000 +0000
-+++ ./openjdk/hotspot/src/share/vm/adlc/adlc.hpp	2007-12-20 19:52:48.000000000 +0000
-@@ -35,7 +35,7 @@
- #if _MSC_VER >= 1300  // Visual C++ 7.0 or later
- #include <iostream>
- #else
--#include <iostream.h>
-+#include <iostream>
- #endif
- #include "string.h"
- #include "ctype.h"
---- ./openjdk/hotspot/src/share/vm/adlc/filebuff.hpp.orig	2007-12-20 19:53:19.000000000 +0000
-+++ ./openjdk/hotspot/src/share/vm/adlc/filebuff.hpp	2007-12-20 19:53:44.000000000 +0000
-@@ -30,7 +30,7 @@
- #if _MSC_VER >= 1300  // Visual C++ 7.0 or later
- #include <iostream>
- #else
--#include <iostream.h>
-+#include <iostream>
- #endif
- 
- // STRUCTURE FOR HANDLING INPUT AND OUTPUT FILES
-@@ -99,8 +99,8 @@
-   FileBuffRegion *copy();	            // Deep copy
-   FileBuffRegion *merge(FileBuffRegion*); // Merge 2 regions; delete input
- 
--//  void print(std::ostream&);
--//  friend std::ostream& operator<< (std::ostream&, FileBuffRegion&);
--  void print(ostream&);
--  friend ostream& operator<< (ostream&, FileBuffRegion&);
-+  void print(std::ostream&);
-+  friend std::ostream& operator<< (std::ostream&, FileBuffRegion&);
-+//  void print(ostream&);
-+//  friend ostream& operator<< (ostream&, FileBuffRegion&);
- };
---- ./openjdk/hotspot/src/share/vm/adlc/filebuff.cpp.orig	2007-12-20 19:53:55.000000000 +0000
-+++ ./openjdk/hotspot/src/share/vm/adlc/filebuff.cpp	2007-12-20 19:54:10.000000000 +0000
-@@ -158,7 +158,7 @@
- }
- 
- //------------------------------expandtab--------------------------------------
--static int expandtab( ostream &os, int off, char c, char fill1, char fill2 ) {
-+static int expandtab( std::ostream &os, int off, char c, char fill1, char fill2 ) {
-   if( c == '\t' ) {             // Tab?
-     do os << fill1;		// Expand the tab; Output space
-     while( (++off) & 7 );	// Expand to tab stop
-@@ -172,7 +172,7 @@
- //------------------------------printline--------------------------------------
- // Print and highlite a region of a line.  Return the amount of highliting left
- // to do (i.e. highlite length minus length of line).
--static int printline( ostream& os, const char *fname, int line,
-+static int printline( std::ostream& os, const char *fname, int line,
- 			const char *_sol, int skip, int len ) {
- 
-   // Display the entire tab-expanded line
-@@ -222,8 +222,8 @@
- }
- 
- //------------------------------print------------------------------------------
--//std::ostream& operator<< ( std::ostream& os, FileBuffRegion &br ) {
--ostream& operator<< ( ostream& os, FileBuffRegion &br ) {
-+//std::std::ostream& operator<< ( std::std::ostream& os, FileBuffRegion &br ) {
-+std::ostream& operator<< ( std::ostream& os, FileBuffRegion &br ) {
-   if( &br == NULL ) return os;	// The empty buffer region
-   FileBuffRegion *brp = &br;	// Pointer to region
-   while( brp ) {		// While have chained regions
-@@ -238,8 +238,8 @@
- // filename and line number to the left, and complete text lines to the right.
- // Selected portions (portions of a line actually in the FileBuffRegion are
- // underlined.	Ellipses are used for long multi-line regions.
--//void FileBuffRegion::print( std::ostream& os ) {
--void FileBuffRegion::print( ostream& os ) {
-+//void FileBuffRegion::print( std::std::ostream& os ) {
-+void FileBuffRegion::print( std::ostream& os ) {
-   if( !this ) return;		// Nothing to print
-   char *s = _bfr->get_line();
-   int skip = (int)(_offset - _sol);	// Amount to skip to start of data
---- ./Makefile.in.orig	2007-12-22 17:54:03.000000000 +0000
-+++ ./Makefile.in	2007-12-22 17:54:19.000000000 +0000
-@@ -240,7 +240,6 @@
- 	patches/icedtea-graphics.patch \
- 	patches/icedtea-antialias.patch \
- 	patches/icedtea-paths.patch \
--	patches/icedtea-debuginfo.patch \
- 	patches/icedtea-ssl.patch \
- 	patches/icedtea-license-headers.patch \
- 	patches/icedtea-libpng.patch \
diff --git a/dev-java/icedtea/files/icedtea-1.4-no-werror.patch b/dev-java/icedtea/files/icedtea-1.4-no-werror.patch
deleted file mode 100644
index 6d5d592..0000000
--- a/dev-java/icedtea/files/icedtea-1.4-no-werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./openjdk/hotspot/build/linux/makefiles/gcc.make.orig	2007-12-22 19:10:06.000000000 +0000
-+++ ./openjdk/hotspot/build/linux/makefiles/gcc.make	2007-12-22 19:10:24.000000000 +0000
-@@ -88,7 +88,7 @@
- endif
- 
- # Compiler warnings are treated as errors
--WARNINGS_ARE_ERRORS = -Werror
-+WARNINGS_ARE_ERRORS =
- # Except for a few acceptable ones
- ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare
- CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS)
diff --git a/dev-java/icedtea/files/icedtea-1.4-xulrunner.patch b/dev-java/icedtea/files/icedtea-1.4-xulrunner.patch
deleted file mode 100644
index 362f1c7..0000000
--- a/dev-java/icedtea/files/icedtea-1.4-xulrunner.patch
+++ /dev/null
@@ -1,135 +0,0 @@
---- ./configure.orig	2007-12-20 19:27:31.000000000 +0000
-+++ ./configure	2007-12-20 19:29:27.000000000 +0000
-@@ -7022,12 +7022,12 @@
-         pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-plugin\"") >&5
--  ($PKG_CONFIG --exists --print-errors "mozilla-plugin") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xulrunner-plugin\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "xulrunner-plugin") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "mozilla-plugin" 2>/dev/null`
-+  pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "xulrunner-plugin" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -7040,12 +7040,12 @@
-         pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-plugin\"") >&5
--  ($PKG_CONFIG --exists --print-errors "mozilla-plugin") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xulrunner-plugin\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "xulrunner-plugin") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "mozilla-plugin" 2>/dev/null`
-+  pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "xulrunner-plugin" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -7064,9 +7064,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mozilla-plugin"`
-+	        MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xulrunner-plugin"`
-         else
--	        MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-plugin"`
-+	        MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xulrunner-plugin"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$MOZILLA_PKG_ERRORS" >&5
-@@ -7097,12 +7097,12 @@
-         pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-plugin firefox-xpcom\"") >&5
--  ($PKG_CONFIG --exists --print-errors "firefox-plugin firefox-xpcom") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xulrunner-plugin firefox-xpcom\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "xulrunner-plugin firefox-xpcom") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "firefox-plugin firefox-xpcom" 2>/dev/null`
-+  pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "xulrunner-plugin firefox-xpcom" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -7115,12 +7115,12 @@
-         pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-plugin firefox-xpcom\"") >&5
--  ($PKG_CONFIG --exists --print-errors "firefox-plugin firefox-xpcom") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xulrunner-plugin firefox-xpcom\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "xulrunner-plugin firefox-xpcom") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "firefox-plugin firefox-xpcom" 2>/dev/null`
-+  pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "xulrunner-plugin firefox-xpcom" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -7139,9 +7139,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "firefox-plugin firefox-xpcom"`
-+	        MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xulrunner-plugin firefox-xpcom"`
-         else
--	        MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "firefox-plugin firefox-xpcom"`
-+	        MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xulrunner-plugin firefox-xpcom"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$MOZILLA_PKG_ERRORS" >&5
-@@ -7247,12 +7247,12 @@
-         pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-firefox-plugin mozilla-firefox-xpcom\"") >&5
--  ($PKG_CONFIG --exists --print-errors "mozilla-firefox-plugin mozilla-firefox-xpcom") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-xulrunner-plugin mozilla-firefox-xpcom\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "mozilla-xulrunner-plugin mozilla-firefox-xpcom") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "mozilla-firefox-plugin mozilla-firefox-xpcom" 2>/dev/null`
-+  pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "mozilla-xulrunner-plugin mozilla-firefox-xpcom" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -7265,12 +7265,12 @@
-         pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-firefox-plugin mozilla-firefox-xpcom\"") >&5
--  ($PKG_CONFIG --exists --print-errors "mozilla-firefox-plugin mozilla-firefox-xpcom") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-xulrunner-plugin mozilla-firefox-xpcom\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "mozilla-xulrunner-plugin mozilla-firefox-xpcom") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "mozilla-firefox-plugin mozilla-firefox-xpcom" 2>/dev/null`
-+  pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "mozilla-xulrunner-plugin mozilla-firefox-xpcom" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -7289,9 +7289,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mozilla-firefox-plugin mozilla-firefox-xpcom"`
-+	        MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mozilla-xulrunner-plugin mozilla-firefox-xpcom"`
-         else
--	        MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-firefox-plugin mozilla-firefox-xpcom"`
-+	        MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-xulrunner-plugin mozilla-firefox-xpcom"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$MOZILLA_PKG_ERRORS" >&5
-
diff --git a/dev-java/icedtea/files/icedtea-1.7.env b/dev-java/icedtea/files/icedtea-1.7.env
deleted file mode 100644
index 45d44b0..0000000
--- a/dev-java/icedtea/files/icedtea-1.7.env
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-VERSION="IcedTea @PV@"
-JAVA_HOME=/opt/@P@
-JDK_HOME=/opt/@P@
-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="/opt/@P@/man"
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="1.7"
-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-1.4.ebuild b/dev-java/icedtea/icedtea-1.4.ebuild
deleted file mode 100644
index 08a3e4d..0000000
--- a/dev-java/icedtea/icedtea-1.4.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.05.ebuild,v 1.2 2005/10/10 16:23:12 betelgeuse Exp $
-
-inherit pax-utils eutils java-pkg-2 java-vm-2
-
-
-openjdk="openjdk-7-ea-src-b21-27_sep_2007.zip"
-
-DESCRIPTION="Open Source JDK"
-HOMEPAGE="https://openjdk.dev.java.net/"
-SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz
-http://download.java.net/openjdk/jdk7/promoted/b21/${openjdk}"
-
-SLOT="1.7"
-# Needs other for Apache asm etc see THIRD_PARTY_README
-LICENSE="GPL-2-with-linking-exception sun-prerelease-jdk7"
-KEYWORDS="~amd64 ~x86"
-IUSE="nsplugin xulrunner"
-
-COMMON_DEP="
-	media-libs/alsa-lib
-	media-libs/libpng
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libXtst
-	nsplugin? ( net-libs/xulrunner )"
-
-# Found by included libs but not built by default I think:
-#	dev-libs/elfutils
-# Bundled (should make it to use system copy):
-#   media-libs/jpeg
-
-DEPEND="
-	app-arch/unzip
-	app-arch/zip
-	virtual/motif
-	>=virtual/jdk-1.6
-	dev-java/ant-core
-	x11-libs/libXmu
-	x11-libs/libXrandr
-	x11-libs/libXt
-	x11-proto/inputproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/xineramaproto
-	net-print/cups
-	>=dev-java/eclipse-ecj-3.3
-	>sys-devel/gcc-4.2
-	xulrunner? ( net-libs/xulrunner )
-	${COMMON_DEP}"
-
-RDEPEND="${COMMON_DEP}
-	doc? ( =dev-java/java-sdk-docs-1.6.0* )
-	>=dev-libs/nspr-4.7"
-
-#S="${WORKDIR}/o"
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-pkg_setup() {
-	if ! built_with_use sys-devel/gcc gcj; then
-		eerror "You need to build sys-devel/gcc with USE=gcj enabled."
-		die "gcc w/o gcj-support detected."
-	else
-		einfo "gcc compiled with gcj-support =)"
-	fi
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cp ${DISTDIR}/${openjdk} ${S} || die "copy of openjdk failed"
-	cd ${S}
-	unpack ${openjdk}
-
-	rm -v ${S}/patches/icedtea-debuginfo.patch
-	
-	epatch "${FILESDIR}/icedtea-1.4-gentoo.patch"
-	epatch "${FILESDIR}/icedtea-1.4-no-werror.patch"
-
-	if use xulrunner ; then
-		epatch "${FILESDIR}/icedtea-1.4-xulrunner.patch"
-	fi
-
-}
-
-src_compile() {
-
-	local SUNJDK="$(java-config --select-vm=sun-jdk-1.7 -O)"
-	#local GCJJDK="$(java-config --select-vm=gcj-jdk-4.3 -O)"
-	local GCJJDK="/usr/share/$CHOST/$(has_version gcc)java"
-	local ECJJAR=$(grep CLASS /usr/share/eclipse-ecj-3.[3,4]*/package.env | awk -F= '{print $2}')
-
-	unset CFLAGS CXXFLAGS
-
-	unset JAVA_HOME CLASSPATH LD_LIBRARY_PATH
-
-	./configure --with-ecj-jar=${ECJJAR} \
-				--with-libgcj-jar=${GCJJDK} \
-				--with-icedtea-home=${SUNJDK} || die 'configure failed'
-	
-	#--with-gcj-home=/usr/lib/gcj \
-
-
-	emake -j1 \
-		COMPILER_WARNINGS_FATAL=false \
-		MILESTONE=experimental \
-		BUILD_NUMBER=gentoo-${P} || die 'make failed'
-}
-
-src_install() {
-	local dest=/opt/${P}
-	local ddest="${D}/${dest}"
-	dodir ${dest}
-
-	local arch=i586
-	[[ ${ARCH} = amd64 ]] && arch=amd64
-
-	cd ${S}/openjdk/control/build/linux-${arch}/
-
-	if use doc; then
-		dohtml -r docs/* || die
-	fi
-
-	cd j2sdk-image
-
-	# For some people the files got 600 so doing it manually
-	# should be investigated why this happened
-	if is-java-strict; then
-		if [[ $(find . -perm 600) ]]; then
-			eerror "OpenJDK built with permission mask 600"
-			eerror "report this on #gentoo-java on freenode"
-		fi
-	fi
-
-	# doins can't handle symlinks
-	cp -vRP bin include jre lib man "${ddest}" || die "failed to copy"
-	find "${ddest}" -type f -exec chmod 644 {} +
-	find "${ddest}" -type d -exec chmod 755 {} +
-	chmod 755 ${ddest}/bin/* \
-		${ddest}/jre/bin/* \
-		${ddest}/jre/lib/*/*.{so,cfg} \
-		${ddest}/jre/lib/*/*/*.so \
-		${ddest}/jre/lib/jexec \
-		${ddest}/lib/jexec || die
-
-	if [[ $(find "${ddest}" -perm 600) ]]; then
-		eerror "Files with permission set to 600 found in the image"
-		eerror "please report this to java@gentoo.org"
-	fi
-
-	pax-mark m $(list-paxables ${ddest}{,/jre}/bin/*)
-
-	dodoc LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README || die
-	dohtml README.html || die
-
-	if use examples; then
-		cp -pPR demo sample "${ddest}/share/"
-	fi
-
-	cp src.zip "${ddest}" || die
-
-	if use nsplugin; then
-		local plugin_dir="ns7-gcc29"
-		if has_version '>=sys-devel/gcc-3' ; then
-			plugin_dir="ns7"
-		fi
-		install_mozilla_plugin /opt/${P}/jre/lib/${arch}/gcjwebplugin.so
-	fi
-
-	# create dir for system preferences
-	dodir /opt/${P}/jre/.systemPrefs
-	# Create files used as storage for system preferences.
-	touch ${D}/opt/${P}/jre/.systemPrefs/.system.lock
-	chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.system.lock
-	touch ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile
-	chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile
-
-	set_java_env
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-	echo
-	ewarn "!!!!!! THIS IS SOO BETA ITS ALPHA !!!!!!"
-}
diff --git a/media-sound/remuco-server/Manifest b/media-sound/remuco-server/Manifest
deleted file mode 100644
index e377605..0000000
--- a/media-sound/remuco-server/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX amarok.bpp-0 635 RMD160 9730bcc300b178e11398f433dc5f8feb7491e2d9 SHA1 3467762d17f40649406cfd686d9c7072ccf5fce9 SHA256 c05d60de5a142e8b660ac778caab52345acaf1f9d71207821cfe4cce6911033e
-AUX mpd.bpp-0 378 RMD160 999fff0f4a7004cd355f8edbf4c3a9088dd8206c SHA1 f0cd399c0fa9fe20a1c5df0e1c835edcbed1a899 SHA256 52749aa98a7a442e34e9832e6b1db844ca7cc27a121300fdf9ce06675535ab3c
-AUX remuco-server.initd-0 452 RMD160 958b63329694661f67316825c4195649d473fb11 SHA1 d306676389b7d8b733e5792b371bab7ed9d0052b SHA256 8534415cde5752b5dce86c5e6d04a3694bc627d2256be98e4264e83b2e22ccd4
-AUX remuco-server.initd-1 445 RMD160 78d8f905330fe7830e210d57c318279c48f8b6f2 SHA1 8dc06ad1f4f94bb2e762534ce8ecf65f4be9195e SHA256 db9b498393d32f46fb52c33e3cfe290ae66277e2f2844d17f53f55d08435336a
-AUX totem.bpp-0 190 RMD160 64bc2a76a7999172d16db3c08192c1e79c07a76a SHA1 793f0d4c1c4ca6c939770823263ad7386648cfc5 SHA256 c6b14fde527e760c40cf01243e1424df39595b5ce25c7efba40205fd76502479
-DIST remuco-rhythmbox-0.7.1.tar.gz 18049 RMD160 5af88fdf9f4fbf2fd4ca5e3e95112ad2500fa4be SHA1 7cb8feef5e2f34a6f18bb4219c5063a516ab0042 SHA256 687b293f8a6c2643c1200b1f988ef5d5437315194dc602d9989a8709e609c324
-DIST remuco-server-0.7.2.tar.gz 65689 RMD160 124061a84309e91cf763d1ae3f901c431dbee98c SHA1 2af739bda309d7fab59632d4dc36a7068019461e SHA256 6a70be56c2804997b60a5fd73c44bf141f72e24b9990fcf9e761c62a8ead086c
-DIST remuco-xmms2-0.7.1.tar.gz 15786 RMD160 d331cc844622397743af18261a46591d447c8fb0 SHA1 dd5cc828321ef493c233a2f56c182958719a0cfc SHA256 91383b74317680178d67bd8e32f98100d8bd2476af6f8941c3148d5795219a65
-EBUILD remuco-server-0.7.2.ebuild 2373 RMD160 f693ce497333b596c94295663878e3de82913f34 SHA1 da5368ace0adae4ec29f297a72392f1d031c0806 SHA256 89d9c2f8c475d07d5563b66444892da2a1435788f504290110c9eba60882314b
diff --git a/media-sound/remuco-server/files/amarok.bpp-0 b/media-sound/remuco-server/files/amarok.bpp-0
deleted file mode 100644
index 2922812..0000000
--- a/media-sound/remuco-server/files/amarok.bpp-0
+++ /dev/null
@@ -1,21 +0,0 @@
-[config]
-
-[commands]
-
-running = dcop amarok
-
-playpause = dcop amarok player playPause
-next = dcop amarok player next
-prev = dcop amarok player prev
-next = dcop amarok player next
-stop = dcop amarok player stop
-seek-fwd = dcop amarok player seekRelative 5
-seek-bwd = dcop amarok player seekRelative -5
-volume-set = dcop amarok player setVolume $PARAM
-jump = dcop amarok playlist playByIndex $PARAM
-
-playing = dcop amarok player isPlaying
-volume = dcop amarok player getVolume
-plob = dcop amarok player nowPlaying
-playlist = cat `dcop amarok playlist saveCurrentPlaylist` | grep "<Title>" | sed -e "s,^ *<Title>\\(.*\\)</Title> *,\\1,"
-
diff --git a/media-sound/remuco-server/files/mpd.bpp-0 b/media-sound/remuco-server/files/mpd.bpp-0
deleted file mode 100644
index 304924b..0000000
--- a/media-sound/remuco-server/files/mpd.bpp-0
+++ /dev/null
@@ -1,20 +0,0 @@
-[config]
-
-[commands]
-
-running = mpc
-
-playpause = mpc toggle
-next = mpc next
-prev = mpc prev
-stop = mpc stop
-seek-fwd = mpc seek +5s
-seek-bwd = mpc seek -5s
-volume-set = mpc volume $PARAM
-mute = mpc volume 0
-jump = mpc play $( expr $PARAM + 2 )
-
-playing = mpc | fgrep playing
-volume = mpc | fgrep volume | cut -d ' ' -f2 | tr -d '%'
-plob = mpc | head -n1
-playlist = mpc playlist
diff --git a/media-sound/remuco-server/files/remuco-server.initd-0 b/media-sound/remuco-server/files/remuco-server.initd-0
deleted file mode 100644
index e46b873..0000000
--- a/media-sound/remuco-server/files/remuco-server.initd-0
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-start() {
-	ebegin "Starting remuco-server"
-	start-stop-daemon --start --exec /usr/bin/remuco-server --pidfile /var/run/remuco-server.pid \
-		--make-pidfile --chuid remuco --background
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping remuco-server"
-	start-stop-daemon --stop --pidfile /var/run/remuco-server.pid
-	eend $?
-
-}
diff --git a/media-sound/remuco-server/files/remuco-server.initd-1 b/media-sound/remuco-server/files/remuco-server.initd-1
deleted file mode 100644
index 3dd6503..0000000
--- a/media-sound/remuco-server/files/remuco-server.initd-1
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-start() {
-	ebegin "Starting remuco-server"
-	start-stop-daemon --start --exec /usr/bin/remuco --pidfile /var/run/remuco-server.pid \
-		--make-pidfile --chuid remuco --background
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping remuco-server"
-	start-stop-daemon --stop --pidfile /var/run/remuco-server.pid
-	eend $?
-
-}
diff --git a/media-sound/remuco-server/files/totem.bpp-0 b/media-sound/remuco-server/files/totem.bpp-0
deleted file mode 100644
index edf8a77..0000000
--- a/media-sound/remuco-server/files/totem.bpp-0
+++ /dev/null
@@ -1,16 +0,0 @@
-[config]
-
-tick = 10
-
-[commands]
-
-running = pidof totem
-
-playpause = totem --play-pause
-
-next = totem --next
-prev = totem --previous
-
-seek-fwd = totem --seek-fwd
-seek-bwd = totem --seek-bwd
-
diff --git a/media-sound/remuco-server/remuco-server-0.7.2.ebuild b/media-sound/remuco-server/remuco-server-0.7.2.ebuild
deleted file mode 100644
index d4e4c1b..0000000
--- a/media-sound/remuco-server/remuco-server-0.7.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-PROXY_V=${PV/2/1}
-MY_PN="remuco"
-
-DESCRIPTION="Remuco is a remote control system for Linux media players and
-mobile devices equipped with Bluetooth or WLAN"
-HOMEPAGE="http://remuco.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${MY_PN}/${P}.tar.gz
-	mirror://sourceforge/${MY_PN}/remuco-xmms2-${PROXY_V}.tar.gz
-	mirror://sourceforge/${MY_PN}/remuco-rhythmbox-${PROXY_V}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="amarok daemon mpd rhythmbox totem xmms2"
-
-DEPEND="dev-libs/glib:2 dev-libs/dbus-glib net-wireless/bluez-libs"
-RDEPEND="${DEPEND}
-	xmms2? ( dev-python/dbus-python )
-	rhythmbox? (
-		dev-python/dbus-python
-		>=media-sound/rhythmbox-0.11.5
-		)
-	"
-
-pkg_preinst() {
-	use daemon && enewuser remuco -1 -1 /etc/remuco
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "failed install remuco-server"
-
-	if use daemon ; then
-		keepdir /etc/remuco/.config/remuco
-		fowners remuco:root /etc/remuco/
-		fowners remuco:root /etc/remuco/.config
-		fowners remuco:root /etc/remuco/.config/remuco
-		dosym .config/remuco /etc/remuco/config
-		newinitd "${FILESDIR}/remuco-server.initd-0" remuco-server
-	fi
-
-	if use xmms2 ; then
-		cd "${S}/../remuco-xmms2-${PV}"
-		emake install DESTDIR="${D}" || die "failed install remuco-xmms2"
-		cd "$S"
-		einfo "run ln -s /usr/bin/remuco-xmms2 ~/.config/xmms2/startup.d to use\
-		remuco-xmms2 for your user account"
-	fi
-	
-	if use rhythmbox ; then
-		cd ${S}/../remuco-rhythmbox-${PV}
-		emake install DESTDIR="${D}" || die "failed install remuco-rhythmbox"
-		cd "${S}"
-	fi
-
-	if use amarok ; then
-		insinto /usr/share/${PN}
-		newins ${FILESDIR}/amarok.bpp-0 amarok.bpp
-		use daemon && dosym /usr/share/${PN}/amarok.bpp /etc/remuco/config/
-		einfo "run ln -s /usr/share/${PN}/amarok.bpp ~/.config/remuco/ to use it"
-	fi
-	
-	if use mpd ; then
-		insinto /usr/share/${PN}
-		newins ${FILESDIR}/mpd.bpp-0 mpd.bpp
-		use daemon && dosym /usr/share/${PN}/mpd.bpp /etc/remuco/config/
-		einfo "ln -s /usr/share/${PN}/mpd.bpp ~/.config/remuco/ to use it"
-	fi
-	
-	if use totem ; then
-		insinto /usr/share/${PN}
-		newins ${FILESDIR}/totem.bpp-0 totem.bpp
-		use daemon && dosym /usr/share/${PN}/totem.bpp /etc/remuco/config/
-		einfo "ln -s /usr/share/${PN}/totem.bpp ~/.config/remuco/ to use it"
-	fi
-}
diff --git a/sci-geosciences/tah/Manifest b/sci-geosciences/tah/Manifest
deleted file mode 100644
index 107c04b..0000000
--- a/sci-geosciences/tah/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX local_conf-2.patch 2398 RMD160 555485553757c164a39a9a3eb425a379030ffc91 SHA1 af7b2d7bc03b968070dee6c8069f57e1493d4a25 SHA256 d47f40388a97ffb2301c34c8bb783ac48a2ce51c4b535551b89577b22c4d207e
-AUX local_conf.patch 1131 RMD160 03751af034fc3fa9abe35c126a35b25a48e579ae SHA1 fc863b21e6753a2f962386b0f253a395be2a891f SHA256 e0ea914369a61e7c0798f3aafba9c355d3340dcbfb9603f50a63933a22840429
-AUX tilesGen 44 RMD160 7857ef06a4b2be30bec15663f42afced73ac6dc5 SHA1 772ed487d62993549b995c3d1ee4f76f52252e40 SHA256 09d3ae7eddac134f1fbdf6df30ff5a582e66dfa2bc39c65705f7f4ed7895b753
-EBUILD tah-9999-r1.ebuild 1267 RMD160 11b599d3e1117c8832245aa9b39eab87ee3ddc47 SHA1 3a7e732cb70cc067ff74b0915eb2c992779db26b SHA256 e3e6e8ffe6107c2b3710c41cb176a2453124a5858786b34eea846602c7442bc9
-EBUILD tah-9999-r2.ebuild 1287 RMD160 4233671364b32995758e0e7f405c56d92360a750 SHA1 5f89f5c9fb176aec404e204f1d6f9e7b71c6944d SHA256 04a77cdc4bd10e9fcfa0aeef65456dcc60b112f11cba6d5ab005cdc74142159a
-EBUILD tah-9999.ebuild 1144 RMD160 9e5b21091340932cec220e62f6cf38d1cb6d3aa2 SHA1 a5a0f794760334c077d73b8f732fe2904807e907 SHA256 864a7f7210a29d1562e8bdaa96315aace9270da0576840ecdbc49d5142901b0d
diff --git a/sci-geosciences/tah/files/local_conf-2.patch b/sci-geosciences/tah/files/local_conf-2.patch
deleted file mode 100644
index 32d8a21..0000000
--- a/sci-geosciences/tah/files/local_conf-2.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Index: tilesGen.pl
-===================================================================
---- tilesGen.pl	(revision 7387)
-+++ tilesGen.pl	(working copy)
-@@ -33,7 +33,7 @@
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- #-----------------------------------------------------------------------------
- # Read the config file
--my %Config = ReadConfig("tilesAtHome.conf", "general.conf", "authentication.conf", "layers.conf");
-+my %Config = ReadConfig("$ENV{'HOME'}/.tah/tilesAtHome.conf", "general.conf", "$ENV{'HOME'}/.tah/authentication.conf", "layers.conf");
- my %EnvironmentInfo = CheckConfig(\%Config);
- 
- my $Layers = $Config{"Layers"};
-Index: upload.pl
-===================================================================
---- upload.pl	(revision 7387)
-+++ upload.pl	(working copy)
-@@ -35,7 +35,7 @@
- }
- 
- # conf file, will contain username/password and environment info
--my %Config = ReadConfig("tilesAtHome.conf", "general.conf", "authentication.conf", "layers.conf");
-+my %Config = ReadConfig("$ENV{'HOME'}/.tah/tilesAtHome.conf", "general.conf", "$ENV{'HOME'}/.tah/authentication.conf", "layers.conf");
- 
- if ($Config{"LocalSlippymap"})
- {
-Index: compress.pl
-===================================================================
---- compress.pl	(revision 7387)
-+++ compress.pl	(working copy)
-@@ -28,7 +28,7 @@
- #-----------------------------------------------------------------------------
- 
- # conf file, will contain username/password and environment info
--my %Config = ReadConfig("tilesAtHome.conf", "general.conf", "authentication.conf", "layers.conf");
-+my %Config = ReadConfig("$ENV{'HOME'}/.tah/tilesAtHome.conf", "general.conf", "$ENV{'HOME'}/.tah/authentication.conf", "layers.conf");
- 
- if ($Config{"LocalSlippymap"})
- {
-Index: tahlib.pm
-===================================================================
---- tahlib.pm	(revision 7387)
-+++ tahlib.pm	(working copy)
-@@ -3,7 +3,7 @@
- # =====================================================================
- # The following is duplicated from tilesGen.pl
- # =====================================================================
--my %Config = ReadConfig("tilesAtHome.conf", "general.conf", "authentication.conf", "layers.conf");
-+my %Config = ReadConfig("$ENV{'HOME'}/.tah/tilesAtHome.conf", "general.conf", "$ENV{'HOME'}/.tah/authentication.conf", "layers.conf");
- my $lastmsglen = 0;
- 
- my $idleFor = 0;
diff --git a/sci-geosciences/tah/files/local_conf.patch b/sci-geosciences/tah/files/local_conf.patch
deleted file mode 100644
index 15cb125..0000000
--- a/sci-geosciences/tah/files/local_conf.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- tilesGen.pl	(revision 7387)
-+++ tilesGen.pl	(working copy)
-@@ -33,7 +33,7 @@
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- #-----------------------------------------------------------------------------
- # Read the config file
--my %Config = ReadConfig("tilesAtHome.conf", "general.conf", "authentication.conf", "layers.conf");
-+my %Config = ReadConfig("$ENV{'HOME'}/.tah/tilesAtHome.conf", "general.conf", "$ENV{'HOME'}/.tah/authentication.conf", "layers.conf");
- my %EnvironmentInfo = CheckConfig(\%Config);
- 
- my $Layers = $Config{"Layers"};
---- tahlib.pm	(revision 7387)
-+++ tahlib.pm	(working copy)
-@@ -3,7 +3,7 @@
- # =====================================================================
- # The following is duplicated from tilesGen.pl
- # =====================================================================
--my %Config = ReadConfig("tilesAtHome.conf", "general.conf", "authentication.conf", "layers.conf");
-+my %Config = ReadConfig("$ENV{'HOME'}/.tah/tilesAtHome.conf", "general.conf", "$ENV{'HOME'}/.tah/authentication.conf", "layers.conf");
- my $lastmsglen = 0;
- 
- my $idleFor = 0;
diff --git a/sci-geosciences/tah/files/tilesGen b/sci-geosciences/tah/files/tilesGen
deleted file mode 100755
index a6093da..0000000
--- a/sci-geosciences/tah/files/tilesGen
+++ /dev/null
@@ -1,4 +0,0 @@
-#! /bin/sh
-
-cd /opt/tah/
-./tilesGen.pl "$@"
diff --git a/sci-geosciences/tah/tah-9999-r1.ebuild b/sci-geosciences/tah/tah-9999-r1.ebuild
deleted file mode 100644
index 1a11487..0000000
--- a/sci-geosciences/tah/tah-9999-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils subversion
-
-DESCRIPTION="Tiles@home (short: T@H or t@h) is a distributed program to render
-osmarender maps."
-HOMEPAGE="http://tah.openstreetmap.org/"
-SRC_URI=""
-
-ESVN_REPO_URI="http://svn.openstreetmap.org/applications/rendering/tilesAtHome/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="virtual/perl-File-Spec dev-perl/Math-VecStat dev-perl/libwww-perl
-	dev-perl/GD app-text/xmlstarlet dev-perl/Math-Vec media-gfx/pngcrush
-	media-gfx/inkscape
-	app-arch/zip app-arch/unzip
-	media-fonts/dejavu"
-
-
-pkg_setup(){
-	if ! built_with_use dev-perl/GD png; then
-		eerror "                                                 "
-		eerror "you need to compile dev-perl/GD with png useflag "
-		eerror "                                                 "
-		die "dev-perl/GD is emerged without png useflag!"
-	fi
-}
-
-src_install() {
-	patch < ${FILESDIR}/local_conf-2.patch
-	diropts -m2770
-	dodir /opt/${PN}
-	fowners root:users /opt/${PN}
-
-	insinto /opt/${PN}
-	insopts -m660
-	doins -r *
-
-	exeinto /opt/${PN}
-	exeopts -m750
-	doexe *.pl
-
-	exeinto /opt/bin
-	doexe ${FILESDIR}/tilesGen
-	fowners root:users /opt/bin/tilesGen
-}
-
diff --git a/sci-geosciences/tah/tah-9999-r2.ebuild b/sci-geosciences/tah/tah-9999-r2.ebuild
deleted file mode 100644
index 9e7621e..0000000
--- a/sci-geosciences/tah/tah-9999-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils subversion
-
-DESCRIPTION="Tiles@home (short: T@H or t@h) is a distributed program to render
-osmarender maps."
-HOMEPAGE="http://tah.openstreetmap.org/"
-SRC_URI=""
-
-ESVN_REPO_URI="http://svn.openstreetmap.org/applications/rendering/tilesAtHome/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="virtual/perl-File-Spec dev-perl/Math-VecStat dev-perl/libwww-perl
-	dev-perl/GD app-text/xmlstarlet dev-perl/Math-Vec media-gfx/pngcrush
-	media-gfx/inkscape
-	app-arch/zip app-arch/unzip
-	media-fonts/dejavu
-	dev-perl/AppConfig"
-
-
-pkg_setup(){
-	if ! built_with_use dev-perl/GD png; then
-		eerror "                                                 "
-		eerror "you need to compile dev-perl/GD with png useflag "
-		eerror "                                                 "
-		die "dev-perl/GD is emerged without png useflag!"
-	fi
-}
-
-src_install() {
-	patch < ${FILESDIR}/local_conf-2.patch
-	diropts -m2770
-	dodir /opt/${PN}
-	fowners root:users /opt/${PN}
-
-	insinto /opt/${PN}
-	insopts -m660
-	doins -r *
-
-	exeinto /opt/${PN}
-	exeopts -m750
-	doexe *.pl
-
-	exeinto /opt/bin
-	doexe ${FILESDIR}/tilesGen
-	fowners root:users /opt/bin/tilesGen
-}
-
diff --git a/sci-geosciences/tah/tah-9999.ebuild b/sci-geosciences/tah/tah-9999.ebuild
deleted file mode 100644
index ca38f7a..0000000
--- a/sci-geosciences/tah/tah-9999.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils subversion
-
-DESCRIPTION="Tiles@home (short: T@H or t@h) is a distributed program to render
-osmarender maps."
-HOMEPAGE="http://tah.openstreetmap.org/"
-SRC_URI=""
-
-ESVN_REPO_URI="http://svn.openstreetmap.org/applications/rendering/tilesAtHome/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="virtual/perl-File-Spec dev-perl/Math-VecStat dev-perl/libwww-perl
-	dev-perl/GD app-text/xmlstarlet dev-perl/Math-Vec media-gfx/pngcrush
-	media-gfx/inkscape
-	app-arch/zip app-arch/unzip
-	media-fonts/dejavu"
-
-
-pkg_setup(){
-	if ! built_with_use dev-perl/GD png; then
-		eerror "                                                 "
-		eerror "you need to compile dev-perl/GD with png useflag "
-		eerror "                                                 "
-		die "dev-perl/GD is emerged without png useflag!"
-	fi
-}
-
-src_install() {
-	patch < ${FILESDIR}/local_conf.patch
-	#dodir /opt/${PN}
-
-	insinto /opt/${PN}
-	doins -r *
-
-	exeinto /opt/${PN}
-	doexe *.pl
-
-	exeinto /opt/bin
-	doexe ${FILESDIR}/tilesGen
-}
-
diff --git a/x11-misc/read-edid/Manifest b/x11-misc/read-edid/Manifest
deleted file mode 100644
index b990b2a..0000000
--- a/x11-misc/read-edid/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST read-edid-2.0.0.tar.gz 82282 RMD160 8dc10ab6ed09d567b4ca161e943eeb85a1dc407a SHA1 8605a242c0a104a70ab1a5cdd616fffbac52d6c8 SHA256 246ec14ec509e09ac26fe6862b120481b2cc881e2f142ba40886d6eec15e77e8
-EBUILD read-edid-2.0.0.ebuild 597 RMD160 a9c8b3ca5347bffffefb956d1cf9b0606816a6fb SHA1 a79ca44c61a91e0ebae4100b25935c9c03a0c870 SHA256 14d55110cfdf78bce668290c705786a11fa95dac2ee1f761c45c01e0a75884e3
diff --git a/x11-misc/read-edid/read-edid-2.0.0.ebuild b/x11-misc/read-edid/read-edid-2.0.0.ebuild
deleted file mode 100644
index 30a782f..0000000
--- a/x11-misc/read-edid/read-edid-2.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: Exp $
-
-inherit autotools eutils
-
-DESCRIPTION="program that can get information from a pnp monitor."
-HOMEPAGE="http://polypux.org/projects/read-edid/"
-SRC_URI="http://polypux.org/projects/read-edid/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ~sparc x86"
-IUSE=""
-DEPEND="dev-libs/libx86"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README
-}