Fix hibiscus 2.6.11

8 files changed, 78 insertions, 9 deletions

diff --git a/app-office/hibiscus/Manifest b/app-office/hibiscus/Manifest
index 4c544fe..695310c 100644
--- a/app-office/hibiscus/Manifest
+++ b/app-office/hibiscus/Manifest
@@ -5,4 +5,4 @@ AUX 2.4.2-hbci4java-so-filename.patch 1697 SHA256 22df5c01119aa6a6b818557090e08f
 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 834b67da21e8523c90ec4dfef2cb89de8240faf18bf605112f35e2d161c9c126 SHA512 65df8dc589973f6fb3e89e4bd51742c3a4f07e79a846855cca13176ef4d9639a4032fd37567bc857e07b12f2849df0a6f09770a75dbb6d1bc35a022c01d87d55 WHIRLPOOL eff8c325f13484493089435215df01d4bd0c1076aeebb15d1f2bcfacfd66016f354028495f1a038f3e55fe139637daebf076c1241a790d330392936fc8c45f05
+EBUILD hibiscus-2.6.11.ebuild 2693 SHA256 8bc177c5b0d3adc9ff195447d929f5b3286930707b210202dac65be1c8733673 SHA512 3227f966bb4d34d81495d84eae580699633cf2151bf0e71d53b9c048314c33d1c7de68bf5caef7795ee7ae6234b3ec4eaa12e475f2b179dff8d46e8273261ead WHIRLPOOL 700c46f8302730ef8a333f303af035ca50c06a35019e0fd7a4ff6c24f0775706fc49be4757ec8cd1ce0d6e3e485a803f1df10a95c8501c69f3e89008c27d6bb0
diff --git a/app-office/hibiscus/hibiscus-2.6.11.ebuild b/app-office/hibiscus/hibiscus-2.6.11.ebuild
index e23f85b..2a1a097 100644
--- a/app-office/hibiscus/hibiscus-2.6.11.ebuild
+++ b/app-office/hibiscus/hibiscus-2.6.11.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~x86 ~amd64"
 IUSE=""
 
 COMMON_DEP="=dev-java/jameica-${MY_PV}*
-        >=net-libs/willuhn-hbci4java-2.5.12_p20140731
+        >=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"
diff --git a/dev-java/jameica/Manifest b/dev-java/jameica/Manifest
index 7b40aae..df7aeac 100644
--- a/dev-java/jameica/Manifest
+++ b/dev-java/jameica/Manifest
@@ -1,4 +1,4 @@
 DIST jameica-2.6.1.zip 22364873 SHA256 1ef489ed692addaecd1412a51f9789e989589445ce0505c9355a3233df605ff2 SHA512 63fa46c4930bee1a6d9d66caca6bf1f6c2ff2087f6cbe0dfb16e283aab50bdedecc7d1a5e17c3a2db37f5f5dcea3f43bca3877d16cbf8a88d358e8ee80eee140 WHIRLPOOL d6c40f5290da98e0ac3f3faa3999dc5fc328fb89fc8b47f63c88eb20bc37e4ed747ae41b76f03eef5018af39b7e1431fc40d3007d8e794d830ad31c71759d9e5
 DIST jameica-2.6.2.zip 22266401 SHA256 27b61ea39698ba524db7debb74d3488b8386078da4b0540bc40161c521e215f5 SHA512 1cfaa09b8441d95fe7b6cb90013208fa871e373cd7aff46b647e7a635ad081919c26177f2df96fc6ac2601dee20ef20de7f6494d66a5f91d547c79afb5408c29 WHIRLPOOL 05a963f0d40ae454275ee5722d2caf067fe9cdf0f382a4852dd0998b63fc6276f503e116f3542ae8c66f55be5a43f8b45f9256f5019d39f8b65ddd6194f24598
 EBUILD jameica-2.6.1.ebuild 2783 SHA256 0c3d51a4fce9ea42e34c404359ce96d2a25f53c6b45e27be58fda24e98455628 SHA512 00b71cd968ca3906bfa16c083b09b4cb30c1f04b781fe00c30a805ebc81c555f2820406ceb14ec66b622093d61ddc7605b430533316dd5dc00b9e305c1d19e40 WHIRLPOOL a413c2e5e5589b4769c4cc1a0ea31fa7a1e79f135708ef7deae14dd537a7d3f8b4ba4a159200e0a86b24195fcd3e6b323f6a3d07fbdcb1bd64116ffdf49dbac5
