ebuild quality improvements

20 files changed, 147 insertions, 147 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1377554
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.swp
diff --git a/app-office/hibiscus/Manifest b/app-office/hibiscus/Manifest
index 00621af..d47b511 100644
--- a/app-office/hibiscus/Manifest
+++ b/app-office/hibiscus/Manifest
@@ -5,4 +5,4 @@ AUX 2.4.2-hbci4java-so-filename.patch 1697 SHA256 22df5c01119aa6a6b818557090e08f
 DIST hibiscus-2.2.1.zip 5245507 SHA256 d026229bb24b4502b42da193538c0fc35f07d05bce1e9469cf25bb248e4b3495 SHA512 a18ad22859de1ac8faf9b5e286f82f2dd3cbf445460055313440c88471b10e32e0a59b20b824ae1f1817b4a3366c2dba9087be4798dcac0fdc7df02615a9a479 WHIRLPOOL 4dae30ee699d2cda33cf194fa7750e6a68a8d1c1c5938415d1f1fd05306d03598aec729f9e89c4c045923d153a8d6f24d547c6ceb2f6c2ecfdb321c769cd53b2
 DIST hibiscus-2.4.2.zip 5260678 SHA256 a410c0b79ee8fae3b12405332c81e8fa8908b51beb70bc827105241b29bcdea2 SHA512 348e953dd19a71527c486430021b89452a9b5adafc7900424ccd07fb5423de1ca42c7b80e3d73691772ccf467aa6ca39635a0ecf3054478278b81ae598b81ffb WHIRLPOOL afae77fbbb7ca687ad93c3a3341440e82e611954515583a39c2b59bc7ff03c0aa64b77e5e2df896c1fc9db79b60f4481d86538f34c5bc031a4ae8b9d2fb2b865
 EBUILD hibiscus-2.2.1.ebuild 2445 SHA256 9a388dee18ee61e8bcb28281de8b741fca433509f29c778b5c8193315cc31cb8 SHA512 b8d96be8ddb7e196357931c0022e3f544574ec76942144f2a2347b06143699dc8b4faae787a77b2e15a999e278a8103092ec558cbb7ae377f1d540b647049cce WHIRLPOOL dd308bc0976123b521caf5408a45f31ee9cb4412ac3318bd6d97a78fc4d684cb408977412dbf8103952bc14da2ab0c3791812eb5ce3b9bead1a73bf5c5695503
-EBUILD hibiscus-2.4.2.ebuild 2684 SHA256 0a16060b3a8726c02d1b6b99b80cf83faea0ba9152c92ee4667060dc997de962 SHA512 3d259a265a47211caad166ee88e109a0d1259b2c9579ef30e9d15dd7dc48d8f093665ce370b89a939335434ec7f135dadfff0f84748dcfe12446edf4d3df181c WHIRLPOOL 450a09f9ee5049c04d3dc536f01588c808540a5726a6ed4ecb5d0596e56a7da88e5cdda70acfcfe77cc6766239b8c60cf251bd2e238fdb56641bfe7b239e0f0e
+EBUILD hibiscus-2.4.2.ebuild 2689 SHA256 5c1e1f7b53e8131905f47802c4696141abe717f965b263f0c1a47eef172b59f6 SHA512 52d2de2596408adaa3e7e79815e8e310ec1185fe1ff0da36505e3d9d783ff8e8c0b2e382fdad465e6295c3374f9fdc1561a8eac5b08ca473954a3ae1922c2737 WHIRLPOOL d8b5bfa2495cd2d9fc8b5279b81eff9a71584d3ffd925d702c62d1f29b82ab734488dddf2af6fe217250d860d93e4216222a600b1ffabdd1870b1396a8878f96
diff --git a/app-office/hibiscus/hibiscus-2.4.2.ebuild b/app-office/hibiscus/hibiscus-2.4.2.ebuild
index a741eda..cfde27c 100644
--- a/app-office/hibiscus/hibiscus-2.4.2.ebuild
+++ b/app-office/hibiscus/hibiscus-2.4.2.ebuild
@@ -18,7 +18,7 @@ IUSE=""
 COMMON_DEP="=dev-java/jameica-${MY_PV}*
         >=net-libs/willuhn-hbci4java-2.5.12.30
 	=dev-java/obantoo-1.5.2
-	>=dev-java/supercsv-1.31
+	>=dev-java/super-csv-1.31:0
 	>=dev-java/swt-chart-0.7.0"
 
 RDEPEND=">=virtual/jre-1.6
