Hibiscus 2.6.8

7 files changed, 137 insertions, 84 deletions

diff --git a/app-office/hibiscus/Manifest b/app-office/hibiscus/Manifest
index b6c598a..a26b568 100644
--- a/app-office/hibiscus/Manifest
+++ b/app-office/hibiscus/Manifest
@@ -2,7 +2,5 @@ AUX 1.12.2-hbci4java-api.patch 1681 SHA256 48f4efd5622e10e65ff8c06c39c44357123df
 AUX 1.12.2-hbci4java-so-filename.patch 1699 SHA256 cfacad8432d216bb861f63970a51f4eb038e659797cf4b4f3d9c816835dc4677 SHA512 1bfe4880d6ea76c1b14b4abfb72115d44645832552bbcf0eb89c7d0bfa6a6ef3dbf98e8d545590951606d10b2abff0c80df93d34e1200ab3de6e6d0873a787fa WHIRLPOOL f1dc7b67d5fd4eb3807298bc5b6705a2a87dfed2fd687437b6b6b50519f22cda8af939d658174498cf10a7f03717a8a66e036a35292742cfa52b78e2d692a9da
 AUX 2.2.1-hbci4java-so-filename.patch 1697 SHA256 22df5c01119aa6a6b818557090e08f0295970ab64d97374953f0c84f70445938 SHA512 367b112f08c95e1029b9f09fd902fff6af0790579554ac63df78ef56b8ba1311d544b522bd4b13b2d4fbeece241f57d8192364d7f72f3261bf1a5cc240d252f2 WHIRLPOOL d34d3328acbdf676f097485d10753f40d0a4df4044cc1cf80efbe777efd6cd4db9f06bf6b41208d3f7073346ec826001413ed7c973277f5025f37f9f70457ec9
 AUX 2.4.2-hbci4java-so-filename.patch 1697 SHA256 22df5c01119aa6a6b818557090e08f0295970ab64d97374953f0c84f70445938 SHA512 367b112f08c95e1029b9f09fd902fff6af0790579554ac63df78ef56b8ba1311d544b522bd4b13b2d4fbeece241f57d8192364d7f72f3261bf1a5cc240d252f2 WHIRLPOOL d34d3328acbdf676f097485d10753f40d0a4df4044cc1cf80efbe777efd6cd4db9f06bf6b41208d3f7073346ec826001413ed7c973277f5025f37f9f70457ec9
-DIST hibiscus-2.6.5.zip 6867012 SHA256 27e8e0e1d077bad70b931bca0bea108c681cc8f509f189ac2b843b87f2557f89 SHA512 2ed599dbc127a9853deb48e06cda64c72bc99a8ff968322e82b6b5847079df2900b335886c3593653277121c6441daaceaf68828b565c33d43d85e6d795c9429 WHIRLPOOL 94236abe6e123e30422c5a68ae9b143d04702f532f11a511047910a83a052d89b2ee8a7e686ef59fb827be0fb508cfad267e7067c4d1b733e9c60e0da6c6ca27
-DIST hibiscus-2.6.7.zip 6983018 SHA256 0dbea55ec0f143ae26e9ab0039b61587f3addf3e8989e77a60ee2cf7858c9a39 SHA512 3597d109a349fa2ad64488a2b8b22a1cfd5a33efb02d4dacd1f89ddf9dc1d5c6b45343b51ca106fa3659897bd2210a2d1389f626c4a9854d027ae361cf5bd8d4 WHIRLPOOL 9d2b852278cbe17e7ff08b45d7e3e2e0cc70e207010ade988af795289af47ab7c7ecf71abfecd28392773b580cdcaf51767af867dea85584cdf5cf0c372ed6ec
-EBUILD hibiscus-2.6.5.ebuild 2693 SHA256 47f5825eef39361bcd178291c31d7b26922b0eff7c55be8016b592ce2ff037e8 SHA512 ae274fade2e1e82411b1785b9dde92fc03f4fe9155c62be2f1eff78ff566319445ff824f82b902ef838280243858ba8045a283164304ca5cd7ff11322a213a06 WHIRLPOOL 2352927a467f533b1959ad20c38cb73a78b7701103cd7e53353c0cc4bba3e1512c542a0ca31d29dafefa8630b38a0324676842dab07ef411176fdd627728e4a0
-EBUILD hibiscus-2.6.7.ebuild 2693 SHA256 e6394cf5b3d2c9db899cc2ea258c35ad1c878b95f600cb5f6c37a12925ea4ceb SHA512 59839cd901b46244c6e9264bbc174d12462d450fddc1570fa121bc15340c0c59a4f304389416d259c7c849b37b4ec4180d8ba8e31a74a459f83fe1539933a3b1 WHIRLPOOL 12c86051585dbd1af60b23b76e91343c4e660f813b28c3a1f084be87a61d8fab9d9c26533d23518f802cb0c8ef3866f340a57ba6aa9d1869d035bd4404cac8f7
+DIST hibiscus-2.6.8.zip 6985048 SHA256 f7c4a29385a7423364b1ff96d95c1943ad3f37624883f687c8caaef1a78a3cec SHA512 d738109e3c87ffbf386c4e2dd6e0e82609ad3cd1c428b8b4a7e732cd3dd2ea7fd5bf2425c02b6ff84a0f3186a957f0a14e06c72f04226214a69e3399f2221bf0 WHIRLPOOL 12312dddc6709269ed02b2ef56130804d533c07eba15a3d31f5b7ae0ef1442e0401709c080910ed642371f81eaebe235ffd317e1bd2be7097ab19be39319b090
+EBUILD hibiscus-2.6.8.ebuild 2693 SHA256 834b67da21e8523c90ec4dfef2cb89de8240faf18bf605112f35e2d161c9c126 SHA512 65df8dc589973f6fb3e89e4bd51742c3a4f07e79a846855cca13176ef4d9639a4032fd37567bc857e07b12f2849df0a6f09770a75dbb6d1bc35a022c01d87d55 WHIRLPOOL eff8c325f13484493089435215df01d4bd0c1076aeebb15d1f2bcfacfd66016f354028495f1a038f3e55fe139637daebf076c1241a790d330392936fc8c45f05
diff --git a/app-office/hibiscus/hibiscus-2.6.7.ebuild b/app-office/hibiscus/hibiscus-2.6.7.ebuild
deleted file mode 100644
index 22c0641..0000000
--- a/app-office/hibiscus/hibiscus-2.6.7.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-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_p20140617
-	>=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.5.ebuild b/app-office/hibiscus/hibiscus-2.6.8.ebuild
index b864522..e23f85b 100644
--- a/app-office/hibiscus/hibiscus-2.6.5.ebuild
+++ b/app-office/hibiscus/hibiscus-2.6.8.ebuild
@@ -16,8 +16,8 @@ KEYWORDS="~x86 ~amd64"
 IUSE=""
 
 COMMON_DEP="=dev-java/jameica-${MY_PV}*
