diff --git a/dev-java/ICEpdf/ICEpdf-4.1.0.ebuild b/dev-java/ICEpdf/ICEpdf-4.1.0.ebuild
deleted file mode 100644
index c64a1b4f..00000000
--- a/dev-java/ICEpdf/ICEpdf-4.1.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=1
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java PDF Renderer"
-HOMEPAGE="http://www.icepdf.org/"
-SRC_URI="${PN}-${PV}-src.zip"
-RESTRICT="fetch"
-
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-IUSE=""
-
-COMMON_DEP="
-	"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-		app-arch/unzip
-		${COMMON_DEP}"
-
-S=${WORKDIR}/${PN}-${PV}-src/icepdf
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-}
-
-EANT_BUILD_TARGET="build.jars"
-EANT_DOC_TARGET=""
-
-src_install() {
-	die
-	java-pkg_dojar
-	use doc && java-pkg_dojavadoc
-	use source && java-pkg_dosrc
-}
diff --git a/dev-java/ICEpdf/ICEpdf-4.1.1.ebuild b/dev-java/ICEpdf/ICEpdf-4.1.1.ebuild
deleted file mode 100644
index c64a1b4f..00000000
--- a/dev-java/ICEpdf/ICEpdf-4.1.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=1
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java PDF Renderer"
-HOMEPAGE="http://www.icepdf.org/"
-SRC_URI="${PN}-${PV}-src.zip"
-RESTRICT="fetch"
-
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-IUSE=""
-
-COMMON_DEP="
-	"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-		app-arch/unzip
-		${COMMON_DEP}"
-
-S=${WORKDIR}/${PN}-${PV}-src/icepdf
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-}
-
-EANT_BUILD_TARGET="build.jars"
-EANT_DOC_TARGET=""
-
-src_install() {
-	die
-	java-pkg_dojar
-	use doc && java-pkg_dojavadoc
-	use source && java-pkg_dosrc
-}
diff --git a/dev-java/ICEpdf/ICEpdf-4.1.4.ebuild b/dev-java/ICEpdf/ICEpdf-4.1.4.ebuild
deleted file mode 100644
index c64a1b4f..00000000
--- a/dev-java/ICEpdf/ICEpdf-4.1.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=1
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java PDF Renderer"
-HOMEPAGE="http://www.icepdf.org/"
-SRC_URI="${PN}-${PV}-src.zip"
-RESTRICT="fetch"
-
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-IUSE=""
-
-COMMON_DEP="
-	"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-		app-arch/unzip
-		${COMMON_DEP}"
-
-S=${WORKDIR}/${PN}-${PV}-src/icepdf
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-}
-
-EANT_BUILD_TARGET="build.jars"
-EANT_DOC_TARGET=""
-
-src_install() {
-	die
-	java-pkg_dojar
-	use doc && java-pkg_dojavadoc
-	use source && java-pkg_dosrc
-}
diff --git a/dev-java/ICEpdf/ICEpdf-4.2.0.ebuild b/dev-java/ICEpdf/ICEpdf-4.2.0.ebuild
deleted file mode 100644
index 934d20f6..00000000
--- a/dev-java/ICEpdf/ICEpdf-4.2.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=1
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java PDF Renderer"
-HOMEPAGE="http://www.icepdf.org/"
-SRC_URI="${PN}-${PV}-src.zip"
-RESTRICT="fetch"
-
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-IUSE="source"
-
-COMMON_DEP="
-	dev-java/batik:1.7"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-		app-arch/unzip
-		${COMMON_DEP}"
-
-S=${WORKDIR}/${PN}-${PV}-src/icepdf
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-}
-
-src_prepare() {
-	cd "${S}/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from batik-1.7
-}
-
-EANT_BUILD_TARGET="build.jars"
-EANT_DOC_TARGET=""
-
-src_install() {
-	java-pkg_dojar lib/icepdf-core.jar lib/icepdf-viewer.jar
-	use source && java-pkg_dosrc core/src viewer/src
-}
diff --git a/dev-java/iscwt/files/build.xml b/dev-java/iscwt/files/build.xml
index 8097bd22..38c81c31 100644
--- a/dev-java/iscwt/files/build.xml
+++ b/dev-java/iscwt/files/build.xml
@@ -47,7 +47,7 @@
     </path>
 
     <!-- Compile the java code -->
