diff options
author | 2009-06-21 05:21:26 +0000 | |
---|---|---|
committer | 2009-06-21 05:21:26 +0000 | |
commit | 666534715792143e79c380278b0e1fb30ae9c66a (patch) | |
tree | fdd081a5092c7d59a4582e9a78f570b397fa90b3 /dev-java | |
parent | Fix installing I broke when switching to EAPI=2. (diff) | |
download | gentoo-2-666534715792143e79c380278b0e1fb30ae9c66a.tar.gz gentoo-2-666534715792143e79c380278b0e1fb30ae9c66a.tar.bz2 gentoo-2-666534715792143e79c380278b0e1fb30ae9c66a.zip |
Part of new istack-commons (upstream pom.xml tag is 1.1-SNAPSHOT) in a new slot, needed for jersey. buildtools portion was not packaged before.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'dev-java')
4 files changed, 104 insertions, 0 deletions
diff --git a/dev-java/istack-commons-buildtools/ChangeLog b/dev-java/istack-commons-buildtools/ChangeLog new file mode 100644 index 000000000000..1eda5f3b0db5 --- /dev/null +++ b/dev-java/istack-commons-buildtools/ChangeLog @@ -0,0 +1,12 @@ +# ChangeLog for dev-java/istack-commons-buildtools +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/istack-commons-buildtools/ChangeLog,v 1.1 2009/06/21 05:21:26 robbat2 Exp $ + +*istack-commons-buildtools-20090620 (21 Jun 2009) + + 21 Jun 2009; Robin H. Johnson <robbat2@gentoo.org> + +istack-commons-buildtools-20090620.ebuild, + +files/istack-commons-20090620-less-maven.patch, +metadata.xml: + Part of new istack-commons (upstream pom.xml tag is 1.1-SNAPSHOT) in a new + slot, needed for jersey. buildtools portion was not packaged before. + diff --git a/dev-java/istack-commons-buildtools/files/istack-commons-20090620-less-maven.patch b/dev-java/istack-commons-buildtools/files/istack-commons-20090620-less-maven.patch new file mode 100644 index 000000000000..5213c41d21c0 --- /dev/null +++ b/dev-java/istack-commons-buildtools/files/istack-commons-20090620-less-maven.patch @@ -0,0 +1,25 @@ +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> diff --git a/dev-java/istack-commons-buildtools/istack-commons-buildtools-20090620.ebuild b/dev-java/istack-commons-buildtools/istack-commons-buildtools-20090620.ebuild new file mode 100644 index 000000000000..d6f1b50ce6dc --- /dev/null +++ b/dev-java/istack-commons-buildtools/istack-commons-buildtools-20090620.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/istack-commons-buildtools/istack-commons-buildtools-20090620.ebuild,v 1.1 2009/06/21 05:21:26 robbat2 Exp $ + +JAVA_PKG_IUSE="source" +EAPI=2 + +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/* +} diff --git a/dev-java/istack-commons-buildtools/metadata.xml b/dev-java/istack-commons-buildtools/metadata.xml new file mode 100644 index 000000000000..669672a6dee3 --- /dev/null +++ b/dev-java/istack-commons-buildtools/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>java</herd> +<maintainer> + <email>robbat2@gentoo.org</email> +</maintainer> +</pkgmetadata> |