Hibiscus 2.6.8

3 files changed, 4 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"