-EBUILD jameica-2.6.2.ebuild 2783 SHA256 0c3d51a4fce9ea42e34c404359ce96d2a25f53c6b45e27be58fda24e98455628 SHA512 00b71cd968ca3906bfa16c083b09b4cb30c1f04b781fe00c30a805ebc81c555f2820406ceb14ec66b622093d61ddc7605b430533316dd5dc00b9e305c1d19e40 WHIRLPOOL a413c2e5e5589b4769c4cc1a0ea31fa7a1e79f135708ef7deae14dd537a7d3f8b4ba4a159200e0a86b24195fcd3e6b323f6a3d07fbdcb1bd64116ffdf49dbac5
+EBUILD jameica-2.6.2.ebuild 2786 SHA256 00b437f3634f47803123c258fa0d46c3c2e09e3987d0bb76ba4dfb1aa1a8fc5b SHA512 006d18dfe3fcd5689b8bee037ab8532848653e8d5a297cc8615172322f01e1745c7835cd56a5849c4795114e9ffc13cdd5194013ae3b66f63a197f7e3ac0138a WHIRLPOOL f637bad3fed0c436c9b36be2c1765746041bfd9e6113e89656087a738e0fcd31ca3703ce6e52f2f6a728a574a41f85a2fbab9561112af38dababd3e6be5c4c1d
diff --git a/dev-java/jameica/jameica-2.6.2.ebuild b/dev-java/jameica/jameica-2.6.2.ebuild
index 599fa83..468e534 100644
--- a/dev-java/jameica/jameica-2.6.2.ebuild
+++ b/dev-java/jameica/jameica-2.6.2.ebuild
@@ -25,7 +25,7 @@ COMMON_DEP="~dev-java/willuhn-util-${MY_PV}
 	>=dev-java/commons-lang-2.6
 	>=dev-java/commons-logging-1.1.1
 	dev-java/swtcalendar
-	>=dev-java/bcprov-1.44
+	dev-java/bcprov:1.45
 	>=dev-java/h2-1.2.145
 	>=dev-java/commons-lang-2.6
 	>=dev-java/swt-paperclips-1.0.4
@@ -58,7 +58,7 @@ java_prepare() {
 		xmlrpc="xmlrpc-3"
 	fi
 
-	EANT_GENTOO_CLASSPATH="willuhn-util,willuhn-datasource,nanoxml,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"
+	EANT_GENTOO_CLASSPATH="willuhn-util,willuhn-datasource,nanoxml,velocity,${xmlrpc},commons-cli-1,commons-collections,commons-lang-2.1,commons-logging,swtcalendar,bcprov-1.45,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}"
 }
diff --git a/dev-java/spiffy/Manifest b/dev-java/spiffy/Manifest
index c601dff..257ad52 100644
--- a/dev-java/spiffy/Manifest
+++ b/dev-java/spiffy/Manifest
@@ -1,3 +1,3 @@
 DIST spiffy-all-0.05.zip 141335 SHA256 773b9c2e1b5fe8904d64ba2984903dd022039826b5e682d103c16a10911a227f SHA512 33d824193bff271e1079d1bf9445d28c69b88acddcd4504f3b0868ae569659f20a3a117c6b9574ff08a26d72fa170b96e5f30e3732db98c36e544f81b8ce747d WHIRLPOOL 55ad653642f0d7b3ece17ce2bd8554ba26343e5aca43137e92ca96bde01de66e67989a777f4a54c10fb62cbd0ce3bf7c3003aaf36e1975671454a3514ada0862
