diff --git a/dev-java/ICEpdf/ICEpdf-4.2.2.ebuild b/dev-java/ICEpdf/ICEpdf-4.2.2.ebuild
index 934d20f6..1df8281c 100644
--- a/dev-java/ICEpdf/ICEpdf-4.2.2.ebuild
+++ b/dev-java/ICEpdf/ICEpdf-4.2.2.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=1
-JAVA_PKG_IUSE="doc source"
+EAPI=4
+JAVA_PKG_IUSE="source"
 
 inherit java-pkg-2 java-ant-2
 
@@ -17,33 +17,24 @@ LICENSE="MPL-1.1"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
 
-IUSE="source"
-
 COMMON_DEP="
 	dev-java/batik:1.7"
 
-RDEPEND=">=virtual/jre-1.4
+RDEPEND=">=virtual/jre-1.5
 	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
+DEPEND=">=virtual/jdk-1.5
 		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_prepare() {
+	cd lib || die
+	rm -vf *.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
diff --git a/dev-java/ICEpdf/Manifest b/dev-java/ICEpdf/Manifest
index 3998331a..b8a8927f 100644
--- a/dev-java/ICEpdf/Manifest
+++ b/dev-java/ICEpdf/Manifest
@@ -7,4 +7,4 @@ EBUILD ICEpdf-4.1.0.ebuild 713 RMD160 5ec6281f64545d72fbf946d55fa09f73b79484aa S
 EBUILD ICEpdf-4.1.1.ebuild 713 RMD160 5ec6281f64545d72fbf946d55fa09f73b79484aa SHA1 370726c9900954d795fe4be053f7b77e36def0a4 SHA256 138e5cef3888373af641fa5aa47ce3d950a1bccc30cef2df34f09d71e1f90a0f
 EBUILD ICEpdf-4.1.4.ebuild 713 RMD160 5ec6281f64545d72fbf946d55fa09f73b79484aa SHA1 370726c9900954d795fe4be053f7b77e36def0a4 SHA256 138e5cef3888373af641fa5aa47ce3d950a1bccc30cef2df34f09d71e1f90a0f
 EBUILD ICEpdf-4.2.0.ebuild 847 RMD160 9250d0b803ad843970865b8fec0926144fd9faf7 SHA1 86e9849809f48ea07afc177f31bfed291eae91e5 SHA256 cc52081df5abac54509ffb9cd40d6def2710b3827250468cdbd78df0eae7eb01
-EBUILD ICEpdf-4.2.2.ebuild 847 RMD160 9250d0b803ad843970865b8fec0926144fd9faf7 SHA1 86e9849809f48ea07afc177f31bfed291eae91e5 SHA256 cc52081df5abac54509ffb9cd40d6def2710b3827250468cdbd78df0eae7eb01
+EBUILD ICEpdf-4.2.2.ebuild 768 RMD160 2a72a91ac0fc1df4e6b9d3816a3f1cc834714771 SHA1 6b6f1fdb1e6c60347c8f94c4c93196471f065998 SHA256 effbf1b7e606fc660b777f83a1d4eda29eac7675f9dec821a9177f8f733e3d02
diff --git a/net-fs/mars-nwe/Manifest b/net-fs/mars-nwe/Manifest
index cc73ecea..654f4c8e 100644
--- a/net-fs/mars-nwe/Manifest
+++ b/net-fs/mars-nwe/Manifest
@@ -1,2 +1,2 @@
-DIST mars_nwe-0.99.pl22.tar.bz2 377548 RMD160 13ea971c6df665f08232b72510a8852851d7098d SHA1 7675cc88ac5de70d4e7d445e0a2bc6af1c3df5a6 SHA256 43ef49fa1d9dcfb07dac6c82f5f479ca5aa259770a5efc85e2f30b4da94e6d15
+DIST mars_nwe-0.99.pl22.tar.bz2 379463 RMD160 ab861fd30700ef63fc99779129f9c6ad7971f75c SHA1 66f3013fce3c7e79c981c64a78a467e63ae5373f SHA256 6cdbaabc89caf37b1028ecb20d2e3e58afa39d9376854cd2de3f67092d781860
 EBUILD mars-nwe-0.99_p22.ebuild 767 RMD160 538bd3c9c82628de1914ed9684c21326cd3fd273 SHA1 568240236e549f489380f1840417ee355d0e3dca SHA256 0af86d01310ba42ca658153b8c5f49e3290d2505accc9997c1a72190a318fb90