Hibiscus 2.6.3

15 files changed, 465 insertions, 15 deletions

diff --git a/app-office/hibiscus/Manifest b/app-office/hibiscus/Manifest
index 00f10d2..ae211a4 100644
--- a/app-office/hibiscus/Manifest
+++ b/app-office/hibiscus/Manifest
@@ -5,6 +5,10 @@ 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
 DIST hibiscus-2.6.0.zip 6695238 SHA256 7be45416165e1a7f232b55f29e74b6e143c089232861f7cd015c4e6cac4b8957 SHA512 b0d33aab786c7b450dca01dd04aea985ec275902b541fef8b82c84ed69462a05ea1ea44172438f3b2f83e0b7343dc67992885029fa182179ed8712e80cc644cb WHIRLPOOL 3d00afb9a214e65849e3198865d959c66a1d337e31b49e3ceee1c64de6aa2050c11d44c1beeaaec610dd3b6559f7b0df44ec85a4477750d7736ba1d64e94f1df
+DIST hibiscus-2.6.2.zip 6713994 SHA256 681fb2b6a4d1945ae96fa441c96fe0d87008427ecdc6e04de17495487773eea2 SHA512 2ac1a5028ea2951e78710db7b712326464b5e34a3ddbe63a59fbec32e6127f8ed34e7b3aa8e3b05b9c71079d4aa67c5d298a448ccc18f9cc4db586d4a56a309d WHIRLPOOL 3f5cc71e1149de36bfe50f6f57876aa8244c42394a75bf454c6fb8e008a37a2f0c0d64baad33205f60d6d5345845d4d278ae0c2b24a6674d595497ecb35b443f
+DIST hibiscus-2.6.3.zip 6761144 SHA256 777757efdf8452d4ff8ed0100729589c38c658619e32ca2369f8a03bd673b287 SHA512 eaa16012589cb938d33dba237ceb2d0308979efa30a360d5c23f778dab8948544e2729edfa2fff62cf1064ec646b5ca473b3cd909c36f28a4534572944009717 WHIRLPOOL 024ae7d832cbdefeb8e32f11226bd83bef138f5434df2a501938776a44af7a34aa0d4070ec3ea253efe07b8d6b083facf66e0aef6d083577a7baca1d0084d9f2
 EBUILD hibiscus-2.2.1.ebuild 2445 SHA256 9a388dee18ee61e8bcb28281de8b741fca433509f29c778b5c8193315cc31cb8 SHA512 b8d96be8ddb7e196357931c0022e3f544574ec76942144f2a2347b06143699dc8b4faae787a77b2e15a999e278a8103092ec558cbb7ae377f1d540b647049cce WHIRLPOOL dd308bc0976123b521caf5408a45f31ee9cb4412ac3318bd6d97a78fc4d684cb408977412dbf8103952bc14da2ab0c3791812eb5ce3b9bead1a73bf5c5695503
 EBUILD hibiscus-2.4.2.ebuild 2696 SHA256 32a02d502c11aca3be2f62da49fb73fbdef2ee219a2b3a78687ea00a0e8f28c1 SHA512 0e687939412638883b67221b930e1d22a6567a8d7bbabdf40dde14779ba73ccbd859f38cd133600f477b90d65ab7b353aa949288cc3f34e63a9d3d7a22a2b9bc WHIRLPOOL 99d1f0ecc9db5e4d33720aa8d19810dbdb9b48d187d1e6cf642cbe21e063f00d16e7523ff8d80dc755ac908a732e8813ff6f10a33be9bb90ffbde46f3c39212c
 EBUILD hibiscus-2.6.0.ebuild 2693 SHA256 7816cb64bd37f0df76ab69629758f39a50f5aa6c6657b16634b288f51ee6651c SHA512 fade0f824891ea2ad5851ca8751ce6e0aea14ece3355db5271e0f5978db4414e583ce7528ee88e52d1fc4677e2c639581d6f442ef4288950a53b296213f7a053 WHIRLPOOL 6174cfdf14b1ef2223f927f60a5ad5b343337d673975b84e38b59a910f77a15620b903cc8cfd900efa6c08cef2fa3c10cb60228f18a50eb69a72205f7d2dadc6
