Major cleanup and add compiling live ebuilds

9 files changed, 67 insertions, 254 deletions

diff --git a/app-office/hibiscus-dkbvisa/Manifest b/app-office/hibiscus-dkbvisa/Manifest
deleted file mode 100644
index 4ed8bdc..0000000
--- a/app-office/hibiscus-dkbvisa/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST dkbvisa.zip 4179 SHA256 8d5b5ee10c3ba12c35d52338d9e15cfb454adaf26e22ef84020644dcffb11a06 SHA512 348868750cccdf22392e779a5cf3a619720b50846835a779369d10e917a9f5cc17627e68609f9bd6d93cee19d85df65c1d94c6913f84b0b9d8eaa6d9243b9f86 WHIRLPOOL ec13d3db35f07d7e70f639f289329b8a60f8d4a8cf6d859bb1a354ca98e199671bf11926b26ea371367d9629a366aaedfb39c4703bb075bcc868d90fb9698ce1
-EBUILD hibiscus-dkbvisa-9999.ebuild 867 SHA256 8d306ff46a87b20266edc871aa7335b0a17e03691f36d6ffa4f0121379fe2a48 SHA512 28b45b6c4beb9e69cac60d8881cba57d26233d2b58daf88980b0da9061eb39f402de6d281dc781d85fe41c5235f8dafbefe6c7dd6ff80ea7fd107f538dd09fff WHIRLPOOL ee9c7da460cebdf16d884f24fbc9650bb962daf44b9efeffcd928e0a47cce9eed3d72fe885381303468357a2b02703900c0cdf738c19482a1f2086dffb02a884
diff --git a/app-office/hibiscus-dkbvisa/hibiscus-dkbvisa-9999.ebuild b/app-office/hibiscus-dkbvisa/hibiscus-dkbvisa-9999.ebuild
deleted file mode 100644
index 0cefcc3..0000000
--- a/app-office/hibiscus-dkbvisa/hibiscus-dkbvisa-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-EAPI="4"
-
-inherit eutils java-pkg-2
-
-DESCRIPTION="Script for Hibiscus to retrieve VISA bookings from DKB bank"
-HOMEPAGE="http://www.wiedenhoeft.net/hibiscus-scripting/dkbvisa"
-SRC_URI="http://www.wiedenhoeft.net/download/dkbvisa.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-RDEPEND=">=dev-java/jameica-scripting-2.3.0
-		>=app-office/hibiscus-2.3.0
-		>=dev-java/htmlunit-2.7"
-
-S=${WORKDIR}
-
-src_install() {
-
-	local plugin_dir=/usr/share/jameica/plugins/jameica.scripting
-
-	dodir ${plugin_dir}/scripts
-	insinto ${plugin_dir}/scripts
-	doins dkbvisa.js
-	
-	dodir ${plugin_dir}/lib
-
-	#dosym "$(java-pkg_getjars --with-dependencies htmlunit)" ${plugin_dir}/lib/
-	IFS=':' ; 
-	for jar in $(java-pkg_getjars --with-dependencies htmlunit);
-		do dosym $jar ${plugin_dir}/lib/
-	done
-	#java-pkg_jar-from --with-dependencies --into ${plugin_dir}/lib/ "htmlunit"
-}
diff --git a/app-office/hibiscus/Manifest b/app-office/hibiscus/Manifest
index 695310c..b7e0d80 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.10.zip 6993525 SHA256 18d549368ddadc17b1451b898ca4ac71c05dae78dcf329917027b14cdc7f762a SHA512 abc5896e9d5566d2a08189652b12dd5714c4aca12f7074929257818d2e5639499f613aa97bad97886e50ab1bcccb3320d0b6a83e07dea10aab49ee16442a7259 WHIRLPOOL ccd34e28292136fd9f3572baf86f7875aab001e38fadef7c89c74721cfed28f6f7a3f4c262980f2c52721a03cbdc597d17a4627a9ee570c0d67cc4e6e3a53ac7
-DIST hibiscus-2.6.11.zip 6926017 SHA256 109581c92eb3df4a5a1a497ae515d37e7d652571de99d0733f60683606df3afe SHA512 0d5ee326813a210995f6d942fe2d3d070628e639c148a511efa888a31e562ca82ff7bc9869c3a925544aa269f6e424ab0adbdf872179d4992745b8ffd6ea05e9 WHIRLPOOL fe27df9e9640b5c84a91fbcdee347e4558ccde2b91dc52f9d4162c44914eb1836c0d92ceee7ea27955f39b39daf884e90d8aa590b63e1a864fcf0225b4477930
-EBUILD hibiscus-2.6.10.ebuild 2693 SHA256 834b67da21e8523c90ec4dfef2cb89de8240faf18bf605112f35e2d161c9c126 SHA512 65df8dc589973f6fb3e89e4bd51742c3a4f07e79a846855cca13176ef4d9639a4032fd37567bc857e07b12f2849df0a6f09770a75dbb6d1bc35a022c01d87d55 WHIRLPOOL eff8c325f13484493089435215df01d4bd0c1076aeebb15d1f2bcfacfd66016f354028495f1a038f3e55fe139637daebf076c1241a790d330392936fc8c45f05
-EBUILD hibiscus-2.6.11.ebuild 2693 SHA256 8bc177c5b0d3adc9ff195447d929f5b3286930707b210202dac65be1c8733673 SHA512 3227f966bb4d34d81495d84eae580699633cf2151bf0e71d53b9c048314c33d1c7de68bf5caef7795ee7ae6234b3ec4eaa12e475f2b179dff8d46e8273261ead WHIRLPOOL 700c46f8302730ef8a333f303af035ca50c06a35019e0fd7a4ff6c24f0775706fc49be4757ec8cd1ce0d6e3e485a803f1df10a95c8501c69f3e89008c27d6bb0
+AUX super-csv-api.patch 2500 SHA256 9b8d8aa7b183660928bfa765eeb111b2dea5fd463927d6809db9b404b5e2f2e0 SHA512 d4bf2f423bbec86dd584194d989122ec3a68a1238605527d08aea73af981ae7672f4ae458b23c8c56c56d902626fadd1c097b32324dcd4e55c9a22325b452b06 WHIRLPOOL 689e910b5f72018c03530b7e89cffd4a11f27972b49e7373aea34d8337d6bedc5abf96a386bbbc10602c3e862f653595d6589fe4f04ca1efcbec3b15e0306266
+EBUILD hibiscus-9999.ebuild 2263 SHA256 4fb8e1175da963aceebd429a618ff2702ddac17dfbcef321e5d6f2b74da8a033 SHA512 9e03d2bd17d40e0e012ebd889464fb203a47b2cac95bf28fc279f9087a853b57408200672d23d6b3e34e92207520c58c053512e970afe7b625ce66bdf41b6d02 WHIRLPOOL 7deb25f55c53a3e07a74fd2fbc0e5176908cca9a9179b11fcbfb951cbed678304bffdfa422c508707234f476bed322fa5a3ba9e36f969a111692dfbcd1fd2fff
diff --git a/app-office/hibiscus/files/1.12.2-hbci4java-api.patch b/app-office/hibiscus/files/1.12.2-hbci4java-api.patch
deleted file mode 100644
index c6f7096..0000000
--- a/app-office/hibiscus/files/1.12.2-hbci4java-api.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: hibiscus/src/de/willuhn/jameica/hbci/io/MT940UmsatzImporter.java
-===================================================================
---- hibiscus.orig/src/de/willuhn/jameica/hbci/io/MT940UmsatzImporter.java
-+++ hibiscus/src/de/willuhn/jameica/hbci/io/MT940UmsatzImporter.java
-@@ -246,11 +246,13 @@ public class MT940UmsatzImporter impleme
-         public boolean onlyBPDGVs() {return false;}
-         public boolean needUserKeys() {return false;}
-         public boolean needInstKeys() {return false;}
-+	public boolean needDigKey() {return false;}
-         public boolean isSupported() {return false;}
-         public boolean hasMySigKey() {return false;}
-         public boolean hasMyEncKey() {return false;}
-         public boolean hasInstSigKey() {return false;}
-         public boolean hasInstEncKey() {return false;}
-+	public boolean hasInstDigKey() {return false;}
-         public String getUserId() {return null;}
-         public String getUPDVersion() {return null;}
-         public Properties getUPD() {return null;}
-@@ -288,6 +290,7 @@ public class MT940UmsatzImporter impleme
-         public void clearUPD() {}
-         public void clearInstSigKey() {}
-         public void clearInstEncKey() {}
-+	public void clearInstDigKey() {}
-         public void clearBPD(){}
-         public void changePassphrase(){}
-       };
-@@ -356,4 +359,4 @@ public class MT940UmsatzImporter impleme
-  * Revision 1.1  2006/01/17 00:22:36  willuhn
-  * @N erster Code fuer Swift MT940-Import
-  *
-- ******************************************************************************/
-\ No newline at end of file
-+ ******************************************************************************/
diff --git a/app-office/hibiscus/files/1.12.2-hbci4java-so-filename.patch b/app-office/hibiscus/files/1.12.2-hbci4java-so-filename.patch
deleted file mode 100644
index b46a2fc..0000000
--- a/app-office/hibiscus/files/1.12.2-hbci4java-so-filename.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: hibiscus/src/de/willuhn/jameica/hbci/passports/ddv/DDVConfigFactory.java
-===================================================================
---- hibiscus.orig/src/de/willuhn/jameica/hbci/passports/ddv/DDVConfigFactory.java
-+++ hibiscus/src/de/willuhn/jameica/hbci/passports/ddv/DDVConfigFactory.java
-@@ -447,9 +447,9 @@ public class DDVConfigFactory
-    */
-   private static File getJNILib() throws ApplicationException
-   {
--    String file = null;
-+    String file = "libhbci4java-card-linux.so";
-     
--    switch (Application.getPlatform().getOS())
-+    /*switch (Application.getPlatform().getOS())
-     {
-       case Platform.OS_LINUX:
-         file = "libhbci4java-card-linux-32.so";
-@@ -474,12 +474,12 @@ public class DDVConfigFactory
-       case Platform.OS_FREEBSD_64:
-         file = "libhbci4java-card-freebsd-64.so";
-         break;
--    }
-+    }*/
-     
-     if (file == null)
-       throw new ApplicationException(i18n.tr("Hibiscus unterstützt leider keine Chipkartenleser für Ihr Betriebssystem"));
- 
--    File f = new File(de.willuhn.jameica.hbci.Settings.getLibPath(),file);
-+    File f = new File("/usr/lib",file);
-     if (!f.exists())
-       throw new ApplicationException(i18n.tr("Treiber {0} nicht gefunden",f.getAbsolutePath()));
- 
-@@ -508,4 +508,4 @@ public class DDVConfigFactory
-  * Revision 1.1  2010-09-07 15:28:05  willuhn
-  * @N BUGZILLA 391 - Kartenleser-Konfiguration komplett umgebaut. Damit lassen sich jetzt beliebig viele Kartenleser und Konfigurationen parellel einrichten
-  *
-- **********************************************************************/
-\ No newline at end of file
-+ **********************************************************************/
diff --git a/app-office/hibiscus/files/2.2.1-hbci4java-so-filename.patch b/app-office/hibiscus/files/2.2.1-hbci4java-so-filename.patch
deleted file mode 100644
index 8168548..0000000
--- a/app-office/hibiscus/files/2.2.1-hbci4java-so-filename.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: hibiscus/src/de/willuhn/jameica/hbci/passports/ddv/DDVConfigFactory.java
-===================================================================
---- hibiscus.orig/src/de/willuhn/jameica/hbci/passports/ddv/DDVConfigFactory.java
-+++ hibiscus/src/de/willuhn/jameica/hbci/passports/ddv/DDVConfigFactory.java
-@@ -530,9 +530,9 @@ public class DDVConfigFactory
-    */
-   private static File getJNILib() throws ApplicationException
-   {
--    String file = null;
-+    String file = "libhbci4java-card-linux.so";
-     
--    switch (Application.getPlatform().getOS())
-+    /*switch (Application.getPlatform().getOS())
-     {
-       case Platform.OS_LINUX:
-         file = "libhbci4java-card-linux-32.so";
-@@ -561,12 +561,12 @@ public class DDVConfigFactory
-       case Platform.OS_FREEBSD_64:
-         file = "libhbci4java-card-freebsd-64.so";
-         break;
--    }
-+    }*/
-     
-     if (file == null)
-       throw new ApplicationException(i18n.tr("Hibiscus unterstützt leider keine Chipkartenleser für Ihr Betriebssystem"));
- 
--    File f = new File(de.willuhn.jameica.hbci.Settings.getLibPath(),file);
-+    File f = new File("/usr/lib",file);
-     if (!f.exists())
-       throw new ApplicationException(i18n.tr("Treiber {0} nicht gefunden",f.getAbsolutePath()));
- 
-@@ -612,4 +612,4 @@ public class DDVConfigFactory
-  * Revision 1.1  2010-09-07 15:28:05  willuhn
-  * @N BUGZILLA 391 - Kartenleser-Konfiguration komplett umgebaut. Damit lassen sich jetzt beliebig viele Kartenleser und Konfigurationen parellel einrichten
-  *
-- **********************************************************************/
-\ No newline at end of file
-+ **********************************************************************/
diff --git a/app-office/hibiscus/files/super-csv-api.patch b/app-office/hibiscus/files/super-csv-api.patch
new file mode 100644
index 0000000..7a94c74
--- /dev/null
+++ b/app-office/hibiscus/files/super-csv-api.patch
@@ -0,0 +1,40 @@
+Index: hibiscus-9999/src/de/willuhn/jameica/hbci/gui/dialogs/CSVImportDialog.java
+===================================================================
+--- hibiscus-9999.orig/src/de/willuhn/jameica/hbci/gui/dialogs/CSVImportDialog.java
++++ hibiscus-9999/src/de/willuhn/jameica/hbci/gui/dialogs/CSVImportDialog.java
+@@ -209,8 +209,6 @@ public class CSVImportDialog extends Abs
+       CsvPreference prefs = CsvPreference.EXCEL_NORTH_EUROPE_PREFERENCE;
+       String sep = p.getSeparatorChar();
+       String quo = p.getQuotingChar();
+-      if (sep != null && sep.length() == 1) prefs.setDelimiterChar(sep.charAt(0));
+-      if (quo != null && quo.length() == 1) prefs.setQuoteChar(quo.charAt(0));
+       
+       ICsvListReader csv = new CsvListReader(new InputStreamReader(new ByteArrayInputStream(this.data),p.getFileEncoding()),prefs);
+       List<String> line = null;
+@@ -567,4 +565,4 @@ public class CSVImportDialog extends Abs
+  *
+  * Revision 1.5  2008/04/24 11:37:21  willuhn
+  * @N BUGZILLA 304
+- **********************************************************************/
+\ No newline at end of file
++ **********************************************************************/
+Index: hibiscus-9999/src/de/willuhn/jameica/hbci/io/csv/CsvImporter.java
+===================================================================
+--- hibiscus-9999.orig/src/de/willuhn/jameica/hbci/io/csv/CsvImporter.java
++++ hibiscus-9999/src/de/willuhn/jameica/hbci/io/csv/CsvImporter.java
+@@ -91,8 +91,6 @@ public class CsvImporter implements Impo
+       CsvPreference prefs = CsvPreference.EXCEL_NORTH_EUROPE_PREFERENCE;
+       String sep = p.getSeparatorChar();
+       String quo = p.getQuotingChar();
+-      if (sep != null && sep.length() == 1) prefs.setDelimiterChar(sep.charAt(0));
+-      if (quo != null && quo.length() == 1) prefs.setQuoteChar(quo.charAt(0));
+       ICsvListReader csv = new CsvListReader(new InputStreamReader(new ByteArrayInputStream(data),p.getFileEncoding()),prefs);
+ 
+       List<String> line = csv.read();
+@@ -416,4 +414,4 @@ public class CsvImporter implements Impo
+  *   - Import-Preset wird nun im XML-Format nach ~/.jameica/hibiscus/csv serialisiert. Damit wird es kuenftig moeglich sein,
+  *     CSV-Import-Profile vorzukonfigurieren und anschliessend zu exportieren, um sie mit anderen Usern teilen zu koennen
+  *
+- **********************************************************************/
+\ No newline at end of file
++ **********************************************************************/
diff --git a/app-office/hibiscus/hibiscus-2.6.11.ebuild b/app-office/hibiscus/hibiscus-2.6.11.ebuild
deleted file mode 100644
index 2a1a097..0000000
--- a/app-office/hibiscus/hibiscus-2.6.11.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_p20141212
-	>=dev-java/obantoo-2.1.6
-	>=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.10.ebuild b/app-office/hibiscus/hibiscus-9999.ebuild
index e23f85b..2014c9c 100644
--- a/app-office/hibiscus/hibiscus-2.6.10.ebuild
+++ b/app-office/hibiscus/hibiscus-9999.ebuild
@@ -1,45 +1,45 @@
-EAPI="2"
+EAPI="5"
 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)"
+if [[ ${PV} != 9999 ]]; then
+        SRC_URI="http://www.willuhn.de/products/hibiscus/releases/${MY_PV}/hibiscus.src.zip -> ${P}.zip"
+        KEYWORDS="~amd64 ~x86"
+				MY_PV="$(get_version_component_range 1-2)"
+else
+        inherit git-r3
+        EGIT_REPO_URI="https://github.com/willuhn/hibiscus.git"
+				MY_PV="9999"
+fi
 
 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_p20140731
-	>=dev-java/obantoo-2.1.6
-	>=dev-java/super-csv-1.31:0
-	>=dev-java/swt-chart-0.7.0"
+            >=net-libs/willuhn-hbci4java-$PV
+	          >=dev-java/obantoo-2.1.12
+	          dev-java/super-csv
+	          >=dev-java/swt-chart-0.7.0"
 
-RDEPEND=">=virtual/jre-1.6
+RDEPEND=">=virtual/jre-1.5
         ${COMMON_DEP}"
 
-DEPEND=">=virtual/jdk-1.6
+DEPEND=">=virtual/jdk-1.5
         ${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/*
+	epatch "${FILESDIR}/super-csv-api.patch"
 
-	#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
+	rm -rv -v ${S}/lib/*
 
-    java-pkg_jar-from --with-dependencies --into ${S}/lib/ willuhn-hbci4java,obantoo,jameica,super-csv,swt-chart
+  java-pkg_jar-from --with-dependencies --into ${S}/lib/ willuhn-hbci4java,obantoo,jameica,super-csv,swt-chart
 }
 
 src_compile() {
@@ -52,10 +52,10 @@ src_install() {
 
 	dodir ${plugin_dir}
 	insinto ${plugin_dir}
-	
+
 	doins plugin.xml
-    doins releases/${PV}-0/${PN}/${PN}.jar
-	
+	doins releases/*/${PN}/${PN}.jar
+
 	cp -R "${S}/updates" "${D}${plugin_dir}" || die "Install failed!"
 	cp -R "${S}/sql" "${D}${plugin_dir}" || die "Install failed!"
 
@@ -70,9 +70,9 @@ src_install() {
 	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-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
+  use doc && java-pkg_dojavadoc releases/${PV}-0/javadoc
+  use source && java-pkg_dosrc src/de
 }