diff options
author | James Le Cuirot <chewi@gentoo.org> | 2016-03-14 20:46:33 +0000 |
---|---|---|
committer | James Le Cuirot <chewi@gentoo.org> | 2016-03-14 21:04:30 +0000 |
commit | 89bbbc7c84ae44bfb9adde04d00c85036a371b35 (patch) | |
tree | c2710372a110b25dc38f3df024cf081265acc9c6 /dev-java/guice | |
parent | dev-java/guice: 4.0 stable on amd64 and x86 using ALLARCHES (diff) | |
download | gentoo-89bbbc7c84ae44bfb9adde04d00c85036a371b35.tar.gz gentoo-89bbbc7c84ae44bfb9adde04d00c85036a371b35.tar.bz2 gentoo-89bbbc7c84ae44bfb9adde04d00c85036a371b35.zip |
dev-java/guice: Remove old
Package-Manager: portage-2.2.28
Diffstat (limited to 'dev-java/guice')
-rw-r--r-- | dev-java/guice/Manifest | 1 | ||||
-rw-r--r-- | dev-java/guice/files/2.0-build.xml.patch | 16 | ||||
-rw-r--r-- | dev-java/guice/files/2.0-common.xml.patch | 21 | ||||
-rw-r--r-- | dev-java/guice/files/3.0-build.xml.patch | 55 | ||||
-rw-r--r-- | dev-java/guice/files/3.0-common.xml.patch | 26 | ||||
-rw-r--r-- | dev-java/guice/guice-2.0-r1.ebuild | 51 |
6 files changed, 0 insertions, 170 deletions
diff --git a/dev-java/guice/Manifest b/dev-java/guice/Manifest index 23f8e3eeddc7..53592b060e73 100644 --- a/dev-java/guice/Manifest +++ b/dev-java/guice/Manifest @@ -1,2 +1 @@ -DIST guice-2.0-src.zip 17342981 SHA256 7f836156d9d6b7688d373a4c70971b8b42e3a553e26a8f98a110a868eb749394 SHA512 61e1c5b6bbd7db5017a99b2998b706071717781360ab8d622d163be2cc954d9b34ab8b68d2ab02f29bb1a8b640ac25350dca302c390855641ca3e4cc4438a1b9 WHIRLPOOL 7be8673b603ad1aa722ddb76cefaec5e1d03e9a4199d25cbb1a58a31f89c33ac1d9e0a479951b5412cc2c94504d46afd56f42a57f3d87ef3915554fbf821d506 DIST guice-4.0.tar.gz 23103592 SHA256 353cd5130d6e7f5bdb702af2e6b4f8aedd6e152c276275a6adcf5bbefade4ddb SHA512 45bdc00ebbad051f1f31b7cb5c134e42c841a06513563abc184739a514f39bc76dcb220af77ec60f46a0d887df93e0177ce071110b41ef6e5e69bad1a30f0e40 WHIRLPOOL 7b9b1d41b5256592ae5ccbd550b008d4cd10a50e7007a3c2b3d9b5cfaaa144f43be2d398386a762d9ca4afa76b30d4ec40aed2a9c9fd1c731f359de23c3be0df diff --git a/dev-java/guice/files/2.0-build.xml.patch b/dev-java/guice/files/2.0-build.xml.patch deleted file mode 100644 index 4b0e24d3951f..000000000000 --- a/dev-java/guice/files/2.0-build.xml.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- /tmp/guice-2.0-src.orig/build.xml 2012-08-23 23:04:55.759642915 +0300 -+++ build.xml 2012-08-23 23:30:05.899593954 +0300 -@@ -13,11 +13,8 @@ - </path> - - -- <target name="jar" depends="jar.withdeps, manifest" description="Build jar."> -- <jar jarfile="${build.dir}/dist/guice-${version}.jar" -- manifest="${build.dir}/META-INF/MANIFEST.MF"> -- <zipfileset src="${build.dir}/${ant.project.name}-with-deps.jar"/> -- </jar> -+ <target name="jar" depends="jar.withdeps" description="Build jar."> -+ <echo>${build.dir}/${ant.project.name}</echo> - </target> - - <target name="dist" depends="distjars, javadoc" diff --git a/dev-java/guice/files/2.0-common.xml.patch b/dev-java/guice/files/2.0-common.xml.patch deleted file mode 100644 index f410a6438c06..000000000000 --- a/dev-java/guice/files/2.0-common.xml.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- /tmp/guice-2.0-src.orig/common.xml 2012-08-23 23:28:51.056596381 +0300 -+++ common.xml 2012-08-23 23:28:14.416597570 +0300 -@@ -108,17 +108,7 @@ - <target name="jar.withdeps" depends="compile" - description="Build jar with dependencies embedded."> - <mkdir dir="${build.dir}/dist"/> -- <dirname property="common.basedir" file="${ant.file.common}"/> -- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" -- classpath="${common.basedir}/lib/build/jarjar-1.0rc8.jar"/> -- <jarjar jarfile="${build.dir}/${ant.project.name}-with-deps.jar"> -- <fileset dir="${build.dir}/classes"/> -- <zipfileset src="${common.basedir}/lib/build/cglib-2.2.1-snapshot.jar"/> -- <zipfileset src="${common.basedir}/lib/build/asm-3.1.jar"/> -- <rule pattern="net.sf.cglib.**" result="com.google.inject.internal.cglib.@1"/> -- <rule pattern="org.objectweb.asm.**" result="com.google.inject.internal.asm.@1"/> -- <keep pattern="com.google.inject.**"/> -- </jarjar> -+ <jar destfile="${build.dir}/${ant.project.name}.jar" basedir="${build.dir}/classes" /> - </target> - - </project> diff --git a/dev-java/guice/files/3.0-build.xml.patch b/dev-java/guice/files/3.0-build.xml.patch deleted file mode 100644 index cdae24107ba6..000000000000 --- a/dev-java/guice/files/3.0-build.xml.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/guice-3.0-src/build.xml b/guice-3.0-src/build.xml -index a66a186..da1dd76 100644 ---- a/guice-3.0-src/build.xml -+++ b/guice-3.0-src/build.xml -@@ -10,11 +10,7 @@ - </path> - - -- <target name="jar" depends="jar.withdeps, manifest" description="Build jar."> -- <jar jarfile="${build.dir}/dist/guice-${version}.jar" -- manifest="${build.dir}/META-INF/MANIFEST.MF"> -- <zipfileset src="${build.dir}/${ant.project.name}-with-deps.jar"/> -- </jar> -+ <target name="jar" depends="jar.withdeps" description="Build jar."> - </target> - - <target name="dist" depends="distjars, javadoc" -@@ -166,10 +162,7 @@ - <target name="javadoc"> - <javadoc packagenames="com.google.*" - destdir="build/docs" -- docletpath="lib/build/doclava.jar" -- bootclasspath="${java.home}/lib/rt.jar" -- maxmemory="512M" -- classpath="lib/javax.inject.jar${path.separator}lib/aopalliance.jar"> -+ maxmemory="512M"> - <fileset dir="${src.dir}" defaultexcludes="yes"> - <include name="com/google/**"/> - <exclude name="com/google/inject/internal/**"/> -@@ -183,25 +176,7 @@ - <fileset dir="${multibindings.src.dir}"/> - <fileset dir="${persist.src.dir}"/> - <fileset dir="${grapher.src.dir}"/> -- <!-- TODO: this breaks Doclava for some reason -- <fileset dir="${struts2.src.dir}"/> --> -- -- <doclet name="com.google.doclava.Doclava"> -- <param name="-hdf"/> <param name="project.name"/> <param name="Guice"/> -- <param name="-since"/> <param name="lib/build/guice-1.0.xml"/> <param name="Guice_1.0" /> -- <param name="-since"/> <param name="lib/build/guice-2.0.xml"/> <param name="Guice_2.0" /> -- <param name="-apiversion" value="Guice_${new.api}"/> -- <param name="-assetsdir" value="javadoc/assets"/> -- <param name="-apixml" value="build/docs/guice-${new.api}.xml"/> -- <!-- TODO: fix doclava federation -- http://aopalliance.sourceforge.net/doc -- http://www.springframework.org/docs/api/ -- <param name="-federate"/><param name="JDK"/><param name="http://download.oracle.com/javase/6/docs/api/index.html?"/> -- <param name="-federationxml"/><param name="JDK"/><param name="http://doclava.googlecode.com/svn/static/api/openjdk-6.xml"/> -- --> -- </doclet> - </javadoc> -- <move todir="build/docs/javadoc"><fileset dir="build/docs/reference"/></move> - </target> - - <target name="no_aop" diff --git a/dev-java/guice/files/3.0-common.xml.patch b/dev-java/guice/files/3.0-common.xml.patch deleted file mode 100644 index 01162c258a12..000000000000 --- a/dev-java/guice/files/3.0-common.xml.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/guice-3.0-src/common.xml b/guice-3.0-src/common.xml -index a318ab3..62cadce 100644 ---- a/guice-3.0-src/common.xml -+++ b/guice-3.0-src/common.xml -@@ -137,20 +137,6 @@ - <target name="jar.withdeps" depends="compile" - description="Build jar with dependencies embedded."> - <mkdir dir="${build.dir}/dist"/> -- <dirname property="common.basedir" file="${ant.file.common}"/> -- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" -- classpath="${common.basedir}/lib/build/jarjar-snapshot.jar"/> -- <jarjar jarfile="${build.dir}/${ant.project.name}-with-deps.jar"> -- <fileset dir="${build.dir}/classes"/> -- <zipfileset src="${common.basedir}/lib/build/cglib-2.2.1-snapshot.jar"/> -- <zipfileset src="${common.basedir}/lib/build/asm-3.1.jar"/> -- <rule pattern="net.sf.cglib.*" result="com.google.inject.internal.cglib.$@1"/> -- <rule pattern="net.sf.cglib.**.*" result="com.google.inject.internal.cglib.@1.$@2"/> -- <rule pattern="org.objectweb.asm.*" result="com.google.inject.internal.asm.$@1"/> -- <rule pattern="org.objectweb.asm.**.*" result="com.google.inject.internal.asm.@1.$@2"/> -- <rule pattern="com.google.inject.internal.util.*" result="com.google.inject.internal.util.$@1"/> -- <rule pattern="com.google.inject.internal.util.**.*" result="com.google.inject.internal.util.@1.$@2"/> -- <keep pattern="com.google.inject.**"/> -- </jarjar> -+ <jar destfile="${build.dir}/${ant.project.name}.jar" basedir="${build.dir}/classes" /> - </target> - </project> diff --git a/dev-java/guice/guice-2.0-r1.ebuild b/dev-java/guice/guice-2.0-r1.ebuild deleted file mode 100644 index 04589ada390e..000000000000 --- a/dev-java/guice/guice-2.0-r1.ebuild +++ /dev/null @@ -1,51 +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="Guice is a lightweight dependency injection framework for Java 5 and above" -HOMEPAGE="https://code.google.com/p/google-guice/" -SRC_URI="https://google-guice.googlecode.com/files/${P}-src.zip" - -LICENSE="Apache-2.0" -SLOT="2" -KEYWORDS="amd64 x86" - -IUSE="" - -COMMON_DEPEND="dev-java/aopalliance:1 - dev-java/asm:3 - dev-java/cglib:3" -RDEPEND="|| ( virtual/jre:1.6 virtual/jre:1.7 ) - ${COMMON_DEPEND}" -DEPEND="|| ( virtual/jdk:1.6 virtual/jdk:1.7 ) - ${COMMON_DEPEND}" - -S="${WORKDIR}/${P}-src/" - -RESTRICT="test" - -JAVA_PKG_BSFIX_NAME="build.xml common.xml servlet/build.xml" -JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc" - -JAVA_ANT_REWRITE_CLASSPATH="yes" -EANT_GENTOO_CLASSPATH="aopalliance-1,asm-3,cglib-3" - -java_prepare() { - find . -name '*.jar' -delete || die - find . -name '*.class' -delete || die - epatch "${FILESDIR}"/${PV}-common.xml.patch - epatch "${FILESDIR}"/${PV}-build.xml.patch -} - -src_install() { - java-pkg_dojar build/${PN}.jar - - use doc && java-pkg_dojavadoc javadoc/ - use source && java-pkg_dosrc src/com -} |