+EBUILD hibiscus-2.6.2.ebuild 2693 SHA256 8904d0ede8137948f34dffa6b5ef98558714e1214b624f919f51fa8c12fe6578 SHA512 924a141fd0f4e7ab4baeda046d233ed4683653596974b6f8a9f5e59e754441eaed8dca11d634dbb5cf1a49ffefc2113ff34207b2cec33a7a934a897d8af72485 WHIRLPOOL 20919886a1930362bd013ec96e9f49a0b34d03a0a98dae4fa7159cf249df154e335759cd33ddd131fbecc0d5891901b58f1237165400f8cdcbb35c0839cd21b5
+EBUILD hibiscus-2.6.3.ebuild 2693 SHA256 28b1f6084bde58a1bf7cebd4fa1b53b9142c695670717d1b161b4e9cd9483e6a SHA512 e0ed0f1524ffd7d8971630bd8f803ca5253c7714db4022acf9b39040931d202666bb3a247f4da1c169ed1343484f9524572785f1a91072b66d2346034ffbeb4c WHIRLPOOL 17ae1ca6f18230006d7577610fc331ef86ba42db1bdde4c5ddb9a9b8ddfc6369b000ab7a04fc570b0474d2d9a53cfc00d7d31c2a8ae03dfbf49ecaeabfc02264
diff --git a/app-office/hibiscus/hibiscus-2.6.2.ebuild b/app-office/hibiscus/hibiscus-2.6.2.ebuild
new file mode 100644
index 0000000..2a74328
--- /dev/null
+++ b/app-office/hibiscus/hibiscus-2.6.2.ebuild
@@ -0,0 +1,78 @@
+EAPI="2"
+JAVA_PKG_IUSE="doc source"
+WANT_ANT_TASKS="ant-nodeps"
+
+inherit eutils java-pkg-2 java-ant-2 versionator
+
+MY_PV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="A HBCI homebanking application based on hbci4java"
+HOMEPAGE="http://www.willuhn.de/products/hibiscus/"
+SRC_URI="http://www.willuhn.de/products/hibiscus/releases/${MY_PV}/hibiscus.src.zip -> ${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+COMMON_DEP="=dev-java/jameica-${MY_PV}*
+        >=net-libs/willuhn-hbci4java-2.5.12_p20140109
+	>=dev-java/obantoo-2.0.9
+	>=dev-java/super-csv-1.31:0
+	>=dev-java/swt-chart-0.7.0"
+
+RDEPEND=">=virtual/jre-1.6
+        ${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.6
+        ${COMMON_DEP}"
+
+S=${WORKDIR}/${PN}
+
+java_prepare() {
+	#epatch "${FILESDIR}/${PV}-hbci4java-api.patch"
+	epatch "${FILESDIR}/2.4.2-hbci4java-so-filename.patch"
+	
+    #rm -v ${S}/lib/*.{jar,so,dll,jnilib} || die
+	#rm -rv ${S}/lib/swtchart
+	rm -rv -v ${S}/lib/*
+
+	#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,super-csv,swt-chart
+}
+
+src_compile() {
+	eant -f build/build.xml jar $(use_doc javadoc)
+}
+
+src_install() {
+
+	local plugin_dir=/usr/share/jameica/plugins/hibiscus
+
+	dodir ${plugin_dir}
+	insinto ${plugin_dir}
+	
+	doins plugin.xml
+    doins releases/${PV}-0/${PN}/${PN}.jar
+	
+	cp -R "${S}/updates" "${D}${plugin_dir}" || die "Install failed!"
+	cp -R "${S}/sql" "${D}${plugin_dir}" || die "Install failed!"
+
+	dodir ${plugin_dir}/lib
+
+	dosym "$(java-pkg_getjars willuhn-hbci4java)" ${plugin_dir}/lib/
+	dosym "$(java-pkg_getjars obantoo)" ${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/
+	dosym "$(java-pkg_getjar swt-chart org.swtchart.ext.jar)" ${plugin_dir}/lib/
+
+	newicon icons/${PN}-icon-16x16.png ${PN}-icon-16x16.png || die "newicon failed"
+    newicon icons/${PN}-icon-32x32.png ${PN}-icon-32x32.png || die "newicon failed"
+	newicon icons/${PN}-icon-64x64.png ${PN}-icon-64x64.png || die "newicon failed"
+
+    use doc && java-pkg_dojavadoc releases/${PV}-0/javadoc
+    use source && java-pkg_dosrc src/de
+}
diff --git a/app-office/hibiscus/hibiscus-2.6.3.ebuild b/app-office/hibiscus/hibiscus-2.6.3.ebuild
new file mode 100644
index 0000000..3bacf91
--- /dev/null
+++ b/app-office/hibiscus/hibiscus-2.6.3.ebuild
@@ -0,0 +1,78 @@
+EAPI="2"
+JAVA_PKG_IUSE="doc source"
+WANT_ANT_TASKS="ant-nodeps"
+
+inherit eutils java-pkg-2 java-ant-2 versionator
+
+MY_PV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="A HBCI homebanking application based on hbci4java"
+HOMEPAGE="http://www.willuhn.de/products/hibiscus/"
+SRC_URI="http://www.willuhn.de/products/hibiscus/releases/${MY_PV}/hibiscus.src.zip -> ${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+COMMON_DEP="=dev-java/jameica-${MY_PV}*
+        >=net-libs/willuhn-hbci4java-2.5.12_p20140221
+	>=dev-java/obantoo-2.0.9
+	>=dev-java/super-csv-1.31:0
+	>=dev-java/swt-chart-0.7.0"
+
+RDEPEND=">=virtual/jre-1.6
+        ${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.6
+        ${COMMON_DEP}"
+
+S=${WORKDIR}/${PN}
+
+java_prepare() {
+	#epatch "${FILESDIR}/${PV}-hbci4java-api.patch"
+	epatch "${FILESDIR}/2.4.2-hbci4java-so-filename.patch"
+	
+    #rm -v ${S}/lib/*.{jar,so,dll,jnilib} || die
+	#rm -rv ${S}/lib/swtchart
+	rm -rv -v ${S}/lib/*
+
+	#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,super-csv,swt-chart
+}
+
+src_compile() {
+	eant -f build/build.xml jar $(use_doc javadoc)
+}
+
+src_install() {
+
+	local plugin_dir=/usr/share/jameica/plugins/hibiscus
+
+	dodir ${plugin_dir}
+	insinto ${plugin_dir}
+	
+	doins plugin.xml
+    doins releases/${PV}-0/${PN}/${PN}.jar
+	
+	cp -R "${S}/updates" "${D}${plugin_dir}" || die "Install failed!"
+	cp -R "${S}/sql" "${D}${plugin_dir}" || die "Install failed!"
+
+	dodir ${plugin_dir}/lib
+
+	dosym "$(java-pkg_getjars willuhn-hbci4java)" ${plugin_dir}/lib/
+	dosym "$(java-pkg_getjars obantoo)" ${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/
+	dosym "$(java-pkg_getjar swt-chart org.swtchart.ext.jar)" ${plugin_dir}/lib/
+
+	newicon icons/${PN}-icon-16x16.png ${PN}-icon-16x16.png || die "newicon failed"
+    newicon icons/${PN}-icon-32x32.png ${PN}-icon-32x32.png || die "newicon failed"
+	newicon icons/${PN}-icon-64x64.png ${PN}-icon-64x64.png || die "newicon failed"
+
+    use doc && java-pkg_dojavadoc releases/${PV}-0/javadoc
+    use source && java-pkg_dosrc src/de
+}
diff --git a/dev-java/h2/Manifest b/dev-java/h2/Manifest
new file mode 100644
index 0000000..d6bdba1
--- /dev/null
+++ b/dev-java/h2/Manifest
@@ -0,0 +1,2 @@
+DIST h2-2013-10-19.zip 7563851 SHA256 2f7d36f2ef5ec2274e46019ddb1fbf7e98870513a46fd6771760102d74cbe194 SHA512 818c0a61db06a79f1843447097eaf308d894be8a6870f455be592dfe50a937cbd1cf297fbc0779560f4e81072af981d5039ba90c520194aa44de83d02fed6254 WHIRLPOOL 30ceabb674951c679d4e97f1832d7e6c7c742e5b66ba5467fb8ce06cb179228a4c187f41678db497ba0822c256e4b88e25a0bd02183d0351a02e064524ff699f
+EBUILD h2-1.3.174.ebuild 2453 SHA256 31f174176848054e617878f403f120db4fd9e7fb98e47c433a54ba0217d2b903 SHA512 a42a4b8c3c970ce1f0418ba2f03d896acf952a3eede1bf0ee497f1c84962cd4a7349fc22587bc11ebc70b633e34251a88051dc2f6b1b134106af0ed3e2c783d9 WHIRLPOOL 5c8c3a08e10ac053aa75e6de52487f8426d568d8ee607b3f0ec627c749084d65713862453716628a2935bcf2e9376991f1d943ef47b08114e6c8e68667da426f
diff --git a/dev-java/jameica/Manifest b/dev-java/jameica/Manifest
index 882b5a5..5c94fb3 100644
--- a/dev-java/jameica/Manifest
+++ b/dev-java/jameica/Manifest
@@ -1,6 +1,8 @@
 DIST jameica-2.2.0.zip 20393047 SHA256 4bdd4030b9a8d5d5d8f1887db6b2602e094103b86fae7b7f2ea52e6532c2b7a9 SHA512 95e43cbf46f0a00c2db180d62aec2ba256b89baf860bff09c1091884e40f92b56864bbc2157bb5bea84c0ae3eb8d0bcf44a408f2442978c8a68f49088d061a22 WHIRLPOOL 451fdef9d23533927e90786b0f2009a7e3277c87e75d5fa806657e770c517940cd3bac249ef54349b780ddaadbdc82d84e679e1b8e60dbcb9e84ed5567a29b20
 DIST jameica-2.4.0.zip 20395429 SHA256 7c2babf9fc2c43560bb76b6c23442f51a5d307eebe14715785ec23e79ae6a163 SHA512 737181d9a99d7ed7677a7170ca8dd117b811a5d66261bdcb79d64675bf65b3ef8c395ff7b3b7400bcc7cfed5c5a96396d37f7410015337ec9fa748338ae82bc2 WHIRLPOOL f2d6f04a7becc4f8ad1dcc182000e2fe91b9eeca99db65ae56d667e2f5cf2704dcd2e0089886f26827979508af366653bae557e2a07371e24381c66064bad3f5
-DIST jameica-2.6.0.zip 22364536 SHA256 323770356eb5bf6ff47a4f305a8397dbc1164c0059f03f68055a47684983d567 SHA512 b788af206a1ddffa15416e1e1d3c3d9d8fa0322291d4702da4a1993721df9eb7941655c1cea9d8321f5350dda0a957ca7b97d723f8b6e167dd52b8f7fc5f6548 WHIRLPOOL 007a00150f2ce0109695eb617b7158366245ac943bce65aa90d5f397ba8581f2e29b231219506b33c5303080050794e4da6a2ebc68b38a5567b07c4f3c14b888
+DIST jameica-2.6.0.zip 22364873 SHA256 1ef489ed692addaecd1412a51f9789e989589445ce0505c9355a3233df605ff2 SHA512 63fa46c4930bee1a6d9d66caca6bf1f6c2ff2087f6cbe0dfb16e283aab50bdedecc7d1a5e17c3a2db37f5f5dcea3f43bca3877d16cbf8a88d358e8ee80eee140 WHIRLPOOL d6c40f5290da98e0ac3f3faa3999dc5fc328fb89fc8b47f63c88eb20bc37e4ed747ae41b76f03eef5018af39b7e1431fc40d3007d8e794d830ad31c71759d9e5
+DIST jameica-2.6.1.zip 22364873 SHA256 1ef489ed692addaecd1412a51f9789e989589445ce0505c9355a3233df605ff2 SHA512 63fa46c4930bee1a6d9d66caca6bf1f6c2ff2087f6cbe0dfb16e283aab50bdedecc7d1a5e17c3a2db37f5f5dcea3f43bca3877d16cbf8a88d358e8ee80eee140 WHIRLPOOL d6c40f5290da98e0ac3f3faa3999dc5fc328fb89fc8b47f63c88eb20bc37e4ed747ae41b76f03eef5018af39b7e1431fc40d3007d8e794d830ad31c71759d9e5
 EBUILD jameica-2.2.0.ebuild 2569 SHA256 2b4830a1d9ca438a721ec8c642a54d9efce2701fface44e65c6b7ba287edaa54 SHA512 7b614b28915cf8fe4dc3391c7603e4be1b97ea90da6dfae1b4902ecf86faf62506db3e22d2646cf7a41ed947258d2a8fefc5c4921da89669efa6eea8e04e140f WHIRLPOOL d4512aeec091c2e2b99793feb86084c2d201920773bfa096c380e0c86de635003726615dec9a0a0d3b484b8e5a8e0940c4e2b7264813300303447dfae497a7dd
 EBUILD jameica-2.4.0.ebuild 2753 SHA256 72d802fde61b085a2d19ab9b9f1ad59b35e056319e3dd2ad767ded6964f5f195 SHA512 caa62a493729cb1a55351bf11d75d9ff3299ed5d15d8ad12b9e1c961383491b8a466af140f8cb47612f6bddc69cef8c290c1afea5480612ae565240c522c0c92 WHIRLPOOL 4ff362923651e54cc4ed977afa023a551a45c21ccd311ca40eb8c101df48fca21a3638ff65018494d761f4c1fff471909563685251a064228895c6bd5139c6b2
 EBUILD jameica-2.6.0.ebuild 2750 SHA256 78a56d55e723a2d05d3d38778fe634d9ef71dc8808a20166ee627fcba866b67e SHA512 572a654dce70cf9445954c47a03ebbf63e838a4b44255101171ab13f66d05e864306b7745347ca96cb3e5dbe8bc7322fba48eb38cc9802ccd44cb5ae15052673 WHIRLPOOL dd415d89b29b1745b56a18561d45623b9ccf44eb8e441d7c5609858aef146ce7bb16ddc6c25b8373c0bfcf3d0c1197a43ef2c9d782ca8e95311db3e34561b142
+EBUILD jameica-2.6.1.ebuild 2760 SHA256 21f721420bd4f0695e45a61df413592a1aa2bca47249e73cc2da65085f9568b3 SHA512 bd56de4f9772208a056142639d22fbf362a1774de979606575586fead6b3217429c152ffc9ffde5a3453d0ab9a290ea66c533d02897e312c70135080c248392f WHIRLPOOL 718f421a64006812a1a562264662b6e9dce24970887ceb600bde85baf8c4cab349b933f034aa58c0292d4ab278e031136d1af9d2f2e96d12bb952a56ecd3d9d5
diff --git a/dev-java/jameica/jameica-2.6.1.ebuild b/dev-java/jameica/jameica-2.6.1.ebuild
new file mode 100644
index 0000000..05365d9
--- /dev/null
+++ b/dev-java/jameica/jameica-2.6.1.ebuild
@@ -0,0 +1,90 @@
+EAPI="2"
+JAVA_PKG_IUSE="doc source"
+
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2 versionator
+
+MY_PV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="A Java Framework and Runtime Environment"
+HOMEPAGE="http://www.willuhn.de/products/jameica/"
+SRC_URI="http://www.willuhn.de/products/${PN}/releases/${MY_PV}/${PN}/${PN}.src.zip -> ${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+COMMON_DEP="~dev-java/willuhn-util-${MY_PV}
+	~dev-java/willuhn-datasource-${MY_PV}_p20131229
+	>=dev-java/nanoxml-2.2.3
+	dev-java/swt:3.7
+	>=dev-java/velocity-1.5
+	>=dev-java/xmlrpc-3.1
+	>=dev-java/commons-cli-1.1
+	>=dev-java/commons-collections-3.2.1
+	>=dev-java/commons-lang-2.6
+	>=dev-java/commons-logging-1.1.1
+	dev-java/swtcalendar
+	>=dev-java/bcprov-1.44
+	>=dev-java/h2-1.2.145
+	>=dev-java/commons-lang-2.6
+	>=dev-java/swt-paperclips-1.0.4
+	dev-java/eclipse-jface:3.1
+	dev-java/eclipse-core-runtime:3.1
+	dev-java/eclipse-osgi:3.1
+	dev-java/eclipse-ui-forms:3.1"
+
+RDEPEND=">=virtual/jre-1.5
+    ${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+    ${COMMON_DEP}"
+
+S=${WORKDIR}/${PN}
+
+java_prepare() {
+	rm -vr ${S}/lib/*
+	cd ${S}/lib
+
+	#rm -vr apache_xmlrpc bouncycastle de_willuhn_ds de_willuhn_util h2 jakarta_commons mckoi mysql nanoxml paperclips splash.jar swtcalendar velocity
+	#rm -vr swt/linux swt/linux64 swt/macos swt/macos64 swt/win32 swt/win64
+
+	mkdir gentoo
+	local xmlrpc
+	xmlrpc="xmlrpc"
+	if has_version ">=dev-java/xmlrpc-3"; then
+		#TODO: How to reference slot instead of version ?
+		xmlrpc="xmlrpc-3"
+	fi
+
+	EANT_GENTOO_CLASSPATH="willuhn-util,willuhn-datasource,nanoxml,swt-3.7,velocity,${xmlrpc},commons-cli-1,commons-collections,commons-lang-2.1,commons-logging,swtcalendar,bcprov,h2,swt-paperclips,eclipse-jface-3.1,eclipse-osgi-3.1,eclipse-ui-forms-3.1,eclipse-core-runtime-3.1"
+
+	java-pkg_jar-from --with-dependencies --into gentoo "${EANT_GENTOO_CLASSPATH}"
+}
+
+src_compile() {
+	eant -f build/build.xml jar $(use_doc javadoc)
+}
+
+src_install() {
+    java-pkg_newjar releases/${PV}-0/jameica/jameica.jar
+
+	#java-pkg_newjar lib/swt/org.eclipse.core.runtime*.jar org.eclipse.core.runtime.jar
+	#java-pkg_newjar lib/swt/org.eclipse.jface*.jar org.eclipse.jface.jar
+	#java-pkg_newjar lib/swt/org.eclipse.osgi*.jar org.eclipse.osgi.jar
+	#java-pkg_newjar lib/swt/org.eclipse.ui.forms*.jar org.eclipse.ui.forms.jar
+
+	insinto /usr/share/${PN}
+	doins plugin.xml
+	dodir /usr/share/${PN}/plugins
+	
+	java-pkg_dolauncher ${PN} --main de.willuhn.jameica.Main --pwd /usr/share/jameica/
+
+	newicon	build/${PN}-icon.png ${PN}-icon.png || die "newicon failed"
+	make_desktop_entry jameica "Jameica" ${PN}-icon "Office;Finance"
+
+    use doc && java-pkg_dojavadoc releases/${PV}-0/javadoc
+    use source && java-pkg_dosrc src/de
+}
diff --git a/dev-java/obantoo/Manifest b/dev-java/obantoo/Manifest
index 025bde0..6492682 100644
--- a/dev-java/obantoo/Manifest
+++ b/dev-java/obantoo/Manifest
@@ -1,7 +1,6 @@
 AUX 1.4.11-hibiscus-encoding.patch 4967 SHA256 b0b60b1aac782df8d89e3e6773480d776c623ed0434eb2ca419b90fd7e8a7278 SHA512 3392cd972e6ced619efce7583e521999d34584ac5cda4a5b2beafbeacf84c9d16eb2f51c966ba6ac28055f14d61095bfe78e8f724083fe67a9c38b522b4b65f1 WHIRLPOOL 2e8f7574647cccba0632190d64dc99cb46608f497d4ff59c8d717f94e4af2d3be14e2fd56e6233892f6078aa121a33f22359ef2235904a036f2593b35ffb485f
 DIST obantoo-1.5.1.zip 283790 SHA256 20d335034c3c56c8d8c4bde522f727dc7f99e8725997549b0323cb4495514a41 SHA512 d6616a0100b6fc028c051b84f99cf2dc83d26462bf598ac6301e8874c257417a2f1ae57a23352ab0710843772d0358a854ed7b678546ba6a5a316d924bfd4206 WHIRLPOOL b0b0019d6ab1a4eddf348f6269d9e4010c3d5c72eab5598be0f5b90bf9fa92020e6cf2b644e3fba08fa71d0f56a577471ec33823729edc39092429d10e5c8507
 DIST obantoo-1.5.2.zip 291683 SHA256 0da4ad09283197f87bca6a96fcf67b3bf695d7e70c30d00ce526ee30fc2795e0 SHA512 0566a8aa6fa716c609d383491c92d45bcff3d94d9a02ea360bd8668090967d78247c2845d0e5b5e3039761074da0b3195d27a8dca4e6c076dd645857881206d8 WHIRLPOOL f816cdee9d2040bbf5a0814e10f12607a9d0bb4cc9d925d8ee9bd47072a957ce81053e7568d612f646a3ed0171f12fcf6fe873368023681a9e525551b785971d
-DIST obantoo-2.0.9.tar.gz 6184230 SHA256 dede5f4cf2c364f499bda6f1118257d3f2b12ed399c86d92d91695ba56e3aca2 SHA512 ee4fbb9689e638efd0bd1f21017d9069eceb8a34274a1f6034086740072cb760cad933b8ff0e1cd06e813410586e5482383e3407f06394d7cd81137f72e0fe8b WHIRLPOOL 54419e2893250501926293d8c046cdc81cec51b4ef5f4a920fe02623f7710f64ebb0b2250b3369dc867c0ad27c832d76384a98da7b5ed8e54cd6dd939de7b484
 EBUILD obantoo-1.5.1.ebuild 973 SHA256 7f4033de1874b09fcb1b0ecad853d29bea09a36a6ff280ab190de96de6575c78 SHA512 c84753cfa37dc1697ea919972ad4bc006bb3b755aaf1e0c99722803713713657bf5b598fab601d24c7a0233f4da953b7b2857c06e76c96aaad986e8306fced00 WHIRLPOOL a6a77170504bc30f32a8f0d93ac6a7c6d6157faaf0d8d7de7460e153b3cd7173d39b04ba4188353f6294f7baf8eaad813d1a54f55eefb71c6b403c59f48d9564
 EBUILD obantoo-1.5.2.ebuild 975 SHA256 f34236fa29bf9e1eb38533d7a5642c09629d2e6a4d013e43a1ada023d774155e SHA512 e1b53ba6144d936751c7156b9207e72edfad2ae5c4560aca9d6f04a9106d59f02c8fc9da92034be165d5a46529056bfe84d7d22c1b66ccf0573733f8f930966d WHIRLPOOL a8fc6deb991451bea9beeaeb6ac09962641048e7b6725ea41eb77e39a594e7b62daf97bf68eee5fbee79ec02ff8f021f0c0b9f2626950ea0bf824aa3acafaef4
-EBUILD obantoo-2.0.9.ebuild 1319 SHA256 2703ec75213d53fd2361507c0789b9d8e547e5eda446779a0e11ee3542fa254a SHA512 13271da2e68210d3677960efef4e0caa0c6b151c6420664761fd891e42f140433cf01ff4f446ea1c5d809bf8e3cdb96d2ca9fbc4adb1a36ac19ca0252a8d040c WHIRLPOOL dd639c474c663d6cfceadb0d65c9e89f479b1b03afc9062f5856ecf8713b1f39a6a4902e6b3cd3ed0f3fc290717ae4ea7eee2595ae3892b15f9f3831224bb269
+EBUILD obantoo-2.0.9.ebuild 1427 SHA256 f71612b7852d2981efcaadee7c8cda0be2f9adcede66aea127653784f7f88418 SHA512 b6710336f339bbcde5c1b4d2fb406b4df280b08b9a24c749204ffa091c2ec5bafe5993a8f9f398687a3e6ff81138aa329019338557009ed0845566a106093d46 WHIRLPOOL aba80c8b804aa227d67fd846bc16297e407d02ab65b1dcd8ddb59b6bbd08af923f1ef556f2a7a6669afcf4c30fd023daaf3c9c27e8aab84563a925181ce535cc
diff --git a/dev-java/obantoo/obantoo-2.0.9.ebuild b/dev-java/obantoo/obantoo-2.0.9.ebuild
index 4920e60..ea4ff6f 100644
--- a/dev-java/obantoo/obantoo-2.0.9.ebuild
+++ b/dev-java/obantoo/obantoo-2.0.9.ebuild
@@ -1,14 +1,16 @@
 EAPI="2"
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit eutils java-pkg-2 java-ant-2 cvs
 
-CVS_REV="1.6"
+ECVS_SERVER="obantoo.cvs.sourceforge.net:/cvsroot/${PN}"
+ECVS_MODULE="${PN}"
+ECVS_DATE="\"2013-11-12 21:34:46 UTC\""
 
 DESCRIPTION="A Java Library for HBCI (Homebanking Computer Interface) / FinTS (Financial Transaction Services)"
 HOMEPAGE="http://obantoo.sourceforge.net/"
 #SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-SRC_URI="http://${PN}.cvs.sourceforge.net/viewvc/${PN}/${PN}/?view=tar&revision=${CVS_REV} -> ${P}.tar.gz"
+#SRC_URI="http://${PN}.cvs.sourceforge.net/viewvc/${PN}/${PN}/?view=tar&revision=${CVS_REV} -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-java/willuhn-datasource/Manifest b/dev-java/willuhn-datasource/Manifest
index e5e4132..9e6011f 100644
--- a/dev-java/willuhn-datasource/Manifest
+++ b/dev-java/willuhn-datasource/Manifest
@@ -2,6 +2,8 @@ AUX 2.2-java7-api.patch 1119 SHA256 8cf266ba0593e7e6426e41b181382fdc4a4abb91d610
 DIST willuhn-datasource-2.2.zip 77290 SHA256 863a1f72b14bb8556a5f03264d8e39c04ce90b7abfe29da92aac92e033f2b3dd SHA512 8f443cc8c3c21df1eebb5a229160736bddb37a2e7e5775f9b5ade9497dc074e4338ae35e454f3a2cb1fcf2f83c63742de69ba24c6ed8e3907fd31ab527cf8168 WHIRLPOOL 2552b60ccad733803cc41953b56eb6804eb5b0eabccc2f443715cfe7d64a5b74abf2fa1c5d8b13f84c4927d2474c55e72d4d93e6abfb624c0a69a4e3ac2d8a37
 DIST willuhn-datasource-2.4.zip 77415 SHA256 3e9dcfd36bdf44399e22f7e3f2808563c4bfb5b704177fa2b8d64c91293a5016 SHA512 92c23ff0e65c23ac4026425e921a080b11015138d370ee9c8713b242a28c812d0e02ab9f37fce3aff5e85c3dee192acb377af2199bbb70117c5f7da3ccf1d9bf WHIRLPOOL a3fc8bd65c25ca065202d692d5ebd4f151bc964f8be5bad2cc690ae0d44cfdc8a69bb2ed5e0e6cfb54e9a1a462320ba4138792bd8a3041c4938caa795c66c1de
 DIST willuhn-datasource-2.6.zip 77052 SHA256 2bf73e2557662f1110deb2d97de20a726324203475cfede3b7d632bec480ef9d SHA512 c5f3b81e117c821854cde0d8de869142152e767bb08262086a82aa4cc39ed39c9c85efd6b71687d9ed1059936887803c966d35ff441cafea663bdc81d8b3fa66 WHIRLPOOL 554bfba7854919777630fa1c3e093d92954fbf1e2ff1d7d3625a443a5ac2ec0daa9e402150dead13805b25cb5d6b3764e1d5cf92aa61b8211db29e4f8e662d50
+DIST willuhn-datasource-2.6_p20131229.zip 1172401 SHA256 5b02790741be3d3d591bb4725b672636a4a7d09f16b408ba442dd7b0ed402d32 SHA512 a27ee32d1834502add3ab673e878d8a0f5626db511a04a7c0f14ec19cc489bd52e898c2177a405d0ed59c75f11b927c801467f2d5149da72b24907d0c3e931d4 WHIRLPOOL f8f03d70950c836b999c5831d24c9cbd638516d59d7c4b35e38950298d5de195a9d14a269ff69bc88eef84b734b65674a87930298a0317d75269c92749fb3a01
 EBUILD willuhn-datasource-2.2.ebuild 1057 SHA256 fc710ce43fd74bca83b5bd5280e61a717ffb38f21054de9af605498ed0baf013 SHA512 1937719c4e67fe48020a3b1d5fee737ed895cb6fe1dc5b99279152cf8964de5683e332303d0866cc11cac8eec9d19d3a4a46fc1049e6be51f520069c6dece49d WHIRLPOOL df71419e64c2cb049e33bd64d3188060b1e1ab693dc23def0bc714f07e63f325cd1e939e8860c9a2a7f749bcddd0cbe37fad3f27b0f81f4ab178b7333fec75fe
 EBUILD willuhn-datasource-2.4.ebuild 1058 SHA256 9049fafcb4ff164b31b2d1336c543ef548a0cdd64adbb1f7b785a03dc811ce00 SHA512 06c961fa63c33c1c4f739b27f08d31437da3438f6fe3d20f5f482e3f6eeb8d5f4ee044fdf27e47e0a9359a117aa7271e9fe894373924b663d6e0fd61489cf631 WHIRLPOOL cc9526b59d42746ac259bae83946d3946b6cc57016d27ef6011dbe9b85fd6a9a237ce0102e359b1dfd97bf157fb858d0fb1c04e26c455cba5c902f35d2e472c8
 EBUILD willuhn-datasource-2.6.ebuild 1058 SHA256 9049fafcb4ff164b31b2d1336c543ef548a0cdd64adbb1f7b785a03dc811ce00 SHA512 06c961fa63c33c1c4f739b27f08d31437da3438f6fe3d20f5f482e3f6eeb8d5f4ee044fdf27e47e0a9359a117aa7271e9fe894373924b663d6e0fd61489cf631 WHIRLPOOL cc9526b59d42746ac259bae83946d3946b6cc57016d27ef6011dbe9b85fd6a9a237ce0102e359b1dfd97bf157fb858d0fb1c04e26c455cba5c902f35d2e472c8
+EBUILD willuhn-datasource-2.6_p20131229.ebuild 1101 SHA256 aa67467727771c43cbfb3f04a89548474408108b9110a8ff02f5bb969d51d78d SHA512 b2bb0d24202c0c2b5f249fbc6ea92f381a7741ffa7620497f05ed7a5aa70ab5b07cd3eeefc4da95073fe33eaeee2aeff24f7daeb3ae1680e8fe1b720b4e6464e WHIRLPOOL a92c972cc7c4428f55ca03fda4e5578f7c4e2f3fe616c9d7df8a05b8b9169c1a251fbac10106a0b4d54b2d4cb903f0459c1f38c4de1596fdbd3390d05f24b983
diff --git a/dev-java/willuhn-datasource/willuhn-datasource-2.6_p20131229.ebuild b/dev-java/willuhn-datasource/willuhn-datasource-2.6_p20131229.ebuild
new file mode 100644
index 0000000..8704ffe
--- /dev/null
+++ b/dev-java/willuhn-datasource/willuhn-datasource-2.6_p20131229.ebuild
@@ -0,0 +1,48 @@
+EAPI="2"
+JAVA_PKG_IUSE="doc source"
+
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+COMMIT="e15b2f100a668d1faf242caf851064aefee56409"
+
+DESCRIPTION="An object relational mapper with RMI support"
+HOMEPAGE="http://www.willuhn.de/products/jameica/"
+SRC_URI="https://github.com/willuhn/datasource/archive/${COMMIT}.zip -> ${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+COMMON_DEP="~dev-java/willuhn-util-2.6
+	dev-java/mckoi"
+
+RDEPEND=">=virtual/jre-1.5
+        ${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+        ${COMMON_DEP}"
+
+S="${WORKDIR}/datasource-$COMMIT"
+
+java_prepare() {
+
+	#epatch "${FILESDIR}/${PV}-java7-api.patch"
+	java-ant_rewrite-classpath build/build.xml
+	eant -f build/build.xml clean
+}
+
+src_compile() {
+
+	EANT_GENTOO_CLASSPATH="willuhn-util,mckoi-1" eant -f build/build.xml jar $(use_doc javadoc) 
+#		-Dgentoo.classpath="$(java-pkg_getjars willuhn-util,mckoi-1)"
+}
+
+src_install() {
+        java-pkg_dojar releases/2.7-215/de_willuhn_ds.jar
+
+        use doc && java-pkg_dojavadoc dist/api
+        use source && java-pkg_dosrc src/de
+}
diff --git a/net-libs/willuhn-hbci4java/Manifest b/net-libs/willuhn-hbci4java/Manifest
index 494f4ac..3a9ff0e 100644
--- a/net-libs/willuhn-hbci4java/Manifest
+++ b/net-libs/willuhn-hbci4java/Manifest
@@ -1,7 +1,11 @@
-AUX java_home.patch 626 SHA256 6a8e5e359745e53fe52e44ee8ebea6faceffd4e24a7979b374eaee297243b977 SHA512 aad935c81cec04af54cb417829d770d77dde5ecbda5f45f92ea55519daee09e567cb54872c129bbbf8de168ce839374e9425de803b5eac4bf0418c714f73ca83 WHIRLPOOL 319c775a5c8e6fd8543938e6378c8bbe0ea737c9bec3e9f8f12dad700f4097b8ab6d9611ec3744a6ee72f58b3d969bd6d87a64e8a8e2e20f554a1482d30e9c87
+AUX java_home.patch 801 SHA256 39eb0d359acfbdc9305acec5f9d9acafd0bf742cbb40e13fbe2ba63bcec8bbde SHA512 71917237379da6dfe1d4c1296531c35f41c973436d2b68c502558a52e5498ad210754478574f090017943cf976aa937cfaa7f458cdbe8dffb0af4a862534bb2d WHIRLPOOL 60cfb86eb4d8fc9d7da2c48b7e1b312c76ec449cab25d649e0ecaeddbef8eb14e149fd80cd74908957ab91afc6c5f7bc54650386313117dc123a9fb6836b1b6a
 DIST willuhn-hbci4java-2.5.12_p20130130.zip 4707337 SHA256 560b9d9120780f955aef1a27a92ae0473c4c3bb82791eea212763631f9ee0f57 SHA512 235195618fd109d3cff2a3a4af2c62a806e0c7b058c2b9c143fca95210e6c797dc1abc388b8c05b33d7892e996c5f36949f293f33ae5759731df3b9d3dd32814 WHIRLPOOL fcb3f16bccd14e54615b47986519d5ddfb14caa0d3a8c0f7d5699a5b405f3dc2bea9a3727a9d3626cf82a28f4f35b90a42d0da2fac265ef05966aebc9c7c5f5d
 DIST willuhn-hbci4java-2.5.12_p20131218.zip 5478972 SHA256 bc4f8cd6d7d1216f36b8c82048917ca776580a68c09bbb44c5d00a2be8b452cf SHA512 86ab21cc0a1074de5dae453c78be798cf6f02268c5ae4d4c51d7b697d6fd589706640ed6bb9ec464ff40552b37055e1083fb6dd552b2adddcaa1ddd6f1db1162 WHIRLPOOL 734b2ab83d529f41a96ec9da480a89e4ffac4a5f1d68b5809442cc665371015b9cea466d122b0278d07e6b091097e2456568d55361af33b544112e17f125b5df
+DIST willuhn-hbci4java-2.5.12_p20140109.zip 5486418 SHA256 be9c1fd170d53c4c16689246722cb28cccfbe6b133faf4f80be954eef40fc7ab SHA512 e5baf21ff18bb6870fa4d8caadd2b7573cc980638637e1766205c72fcf1498dd2cf1ade83d7084cd97f7505d978be41ec87e1f5eb05fda685bb0b4e2a1ddf7fc WHIRLPOOL 1e34949cd262d2627d384511fb7414a0d9719992efc2031373e07b9dd93c7b45d8f300f87fb7fe1fad3cdaa8f09365fb87257efe4dbfd581c30a9dcd2e10685c
+DIST willuhn-hbci4java-2.5.12_p20140221.zip 5489177 SHA256 8299740141d949803aa0432bdb027403dae9b2aa61ad71c287db9682a78b2f35 SHA512 ffe117ea8a2f56a6c38c8a9342ccf827f09876b33d556c4dca812207bfc3b1461eb4e23c9a9d394f510124b90e6c0434f156dfc5dbae0d212a05733c4492474d WHIRLPOOL 241aadb20fa92e383d8f190c90578c3b4d0d464de9ce142f2092a1410124394c9d4ff36748544e9b8120097d5f9bc16b0f1f0063ef2a849a0e044142a83f1324
 DIST willuhn-hbci4java-2.5.12_p30.tar.gz 2833964 SHA256 6fd541c02384d64ece3e032a7b0650bf52d86ea89c9afb439df1bb1ad471ed19 SHA512 ac2371b886decf692fb8afdb58a810e613679d7984b3d6853e778d7559c4127fc0fac4bf387ec789e4c8ad3ab95c5e4ce17e3fbde0ec478648f1ed53cff8f69c WHIRLPOOL e2e094e8b8eea845a66780b09c0112384fb9cc6624ec1a919206b60ac9246b32ca92ad3fa294e19841666c0a9347e9192a32fbf782e3ddcfeceeb8f54012a694
 EBUILD willuhn-hbci4java-2.5.12_p20130130.ebuild 1471 SHA256 909b60ce4ad8832f6a7be5b2d8d670582ee636d36147f472a85ac2bd770c6a95 SHA512 46e1cc77cf7a790f31c3a8544f43c36ce949787e67a51fd071e002e5c90075895830dda80f619176e176c3beb4fc958c6da29d576f6520b69e176ebb9c8af5ee WHIRLPOOL 7558ba504472d1d58c725284b9c004c4300ff477b47470473f5ec7e5473dfcf663590fe948baee70d3489824d19dc09225d89e729055485bbf4a0d0524409d9c
-EBUILD willuhn-hbci4java-2.5.12_p20131218.ebuild 1528 SHA256 4be86e3732bb4bc663921ac694e72d234d022c4c1ec323253f581c61012ce56b SHA512 1691f2d00e094088827159f83ef6f08a17e9ede97e0a1e513a0abd8a6b6787cd596da2bbeb43e2876d1cdf75824f7f4aac05e366809546705056a4f625673828 WHIRLPOOL 21660424a4038a4f0b154fee26c5a4be2f78c8a2cd828d99aad34044372bd27827934e292118fd494da4ed47e3a062c25ab334d9ac86beb1042c0230e9b05aab
+EBUILD willuhn-hbci4java-2.5.12_p20131218.ebuild 1530 SHA256 1f19d212875825d03236c334ecdc0ad0389eb3077e5480891478912e1747aaec SHA512 6ad808dc72f6bd2b750d231d57e6b9bf29ab4fdd7e26f74346b1df1214c747de83ce3e436c69af8e3b1154cec11cbcd572f5a85060cd5163b33898bfb1313f32 WHIRLPOOL fb4097b29b8e49950fbbab3e825eadd3e789478fcbafbeda15d26f4f1f560c320e40bdf716830bd22ce66c469daea0f0b3e425a44e54f4d3287da118d2b249bf
+EBUILD willuhn-hbci4java-2.5.12_p20140109.ebuild 1530 SHA256 9ea91cf77efbba91ea7d5e7dd94cff2b11147453f82a59f5d10ce3cf4d6958aa SHA512 49d6785120ca6828471753dad82fe1bcd59f64c562548ce90c612363bd88856959702b48d1382cf353684c32fd74e555dd7cb4675ddeb80cde85c1bb471444d9 WHIRLPOOL 4766c1fc409b95e64d48e6a81bfc8637593004308e8525f11541700a022e7c954d1a50d221ef1110335cd4e9344b79cd4d2a4933591d6d74376f04e485ecaba0
+EBUILD willuhn-hbci4java-2.5.12_p20140221.ebuild 1530 SHA256 5ed3eacada7d3bb4c03d0ddec9cc809aab9e009e108de819349b2b231906e53a SHA512 ffd3a2c943e90a577a0e6280f7201c33d0fdc53d6ac53ac6d03f78ae203ce34b0a82be08c1d450817d9ee4e964a4d363e941776680e192d28c36d4be693f5a86 WHIRLPOOL c09394ceccb37b32e28dc04c0d9e18be8c5c6807f0a748f9f4b344ff04d2b93ac4eab085460cba10201c6ac2a7db9b82eadac0c5456fbbf1c872a092d86e449f
 EBUILD willuhn-hbci4java-2.5.12_p30.ebuild 1448 SHA256 7e699f4f145141bda9cf00eaff1f8d8efdec0c93048506835c2a95d6bcf31de2 SHA512 8e1d4e5bb2ff89dd8f18ad123d45d3dde01e143381747b76639819b07d4773492f745024aa390b9ddea01952e14f02e62c09a28d257f11d6f373757f076eff88 WHIRLPOOL 7ca63a362a206ece683a88df617786c99570e545e6c3b2b7a26c25d3661335c21385e2f45860b8cc49ee2e77be99573ad6569193a573d373bb5d241ff34ae4c8
diff --git a/net-libs/willuhn-hbci4java/files/java_home.patch b/net-libs/willuhn-hbci4java/files/java_home.patch
index 4d443ed..9a61032 100644
--- a/net-libs/willuhn-hbci4java/files/java_home.patch
+++ b/net-libs/willuhn-hbci4java/files/java_home.patch
@@ -1,10 +1,13 @@
-Index: hbci4java-dc095021274a54aeb8778b20ed22e84ddf0f5a8d/chipcard/src/frontend/Makefile
+Index: hbci4java-bc2108ad8dabe468e3fca314c4314d63d9a036ef/chipcard/src/frontend/Makefile
 ===================================================================
---- hbci4java-dc095021274a54aeb8778b20ed22e84ddf0f5a8d.orig/chipcard/src/frontend/Makefile
-+++ hbci4java-dc095021274a54aeb8778b20ed22e84ddf0f5a8d/chipcard/src/frontend/Makefile
-@@ -1,4 +1,4 @@
+--- hbci4java-bc2108ad8dabe468e3fca314c4314d63d9a036ef.orig/chipcard/src/frontend/Makefile
++++ hbci4java-bc2108ad8dabe468e3fca314c4314d63d9a036ef/chipcard/src/frontend/Makefile
+@@ -1,6 +1,6 @@
 -JAVA_HOME = $(shell readlink -f /usr/bin/javac | sed "s:/bin/javac::")
 +JAVA_HOME = ${JAVA_HOME-$(shell readlink -f /usr/bin/javac | sed "s:/bin/javac::")}
  DEFINES   = -D__UNIX
- INCLUDES  = -I../include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
+-INCLUDES  = -I../include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
++INCLUDES  = -I../include -I/opt/icedtea-bin-6.1.12.7/include/ -I/opt/icedtea-bin-6.1.12.7/include/linux/
  WARNINGS  = -Wall
+ # removed "-Werror -pedantic" because of dlsym() typecast problem
+ 
diff --git a/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p20131218.ebuild b/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p20131218.ebuild
index 3f9bea6..3ed16b9 100644
--- a/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p20131218.ebuild
+++ b/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p20131218.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/willuhn/hbci4java/archive/${COMMIT}.zip -> ${P}.zip"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+smartcard"
+IUSE="ctapi +smartcard"
 
 S="${WORKDIR}/hbci4java-${COMMIT}"
 
@@ -25,7 +25,7 @@ COMMON_DEP="
 	dev-java/xerces:2
 	>=dev-java/log4j-1.2.8:0
 	!net-libs/hbci4java
-	smartcard? ( sys-libs/pcsc-ctapi-wrapper )"
+	ctapi? ( sys-libs/pcsc-ctapi-wrapper )"
 
 RDEPEND=">=virtual/jre-1.6
 	${COMMON_DEP}"
diff --git a/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p20140109.ebuild b/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p20140109.ebuild
new file mode 100644
index 0000000..3f5dbe4
--- /dev/null
+++ b/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p20140109.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+JAVA_PKG_IUSE="doc source"
+
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+COMMIT="65daa92ff8f64bb0d6af7a5f4adf5e43df4378fa"
+
+DESCRIPTION="A Java Library for HBCI/FinTS (Hibiscus Branch)"
+HOMEPAGE="https://github.com/willuhn/hbci4java"
+SRC_URI="https://github.com/willuhn/hbci4java/archive/${COMMIT}.zip -> ${P}.zip"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ctapi +smartcard"
+
+S="${WORKDIR}/hbci4java-${COMMIT}"
+
+COMMON_DEP="
+	dev-java/xerces:2
+	>=dev-java/log4j-1.2.8:0
+	!net-libs/hbci4java
+	ctapi? ( sys-libs/pcsc-ctapi-wrapper )"
+
+RDEPEND=">=virtual/jre-1.6
+	${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${COMMON_DEP}"
+
+# JNI libraries don't need SONAME
+QA_SONAME="usr/$(get_libdir)/lib${PN}-chipcard-linux.so"
+
+EANT_BUILD_TARGET="package"
+
+#pkg_setup() {
+#	use smartcard && EANT_BUILD_TARGET="compile-chipcard ${EANT_BUILD_TARGET}"
+#}
+
+src_unpack() {
+	unpack ${A}
+	mv ${PN}-* "${S}"
+}
+
+java_prepare() {
+	epatch ${FILESDIR}/java_home.patch
+	eant clean
+	rm -f chipcard/lib/*
+}
+
+src_install() {
+	java-pkg_newjar dist/jar/hbci4java.jar
+
+	if use smartcard; then
+		dolib chipcard/lib/libhbci4java-card-linux.so || "dolib failed"
+		use amd64 && dosym libhbci4java-card-linux.so /usr/$(get_libdir)/libhbci4java-card-linux-64.so
+	fi
+
+	dodoc readme.md || die "dodoc failed"
+
+	use doc && java-pkg_dojavadoc doc/javadoc
+	use source && java-pkg_dosrc src/org
+}
diff --git a/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p20140221.ebuild b/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p20140221.ebuild
new file mode 100644
index 0000000..66c21fb
--- /dev/null
+++ b/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p20140221.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+JAVA_PKG_IUSE="doc source"
+
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+COMMIT="bc2108ad8dabe468e3fca314c4314d63d9a036ef"
+
+DESCRIPTION="A Java Library for HBCI/FinTS (Hibiscus Branch)"
+HOMEPAGE="https://github.com/willuhn/hbci4java"
+SRC_URI="https://github.com/willuhn/hbci4java/archive/${COMMIT}.zip -> ${P}.zip"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ctapi +smartcard"
+
+S="${WORKDIR}/hbci4java-${COMMIT}"
+
+COMMON_DEP="
+	dev-java/xerces:2
+	>=dev-java/log4j-1.2.8:0
+	!net-libs/hbci4java
+	ctapi? ( sys-libs/pcsc-ctapi-wrapper )"
+
+RDEPEND=">=virtual/jre-1.6
+	${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${COMMON_DEP}"
+
+# JNI libraries don't need SONAME
+QA_SONAME="usr/$(get_libdir)/lib${PN}-chipcard-linux.so"
+
+EANT_BUILD_TARGET="package"
+
+#pkg_setup() {
+#	use smartcard && EANT_BUILD_TARGET="compile-chipcard ${EANT_BUILD_TARGET}"
+#}
+
+src_unpack() {
+	unpack ${A}
+	mv ${PN}-* "${S}"
+}
+
+java_prepare() {
+	epatch ${FILESDIR}/java_home.patch
+	eant clean
+	rm -f chipcard/lib/*
+}
+
+src_install() {
+	java-pkg_newjar dist/jar/hbci4java.jar
+
+	if use smartcard; then
+		dolib chipcard/lib/libhbci4java-card-linux.so || "dolib failed"
+		use amd64 && dosym libhbci4java-card-linux.so /usr/$(get_libdir)/libhbci4java-card-linux-64.so
+	fi
+
+	dodoc readme.md || die "dodoc failed"
+
+	use doc && java-pkg_dojavadoc doc/javadoc
+	use source && java-pkg_dosrc src/org
+}