Major cleanup and add compiling live ebuilds

4 files changed, 40 insertions, 109 deletions

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
++ **********************************************************************/