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

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x77C501ED

5 files changed, 150 insertions, 9 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/Manifest b/dev-java/guice/Manifest
index 6125ccc03c4d..48dea757f3ee 100644
--- a/dev-java/guice/Manifest
+++ b/dev-java/guice/Manifest
@@ -3,18 +3,22 @@ Hash: SHA256
 
 AUX 2.0-build.xml.patch 624 SHA256 cb5f8c4021ab7386ffeab33e86c3443b5b88623bdd9e1572770cb1e54110d9f3 SHA512 1619d921e7bb4718ea754ccb3beb7a7facda933c716a87ae063392f7f3b9e3478ce74c50ec6cce12fe23277a48a1831564252293c79577c846fade993079f91d WHIRLPOOL 212332e3cf4e0aacad39d76ba2e90af32e3038d8ee327aa72b4a5a7a027d5fa0c82cd70ef01de5867fef938a9cd0837dc6897de4889da5adf43e020c3efa2eb1
 AUX 2.0-common.xml.patch 1122 SHA256 c68dd2657cf7f056ce60039dbe0f93d3672390adcbb0a2d8a7b7103b8ebd483f SHA512 5689455fc54732e06ca162e937d8acb889cef410e266b5d287b398edaff4a1fe1322bcf9643eff7c3b0c493d19172975bedb5e2d75028329bd4b1d8d9fd140c5 WHIRLPOOL 6bb269abf389a2864206768dfe900487bef42685bba903d66d18b8704e2b96b37167ce7ac21795536cca17508582292afd2bb5962b2a564c9ed24fbecb92f28f
+AUX 3.0-build.xml.patch 2486 SHA256 9d9cc3f7bb73992a83c13b05b2c774a0c7dc8b280b5c837122adc5abf9c57c45 SHA512 d1f6d56f108533bbb97f6ef7ec951fb68d125c778bcfde3d4a4e24d5f1b78be413252f56567862fc620926f688251e7dd6e0cf5ba3bcad662e555df47711c600 WHIRLPOOL c22e41641e66371a78ac4d4cfb00dc20aa4f4b9e355246f05ce7a252dddaab110840c9aa48e54cb437c32c8cdcbbff92224db2f0886e18d2c52eee637465f075
+AUX 3.0-common.xml.patch 1562 SHA256 39b1cc3190d17232d3064bdf47c411eb861f7a5c199bb1c00acf648d9031c681 SHA512 2c2d332781d2c464f7f2a2cc2e5f0009a4ab0cd6f58d12867de68a4ec8a0d410de156156495cc30680140ec4e80d59e27c84b01ac07b1b54cb31ed47b8912719 WHIRLPOOL 35a94dd7cc0041960914c1e6fad6407054b801aa910dd70804b4a401aa60e5d09902d261a922b62126f9ee3eb07bd2a5e8f043108f8d5aff9afd3d0fe302f0cc
 DIST guice-2.0-src.zip 17342981 SHA256 7f836156d9d6b7688d373a4c70971b8b42e3a553e26a8f98a110a868eb749394 SHA512 61e1c5b6bbd7db5017a99b2998b706071717781360ab8d622d163be2cc954d9b34ab8b68d2ab02f29bb1a8b640ac25350dca302c390855641ca3e4cc4438a1b9 WHIRLPOOL 7be8673b603ad1aa722ddb76cefaec5e1d03e9a4199d25cbb1a58a31f89c33ac1d9e0a479951b5412cc2c94504d46afd56f42a57f3d87ef3915554fbf821d506
+DIST guice-3.0-src.zip 24396399 SHA256 aaa4da9c2d588018b69a757879966da7fcaa02b4a6b208f1300a313c1a426eba SHA512 2918a2ec1c355025d789c6de4275e1b87fa0263e4529813b9758f219d9faeb08cdcba5a82962c3ec632fbdb31376c03198d12599ce6b2ae872cf8b252edd7a05 WHIRLPOOL e2b602bff8e85c6223f05bc750b912e1068f8546cc78fc31957107b6e9e8d0d23e99ea9e94b51562882ccabab14485245207f6754137d33d5e8cc6358e3e9402
 EBUILD guice-2.0.ebuild 1284 SHA256 ceeadcb5221e0c5f593a11f98666c54bec4ebd520949337947c7df28650f7ecd SHA512 2b12d2e60b252ee57973e12f60eba185ab0ab75e135f562376d6eb5821cff52a9319e5331c0691dae16e210f90d4f841bfe2473ee1bd569c6ac9c861b4daf063 WHIRLPOOL 6b6f59aecb139b41ed9d7b7fe3877f5d838f275aa26a730bebd72a2e727acc71357b3e2ee5e1d6dbd044c58a726058ec05435be3c8d5194374abf33166d16bbe