-    <javac compiler="javac1.4" target="1.4" source="1.4" srcdir="${iscwt.src.dir}" destdir="${iscwt.build.dir}" debug="true">
+    <javac compiler="javac1.6" target="1.6" source="1.6" srcdir="${iscwt.src.dir}" destdir="${iscwt.build.dir}" debug="true">
     	<classpath refid="iscwt.classpath"/>
     </javac>
   </target>
diff --git a/dev-java/iscwt/iscwt-5.0.20081218.ebuild b/dev-java/iscwt/iscwt-5.0.20081218.ebuild
deleted file mode 100644
index d7da221a..00000000
--- a/dev-java/iscwt/iscwt-5.0.20081218.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-JAVA_PKG_IUSE="source doc"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="swt-3.4,isfreetype,isnativec,isrt,jna"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="This is a window toolkit and basic rendering abstraction layer."
-HOMEPAGE="http://opensource.intarsys.de/"
-SRC_URI="mirror://sourceforge/jpodrenderer/isCWT.${PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="dev-java/jna:0
-	    dev-java/swt:3.4
-	    dev-java/isrt:0
-	    dev-java/isnativec:0
-	    dev-java/isfreetype:0"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	${COMMON_DEP}
-	app-arch/unzip"
-
-S="${WORKDIR}"/distribution
-
-src_prepare() {
-	cp "${FILESDIR}"/build.* "${S}"
-}
-
-src_install() {
-	java-pkg_dojar build/iscwt/dist/iscwt.jar
-
-	use source && java-pkg_dosrc src/*
-
-	use doc && java-pkg_dojavadoc build/iscwt/javadoc
-}
diff --git a/dev-java/iscwt/iscwt-5.2.20091102.ebuild b/dev-java/iscwt/iscwt-5.2.20091102.ebuild
deleted file mode 100644
index d7da221a..00000000
--- a/dev-java/iscwt/iscwt-5.2.20091102.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-JAVA_PKG_IUSE="source doc"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="swt-3.4,isfreetype,isnativec,isrt,jna"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="This is a window toolkit and basic rendering abstraction layer."
-HOMEPAGE="http://opensource.intarsys.de/"
-SRC_URI="mirror://sourceforge/jpodrenderer/isCWT.${PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="dev-java/jna:0
-	    dev-java/swt:3.4
-	    dev-java/isrt:0
-	    dev-java/isnativec:0
-	    dev-java/isfreetype:0"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	${COMMON_DEP}
-	app-arch/unzip"
-
-S="${WORKDIR}"/distribution
-
-src_prepare() {
-	cp "${FILESDIR}"/build.* "${S}"
-}
-
-src_install() {
-	java-pkg_dojar build/iscwt/dist/iscwt.jar
-
-	use source && java-pkg_dosrc src/*
-
-	use doc && java-pkg_dojavadoc build/iscwt/javadoc
-}
diff --git a/dev-java/iscwt/iscwt-5.3.20100629.ebuild b/dev-java/iscwt/iscwt-5.3.20100629.ebuild
index af6660dd..db3a5b60 100644
--- a/dev-java/iscwt/iscwt-5.3.20100629.ebuild
+++ b/dev-java/iscwt/iscwt-5.3.20100629.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI=4
 
 JAVA_PKG_IUSE="source doc"
 JAVA_ANT_REWRITE_CLASSPATH="true"
@@ -24,15 +24,15 @@ COMMON_DEP="dev-java/jna:0
 	    dev-java/isrt:0
 	    dev-java/isnativec:0
 	    dev-java/isfreetype:0"
-RDEPEND=">=virtual/jre-1.5
+RDEPEND=">=virtual/jre-1.6
 	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
+DEPEND=">=virtual/jdk-1.6
 	${COMMON_DEP}
 	app-arch/unzip"
 
 S="${WORKDIR}"/distribution
 
-src_prepare() {
+java_prepare() {
 	cp "${FILESDIR}"/build.* "${S}"
 }
 
diff --git a/dev-java/isfreetype/files/build.xml b/dev-java/isfreetype/files/build.xml
index 8e9dd43a..cf456b85 100644
--- a/dev-java/isfreetype/files/build.xml
+++ b/dev-java/isfreetype/files/build.xml
@@ -45,7 +45,7 @@
     </path>
 
     <!-- Compile the java code -->
-    <javac compiler="javac1.4" target="1.4" source="1.4" srcdir="${isfreetype.src.dir}" destdir="${isfreetype.build.dir}" debug="true">
+    <javac compiler="javac1.6" target="1.6" source="1.6" srcdir="${isfreetype.src.dir}" destdir="${isfreetype.build.dir}" debug="true">
     	<classpath refid="isfreetype.classpath"/>
     </javac>
   </target>
diff --git a/dev-java/isfreetype/isfreetype-5.0.20081218.ebuild b/dev-java/isfreetype/isfreetype-5.0.20081218.ebuild
deleted file mode 100644
index 55bd1b62..00000000
--- a/dev-java/isfreetype/isfreetype-5.0.20081218.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-JAVA_PKG_IUSE="source doc"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="isnativec,isrt,jna"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="This is a generic native code wrapper."
-HOMEPAGE="http://opensource.intarsys.de/"
-SRC_URI="mirror://sourceforge/jpodrenderer/isFreetype.${PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="dev-java/jna:0
-	   dev-java/isrt:0
-	   dev-java/isnativec:0"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	${COMMON_DEP}
-	app-arch/unzip"
-
-S="${WORKDIR}"/distribution
-
-src_prepare() {
-	cp "${FILESDIR}"/build.* "${S}" || die
-}
-
-src_install() {
-	java-pkg_dojar build/isfreetype/dist/isfreetype.jar
-
-	use source && java-pkg_dosrc src/*
-
-	use doc && java-pkg_dojavadoc build/isfreetype/javadoc
-}
diff --git a/dev-java/isfreetype/isfreetype-5.2.20091102.ebuild b/dev-java/isfreetype/isfreetype-5.2.20091102.ebuild
deleted file mode 100644
index 55bd1b62..00000000
--- a/dev-java/isfreetype/isfreetype-5.2.20091102.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-JAVA_PKG_IUSE="source doc"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="isnativec,isrt,jna"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="This is a generic native code wrapper."
-HOMEPAGE="http://opensource.intarsys.de/"
-SRC_URI="mirror://sourceforge/jpodrenderer/isFreetype.${PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="dev-java/jna:0
-	   dev-java/isrt:0
-	   dev-java/isnativec:0"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	${COMMON_DEP}
-	app-arch/unzip"
-
-S="${WORKDIR}"/distribution
-
-src_prepare() {
-	cp "${FILESDIR}"/build.* "${S}" || die
-}
-
-src_install() {
-	java-pkg_dojar build/isfreetype/dist/isfreetype.jar
-
-	use source && java-pkg_dosrc src/*
-
-	use doc && java-pkg_dojavadoc build/isfreetype/javadoc
-}
diff --git a/dev-java/isfreetype/isfreetype-5.3.20100629.ebuild b/dev-java/isfreetype/isfreetype-5.3.20100629.ebuild
index 36e85c63..53602621 100644
--- a/dev-java/isfreetype/isfreetype-5.3.20100629.ebuild
+++ b/dev-java/isfreetype/isfreetype-5.3.20100629.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI=4
 
 JAVA_PKG_IUSE="source doc"
 JAVA_ANT_REWRITE_CLASSPATH="true"
@@ -22,15 +22,15 @@ IUSE=""
 COMMON_DEP="dev-java/jna:0
 	   dev-java/isrt:0
 	   dev-java/isnativec:0"
-RDEPEND=">=virtual/jre-1.5
+RDEPEND=">=virtual/jre-1.6
 	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
+DEPEND=">=virtual/jdk-1.6
 	${COMMON_DEP}
 	app-arch/unzip"
 
 S="${WORKDIR}"/distribution
 
-src_prepare() {
+java_prepare() {
 	cp "${FILESDIR}"/build.* "${S}" || die
 }
 
diff --git a/dev-java/isnativec/files/build.xml b/dev-java/isnativec/files/build.xml
index f3d295fb..338be71b 100644
--- a/dev-java/isnativec/files/build.xml
+++ b/dev-java/isnativec/files/build.xml
@@ -44,7 +44,7 @@
     </path>
 
     <!-- Compile the java code -->
-    <javac compiler="javac1.4" target="1.4" source="1.4" srcdir="${isnativec.src.dir}" destdir="${isnativec.build.dir}" debug="true">
+    <javac compiler="javac1.6" target="1.6" source="1.6" srcdir="${isnativec.src.dir}" destdir="${isnativec.build.dir}" debug="true">
     	<classpath refid="isnativec.classpath"/>
     </javac>
   </target>
diff --git a/dev-java/isnativec/isnativec-5.0.20081218.ebuild b/dev-java/isnativec/isnativec-5.0.20081218.ebuild
deleted file mode 100644
index b9ec23b1..00000000
--- a/dev-java/isnativec/isnativec-5.0.20081218.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-JAVA_PKG_IUSE="source doc"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="isrt,jna"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="This is a generic native code wrapper."
-HOMEPAGE="http://opensource.intarsys.de/"
-SRC_URI="mirror://sourceforge/jpodrenderer/isNative.${PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="dev-java/jna:0
-	   dev-java/isrt:0"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	${COMMON_DEP}
-	app-arch/unzip"
-
-S="${WORKDIR}"/distribution
-
-src_prepare() {
-	cp "${FILESDIR}"/build.* "${S}" || die
-}
-
-src_install() {
-	java-pkg_dojar build/isnativec/dist/isnativec.jar
-
-	use source && java-pkg_dosrc src/*
-
-	use doc && java-pkg_dojavadoc build/isnativec/javadoc
-}
diff --git a/dev-java/isnativec/isnativec-5.2.20091102.ebuild b/dev-java/isnativec/isnativec-5.2.20091102.ebuild
deleted file mode 100644
index b9ec23b1..00000000
--- a/dev-java/isnativec/isnativec-5.2.20091102.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-JAVA_PKG_IUSE="source doc"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="isrt,jna"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="This is a generic native code wrapper."
-HOMEPAGE="http://opensource.intarsys.de/"
-SRC_URI="mirror://sourceforge/jpodrenderer/isNative.${PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="dev-java/jna:0
-	   dev-java/isrt:0"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	${COMMON_DEP}
-	app-arch/unzip"
-
-S="${WORKDIR}"/distribution
-
-src_prepare() {
-	cp "${FILESDIR}"/build.* "${S}" || die
-}
-
-src_install() {
-	java-pkg_dojar build/isnativec/dist/isnativec.jar
-
-	use source && java-pkg_dosrc src/*
-
-	use doc && java-pkg_dojavadoc build/isnativec/javadoc
-}
diff --git a/dev-java/isnativec/isnativec-5.3.20100629.ebuild b/dev-java/isnativec/isnativec-5.3.20100629.ebuild
index 51744683..fda1b434 100644
--- a/dev-java/isnativec/isnativec-5.3.20100629.ebuild
+++ b/dev-java/isnativec/isnativec-5.3.20100629.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI=4
 
 JAVA_PKG_IUSE="source doc"
 JAVA_ANT_REWRITE_CLASSPATH="true"
@@ -29,7 +29,7 @@ DEPEND=">=virtual/jdk-1.5
 
 S="${WORKDIR}"/distribution
 
-src_prepare() {
+java_prepare() {
 	cp "${FILESDIR}"/build.* "${S}" || die
 }
 
diff --git a/dev-java/isrt/files/build.xml b/dev-java/isrt/files/build.xml
index df40ebdb..6ae7d06b 100644
--- a/dev-java/isrt/files/build.xml
+++ b/dev-java/isrt/files/build.xml
@@ -43,7 +43,7 @@
     </path>
 
     <!-- Compile the java code -->
-    <javac compiler="javac1.4" target="1.4" source="1.4" srcdir="${isrt.src.dir}" destdir="${isrt.build.dir}" debug="true">
+    <javac compiler="javac1.6" target="1.6" source="1.6" srcdir="${isrt.src.dir}" destdir="${isrt.build.dir}" debug="true">
     	<classpath refid="isrt.classpath"/>
     </javac>
   </target>
diff --git a/dev-java/isrt/isrt-4.5.20081218.ebuild b/dev-java/isrt/isrt-4.5.20081218.ebuild
deleted file mode 100644
index e3d09ea9..00000000
--- a/dev-java/isrt/isrt-4.5.20081218.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-JAVA_PKG_IUSE="source doc"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="The basic runtime tools and interfaces for intarsys components."
-HOMEPAGE="http://opensource.intarsys.de/"
-SRC_URI="mirror://sourceforge/jpodrenderer/isrt.${PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip"
-
-S="${WORKDIR}"/distribution
-
-src_prepare() {
-	cp "${FILESDIR}"/build.* "${S}" || die
-}
-
-src_install() {
-	java-pkg_dojar build/isrt/dist/isrt.jar
-
-	use source && java-pkg_dosrc src/*
-
-	use doc && java-pkg_dojavadoc build/isrt/javadoc
-}
diff --git a/dev-java/isrt/isrt-4.7.20091102.ebuild b/dev-java/isrt/isrt-4.7.20091102.ebuild
deleted file mode 100644
index e3d09ea9..00000000
--- a/dev-java/isrt/isrt-4.7.20091102.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-JAVA_PKG_IUSE="source doc"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="The basic runtime tools and interfaces for intarsys components."
-HOMEPAGE="http://opensource.intarsys.de/"
-SRC_URI="mirror://sourceforge/jpodrenderer/isrt.${PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip"
-
-S="${WORKDIR}"/distribution
-
-src_prepare() {
-	cp "${FILESDIR}"/build.* "${S}" || die
-}
-
-src_install() {
-	java-pkg_dojar build/isrt/dist/isrt.jar
-
-	use source && java-pkg_dosrc src/*
-
-	use doc && java-pkg_dojavadoc build/isrt/javadoc
-}
diff --git a/dev-java/isrt/isrt-4.8.20100629.ebuild b/dev-java/isrt/isrt-4.8.20100629.ebuild
index 1d710a78..bd7de356 100644
--- a/dev-java/isrt/isrt-4.8.20100629.ebuild
+++ b/dev-java/isrt/isrt-4.8.20100629.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI=4
 
 JAVA_PKG_IUSE="source doc"
 
@@ -17,13 +17,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
 	app-arch/unzip"
 
 S="${WORKDIR}"/distribution
 
-src_prepare() {
+java_prepare() {
 	cp "${FILESDIR}"/build.* "${S}" || die
 }
 
diff --git a/dev-java/jPod/files/build.xml b/dev-java/jPod/files/build.xml
index d2344f24..3254dc8f 100644
--- a/dev-java/jPod/files/build.xml
+++ b/dev-java/jPod/files/build.xml
@@ -45,7 +45,7 @@
     </path>
 
     <!-- Compile the java code -->
-    <javac compiler="javac1.4" target="1.4" source="1.4" srcdir="${jPod.src.dir}" destdir="${jPod.build.dir}" debug="true">
+    <javac compiler="javac1.6" target="1.6" source="1.6" srcdir="${jPod.src.dir}" destdir="${jPod.build.dir}" debug="true">
     	<classpath refid="jPod.classpath"/>
     </javac>
   </target>
diff --git a/dev-java/jPod/jPod-5.0.20081218.ebuild b/dev-java/jPod/jPod-5.0.20081218.ebuild
deleted file mode 100644
index df1efe72..00000000
--- a/dev-java/jPod/jPod-5.0.20081218.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-JAVA_PKG_IUSE="source doc"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="jbig2,iscwt,isrt"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A library for reading, writing and manipulating PDF files."
-HOMEPAGE="http://opensource.intarsys.de/"
-SRC_URI="mirror://sourceforge/jpodrenderer/jPod.${PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="dev-java/isrt:0
-	    dev-java/jbig2:0
-	    dev-java/iscwt:0"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	${COMMON_DEP}
-	app-arch/unzip"
-
-S="${WORKDIR}"/distribution
-
-src_prepare() {
-	cp "${FILESDIR}"/build.* "${S}" || die
-}
-
-src_install() {
-	java-pkg_dojar build/jPod/dist/jPod.jar
-
-	use source && java-pkg_dosrc src/*
-
-	use doc && java-pkg_dojavadoc build/jPod/javadoc
-}
diff --git a/dev-java/jPod/jPod-5.2.20091102.ebuild b/dev-java/jPod/jPod-5.2.20091102.ebuild
deleted file mode 100644
index df1efe72..00000000
--- a/dev-java/jPod/jPod-5.2.20091102.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-JAVA_PKG_IUSE="source doc"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="jbig2,iscwt,isrt"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A library for reading, writing and manipulating PDF files."
-HOMEPAGE="http://opensource.intarsys.de/"
-SRC_URI="mirror://sourceforge/jpodrenderer/jPod.${PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="dev-java/isrt:0
-	    dev-java/jbig2:0
-	    dev-java/iscwt:0"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	${COMMON_DEP}
-	app-arch/unzip"
-
-S="${WORKDIR}"/distribution
-
-src_prepare() {
-	cp "${FILESDIR}"/build.* "${S}" || die
-}
-
-src_install() {
-	java-pkg_dojar build/jPod/dist/jPod.jar
-
-	use source && java-pkg_dosrc src/*
-
-	use doc && java-pkg_dojavadoc build/jPod/javadoc
-}
diff --git a/dev-java/jPod/jPod-5.3.20100629.ebuild b/dev-java/jPod/jPod-5.3.20100629.ebuild
index 4f1532c6..4e22c7de 100644
--- a/dev-java/jPod/jPod-5.3.20100629.ebuild
+++ b/dev-java/jPod/jPod-5.3.20100629.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI=4
 
 JAVA_PKG_IUSE="source doc"
 JAVA_ANT_REWRITE_CLASSPATH="true"
@@ -22,15 +22,15 @@ IUSE=""
 COMMON_DEP="dev-java/isrt:0
 	    dev-java/jbig2:0
 	    dev-java/iscwt:0"
-RDEPEND=">=virtual/jre-1.5
+RDEPEND=">=virtual/jre-1.6
 	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
+DEPEND=">=virtual/jdk-1.6
 	${COMMON_DEP}
 	app-arch/unzip"
 
 S="${WORKDIR}"/distribution
 
-src_prepare() {
+java_prepare() {
 	cp "${FILESDIR}"/build.* "${S}" || die
 }
 
diff --git a/dev-java/jPodRenderer/files/build.xml b/dev-java/jPodRenderer/files/build.xml
index f7625071..a3b6b8df 100644
--- a/dev-java/jPodRenderer/files/build.xml
+++ b/dev-java/jPodRenderer/files/build.xml
@@ -53,7 +53,7 @@
     </path>
 
     <!-- Compile the java code -->
-    <javac compiler="javac1.4" target="1.4" source="1.4" srcdir="${jPodRenderer.src.dir}" destdir="${jPodRenderer.build.dir}" debug="true">
+    <javac compiler="javac1.6" target="1.6" source="1.6" srcdir="${jPodRenderer.src.dir}" destdir="${jPodRenderer.build.dir}" debug="true">
     	<classpath refid="jPodRenderer.classpath"/>
     </javac>
   </target>
diff --git a/dev-java/jPodRenderer/jPodRenderer-5.0.20081218.ebuild b/dev-java/jPodRenderer/jPodRenderer-5.0.20081218.ebuild
deleted file mode 100644
index 0cc9e2b3..00000000
--- a/dev-java/jPodRenderer/jPodRenderer-5.0.20081218.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-JAVA_PKG_IUSE="source doc"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="jai-imageio,sun-jai-bin,jbig2,swt-3.4,jPod,iscwt,isfreetype,isnativec,isrt,jna"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="This is the jPod based PDF platform & rendering library."
-HOMEPAGE="http://opensource.intarsys.de/"
-SRC_URI="mirror://sourceforge/jpodrenderer/jPodRenderer.${PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="dev-java/jai-imageio:0
-	    dev-java/sun-jai-bin:0
-	    dev-java/jbig2:0
-	    dev-java/jna:0
-	    dev-java/swt:3.4
-	    dev-java/isrt:0
-	    dev-java/isnativec:0
-	    dev-java/isfreetype:0
-	    dev-java/iscwt:0
-	    dev-java/jPod:0"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	${COMMON_DEP}
-	app-arch/unzip"
-
-S="${WORKDIR}"/distribution
-
-src_prepare() {
-	cp "${FILESDIR}"/build.* "${S}" || die
-}
-
-src_install() {
-	java-pkg_dojar build/jPodRenderer/dist/jPodRenderer.jar
-	java-pkg_dojar lib/jPodFonts.jar
-
-	use source && java-pkg_dosrc src/*
-
-	use doc && java-pkg_dojavadoc build/jPodRenderer/javadoc
-}
diff --git a/dev-java/jPodRenderer/jPodRenderer-5.2.10091102.ebuild b/dev-java/jPodRenderer/jPodRenderer-5.2.10091102.ebuild
deleted file mode 100644
index 0cc9e2b3..00000000
--- a/dev-java/jPodRenderer/jPodRenderer-5.2.10091102.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-JAVA_PKG_IUSE="source doc"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="jai-imageio,sun-jai-bin,jbig2,swt-3.4,jPod,iscwt,isfreetype,isnativec,isrt,jna"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="This is the jPod based PDF platform & rendering library."
-HOMEPAGE="http://opensource.intarsys.de/"
-SRC_URI="mirror://sourceforge/jpodrenderer/jPodRenderer.${PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="dev-java/jai-imageio:0
-	    dev-java/sun-jai-bin:0
-	    dev-java/jbig2:0
-	    dev-java/jna:0
-	    dev-java/swt:3.4
-	    dev-java/isrt:0
-	    dev-java/isnativec:0
-	    dev-java/isfreetype:0
-	    dev-java/iscwt:0
-	    dev-java/jPod:0"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	${COMMON_DEP}
-	app-arch/unzip"
-
-S="${WORKDIR}"/distribution
-
-src_prepare() {
-	cp "${FILESDIR}"/build.* "${S}" || die
-}
-
-src_install() {
-	java-pkg_dojar build/jPodRenderer/dist/jPodRenderer.jar
-	java-pkg_dojar lib/jPodFonts.jar
-
-	use source && java-pkg_dosrc src/*
-
-	use doc && java-pkg_dojavadoc build/jPodRenderer/javadoc
-}
diff --git a/dev-java/jPodRenderer/jPodRenderer-5.3.20100629.ebuild b/dev-java/jPodRenderer/jPodRenderer-5.3.20100629.ebuild
index a104a2d9..b7965c4c 100644
--- a/dev-java/jPodRenderer/jPodRenderer-5.3.20100629.ebuild
+++ b/dev-java/jPodRenderer/jPodRenderer-5.3.20100629.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI=4
 
 JAVA_PKG_IUSE="source doc"
 JAVA_ANT_REWRITE_CLASSPATH="true"
@@ -29,15 +29,15 @@ COMMON_DEP="dev-java/jai-imageio:0
 	    dev-java/isfreetype:0
 	    dev-java/iscwt:0
 	    dev-java/jPod:0"
-RDEPEND=">=virtual/jre-1.5
+RDEPEND=">=virtual/jre-1.6
 	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
+DEPEND=">=virtual/jdk-1.6
 	${COMMON_DEP}
 	app-arch/unzip"
 
 S="${WORKDIR}"/distribution
 
-src_prepare() {
+java_prepare() {
 	cp "${FILESDIR}"/build.* "${S}" || die
 }
 
diff --git a/dev-java/jbig2/files/build.xml b/dev-java/jbig2/files/build.xml
index 8c5f827f..1b1a333c 100644
--- a/dev-java/jbig2/files/build.xml
+++ b/dev-java/jbig2/files/build.xml
@@ -43,7 +43,7 @@
     </path>
 
     <!-- Compile the java code -->
-    <javac compiler="javac1.4" target="1.4" source="1.4" srcdir="${jbig2.src.dir}" destdir="${jbig2.build.dir}" debug="true">
+    <javac compiler="javac1.6" target="1.6" source="1.6" srcdir="${jbig2.src.dir}" destdir="${jbig2.build.dir}" debug="true">
     	<classpath refid="jbig2.classpath"/>
     </javac>
   </target>
diff --git a/dev-java/jbig2/jbig2-20090114.ebuild b/dev-java/jbig2/jbig2-20090114.ebuild
deleted file mode 100644
index e1ca875f..00000000
--- a/dev-java/jbig2/jbig2-20090114.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-JAVA_PKG_IUSE="source doc"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="JPedal JBIG2 Image Decoder"
-HOMEPAGE="http://idrsolutions.fogbugzhosting.com/default.asp?W80"
-SRC_URI="http://www.jpedal.org/download/jbig2_src.zip -> jbig2_src-${PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	cp "${FILESDIR}"/build.* "${S}" || die
-}
-
-src_install() {
-	java-pkg_dojar build/jbig2/dist/jbig2.jar
-
-	use source && java-pkg_dosrc src/*
-
-	use doc && java-pkg_dojavadoc build/jbig2/javadoc
-}
diff --git a/dev-java/jbig2/jbig2-20091207.ebuild b/dev-java/jbig2/jbig2-20091207.ebuild
deleted file mode 100644
index e1ca875f..00000000
--- a/dev-java/jbig2/jbig2-20091207.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-JAVA_PKG_IUSE="source doc"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="JPedal JBIG2 Image Decoder"
-HOMEPAGE="http://idrsolutions.fogbugzhosting.com/default.asp?W80"
-SRC_URI="http://www.jpedal.org/download/jbig2_src.zip -> jbig2_src-${PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	cp "${FILESDIR}"/build.* "${S}" || die
-}
-
-src_install() {
-	java-pkg_dojar build/jbig2/dist/jbig2.jar
-
-	use source && java-pkg_dosrc src/*
-
-	use doc && java-pkg_dojavadoc build/jbig2/javadoc
-}
diff --git a/dev-java/jbig2/jbig2-20100827.ebuild b/dev-java/jbig2/jbig2-20100827.ebuild
deleted file mode 100644
index 98aeee35..00000000
--- a/dev-java/jbig2/jbig2-20100827.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-JAVA_PKG_IUSE="source doc"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="JPedal JBIG2 Image Decoder"
-HOMEPAGE="http://idrsolutions.fogbugzhosting.com/default.asp?W80"
-SRC_URI="http://www.jpedal.org/download/jbig2_src.zip -> jbig2_src-${PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	cp "${FILESDIR}"/build.* "${S}" || die
-}
-
-src_install() {
-	java-pkg_dojar build/jbig2/dist/jbig2.jar
-
-	use source && java-pkg_dosrc src/*
-
-	use doc && java-pkg_dojavadoc build/jbig2/javadoc
-}
diff --git a/dev-java/jbig2/jbig2-20100509.ebuild b/dev-java/jbig2/jbig2-20111119.ebuild
similarity index 96%
rename from dev-java/jbig2/jbig2-20100509.ebuild
rename to dev-java/jbig2/jbig2-20111119.ebuild
index 98aeee35..7ac5c516 100644
--- a/dev-java/jbig2/jbig2-20100509.ebuild
+++ b/dev-java/jbig2/jbig2-20111119.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI=4
 
 JAVA_PKG_IUSE="source doc"
 
@@ -23,7 +23,7 @@ DEPEND=">=virtual/jdk-1.5
 
 S="${WORKDIR}"
 
-src_prepare() {
+java_prepare() {
 	cp "${FILESDIR}"/build.* "${S}" || die
 }