Jameica 2.6.0, Hibiscus 2.6.0 and needed dependencies

12 files changed, 468 insertions, 2 deletions

diff --git a/app-office/hibiscus/Manifest b/app-office/hibiscus/Manifest
index c1e498f..00f10d2 100644
--- a/app-office/hibiscus/Manifest
+++ b/app-office/hibiscus/Manifest
@@ -7,4 +7,4 @@ DIST hibiscus-2.4.2.zip 5260678 SHA256 a410c0b79ee8fae3b12405332c81e8fa8908b51be
 DIST hibiscus-2.6.0.zip 6695238 SHA256 7be45416165e1a7f232b55f29e74b6e143c089232861f7cd015c4e6cac4b8957 SHA512 b0d33aab786c7b450dca01dd04aea985ec275902b541fef8b82c84ed69462a05ea1ea44172438f3b2f83e0b7343dc67992885029fa182179ed8712e80cc644cb WHIRLPOOL 3d00afb9a214e65849e3198865d959c66a1d337e31b49e3ceee1c64de6aa2050c11d44c1beeaaec610dd3b6559f7b0df44ec85a4477750d7736ba1d64e94f1df
 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 2696 SHA256 9f3353f5b3335174ee5a508cece945aa88879288ba03e7f960e0ff6e56e866ee SHA512 d3561a4d89d22fe9bfd960cb016874e173f81fb0ceaca916283de7ad8fffff79a4bc7ac50d34bbb52dc70faaeeef37f3927b2d09d9a75388f6f2939b0805ddcb WHIRLPOOL a5d66112beabd37df1444a8487659a3e9c377883b232f4dbdcdd1cba4e10110cd957ea66755925b6d4cf1b55244fedeaf58aca13e25d18499d7cd04f1eedc558
+EBUILD hibiscus-2.6.0.ebuild 2693 SHA256 7816cb64bd37f0df76ab69629758f39a50f5aa6c6657b16634b288f51ee6651c SHA512 fade0f824891ea2ad5851ca8751ce6e0aea14ece3355db5271e0f5978db4414e583ce7528ee88e52d1fc4677e2c639581d6f442ef4288950a53b296213f7a053 WHIRLPOOL 6174cfdf14b1ef2223f927f60a5ad5b343337d673975b84e38b59a910f77a15620b903cc8cfd900efa6c08cef2fa3c10cb60228f18a50eb69a72205f7d2dadc6
diff --git a/app-office/hibiscus/hibiscus-2.6.0.ebuild b/app-office/hibiscus/hibiscus-2.6.0.ebuild
new file mode 100644
index 0000000..3592d35
--- /dev/null
+++ b/app-office/hibiscus/hibiscus-2.6.0.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_p20131208
+	>=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/jameica/jameica-2.6.0.ebuild b/dev-java/jameica/jameica-2.6.0.ebuild
new file mode 100644
index 0000000..093a8c5
--- /dev/null
+++ b/dev-java/jameica/jameica-2.6.0.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}
+	>=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 490a9d6..025bde0 100644
--- a/dev-java/obantoo/Manifest
+++ b/dev-java/obantoo/Manifest
@@ -1,5 +1,7 @@
 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
