commit: f7372747abc086e868b0ebb831429020ebab9fb2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Wed Aug 5 19:42:25 2015 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Wed Aug 5 21:31:21 2015 +0000 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=f7372747
[dev-java/guice] Drop, depends on unavailable dev-java/cglib:2.2 dev-java/guice/ChangeLog | 34 ------------------ dev-java/guice/Manifest | 1 - dev-java/guice/files/build_xml.patch | 21 ----------- dev-java/guice/guice-1.0-r2.ebuild | 70 ------------------------------------ dev-java/guice/metadata.xml | 16 --------- 5 files changed, 142 deletions(-) diff --git a/dev-java/guice/ChangeLog b/dev-java/guice/ChangeLog deleted file mode 100644 index 59d591f..0000000 --- a/dev-java/guice/ChangeLog +++ /dev/null @@ -1,34 +0,0 @@ -# ChangeLog for dev-java/guice -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 22 Jan 2009; Alistair Bush <[email protected]> metadata.xml: - Add use flags. - - 16 Jun 2008; Serkan Kaba <[email protected]> -guice-1.0-r1.ebuild, - +guice-1.0-r2.ebuild: - Fix javadoc. - - 07 Jun 2008; Serkan Kaba <[email protected]> +files/build_xml.patch, - +metadata.xml, +guice-1.0-r1.ebuild: - Add servletapi USE flag to compile servletapi dependent jar. - - 17 Feb 2008; <[email protected]> guice-1.0.ebuild: - Fixed dependency - - 18 Sep 2007; William L. Thomson Jr. <[email protected]> guice-1.0.ebuild: - Combined two find commands into one, no real functional change. - - 12 Sep 2007; Petteri Räty <[email protected]> files/build_xml.patch, - guice-1.0.ebuild: - Ebuild cleanup and fix issues with JDKs higher than 1.5 - - 10 Sep 2007; William L. Thomson Jr. <[email protected]> guice-1.0.ebuild: - Additional improvements, had to require virtual/j**-1.5.0 dep to get 1.5 - bytecode? Bug in Java system?. Ebuild is close to being ready for tree. - Limewire compiles against it :) tests seem happy. - - 09 Sep 2007; William L. Thomson Jr. <[email protected]> - +files/build_xml.patch, +metadata.xml, +guice-1.0.ebuild: - Initial ebuild, compiles but has work to be done still. - diff --git a/dev-java/guice/Manifest b/dev-java/guice/Manifest deleted file mode 100644 index 67a1f1e..0000000 --- a/dev-java/guice/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST guice-1.0-src.zip 15805092 SHA256 1225a03dfd8ff03d9eeb77116a52d7d9cfd0f716267d36f124c2ff1ae0402693 diff --git a/dev-java/guice/files/build_xml.patch b/dev-java/guice/files/build_xml.patch deleted file mode 100644 index e37c3ee..0000000 --- a/dev-java/guice/files/build_xml.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- build.xml.orig 2007-09-12 22:52:57.000000000 +0300 -+++ build.xml 2007-09-12 22:53:47.000000000 +0300 -@@ -11,16 +11,10 @@ - - <target name="jar" depends="compile" - description="Build jar."> -- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" -- classpath="lib/build/jarjar-0.9.jar"/> - <mkdir dir="${build.dir}/dist"/> -- <jarjar jarfile="${build.dir}/dist/guice-${version}.jar"> -+ <jar jarfile="${build.dir}/dist/guice-${version}.jar"> - <fileset dir="${build.dir}/classes"/> -- <zipfileset src="lib/build/cglib-nodep-2.2_beta1.jar"/> -- <zipfileset src="lib/build/asm-3.0.jar"/> -- <rule pattern="net.sf.cglib.**" result="com.google.inject.cglib.@1"/> -- <rule pattern="org.objectweb.asm.**" result="com.google.inject.asm.@1"/> -- </jarjar> -+ </jar> - </target> - - <target name="dist" depends="jar, javadoc" diff --git a/dev-java/guice/guice-1.0-r2.ebuild b/dev-java/guice/guice-1.0-r2.ebuild deleted file mode 100644 index 714c15c..0000000 --- a/dev-java/guice/guice-1.0-r2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=1 -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Guice is a lightweight dependency injection framework for Java 5 and above." -HOMEPAGE="http://code.google.com/p/google-guice/"; -SRC_URI="http://google-guice.googlecode.com/files/${P}-src.zip"; - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="servletapi" -KEYWORDS="~amd64 ~x86" - -COMMON_DEPEND="dev-java/aopalliance - dev-java/asm:3 - dev-java/cglib:2.2 - servletapi? ( java-virtuals/servlet-api:2.5 )" -RDEPEND=">=virtual/jre-1.5 - ${COMMON_DEPEND}" -DEPEND=">=virtual/jdk-1.5 - test? ( dev-java/junit ) - ${COMMON_DEPEND}" - -S="${WORKDIR}" - -# TODO make these work -RESTRICT="test" - -JAVA_PKG_BSFIX_NAME="build.xml common.xml servlet/build.xml" -JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/build_xml.patch" - rm -rv struts2 spring || die - if ! use servletapi; then - rm -rv servlet || die - mkdir -p servlet/lib/build || die - fi - einfo "Removing bundled jars and classes" - find "${S}" -name '*.class' -print -delete - find "${S}" -name '*.jar' -print -delete - java-ant_rewrite-classpath common.xml - use servletapi && java-ant_rewrite-classpath servlet/build.xml - java-ant_rewrite-classpath build.xml -} - -src_compile() { - eant -Dgentoo.classpath=$(java-pkg_getjars aopalliance-1,cglib-2.2,asm-3) jar $(use_doc) - use servletapi && eant -Dgentoo.classpath=$(java-pkg_getjars servlet-api-2.5) -f servlet/build.xml jar -} - -src_install() { - java-pkg_newjar build/dist/${P}.jar ${PN}.jar - use servletapi && java-pkg_newjar servlet/build/${PN}-servlet-${PV}.jar ${PN}-servlet.jar - - use doc && java-pkg_dojavadoc javadoc/ - use source && java-pkg_dosrc src/com -} - -src_test() { - java-pkg_jar-from --into lib/build junit - ANT_TASKS="" eant test -} diff --git a/dev-java/guice/metadata.xml b/dev-java/guice/metadata.xml deleted file mode 100644 index e7a33c3..0000000 --- a/dev-java/guice/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <herd>java</herd> - <maintainer> - <email>[email protected]</email> - <name>Serkan Kaba</name> - </maintainer> - <longdescription> - Guice is a lightweight dependency injection framework for Java 5 and - above, brought to you by Google. - </longdescription> - <use> - <flag name="servletapi">Add support for servlets.</flag> - </use> -</pkgmetadata>