@@ -39,7 +39,7 @@ java_prepare() {
 
 	#rm -v ${S}/lib/{itext-2.0.1.jar,obantoo-bin-1.5.1.jar,postgresql-8.3-604.jdbc3.jar,supercsv-1.31.jar,libct.so,libhbci4java-card-freebsd-64.so,libhbci4java-card-linux-32.so,libhbci4java-card-linux-64.so,libhbci4java-sizrdh-linux-gcc2.so,libhbci4java-sizrdh-linux-gcc3.so,libtowitoko-2.0.7-amd64.so,libtowitoko-2.0.7.so,hbci4java-card-win32.dll,hbci4java-card-win32_x86-64.dll,hbci4java-sizrdh-win32.dll,libhbci4java-card-mac-os-x-10.6.jnilib,libhbci4java-card-mac.jnilib} || die
 
-        java-pkg_jar-from --with-dependencies --into ${S}/lib/ willuhn-hbci4java,obantoo,jameica,supercsv,swt-chart
+        java-pkg_jar-from --with-dependencies --into ${S}/lib/ willuhn-hbci4java,obantoo,jameica,super-csv,swt-chart
 }
 
 src_compile() {
@@ -63,7 +63,7 @@ src_install() {
 
 	dosym "$(java-pkg_getjars willuhn-hbci4java)" ${plugin_dir}/lib/
 	dosym "$(java-pkg_getjars obantoo)" ${plugin_dir}/lib/
-	dosym "$(java-pkg_getjars supercsv)" ${plugin_dir}/lib/
+	dosym "$(java-pkg_getjars super-csv)" ${plugin_dir}/lib/
 	dosym "$(java-pkg_getjars itext-5)" ${plugin_dir}/lib/
 
 	dosym "$(java-pkg_getjar swt-chart org.swtchart.jar)" ${plugin_dir}/lib/
diff --git a/dev-java/htmlunit/Manifest b/dev-java/htmlunit/Manifest
index 6dd27e0..563d99e 100644
--- a/dev-java/htmlunit/Manifest
+++ b/dev-java/htmlunit/Manifest
@@ -1,6 +1,5 @@
+AUX build.xml 742 SHA256 894f525860ed23039b2bd5ec050eefa087aab63fbeb18c0f49f9e6e2fa1d66f8 SHA512 2e36f947768a82898206cbd494f91193996ef275173aa64ab30c27a0cab4d3f13672f125f47d1c67f5a3742bd23a5ef2f5e460cb5a1c1b43ffa8472e25d77786 WHIRLPOOL c985048776a412ed2ccc6ae21e58e58d732493f1b3407577d9bcbf7965c71656c80708c5afa050b61c21bd8af7d521f3a29d0f7981b9e07c0c2a467692a2b8d6
 DIST htmlunit-2.10-src.zip 26472580 SHA256 c9395dd398b1df2ef39bdc06586ece7536232ff393a0b45f258c61171760b5fa SHA512 8e4d7137c4240b404b84530bbd95758e90392631a835f329a301aa0e1580958e6a083cbb60d39c844bddf2ff0667ae564f6777a3ad969334e02ac0781cfdd17d WHIRLPOOL e34b98bcfe3bcb9e4a23df346281123cbdca50022b116c385cd69bda8d968244b65501f7a6745279a26923f8316cf549213bbfaf4d1aed7d5421f52f319dc4e7
-DIST htmlunit-2.7-sources.jar 872027 SHA256 91d75a5e62927474a59ffc8041fef7d8782d91ef3956275779a03443faad8848 SHA512 6528298a3ddd158c61f40c221d22c289f46d6b36fb04d2022e1c816a4595f82fbd058956e1466afd19a2b7e91ef0ddcb591b9889ba4089c31a9b90471a53783c WHIRLPOOL 3048820679aba37ccdf58162bcfc62c67b991061d372cb846ba97b5c7ddec821e0cdf835f690d38bb7234afbc15e026d5b860f5ecd2401611c51beb64456ab8e
 DIST htmlunit-2.7-src.zip 25207504 SHA256 720dce0535587ab2d29ca81989b8492c33200aa1b5d2f4c1fa8e2038f5fa3fc0 SHA512 01648c392817c99655448067c50e0ef58a8bc1f098df896003f42b597cbd0d785aad3ad8f44ff66cd070e1a1d283f724edfe20e8ac84d8a15c9f9d83e7e93502 WHIRLPOOL 5921dfb3b2164500eb953b3b2af35d7169dcd81a731a6ec990933eeea4c4de9379da84ed8a8338320e17a08ce104ef1c4973867bde8322b0a14a73b83c47d1d7
 EBUILD htmlunit-2.10.ebuild 1058 SHA256 9ecc63e61728afa2b780dc63914c8cc7e2d26f4f638cbbcabb123fa51a2e2d31 SHA512 232fee43581b0a081b145cb1373aeaa5e70187a1df3e51cb3ca459b8149a88c3e3a32effc2fd47dc523fcbfd9344ade1f3fbbdb89e3b4451b1ef67206890363e WHIRLPOOL 3bc3a3df3b3ba5889873599fe69600513f8cdb211a8962ff2b739a3ad8a96b098510edf72920ea2b3fc763ed462734ea039e2a2b6afa2abf241258249f90752e
-EBUILD htmlunit-2.7-r1.ebuild 1459 SHA256 ebb8e5c5a417039d1325eb6589f8eb43e884b9a456fbbf2298e4274e9c64397a SHA512 814c5a6ed0096bb27127ca508cb055b857f14da01029e64fd5ce7ed83be7cd9a191d0a1dd9d3578e8ff1dfd7944cb672782333be7a4a0efe0f6a4fb1ce474462 WHIRLPOOL bc9df35a97da4f5c93ce66e28f9e6b22195c0dbf7ff9c0c8b90de057b687b146197589bbe519031afb8e074acae4bd7ca2faaeb2215af20c5bd7096550e09240
-EBUILD htmlunit-2.7.ebuild 1251 SHA256 0fa76cc47571bfdca799b56360ac914541524d2b261be83f4891440f558db5a5 SHA512 c69b29958c3e4de4053bc1d25ec94d38be61c6dc38c9a2f8d7f296e96661555bfe9cbf2db5fc3267da81db7cb139386ad552a7718df2fe037e094293d88f35f0 WHIRLPOOL cebf66f44444dee4468f7f740171242b62704e2fe69504c9a1cbdbec0af738e22613de8b61d5dffed98581c265cf9d6d9573d601947e16b4dec874cf634719d4
+EBUILD htmlunit-2.7.ebuild 1350 SHA256 6857c8924b93d0c10f47d44829fa183ce1a6ca27a71d5f504cbcd66a62a27eb3 SHA512 643ea0d74847ee5d551e6518d94ccbe1fd22c0326c4e48f3824d0299ef85cf9bc50a27d8125be74fb8074b2635202d72ae4ed62e635d323c374760eb346cdb04 WHIRLPOOL 8c1bd41028684768fb7bc9ef8cbf4d520d1ff8bd6d2746157a42c3c4370485581f1a8a0b68d4d5d5f5c0bdc1c3eb08684a7f9d55f0675ee50b8d02c84a57ec3b
diff --git a/dev-java/htmlunit/files/build.xml b/dev-java/htmlunit/files/build.xml
new file mode 100644
index 0000000..0bf7902
--- /dev/null
+++ b/dev-java/htmlunit/files/build.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project basedir="." default="build" name="org.swtchart">
+    <target name="init">
+		<mkdir dir="target/classes"/>
+		<mkdir dir="target/javadoc"/>
+    </target>
+    <target name="clean">
+        <delete dir="target"/>
+    </target>
+    <target depends="init" name="build">
+		<javac debug="true" destdir="target/classes">
+			<src path="src/main/java"/>
+		</javac>
+		<copy todir="target/classes">
+			<fileset dir="src/main/resources" />
+			</copy>
+        <jar destfile="htmlunit.jar">
+			<fileset dir="target/classes"/>
+        </jar>
+    </target>
+    <target name="doc">
+		<javadoc destdir="target/javadoc">
+			<fileset dir="src/main/java"/>
+        </javadoc>
+    </target>
+</project>
diff --git a/dev-java/htmlunit/htmlunit-2.7-r1.ebuild b/dev-java/htmlunit/htmlunit-2.7-r1.ebuild
deleted file mode 100644
index 545e831..0000000
--- a/dev-java/htmlunit/htmlunit-2.7-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/itext-5.2.0.ebuild,v 1.1 2012/03/26 07:21:27 sera Exp $
-
-EAPI="4"
-JAVA_PKG_IUSE=""
-GROUP_ID="net.sourceforge.htmlunit"
-
-inherit java-pkg-2 java-mvn-src 
-
-DESCRIPTION="A java GUI-Less browser, supporting JavaScript, to run againsweb pages"
-HOMEPAGE="http://htmlunit.sourceforge.net/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="dev-java/commons-io
-			dev-java/commons-codec
-			dev-java/commons-logging
-			dev-java/commons-collections
-			dev-java/commons-httpclient
-			dev-java/xalan
-			>=dev-java/cssparser-0.9.5
-			dev-java/xerces
-			>=dev-java/nekohtml-1.9.14
-			dev-java/htmlunit-core-js
-			dev-java/sac"
-
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
-	app-arch/unzip"
-
-JAVA_GENTOO_CLASSPATH="commons-io-1,commons-codec,commons-logging,commons-lang-2.1,commons-httpclient-3,cssparser,xerces-2,commons-collections,nekohtml,htmlunit-core-js,xalan,sac"
-
-# src_compile() {
-#    local classpath="$(java-pkg_getjars \
-	 #commons-io-1,commons-codec,commons-logging,commons-lang-2.1,commons-httpclient-3,cssparser,xerces-2,commons-collections,nekohtml)"
-# 
-#     mkdir build
-#     find src -name '*.java' > sources.list
-#     ejavac -d build -cp "${classpath}" @sources.list
-#     jar cf ${PN}.jar -C build/ .
-# 
-#     # TODO javadoc
-# }
-
diff --git a/dev-java/htmlunit/htmlunit-2.7.ebuild b/dev-java/htmlunit/htmlunit-2.7.ebuild
index 6a10a86..96989b4 100644
--- a/dev-java/htmlunit/htmlunit-2.7.ebuild
+++ b/dev-java/htmlunit/htmlunit-2.7.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
 
 JAVA_PKG_IUSE="doc source"
 
-inherit java-mvn-src
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="A java GUI-Less browser, supporting JavaScript, to run againsweb pages"
 HOMEPAGE="http://htmlunit.sourceforge.net/"
@@ -22,10 +22,12 @@ COMMON_DEP="dev-java/commons-io
 			dev-java/commons-logging
 			dev-java/commons-collections
 			dev-java/commons-httpclient
-			dev-java/cssparser
+			dev-java/xalan
+			>=dev-java/cssparser-0.9.5
 			dev-java/xerces
-			dev-java/nekohtml
-			dev-java/htmlunit-core-js"
+			>=dev-java/nekohtml-1.9.14
+			dev-java/htmlunit-core-js
+			dev-java/sac"
 
 RDEPEND="${COMMON_DEP}
 	>=virtual/jre-1.5"
@@ -35,15 +37,18 @@ DEPEND="${COMMON_DEP}
 
 S="${WORKDIR}/${P}"
 
- src_compile() {
-     local classpath="$(java-pkg_getjars \
-	 commons-io-1,commons-codec,commons-logging,commons-lang-2.1,commons-httpclient-3,cssparser,xerces-2,commons-collections,nekohtml)"
- 
-     mkdir build
-     find src -name '*.java' > sources.list
-     ejavac -d build -cp "${classpath}" @sources.list
-     jar cf ${PN}.jar -C build/ .
- 
-     # TODO javadoc
- }
+EANT_GENTOO_CLASSPATH="commons-io-1,commons-codec,commons-logging,commons-lang-2.1,commons-httpclient-3,cssparser,xerces-2,commons-collections,nekohtml,htmlunit-core-js,xalan,sac"
 
+java_prepare() {
+	cp ${FILESDIR}/build.xml ${S}/
+	java-ant_rewrite-classpath build.xml
+    eant -f build.xml clean
+}
+
+src_compile() {
+	eant -f build.xml build $(use_doc javadoc)
+}
+
+src_install() {
+	java-pkg_dojar htmlunit.jar
+}
diff --git a/dev-java/spiffy/Manifest b/dev-java/spiffy/Manifest
index 4939168..d4a78a9 100644
--- a/dev-java/spiffy/Manifest
+++ b/dev-java/spiffy/Manifest
@@ -1,3 +1,3 @@
 DIST spiffy-all-0.05.zip 141335 SHA256 773b9c2e1b5fe8904d64ba2984903dd022039826b5e682d103c16a10911a227f SHA512 33d824193bff271e1079d1bf9445d28c69b88acddcd4504f3b0868ae569659f20a3a117c6b9574ff08a26d72fa170b96e5f30e3732db98c36e544f81b8ce747d WHIRLPOOL 55ad653642f0d7b3ece17ce2bd8554ba26343e5aca43137e92ca96bde01de66e67989a777f4a54c10fb62cbd0ce3bf7c3003aaf36e1975671454a3514ada0862
-EBUILD spiffy-0.05.ebuild 1416 SHA256 5cc73569bb4fa4ae9e3b846da68dbafc169a60b81bff9421ca7341363a4069c3 SHA512 fb96deadebfb407790423dfc8e35f042fe7969ca69afa150c41184b21b5dbf85154623512a9b5e7aab7d244aeb1d388a2ebe8a3d89c6060a5102dc83cc1728b6 WHIRLPOOL 71660c437fff73ca9e1b068daac78b1af91f3eeba36dc40ccc064f9220936bd9b985e7586404ffd84bcb88f040405b21596770bced55976d229e04005e4650e8
+EBUILD spiffy-0.05.ebuild 1411 SHA256 1031807de341920cfdca30220dc69fc3cd47cc9c881f96a8e69849b654b54901 SHA512 9b264cade6d060cbf7dea6ce4991abf71218548a7051d87a75666aab1f4a1ff333c590097a95cd43240367be7abea0ef34325837eab84e12caf6f0d8375133a0 WHIRLPOOL 45e39585e0cb9cf6cf8d1f20f61ba2eccd73daa50122560ff7ba4f7f87236f6616569f66ee8a2b64c732c57b1f46e6a5a3207b255c0633e56ab4a18dd223d41d
 MISC metadata.xml 214 SHA256 c1f09dc7d5313cd2da7b82259c7846ed23144d62b15e59680ada90e2b6b4d154 SHA512 aeb2fb354a9ddf41c45a071091a58b91eaf8b25d6d2c49e3e3daa547b591a54530144de4533573160b48dc356289c909612c4e3c80e387f081f88cb39263e130 WHIRLPOOL 54d8861daedd18ca38e4ada0fb71026c612b63946d47a9b34de90d1d6d85c8ce05c0a4b97730f554ea637d73ccce8ed207d33e707c2b8c1dd28af24cf44dd186
diff --git a/dev-java/spiffy/spiffy-0.05.ebuild b/dev-java/spiffy/spiffy-0.05.ebuild
index 90fc9e1..63839e2 100644
--- a/dev-java/spiffy/spiffy-0.05.ebuild
+++ b/dev-java/spiffy/spiffy-0.05.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/spiffyframework/spiffyframework/v0.xx/${PN}-all-${
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 IUSE=""
 
 COMMON_DEPS="dev-java/log4j"
diff --git a/dev-java/super-csv/Manifest b/dev-java/super-csv/Manifest
new file mode 100644
index 0000000..7fc77ce
--- /dev/null
+++ b/dev-java/super-csv/Manifest
@@ -0,0 +1,5 @@
+DIST SuperCSV-1.52.zip 640962 SHA256 e11679f50225bd21e8ad752e8b88e0d4e0f16d6ac90c48a2da7cbc6f8145ebb8 SHA512 ffcd22e735d367ddaf41af43fae73a645ec3fd60baa4efb62a08b7dda33624c885fb140e7b5c73dfd0d49d9ea61d9d7f303ce8abfb549d6ab6c108a29fa9e175 WHIRLPOOL 7f3b65ec2726553f53dfb08b2aea8dbb4fe8685635f36b4347a80e460393b7effa0069164ade77f64998f31e82cb5bebc5c06861c683ab2b1f5e8a09ff790dc9
+DIST super-csv-2.0.1-sources.jar 104596 SHA256 e6314e4bce6adf7a1630f6828066a805e1559fec33c48fae3546df3bd2626659 SHA512 4068bc36cfeb5235624ba92b50997c3d735880e589bc4cb24014485ef2d5ae1e8d18095e12cfb85d58c0ee04f885e2671ce1eacbd99d7667394c5fd9cfad9779 WHIRLPOOL 9b22cda08afc87981d886df5dfd74b7dd86c2193d4429835308cf7dda0b58fb5f1272c2ee15a0817ffadeb6090c9b3d4fd5c93e0350c5cd462b27b8752889505
+EBUILD super-csv-1.52.ebuild 730 SHA256 044d1b4e773f12367775b17d8d5003b7800cba0fbc44dc1bf26bef8ec29fdec3 SHA512 55410dbe33b1f800779971f455d6a0c23c14841b72305c397c796e7a454e2c4f63efbb4930fdfb25f4d85ad3c9003ccc61a9d0bf300aea7d6675c4b1ad28bb2f WHIRLPOOL e8e5191d8848e175ec9f9ba2f75137470f62ed78a582a6fd587ce3e802ff6c23f64a1c824ba9c3fc7f0497982849726da3413e092c6906a73e5c2bd8cfcefb8d
+EBUILD super-csv-2.0.1.ebuild 433 SHA256 a9d0ed396e01d51e94b52f780a960337ae50e2b5586f863578dc1920eacb7ab5 SHA512 f914acfa4497950c06cd3ac93ad7208b6252ee48dec134e84fcfa232bb0058e3a44304da5cbcf476fb04275753d6eb59278a097727395dc641ebfe9dffd60b71 WHIRLPOOL ea7421cb60459708cb32753aadb784481541811436d263b4f31d09ab96a61195f0aee891925410a02730a1919fe3d2f7ec0390824ee73f35fa1ad3aa76a608fc
+MISC metadata.xml 235 SHA256 c947f6510999c8ad24cab8fc9115f6d3c97a0d5ad45a07721e88ea08302d3a06 SHA512 3675a2546febb2782ac8089cb87bc0a67a12e8585bcab67a1daea7be5df5cbd3fac6eedc7af069001b31582b7920c7a75fb096f6456df74fef4e20c58a839f55 WHIRLPOOL f6496ac10ab36309fc873fb249eed67bc4afcdf5adf5feb03ca44654bfd269fda1f335131fcd96fbf0669f0d809d63a2e264d606c9e575e529b9bfcd811b098b
diff --git a/dev-java/super-csv/metadata.xml b/dev-java/super-csv/metadata.xml
new file mode 100644
index 0000000..114eccd
--- /dev/null
+++ b/dev-java/super-csv/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>f.koester@tarent.de</email>
+		<name>Fabian Köster</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/super-csv/super-csv-1.52.ebuild b/dev-java/super-csv/super-csv-1.52.ebuild
new file mode 100644
index 0000000..fb61db5
--- /dev/null
+++ b/dev-java/super-csv/super-csv-1.52.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+MY_PN="SuperCSV"
+MY_P="${MY_PN}-${PV}"
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+DESCRIPTION="CSV processing library for Java"
+HOMEPAGE="http://supercsv.sourceforge.net/"
+SRC_URI="mirror://sourceforge/supercsv/v1-branch/v${PV}/${MY_P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPS="dev-java/spiffy"
+
+DEPEND="${COMMON_DEPS}
+	app-arch/unzip
+	>=virtual/jdk-1.5"
+RDEPEND="${COMMON_DEPS}
+	>=virtual/jre-1.5"
+
+JAVA_SRC_DIR="src"
+JAVA_GENTOO_CLASSPATH="spiffy"
+
+src_unpack() {
+	unpack ${A}
+	unpack ./${MY_P}-source.zip
+	rm -v *.jar *.zip || die
+}
diff --git a/dev-java/super-csv/super-csv-2.0.1.ebuild b/dev-java/super-csv/super-csv-2.0.1.ebuild
new file mode 100644
index 0000000..3f8ec02
--- /dev/null
+++ b/dev-java/super-csv/super-csv-2.0.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+GROUP_ID="net.sf.supercsv"
+
+inherit eutils java-pkg-2 java-mvn-src
+
+DESCRIPTION="CSV processing library for Java"
+HOMEPAGE="http://supercsv.sourceforge.net/"
+LICENSE="Apache-2.0"
+
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/supercsv/Manifest b/dev-java/supercsv/Manifest
deleted file mode 100644
index 1ba1a4b..0000000
--- a/dev-java/supercsv/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST SuperCSV-1.52.zip 640962 SHA256 e11679f50225bd21e8ad752e8b88e0d4e0f16d6ac90c48a2da7cbc6f8145ebb8 SHA512 ffcd22e735d367ddaf41af43fae73a645ec3fd60baa4efb62a08b7dda33624c885fb140e7b5c73dfd0d49d9ea61d9d7f303ce8abfb549d6ab6c108a29fa9e175 WHIRLPOOL 7f3b65ec2726553f53dfb08b2aea8dbb4fe8685635f36b4347a80e460393b7effa0069164ade77f64998f31e82cb5bebc5c06861c683ab2b1f5e8a09ff790dc9
-EBUILD supercsv-1.52.ebuild 1102 SHA256 1361fe5963d3810554982ad864b68397229cf144b0e3475d6eb2ad42e19f94ac SHA512 8631be8fd40f2dcf2f5c3ce46008c33849df846e3f92acbaf9ede56522cfe64e71f2b0e4b7dbeebb44933434225f51178c93fd5e887e51b8db3bb54978b12ec7 WHIRLPOOL 870fb52e8a54aec5e7e06c37cfe22a13c4c25576b4e13a49301d7edae4dc626c45402377b22eef83d13bca92919f4af7b763481c866d8dbabfd73fcedb3df0e4
diff --git a/dev-java/supercsv/supercsv-1.52.ebuild b/dev-java/supercsv/supercsv-1.52.ebuild
deleted file mode 100644
index 84a67e8..0000000
--- a/dev-java/supercsv/supercsv-1.52.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-JAVA_PKG_IUSE="doc source"
-
-MY_PN="SuperCSV"
-MY_P="${MY_PN}-${PV}"
-
-inherit java-pkg-2 eutils
-
-DESCRIPTION="A XML serialization and configuration framework for Java"
-HOMEPAGE="http://simple.sourceforge.net/"
-SRC_URI="mirror://sourceforge/supercsv/v1-branch/v${PV}/${MY_P}.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-
-COMMON_DEPS="dev-java/spiffy"
-
-DEPEND="${COMMON_DEPS}
-	app-arch/unzip
-        >=virtual/jdk-1.5"
-RDEPEND="${COMMON_DEPS}
-        >=virtual/jre-1.5"
-
-S="${WORKDIR}"
-
-src_prepare() {
-
-	unzip -o ${MY_P}-source.zip 
-        rm -v *.jar *.zip || die
-}
-
-src_compile() {
-	local classpath="$(java-pkg_getjars spiffy)"
-
-        mkdir build
-        find src -name '*.java' > sources.list
-        ejavac -d build -cp "${classpath}" @sources.list
-        jar cf ${PN}.jar -C build/ .
-
-	# TODO javadoc
-}
-
-src_install() {
-        java-pkg_newjar ${PN}.jar
-
-        #use doc && java-pkg_dohtml -r docs/*
-        use source && java-pkg_dosrc src/org
-}
-
diff --git a/net-libs/willuhn-hbci4java/Manifest b/net-libs/willuhn-hbci4java/Manifest
index 9e6f654..ec304d0 100644
--- a/net-libs/willuhn-hbci4java/Manifest
+++ b/net-libs/willuhn-hbci4java/Manifest
@@ -1,2 +1,2 @@
 DIST willuhn-hbci4java-2.5.12.30.tar.gz 2833964 SHA256 6fd541c02384d64ece3e032a7b0650bf52d86ea89c9afb439df1bb1ad471ed19 SHA512 ac2371b886decf692fb8afdb58a810e613679d7984b3d6853e778d7559c4127fc0fac4bf387ec789e4c8ad3ab95c5e4ce17e3fbde0ec478648f1ed53cff8f69c WHIRLPOOL e2e094e8b8eea845a66780b09c0112384fb9cc6624ec1a919206b60ac9246b32ca92ad3fa294e19841666c0a9347e9192a32fbf782e3ddcfeceeb8f54012a694
-EBUILD willuhn-hbci4java-2.5.12.30.ebuild 1551 SHA256 bd0b684ddccecfdcc1f6371dc29686681aa5b04e3aa06ee396f0252793ab60c7 SHA512 0b0a58dd3f3504c93d5f6bc3760101d95659129f9fbd2eeae0a4276cb8b0874ff91568a7e7b6134257567a349e80ae987dcd78e37a987558db0628aac47b68d3 WHIRLPOOL 0c06d6bd935ff8d4af394b4b6a5ad326991c1a5adb80c16eeb479f5f99dbff5afb208537394aaf85cb21aed6c41f634a769df4e32679fe8294673eef5c155636
+EBUILD willuhn-hbci4java-2.5.12.30.ebuild 1445 SHA256 8f1481fbc280be9327e062373366890da93cea2f36050248bebd427053826330 SHA512 a31e920181ca22da590b7bb08d0f396839fffeae3c95b6779ce54f28c11ec7148d37d22ed20c9bed32c139c5422d5c614fb46b52ee8e8175aeeef126c26c5f09 WHIRLPOOL 2e2e5806d79ec1ee4ef006b1812af601effc81183d88a235038c95954ba1f51d7c4ec55ee192838e63b953a2493f8b2de1fce94ca72698398935508efed802f9
diff --git a/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12.30.ebuild b/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12.30.ebuild
index 51dcb1e..078e3e9 100644
--- a/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12.30.ebuild
+++ b/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12.30.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="A Java Library for HBCI/FinTS (Hibiscus Branch)"
 HOMEPAGE="https://github.com/willuhn/hbci4java"
 SRC_URI="https://github.com/willuhn/hbci4java/tarball/PATCH_${PATCH_VERSION} -> ${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+smartcard"
@@ -38,17 +38,15 @@ QA_SONAME="usr/$(get_libdir)/lib${PN}-chipcard-linux.so"
 EANT_BUILD_TARGET="package"
 
 #pkg_setup() {
-	# FIXME use smartcard && EANT_BUILD_TARGET="compile-chipcard ${EANT_BUILD_TARGET}"
+#	use smartcard && EANT_BUILD_TARGET="compile-chipcard ${EANT_BUILD_TARGET}"
 #}
 
 src_unpack() {
-        unpack ${A}
-        mv ${PN}-* "${S}"
+	unpack ${A}
+	mv ${PN}-* "${S}"
 }
 
 java_prepare() {
-	#epatch "${FILESDIR}/${PV}-makefile.patch"
-	#epatch "${FILESDIR}/${PV}-build.patch"
 	eant clean
 }
 
diff --git a/sys-libs/pcsc-ctapi-wrapper/Manifest b/sys-libs/pcsc-ctapi-wrapper/Manifest
index 80cbd96..3657cb6 100644
--- a/sys-libs/pcsc-ctapi-wrapper/Manifest
+++ b/sys-libs/pcsc-ctapi-wrapper/Manifest
@@ -1,2 +1,3 @@
 DIST pcsc-ctapi-wrapper-0.3.tar.gz 14792 SHA256 5ae49663120a711183a624798d150006cf18e2eedaf489c4aa139b6e97befb33 SHA512 d7298ab22d90fa4a6b49ac8c7c1339dfb5ca150776fdc83c1c92dc9b979065ed419df7c0ed29072cdd29f2f04121db9057b37f0f9e66c29474b80782b0b87dbc WHIRLPOOL 460181260fbb6f4c515f1a96f0c02ad44ad18585d27b6831610cc36a4b70db80492c5ce72613fe6c9db94d1da827b60df570c1346ce091aedc8694d8f092b6b0
-EBUILD pcsc-ctapi-wrapper-0.3.ebuild 851 SHA256 6a80380a5a0ff33a87bed9d5e540c03acf495e4fc8fdc060bc60eccad5926e6e SHA512 91931421a0feabb10048d35aef6a40af4451ad95ae344b9f6e61c369073a1b3e2f530cf08d61172dd795d27a8edc14acd9881e616d011f7463debf55ed7af2cf WHIRLPOOL a418cca0d57ecf1799021bf5ce1fea497bd875a63a6828ba551910933e0c4c5e0af2be07140b7e4cc266ea23e37bb802d249ec84771f2908f62b4847cf713516
+EBUILD pcsc-ctapi-wrapper-0.3.ebuild 701 SHA256 4c208e5f2315af2cd1b6f86e29e1e4597747c3e9ec607c9b4629f5d5581d8c27 SHA512 b95b890d8100f7d2d7789cc56835f4f2d2751bfe84e82b9bea9a2ea60e9c095d51f654dc98a1e9db2ffabf507d170418d73f8079b2129f8e6202defb6e6295ef WHIRLPOOL 82a1803c80a7310845d7c89c77ddbeaa37970d17e61aa34f233d8b5052d21c485687770147ee64e17da3e273f54fc673d50a861eb2f1e794a823c990a26f4783
+MISC metadata.xml 240 SHA256 7cc305e7e941711fe1eb453d7b6eb7de410cb13e54cb2b8a6de8bc396d19a9d9 SHA512 bf3b773b4a6ef9578c5661b73acc0ae6f979ed82dd082b058a8159e220442156eb6478eac9fbf1199792aaff2345d28ad5070ec0dfab8693c2e0897f53302f71 WHIRLPOOL 157a46bf4bde6ed81a546e3958cc57f2081c19f57c322fe03615c2d23e31cf566f577ac8b54dc305663ce12d5dec504991d005b1d3212967f3f470f9cda527a5
diff --git a/sys-libs/pcsc-ctapi-wrapper/metadata.xml b/sys-libs/pcsc-ctapi-wrapper/metadata.xml
new file mode 100644
index 0000000..cc3fe24
--- /dev/null
+++ b/sys-libs/pcsc-ctapi-wrapper/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-wanted@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/sys-libs/pcsc-ctapi-wrapper/pcsc-ctapi-wrapper-0.3.ebuild b/sys-libs/pcsc-ctapi-wrapper/pcsc-ctapi-wrapper-0.3.ebuild
index 956b34b..0224b46 100644
--- a/sys-libs/pcsc-ctapi-wrapper/pcsc-ctapi-wrapper-0.3.ebuild
+++ b/sys-libs/pcsc-ctapi-wrapper/pcsc-ctapi-wrapper-0.3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libchipcard/libchipcard-5.0.2.ebuild,v 1.5 2012/04/16 19:39:58 ranger Exp $
+# $Header: $
 
-EAPI=2
+EAPI=5
 
-inherit eutils multilib 
+inherit eutils multilib
 
-DESCRIPTION="Wrapper library for using smartcard readers that support PCSC only (e.g. SCR24x) with any application that supports CTAPI."
+DESCRIPTION="Wrapper library for using applications which use CTAPI with PCSC smartcard readers"
 HOMEPAGE="http://pcsc-ctapi.sourceforge.net/"
 SRC_URI="mirror://sourceforge/pcsc-ctapi/${P}.tar.gz"
 
@@ -19,7 +19,6 @@ RDEPEND=">=sys-apps/pcsc-lite-1.6.2"
 DEPEND="${RDEPEND}"
 
 src_install() {
-	
 	dolib.so lib${PN}.so.${PV} || die "dolib.so failed"
 	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.0 || die
 	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so || die