Latest version (:3) of guice - lightweight dependency injection framework

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 77C501ED)

4 files changed, 138 insertions, 1 deletions

diff --git a/dev-java/guice/ChangeLog b/dev-java/guice/ChangeLog
index f8a19adb4cf0..02fd05b9cb84 100644
--- a/dev-java/guice/ChangeLog
+++ b/dev-java/guice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/guice
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/guice/ChangeLog,v 1.1 2013/09/25 17:20:14 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/guice/ChangeLog,v 1.2 2013/09/25 17:22:05 ercpe Exp $
+
+*guice-3.0 (25 Sep 2013)
+
+  25 Sep 2013; Johann Schmitz <ercpe@gentoo.org> +files/3.0-build.xml.patch,
+  +files/3.0-common.xml.patch, +guice-3.0.ebuild:
+  Latest version (:3) of guice - lightweight dependency injection framework
 
 *guice-2.0 (25 Sep 2013)
 
diff --git a/dev-java/guice/files/3.0-build.xml.patch b/dev-java/guice/files/3.0-build.xml.patch
new file mode 100644
index 000000000000..cdae24107ba6
--- /dev/null
+++ b/dev-java/guice/files/3.0-build.xml.patch
@@ -0,0 +1,55 @@
+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
new file mode 100644
index 000000000000..01162c258a12
--- /dev/null
+++ b/dev-java/guice/files/3.0-common.xml.patch
@@ -0,0 +1,26 @@
+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-3.0.ebuild b/dev-java/guice/guice-3.0.ebuild
new file mode 100644
index 000000000000..441fd56d2bd8
--- /dev/null
+++ b/dev-java/guice/guice-3.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/guice/guice-3.0.ebuild,v 1.1 2013/09/25 17:22:05 ercpe Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="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="3"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+COMMON_DEPEND="dev-java/aopalliance:1
+	dev-java/javax-inject:0
+	dev-java/asm:3
+	dev-java/cglib:2.2"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEPEND}"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}-src/"
+
+JAVA_PKG_BSFIX_NAME="build.xml common.xml servlet/build.xml"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="aopalliance-1,asm-3,cglib-2.2,javax-inject"
+
+java_prepare() {
+	find . -name '*.jar' -exec rm -v {} + || die
+	find . -name '*.class' -exec rm -v {} + || die
+	epatch "${FILESDIR}"/${PV}-common.xml.patch
+	epatch "${FILESDIR}"/${PV}-build.xml.patch
+}
+
+src_install() {
+	java-pkg_dojar build/${PN}.jar
+	use source && java-pkg_dosrc core/src/com
+}