Add updated version of willuhn-hbci4java required by Hibiscus 2.4.2

5 files changed, 74 insertions, 5 deletions

diff --git a/app-office/hibiscus/Manifest b/app-office/hibiscus/Manifest
index d47b511..41ed1ae 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.2.1.zip 5245507 SHA256 d026229bb24b4502b42da193538c0fc35f07d05bce1e9469cf25bb248e4b3495 SHA512 a18ad22859de1ac8faf9b5e286f82f2dd3cbf445460055313440c88471b10e32e0a59b20b824ae1f1817b4a3366c2dba9087be4798dcac0fdc7df02615a9a479 WHIRLPOOL 4dae30ee699d2cda33cf194fa7750e6a68a8d1c1c5938415d1f1fd05306d03598aec729f9e89c4c045923d153a8d6f24d547c6ceb2f6c2ecfdb321c769cd53b2
 DIST hibiscus-2.4.2.zip 5260678 SHA256 a410c0b79ee8fae3b12405332c81e8fa8908b51beb70bc827105241b29bcdea2 SHA512 348e953dd19a71527c486430021b89452a9b5adafc7900424ccd07fb5423de1ca42c7b80e3d73691772ccf467aa6ca39635a0ecf3054478278b81ae598b81ffb WHIRLPOOL afae77fbbb7ca687ad93c3a3341440e82e611954515583a39c2b59bc7ff03c0aa64b77e5e2df896c1fc9db79b60f4481d86538f34c5bc031a4ae8b9d2fb2b865
 EBUILD hibiscus-2.2.1.ebuild 2445 SHA256 9a388dee18ee61e8bcb28281de8b741fca433509f29c778b5c8193315cc31cb8 SHA512 b8d96be8ddb7e196357931c0022e3f544574ec76942144f2a2347b06143699dc8b4faae787a77b2e15a999e278a8103092ec558cbb7ae377f1d540b647049cce WHIRLPOOL dd308bc0976123b521caf5408a45f31ee9cb4412ac3318bd6d97a78fc4d684cb408977412dbf8103952bc14da2ab0c3791812eb5ce3b9bead1a73bf5c5695503
-EBUILD hibiscus-2.4.2.ebuild 2689 SHA256 5c1e1f7b53e8131905f47802c4696141abe717f965b263f0c1a47eef172b59f6 SHA512 52d2de2596408adaa3e7e79815e8e310ec1185fe1ff0da36505e3d9d783ff8e8c0b2e382fdad465e6295c3374f9fdc1561a8eac5b08ca473954a3ae1922c2737 WHIRLPOOL d8b5bfa2495cd2d9fc8b5279b81eff9a71584d3ffd925d702c62d1f29b82ab734488dddf2af6fe217250d860d93e4216222a600b1ffabdd1870b1396a8878f96
+EBUILD hibiscus-2.4.2.ebuild 2696 SHA256 32a02d502c11aca3be2f62da49fb73fbdef2ee219a2b3a78687ea00a0e8f28c1 SHA512 0e687939412638883b67221b930e1d22a6567a8d7bbabdf40dde14779ba73ccbd859f38cd133600f477b90d65ab7b353aa949288cc3f34e63a9d3d7a22a2b9bc WHIRLPOOL 99d1f0ecc9db5e4d33720aa8d19810dbdb9b48d187d1e6cf642cbe21e063f00d16e7523ff8d80dc755ac908a732e8813ff6f10a33be9bb90ffbde46f3c39212c
diff --git a/app-office/hibiscus/hibiscus-2.4.2.ebuild b/app-office/hibiscus/hibiscus-2.4.2.ebuild
index cfde27c..25c00e8 100644
--- a/app-office/hibiscus/hibiscus-2.4.2.ebuild
+++ b/app-office/hibiscus/hibiscus-2.4.2.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~x86 ~amd64"
 IUSE=""
 
 COMMON_DEP="=dev-java/jameica-${MY_PV}*
-        >=net-libs/willuhn-hbci4java-2.5.12.30
+        >=net-libs/willuhn-hbci4java-2.5.12_p20130130
 	=dev-java/obantoo-1.5.2
 	>=dev-java/super-csv-1.31:0
 	>=dev-java/swt-chart-0.7.0"
