Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/net-libs
diff options
context:
space:
mode:
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/hbci4java/Manifest4
-rw-r--r--net-libs/hbci4java/files/2.5.12-build.patch60
-rw-r--r--net-libs/hbci4java/files/2.5.12-makefile.patch139
-rw-r--r--net-libs/hbci4java/hbci4java-2.5.12.ebuild60
-rw-r--r--net-libs/willuhn-hbci4java/Manifest11
-rw-r--r--net-libs/willuhn-hbci4java/files/java_home.patch14
-rw-r--r--net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p20140325.ebuild69
-rw-r--r--net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p20140731.ebuild69
-rw-r--r--net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p20141212.ebuild69
-rw-r--r--net-libs/willuhn-hbci4java/willuhn-hbci4java-9999.ebuild (renamed from net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p20140617.ebuild)29
10 files changed, 18 insertions, 506 deletions
diff --git a/net-libs/hbci4java/Manifest b/net-libs/hbci4java/Manifest
deleted file mode 100644
index ab056ed..0000000
--- a/net-libs/hbci4java/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 2.5.12-build.patch 2450 SHA256 7e2014b78bcb484570b1648f45090bb22f839c774bb9cbdd0c0138adc12ca9eb SHA512 adba26d72072626d1d2957c9795892cb89f1d60c56229ae1fd78bf2d1077118fce9889321957c1a0ac0dbfadfd7c2a5c5a8f2cb86407a5306b9f5b99e2f92f87 WHIRLPOOL d979ed8211566a11519e30c7854a869aac53a532f0f7fe3fb0a03accfc56664608b344ad7327abe4dfbf00931fe06fe502149c37614874ea6e00ec53190d4d78
-AUX 2.5.12-makefile.patch 4981 SHA256 26e8eb182fe8e81a56f08732112d750fbdd91245d493e38858a0f2fe9e1fb5fa SHA512 4578a46e73d33a12ab9e885c2cdddb1797478c693a9ad343774faee4a0d802794e2553d50331d58fd3276cc4dcc766834decee5ce4be4e6d05197498b8cbf32c WHIRLPOOL 23b32f931a0fc842677da92e9f85bf1a42b530f2722dd26b7757e69dd7774c63b6053f1295e4fec7b4e6b1a3cabb351493556bd656ee5f68e05c025a889ff5d6
-DIST hbci4java-2.5.12-src.zip 1985181 SHA256 a829188fbc858b61109108c889f72fab10a555b13430517a029bbbbb383d6827 SHA512 f72e9388b9c12aa5abcbbdb4021cb32fc8d9ccc87941571d8a0c521ea88c96c69a68024e5eb0fe55f80ec7504e562b0b1b12f4b65bdab0c8988914a36e3dd6ed WHIRLPOOL 27daeffc2316d3bbb7a427143423e875213bd43ce895b27de96ec0d4eebd0023558cb87d430c3edc0e02ce2a866474d4795312530d4a7b92456d850c43a84e56
-EBUILD hbci4java-2.5.12.ebuild 1322 SHA256 34c7a32a7bad855d83548ae49f34441b00d1539b5cf5405b2118cc955c345743 SHA512 773b7556b60a8d210e99439565f11233d32201a80b9fb72ef9b88598f23a7c17a33b0134d23a09eb894bb39d10d4c96d4bc73fc79a3736e51c81f309ec999f78 WHIRLPOOL 79bde01c56fdc9ef627981e5a68cdc8d51a44013129b341afe47c662ec1541b0144855ef9b267eb904d10b2352835bded958bae2904bb142064ee7a06b4cd416
diff --git a/net-libs/hbci4java/files/2.5.12-build.patch b/net-libs/hbci4java/files/2.5.12-build.patch
deleted file mode 100644
index 73f1c8d..0000000
--- a/net-libs/hbci4java/files/2.5.12-build.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Index: hbci4java-2.5.12-src/build.xml
-===================================================================
---- hbci4java-2.5.12-src.orig/build.xml
-+++ hbci4java-2.5.12-src/build.xml
-@@ -14,7 +14,11 @@
- </path>
-
- <target name="compile"
-- description="compile all the needed stuff; after that add dir 'classes' to the classpath; in dir 'chipcard/lib' you will find the ddv-library needed for accessing your chipcard terminal">
-+ description="compile all the needed stuff; after that add dir 'classes' to the classpath; in dir 'chipcard/lib' you will find the ddv-library needed for accessing your chipcard terminal"
-+ depends="compile-java, compile-chipcard" />
-+
-+ <target name="compile-java"
-+ description="Compile the Java library">
- <mkdir dir="${classes}"/>
- <javac srcdir="${src}" destdir="${classes}"
- debug="on" encoding="ISO-8859-1"
-@@ -39,17 +43,20 @@
- </fileset>
- <mapper type="glob" from="messages*" to="HBCIMessages*" />
- </copy>
-+ </target>
-
-- <javah class="org.kapott.hbci.passport.HBCIPassportDDV"
-- outputFile="${chipcard}/src/include/frontend.h"
-+ <target name="compile-chipcard" depends="compile-java"
-+ description="Compiles the driver for chipcard terminals">
-+ <javah class="org.kapott.hbci.passport.HBCIPassportDDV"
-+ outputFile="${chipcard}/src/include/frontend.h"
- classpath="${classes}"/>
--
-+
- <exec executable="${make}" os="Linux">
- <arg line="-C ${chipcard}"/>
- </exec>
- </target>
-
-- <target name="package" depends="compile">
-+ <target name="package" depends="compile-java">
- <mkdir dir="${dist}/jar"/>
- <jar destfile="${dist}/jar/hbci4java.jar"
- basedir="${classes}" compress="true">
-@@ -96,7 +103,7 @@
- <include name="tools/HBCIBatch.java"/>
- </fileset>
-
-- <target name="javadoc" depends="compile"
-+ <target name="javadoc" depends="compile-java"
- description="create javadoc documentation">
- <mkdir dir="${doc}/javadoc" />
- <javadoc classpath="${classes}"
-@@ -111,7 +118,7 @@
- </javadoc>
- </target>
-
-- <target name="dist" depends="package,javadoc"
-+ <target name="dist" depends="compile,package,javadoc"
- description="bundle all required stuff in a single directory (dir 'dist').">
-
- <mkdir dir="${dist}/templates"/>
diff --git a/net-libs/hbci4java/files/2.5.12-makefile.patch b/net-libs/hbci4java/files/2.5.12-makefile.patch
deleted file mode 100644
index f679274..0000000
--- a/net-libs/hbci4java/files/2.5.12-makefile.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-Index: hbci4java-2.5.12-src/chipcard/src/frontend/Makefile
-===================================================================
---- hbci4java-2.5.12-src.orig/chipcard/src/frontend/Makefile
-+++ hbci4java-2.5.12-src/chipcard/src/frontend/Makefile
-@@ -4,8 +4,9 @@ INCLUDES = -I../include -I$(JAVA_HOME)/i
- WARNINGS = -Wall
- # removed "-Werror -pedantic" because of dlsym() typecast problem
-
--CC = g++
--CFLAGS = -fPIC $(DEFINES) $(INCLUDES) $(WARNINGS)
-+CXX ?= g++
-+AR ?= ar
-+CXXFLAGS += -fPIC $(DEFINES) $(INCLUDES) $(WARNINGS)
- LIBS = -L../../bin -lzkachip-highlevel -lzkachip-lowlevel
-
- SOURCES = frontend.cpp
-@@ -15,16 +16,16 @@ OBJECTS = ../../bin/frontend.o
- .SUFFIXES: .cpp .o
-
- ../../bin/%.o: %.cpp
-- $(CC) -c -o $@ $(CFLAGS) $<
-+ $(CXX) -c -o $@ $(CXXFLAGS) $(LDFLAGS) $<
-
- all: depend ../../bin/libhbci4java-card-linux.so
-
- depend: Makefile.depend
-
- Makefile.depend: $(SOURCES)
-- for file in $(SOURCES); do echo -n "../../bin/"; gcc $(CFLAGS) -MM $$file; done >Makefile.depend
-+ for file in $(SOURCES); do echo -n "../../bin/"; $(CXX) $(CXXFLAGS) $(LDFLAGS) -MM $$file; done >Makefile.depend
-
- ../../bin/libhbci4java-card-linux.so: $(OBJECTS) ../../bin/libzkachip-highlevel.a ../../bin/libzkachip-lowlevel.a
-- $(CC) -fPIC -shared -o $@ $(OBJECTS) $(LIBS)
-+ $(CXX) $(LDFLAGS) -fPIC -shared -o $@ $(OBJECTS) $(LIBS)
-
- include Makefile.depend
-Index: hbci4java-2.5.12-src/chipcard/src/highlevel/Makefile
-===================================================================
---- hbci4java-2.5.12-src.orig/chipcard/src/highlevel/Makefile
-+++ hbci4java-2.5.12-src/chipcard/src/highlevel/Makefile
-@@ -4,9 +4,9 @@ INCLUDES = -I../include
- WARNINGS = -Wall
- # removed "-Werror -pedantic" because of dlsym() typecast problem
-
--CC = g++
--AR = ar
--CFLAGS = -fPIC $(DEFINES) $(INCLUDES) $(WARNINGS)
-+CXX ?= g++
-+AR ?= ar
-+CXXFLAGS += -fPIC $(DEFINES) $(INCLUDES) $(WARNINGS)
-
- SOURCES = hbci_cardtype.cpp \
- ddv_decrypt.cpp \
-@@ -37,14 +37,14 @@ OBJECTS = ../../bin/hbci_cardtype.o \
- .SUFFIXES: .cpp .o
-
- ../../bin/%.o: %.cpp
-- $(CC) -c -o $@ $(CFLAGS) $<
-+ $(CXX) -c -o $@ $(CXXFLAGS) $(LDFLAGS) $<
-
- all: depend ../../bin/libzkachip-highlevel.a
-
- depend: Makefile.depend
-
- Makefile.depend: $(SOURCES)
-- for file in $(SOURCES); do echo -n "../../bin/"; gcc $(CFLAGS) -MM $$file; done >Makefile.depend
-+ for file in $(SOURCES); do echo -n "../../bin/"; $(CXX) $(CXXFLAGS) $(LDFLAGS) -MM $$file; done >Makefile.depend
-
- ../../bin/libzkachip-highlevel.a: $(OBJECTS)
- $(AR) rcsv $@ $(OBJECTS)
-Index: hbci4java-2.5.12-src/chipcard/src/lowlevel/Makefile
-===================================================================
---- hbci4java-2.5.12-src.orig/chipcard/src/lowlevel/Makefile
-+++ hbci4java-2.5.12-src/chipcard/src/lowlevel/Makefile
-@@ -4,9 +4,9 @@ INCLUDES = -I../include
- WARNINGS = -Wall
- # removed "-Werror -pedantic" because of dlsym() typecast problem
-
--CC = g++
--AR = ar
--CFLAGS = -fPIC $(DEFINES) $(INCLUDES) $(WARNINGS)
-+CXX ?= g++
-+AR ?= ar
-+CXXFLAGS += -fPIC $(DEFINES) $(INCLUDES) $(WARNINGS)
-
- SOURCES = atr.cpp \
- bcs.cpp \
-@@ -41,14 +41,14 @@ OBJECTS = ../../bin/atr.o \
- .SUFFIXES: .cpp .o
-
- ../../bin/%.o: %.cpp
-- $(CC) -c -o $@ $(CFLAGS) $<
-+ $(CXX) -c -o $@ $(CXXFLAGS) $(LDFLAGS) $<
-
- all: depend ../../bin/libzkachip-lowlevel.a
-
- depend: Makefile.depend
-
- Makefile.depend: $(SOURCES)
-- for file in $(SOURCES); do echo -n "../../bin/"; gcc $(CFLAGS) -MM $$file; done >Makefile.depend
-+ for file in $(SOURCES); do echo -n "../../bin/"; $(CXX) $(CXXFLAGS) $(LDFLAGS) -MM $$file; done >Makefile.depend
-
- ../../bin/libzkachip-lowlevel.a: $(OBJECTS)
- $(AR) rcsv $@ $(OBJECTS)
-Index: hbci4java-2.5.12-src/chipcard/src/tools/Makefile
-===================================================================
---- hbci4java-2.5.12-src.orig/chipcard/src/tools/Makefile
-+++ hbci4java-2.5.12-src/chipcard/src/tools/Makefile
-@@ -4,8 +4,9 @@ INCLUDES = -I../include
- WARNINGS = -Wall
- # removed "-Werror -pedantic" because of dlsym() typecast problem
-
--CC = g++
--CFLAGS = -fPIC $(DEFINES) $(INCLUDES) $(WARNINGS)
-+CXX ?= g++
-+AR ?= ar
-+CXXFLAGS += -fPIC $(DEFINES) $(INCLUDES) $(WARNINGS)
- LIBS = -L../../bin -lzkachip-highlevel -lzkachip-lowlevel -ldl
-
- SOURCES = t_hbci_cardinfo.cpp \
-@@ -29,15 +30,15 @@ PROGRAMS = ../../bin/t_hbci_cardinfo \
- .SUFFIXES: .cpp .o
-
- ../../bin/%.o: %.cpp
-- $(CC) -c -o $@ $(CFLAGS) $<
-+ $(CXX) -c -o $@ $(CXXFLAGS) $(LDFLAGS) $<
- ../../bin/%: ../../bin/%.o ../../bin/libzkachip-highlevel.a ../../bin/libzkachip-lowlevel.a
-- $(CC) -fPIC -o $@ $< $(LIBS)
-+ $(CXX) -fPIC -o $@ $< $(LIBS)
-
- all: depend $(PROGRAMS)
-
- depend: Makefile.depend
-
- Makefile.depend: $(SOURCES)
-- for file in $(SOURCES); do echo -n "../../bin/"; gcc $(CFLAGS) -MM $$file; done >Makefile.depend
-+ for file in $(SOURCES); do echo -n "../../bin/"; $(CXX) $(CXXFLAGS) $(LDFLAGS) -MM $$file; done >Makefile.depend
-
- include Makefile.depend
diff --git a/net-libs/hbci4java/hbci4java-2.5.12.ebuild b/net-libs/hbci4java/hbci4java-2.5.12.ebuild
deleted file mode 100644
index d997072..0000000
--- a/net-libs/hbci4java/hbci4java-2.5.12.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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
-
-DESCRIPTION="A Java Library for HBCI (Homebanking Computer Interface) / FinTS (Financial Transaction Services)"
-HOMEPAGE="http://hbci4java.kapott.org/"
-SRC_URI="http://hbci4java.kapott.org/${P}-src.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="+chipcard"
-
-COMMON_DEP="
- dev-java/xerces:2
- >=dev-java/log4j-1.2.8:0
- !net-libs/willuhn-hbci4java"
-
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.4
- app-arch/unzip
- ${COMMON_DEP}"
-
-S=${WORKDIR}/${P}-src
-
-# JNI libraries don't need SONAME
-QA_SONAME="usr/$(get_libdir)/lib${PN}-chipcard-linux.so"
-
-EANT_BUILD_TARGET="package"
-
-pkg_setup() {
- use chipcard && EANT_BUILD_TARGET="compile-chipcard ${EANT_BUILD_TARGET}"
-}
-
-java_prepare() {
- epatch "${FILESDIR}/${PV}-makefile.patch"
- epatch "${FILESDIR}/${PV}-build.patch"
- eant clean
-}
-
-src_install() {
- java-pkg_newjar dist/jar/${PN}.jar
-
- if use chipcard; then
- dolib chipcard/lib/libhbci4java-card-linux.so || "dolib failed"
- fi
-
- dodoc README* FEATURES BUGS ChangeLog || die "dodoc failed"
-
- use doc && java-pkg_dojavadoc doc/javadoc
- use source && java-pkg_dosrc src/org
-}
diff --git a/net-libs/willuhn-hbci4java/Manifest b/net-libs/willuhn-hbci4java/Manifest
index 6236f12..6c48b87 100644
--- a/net-libs/willuhn-hbci4java/Manifest
+++ b/net-libs/willuhn-hbci4java/Manifest
@@ -1,9 +1,2 @@
-AUX java_home.patch 801 SHA256 39eb0d359acfbdc9305acec5f9d9acafd0bf742cbb40e13fbe2ba63bcec8bbde SHA512 71917237379da6dfe1d4c1296531c35f41c973436d2b68c502558a52e5498ad210754478574f090017943cf976aa937cfaa7f458cdbe8dffb0af4a862534bb2d WHIRLPOOL 60cfb86eb4d8fc9d7da2c48b7e1b312c76ec449cab25d649e0ecaeddbef8eb14e149fd80cd74908957ab91afc6c5f7bc54650386313117dc123a9fb6836b1b6a
-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
+AUX java_home.patch 457 SHA256 d08d3bf72676dbc5e7935942de748c64ced58d8a515aa1b6843c2ca80615fd3b SHA512 9fd7ed1b875d6d120377b366f9b3fa899ce1ebfb6978bfe159b15cb2158ff01768c303d4c13a06fa094db9aee12665f3ebe681c649d0ecd2f02792c184e2ec58 WHIRLPOOL 7cad4594caf20d2dbce856cb6bea9b2e737de914bb387bd7045b40aa7202d856e7ad1f68f703ab63ef8c8468f53aeca7fdbc83ab77a9b0d9ea1abf7e96f92314
+EBUILD willuhn-hbci4java-9999.ebuild 1442 SHA256 2f69ee8b1c91270351bb09affcd4b7a970b5916b77a16aae3dc3478046edb753 SHA512 3229e06b6add787ea211e7593f28eb15d8854afb8c49bd8e52d002be2ccfa84f383e50b15dfbcb3a1d6e31692a0887962216b86254584250c50efd3148555d98 WHIRLPOOL 36f76ca3cef0e1fbb3d39927b938a05cc69afce3d0972b5088e74ea13c75ccfa36064ccbfa02b27e047736088bad6005d0e301483f5f7c3e9f3babee431ee2a7
diff --git a/net-libs/willuhn-hbci4java/files/java_home.patch b/net-libs/willuhn-hbci4java/files/java_home.patch
index 9a61032..812ef8d 100644
--- a/net-libs/willuhn-hbci4java/files/java_home.patch
+++ b/net-libs/willuhn-hbci4java/files/java_home.patch
@@ -1,13 +1,9 @@
-Index: hbci4java-bc2108ad8dabe468e3fca314c4314d63d9a036ef/chipcard/src/frontend/Makefile
+Index: willuhn-hbci4java-9999/chipcard/src/frontend/Makefile
===================================================================
---- hbci4java-bc2108ad8dabe468e3fca314c4314d63d9a036ef.orig/chipcard/src/frontend/Makefile
-+++ hbci4java-bc2108ad8dabe468e3fca314c4314d63d9a036ef/chipcard/src/frontend/Makefile
-@@ -1,6 +1,6 @@
+--- willuhn-hbci4java-9999.orig/chipcard/src/frontend/Makefile
++++ willuhn-hbci4java-9999/chipcard/src/frontend/Makefile
+@@ -1,4 +1,3 @@
-JAVA_HOME = $(shell readlink -f /usr/bin/javac | sed "s:/bin/javac::")
-+JAVA_HOME = ${JAVA_HOME-$(shell readlink -f /usr/bin/javac | sed "s:/bin/javac::")}
DEFINES = -D__UNIX
--INCLUDES = -I../include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
-+INCLUDES = -I../include -I/opt/icedtea-bin-6.1.12.7/include/ -I/opt/icedtea-bin-6.1.12.7/include/linux/
+ INCLUDES = -I../include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
WARNINGS = -Wall
- # removed "-Werror -pedantic" because of dlsym() typecast problem
-
diff --git a/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p20140325.ebuild b/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p20140325.ebuild
deleted file mode 100644
index 3a56062..0000000
--- a/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p20140325.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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="31e9842347aa13893a252bad54d6a7ee8e4789cd"
-
-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
-}
diff --git a/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p20140731.ebuild b/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p20140731.ebuild
deleted file mode 100644
index db0ba5b..0000000
--- a/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p20140731.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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="d57bd1cd6310ac0f280e55a8dca039ec41e1e219"
-
-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
-}
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
deleted file mode 100644
index f36d0ee..0000000
--- a/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p20141212.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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
-}
diff --git a/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p20140617.ebuild b/net-libs/willuhn-hbci4java/willuhn-hbci4java-9999.ebuild
index e8be4ca..dfca047 100644
--- a/net-libs/willuhn-hbci4java/willuhn-hbci4java-2.5.12_p20140617.ebuild
+++ b/net-libs/willuhn-hbci4java/willuhn-hbci4java-9999.ebuild
@@ -2,35 +2,37 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="2"
+EAPI="5"
JAVA_PKG_IUSE="doc source"
WANT_ANT_TASKS="ant-nodeps"
inherit eutils java-pkg-2 java-ant-2
-COMMIT="3f03bedcaa49deafe658ebae5ce8978933659b5e"
+if [[ ${PV} != 9999 ]]; then
+ SRC_URI="https://github.com/willuhn/hbci4java/archive/${COMMIT}.zip -> ${P}.zip"
+ KEYWORDS="~amd64 ~x86"
+else
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/willuhn/hbci4java.git"
+fi
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
+RDEPEND=">=virtual/jre-1.5
${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.6
+DEPEND=">=virtual/jdk-1.5
app-arch/unzip
${COMMON_DEP}"
@@ -39,15 +41,6 @@ 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
@@ -58,7 +51,7 @@ src_install() {
java-pkg_newjar dist/jar/hbci4java.jar
if use smartcard; then
- dolib chipcard/lib/libhbci4java-card-linux.so || "dolib failed"
+ dolib.so chipcard/lib/libhbci4java-card-linux.so || "dolib failed"
use amd64 && dosym libhbci4java-card-linux.so /usr/$(get_libdir)/libhbci4java-card-linux-64.so
fi