-        >=net-libs/willuhn-hbci4java-2.5.12_p20140325
-	>=dev-java/obantoo-2.0.9
+        >=net-libs/willuhn-hbci4java-2.5.12_p20140731
+	>=dev-java/obantoo-2.1.6
 	>=dev-java/super-csv-1.31:0
 	>=dev-java/swt-chart-0.7.0"
 
diff --git a/dev-java/obantoo/Manifest b/dev-java/obantoo/Manifest
index 6492682..74ca0c4 100644
--- a/dev-java/obantoo/Manifest
+++ b/dev-java/obantoo/Manifest
@@ -4,3 +4,4 @@ DIST obantoo-1.5.2.zip 291683 SHA256 0da4ad09283197f87bca6a96fcf67b3bf695d7e70c3
 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 1427 SHA256 f71612b7852d2981efcaadee7c8cda0be2f9adcede66aea127653784f7f88418 SHA512 b6710336f339bbcde5c1b4d2fb406b4df280b08b9a24c749204ffa091c2ec5bafe5993a8f9f398687a3e6ff81138aa329019338557009ed0845566a106093d46 WHIRLPOOL aba80c8b804aa227d67fd846bc16297e407d02ab65b1dcd8ddb59b6bbd08af923f1ef556f2a7a6669afcf4c30fd023daaf3c9c27e8aab84563a925181ce535cc