-EBUILD spiffy-0.05.ebuild 1274 SHA256 da0f6c5941b48c2c4d0160bbd64e281b04a06f57a7c8a244f5e14f0d962b65d0 SHA512 de8486a21fc483f32a915e33cb2585132e7b5601eb98f7112b8ada5f1583c8b200dd4b8535debe585461a52d1a07f0873a27b080d9b5a029b4a82c21ca6d773f WHIRLPOOL 85dd70c5bb1431d8529c53e71ae925b66383b56692c0dc1bb4f40d7d3e2bfb9fd44534544d9fe63fe2f17b05ea204d5705b34206da9e2f20589c84f7d1a0b665
+EBUILD spiffy-0.05.ebuild 1261 SHA256 5c8320994c5b5d1370ec9ec3b5223d2ff7b468f9710f31b8388693a62b359181 SHA512 d51daeb92f22b3f03fc4cb6f176159237fadb44ded7c4c8620a0bc2d50e3cc6f23c04aeb7ba0de5810fb2ced07c4c4848b9130809e19c40976599f8bf45f1b04 WHIRLPOOL 501e8062eb457900c69210e225c837f5c9f5de2f03d44495aff8fc7475094a5e1febc2ade2427a6fa191927a328410a0ae5f4cc51ae22b71cf1ac05f7778ec2c
 MISC metadata.xml 214 SHA256 c1f09dc7d5313cd2da7b82259c7846ed23144d62b15e59680ada90e2b6b4d154 SHA512 aeb2fb354a9ddf41c45a071091a58b91eaf8b25d6d2c49e3e3daa547b591a54530144de4533573160b48dc356289c909612c4e3c80e387f081f88cb39263e130 WHIRLPOOL 54d8861daedd18ca38e4ada0fb71026c612b63946d47a9b34de90d1d6d85c8ce05c0a4b97730f554ea637d73ccce8ed207d33e707c2b8c1dd28af24cf44dd186
diff --git a/dev-java/spiffy/spiffy-0.05.ebuild b/dev-java/spiffy/spiffy-0.05.ebuild
index cf5c351..68b4999 100644
--- a/dev-java/spiffy/spiffy-0.05.ebuild
+++ b/dev-java/spiffy/spiffy-0.05.ebuild
@@ -21,9 +21,7 @@ COMMON_DEPS="dev-java/log4j"
 
 DEPEND="${COMMON_DEPS}
 	app-arch/unzip
-	test? (
-		dev-java/junit:4
-	)
+	dev-java/junit:4
 	dev-java/struts:1.2
 	>=virtual/jdk-1.5"
 RDEPEND="${COMMON_DEPS}
diff --git a/net-libs/willuhn-hbci4java/Manifest b/net-libs/willuhn-hbci4java/Manifest
index 185eb07..6236f12 100644
--- a/net-libs/willuhn-hbci4java/Manifest
+++ b/net-libs/willuhn-hbci4java/Manifest
@@ -2,6 +2,8 @@ AUX java_home.patch 801 SHA256 39eb0d359acfbdc9305acec5f9d9acafd0bf742cbb40e13fb
 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
+DIST willuhn-hbci4java-2.5.12_p20141212.zip 5550377 SHA256 e58b5ab981ff7a68a9ea78f673f47500110c89be924add865f7eb6369e32537e SHA512 d595844fe49e5c6eb96467b15cf7f1490901d3575efd4469ea30adc495575713dc0b7a5c4305239980e96457765057a2048a7242ff9ad4ac7a1dd30fb5d84442 WHIRLPOOL 4470d35a299e7175799dc2cef709e5581127b896024cd57fd523e984718ef5cfe480125947d4ec144041ce44cf072bb94bbbe86a70062ecd09cfdd091b59a7fd
 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
+EBUILD willuhn-hbci4java-2.5.12_p20141212.ebuild 1530 SHA256 60268020ab20e3642e1302c08d321f4e4bbd811c46c37928f27820749b7259bf SHA512 3114d9b1b72d274354fb64fbf5d8253e6bf54bee02abefc39c2fb0c282f55f4b9325c03e34b5c1dc477cd5ee6cf8f8c2155ffd599f2f993d73cf21375e050a2c WHIRLPOOL 200f9fd17c301395db8fdb6e3014ffad753cfd3c01eab65274fe932ea532abac9799b9fd5ac6049cbae30263bbcbd302b97b4089fce11b0074bc7c7bf8c5eac6
diff --git a/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p20141212.ebuild b/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p20141212.ebuild
new file mode 100644
index 0000000..f36d0ee
--- /dev/null
+++ b/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p20141212.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="5febbbba6d780c6a11f7bcf64e066a2b3cb6bb68"
+
+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
+}