diff --git a/dev-java/obantoo/obantoo-2.0.9.ebuild b/dev-java/obantoo/obantoo-2.0.9.ebuild
new file mode 100644
index 0000000..4920e60
--- /dev/null
+++ b/dev-java/obantoo/obantoo-2.0.9.ebuild
@@ -0,0 +1,59 @@
+EAPI="2"
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+CVS_REV="1.6"
+
+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"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+COMMON_DEP="dev-java/itext:5"
+
+RDEPEND=">=virtual/jre-1.6
+        ${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	dev-java/junit:4
+    ${COMMON_DEP}"
+
+S=${WORKDIR}/${PN}
+
+java_prepare() {
+#	epatch ${FILESDIR}/${PV}-hibiscus-encoding.patch
+	rm -rv lib/* || die
+	eant clean
+	java-pkg_jar-from itext-5 itext.jar ${S}/lib/itextpdf-5.3.3.jar
+	java-pkg_jar-from junit-4 junit.jar ${S}/lib/junit-4.11.jar
+}
+
+#src_compile() {
+#
+#	local classpath="$(java-pkg_getjars itext-5)"
+#
+#	find src -name '*.java' > sources.list
+#	ejavac -encoding latin1 -cp "${classpath}" -d bin @sources.list
+#	jar cf ${PN}.jar -C bin/ .
+#	# TODO: javadoc
+#}
+
+src_compile() {
+	eant jar $(use_doc javadoc)
+}
+
+src_install() {
+    java-pkg_newjar build/${PN}-bin-${PV}.jar
+
+	use doc && dodoc doc/*
+    use doc && java-pkg_dojavadoc javadoc
+
+    use source && java-pkg_dosrc src/de
+}
diff --git a/dev-java/willuhn-datasource/willuhn-datasource-2.6.ebuild b/dev-java/willuhn-datasource/willuhn-datasource-2.6.ebuild
new file mode 100644
index 0000000..373d331
--- /dev/null
+++ b/dev-java/willuhn-datasource/willuhn-datasource-2.6.ebuild
@@ -0,0 +1,46 @@
+EAPI="2"
+JAVA_PKG_IUSE="doc source"
+
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="An object relational mapper with RMI support"
+HOMEPAGE="http://www.willuhn.de/products/jameica/"
+SRC_URI="http://www.willuhn.de/products/jameica/releases/${PV}/datasource/de_willuhn_ds.src.zip -> ${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+COMMON_DEP="~dev-java/willuhn-util-${PV}
+	dev-java/mckoi"
+
+RDEPEND=">=virtual/jre-1.5
+        ${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+        ${COMMON_DEP}"
+
+S=${WORKDIR}
+
+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/${PV}-0/de_willuhn_ds.jar
+
+        use doc && java-pkg_dojavadoc dist/api
+        use source && java-pkg_dosrc src/de
+}
diff --git a/dev-java/willuhn-util/willuhn-util-2.6.ebuild b/dev-java/willuhn-util/willuhn-util-2.6.ebuild
new file mode 100644
index 0000000..f0bd12a
--- /dev/null
+++ b/dev-java/willuhn-util/willuhn-util-2.6.ebuild
@@ -0,0 +1,42 @@
+EAPI="2"
+JAVA_PKG_IUSE="doc source"
+
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="A collection of small java helpers"
+HOMEPAGE="http://www.willuhn.de/products/jameica/"
+SRC_URI="http://www.willuhn.de/products/jameica/releases/${PV}/util/de_willuhn_util.src.zip -> ${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+COMMON_DEP=""
+
+RDEPEND=">=virtual/jre-1.5
+        ${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+        ${COMMON_DEP}"
+
+S=${WORKDIR}
+
+java_prepare() {
+
+	eant -f build/build.xml clean
+}
+
+src_compile() {
+
+	eant -f build/build.xml jar $(use_doc javadoc) || die "compile problem" 
+}
+
+src_install() {
+        java-pkg_dojar releases/${PV}-0/de_willuhn_util.jar
+
+        use doc && java-pkg_dojavadoc dist/api
+        use source && java-pkg_dosrc src/de
+}
diff --git a/dev-java/xmlrpc/Manifest b/dev-java/xmlrpc/Manifest
new file mode 100644
index 0000000..dbadc7d
--- /dev/null
+++ b/dev-java/xmlrpc/Manifest
@@ -0,0 +1,2 @@
+DIST apache-xmlrpc-3.1.3-src.tar.gz 170246 SHA256 659671d30eed83ed28a79d448b0960e93c6cc42d371058a375ea6ecdd66e1ad6 SHA512 3c88f23082f82afd96fa3b2041d242d10f5886f21c2274f78fc035f7c4328ab6d436430a0dc126498f048f816207452da227299195daed47af0f84770167ff54 WHIRLPOOL f1a5b42bf70d6399d20c2da78c9ea5b4f7f8536304a354203e7836083e40df4c7b236b516eac4eadcdd5c2314f23119a0450672d0180fccb56f5a310045ced45
+EBUILD xmlrpc-3.1.3.ebuild 1806 SHA256 009fc908890cac024c071b05c7c5cf67f7d5fe02df5763e173624646e47435dd SHA512 f3aa13623a1b854cd553bf77fda5eb46c99937030d8c17f37ba68a5447c279c50e218cbbc6ace3294f90ce8fe41bbffbdde1fb4719b142b385142b218cac4164 WHIRLPOOL 3b96f37c6c52fa824b570b2f92508022be88b7a3495fa6bdcf137ea4674d05f01c0b88e6cb5b5d7d5f45a29da78785861a980943330d6aa2608a3b6856f1e032
diff --git a/dev-java/xmlrpc/xmlrpc-3.1.3.ebuild b/dev-java/xmlrpc/xmlrpc-3.1.3.ebuild
new file mode 100644
index 0000000..441ed56
--- /dev/null
+++ b/dev-java/xmlrpc/xmlrpc-3.1.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="1"
+JAVA_PKG_IUSE="source test"
+inherit java-pkg-2
+
+DESCRIPTION="Apache XML-RPC is a Java implementation of XML-RPC"
+HOMEPAGE="http://ws.apache.org/xmlrpc/"
+SRC_URI="mirror://apache/ws/xmlrpc/sources/apache-${P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE=""
+
+CDEPEND="dev-java/commons-codec
+	dev-java/commons-logging
+	dev-java/commons-httpclient:3
+	dev-java/servletapi:2.4
+	dev-java/ws-commons-util
+	dev-java/xerces:2"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.4
+	test? ( dev-java/junit:0 )"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.4"
+
+S="${WORKDIR}/apache-${P}-src"
+EANT_GENTOO_CLASSPATH="commons-codec commons-logging commons-httpclient:3 servletapi:2.4 ws-commons-util xerces:2"
+JARS="common client server"
+
+pkg_setup() {
+	MY_CP=`eval echo ${PN}-{${JARS// /,}}.jar`
+	MY_CP=${MY_CP// /:}
+	MY_CP=${MY_CP}:`java-pkg_getjars --with-dependencies ${EANT_GENTOO_CLASSPATH// /,}`
+}
+
+src_compile() {
+	local jar
+	mkdir -p bin || die
+
+	for jar in ${JARS} ; do
+		ejavac -cp ${MY_CP} -d bin `find ${jar}/src/main -name "*.java" || die`
+		`java-config -j` cvf "${PN}-${jar}.jar" -C bin . || die
+		rm -rf bin/* || die
+	done
+}
+
+src_install() {
+	java-pkg_dojar *.jar
+	use source && java-pkg_dosrc `eval echo {${JARS// /,}}/src/main/java/*`
+}
+
+src_test() {
+	local class tests="tests/src/test/java"
+	ejavac -cp ${MY_CP}:`java-pkg_getjars junit` `find ${tests} -name "*.java" || die`
+
+	# ScalabilityTest results in an error for some reason. Is it our fault?
+	for class in `find ${tests} -name "*Test.java" ! -name "ScalabilityTest.java" || die` ; do
+		class=${class#${tests}/}
+		class=${class%.java}
+		ejunit -cp ${tests}:${tests/\/java/\/resources}:${MY_CP} ${class//\//.}
+	done
+}
diff --git a/net-libs/willuhn-hbci4java/Manifest b/net-libs/willuhn-hbci4java/Manifest
index 934cb70..494f4ac 100644
--- a/net-libs/willuhn-hbci4java/Manifest
+++ b/net-libs/willuhn-hbci4java/Manifest
@@ -1,6 +1,7 @@
+AUX java_home.patch 626 SHA256 6a8e5e359745e53fe52e44ee8ebea6faceffd4e24a7979b374eaee297243b977 SHA512 aad935c81cec04af54cb417829d770d77dde5ecbda5f45f92ea55519daee09e567cb54872c129bbbf8de168ce839374e9425de803b5eac4bf0418c714f73ca83 WHIRLPOOL 319c775a5c8e6fd8543938e6378c8bbe0ea737c9bec3e9f8f12dad700f4097b8ab6d9611ec3744a6ee72f58b3d969bd6d87a64e8a8e2e20f554a1482d30e9c87
 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_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 1471 SHA256 d317e73e47d4694e914d2cbc56b75b35cf1c0dda344686cbe5addd8a550d70b7 SHA512 623d2963fb5cea997eadcdb2caae8d90da4433fff0fa36c1b22515b2e4857d539e657131d513bc1359df55ede934238131e8c8c020ecc2e62fe76dce2c4629c2 WHIRLPOOL 7e2df0ebc533bde5db481e4448a30a70ec8440c64fae0e0a05846df084e47a680f5da15fa6bf2f2578453fa1e48cccb577503f16df4f3aae31f1e184728e6ab8
+EBUILD willuhn-hbci4java-2.5.12_p20131218.ebuild 1528 SHA256 4be86e3732bb4bc663921ac694e72d234d022c4c1ec323253f581c61012ce56b SHA512 1691f2d00e094088827159f83ef6f08a17e9ede97e0a1e513a0abd8a6b6787cd596da2bbeb43e2876d1cdf75824f7f4aac05e366809546705056a4f625673828 WHIRLPOOL 21660424a4038a4f0b154fee26c5a4be2f78c8a2cd828d99aad34044372bd27827934e292118fd494da4ed47e3a062c25ab334d9ac86beb1042c0230e9b05aab
 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
new file mode 100644
index 0000000..4d443ed
--- /dev/null
+++ b/net-libs/willuhn-hbci4java/files/java_home.patch
@@ -0,0 +1,10 @@
+Index: hbci4java-dc095021274a54aeb8778b20ed22e84ddf0f5a8d/chipcard/src/frontend/Makefile
+===================================================================
+--- hbci4java-dc095021274a54aeb8778b20ed22e84ddf0f5a8d.orig/chipcard/src/frontend/Makefile
++++ hbci4java-dc095021274a54aeb8778b20ed22e84ddf0f5a8d/chipcard/src/frontend/Makefile
+@@ -1,4 +1,4 @@
+-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
+ WARNINGS  = -Wall
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
new file mode 100644
index 0000000..3f9bea6
--- /dev/null
+++ b/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p20131218.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="dc095021274a54aeb8778b20ed22e84ddf0f5a8d"
+
+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="+smartcard"
+
+S="${WORKDIR}/hbci4java-${COMMIT}"
+
+COMMON_DEP="
+	dev-java/xerces:2
+	>=dev-java/log4j-1.2.8:0
+	!net-libs/hbci4java
+	smartcard? ( 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
+}