summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Köster <fabian.koester@bringnow.com>2015-10-28 16:11:20 +0100
committerFabian Köster <fabian.koester@bringnow.com>2015-10-28 16:11:20 +0100
commit76a796ab5634dbb10e57822e127bf155b707663c (patch)
treed27b5c3c74dc523bdb1d0966ba38a48cd61bb7e9 /dev-java
parentFix dev-java/h2 SRC_URI (see bug https://bugs.gentoo.org/show_bug.cgi?id=463732) (diff)
downloadhibiscus-76a796ab5634dbb10e57822e127bf155b707663c.tar.gz
hibiscus-76a796ab5634dbb10e57822e127bf155b707663c.tar.bz2
hibiscus-76a796ab5634dbb10e57822e127bf155b707663c.zip
Major cleanup and add compiling live ebuilds
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/cssparser/Manifest2
-rw-r--r--dev-java/cssparser/cssparser-0.9.5.ebuild23
-rw-r--r--dev-java/htmlunit-core-js/Manifest2
-rw-r--r--dev-java/htmlunit-core-js/htmlunit-core-js-2.7.ebuild38
-rw-r--r--dev-java/htmlunit/Manifest5
-rw-r--r--dev-java/htmlunit/files/build.xml26
-rw-r--r--dev-java/htmlunit/htmlunit-2.10.ebuild42
-rw-r--r--dev-java/htmlunit/htmlunit-2.7.ebuild54
-rw-r--r--dev-java/itext/Manifest3
-rw-r--r--dev-java/itext/files/2.0.8-site_xml.patch12
-rw-r--r--dev-java/itext/itext-5.3.3.ebuild59
-rw-r--r--dev-java/jameica-scripting/Manifest8
-rw-r--r--dev-java/jameica-scripting/files/disable-examples.patch16
-rw-r--r--dev-java/jameica-scripting/files/jre-missing-scripting.patch23
-rw-r--r--dev-java/jameica-scripting/jameica-scripting-1.0.ebuild57
-rw-r--r--dev-java/jameica-scripting/jameica-scripting-2.3.0_pre.ebuild53
-rw-r--r--dev-java/jameica-scripting/jameica-scripting-2.5.0_pre.ebuild56
-rw-r--r--dev-java/jameica/Manifest5
-rw-r--r--dev-java/jameica/jameica-2.6.1.ebuild90
-rw-r--r--dev-java/jameica/jameica-9999.ebuild (renamed from dev-java/jameica/jameica-2.6.2.ebuild)52
-rw-r--r--dev-java/mckoi/Manifest5
-rw-r--r--dev-java/mckoi/files/build.xml55
-rw-r--r--dev-java/mckoi/files/mckoi-1.0.3-jikes.patch48
-rw-r--r--dev-java/mckoi/mckoi-1.0.3-r2.ebuild63
-rw-r--r--dev-java/mckoi/metadata.xml252
-rw-r--r--dev-java/nekohtml/Manifest3
-rw-r--r--dev-java/nekohtml/files/nekohtml-1.9.16-remove-obsolete-xerces-bridges.patch12
-rw-r--r--dev-java/nekohtml/nekohtml-1.9.16.ebuild55
-rw-r--r--dev-java/obantoo/Manifest8
-rw-r--r--dev-java/obantoo/files/1.4.11-hibiscus-encoding.patch151
-rw-r--r--dev-java/obantoo/obantoo-1.5.1.ebuild49
-rw-r--r--dev-java/obantoo/obantoo-2.0.9.ebuild61
-rw-r--r--dev-java/obantoo/obantoo-2.1.12.ebuild (renamed from dev-java/obantoo/obantoo-1.5.2.ebuild)18
-rw-r--r--dev-java/obantoo/obantoo-2.1.6.ebuild61
-rw-r--r--dev-java/spiffy/Manifest3
-rw-r--r--dev-java/spiffy/metadata.xml7
-rw-r--r--dev-java/spiffy/spiffy-0.05.ebuild50
-rw-r--r--dev-java/super-csv/Manifest5
-rw-r--r--dev-java/super-csv/metadata.xml8
-rw-r--r--dev-java/super-csv/super-csv-1.52.ebuild54
-rw-r--r--dev-java/super-csv/super-csv-2.0.1.ebuild22
-rw-r--r--dev-java/swt-chart/swt-chart-0.7.0.ebuild74
-rw-r--r--dev-java/willuhn-datasource/Manifest10
-rw-r--r--dev-java/willuhn-datasource/files/2.2-java7-api.patch33
-rw-r--r--dev-java/willuhn-datasource/willuhn-datasource-2.4.ebuild46
-rw-r--r--dev-java/willuhn-datasource/willuhn-datasource-2.6.ebuild46
-rw-r--r--dev-java/willuhn-datasource/willuhn-datasource-2.6_p20131229.ebuild48
-rw-r--r--dev-java/willuhn-datasource/willuhn-datasource-9999.ebuild (renamed from dev-java/willuhn-datasource/willuhn-datasource-2.2.ebuild)27
-rw-r--r--dev-java/willuhn-util/Manifest7
-rw-r--r--dev-java/willuhn-util/willuhn-util-2.2.ebuild42
-rw-r--r--dev-java/willuhn-util/willuhn-util-2.6.ebuild42
-rw-r--r--dev-java/willuhn-util/willuhn-util-9999.ebuild (renamed from dev-java/willuhn-util/willuhn-util-2.4.ebuild)19
52 files changed, 64 insertions, 1946 deletions
diff --git a/dev-java/cssparser/Manifest b/dev-java/cssparser/Manifest
deleted file mode 100644
index ecbc541..0000000
--- a/dev-java/cssparser/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST cssparser-0.9.5-sources.jar 173687 SHA256 26d1edf35a5dc5e6b1d0ac3b69998cd18c3ddbd721995ba0552e67fbe508463a SHA512 864ecd46130764eaf79b04551cebacb99e14bc64a963f5fce0b1a1798129d4bd0b62723d1ed19dbb9bde62de9b79b1c98ab81f80cf245311572bd9638849787f WHIRLPOOL a3f7392fe5d3c5e4e206722669ba11115880496f3902bda7f8f59cbf2870e5eb8156a9dc647d72fc3622b640b26aa35f8cbeb557fd5885d5fdc3bad5f14e6d74
-EBUILD cssparser-0.9.5.ebuild 574 SHA256 36236eb82d4a076c6a3cf11a7261c6e983d59aea8b3c78f6128aeab195130217 SHA512 0c17292eb6abf0a20194bdca5ed42b6473b4b4eeeb693c466ec6187f514fa902d7392e291b7493b1843cb5280bd8a179bb3f5d3f141ceb5fa49b3f2ea82f1ff6 WHIRLPOOL 34a988902756792851d6f98e62f78af20ce0188618ef784b69ba28e68e40c3d82112aff0af3b01250acf7ca03c77c717893d48cd94bed89500eb1b61c426090d
diff --git a/dev-java/cssparser/cssparser-0.9.5.ebuild b/dev-java/cssparser/cssparser-0.9.5.ebuild
deleted file mode 100644
index 605ebba..0000000
--- a/dev-java/cssparser/cssparser-0.9.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-JAVA_PKG_IUSE=""
-GROUP_ID="net.sourceforge.cssparser"
-inherit java-pkg-2 java-mvn-src
-
-DESCRIPTION="The CSS Parser inputs Cascading Style Sheets Level 2 source text and outputs a Document Object Model Level 2 Style tree."
-HOMEPAGE="http://cssparser.sourceforge.net/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-CDEPEND="dev-java/sac"
-DEPEND=">=virtual/jdk-1.5
- $CDEPEND"
-RDEPEND=">=virtual/jre-1.5
- $CDEPEND"
-
-JAVA_GENTOO_CLASSPATH="sac"
diff --git a/dev-java/htmlunit-core-js/Manifest b/dev-java/htmlunit-core-js/Manifest
deleted file mode 100644
index 8430afd..0000000
--- a/dev-java/htmlunit-core-js/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST htmlunit-core-js-2.7-sources.jar 834444 SHA256 9cde440efe3bd0c7ec2b5e2f0178499ddb4adee080be71a78c4ef0392e43f97d SHA512 752398b4d972c74a2df210d6cea033b5fe517e60ea5fa2deef295c9e398e786e54656edc4dda63fa51af841cbd8c9ff0c8de221a0b32adbde41444abfe058223 WHIRLPOOL df96638774fb8f90f2d2520cf07ee2a46b67f6603712fb1dc065630dbc76b3e66b09a46d702329f3a60d533bcd96cf2d9c556ad630f19a8cea705cfd36a61a5e
-EBUILD htmlunit-core-js-2.7.ebuild 1000 SHA256 7ce0bf36ba767a98b0076decb80bcaa87d7759abc78171d3d431ec206a408b8e SHA512 4e069f8e7d2f36564e513507e78cceb7074b24cf33f0f706159bb6b279ea9119892fd6de718c350d13757f6937a2ef89194877aad9c7c14a31a30f20d449b901 WHIRLPOOL d44d4e14f59c4dc5fd1e4e8409d0087c2f9f7cbb784383d28206b09650c2cfbe77d3c40e1a8364feddddca57298d685b49426885bd748292c7c9d89131e8eb84
diff --git a/dev-java/htmlunit-core-js/htmlunit-core-js-2.7.ebuild b/dev-java/htmlunit-core-js/htmlunit-core-js-2.7.ebuild
deleted file mode 100644
index 08e0137..0000000
--- a/dev-java/htmlunit-core-js/htmlunit-core-js-2.7.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/itext-5.2.0.ebuild,v 1.1 2012/03/26 07:21:27 sera Exp $
-
-EAPI="4"
-JAVA_PKG_IUSE=""
-GROUP_ID="net.sourceforge.htmlunit"
-
-inherit java-pkg-2 java-mvn-src
-
-DESCRIPTION="A java GUI-Less browser, supporting JavaScript, to run againsweb pages"
-HOMEPAGE="http://htmlunit.sourceforge.net/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP=""
-
-RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
- >=virtual/jdk-1.5
- app-arch/unzip"
-
-# src_compile() {
-# local classpath="$(java-pkg_getjars \
- #commons-io-1,commons-codec,commons-logging,commons-lang-2.1,commons-httpclient-3,cssparser,xerces-2,commons-collections,nekohtml)"
-#
-# mkdir build
-# find src -name '*.java' > sources.list
-# ejavac -d build -cp "${classpath}" @sources.list
-# jar cf ${PN}.jar -C build/ .
-#
-# # TODO javadoc
-# }
-
diff --git a/dev-java/htmlunit/Manifest b/dev-java/htmlunit/Manifest
deleted file mode 100644
index 563d99e..0000000
--- a/dev-java/htmlunit/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX build.xml 742 SHA256 894f525860ed23039b2bd5ec050eefa087aab63fbeb18c0f49f9e6e2fa1d66f8 SHA512 2e36f947768a82898206cbd494f91193996ef275173aa64ab30c27a0cab4d3f13672f125f47d1c67f5a3742bd23a5ef2f5e460cb5a1c1b43ffa8472e25d77786 WHIRLPOOL c985048776a412ed2ccc6ae21e58e58d732493f1b3407577d9bcbf7965c71656c80708c5afa050b61c21bd8af7d521f3a29d0f7981b9e07c0c2a467692a2b8d6
-DIST htmlunit-2.10-src.zip 26472580 SHA256 c9395dd398b1df2ef39bdc06586ece7536232ff393a0b45f258c61171760b5fa SHA512 8e4d7137c4240b404b84530bbd95758e90392631a835f329a301aa0e1580958e6a083cbb60d39c844bddf2ff0667ae564f6777a3ad969334e02ac0781cfdd17d WHIRLPOOL e34b98bcfe3bcb9e4a23df346281123cbdca50022b116c385cd69bda8d968244b65501f7a6745279a26923f8316cf549213bbfaf4d1aed7d5421f52f319dc4e7
-DIST htmlunit-2.7-src.zip 25207504 SHA256 720dce0535587ab2d29ca81989b8492c33200aa1b5d2f4c1fa8e2038f5fa3fc0 SHA512 01648c392817c99655448067c50e0ef58a8bc1f098df896003f42b597cbd0d785aad3ad8f44ff66cd070e1a1d283f724edfe20e8ac84d8a15c9f9d83e7e93502 WHIRLPOOL 5921dfb3b2164500eb953b3b2af35d7169dcd81a731a6ec990933eeea4c4de9379da84ed8a8338320e17a08ce104ef1c4973867bde8322b0a14a73b83c47d1d7
-EBUILD htmlunit-2.10.ebuild 1058 SHA256 9ecc63e61728afa2b780dc63914c8cc7e2d26f4f638cbbcabb123fa51a2e2d31 SHA512 232fee43581b0a081b145cb1373aeaa5e70187a1df3e51cb3ca459b8149a88c3e3a32effc2fd47dc523fcbfd9344ade1f3fbbdb89e3b4451b1ef67206890363e WHIRLPOOL 3bc3a3df3b3ba5889873599fe69600513f8cdb211a8962ff2b739a3ad8a96b098510edf72920ea2b3fc763ed462734ea039e2a2b6afa2abf241258249f90752e
-EBUILD htmlunit-2.7.ebuild 1350 SHA256 6857c8924b93d0c10f47d44829fa183ce1a6ca27a71d5f504cbcd66a62a27eb3 SHA512 643ea0d74847ee5d551e6518d94ccbe1fd22c0326c4e48f3824d0299ef85cf9bc50a27d8125be74fb8074b2635202d72ae4ed62e635d323c374760eb346cdb04 WHIRLPOOL 8c1bd41028684768fb7bc9ef8cbf4d520d1ff8bd6d2746157a42c3c4370485581f1a8a0b68d4d5d5f5c0bdc1c3eb08684a7f9d55f0675ee50b8d02c84a57ec3b
diff --git a/dev-java/htmlunit/files/build.xml b/dev-java/htmlunit/files/build.xml
deleted file mode 100644
index 0bf7902..0000000
--- a/dev-java/htmlunit/files/build.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project basedir="." default="build" name="org.swtchart">
- <target name="init">
- <mkdir dir="target/classes"/>
- <mkdir dir="target/javadoc"/>
- </target>
- <target name="clean">
- <delete dir="target"/>
- </target>
- <target depends="init" name="build">
- <javac debug="true" destdir="target/classes">
- <src path="src/main/java"/>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources" />
- </copy>
- <jar destfile="htmlunit.jar">
- <fileset dir="target/classes"/>
- </jar>
- </target>
- <target name="doc">
- <javadoc destdir="target/javadoc">
- <fileset dir="src/main/java"/>
- </javadoc>
- </target>
-</project>
diff --git a/dev-java/htmlunit/htmlunit-2.10.ebuild b/dev-java/htmlunit/htmlunit-2.10.ebuild
deleted file mode 100644
index 3f95c1b..0000000
--- a/dev-java/htmlunit/htmlunit-2.10.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/itext-5.2.0.ebuild,v 1.1 2012/03/26 07:21:27 sera Exp $
-
-EAPI="4"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A java GUI-Less browser, supporting JavaScript, to run againsweb pages"
-HOMEPAGE="http://htmlunit.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-COMMON_DEP="dev-java/commons-io
- dev-java/commons-codec
- dev-java/commons-logging"
-
-RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
- >=virtual/jdk-1.5
- app-arch/unzip"
-
-S="${WORKDIR}/${P}"
-
- src_compile() {
- local classpath="$(java-pkg_getjars commons-io-1,commons-codec,commons-logging,commons-lang-2.1,commons-httpclient-3)"
-
- mkdir build
- find src/main/java -name '*.java' > sources.list
- ejavac -d build -cp "${classpath}" @sources.list
- jar cf ${PN}.jar -C build/ .
-
- # TODO javadoc
- }
-
diff --git a/dev-java/htmlunit/htmlunit-2.7.ebuild b/dev-java/htmlunit/htmlunit-2.7.ebuild
deleted file mode 100644
index 96989b4..0000000
--- a/dev-java/htmlunit/htmlunit-2.7.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/itext-5.2.0.ebuild,v 1.1 2012/03/26 07:21:27 sera Exp $
-
-EAPI="4"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A java GUI-Less browser, supporting JavaScript, to run againsweb pages"
-HOMEPAGE="http://htmlunit.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="dev-java/commons-io
- dev-java/commons-codec
- dev-java/commons-logging
- dev-java/commons-collections
- dev-java/commons-httpclient
- dev-java/xalan
- >=dev-java/cssparser-0.9.5
- dev-java/xerces
- >=dev-java/nekohtml-1.9.14
- dev-java/htmlunit-core-js
- dev-java/sac"
-
-RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
- >=virtual/jdk-1.5
- app-arch/unzip"
-
-S="${WORKDIR}/${P}"
-
-EANT_GENTOO_CLASSPATH="commons-io-1,commons-codec,commons-logging,commons-lang-2.1,commons-httpclient-3,cssparser,xerces-2,commons-collections,nekohtml,htmlunit-core-js,xalan,sac"
-
-java_prepare() {
- cp ${FILESDIR}/build.xml ${S}/
- java-ant_rewrite-classpath build.xml
- eant -f build.xml clean
-}
-
-src_compile() {
- eant -f build.xml build $(use_doc javadoc)
-}
-
-src_install() {
- java-pkg_dojar htmlunit.jar
-}
diff --git a/dev-java/itext/Manifest b/dev-java/itext/Manifest
deleted file mode 100644
index 735130e..0000000
--- a/dev-java/itext/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX 2.0.8-site_xml.patch 726 SHA256 b6738416f0587706908d4eb30626e49766428922ecc3995d825b0c42515a7fe2 SHA512 da50239e9afabb25685380e6af59cdd613734416cb46416ff00a6acf54ee1746dd36a25d7dfff7dfff905ffdff35a06c89164b05fb5ba3947f1558d427459bad WHIRLPOOL 829a6d605230205364c39847b4c9829e77dab4381399d5009db137120a4fb4ddbfdfdea475de3f7f560b080c52499076f117b02a2cfd96803e0cbef2a14dfe30
-DIST itext-5.3.3.zip 7412526 SHA256 5b3acc70355131b446e9cb3c95969b519eb4e1277058484456007e9744ae2d6a SHA512 8d8a86605be338f398cbea4ed92e52510b39e999af4203c31b075eb948b42fb00d67747a4c8f0d8c3017c1e881f5709a48683446877d0f8b0c910492ff17e9cf WHIRLPOOL cdebe2b426820c1511ea2dbfe83eb3def5f2977fecc67c380a338a8ffde13196dd566297979b20610bfb966127ffdf89f6f88a7314af832339a889bb4c039065
-EBUILD itext-5.3.3.ebuild 1423 SHA256 d6aab0686434e906f16b44e19619300c71fe8a5bc8824949dcb9945d25aa51c8 SHA512 d986c39854e890048362750334c6fa0c7052afcd009dd51613723eedf3172878aebfb77c25ecdb0d944068d2a19f413e1adb5123489f1f076974b7259f90bb50 WHIRLPOOL 08b89436da08a12719ad0db941bdd38b3327f0297447ebc8d27cd2818872492856548c9398cd0b5efcd4ce15681226f62efd49d490b88f43335405b847cc92be
diff --git a/dev-java/itext/files/2.0.8-site_xml.patch b/dev-java/itext/files/2.0.8-site_xml.patch
deleted file mode 100644
index 6ea2af9..0000000
--- a/dev-java/itext/files/2.0.8-site_xml.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur itext-2.0.8_orig/work/src/ant/site.xml itext-2.0.8/work/src/ant/site.xml
---- itext-2.0.8_orig/work/src/ant/site.xml 2008-01-26 13:26:26.000000000 -0500
-+++ itext-2.0.8/work/src/ant/site.xml 2008-01-26 13:26:46.000000000 -0500
-@@ -67,8 +67,6 @@
- <include name="com/lowagie/**" />
- </packageset>
- <classpath refid="itext.classpath"/>
-- <link href="http://java.sun.com/j2se/1.4/docs/api/" />
-- <link href="http://www.bouncycastle.org/docs/docs1.4/" />
- <header>&lt;a href="http://itext.ugent.be/itext-in-action/" target="_blank"&gt;&lt;img src="http://itext.ugent.be/img/lowagie_3d.jpg" border="0" /&gt;&lt;/a&gt;</header>
- </javadoc>
- </target>
diff --git a/dev-java/itext/itext-5.3.3.ebuild b/dev-java/itext/itext-5.3.3.ebuild
deleted file mode 100644
index 8c02689..0000000
--- a/dev-java/itext/itext-5.3.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/itext-5.2.0.ebuild,v 1.1 2012/03/26 07:21:27 sera Exp $
-
-EAPI="4"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java library that generate documents in the Portable Document Format (PDF) and/or HTML."
-HOMEPAGE="http://itextpdf.com"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-
-LICENSE="AGPL-3"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="
- >=dev-java/bcmail-1.45
- >=dev-java/bcprov-1.46
- >=dev-java/bctsp-1.45"
-RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
- >=virtual/jdk-1.5
- app-arch/unzip"
-
-src_unpack() {
- default
- unpack ./${PN}{pdf,-xtra}-${PV}-sources.jar
-}
-
-java_prepare() {
- # Extract resources from precompiled jar
- mkdir target/classes -p || die
- pushd target/classes > /dev/null || die
- declare -a resources
- resources=( $(jar -tf "${WORKDIR}"/${PN}pdf-${PV}.jar \
- | sed -e '/class$/d' -e '/\/$/d' -e '/META-INF/d') )
- assert
- jar -xf "${WORKDIR}"/${PN}pdf-${PV}.jar "${resources[@]}" || die
- popd > /dev/null
-
- # TODO Re-enable this, fix dependencies
- #find "${WORKDIR}" -name '*.jar' -exec rm -v {} + || die
-}
-
-src_compile() {
- echo "Nothing to compile"
- mv itextpdf-5.3.3.jar itext.jar
-}
-
-#JAVA_GENTOO_CLASSPATH="bcmail,bcprov,bctsp"
-
-src_install() {
- java-pkg-simple_src_install
-}
diff --git a/dev-java/jameica-scripting/Manifest b/dev-java/jameica-scripting/Manifest
deleted file mode 100644
index 6739a5d..0000000
--- a/dev-java/jameica-scripting/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX disable-examples.patch 546 SHA256 678bc0a9e6eac25fb544f11e4e036fa84d2d02d2de4a48293b69050562e70f14 SHA512 5cfebb380a812cedb7e477fcb3870c933d8cbd6001fc7dc4fdcd1c1746502ea1031c733286836976e6df786d605b14e8b187da42deb1e3339e3c6233b37d4493 WHIRLPOOL 3e9e332b3807b9d09f60e12c49c2e0043b05cfd1b807d9ad43d49925d49fd738e85002e5fae8ceea7f967e932ad437c647add09105758312ac34e8bca5d8d699
-AUX jre-missing-scripting.patch 1221 SHA256 91a555bbb136a8badaa03a652cf3f27ba46f80409d987c0a35f7d70ad1092fea SHA512 540f142abfc27467da182288bf14ca3e0c7c969c01a186c5ee39ef08f1ff971b874798b78126591487f959cb9641dea4cc393ef1fc7977b0d94c74cb5a19d709 WHIRLPOOL fc50970355bd166aa7865ba23810477466fa2e7ad4af8be86aaf119b7e869bf69ad9c96788f82331d942df82740d091f2edcdb7f3b98122073e6fa15e4a95140
-DIST jameica-scripting-1.0.zip 26023 SHA256 e99be32078cc8866b9be1ece39503f05159b6dbb0d2175655c424353009e8eac SHA512 4eed8d8022369752b8280f51f49cc22f1b12c239ff7919561b67b3b3d11b165f6eea7dcec4f6da8fdf1b11a195084b3ad7173bbbd6eba969473da0a64a45076d WHIRLPOOL fabeea3982e4d30e8e0a040d02f8cfc906c90dc135d1b8177133a91df5539ca47e8c3d984abce200c799c0a4c41c12b4afaa0abc3a60f18a64a03840da24e8b3
-DIST jameica.scripting-2.3.0-nightly.src.zip 25521 SHA256 4af9f531bb08bb2380ad2a98a99255cba57b3691c786b0d1f093714566121bab SHA512 2f8dd8f0164a5e1e2a44e39c98f1df4d8c983e8b51736d6d99039b78811333c78873c2da6235f089daca36fb5150944b29b2220ac024f6632f98b3acf401b08c WHIRLPOOL 613f736412a779e3df3c10764c7ae57d266dff555d7e07a50b8b41b44f7653c984a0bc69cea0c3b3c934ff5ff6479de7544f2714a7e57dad3c8f66f06bc64123
-DIST jameica.scripting-2.5.0-nightly.src.zip 27039 SHA256 d5b1273e4ad7f1a55eb11cc7e9a16a0104bc7ba59b2699e2addf347c9a238ded SHA512 58d2895f8ca3b9a0b2c33b7284d206ff47e3c0027e29ba633b811413f8c4ee6136c8cec9efd91b6762d1987c2c9dd333b52f9a7024d41f81e64060f2428835d2 WHIRLPOOL c4e9527d1b337c1485c33eee0630fc66db97a4fb26932f4659305cc53469b65acde6e58cb58e4de7271bcf8370492b6a9e7d0abb3c28d58aec0d05aa3656947e
-EBUILD jameica-scripting-1.0.ebuild 1342 SHA256 02d31f59048da584bcbe4b74ef06a899e514e00405fa73d47a889e722bdc0d11 SHA512 0d95255fa55af507543b0afdf5be9ccc4acbfc07e2e3dd527b24ab43dfea7f6020d4b0c8a2511f6411a8a4433991ddcd98cd28364ad731ae9222b5d9b474e231 WHIRLPOOL 5f13f49c422c8ccda0a369a625350b87557dc33e1c2f2a10c255a2dcffe10ae321774baa75226ce78de845cf496bfe8c7c9479d163b0801d27d497c11b7db946
-EBUILD jameica-scripting-2.3.0_pre.ebuild 1294 SHA256 4a78dc9f04b51ebdd8a39e1356437f7d2107a7e6b494e343733478896b739bd1 SHA512 47785eb41f5e3410e3c4c10d64b8113e7b178b19f911f9cc9c7f0c8e595dfa70b08218d6f7332bd959f3065e4ac31b77fcad3dc7f5b604519e3137c725a80220 WHIRLPOOL f08eac566f8d9c28ac0b59c61baf7cb47e204169edaa64b70dcca6f4c5b7f48601eab1d09c5cba3e7af43ffd6eb7b9022e73315d45380e20103eeccf77bea69a
-EBUILD jameica-scripting-2.5.0_pre.ebuild 1431 SHA256 91590eea26ca6fbb820454d942f52b18da4128d67264ff2152130efea72c2303 SHA512 2f2effc5efde1a3bbfbb7870d7d7b7113fabd3495171990bbed464243d1a7266dc899ef96cfd165aef2495d3fd6bdf3353399912d68e3570cef1a1837223ff09 WHIRLPOOL 0df4182096200c5d96e8a1a55643ff3aaf87defe967c55839a8ee41a6764ac1c635c776e703a211a43ad7b64e55ac27fd63dd18d797db63d872183d99c67df7f
diff --git a/dev-java/jameica-scripting/files/disable-examples.patch b/dev-java/jameica-scripting/files/disable-examples.patch
deleted file mode 100644
index 17af20e..0000000
--- a/dev-java/jameica-scripting/files/disable-examples.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: jameica.scripting/build/build.xml
-===================================================================
---- jameica.scripting.orig/build/build.xml
-+++ jameica.scripting/build/build.xml
-@@ -143,11 +143,6 @@
- <antcall target="addlib"/>
- <antcall target="addwebapps"/>
-
-- <mkdir dir="${project.zipdir}/examples" />
-- <copy todir="${project.zipdir}/examples">
-- <fileset dir="examples" />
-- </copy>
--
- <copy file="plugin.xml" todir="${project.zipdir}" />
- <copy file="${build.dir}/COPYING" todir="${project.zipdir}" />
-
diff --git a/dev-java/jameica-scripting/files/jre-missing-scripting.patch b/dev-java/jameica-scripting/files/jre-missing-scripting.patch
deleted file mode 100644
index 2791b64..0000000
--- a/dev-java/jameica-scripting/files/jre-missing-scripting.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: jameica.scripting/src/de/willuhn/jameica/scripting/services/impl/ScriptingServiceImpl.java
-===================================================================
---- jameica.scripting.orig/src/de/willuhn/jameica/scripting/services/impl/ScriptingServiceImpl.java
-+++ jameica.scripting/src/de/willuhn/jameica/scripting/services/impl/ScriptingServiceImpl.java
-@@ -89,6 +89,11 @@ public class ScriptingServiceImpl implem
- // 1. Script-Engine laden
- ScriptEngineManager factory = new ScriptEngineManager();
- this.engine = factory.getEngineByName("JavaScript");
-+
-+ // Some JREs do not necessarily provide a JavaScript engine
-+ if (this.engine == null)
-+ throw new RuntimeException("Your Java Runtime Environment does not provide a JavaScript engine. Jameica Scripting won't work");
-+
- this.engine.put("events",this.events);
-
- // 2. Vom Benutzer registrierte Scripts ausfuehren.
-@@ -273,4 +278,4 @@ public class ScriptingServiceImpl implem
- * Revision 1.1 2010-07-23 12:58:33 willuhn
- * @N initial import
- *
-- **********************************************************************/
-\ No newline at end of file
-+ **********************************************************************/
diff --git a/dev-java/jameica-scripting/jameica-scripting-1.0.ebuild b/dev-java/jameica-scripting/jameica-scripting-1.0.ebuild
deleted file mode 100644
index f8889ea..0000000
--- a/dev-java/jameica-scripting/jameica-scripting-1.0.ebuild
+++ /dev/null
@@ -1,57 +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-3)"
-MY_PN="jameica.scripting"
-
-DESCRIPTION="Scripting extension for Jameica"
-HOMEPAGE="http://www.willuhn.de/products/jameica/extensions.php#${MY_PN}"
-SRC_URI="https://github.com/willuhn/jameica.scripting/zipball/2cabf4a4c7db673cfee12e265169b9726d4a09b9 -> ${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-COMMON_DEP=">=dev-java/jameica-1.10.0"
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.5
- app-arch/unzip
- ${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_PN}"
-
-src_unpack() {
- default
- mv willuhn-${MY_PN}-* ${MY_PN}
-}
-
-java_prepare() {
- cd "${S}"
- rm -v build/BUILD
-
- EANT_GENTOO_CLASSPATH="jameica"
- mkdir lib
- java-pkg_jar-from --with-dependencies --into lib "${EANT_GENTOO_CLASSPATH}"
-}
-
-src_compile() {
- eant -f build/build.xml jar $(use_doc javadoc)
-}
-
-src_install() {
- local INST_DIR="/usr/share/jameica/plugins/${MY_PN}"
-
- dodir "$INST_DIR"
- insinto ${INST_DIR}
- doins releases/${MY_PV}-0/${MY_PN}/${MY_PN}.jar || die "doins failed"
- doins releases/${MY_PV}-0/${MY_PN}/plugin.xml || die "doins failed"
-
- #use doc && java-pkg_dojavadoc releases/${PV}-0/javadoc
- #use source && java-pkg_dosrc src/de
-}
diff --git a/dev-java/jameica-scripting/jameica-scripting-2.3.0_pre.ebuild b/dev-java/jameica-scripting/jameica-scripting-2.3.0_pre.ebuild
deleted file mode 100644
index eae5f16..0000000
--- a/dev-java/jameica-scripting/jameica-scripting-2.3.0_pre.ebuild
+++ /dev/null
@@ -1,53 +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-3)"
-MY_PN="jameica.scripting"
-
-DESCRIPTION="Scripting extension for Jameica"
-HOMEPAGE="http://www.willuhn.de/products/jameica/extensions.php#${MY_PN}"
-SRC_URI="http://www.willuhn.de/products/jameica/releases/nightly/${MY_PN}-${MY_PV}-nightly.src.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-COMMON_DEP=">=dev-java/jameica-2.3.0"
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.5
- app-arch/unzip
- ${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_PN}"
-
-java_prepare() {
- epatch "${FILESDIR}/disable-examples.patch"
-
- cd "${S}"
-
- EANT_GENTOO_CLASSPATH="jameica"
- mkdir lib
- java-pkg_jar-from --with-dependencies --into lib "${EANT_GENTOO_CLASSPATH}"
-}
-
-src_compile() {
- eant -f build/build.xml jar $(use_doc javadoc)
-}
-
-src_install() {
- local INST_DIR="/usr/share/jameica/plugins/${MY_PN}"
-
- dodir "$INST_DIR"
- insinto ${INST_DIR}
- doins releases/${MY_PV}-0/${MY_PN}/${MY_PN}.jar || die "doins failed"
- doins releases/${MY_PV}-0/${MY_PN}/plugin.xml || die "doins failed"
-
- #use doc && java-pkg_dojavadoc releases/${PV}-0/javadoc
- #use source && java-pkg_dosrc src/de
-}
diff --git a/dev-java/jameica-scripting/jameica-scripting-2.5.0_pre.ebuild b/dev-java/jameica-scripting/jameica-scripting-2.5.0_pre.ebuild
deleted file mode 100644
index 0457c9c..0000000
--- a/dev-java/jameica-scripting/jameica-scripting-2.5.0_pre.ebuild
+++ /dev/null
@@ -1,56 +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-3)"
-MY_PN="jameica.scripting"
-
-DESCRIPTION="Scripting extension for Jameica"
-HOMEPAGE="http://www.willuhn.de/products/jameica/extensions.php#${MY_PN}"
-SRC_URI="http://www.willuhn.de/products/jameica/releases/nightly/${MY_PN}-${MY_PV}-nightly.src.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-# TODO We a jre with scripting support (USE="javascript"), can we map this via
-# virtual/jre ?
-COMMON_DEP=">=dev-java/jameica-2.3.0"
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.5
- app-arch/unzip
- ${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_PN}"
-
-java_prepare() {
- epatch "${FILESDIR}/disable-examples.patch"
- epatch "${FILESDIR}/jre-missing-scripting.patch"
-
- cd "${S}"
-
- EANT_GENTOO_CLASSPATH="jameica"
- mkdir lib
- java-pkg_jar-from --with-dependencies --into lib "${EANT_GENTOO_CLASSPATH}"
-}
-
-src_compile() {
- eant -f build/build.xml jar $(use_doc javadoc)
-}
-
-src_install() {
- local INST_DIR="/usr/share/jameica/plugins/${MY_PN}"
-
- dodir "$INST_DIR"
- insinto ${INST_DIR}
- doins releases/${MY_PV}-0/${MY_PN}/${MY_PN}.jar || die "doins failed"
- doins releases/${MY_PV}-0/${MY_PN}/plugin.xml || die "doins failed"
-
- #use doc && java-pkg_dojavadoc releases/${PV}-0/javadoc
- #use source && java-pkg_dosrc src/de
-}
diff --git a/dev-java/jameica/Manifest b/dev-java/jameica/Manifest
index df7aeac..481ab6e 100644
--- a/dev-java/jameica/Manifest
+++ b/dev-java/jameica/Manifest
@@ -1,4 +1,3 @@
-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 2786 SHA256 00b437f3634f47803123c258fa0d46c3c2e09e3987d0bb76ba4dfb1aa1a8fc5b SHA512 006d18dfe3fcd5689b8bee037ab8532848653e8d5a297cc8615172322f01e1745c7835cd56a5849c4795114e9ffc13cdd5194013ae3b66f63a197f7e3ac0138a WHIRLPOOL f637bad3fed0c436c9b36be2c1765746041bfd9e6113e89656087a738e0fcd31ca3703ce6e52f2f6a728a574a41f85a2fbab9561112af38dababd3e6be5c4c1d
+EBUILD jameica-2.6.2.ebuild 2783 SHA256 0c3d51a4fce9ea42e34c404359ce96d2a25f53c6b45e27be58fda24e98455628 SHA512 00b71cd968ca3906bfa16c083b09b4cb30c1f04b781fe00c30a805ebc81c555f2820406ceb14ec66b622093d61ddc7605b430533316dd5dc00b9e305c1d19e40 WHIRLPOOL a413c2e5e5589b4769c4cc1a0ea31fa7a1e79f135708ef7deae14dd537a7d3f8b4ba4a159200e0a86b24195fcd3e6b323f6a3d07fbdcb1bd64116ffdf49dbac5
+EBUILD jameica-9999.ebuild 2330 SHA256 ce80448b818f939a54a3c9c7ad2c49e61625a041de6afe587d6b29f3ed176065 SHA512 57fc9aee8fd932559185517f698f5d36aedffb85995a07c211a4a9e07299fdff18f088d553324f40d0b5d32327cfccbf91cfb5ea2909b10b7d986f6041585e8c WHIRLPOOL 4f8f674921d2e375f4dea149380ba12a8a8f752feffbbe984c2b27656a9162e0f4bc7a097448a029b7eb45448396af968588d07e1327b48915ff2d35a700f121
diff --git a/dev-java/jameica/jameica-2.6.1.ebuild b/dev-java/jameica/jameica-2.6.1.ebuild
deleted file mode 100644
index 599fa83..0000000
--- a/dev-java/jameica/jameica-2.6.1.ebuild
+++ /dev/null
@@ -1,90 +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 Java Framework and Runtime Environment"
-HOMEPAGE="http://www.willuhn.de/products/jameica/"
-SRC_URI="http://www.willuhn.de/products/${PN}/releases/${MY_PV}/${PN}/${PN}.src.zip -> ${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-COMMON_DEP="~dev-java/willuhn-util-${MY_PV}
- ~dev-java/willuhn-datasource-${MY_PV}_p20131229
- >=dev-java/nanoxml-2.2.3
- >=dev-java/velocity-1.5
- >=dev-java/xmlrpc-3.1
- >=dev-java/commons-cli-1.1
- >=dev-java/commons-collections-3.2.1
- >=dev-java/commons-lang-2.6
- >=dev-java/commons-logging-1.1.1
- dev-java/swtcalendar
- >=dev-java/bcprov-1.44
- >=dev-java/h2-1.2.145
- >=dev-java/commons-lang-2.6
- >=dev-java/swt-paperclips-1.0.4
- dev-java/eclipse-jface:3.1
- dev-java/eclipse-core-runtime:3.1
- dev-java/eclipse-osgi:3.1
- dev-java/eclipse-ui-forms:3.1"
-
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.5
- app-arch/unzip
- ${COMMON_DEP}"
-
-S=${WORKDIR}/${PN}
-
-java_prepare() {
- #rm -vr ${S}/lib/*
- cd ${S}/lib
-
- rm -vr apache_xmlrpc bouncycastle de_willuhn_ds de_willuhn_util h2 jakarta_commons mckoi mysql nanoxml paperclips splash.jar swtcalendar velocity
- #rm -vr swt/linux swt/linux64 swt/macos swt/macos64 swt/win32 swt/win64
-
- mkdir gentoo
- local xmlrpc
- xmlrpc="xmlrpc"
- if has_version ">=dev-java/xmlrpc-3"; then
- #TODO: How to reference slot instead of version ?
- 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"
-
- java-pkg_jar-from --with-dependencies --into gentoo "${EANT_GENTOO_CLASSPATH}"
-}
-
-src_compile() {
- eant -f build/build.xml jar $(use_doc javadoc)
-}
-
-src_install() {
- java-pkg_newjar releases/${PV}-0/jameica/jameica.jar
-
- #java-pkg_newjar lib/swt/org.eclipse.core.runtime*.jar org.eclipse.core.runtime.jar
- #java-pkg_newjar lib/swt/org.eclipse.jface*.jar org.eclipse.jface.jar
- #java-pkg_newjar lib/swt/org.eclipse.osgi*.jar org.eclipse.osgi.jar
- #java-pkg_newjar lib/swt/org.eclipse.ui.forms*.jar org.eclipse.ui.forms.jar
- java-pkg_newjar lib/swt/linux64/swt.jar swt.jar
-
- insinto /usr/share/${PN}
- doins plugin.xml
- dodir /usr/share/${PN}/plugins
-
- java-pkg_dolauncher ${PN} --main de.willuhn.jameica.Main --pwd /usr/share/jameica/
-
- newicon build/${PN}-icon.png ${PN}-icon.png || die "newicon failed"
- make_desktop_entry jameica "Jameica" ${PN}-icon "Office;Finance"
-
- use doc && java-pkg_dojavadoc releases/${PV}-0/javadoc
- use source && java-pkg_dosrc src/de
-}
diff --git a/dev-java/jameica/jameica-2.6.2.ebuild b/dev-java/jameica/jameica-9999.ebuild
index 468e534..5621249 100644
--- a/dev-java/jameica/jameica-2.6.2.ebuild
+++ b/dev-java/jameica/jameica-9999.ebuild
@@ -1,55 +1,57 @@
-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/${PN}/releases/${MY_PV}/${PN}/${PN}.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/jameica.git"
+ MY_PV="9999"
+fi
DESCRIPTION="A Java Framework and Runtime Environment"
HOMEPAGE="http://www.willuhn.de/products/jameica/"
-SRC_URI="http://www.willuhn.de/products/${PN}/releases/${MY_PV}/${PN}/${PN}.src.zip -> ${P}.zip"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~x86 ~amd64"
IUSE=""
COMMON_DEP="~dev-java/willuhn-util-${MY_PV}
- ~dev-java/willuhn-datasource-${MY_PV}_p20131229
+ ~dev-java/willuhn-datasource-${MY_PV}
>=dev-java/nanoxml-2.2.3
- >=dev-java/velocity-1.5
- >=dev-java/xmlrpc-3.1
- >=dev-java/commons-cli-1.1
+ >=dev-java/velocity-1.7
+ >=dev-java/xmlrpc-3.1.3
+ >=dev-java/commons-cli-1.2
>=dev-java/commons-collections-3.2.1
>=dev-java/commons-lang-2.6
- >=dev-java/commons-logging-1.1.1
+ >=dev-java/commons-logging-1.2
dev-java/swtcalendar
dev-java/bcprov:1.45
>=dev-java/h2-1.2.145
- >=dev-java/commons-lang-2.6
>=dev-java/swt-paperclips-1.0.4
+ dev-java/swt:4.2
dev-java/eclipse-jface:3.1
dev-java/eclipse-core-runtime:3.1
dev-java/eclipse-osgi:3.1
dev-java/eclipse-ui-forms:3.1"
-RDEPEND=">=virtual/jre-1.5
+RDEPEND=">=virtual/jre-1.6
${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
+DEPEND=">=virtual/jdk-1.6
app-arch/unzip
- ${COMMON_DEP}"
-
-S=${WORKDIR}/${PN}
+ ${COMMON_DEP}"
java_prepare() {
- #rm -vr ${S}/lib/*
+ rm -vr ${S}/lib/*
cd ${S}/lib
- rm -vr apache_xmlrpc bouncycastle de_willuhn_ds de_willuhn_util h2 jakarta_commons mckoi mysql nanoxml paperclips splash.jar swtcalendar velocity
- #rm -vr swt/linux swt/linux64 swt/macos swt/macos64 swt/win32 swt/win64
-
mkdir gentoo
local xmlrpc
xmlrpc="xmlrpc"
@@ -58,7 +60,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-1.45,h2,swt-paperclips,eclipse-jface-3.1,eclipse-osgi-3.1,eclipse-ui-forms-3.1,eclipse-core-runtime-3.1"
+ EANT_GENTOO_CLASSPATH="swt-4.2,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}"
}
@@ -68,18 +70,12 @@ src_compile() {
}
src_install() {
- java-pkg_newjar releases/${PV}-0/jameica/jameica.jar
-
- #java-pkg_newjar lib/swt/org.eclipse.core.runtime*.jar org.eclipse.core.runtime.jar
- #java-pkg_newjar lib/swt/org.eclipse.jface*.jar org.eclipse.jface.jar
- #java-pkg_newjar lib/swt/org.eclipse.osgi*.jar org.eclipse.osgi.jar
- #java-pkg_newjar lib/swt/org.eclipse.ui.forms*.jar org.eclipse.ui.forms.jar
- java-pkg_newjar lib/swt/linux64/swt.jar swt.jar
+ java-pkg_newjar releases/*/jameica/jameica.jar
insinto /usr/share/${PN}
doins plugin.xml
dodir /usr/share/${PN}/plugins
-
+
java-pkg_dolauncher ${PN} --main de.willuhn.jameica.Main --pwd /usr/share/jameica/
newicon build/${PN}-icon.png ${PN}-icon.png || die "newicon failed"
diff --git a/dev-java/mckoi/Manifest b/dev-java/mckoi/Manifest
deleted file mode 100644
index f41e3dd..0000000
--- a/dev-java/mckoi/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX build.xml 1453 SHA256 74b038a3e87ece9cc5195b5380dd64cf2e8cab6a59c82fb9b0275ae89cb8860e SHA512 3944163ea5bcce0e95d83c5133cdedcc2f5fce2d5a0378f8581454e879c185e34282066c4618da474de4c746440d741d1227c382baa87c119ec58affb22fec30 WHIRLPOOL 10ee98538a26a6c317fb3bc40c298cac0b945249082f5099ff3304800281a74b3190692d1c2108205283ef61d1950d8921133d1c39a3e3e1ed36c8292f9ada8c
-AUX mckoi-1.0.3-jikes.patch 1728 SHA256 d3f658c8c55cb54250717968bfb80626fd92d1082e61b2364732889dc2c6b584 SHA512 f82a5e79d038148d73de80d77547d0591138aabcbdb627c75bc8dbc6ecc6fd332839e0c9cb54a48f3a5e564422a599275258593663706f700aebc0f0de2992ca WHIRLPOOL 306bd6d79c8c73597650c2369586911b1aa55d57dac1736f882c557e471cb5da57c1862596a97d4d84589aefb50a6491dca7d7dae3e9d1c9931f253dc1b4b1f5
-DIST mckoi1.0.3.zip 2192577 SHA256 ffe54237dcdee9752489530347830a752a5606d7d5e97c2d395bf83355bee8df SHA512 37e654e5b801329e06d0d194f95298a78e8f8fde82c0e6b93bc3dc62476b0c34c4c370687948c6b631f2cc75287e144bf669b668ad3e0112e9ebf6a06c9e53d0 WHIRLPOOL 0cc7933fd106a97a22824c1386417fe1de4f0469d4b634b8239505916e921c1b043673d10d8814a4f263b16ce07f7226e82c712fb0dec0b9d30925fba0803583
-EBUILD mckoi-1.0.3-r2.ebuild 1302 SHA256 bd467e1dfcbe6dbadde9f934d4228efcf2dbd7409903926a828676b8c7afe747 SHA512 c070a8c175faa45ad6a3f4dc2af57b8632d4d590831901551c5ba08a5c40dcd02ecc0ec18f72a701d8c51975f2665a70bcc5ad32fe32a170f4a88b6cf4b91f14 WHIRLPOOL 0e7711f6412bd977ddcd370136bd8a0a7bbf2c11ee2988d3c6bcb46b3d9c4d61eaebcee99d39b763f2830a212756a1e7063b154610e055fd5f19926cc1a356fc
-MISC metadata.xml 16133 SHA256 8a94c3e189e5842a65108632f1d96bbf9eb3c9ecee659885dde2f4802eb1eb65 SHA512 917c64e77e5d44a1c06d05bd78d769c0c3418c630c5d83d92e2507c90ad438de0ca121d240a9857cd38bf9f5a6276c2f6345b21fe2eebd747eaa6334069194a5 WHIRLPOOL c6d6560e0fce0aab0c09ed5824bf86d17eb264204e32e9807740900728dd661656ddeb98849135d879d357bd130e0629c6ebfb996e3b8bac73e8f549a6c06fd0
diff --git a/dev-java/mckoi/files/build.xml b/dev-java/mckoi/files/build.xml
deleted file mode 100644
index 48950ac..0000000
--- a/dev-java/mckoi/files/build.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="mckoi" default="jar">
- <!-- some properties -->
- <property name="src.dir" value="src" />
- <property name="build.dir" value="build" />
- <property name="docs.dir" value="docs/api" />
- <property name="dist.dir" value="dist" />
- <property name="jarfile" value="${dist.dir}/mckoidb.jar" />
- <property name="target.jdk" value="1.4" />
- <property file="build.properties" />
-
- <!-- init -->
- <target name="init">
- <mkdir dir="${dist.dir}" />
- <mkdir dir="${build.dir}" />
- <mkdir dir="${docs.dir}" />
- </target>
-
- <!-- compile everything -->
- <target name="compile" depends="init">
- <mkdir dir="${build.dir}" />
- <javac srcdir="${src.dir}"
- destdir="${build.dir}"
- source="${target.jdk}"
- target="${target.jdk}">
- <classpath>
- <pathelement path="${gnu-regexp.jar}" />
- </classpath>
- </javac>
- </target>
-
- <!-- build the jar file -->
- <target name="jar" depends="compile">
- <jar jarfile="${jarfile}" basedir="${build.dir}" />
- </target>
-
- <!-- generate javadocs -->
- <target name="docs" depends="init">
- <javadoc sourcepath="${src.dir}"
- packagenames="com.*"
- destdir="${docs.dir}"
- author="true"
- version="true"
- use="true"
- windowtitle="${ant.project.name} API" />
- </target>
-
- <!-- clean up -->
- <target name="clean">
- <delete dir="${build.dir}" />
- <delete dir="${docs.dir}" />
- <delete dir="${dist.dir}" />
- </target>
-</project>
diff --git a/dev-java/mckoi/files/mckoi-1.0.3-jikes.patch b/dev-java/mckoi/files/mckoi-1.0.3-jikes.patch
deleted file mode 100644
index 1733407..0000000
--- a/dev-java/mckoi/files/mckoi-1.0.3-jikes.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ur mckoi1.0.3.orig/src/com/mckoi/store/JournalledSystem.java mckoi1.0.3/src/com/mckoi/store/JournalledSystem.java
---- mckoi1.0.3.orig/src/com/mckoi/store/JournalledSystem.java 2004-08-15 22:14:58.000000000 +0200
-+++ mckoi1.0.3/src/com/mckoi/store/JournalledSystem.java 2004-12-20 13:19:07.808868672 +0100
-@@ -1047,7 +1047,7 @@
- /**
- * The journal file.
- */
-- private final JournalFile journal;
-+ private final com.mckoi.store.JournalledSystem.JournalFile journal;
-
- /**
- * The position in the journal file.
-@@ -1069,7 +1069,7 @@
- /**
- * Constructs the entry.
- */
-- public JournalEntry(String resource_name, JournalFile journal,
-+ public JournalEntry(String resource_name, com.mckoi.store.JournalledSystem.JournalFile journal,
- long position, long page_number) {
- this.resource_name = resource_name;
- this.journal = journal;
-@@ -1080,7 +1080,7 @@
- /**
- * Returns the journal file for this entry.
- */
-- public JournalFile getJournalFile() {
-+ public com.mckoi.store.JournalledSystem.JournalFile getJournalFile() {
- return journal;
- }
-
-@@ -1716,7 +1716,7 @@
- /**
- * The JournalFile object that is a summary of.
- */
-- JournalFile journal_file;
-+ com.mckoi.store.JournalledSystem.JournalFile journal_file;
-
- /**
- * True if the journal is recoverable (has one or more complete check
-@@ -1737,7 +1737,7 @@
- /**
- * Constructor.
- */
-- public JournalSummary(JournalFile journal_file) {
-+ public JournalSummary(com.mckoi.store.JournalledSystem.JournalFile journal_file) {
- this.journal_file = journal_file;
- }
-
diff --git a/dev-java/mckoi/mckoi-1.0.3-r2.ebuild b/dev-java/mckoi/mckoi-1.0.3-r2.ebuild
deleted file mode 100644
index f49f11d..0000000
--- a/dev-java/mckoi/mckoi-1.0.3-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-JAVA_PKG_IUSE="doc examples source"
-JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Mckoi Java SQL Database System"
-HOMEPAGE="http://mckoi.com/database/"
-SRC_URI="http://www.mckoi.com/database/ver/${P/-/}.zip"
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="amd64 x86"
-IUSE=""
-COMMON_DEP="=dev-java/gnu-regexp-1.1*"
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
- app-arch/unzip
- ${COMMON_DEP}"
-
-S="${WORKDIR}/${P/-/}"
-
-# uses enum as identifier
-JAVA_PKG_WANT_SOURCE="1.4"
-JAVA_PKG_WANT_TARGET="1.4"
-
-src_unpack() {
- default
- cd "${S}"
- unpack ./src.zip
-}
-
-java_prepare() {
- epatch "${FILESDIR}/${P}-jikes.patch"
-
- cp "${FILESDIR}/build.xml" . || die
- java-ant_rewrite-classpath
- java-ant_rewrite-bootclasspath 1.5
-
- rm -v gnu-regexp-*
- rm -v *.jar
- find demo -name '*.class' -delete
- # some contrib stuff depending on jboss
- rm -rf src/net
-}
-
-EANT_DOC_TARGET="docs"
-EANT_GENTOO_CLASSPATH="gnu-regexp-1"
-
-src_install() {
- java-pkg_dojar dist/mckoidb.jar
-
- dodoc README.txt db.conf
-
- # apidocs are in expected place
- use doc && java-pkg_dohtml -r docs/*
- use examples && java-pkg_doexamples demo
- use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/mckoi/metadata.xml b/dev-java/mckoi/metadata.xml
deleted file mode 100644
index 48057bf..0000000
--- a/dev-java/mckoi/metadata.xml
+++ /dev/null
@@ -1,252 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>repo/gentoo.git - Gentoo Portage tree (formerly known as gentoo-x86 in CVS)</title>
-<meta name='generator' content='cgit v0.11.2'/>
-<meta name='robots' content='index,follow'/>
-<link rel='stylesheet' type='text/css' href='/cgit.css'/>
-<link rel='shortcut icon' href='//www.gentoo.org/favicon.ico'/>
-<link rel='alternate' title='Atom feed' href='https://gitweb.gentoo.org/repo/gentoo.git/atom/dev-java/mckoi/metadata.xml?h=master' type='application/atom+xml'/>
-<link rel='vcs-git' href='git://anongit.gentoo.org/repo/gentoo.git' title='repo/gentoo.git Git repository'/>
-<link rel='vcs-git' href='https://anongit.gentoo.org/git/repo/gentoo.git' title='repo/gentoo.git Git repository'/>
-<link rel='vcs-git' href='http://anongit.gentoo.org/git/repo/gentoo.git' title='repo/gentoo.git Git repository'/>
-<link rel='vcs-git' href='git+ssh://git@git.gentoo.org/repo/gentoo.git' title='repo/gentoo.git Git repository'/>
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<meta name="theme-color" content="#54487a">
-<meta name="description" content="The Gentoo Git repositories">
-<link href="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/bootstrap.min.css" rel="stylesheet" media="screen">
-<link href="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/tyrian.min.css" rel="stylesheet" media="screen">
-
-</head>
-<body>
-<header>
- <div class="site-title">
- <div class="container">
- <div class="row">
- <div class="site-title-buttons">
- <div class="btn-group btn-group-sm">
- <a href="http://get.gentoo.org/" role="button" class="btn get-gentoo"><span class="fa fa-download"></span> <strong>Get Gentoo!</strong></a>
- <div class="btn-group btn-group-sm">
- <a class="btn gentoo-org-sites dropdown-toggle" data-toggle="dropdown" data-target="#" href="#">
- <span class="glyphicon glyphicon-globe"></span> gentoo.org sites <span class="caret"></span>
- </a>
- <ul class="dropdown-menu">
- <li><a href="http://www.gentoo.org/" title="Main Gentoo website"><span class="fa fa-home fa-fw"></span> gentoo.org</a></li>
- <li><a href="http://wiki.gentoo.org/" title="Find and contribute documentation"><span class="fa fa-file-text fa-fw"></span> Wiki</a></li>
- <li><a href="https://bugs.gentoo.org/" title="Report issues and find common issues"><span class="fa fa-bug fa-fw"></span> Bugs</a></li>
- <li><a href="http://forums.gentoo.org/" title="Discuss with the community"><span class="fa fa-comments-o fa-fw"></span> Forums</a></li>
- <li><a href="http://packages.gentoo.org/" title="Find software for your Gentoo"><span class="fa fa-hdd-o fa-fw"></span> Packages</a></li>
- <li class="divider"></li>
- <li><a href="http://overlays.gentoo.org/" title="Collaborate on maintaining packages"><span class="fa fa-code-fork fa-fw"></span> Overlays</a></li>
- <li><a href="http://planet.gentoo.org/" title="Find out what's going on in the developer community"><span class="fa fa-rss fa-fw"></span> Planet</a></li>
- <li><a href="http://archives.gentoo.org/" title="Read up on past discussions"><span class="fa fa-archive fa-fw"></span> Archives</a></li>
- <li><a href="http://sources.gentoo.org/" title="Browse our source code"><span class="fa fa-code fa-fw"></span> Sources</a></li>
- <li class="divider"></li>
- <li><a href="http://infra-status.gentoo.org/" title="Get updates on the services provided by Gentoo"><span class="fa fa-tasks fa-fw"></span> Infra Status</a></li>
- </ul>
- </div>
- </div>
- </div>
- <div class="logo">
- <img src="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/site-logo.png" data-at2x="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/site-logo@2x.png" alt="Gentoo Linux Logo" />
- <span class="site-label">GitWeb</span>
- </div>
- </div>
- </div>
- </div>
- <nav class="tyrian-navbar" role="navigation">
- <div class="container">
- <div class="row">
- <div class="navbar-header">
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-main-collapse">
- <span class="sr-only">Toggle navigation</span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- </div>
- <div class="collapse navbar-collapse navbar-main-collapse">
- <ul class="nav navbar-nav">
- <li><a href="/">Home</a></li>
- <li><a href="/dev/">Developer Overlays</a></li>
- <li><a href="/proj/">Projects</a></li>
- <li><a href="/user/">User Overlays</a></li>
- </ul>
- </div>
- </div>
- </div>
- </nav>
-</header>
-
-<div class="container">
- <div class="row">
- <div class="col-md-12">
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/'><img src='/cgit.png' alt='cgit logo'/></a></td>
-<td class='main'><a href='/'>index</a> : <a title='repo/gentoo.git' href='/repo/gentoo.git/'>repo/gentoo.git</a></td><td class='form'><form method='get' action=''>
-<input type='hidden' name='id' value='1dccbff0478370fa30c4c32871235437e48fa3f3'/><select name='h' onchange='this.form.submit();'>
-<option value='git-r3_support_any_refs'>git-r3_support_any_refs</option>
-<option value='master' selected='selected'>master</option>
-<option value='project/libressl'>project/libressl</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>Gentoo Portage tree (formerly known as gentoo-x86 in CVS)</td><td class='sub right'>Infrastructure team &lt;infrastructure@gentoo.org&gt;</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/repo/gentoo.git/'>summary</a><a href='/repo/gentoo.git/refs/?id=1dccbff0478370fa30c4c32871235437e48fa3f3'>refs</a><a href='/repo/gentoo.git/log/dev-java/mckoi/metadata.xml'>log</a><a class='active' href='/repo/gentoo.git/tree/dev-java/mckoi/metadata.xml?id=1dccbff0478370fa30c4c32871235437e48fa3f3'>tree</a><a href='/repo/gentoo.git/commit/dev-java/mckoi/metadata.xml?id=1dccbff0478370fa30c4c32871235437e48fa3f3'>commit</a><a href='/repo/gentoo.git/diff/dev-java/mckoi/metadata.xml?id=1dccbff0478370fa30c4c32871235437e48fa3f3'>diff</a></td><td class='form'><form class='right' method='get' action='/repo/gentoo.git/log/dev-java/mckoi/metadata.xml'>
-<input type='hidden' name='id' value='1dccbff0478370fa30c4c32871235437e48fa3f3'/><select name='qt'>
-<option value='grep'>log msg</option>
-<option value='author'>author</option>
-<option value='committer'>committer</option>
-<option value='range'>range</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input type='submit' value='search'/>
-</form>
-</td></tr></table>
-<div class='path'>path: <a href='/repo/gentoo.git/tree/?id=1dccbff0478370fa30c4c32871235437e48fa3f3'>root</a>/<a href='/repo/gentoo.git/tree/dev-java?id=1dccbff0478370fa30c4c32871235437e48fa3f3'>dev-java</a>/<a href='/repo/gentoo.git/tree/dev-java/mckoi?id=1dccbff0478370fa30c4c32871235437e48fa3f3'>mckoi</a>/<a href='/repo/gentoo.git/tree/dev-java/mckoi/metadata.xml?id=1dccbff0478370fa30c4c32871235437e48fa3f3'>metadata.xml</a></div><div class='content'>blob: 0e55c8cf810a2427f4350b7cc0261c8a66cae30d (<a href='/repo/gentoo.git/plain/dev-java/mckoi/metadata.xml?id=1dccbff0478370fa30c4c32871235437e48fa3f3'>plain</a>)
-<table summary='blob content' class='blob'>
-<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
-<a id='n2' href='#n2'>2</a>
-<a id='n3' href='#n3'>3</a>
-<a id='n4' href='#n4'>4</a>
-<a id='n5' href='#n5'>5</a>
-<a id='n6' href='#n6'>6</a>
-<a id='n7' href='#n7'>7</a>
-<a id='n8' href='#n8'>8</a>
-<a id='n9' href='#n9'>9</a>
-<a id='n10' href='#n10'>10</a>
-<a id='n11' href='#n11'>11</a>
-<a id='n12' href='#n12'>12</a>
-<a id='n13' href='#n13'>13</a>
-<a id='n14' href='#n14'>14</a>
-<a id='n15' href='#n15'>15</a>
-<a id='n16' href='#n16'>16</a>
-<a id='n17' href='#n17'>17</a>
-<a id='n18' href='#n18'>18</a>
-</pre></td>
-<td class='lines'><pre><code><style>.highlight .hll { background-color: #ffffcc }
-.highlight { background: #ffffff; }
-.highlight .c { color: #888888 } /* Comment */
-.highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */
-.highlight .k { color: #008800; font-weight: bold } /* Keyword */
-.highlight .cm { color: #888888 } /* Comment.Multiline */
-.highlight .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */
-.highlight .c1 { color: #888888 } /* Comment.Single */
-.highlight .cs { color: #cc0000; font-weight: bold; background-color: #fff0f0 } /* Comment.Special */
-.highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
-.highlight .ge { font-style: italic } /* Generic.Emph */
-.highlight .gr { color: #aa0000 } /* Generic.Error */
-.highlight .gh { color: #333333 } /* Generic.Heading */
-.highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
-.highlight .go { color: #888888 } /* Generic.Output */
-.highlight .gp { color: #555555 } /* Generic.Prompt */
-.highlight .gs { font-weight: bold } /* Generic.Strong */
-.highlight .gu { color: #666666 } /* Generic.Subheading */
-.highlight .gt { color: #aa0000 } /* Generic.Traceback */
-.highlight .kc { color: #008800; font-weight: bold } /* Keyword.Constant */
-.highlight .kd { color: #008800; font-weight: bold } /* Keyword.Declaration */
-.highlight .kn { color: #008800; font-weight: bold } /* Keyword.Namespace */
-.highlight .kp { color: #008800 } /* Keyword.Pseudo */
-.highlight .kr { color: #008800; font-weight: bold } /* Keyword.Reserved */
-.highlight .kt { color: #888888; font-weight: bold } /* Keyword.Type */
-.highlight .m { color: #0000DD; font-weight: bold } /* Literal.Number */
-.highlight .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */
-.highlight .na { color: #336699 } /* Name.Attribute */
-.highlight .nb { color: #003388 } /* Name.Builtin */
-.highlight .nc { color: #bb0066; font-weight: bold } /* Name.Class */
-.highlight .no { color: #003366; font-weight: bold } /* Name.Constant */
-.highlight .nd { color: #555555 } /* Name.Decorator */
-.highlight .ne { color: #bb0066; font-weight: bold } /* Name.Exception */
-.highlight .nf { color: #0066bb; font-weight: bold } /* Name.Function */
-.highlight .nl { color: #336699; font-style: italic } /* Name.Label */
-.highlight .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */
-.highlight .py { color: #336699; font-weight: bold } /* Name.Property */
-.highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */
-.highlight .nv { color: #336699 } /* Name.Variable */
-.highlight .ow { color: #008800 } /* Operator.Word */
-.highlight .w { color: #bbbbbb } /* Text.Whitespace */
-.highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */
-.highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */
-.highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */
-.highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */
-.highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */
-.highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */
-.highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */
-.highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */
-.highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */
-.highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */
-.highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */
-.highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */
-.highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */
-.highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */
-.highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */
-.highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */
-.highlight .vc { color: #336699 } /* Name.Variable.Class */
-.highlight .vg { color: #dd7700 } /* Name.Variable.Global */
-.highlight .vi { color: #3333bb } /* Name.Variable.Instance */
-.highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */</style><div class="highlight"><pre><span class="cp">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;</span>
-<span class="cp">&lt;!DOCTYPE pkgmetadata SYSTEM &quot;http://www.gentoo.org/dtd/metadata.dtd&quot;&gt;</span>
-<span class="nt">&lt;pkgmetadata&gt;</span>
-<span class="nt">&lt;herd&gt;</span>java<span class="nt">&lt;/herd&gt;</span>
-<span class="nt">&lt;longdescription&gt;</span>
-Mckoi SQL Database is an SQL (Structured Query Language) Database
-management system written for the JavaTM platform. Mckoi SQL Database is
-optimized to run as a client/server database server for multiple
-clients, however it can also be embedded in an application as a
-stand-alone database. It is highly multi-threaded and features an
-extendable object-oriented engine.
-
-Mckoi SQL Database started as an internal project and has since evolved
-from its inception in 1998. The main goals of the project are a code
-base that is simple to maintain and extend, ease of use and
-administration, robustness, multiple concurrent access, and performance.
-<span class="nt">&lt;/longdescription&gt;</span>
-<span class="nt">&lt;/pkgmetadata&gt;</span>
-</pre></div>
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
- </div>
- </div>
- </div>
- </div>
-
- <footer>
- <div class="container">
- <div class="row">
- <div class="col-xs-12 col-md-offset-2 col-md-7">
- <p class="spacer">
- </p>
- </div>
- <div class="col-xs-12 col-md-3">
- <h3 class="footerhead">Questions or comments?</h3>
- Please feel free to <a href="http://www.gentoo.org/main/en/contact.xml">contact us</a>.
- </div>
- </div>
- <div class="row">
- <div class="col-xs-2 col-sm-3 col-md-2">
- <ul class="footerlinks three-icons">
- <li><a href="http://twitter.com/gentoo" title="@Gentoo on Twitter"><span class="fa fa-twitter fa-fw"></span></a></li>
- <li><a href="https://plus.google.com/+Gentoo" title="+Gentoo on Google+"><span class="fa fa-google-plus fa-fw"></span></a></li>
- <li><a href="https://www.facebook.com/gentoo.org" title="Gentoo on Facebook"><span class="fa fa-facebook fa-fw"></span></a></li>
- </ul>
- </div>
- <div class="col-xs-10 col-sm-9 col-md-10">
- <strong>&copy; 2001&ndash;2015 Gentoo Foundation, Inc.</strong><br />
- <small>
- Gentoo is a trademark of the Gentoo Foundation, Inc.
- The contents of this document, unless otherwise expressly stated, are licensed under the
- <a href="http://creativecommons.org/licenses/by-sa/3.0/" rel="license">CC-BY-SA-3.0</a> license.
- The <a href="http://www.gentoo.org/main/en/name-logo.xml">Gentoo Name and Logo Usage Guidelines</a> apply.
- </small>
- </div>
- </div>
- </div>
- </footer>
-
- <script src="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/jquery.min.js"></script>
- <script src="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/bootstrap.min.js"></script>
- <script src="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/retina.min.js"></script>
-</div> <!-- id=cgit -->
-</body>
-</html>
diff --git a/dev-java/nekohtml/Manifest b/dev-java/nekohtml/Manifest
deleted file mode 100644
index 1d91e49..0000000
--- a/dev-java/nekohtml/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX nekohtml-1.9.16-remove-obsolete-xerces-bridges.patch 533 SHA256 9d72da5a1b4281fb83514db33c471e70dbf91c1e0c9bcdbb9e41a5049ffa2bed SHA512 21c077f13c5157928f6cdc1be45f729e05b42d5b33cae7394d0d8c1167045f27e8baab89a5aefe33b907d1c3e2146030ee54a48da6d1a3bdde6c75f729dc7937 WHIRLPOOL c15097c889a72e511d8c2e6306f35b54821a7c983a0d995aa4d11d739002f4a2bd5c1512eb1002014dd21fe80650181e3f8bfa4b1ce1370eacff39b1d22673bc
-DIST nekohtml-1.9.16.tar.gz 9091262 SHA256 292437dd7e88785aa921faf502316cadd789496334ba01affe96c8f3ee06e011 SHA512 d71a08e6d7a7a509b00dc5ec2d539a855b9a803c83ec0674b4b2231b1ed40079244dd462917d700406a75cdf9821a1b866a19704be4ce02e48ceec42154f54a8 WHIRLPOOL 7cd844a51300b642e86b90ead1e4ff9e1310aa279c7cae40bee68f1cb68364fd6a76b9119e91dc9025b372358d77ad677fb544c993a2fd9f0c0309af52054add
-EBUILD nekohtml-1.9.16.ebuild 1258 SHA256 50676a35c1c727fb77433571ef6d9bd914927cfac8302c4ea65e7519ef26a9bc SHA512 fabcfb2a6a97a5317264bee0589c037abce46d049982bf060415e17f40d7af4cd203357b1cbe27bacb340e38f9b4a2ade454f9d95cba9f0632db890beae2315d WHIRLPOOL e118f8aa6d070edee053854d40901c660326488724d584393a969a4599b61be7cfc8759627df66b1a663a9b9037c7feb4a09212cc3e4736d545cbe5bf66efaf3
diff --git a/dev-java/nekohtml/files/nekohtml-1.9.16-remove-obsolete-xerces-bridges.patch b/dev-java/nekohtml/files/nekohtml-1.9.16-remove-obsolete-xerces-bridges.patch
deleted file mode 100644
index 2f4a6c6..0000000
--- a/dev-java/nekohtml/files/nekohtml-1.9.16-remove-obsolete-xerces-bridges.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru /tmp/nekohtml-1.9.16.orig/build.xml ./build.xml
---- /tmp/nekohtml-1.9.16.orig/build.xml 2012-07-31 18:12:48.559950104 +0300
-+++ ./build.xml 2012-07-31 18:12:53.887883123 +0300
-@@ -103,8 +103,6 @@
- unless="compile.skip">
- <mkdir dir="${build.classes.dir}"/>
-
-- <compileWith xercesVersion="2.0.2" bridge="2_0"/>
-- <compileWith xercesVersion="2.1.0" bridge="2_1"/>
- <compileWith xercesVersion="2.2.1" bridge="2_2"/>
- <compileWith xercesVersion="2.3.0" bridge="2_3"/>
- <compileWith xercesVersion="2.8.1" bridge="2_3"/>
diff --git a/dev-java/nekohtml/nekohtml-1.9.16.ebuild b/dev-java/nekohtml/nekohtml-1.9.16.ebuild
deleted file mode 100644
index d11207f..0000000
--- a/dev-java/nekohtml/nekohtml-1.9.16.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/nekohtml/nekohtml-1.9.6.ebuild,v 1.6 2012/07/05 19:50:21 sera Exp $
-
-EAPI="4"
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="A simple HTML scanner and tag balancer using standard XML interfaces."
-
-HOMEPAGE="http://nekohtml.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="Apache-2.0"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-COMMON_DEP=">=dev-java/xerces-2.7"
-DEPEND=">=virtual/jdk-1.4
- test? ( =dev-java/junit-3.8* )
- ${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEP}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="xerces-2"
-
-#do not generate docs, use bundled
-EANT_DOC_TARGET=""
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-remove-obsolete-xerces-bridges.patch
- find . -iname '*.jar' -delete
-}
-
-src_test() {
- ANT_TASKS="ant-junit" \
- EANT_GENTOO_CLASSPATH="xerces-2 junit" \
- eant test
-}
-
-src_install() {
- java-pkg_dojar build/lib/${PN}.jar
-
- if use doc; then
- java-pkg_dojavadoc --symlink javadoc doc/javadoc
- dohtml doc/*
- fi
-
- use source && java-pkg_dosrc ./src/org
- use examples && java-pkg_doexamples src/sample
-}
diff --git a/dev-java/obantoo/Manifest b/dev-java/obantoo/Manifest
index 74ca0c4..9263d3d 100644
--- a/dev-java/obantoo/Manifest
+++ b/dev-java/obantoo/Manifest
@@ -1,7 +1,3 @@
AUX 1.4.11-hibiscus-encoding.patch 4967 SHA256 b0b60b1aac782df8d89e3e6773480d776c623ed0434eb2ca419b90fd7e8a7278 SHA512 3392cd972e6ced619efce7583e521999d34584ac5cda4a5b2beafbeacf84c9d16eb2f51c966ba6ac28055f14d61095bfe78e8f724083fe67a9c38b522b4b65f1 WHIRLPOOL 2e8f7574647cccba0632190d64dc99cb46608f497d4ff59c8d717f94e4af2d3be14e2fd56e6233892f6078aa121a33f22359ef2235904a036f2593b35ffb485f
-DIST obantoo-1.5.1.zip 283790 SHA256 20d335034c3c56c8d8c4bde522f727dc7f99e8725997549b0323cb4495514a41 SHA512 d6616a0100b6fc028c051b84f99cf2dc83d26462bf598ac6301e8874c257417a2f1ae57a23352ab0710843772d0358a854ed7b678546ba6a5a316d924bfd4206 WHIRLPOOL b0b0019d6ab1a4eddf348f6269d9e4010c3d5c72eab5598be0f5b90bf9fa92020e6cf2b644e3fba08fa71d0f56a577471ec33823729edc39092429d10e5c8507
-DIST obantoo-1.5.2.zip 291683 SHA256 0da4ad09283197f87bca6a96fcf67b3bf695d7e70c30d00ce526ee30fc2795e0 SHA512 0566a8aa6fa716c609d383491c92d45bcff3d94d9a02ea360bd8668090967d78247c2845d0e5b5e3039761074da0b3195d27a8dca4e6c076dd645857881206d8 WHIRLPOOL f816cdee9d2040bbf5a0814e10f12607a9d0bb4cc9d925d8ee9bd47072a957ce81053e7568d612f646a3ed0171f12fcf6fe873368023681a9e525551b785971d
-EBUILD obantoo-1.5.1.ebuild 973 SHA256 7f4033de1874b09fcb1b0ecad853d29bea09a36a6ff280ab190de96de6575c78 SHA512 c84753cfa37dc1697ea919972ad4bc006bb3b755aaf1e0c99722803713713657bf5b598fab601d24c7a0233f4da953b7b2857c06e76c96aaad986e8306fced00 WHIRLPOOL a6a77170504bc30f32a8f0d93ac6a7c6d6157faaf0d8d7de7460e153b3cd7173d39b04ba4188353f6294f7baf8eaad813d1a54f55eefb71c6b403c59f48d9564
-EBUILD obantoo-1.5.2.ebuild 975 SHA256 f34236fa29bf9e1eb38533d7a5642c09629d2e6a4d013e43a1ada023d774155e SHA512 e1b53ba6144d936751c7156b9207e72edfad2ae5c4560aca9d6f04a9106d59f02c8fc9da92034be165d5a46529056bfe84d7d22c1b66ccf0573733f8f930966d WHIRLPOOL a8fc6deb991451bea9beeaeb6ac09962641048e7b6725ea41eb77e39a594e7b62daf97bf68eee5fbee79ec02ff8f021f0c0b9f2626950ea0bf824aa3acafaef4
-EBUILD obantoo-2.0.9.ebuild 1427 SHA256 f71612b7852d2981efcaadee7c8cda0be2f9adcede66aea127653784f7f88418 SHA512 b6710336f339bbcde5c1b4d2fb406b4df280b08b9a24c749204ffa091c2ec5bafe5993a8f9f398687a3e6ff81138aa329019338557009ed0845566a106093d46 WHIRLPOOL aba80c8b804aa227d67fd846bc16297e407d02ab65b1dcd8ddb59b6bbd08af923f1ef556f2a7a6669afcf4c30fd023daaf3c9c27e8aab84563a925181ce535cc
-EBUILD obantoo-2.1.6.ebuild 1427 SHA256 6b62f45443ae433a8677affb1d2d59901394c47bcd351413825324625bddd5cd SHA512 ce80c1d42890c76ad1f3fa587d0fd39b5c10a4ff307a1eb06f01186c34862e3d091b0656002abeb808b3166f5c72430646613d230a812930dca62e60f3fa73d9 WHIRLPOOL da9c72446a857bb3339f0976f7c3a66bc0810f00987c88423deaf39f11ce47b88c468c607f7a6c24a9fd189fd1e53580da3029e800183501596dc58f1c49538f
+DIST obantoo-2.1.12.zip 2740423 SHA256 13c752bd50596efe89aed3ff8144bc8f1246a45820f7c411295ea64de8a849d8 SHA512 579e7287c7844a2160c05702c641700b06413c7628676874a189ec98d5c84af2b71517127d1787871ff7727a1ac8097a5d3d1064055434662fda82f8bec00caf WHIRLPOOL a135ee13334bad5ed1cd846d546152f0dd7c6794569846144f3d9b00a3a8b4f0a7c4534659c9108cd478f92f3b6a3da59ea7352f21ddff7f38187f235aa65492
+EBUILD obantoo-2.1.12.ebuild 924 SHA256 803c4a03e53d5096c32d286c21ed227baa5c70b5626aaffadd2afb1559ba908f SHA512 1108a0c6abaebfa71ac4f5154bff72f8ae33a758b50c20527a96292f9d9dc9ff01652333456247e9381b4905047b284ba239c2b06eb68dea98a87ffb2e987b5a WHIRLPOOL 2fe62135e1154c335a7dd0416bb270481d7fa2380ac277661cb5fa020bfadb0827ea19a63da216bf42f55743ad45195b2858f4d32890d1af88646426ad530cc3
diff --git a/dev-java/obantoo/files/1.4.11-hibiscus-encoding.patch b/dev-java/obantoo/files/1.4.11-hibiscus-encoding.patch
deleted file mode 100644
index 29e74ca..0000000
--- a/dev-java/obantoo/files/1.4.11-hibiscus-encoding.patch
+++ /dev/null
@@ -1,151 +0,0 @@
---- src/de/jost_net/OBanToo/Dtaus/DtausDateiParser.java 2008-07-09 15:02:58.000000000 +0200
-+++ DtausDateiParser.java 2010-12-28 15:45:29.907892004 +0100
-@@ -1,7 +1,7 @@
- /*
- * $Source: /cvsroot/obantoo/obantoo/src/de/jost_net/OBanToo/Dtaus/DtausDateiParser.java,v $
-- * $Revision: 1.8 $
-- * $Date: 2008/02/17 08:30:46 $
-+ * $Revision: 1.10 $
-+ * $Date: 2008/08/23 12:18:30 $
- * $Author: jost $
- *
- * Copyright 2006 by Heiner Jostkleigrewe
-@@ -24,7 +24,8 @@
- * </p>
- * <p>
- * Dem Parser kann ber einen speziellen Konstruktor mitgeteilt werden, wie
-- * fehlertolerant er sein soll.
-+ * fehlertolerant er sein soll. Standardmssig wird das Encoding ISO-8859-1
-+ * verwendet. In einem Konstruktor kann ein anderes Encoding vorgegeben werden.
- * <ul>
- * <li>SPEZIFIKATIONSKONFORM - entsprechend der DTAUS-Spezifikation wird ohne
- * Fehlertoleranz gearbeitet.</li>
-@@ -81,6 +82,8 @@
- */
- public class DtausDateiParser
- {
-+ private String encoding = "ISO-8859-1";
-+
- private InputStream dtaus;
-
- private ASatz asatz = null;
-@@ -116,6 +119,13 @@
- this(new BufferedInputStream(new FileInputStream(filename)), toleranz);
- }
-
-+ public DtausDateiParser(String filename, int toleranz, String encoding)
-+ throws IOException, DtausException
-+ {
-+ this(new BufferedInputStream(new FileInputStream(filename)), toleranz,
-+ encoding);
-+ }
-+
- public DtausDateiParser(InputStream is) throws IOException, DtausException
- {
- this(is, SPEZIFIKATIONSKONFORM);
-@@ -124,7 +134,18 @@
- public DtausDateiParser(InputStream is, int toleranz) throws IOException,
- DtausException
- {
-+ this(is, toleranz, null);
-+ }
-+
-+ public DtausDateiParser(InputStream is, int toleranz, String encoding)
-+ throws IOException, DtausException
-+ {
- this.toleranz = toleranz;
-+ if (encoding != null)
-+ {
-+ this.encoding = encoding;
-+ }
-+
- logischeDateien = new Vector();
- dtaus = is;
- while (is.available() > 0)
-@@ -201,13 +222,13 @@
- {
- byte[] inchar = new byte[4];
- dtaus.read(inchar);
-- String satzlaenge = new String(inchar);
-+ String satzlaenge = new String(inchar, this.encoding);
- // Lese in der Satzlnge. Die Satzlnge ist um 4 Bytes zu verringern, da
- // diese
- // Bytes bereits gelesen wurden.
- inchar = new byte[getSatzlaenge(satzlaenge) - 4];
- dtaus.read(inchar);
-- return satzlaenge + new String(inchar);
-+ return satzlaenge + new String(inchar, this.encoding);
- }
-
- /**
-@@ -262,15 +283,17 @@
- public static void main(String[] args)
- {
- int tol = 0;
-- if (args.length < 1 || args.length > 2)
-+ String encoding = null;
-+ if (args.length < 1 || args.length > 3)
- {
-- System.err.println("Argumente fr den Aufruf: dateiname [toleranz]\n"
-- + "toleranz = 0 Spezifikationskonform\n"
-- + "toleranz = 1 DOS-Umlaute umwandeln\n"
-- + "toleranz = 2 Zeichencode 00 in Space umwandeln");
-+ System.err
-+ .println("Argumente fr den Aufruf: dateiname [toleranz] [encoding]\n"
-+ + "toleranz = 0 Spezifikationskonform\n"
-+ + "toleranz = 1 DOS-Umlaute umwandeln\n"
-+ + "toleranz = 2 Zeichencode 00 in Space umwandeln");
- System.exit(1);
- }
-- if (args.length == 2)
-+ if (args.length >= 2)
- {
- try
- {
-@@ -282,9 +305,21 @@
- System.exit(1);
- }
- }
-+ if (args.length == 3)
-+ {
-+ encoding = args[2];
-+ }
- try
- {
-- DtausDateiParser p = new DtausDateiParser(args[0], tol);
-+ DtausDateiParser p;
-+ if (encoding == null)
-+ {
-+ p = new DtausDateiParser(args[0], tol);
-+ }
-+ else
-+ {
-+ p = new DtausDateiParser(args[0], tol, encoding);
-+ }
- System.out.println("Anzahl logischer Dateien: "
- + p.getAnzahlLogischerDateien());
- for (int i = 1; i <= p.getAnzahlLogischerDateien(); i++)
-@@ -320,10 +355,13 @@
- }
- /*
- * $Log: DtausDateiParser.java,v $
-- * Revision 1.8 2008/02/17 08:30:46 jost
-- * Neuer Toleranzlevel
-- * Neues Feld5
-- * Revision 1.7 2007/02/14 14:42:54 jost javadoc
-+ * Revision 1.10 2008/08/23 12:18:30 jost
-+ * Encoding kann als Kommandozeilenparameter an die main-Methode übergeben werden.
-+ * Revision 1.9 2008/07/09 19:43:28 jost Patch
-+ * von Olaf Willuhn: Standardmässig wird das Encoding ISO-8859-1 verwendet.
-+ * Optional kann über zusätzliche Konstruktoren ein anderes Encoding
-+ * eingestellt werden. Revision 1.8 2008/02/17 08:30:46 jost Neuer Toleranzlevel
-+ * Neues Feld5 Revision 1.7 2007/02/14 14:42:54 jost javadoc
- *
- * Revision 1.6 2006/10/06 12:47:39 jost Optionale Fehlertoleranz Revision 1.5
- * 2006/06/04 12:23:51 jost Redaktionelle nderung
-@@ -333,5 +371,4 @@
- * Dateien pro physikalischer Datei - interne Umstellung von Reader auf
- * InputStream Revision 1.2 2006/05/25 20:30:40 jost Korrektur Satzlngen und
- * Doku Revision 1.1 2006/05/24 16:24:44 jost Prerelease
-- *
- */
diff --git a/dev-java/obantoo/obantoo-1.5.1.ebuild b/dev-java/obantoo/obantoo-1.5.1.ebuild
deleted file mode 100644
index e61861d..0000000
--- a/dev-java/obantoo/obantoo-1.5.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-EAPI="2"
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2
-
-DESCRIPTION="A Java Library for HBCI (Homebanking Computer Interface) / FinTS (Financial Transaction Services)"
-HOMEPAGE="http://obantoo.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-COMMON_DEP="dev-java/itext:0"
-
-RDEPEND=">=virtual/jre-1.6
- ${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip
- ${COMMON_DEP}"
-
-S=${WORKDIR}
-
-java_prepare() {
-# epatch ${FILESDIR}/${PV}-hibiscus-encoding.patch
- rm -rv bin/* doc/api || die
-}
-
-src_compile() {
-
- local classpath="$(java-pkg_getjars itext)"
-
- find src -name '*.java' > sources.list
- ejavac -encoding latin1 -cp "${classpath}" -d bin @sources.list
- jar cf ${PN}.jar -C bin/ .
- # TODO: javadoc
-}
-
-
-src_install() {
- java-pkg_newjar ${PN}.jar
-
- use doc && dodoc doc/*
- use doc && java-pkg_dojavadoc javadoc
-
- use source && java-pkg_dosrc src/de
-}
diff --git a/dev-java/obantoo/obantoo-2.0.9.ebuild b/dev-java/obantoo/obantoo-2.0.9.ebuild
deleted file mode 100644
index ea4ff6f..0000000
--- a/dev-java/obantoo/obantoo-2.0.9.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-EAPI="2"
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2 cvs
-
-ECVS_SERVER="obantoo.cvs.sourceforge.net:/cvsroot/${PN}"
-ECVS_MODULE="${PN}"
-ECVS_DATE="\"2013-11-12 21:34:46 UTC\""
-
-DESCRIPTION="A Java Library for HBCI (Homebanking Computer Interface) / FinTS (Financial Transaction Services)"
-HOMEPAGE="http://obantoo.sourceforge.net/"
-#SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-#SRC_URI="http://${PN}.cvs.sourceforge.net/viewvc/${PN}/${PN}/?view=tar&revision=${CVS_REV} -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-COMMON_DEP="dev-java/itext:5"
-
-RDEPEND=">=virtual/jre-1.6
- ${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip
- dev-java/junit:4
- ${COMMON_DEP}"
-
-S=${WORKDIR}/${PN}
-
-java_prepare() {
-# epatch ${FILESDIR}/${PV}-hibiscus-encoding.patch
- rm -rv lib/* || die
- eant clean
- java-pkg_jar-from itext-5 itext.jar ${S}/lib/itextpdf-5.3.3.jar
- java-pkg_jar-from junit-4 junit.jar ${S}/lib/junit-4.11.jar
-}
-
-#src_compile() {
-#
-# local classpath="$(java-pkg_getjars itext-5)"
-#
-# find src -name '*.java' > sources.list
-# ejavac -encoding latin1 -cp "${classpath}" -d bin @sources.list
-# jar cf ${PN}.jar -C bin/ .
-# # TODO: javadoc
-#}
-
-src_compile() {
- eant jar $(use_doc javadoc)
-}
-
-src_install() {
- java-pkg_newjar build/${PN}-bin-${PV}.jar
-
- use doc && dodoc doc/*
- use doc && java-pkg_dojavadoc javadoc
-
- use source && java-pkg_dosrc src/de
-}
diff --git a/dev-java/obantoo/obantoo-1.5.2.ebuild b/dev-java/obantoo/obantoo-2.1.12.ebuild
index d0f3fb2..2ec5de6 100644
--- a/dev-java/obantoo/obantoo-1.5.2.ebuild
+++ b/dev-java/obantoo/obantoo-2.1.12.ebuild
@@ -19,18 +19,17 @@ RDEPEND=">=virtual/jre-1.6
DEPEND=">=virtual/jdk-1.6
app-arch/unzip
- ${COMMON_DEP}"
-
-S=${WORKDIR}
+ dev-java/junit:4
+ ${COMMON_DEP}"
java_prepare() {
-# epatch ${FILESDIR}/${PV}-hibiscus-encoding.patch
- rm -rv bin/* doc/api || die
+ rm -v *.jar || die
+ rm -rv bin/* || die
}
src_compile() {
- local classpath="$(java-pkg_getjars itext-5)"
+ local classpath="$(java-pkg_getjars itext-5,junit-4)"
find src -name '*.java' > sources.list
ejavac -encoding latin1 -cp "${classpath}" -d bin @sources.list
@@ -38,12 +37,11 @@ src_compile() {
# TODO: javadoc
}
-
src_install() {
- java-pkg_newjar ${PN}.jar
+ java-pkg_newjar ${PN}.jar
use doc && dodoc doc/*
- use doc && java-pkg_dojavadoc javadoc
+ use doc && java-pkg_dojavadoc javadoc
- use source && java-pkg_dosrc src/de
+ use source && java-pkg_dosrc src/de
}
diff --git a/dev-java/obantoo/obantoo-2.1.6.ebuild b/dev-java/obantoo/obantoo-2.1.6.ebuild
deleted file mode 100644
index dc82cf0..0000000
--- a/dev-java/obantoo/obantoo-2.1.6.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-EAPI="2"
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2 cvs
-
-ECVS_SERVER="obantoo.cvs.sourceforge.net:/cvsroot/${PN}"
-ECVS_MODULE="${PN}"
-ECVS_DATE="\"2014-07-30 16:06:19 UTC\""
-
-DESCRIPTION="A Java Library for HBCI (Homebanking Computer Interface) / FinTS (Financial Transaction Services)"
-HOMEPAGE="http://obantoo.sourceforge.net/"
-#SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-#SRC_URI="http://${PN}.cvs.sourceforge.net/viewvc/${PN}/${PN}/?view=tar&revision=${CVS_REV} -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-COMMON_DEP="dev-java/itext:5"
-
-RDEPEND=">=virtual/jre-1.6
- ${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip
- dev-java/junit:4
- ${COMMON_DEP}"
-
-S=${WORKDIR}/${PN}
-
-java_prepare() {
-# epatch ${FILESDIR}/${PV}-hibiscus-encoding.patch
- rm -rv lib/* || die
- eant clean
- java-pkg_jar-from itext-5 itext.jar ${S}/lib/itextpdf-5.3.3.jar
- java-pkg_jar-from junit-4 junit.jar ${S}/lib/junit-4.11.jar
-}
-
-#src_compile() {
-#
-# local classpath="$(java-pkg_getjars itext-5)"
-#
-# find src -name '*.java' > sources.list
-# ejavac -encoding latin1 -cp "${classpath}" -d bin @sources.list
-# jar cf ${PN}.jar -C bin/ .
-# # TODO: javadoc
-#}
-
-src_compile() {
- eant jar $(use_doc javadoc)
-}
-
-src_install() {
- java-pkg_newjar build/${PN}-bin-${PV}.jar
-
- use doc && dodoc doc/*
- use doc && java-pkg_dojavadoc javadoc
-
- use source && java-pkg_dosrc src/de
-}
diff --git a/dev-java/spiffy/Manifest b/dev-java/spiffy/Manifest
deleted file mode 100644
index 257ad52..0000000
--- a/dev-java/spiffy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST spiffy-all-0.05.zip 141335 SHA256 773b9c2e1b5fe8904d64ba2984903dd022039826b5e682d103c16a10911a227f SHA512 33d824193bff271e1079d1bf9445d28c69b88acddcd4504f3b0868ae569659f20a3a117c6b9574ff08a26d72fa170b96e5f30e3732db98c36e544f81b8ce747d WHIRLPOOL 55ad653642f0d7b3ece17ce2bd8554ba26343e5aca43137e92ca96bde01de66e67989a777f4a54c10fb62cbd0ce3bf7c3003aaf36e1975671454a3514ada0862
-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/metadata.xml b/dev-java/spiffy/metadata.xml
deleted file mode 100644
index cc3fe24..0000000
--- a/dev-java/spiffy/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer>
- <email>maintainer-wanted@gentoo.org</email>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-java/spiffy/spiffy-0.05.ebuild b/dev-java/spiffy/spiffy-0.05.ebuild
deleted file mode 100644
index 68b4999..0000000
--- a/dev-java/spiffy/spiffy-0.05.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A collection of often used helper methods and utility classes used in industry"
-HOMEPAGE="http://spiffyframework.sourceforge.net/"
-SRC_URI="mirror://sourceforge/spiffyframework/spiffyframework/v0.xx/${PN}-all-${PV}.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPS="dev-java/log4j"
-
-DEPEND="${COMMON_DEPS}
- app-arch/unzip
- dev-java/junit:4
- dev-java/struts:1.2
- >=virtual/jdk-1.5"
-RDEPEND="${COMMON_DEPS}
- >=virtual/jre-1.5"
-
-JAVA_SRC_DIR="src"
-JAVA_GENTOO_CLASSPATH="log4j,struts-1.2,junit-4"
-
-src_unpack() {
- unpack ${A}
- rm -v ${PN}-all-${PV}.jar ${PN}-with_source-all-${PV}.jar ${PN}-all-${PV}-javadoc.zip || die
- unpack ./${PN}-all-${PV}-source.zip
- rm -v ${PN}-all-${PV}-source.zip || die
-}
-
-src_test() {
- JAVA_SRC_DIR="test" \
- JAVA_CLASSPATH_EXTRA="${PN}.jar" \
- PN="${PN}-test" \
- java-pkg-simple_src_compile
-
- local tests
- tests=$(find test -name '*.java' | sed -e 's/\//./g;s/^test.//;s/.java$//' || die)
-
- ejunit4 -cp "${PN}.jar:${PN}-test.jar:$(java-pkg_getjars ${JAVA_GENTOO_CLASSPATH})" $tests
-}
diff --git a/dev-java/super-csv/Manifest b/dev-java/super-csv/Manifest
deleted file mode 100644
index dc28b88..0000000
--- a/dev-java/super-csv/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST SuperCSV-1.52.zip 640962 SHA256 e11679f50225bd21e8ad752e8b88e0d4e0f16d6ac90c48a2da7cbc6f8145ebb8 SHA512 ffcd22e735d367ddaf41af43fae73a645ec3fd60baa4efb62a08b7dda33624c885fb140e7b5c73dfd0d49d9ea61d9d7f303ce8abfb549d6ab6c108a29fa9e175 WHIRLPOOL 7f3b65ec2726553f53dfb08b2aea8dbb4fe8685635f36b4347a80e460393b7effa0069164ade77f64998f31e82cb5bebc5c06861c683ab2b1f5e8a09ff790dc9
-DIST super-csv-2.0.1-sources.jar 104596 SHA256 e6314e4bce6adf7a1630f6828066a805e1559fec33c48fae3546df3bd2626659 SHA512 4068bc36cfeb5235624ba92b50997c3d735880e589bc4cb24014485ef2d5ae1e8d18095e12cfb85d58c0ee04f885e2671ce1eacbd99d7667394c5fd9cfad9779 WHIRLPOOL 9b22cda08afc87981d886df5dfd74b7dd86c2193d4429835308cf7dda0b58fb5f1272c2ee15a0817ffadeb6090c9b3d4fd5c93e0350c5cd462b27b8752889505
-EBUILD super-csv-1.52.ebuild 1121 SHA256 f20386af70834becbbc78623d574eb9a722b7b79d832260096eb267d75ac61d0 SHA512 0bfd739524df3eed196e6e01cb150a4617a937c29c5da4e69e694ce73273c163a904a5e1f7d012a70a097632d4310c8c5e401f8857b6872ab7c804a4adc2a965 WHIRLPOOL 459526cdb642ba5ebc220d7ac88a1fa9bc553e7729bc57ab996cb9be99c277a77aea8d0449e9d72fa55cc4593cacae1f65fb85f4d498fd9ee4ce74d7f1873e6d
-EBUILD super-csv-2.0.1.ebuild 433 SHA256 a9d0ed396e01d51e94b52f780a960337ae50e2b5586f863578dc1920eacb7ab5 SHA512 f914acfa4497950c06cd3ac93ad7208b6252ee48dec134e84fcfa232bb0058e3a44304da5cbcf476fb04275753d6eb59278a097727395dc641ebfe9dffd60b71 WHIRLPOOL ea7421cb60459708cb32753aadb784481541811436d263b4f31d09ab96a61195f0aee891925410a02730a1919fe3d2f7ec0390824ee73f35fa1ad3aa76a608fc
-MISC metadata.xml 235 SHA256 c947f6510999c8ad24cab8fc9115f6d3c97a0d5ad45a07721e88ea08302d3a06 SHA512 3675a2546febb2782ac8089cb87bc0a67a12e8585bcab67a1daea7be5df5cbd3fac6eedc7af069001b31582b7920c7a75fb096f6456df74fef4e20c58a839f55 WHIRLPOOL f6496ac10ab36309fc873fb249eed67bc4afcdf5adf5feb03ca44654bfd269fda1f335131fcd96fbf0669f0d809d63a2e264d606c9e575e529b9bfcd811b098b
diff --git a/dev-java/super-csv/metadata.xml b/dev-java/super-csv/metadata.xml
deleted file mode 100644
index 114eccd..0000000
--- a/dev-java/super-csv/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer>
- <email>f.koester@tarent.de</email>
- <name>Fabian Köster</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-java/super-csv/super-csv-1.52.ebuild b/dev-java/super-csv/super-csv-1.52.ebuild
deleted file mode 100644
index 3178aa2..0000000
--- a/dev-java/super-csv/super-csv-1.52.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-MY_PN="SuperCSV"
-MY_P="${MY_PN}-${PV}"
-
-inherit eutils java-pkg-2 java-pkg-simple
-
-DESCRIPTION="CSV processing library for Java"
-HOMEPAGE="http://supercsv.sourceforge.net/"
-SRC_URI="mirror://sourceforge/supercsv/v1-branch/v${PV}/${MY_P}.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="dev-java/spiffy"
-
-DEPEND="${CDEPEND}
- app-arch/unzip
- >=virtual/jdk-1.5
- test? (
- dev-java/junit:4
- dev-java/hamcrest-core
- )"
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.5"
-
-JAVA_SRC_DIR="src"
-JAVA_GENTOO_CLASSPATH="spiffy,junit-4,hamcrest-core"
-
-src_unpack() {
- unpack ${A}
- unpack ./${MY_P}-source.zip
- rm -v *.jar *.zip || die
-}
-
-src_test() {
- JAVA_SRC_DIR="test" \
- JAVA_CLASSPATH_EXTRA="${PN}.jar" \
- PN="${PN}-test" \
- java-pkg-simple_src_compile
-
- local tests
- tests=$(find test -name '*.java' | sed -e 's/\//./g;s/^test.//;s/.java$//' || die)
-
- ejunit4 -cp "${PN}.jar:${PN}-test.jar:$(java-pkg_getjars ${JAVA_GENTOO_CLASSPATH})" $tests
-}
diff --git a/dev-java/super-csv/super-csv-2.0.1.ebuild b/dev-java/super-csv/super-csv-2.0.1.ebuild
deleted file mode 100644
index 3f8ec02..0000000
--- a/dev-java/super-csv/super-csv-2.0.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-GROUP_ID="net.sf.supercsv"
-
-inherit eutils java-pkg-2 java-mvn-src
-
-DESCRIPTION="CSV processing library for Java"
-HOMEPAGE="http://supercsv.sourceforge.net/"
-LICENSE="Apache-2.0"
-
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/swt-chart/swt-chart-0.7.0.ebuild b/dev-java/swt-chart/swt-chart-0.7.0.ebuild
deleted file mode 100644
index 04b204f..0000000
--- a/dev-java/swt-chart/swt-chart-0.7.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-JAVA_PKG_IUSE="doc source"
-
-MY_PN="org.swtchart"
-
-inherit java-pkg-2 eutils java-ant-2
-
-DESCRIPTION="Lightweight chart component for SWT"
-HOMEPAGE="http://www.swtchart.org/"
-SRC_URI="mirror://sourceforge/${PN}/SWTChart/${MY_PN}_${PV}.zip"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-COMMON_DEP="dev-java/swt:3.7
- dev-java/eclipse-jface:3.8
- dev-java/eclipse-core-commands:3.6"
-
-# Remove jameica dep which is only needed for jface
-DEPEND="${COMMON_DEP}
- >=virtual/jdk-1.5"
-
-RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.5"
-
-S="${WORKDIR}"
-
-src_unpack() {
- default
- cd "${WORKDIR}"
- unzip plugins/org.swtchart_*.jar -d org.swtchart
- unzip plugins/org.swtchart.ext_*.jar -d org.swtchart.ext
-}
-
-java_prepare() {
- cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
- eant clean
-}
-
-src_compile() {
-
-# local classpath="$(java-pkg_getjars swt-3.7)"
- EANT_GENTOO_CLASSPATH="swt-3.7,eclipse-jface-3.8,eclipse-core-commands-3.6" eant build
-
-# mkdir -p bin/swtchart bin/swtchart-ext
-
-# find swtchart/src -name '*.java' > sources.list
-# ejavac -cp "${classpath}" -d bin/swtchart @sources.list
-# jar cf org.swtchart_${PV}.jar -C bin/swtchart .
-
-# find swtchart-ext/src -name '*.java' > sources.list
-# ejavac -cp "${classpath}:org.swtchart_${PV}.jar" -d bin/swtchart-ext @sources.list
-# jar cf org.swtchart.ext_${PV}.jar -C bin/swtchart-ext .
-
- # TODO: javadoc
-}
-
-
-src_install() {
- java-pkg_newjar org.swtchart.jar org.swtchart.jar
- java-pkg_newjar org.swtchart.ext.jar org.swtchart.ext.jar
-
-# use doc && dodoc doc/*
-# use doc && java-pkg_dojavadoc javadoc
-
- # use source && java-pkg_dosrc src/de
-}
diff --git a/dev-java/willuhn-datasource/Manifest b/dev-java/willuhn-datasource/Manifest
index 9e6011f..4b85be7 100644
--- a/dev-java/willuhn-datasource/Manifest
+++ b/dev-java/willuhn-datasource/Manifest
@@ -1,9 +1 @@
-AUX 2.2-java7-api.patch 1119 SHA256 8cf266ba0593e7e6426e41b181382fdc4a4abb91d6102194bb9aca0ddc2e00ba SHA512 cb404756386d4225b5cd3531f8a8ae750cf7a5b4bebb55ccad7a8152c35a052c755b93e48225c071a6c501e4f50864aefba4f8f1cb552a7384cd8c2d6ec894d7 WHIRLPOOL 52c595acdf977a479003583208a5205d396a81075a51a304899c985ea7d08f9f18f4bdbb100479a925ab4c6d6f6d157e58f6c2314aadb399b59581f56ba1117c
-DIST willuhn-datasource-2.2.zip 77290 SHA256 863a1f72b14bb8556a5f03264d8e39c04ce90b7abfe29da92aac92e033f2b3dd SHA512 8f443cc8c3c21df1eebb5a229160736bddb37a2e7e5775f9b5ade9497dc074e4338ae35e454f3a2cb1fcf2f83c63742de69ba24c6ed8e3907fd31ab527cf8168 WHIRLPOOL 2552b60ccad733803cc41953b56eb6804eb5b0eabccc2f443715cfe7d64a5b74abf2fa1c5d8b13f84c4927d2474c55e72d4d93e6abfb624c0a69a4e3ac2d8a37
-DIST willuhn-datasource-2.4.zip 77415 SHA256 3e9dcfd36bdf44399e22f7e3f2808563c4bfb5b704177fa2b8d64c91293a5016 SHA512 92c23ff0e65c23ac4026425e921a080b11015138d370ee9c8713b242a28c812d0e02ab9f37fce3aff5e85c3dee192acb377af2199bbb70117c5f7da3ccf1d9bf WHIRLPOOL a3fc8bd65c25ca065202d692d5ebd4f151bc964f8be5bad2cc690ae0d44cfdc8a69bb2ed5e0e6cfb54e9a1a462320ba4138792bd8a3041c4938caa795c66c1de
-DIST willuhn-datasource-2.6.zip 77052 SHA256 2bf73e2557662f1110deb2d97de20a726324203475cfede3b7d632bec480ef9d SHA512 c5f3b81e117c821854cde0d8de869142152e767bb08262086a82aa4cc39ed39c9c85efd6b71687d9ed1059936887803c966d35ff441cafea663bdc81d8b3fa66 WHIRLPOOL 554bfba7854919777630fa1c3e093d92954fbf1e2ff1d7d3625a443a5ac2ec0daa9e402150dead13805b25cb5d6b3764e1d5cf92aa61b8211db29e4f8e662d50
-DIST willuhn-datasource-2.6_p20131229.zip 1172401 SHA256 5b02790741be3d3d591bb4725b672636a4a7d09f16b408ba442dd7b0ed402d32 SHA512 a27ee32d1834502add3ab673e878d8a0f5626db511a04a7c0f14ec19cc489bd52e898c2177a405d0ed59c75f11b927c801467f2d5149da72b24907d0c3e931d4 WHIRLPOOL f8f03d70950c836b999c5831d24c9cbd638516d59d7c4b35e38950298d5de195a9d14a269ff69bc88eef84b734b65674a87930298a0317d75269c92749fb3a01
-EBUILD willuhn-datasource-2.2.ebuild 1057 SHA256 fc710ce43fd74bca83b5bd5280e61a717ffb38f21054de9af605498ed0baf013 SHA512 1937719c4e67fe48020a3b1d5fee737ed895cb6fe1dc5b99279152cf8964de5683e332303d0866cc11cac8eec9d19d3a4a46fc1049e6be51f520069c6dece49d WHIRLPOOL df71419e64c2cb049e33bd64d3188060b1e1ab693dc23def0bc714f07e63f325cd1e939e8860c9a2a7f749bcddd0cbe37fad3f27b0f81f4ab178b7333fec75fe
-EBUILD willuhn-datasource-2.4.ebuild 1058 SHA256 9049fafcb4ff164b31b2d1336c543ef548a0cdd64adbb1f7b785a03dc811ce00 SHA512 06c961fa63c33c1c4f739b27f08d31437da3438f6fe3d20f5f482e3f6eeb8d5f4ee044fdf27e47e0a9359a117aa7271e9fe894373924b663d6e0fd61489cf631 WHIRLPOOL cc9526b59d42746ac259bae83946d3946b6cc57016d27ef6011dbe9b85fd6a9a237ce0102e359b1dfd97bf157fb858d0fb1c04e26c455cba5c902f35d2e472c8
-EBUILD willuhn-datasource-2.6.ebuild 1058 SHA256 9049fafcb4ff164b31b2d1336c543ef548a0cdd64adbb1f7b785a03dc811ce00 SHA512 06c961fa63c33c1c4f739b27f08d31437da3438f6fe3d20f5f482e3f6eeb8d5f4ee044fdf27e47e0a9359a117aa7271e9fe894373924b663d6e0fd61489cf631 WHIRLPOOL cc9526b59d42746ac259bae83946d3946b6cc57016d27ef6011dbe9b85fd6a9a237ce0102e359b1dfd97bf157fb858d0fb1c04e26c455cba5c902f35d2e472c8
-EBUILD willuhn-datasource-2.6_p20131229.ebuild 1101 SHA256 aa67467727771c43cbfb3f04a89548474408108b9110a8ff02f5bb969d51d78d SHA512 b2bb0d24202c0c2b5f249fbc6ea92f381a7741ffa7620497f05ed7a5aa70ab5b07cd3eeefc4da95073fe33eaeee2aeff24f7daeb3ae1680e8fe1b720b4e6464e WHIRLPOOL a92c972cc7c4428f55ca03fda4e5578f7c4e2f3fe616c9d7df8a05b8b9169c1a251fbac10106a0b4d54b2d4cb903f0459c1f38c4de1596fdbd3390d05f24b983
+EBUILD willuhn-datasource-9999.ebuild 1017 SHA256 288cdbba83bc067882a98ba2864fe3bf3934a351a03246e34868b1f97021336d SHA512 d7600b45246575d439ffab8664dd1aae40021eb174d16f763eb16ce738761efa8b7177745c32d4e1a05aef6ff92df3f192f509203886acd843caa5cfe9d8ef80 WHIRLPOOL fd90c134aab768514347c71b18f9a4424bf5988772981140fe6aafbbecfe13cf89b4b6c5a119b9dc65b77f013f3e22493f4d44ad5fb140356a33e1284a4c064e
diff --git a/dev-java/willuhn-datasource/files/2.2-java7-api.patch b/dev-java/willuhn-datasource/files/2.2-java7-api.patch
deleted file mode 100644
index 2823482..0000000
--- a/dev-java/willuhn-datasource/files/2.2-java7-api.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: work/src/de/willuhn/datasource/db/MyDriver.java
-===================================================================
---- work.orig/src/de/willuhn/datasource/db/MyDriver.java
-+++ work/src/de/willuhn/datasource/db/MyDriver.java
-@@ -16,7 +16,9 @@ import java.sql.Connection;
- import java.sql.Driver;
- import java.sql.DriverPropertyInfo;
- import java.sql.SQLException;
-+import java.sql.SQLFeatureNotSupportedException;
- import java.util.Properties;
-+import java.util.logging.Logger;
-
- /**
- * Hilfsklasse da java.sql.DriverManager nur Driver akzeptiert,
-@@ -94,6 +96,11 @@ public class MyDriver implements Driver
- return driver.getPropertyInfo(url,info);
- }
-
-+ public Logger getParentLogger() throws SQLFeatureNotSupportedException
-+ {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
- }
-
-
-@@ -105,4 +112,4 @@ public class MyDriver implements Driver
- * Revision 1.1 2004/12/07 01:27:58 willuhn
- * @N Dummy Driver
- *
-- **********************************************************************/
-\ No newline at end of file
-+ **********************************************************************/
diff --git a/dev-java/willuhn-datasource/willuhn-datasource-2.4.ebuild b/dev-java/willuhn-datasource/willuhn-datasource-2.4.ebuild
deleted file mode 100644
index 373d331..0000000
--- a/dev-java/willuhn-datasource/willuhn-datasource-2.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-EAPI="2"
-JAVA_PKG_IUSE="doc source"
-
-WANT_ANT_TASKS="ant-nodeps"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="An object relational mapper with RMI support"
-HOMEPAGE="http://www.willuhn.de/products/jameica/"
-SRC_URI="http://www.willuhn.de/products/jameica/releases/${PV}/datasource/de_willuhn_ds.src.zip -> ${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-COMMON_DEP="~dev-java/willuhn-util-${PV}
- dev-java/mckoi"
-
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.5
- app-arch/unzip
- ${COMMON_DEP}"
-
-S=${WORKDIR}
-
-java_prepare() {
-
- #epatch "${FILESDIR}/${PV}-java7-api.patch"
- java-ant_rewrite-classpath build/build.xml
- eant -f build/build.xml clean
-}
-
-src_compile() {
-
- EANT_GENTOO_CLASSPATH="willuhn-util,mckoi-1" eant -f build/build.xml jar $(use_doc javadoc)
-# -Dgentoo.classpath="$(java-pkg_getjars willuhn-util,mckoi-1)"
-}
-
-src_install() {
- java-pkg_dojar releases/${PV}-0/de_willuhn_ds.jar
-
- use doc && java-pkg_dojavadoc dist/api
- use source && java-pkg_dosrc src/de
-}
diff --git a/dev-java/willuhn-datasource/willuhn-datasource-2.6.ebuild b/dev-java/willuhn-datasource/willuhn-datasource-2.6.ebuild
deleted file mode 100644
index 373d331..0000000
--- a/dev-java/willuhn-datasource/willuhn-datasource-2.6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-EAPI="2"
-JAVA_PKG_IUSE="doc source"
-
-WANT_ANT_TASKS="ant-nodeps"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="An object relational mapper with RMI support"
-HOMEPAGE="http://www.willuhn.de/products/jameica/"
-SRC_URI="http://www.willuhn.de/products/jameica/releases/${PV}/datasource/de_willuhn_ds.src.zip -> ${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-COMMON_DEP="~dev-java/willuhn-util-${PV}
- dev-java/mckoi"
-
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.5
- app-arch/unzip
- ${COMMON_DEP}"
-
-S=${WORKDIR}
-
-java_prepare() {
-
- #epatch "${FILESDIR}/${PV}-java7-api.patch"
- java-ant_rewrite-classpath build/build.xml
- eant -f build/build.xml clean
-}
-
-src_compile() {
-
- EANT_GENTOO_CLASSPATH="willuhn-util,mckoi-1" eant -f build/build.xml jar $(use_doc javadoc)
-# -Dgentoo.classpath="$(java-pkg_getjars willuhn-util,mckoi-1)"
-}
-
-src_install() {
- java-pkg_dojar releases/${PV}-0/de_willuhn_ds.jar
-
- use doc && java-pkg_dojavadoc dist/api
- use source && java-pkg_dosrc src/de
-}
diff --git a/dev-java/willuhn-datasource/willuhn-datasource-2.6_p20131229.ebuild b/dev-java/willuhn-datasource/willuhn-datasource-2.6_p20131229.ebuild
deleted file mode 100644
index 8704ffe..0000000
--- a/dev-java/willuhn-datasource/willuhn-datasource-2.6_p20131229.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-EAPI="2"
-JAVA_PKG_IUSE="doc source"
-
-WANT_ANT_TASKS="ant-nodeps"
-inherit eutils java-pkg-2 java-ant-2
-
-COMMIT="e15b2f100a668d1faf242caf851064aefee56409"
-
-DESCRIPTION="An object relational mapper with RMI support"
-HOMEPAGE="http://www.willuhn.de/products/jameica/"
-SRC_URI="https://github.com/willuhn/datasource/archive/${COMMIT}.zip -> ${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-COMMON_DEP="~dev-java/willuhn-util-2.6
- dev-java/mckoi"
-
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.5
- app-arch/unzip
- ${COMMON_DEP}"
-
-S="${WORKDIR}/datasource-$COMMIT"
-
-java_prepare() {
-
- #epatch "${FILESDIR}/${PV}-java7-api.patch"
- java-ant_rewrite-classpath build/build.xml
- eant -f build/build.xml clean
-}
-
-src_compile() {
-
- EANT_GENTOO_CLASSPATH="willuhn-util,mckoi-1" eant -f build/build.xml jar $(use_doc javadoc)
-# -Dgentoo.classpath="$(java-pkg_getjars willuhn-util,mckoi-1)"
-}
-
-src_install() {
- java-pkg_dojar releases/2.7-215/de_willuhn_ds.jar
-
- use doc && java-pkg_dojavadoc dist/api
- use source && java-pkg_dosrc src/de
-}
diff --git a/dev-java/willuhn-datasource/willuhn-datasource-2.2.ebuild b/dev-java/willuhn-datasource/willuhn-datasource-9999.ebuild
index a88e383..92a87cb 100644
--- a/dev-java/willuhn-datasource/willuhn-datasource-2.2.ebuild
+++ b/dev-java/willuhn-datasource/willuhn-datasource-9999.ebuild
@@ -1,45 +1,46 @@
-EAPI="2"
+EAPI="5"
JAVA_PKG_IUSE="doc source"
WANT_ANT_TASKS="ant-nodeps"
inherit eutils java-pkg-2 java-ant-2
+if [[ ${PV} != 9999 ]]; then
+ SRC_URI="https://github.com/willuhn/datasource/archive/${COMMIT}.zip -> ${P}.zip"
+ KEYWORDS="~amd64 ~x86"
+else
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/willuhn/datasource.git"
+fi
+
DESCRIPTION="An object relational mapper with RMI support"
HOMEPAGE="http://www.willuhn.de/products/jameica/"
-SRC_URI="http://www.willuhn.de/products/jameica/releases/${PV}/datasource/de_willuhn_ds.src.zip -> ${P}.zip"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~x86 ~amd64"
IUSE=""
-COMMON_DEP="~dev-java/willuhn-util-${PV}
- dev-java/mckoi"
+COMMON_DEP="=dev-java/willuhn-util-$PV"
RDEPEND=">=virtual/jre-1.5
${COMMON_DEP}"
DEPEND=">=virtual/jdk-1.5
- app-arch/unzip
- ${COMMON_DEP}"
-
-S=${WORKDIR}
+ app-arch/unzip
+ ${COMMON_DEP}"
java_prepare() {
- epatch "${FILESDIR}/${PV}-java7-api.patch"
java-ant_rewrite-classpath build/build.xml
eant -f build/build.xml clean
}
src_compile() {
- EANT_GENTOO_CLASSPATH="willuhn-util,mckoi-1" eant -f build/build.xml jar $(use_doc javadoc)
-# -Dgentoo.classpath="$(java-pkg_getjars willuhn-util,mckoi-1)"
+ EANT_GENTOO_CLASSPATH="willuhn-util" eant -f build/build.xml jar $(use_doc javadoc)
}
src_install() {
- java-pkg_dojar releases/${PV}-0/de_willuhn_ds.jar
+ java-pkg_dojar releases/*/de_willuhn_ds.jar
use doc && java-pkg_dojavadoc dist/api
use source && java-pkg_dosrc src/de
diff --git a/dev-java/willuhn-util/Manifest b/dev-java/willuhn-util/Manifest
index 0472ed6..f48f8d0 100644
--- a/dev-java/willuhn-util/Manifest
+++ b/dev-java/willuhn-util/Manifest
@@ -1,6 +1 @@
-DIST willuhn-util-2.2.zip 94106 SHA256 adc07636d8a40b41ab04196dff86fd86693dcc703a3e3309e26a16c134d46ee4 SHA512 63ff32c797049339238716b2139e2b1a9064a878628d1feceef8f1630b00d7b135df7b6fea5efaa67e56a75232d2cc00477bd4a0540e15443987c3f5541f417a WHIRLPOOL c4ca822f51240914d61a584c81299f81fee8024b355a46e1c13000bc216d3e5b83990aefcb20200e5865e01690130347899a13f612e5657fc048f57dea7131e5
-DIST willuhn-util-2.4.zip 94251 SHA256 12b9c128c9b9a9512cdc0df42ee538fd7852700e2dafe9c61fd3cbba917a5c00 SHA512 d7ae4b1b0067182ae51d314a551ea7202fcc42b6f7d249ba06d457a6f7129e2f36fb5bbd1f68f7fe60e9ebf69ef5c63fc83dd5829e94b81c352c958641b0ebbc WHIRLPOOL ad0d96e518a3e294789bcc2a752c4913e4d0c0cac37107d2ffab6aa16c4acc6ac888f13fc75510c759d85106ef48b4bb89f306f2654e3ccaf1e89312112caca0
-DIST willuhn-util-2.6.zip 94443 SHA256 f865300c533641a4bea5563594a7f9e16b550e95b4f7046aaf5da51d42379601 SHA512 8ad2d8601ed727bd67f09f32cb2fab6e45c150f13d55d0621c7a275091f70a65311767ec25a94425855dbdc66454c7dad5f51f7a3b0f2e918590847ba14f5ed2 WHIRLPOOL 4d1ea0bd1e30a72b2011a4c3f4b960c5c02844fa0a4c99fd2cdf024afd52bc3a590af3dd38487670beac94660b94afb31f25f4224d2764dce3700ed9755dcb2b
-EBUILD willuhn-util-2.2.ebuild 828 SHA256 3808b3e2cdab708257ba29198668e7da788c67990990c9ecfb76bf74ecf1bbb9 SHA512 676dfa1924cdc3b002567d1ed9ed9a3943a3ef4a649f140f7fc5a43840146a717e7d83bf7521bfec629f94dafc6a8b72836db6032514e03baf76a068ba64c8bb WHIRLPOOL 179277cfc406cac40727d522ce25567f11e963832bfcdfc166202d3a5bda1b967395254618d52cd2c1733175ae69c5b0f3b1cc29594610bae5712f592f9a3e88
-EBUILD willuhn-util-2.4.ebuild 828 SHA256 3808b3e2cdab708257ba29198668e7da788c67990990c9ecfb76bf74ecf1bbb9 SHA512 676dfa1924cdc3b002567d1ed9ed9a3943a3ef4a649f140f7fc5a43840146a717e7d83bf7521bfec629f94dafc6a8b72836db6032514e03baf76a068ba64c8bb WHIRLPOOL 179277cfc406cac40727d522ce25567f11e963832bfcdfc166202d3a5bda1b967395254618d52cd2c1733175ae69c5b0f3b1cc29594610bae5712f592f9a3e88
-EBUILD willuhn-util-2.6.ebuild 828 SHA256 3808b3e2cdab708257ba29198668e7da788c67990990c9ecfb76bf74ecf1bbb9 SHA512 676dfa1924cdc3b002567d1ed9ed9a3943a3ef4a649f140f7fc5a43840146a717e7d83bf7521bfec629f94dafc6a8b72836db6032514e03baf76a068ba64c8bb WHIRLPOOL 179277cfc406cac40727d522ce25567f11e963832bfcdfc166202d3a5bda1b967395254618d52cd2c1733175ae69c5b0f3b1cc29594610bae5712f592f9a3e88
+EBUILD willuhn-util-9999.ebuild 973 SHA256 c4a79471ba4527a9f69e74512c44a8b5cb2975bc2a89d61c0cbb337186d802a4 SHA512 3e637bdc13bcddb731fbf50bb36ef8903c208e062b6a3f751556d637aceef86af8ca068da1faffe44d474e862c30e72baa4a17a348b012b08647e5e1385c9e41 WHIRLPOOL 01cb04a51845e462a0274b6d36559f574cb7e1edb762da2458c0e2fc351a7eda498dee83d49545fa55d3f8f1dc5b585c289c799a0a84d8a00f45db65d9599832
diff --git a/dev-java/willuhn-util/willuhn-util-2.2.ebuild b/dev-java/willuhn-util/willuhn-util-2.2.ebuild
deleted file mode 100644
index f0bd12a..0000000
--- a/dev-java/willuhn-util/willuhn-util-2.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-EAPI="2"
-JAVA_PKG_IUSE="doc source"
-
-WANT_ANT_TASKS="ant-nodeps"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A collection of small java helpers"
-HOMEPAGE="http://www.willuhn.de/products/jameica/"
-SRC_URI="http://www.willuhn.de/products/jameica/releases/${PV}/util/de_willuhn_util.src.zip -> ${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-COMMON_DEP=""
-
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.5
- app-arch/unzip
- ${COMMON_DEP}"
-
-S=${WORKDIR}
-
-java_prepare() {
-
- eant -f build/build.xml clean
-}
-
-src_compile() {
-
- eant -f build/build.xml jar $(use_doc javadoc) || die "compile problem"
-}
-
-src_install() {
- java-pkg_dojar releases/${PV}-0/de_willuhn_util.jar
-
- use doc && java-pkg_dojavadoc dist/api
- use source && java-pkg_dosrc src/de
-}
diff --git a/dev-java/willuhn-util/willuhn-util-2.6.ebuild b/dev-java/willuhn-util/willuhn-util-2.6.ebuild
deleted file mode 100644
index f0bd12a..0000000
--- a/dev-java/willuhn-util/willuhn-util-2.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-EAPI="2"
-JAVA_PKG_IUSE="doc source"
-
-WANT_ANT_TASKS="ant-nodeps"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A collection of small java helpers"
-HOMEPAGE="http://www.willuhn.de/products/jameica/"
-SRC_URI="http://www.willuhn.de/products/jameica/releases/${PV}/util/de_willuhn_util.src.zip -> ${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-COMMON_DEP=""
-
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.5
- app-arch/unzip
- ${COMMON_DEP}"
-
-S=${WORKDIR}
-
-java_prepare() {
-
- eant -f build/build.xml clean
-}
-
-src_compile() {
-
- eant -f build/build.xml jar $(use_doc javadoc) || die "compile problem"
-}
-
-src_install() {
- java-pkg_dojar releases/${PV}-0/de_willuhn_util.jar
-
- use doc && java-pkg_dojavadoc dist/api
- use source && java-pkg_dosrc src/de
-}
diff --git a/dev-java/willuhn-util/willuhn-util-2.4.ebuild b/dev-java/willuhn-util/willuhn-util-9999.ebuild
index f0bd12a..d2d30db 100644
--- a/dev-java/willuhn-util/willuhn-util-2.4.ebuild
+++ b/dev-java/willuhn-util/willuhn-util-9999.ebuild
@@ -1,12 +1,19 @@
-EAPI="2"
+EAPI="5"
JAVA_PKG_IUSE="doc source"
WANT_ANT_TASKS="ant-nodeps"
inherit eutils java-pkg-2 java-ant-2
+if [[ ${PV} != 9999 ]]; then
+ SRC_URI="http://www.willuhn.de/products/jameica/releases/${PV}/util/de_willuhn_util.src.zip -> ${P}.zip"
+ KEYWORDS="~amd64 ~x86"
+else
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/willuhn/util.git"
+fi
+
DESCRIPTION="A collection of small java helpers"
HOMEPAGE="http://www.willuhn.de/products/jameica/"
-SRC_URI="http://www.willuhn.de/products/jameica/releases/${PV}/util/de_willuhn_util.src.zip -> ${P}.zip"
LICENSE="GPL-2"
SLOT="0"
@@ -19,11 +26,9 @@ RDEPEND=">=virtual/jre-1.5
${COMMON_DEP}"
DEPEND=">=virtual/jdk-1.5
- app-arch/unzip
+ app-arch/unzip
${COMMON_DEP}"
-S=${WORKDIR}
-
java_prepare() {
eant -f build/build.xml clean
@@ -31,11 +36,11 @@ java_prepare() {
src_compile() {
- eant -f build/build.xml jar $(use_doc javadoc) || die "compile problem"
+ eant -f build/build.xml jar $(use_doc javadoc) || die "compile problem"
}
src_install() {
- java-pkg_dojar releases/${PV}-0/de_willuhn_util.jar
+ java-pkg_dojar releases/*/de_willuhn_util.jar
use doc && java-pkg_dojavadoc dist/api
use source && java-pkg_dosrc src/de