-MISC ChangeLog 434 SHA256 1ddaede3b96f5f8717c3d428534dc3b05eeacdd48490563d99d72e5ad716632f SHA512 6e2e0be39c9095fa9abdaf89f69ba15d2f1b8c4a3bc04beba80e77a072f0e2243f0ff5b1fa49d52249dd58ae7feb8edf605c0c60fde8ceb9df9c6555280f9528 WHIRLPOOL a949741497886af81024d01c21194535529aadad66791b59bed2d35b6388d42c2c906e56f57c6ada697275a0045139510be19539006b4e5019477e8f4308d88c
+EBUILD guice-3.0.ebuild 1241 SHA256 6aea6ac4fb0465ebaf091ba7cba79af979d9aabb207f76ab73a9ab2979d9c404 SHA512 2763c48cd48401117a0d6b0d3040abc8ca2a3312615121e923f2824efc35fc4dd75be0eb771717db507f9a5def03121d4fc176e5d7b7ac0182cfb7f5b35ec988 WHIRLPOOL 9e8373b6e1db3176b1698ad6232ce9b88d20afbf5af570b0b10e3809d0f446fbb79a968d090d6a961fa411a684cc1cd8778baba0add1ae856ea5cc6be952480d
+MISC ChangeLog 664 SHA256 c3188a18686a3288f8cfa8a3d5e0e8b1fe1dbf0dc48110ad85f1057198c9dfbd SHA512 e2e51ec50a5d1a22c3aa361d8caeae07ad745bb725f99b4890eab7f9d698fc5342528f1c25302e3684e35167df25aa954ed35e0dfc50634e1ac895ce2ec66427 WHIRLPOOL a096959ef58246b5be830d03edd5ffaaed76a58b0d2663e91f0a4f0c303587a1a943d63fc93fe023231efc0121b6bddd2d85678bb81a8d1cbcbf3d0c7d124289
 MISC metadata.xml 241 SHA256 06abd52331abac969df4f818ffe7047e0cc3fdfc1a243cec03e53b5a665cfdb1 SHA512 2aab29c42487d867d041d8753ad7fa8261f418a14aa8981c169955c6ccca991e1fd5b7c83a451fb1dc724c5a94ac28a552fff7eb9a78ea5988a1916a1803246f WHIRLPOOL c53ad30024ef34350c7759715758ec6b8296d5dcbd322724c0e0c3ee5a3a6f4fbfddd7d2d605bd08d605103c56e05e7e9038e12074a623631d2c542898581850
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSQxtPAAoJEKCEBkJ3xQHtOzYH/RuOLvioak9cZkCGTvvIC9dP
-Hznfbt0SwXlBZ0AgzRAQjvlMc68Qle3OQlwmtzHHyscvcSW4y+lh+PZ5BPfbc5yK
-Kmqn+ECHzrl60wcbQCAqUVgbGuFJ1sZvRvkUIBYQKekKA2HCOq/1czWhq+LRg6j0
-jSiCSjfL1OFpsyRsdtrZ/iWO/Nghjc+eY1M7BBSsU6bhpKZ1gBRgSVWl4CwI5WgM
-kOAhaI+qpy2VIckIJirLabP75xxtKMn67Hu2cUKpEn2DKXZYZmtgBi7OHa7jNEcn
-zHZSKEa+QIRofiL6w6FCmeWV4S/UcZFI1mb/+DTXGFLAgKnro18eBCqkkJpFm5A=
-=v0kN
+iQEcBAEBCAAGBQJSQxu+AAoJEKCEBkJ3xQHt52cH/2I4L45ve8QuyFoqSeTC5jeL
+b27//a4sLcAKn8ydxIsHRNj/FtZXdEMmAY8ZDGjeFo4rSLaiOxz2WtkuoWRDdDfj
++5owbrO9P/oRVUmhiCa+QPXPfMhY9FL39Kzk6xLsvMjXG5BHdPDfSZHM2HAWdIkO
+LI8/aqjKgoIqAVvfkGVM2hec+O6LzZwI2G15IEQJe8bPU/f/wVlC+9rK0noGG5XS
+rFWQqNYGTlNqVcrj6zfjYT55G9ivEiAITUfvr/tZ6G8B0hxSCjZLyP94YX7dlLVA
+cvezauQbMpKI5AnBuE6j4cg4hp2qXd9DdLPoTMFHS9YYjL8Jhe44Ki1FEf/rWZI=
+=qjqc
 -----END PGP SIGNATURE-----
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
+}