+EBUILD obantoo-2.1.6.ebuild 1427 SHA256 6b62f45443ae433a8677affb1d2d59901394c47bcd351413825324625bddd5cd SHA512 ce80c1d42890c76ad1f3fa587d0fd39b5c10a4ff307a1eb06f01186c34862e3d091b0656002abeb808b3166f5c72430646613d230a812930dca62e60f3fa73d9 WHIRLPOOL da9c72446a857bb3339f0976f7c3a66bc0810f00987c88423deaf39f11ce47b88c468c607f7a6c24a9fd189fd1e53580da3029e800183501596dc58f1c49538f
diff --git a/dev-java/obantoo/obantoo-2.1.6.ebuild b/dev-java/obantoo/obantoo-2.1.6.ebuild
new file mode 100644
index 0000000..dc82cf0
--- /dev/null
+++ b/dev-java/obantoo/obantoo-2.1.6.ebuild
@@ -0,0 +1,61 @@
+EAPI="2"
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2 cvs
+
+ECVS_SERVER="obantoo.cvs.sourceforge.net:/cvsroot/${PN}"
+ECVS_MODULE="${PN}"
+ECVS_DATE="\"2014-07-30 16:06:19 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"
+
+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/net-libs/willuhn-hbci4java/Manifest b/net-libs/willuhn-hbci4java/Manifest
index 15dd728..185eb07 100644
--- a/net-libs/willuhn-hbci4java/Manifest
+++ b/net-libs/willuhn-hbci4java/Manifest
@@ -1,5 +1,7 @@
 AUX java_home.patch 801 SHA256 39eb0d359acfbdc9305acec5f9d9acafd0bf742cbb40e13fbe2ba63bcec8bbde SHA512 71917237379da6dfe1d4c1296531c35f41c973436d2b68c502558a52e5498ad210754478574f090017943cf976aa937cfaa7f458cdbe8dffb0af4a862534bb2d WHIRLPOOL 60cfb86eb4d8fc9d7da2c48b7e1b312c76ec449cab25d649e0ecaeddbef8eb14e149fd80cd74908957ab91afc6c5f7bc54650386313117dc123a9fb6836b1b6a
 DIST willuhn-hbci4java-2.5.12_p20140325.zip 5495614 SHA256 f3e8c509f54a7ffb12cf928bb04b6e77f33777638631eed11d67760b31d0ade1 SHA512 637e671809d4017b52c5441f030d5e34b3cef00af47db8686d166de4d99c6e9850bffeb2d63327c1bb1d72cb229e967c49c651368236de3305a2f8cc1f8ad000 WHIRLPOOL 62af76334271adb4e974c4180a2ea3f916943e7a8b3cc1b5ae41aa0c6357dcf20115059e8158a9a13fd3406c5f483caa14fa33737a4a5ce9f9eb43d09835734b
 DIST willuhn-hbci4java-2.5.12_p20140617.zip 5543750 SHA256 5f3b050be7b1757b60dca8a503b7d7ba2e5ab674604573af2297094c4cca91d4 SHA512 877c31e963d0a9583145cba0fc69681cdb439aed05250da906cbdd49e14527df22300cbada8ae88838c117fa70642640ebb0315edb204b136128ca63c1ddead7 WHIRLPOOL 4e2f02742aa467f4e78580a402515335485eae40dbfedd91513957c779845ed47b45f2e8afc847f4b9d60e2fe1835046fa274a27d2607669fa506aa75df71d5c
+DIST willuhn-hbci4java-2.5.12_p20140731.zip 5545258 SHA256 0f81321b24d9309b941a9c1e7934f16e9343dc5f7b9165bee5e67a7d367cbaa3 SHA512 1587da67d832cae8dea69edd563944715b70372e4470d605c7f3b433c8483ed4af27335e6ecc7b535fdb2123798cb33f6970df8b31ed543659eb7ffae9b85298 WHIRLPOOL b10879bfceef1aec86f616578e2cee302542523976ecb0d2d082c6c9c93ce73d078afc4a8357331128897926500ffafe73034052c71978a7e2e7d89c59b97230
 EBUILD willuhn-hbci4java-2.5.12_p20140325.ebuild 1530 SHA256 f688f7ffc12fcb79079ecba00f999be0a7a8550fcfb3e05bfcdbebcd68ebc8a0 SHA512 c6ac5b3dee411067cd92351a7e3ec9f02ce3005ed836be1df0469b4ab27e3b98931eb8a85a6e99e22565a797bbc62b6e2ceece1da84199303e2c9dc156bf0508 WHIRLPOOL 499592e71e245412b62effdd5ed3f172b1009804c9d21dfae105b97927db8200728e194d0d7cd906669e83fe90aceca1218260144ea0eee4962d0b605b5ea357
 EBUILD willuhn-hbci4java-2.5.12_p20140617.ebuild 1530 SHA256 65b0e66c88694f80b92f6cae6d812b0548248dd0116d493495fbb03ad570ccb4 SHA512 cd6209bfa5e748c84b4839bb85ae01b103b5286e39481a8ab67b0a43d93c5a29d7b8086f2019b4e0409d3c859c597fd4edf4f344d55f42d97faca4e9ebcc1744 WHIRLPOOL 4799936bd508796e378ef158b09b7b2ac63a321c9fb4c451a60ab6037249987676e0be039db8545a29c320e827818ea06a22a1980214299f52f036c8e0af0307
+EBUILD willuhn-hbci4java-2.5.12_p20140731.ebuild 1530 SHA256 c1ef7882738751436e66b64578ae0be1eb1fe9d41cea670abd5b185500e9ef29 SHA512 c9377ab0115a8a449a19b8a87965539364e02609a6a7462be6ee5cb2b533ea7694d01697d3159225813e08f70e9741b0d40dfa4fc5ba47ba3b6cbe4a4a986416 WHIRLPOOL 3319eb38f2bc0ac7c658827cccbb68f39fc4daeee9f162b84b489d3a21a654eec4b3afa4acc67ced2f563f70a7945d44436bb566f3ddd44cb87238ba76fe908f
diff --git a/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p20140731.ebuild b/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p20140731.ebuild
new file mode 100644
index 0000000..db0ba5b
--- /dev/null
+++ b/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p20140731.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="d57bd1cd6310ac0f280e55a8dca039ec41e1e219"
+
+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
+}