diff --git a/net-libs/willuhn-hbci4java/Manifest b/net-libs/willuhn-hbci4java/Manifest
index ffc8c2e..7f41670 100644
--- a/net-libs/willuhn-hbci4java/Manifest
+++ b/net-libs/willuhn-hbci4java/Manifest
@@ -1,2 +1,4 @@
-DIST willuhn-hbci4java-2.5.12.30.tar.gz 2833964 SHA256 6fd541c02384d64ece3e032a7b0650bf52d86ea89c9afb439df1bb1ad471ed19 SHA512 ac2371b886decf692fb8afdb58a810e613679d7984b3d6853e778d7559c4127fc0fac4bf387ec789e4c8ad3ab95c5e4ce17e3fbde0ec478648f1ed53cff8f69c WHIRLPOOL e2e094e8b8eea845a66780b09c0112384fb9cc6624ec1a919206b60ac9246b32ca92ad3fa294e19841666c0a9347e9192a32fbf782e3ddcfeceeb8f54012a694
-EBUILD willuhn-hbci4java-2.5.12.30.ebuild 1446 SHA256 94c1de4cc67f771c13d4b9ae02d76e6b706ff3cbe3b5131daa576b2a9063a4ac SHA512 35b0fe889f0017ef830d2776981fa442fedfc581ebaf1ffd0a4bd64c1bd235d9797bb813cf63eb90a5539118c6f5d3a5a6f04cc26a9813803251819f77524984 WHIRLPOOL 994b15d9bc0b9a8d953db479b5bcf68bd722111456465461adffd1cd7f45fea9653329acc02425fc8d6a644455b388ae7712b5748a60f5ef57522a76dd566554
+DIST willuhn-hbci4java-2.5.12_p20130130.zip 4707337 SHA256 560b9d9120780f955aef1a27a92ae0473c4c3bb82791eea212763631f9ee0f57 SHA512 235195618fd109d3cff2a3a4af2c62a806e0c7b058c2b9c143fca95210e6c797dc1abc388b8c05b33d7892e996c5f36949f293f33ae5759731df3b9d3dd32814 WHIRLPOOL fcb3f16bccd14e54615b47986519d5ddfb14caa0d3a8c0f7d5699a5b405f3dc2bea9a3727a9d3626cf82a28f4f35b90a42d0da2fac265ef05966aebc9c7c5f5d
+DIST willuhn-hbci4java-2.5.12_p30.tar.gz 2833964 SHA256 6fd541c02384d64ece3e032a7b0650bf52d86ea89c9afb439df1bb1ad471ed19 SHA512 ac2371b886decf692fb8afdb58a810e613679d7984b3d6853e778d7559c4127fc0fac4bf387ec789e4c8ad3ab95c5e4ce17e3fbde0ec478648f1ed53cff8f69c WHIRLPOOL e2e094e8b8eea845a66780b09c0112384fb9cc6624ec1a919206b60ac9246b32ca92ad3fa294e19841666c0a9347e9192a32fbf782e3ddcfeceeb8f54012a694
+EBUILD willuhn-hbci4java-2.5.12_p20130130.ebuild 1471 SHA256 909b60ce4ad8832f6a7be5b2d8d670582ee636d36147f472a85ac2bd770c6a95 SHA512 46e1cc77cf7a790f31c3a8544f43c36ce949787e67a51fd071e002e5c90075895830dda80f619176e176c3beb4fc958c6da29d576f6520b69e176ebb9c8af5ee WHIRLPOOL 7558ba504472d1d58c725284b9c004c4300ff477b47470473f5ec7e5473dfcf663590fe948baee70d3489824d19dc09225d89e729055485bbf4a0d0524409d9c
+EBUILD willuhn-hbci4java-2.5.12_p30.ebuild 1448 SHA256 7e699f4f145141bda9cf00eaff1f8d8efdec0c93048506835c2a95d6bcf31de2 SHA512 8e1d4e5bb2ff89dd8f18ad123d45d3dde01e143381747b76639819b07d4773492f745024aa390b9ddea01952e14f02e62c09a28d257f11d6f373757f076eff88 WHIRLPOOL 7ca63a362a206ece683a88df617786c99570e545e6c3b2b7a26c25d3661335c21385e2f45860b8cc49ee2e77be99573ad6569193a573d373bb5d241ff34ae4c8
diff --git a/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p20130130.ebuild b/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p20130130.ebuild
new file mode 100644
index 0000000..8bb4b32
--- /dev/null
+++ b/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p20130130.ebuild
@@ -0,0 +1,67 @@
+# 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="b7c9c546fbc33010e51a74f4285da7d7378fb76f"
+
+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="+smartcard"
+
+S="${WORKDIR}/hbci4java-${COMMIT}"
+
+COMMON_DEP="
+	dev-java/xerces:2
+	>=dev-java/log4j-1.2.8:0
+	!net-libs/hbci4java
+	smartcard? ( 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() {
+	eant clean
+}
+
+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.txt || die "dodoc failed"
+
+	use doc && java-pkg_dojavadoc doc/javadoc
+	use source && java-pkg_dosrc src/org
+}
diff --git a/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12.30.ebuild b/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p30.ebuild
index 078e3e9..afc7533 100644
--- a/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12.30.ebuild
+++ b/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p30.ebuild
@@ -12,7 +12,7 @@ PATCH_VERSION="$(get_version_component_range 4)"
 
 DESCRIPTION="A Java Library for HBCI/FinTS (Hibiscus Branch)"
 HOMEPAGE="https://github.com/willuhn/hbci4java"
-SRC_URI="https://github.com/willuhn/hbci4java/tarball/PATCH_${PATCH_VERSION} -> ${P}.tar.gz"
+SRC_URI="https://github.com/willuhn/hbci4java/tarball/PATCH_${PATCH_VERSION:1} -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"