+++ /dev/null
-The shipped build.xml is completely bogus in trying to bring in maven.
-We just bring in ant-core, codemodel and istack-commons-runtime-1.1 ourselves,
-and it compiles perfectly.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar istack-commons-20090620.orig/buildtools/build.xml istack-commons-20090620/buildtools/build.xml
---- istack-commons-20090620.orig/buildtools/build.xml 2009-03-30 19:28:53.000000000 -0700
-+++ istack-commons-20090620/buildtools/build.xml 2009-06-20 22:15:09.194598087 -0700
-@@ -1,6 +1,8 @@
- <?xml version="1.0"?>
- <project name="istack-commons-buildtools" basedir="." default="dist" xmlns:artifact="urn:maven-artifact-ant">
-+ <property name="name" value="istack-commons-buildtools" />
- <import file="../build-common.xml"/>
-+ <!--
- <property name="maven.ant.file" value="maven-ant-tasks-2.0.9.jar"/>
- <property name="src" value="src"/>
- <property name="lib.dir" value="lib"/>
-@@ -79,5 +81,6 @@
- <fileset dir="${src}"/>
- </jar>
- </target>
-+ -->
-
- </project>
+++ /dev/null
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN=${PN%%-*}
-
-DESCRIPTION="IStack Commons - Buildtools jar"
-HOMEPAGE="https://istack-commons.java.net"
-SRC_URI="https://maven.java.net/content/repositories/releases/com/sun/${MY_PN}/${PN}/${PV}/${P}-sources.jar"
-
-LICENSE="CDDL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="dev-java/ant-core:0
- dev-java/codemodel:2"
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip
- ${CDEPEND}"
-
-JAVA_GENTOO_CLASSPATH="ant-core,codemodel-2"
+++ /dev/null
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="istack-commons - buildtools"
-HOMEPAGE="https://istack-commons.dev.java.net/"
-PROJ_PN="istack-commons"
-PROJ_P="${PROJ_PN}-${PV}"
-SUB_PN="buildtools"
-SRC_FILE="${PROJ_P}-src.tar.bz2"
-SRC_URI="mirror://gentoo/${SRC_FILE}"
-
-LICENSE="CDDL"
-SLOT="1.1"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/${PROJ_P}"
-
-# Helper to generate the tarball :-)
-# ( PN=istack-commons-runtime ; PV=20090620 ; P="${PN}-${PV}" ; . ${P}.ebuild ; src_tarball )
-src_tarball() {
- CVSROOT=':pserver:guest@cvs.dev.java.net:/cvs'
- PROJ_PN='istack-commons'
- cvs -d "${CVSROOT}" \
- export -D $PV -d "${PROJ_P}" \
- "${PROJ_PN}/${PROJ_PN}" && \
- tar cvjf "${SRC_FILE}" \
- --exclude '*.zip' \
- --exclude '*.jar' \
- "${PROJ_P}" \
- && \
- echo "New tarball located at ${SRC_FILE}"
-}
-
-java_prepare() {
- epatch "${FILESDIR}/${PROJ_PN}-20090620-less-maven.patch"
- java-ant_bsfix_one "${S}/build-common.xml"
- libdir="${S}/${SUB_PN}/lib"
- mkdir -p "${libdir}" || die
- java-pkg_jar-from --into "${libdir}" ant-core
- java-pkg_jar-from --into "${libdir}" codemodel-2
- java-pkg_jar-from --into "${libdir}" istack-commons-runtime-1.1
-}
-
-EANT_BUILD_XML="${SUB_PN}/build.xml"
-
-src_install() {
- java-pkg_dojar ${SUB_PN}/build/${PN}.jar
- use source && java-pkg_dosrc ${SUB_PN}/src/*
-}