commit: 495981951e201d59f074b9106ed003a398f10951
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 10 08:13:22 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Dec 10 08:14:35 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49598195
dev-java/{poi,dbunit}: Removal. Fixes bug 402757.
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-java/dbunit/Manifest | 1 -
dev-java/dbunit/dbunit-2.4.5.ebuild | 54 ----------------
dev-java/dbunit/files/build-2.4.xml | 62 ------------------
dev-java/dbunit/files/build.xml | 57 -----------------
dev-java/dbunit/metadata.xml | 12 ----
dev-java/poi/Manifest | 2 -
dev-java/poi/files/poi-3.0.2-isADateFormat.patch | 11 ----
.../poi/files/poi-3.0.2-isADateFormatTest.patch | 45 -------------
dev-java/poi/metadata.xml | 5 --
dev-java/poi/poi-3.0.2-r1.ebuild | 74 ----------------------
dev-java/poi/poi-3.2.ebuild | 62 ------------------
11 files changed, 385 deletions(-)
diff --git a/dev-java/dbunit/Manifest b/dev-java/dbunit/Manifest
deleted file mode 100644
index 227398c..0000000
--- a/dev-java/dbunit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST dbunit-2.4.5-sources.jar 509812 SHA256
a31762bcf4d41e24a33cbb20043f9c0bbcccab099a8bb11f29fb88fd6af2b9c0 SHA512
9f6f43337d020aa8c8066e6a12efa3d3fc4256b0bc3ed3d330ddbd155a6430accea03e45987ecb44c747a4844c7c49e36549317c63b3cd456896d0e5bc508b5d
WHIRLPOOL
6e230abde0d9792dda3f83f549a0df960a8f7bcb4e3541f4c279bdb3b3b64c4aef7281326d4beb25770b5e6205f8a247a02698d94e84237299ba4da4d5fb3133
diff --git a/dev-java/dbunit/dbunit-2.4.5.ebuild
b/dev-java/dbunit/dbunit-2.4.5.ebuild
deleted file mode 100644
index 5149316..0000000
--- a/dev-java/dbunit/dbunit-2.4.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="DbUnit is a JUnit extension targeted for database-driven projects"
-HOMEPAGE="http://dbunit.sourceforge.net/";
-SRC_URI="mirror://sourceforge/${PN}/${P}-sources.jar"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-IUSE="${JAVA_PKG_IUSE}"
-
-COMMON_DEP="dev-java/slf4j-api:0
- dev-java/poi:3.2
- dev-java/commons-collections:0
- dev-java/ant-core:0
- dev-java/junit:0"
-
-RDEPEND=">=virtual/jre-1.4
- dev-java/slf4j-nop:0
- ${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.4
- app-arch/unzip:0
- ${COMMON_DEP}"
-
-S="${WORKDIR}"
-
-java_prepare() {
- # Upstream no longer provides a build file.
- cp -v "${FILESDIR}"/build-2.4.xml build.xml || die
-}
-
-EANT_GENTOO_CLASSPATH="poi-3.2,junit,slf4j-api,commons-collections,ant-core"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-src_install() {
- # slf4j needed for runtime
- java-pkg_register-optional-dependency slf4j-nop
- java-pkg_register-optional-dependency slf4j-log4j12
-
- java-pkg_dojar "${S}"/dist/"${PN}.jar"
-
- use doc && java-pkg_dojavadoc build/javadoc
- use source && java-pkg_dosrc org
-}
diff --git a/dev-java/dbunit/files/build-2.4.xml
b/dev-java/dbunit/files/build-2.4.xml
deleted file mode 100644
index dd786c5..0000000
--- a/dev-java/dbunit/files/build-2.4.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="dbunit" default="jar" basedir=".">
- <!-- some properties -->
- <property name="src.dir" value="org/dbunit" />
- <property name="build.dir" value="build" />
- <property name="docs.dir" value="build/javadoc" />
- <property name="lib.dir" value="lib"/>
- <property name="dist.dir" value="dist" />
- <property name="jarfile" value="${dist.dir}/dbunit.jar" />
- <property name="pkg" value="${package.name}"/>
- <property name="target.jdk" value="1.5" />
-
-
- <available file="${lib}" type="dir" property="libdir.exists"/>
-
-
- <!-- init -->
- <target name="init">
- <tstamp/>
- <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="${gentoo.classpath}">
- </javac>
- </target>
-
- <!-- build the jar file -->
- <target name="jar" depends="compile">
- <jar jarfile="${jarfile}" basedir="${build.dir}" />
- </target>
-
- <!-- generate javadocs -->
- <target name="javadoc" depends="init">
- <javadoc sourcepath="."
- packagenames="org.*"
- destdir="${docs.dir}"
- author="true"
- version="true"
- use="true"
- windowtitle="${ant.project.name} API"
- doctitle="${ant.project.name} Docs"
- private="no" />
- </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/dbunit/files/build.xml b/dev-java/dbunit/files/build.xml
deleted file mode 100644
index 4ee7b6d..0000000
--- a/dev-java/dbunit/files/build.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="dbunit" default="jar">
- <!-- some properties -->
- <property name="src.dir" value="src/java" />
- <property name="build.dir" value="build" />
- <property name="docs.dir" value="docs" />
- <property name="dist.dir" value="dist" />
- <property name="jarfile" value="${dist.dir}/dbunit.jar" />
- <property name="target.jdk" value="1.4" />
-
- <!-- 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>
- <fileset dir="lib">
- <include name="**/*.jar" />
- </fileset>
- </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="org.*"
- 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/dbunit/metadata.xml b/dev-java/dbunit/metadata.xml
deleted file mode 100644
index 01d4dd9..0000000
--- a/dev-java/dbunit/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <herd>java</herd>
- <longdescription>
- DBUnit is a JUnit extension targeted for database-driven
projects
- that, puts your database into a known state between test runs.
- </longdescription>
- <upstream>
- <remote-id type="sourceforge">dbunit</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-java/poi/Manifest b/dev-java/poi/Manifest
deleted file mode 100644
index 0ade923..0000000
--- a/dev-java/poi/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST poi-src-3.0.2-FINAL-20080204.tar.gz 19034308 SHA256
38a3d599fb75eaaa7c70fec230a9a88c192080b4c07fc9e7c7a31f8b26c8e4eb SHA512
30aa49e7694b6ae904b1362e967b2f0df9990db0c7f51499d60a78285135eef218436419502725083a4cbbc1ae89fc48976ac29cc214b0266b05400c758c6b7a
WHIRLPOOL
189dce9e7a399f4a8b0a3cc29e178ac9b190db6d85e528245c54c9789ea895269f493318bfb4f37f51a0c8cdc92a97635c15c9c2ecdde4bfa37a7444667ab47e
-DIST poi-src-3.2-FINAL-20081019.tar.gz 25909967 SHA256
7f39291c4ea12420676680c7e21923e4579b73122710873448dba1673ad03804 SHA512
e6d77f2ae595a7f97f27169cbf67bcde6f21fc05b673e86818b6da6602e7388f9fb6de78837e33067ea2c483c705e48dd08932635c8457f67c79678eb354e1f3
WHIRLPOOL
2d1b64eef8619c913d9b7874f547e072f0acfdc048cae18f8cdbb14a87b3698c597c0163cd0e77fa9043404800576a36b580915a0441b665f26724d564608e84
diff --git a/dev-java/poi/files/poi-3.0.2-isADateFormat.patch
b/dev-java/poi/files/poi-3.0.2-isADateFormat.patch
deleted file mode 100644
index d474314..0000000
--- a/dev-java/poi/files/poi-3.0.2-isADateFormat.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/java/org/apache/poi/hssf/usermodel/HSSFDateUtil.java.orig
2008-02-07 12:02:57.000000000 +0100
-+++ ./src/java/org/apache/poi/hssf/usermodel/HSSFDateUtil.java 2008-02-07
12:29:17.000000000 +0100
-@@ -210,7 +210,7 @@
-
- // Otherwise, check it's only made up of:
- // y m d - / ,
-- if(fs.matches("^[ymd\\-/, ]+$")) {
-+ if(fs.matches("^[yYmMdDhHsS\\-/,. :]+$")) {
- return true;
- }
-
diff --git a/dev-java/poi/files/poi-3.0.2-isADateFormatTest.patch
b/dev-java/poi/files/poi-3.0.2-isADateFormatTest.patch
deleted file mode 100644
index b21c1d6..0000000
--- a/dev-java/poi/files/poi-3.0.2-isADateFormatTest.patch
+++ /dev/null
@@ -1,45 +0,0 @@
----
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java
2007/12/04 17:06:57 601004
-+++
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java
2008/02/07 12:39:12 619382
-@@ -228,6 +228,7 @@
- "yyyy-mm-dd", "yyyy/mm/dd", "yy/mm/dd", "yy/mmm/dd",
- "dd/mm/yy", "dd/mm/yyyy", "dd/mmm/yy",
- "dd-mm-yy", "dd-mm-yyyy",
-+ "DD-MM-YY", "DD-mm-YYYY",
- "dd\\-mm\\-yy", // Sometimes escaped
-
- // These crazy ones are valid
-@@ -242,15 +243,33 @@
- assertTrue( HSSFDateUtil.isADateFormat(formatId, formats[i]) );
- }
-
-+ // Then time based ones too
-+ formats = new String[] {
-+ "yyyy-mm-dd hh:mm:ss", "yyyy/mm/dd HH:MM:SS",
-+ "mm/dd HH:MM", "yy/mmm/dd SS",
-+ };
-+ for(int i=0; i<formats.length; i++) {
-+ assertTrue( HSSFDateUtil.isADateFormat(formatId, formats[i]) );
-+ }
-+
- // Then invalid ones
- formats = new String[] {
-- "yyyy:mm:dd",
-+ "yyyy*mm*dd",
- "0.0", "0.000",
- "0%", "0.0%",
- "", null
- };
- for(int i=0; i<formats.length; i++) {
- assertFalse( HSSFDateUtil.isADateFormat(formatId, formats[i]) );
-+ }
-+
-+ // And these are ones we probably shouldn't allow,
-+ // but would need a better regexp
-+ formats = new String[] {
-+ "yyyy:mm:dd",
-+ };
-+ for(int i=0; i<formats.length; i++) {
-+ // assertFalse( HSSFDateUtil.isADateFormat(formatId, formats[i]) );
- }
- }
-
diff --git a/dev-java/poi/metadata.xml b/dev-java/poi/metadata.xml
deleted file mode 100644
index 838c00a..0000000
--- a/dev-java/poi/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<herd>java</herd>
-</pkgmetadata>
diff --git a/dev-java/poi/poi-3.0.2-r1.ebuild b/dev-java/poi/poi-3.0.2-r1.ebuild
deleted file mode 100644
index 245ce50..0000000
--- a/dev-java/poi/poi-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=1
-JAVA_PKG_IUSE="doc examples source"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java API To Access Microsoft Format Files"
-HOMEPAGE="http://poi.apache.org/";
-RELEASE_DATE="20080204"
-SRC_URI="mirror://apache/poi/release/src/${PN}-src-${PV}-FINAL-${RELEASE_DATE}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="test"
-
-COMMON_DEPEND="
- >=dev-java/commons-beanutils-1.7:1.7
- >=dev-java/commons-lang-2.1:2.1
- >=dev-java/commons-logging-1.1"
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEPEND}"
-DEPEND=">=virtual/jdk-1.4
- ${COMMON_DEPEND}
- test? ( dev-java/ant-junit )"
-
-S=${WORKDIR}/${P}-FINAL
-
-src_unpack() {
- unpack ${A}
-
- cd "${S}"
- # Patch that adds official fix for detection of custom date/time formats
- # See bug: http://issues.apache.org/bugzilla/show_bug.cgi?id=44373
- epatch "${FILESDIR}/${P}-isADateFormat.patch"
- use test && epatch "${FILESDIR}/${P}-isADateFormatTest.patch"
-
- find -name "*.jar" | xargs rm -v
-
- cd "${S}/lib"
- java-pkg_jar-from commons-logging commons-logging.jar
commons-logging-1.1.jar
- use test && java-pkg_jar-from --build-only junit junit.jar
junit-3.8.1.jar
-
- cd "${S}/src/contrib/lib"
- java-pkg_jar-from commons-beanutils-1.7 commons-beanutils.jar
commons-beanutils-1.7.0.jar
- java-pkg_jar-from commons-lang-2.1 commons-lang.jar commons-lang-2.1.jar
-
- java-pkg_filter-compiler jikes
-}
-
-src_compile() {
- # the same target compiles the source and the test so we just mess with
- # the source directory
- eant jar $(use_doc javadocs) -Ddisconnected=true \
- $(use !test && echo -Dmain.src.test=legal
-Dscratchpad.src.test=legal)
-}
-
-src_test() {
- ANT_TASKS="ant-junit" eant test -Ddisconnected=true
-}
-
-src_install() {
- use doc && java-pkg_dojavadoc build/tmp/site/build/site/*
- use examples && java-pkg_doexamples src/examples/*
src/scratchpad/examples/*
- use source && java-pkg_dosrc src/contrib/src/org src/java/org
src/scratchpad/src/org
-
- cd build/dist
- local VERSION=$(get_version_component_range 1-2)
- java-pkg_newjar poi-scratchpad-${VERSION}* ${PN}-scratchpad.jar
- java-pkg_newjar poi-contrib-${VERSION}* ${PN}-contrib.jar
- java-pkg_newjar poi-${VERSION}* ${PN}.jar
-}
diff --git a/dev-java/poi/poi-3.2.ebuild b/dev-java/poi/poi-3.2.ebuild
deleted file mode 100644
index 782886c..0000000
--- a/dev-java/poi/poi-3.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=1
-JAVA_PKG_IUSE="doc examples source"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java API To Access Microsoft Format Files"
-HOMEPAGE="http://poi.apache.org/";
-RELEASE_DATE="20081019"
-SRC_URI="mirror://apache/poi/release/src/${PN}-src-${PV}-FINAL-${RELEASE_DATE}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3.2"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="test"
-
-COMMON_DEPEND="
- >=dev-java/commons-logging-1.1"
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEPEND}"
-DEPEND=">=virtual/jdk-1.4
- ${COMMON_DEPEND}
- test? ( dev-java/ant-junit )"
-
-S=${WORKDIR}/${P}-FINAL
-
-src_unpack() {
- unpack ${A}
-
- cd "${S}"
- find -name "*.jar" | xargs rm -v
-
- cd "${S}/lib"
- java-pkg_jar-from commons-logging commons-logging.jar
commons-logging-1.1.jar
- use test && java-pkg_jar-from --build-only junit junit.jar
junit-3.8.1.jar
-
- java-pkg_filter-compiler jikes
-}
-
-src_compile() {
- # the same target compiles the source and the test so we just mess with
- # the source directory
- eant jar $(use_doc javadocs) -Ddisconnected=true \
- $(use !test && echo -Dmain.src.test=legal
-Dscratchpad.src.test=legal)
-}
-
-src_test() {
- ANT_TASKS="ant-junit" eant test -Ddisconnected=true
-}
-
-src_install() {
- use doc && java-pkg_dojavadoc build/tmp/site/build/site/apidocs
- use examples && java-pkg_doexamples src/examples/*
src/scratchpad/examples/*
- use source && java-pkg_dosrc src/contrib/src/org src/java/org
src/scratchpad/src/org
-
- cd build/dist || die "Cannot change to dist directory"
- java-pkg_newjar poi-scratchpad-${PV}* ${PN}-scratchpad.jar
- java-pkg_newjar poi-contrib-${PV}* ${PN}-contrib.jar
- java-pkg_newjar poi-${PV}* ${PN}.jar
-}
