summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-java/guice
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-java/guice')
-rw-r--r--dev-java/guice/Manifest2
-rw-r--r--dev-java/guice/files/2.0-build.xml.patch16
-rw-r--r--dev-java/guice/files/2.0-common.xml.patch21
-rw-r--r--dev-java/guice/files/3.0-build.xml.patch55
-rw-r--r--dev-java/guice/files/3.0-common.xml.patch26
-rw-r--r--dev-java/guice/guice-2.0-r1.ebuild51
-rw-r--r--dev-java/guice/guice-3.0-r1.ebuild50
-rw-r--r--dev-java/guice/metadata.xml9
8 files changed, 230 insertions, 0 deletions
diff --git a/dev-java/guice/Manifest b/dev-java/guice/Manifest
new file mode 100644
index 000000000000..4599a87be264
--- /dev/null
+++ b/dev-java/guice/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/dev-java/guice/files/2.0-build.xml.patch b/dev-java/guice/files/2.0-build.xml.patch
new file mode 100644
index 000000000000..4b0e24d3951f
--- /dev/null
+++ b/dev-java/guice/files/2.0-build.xml.patch
@@ -0,0 +1,16 @@
+--- /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
new file mode 100644
index 000000000000..f410a6438c06
--- /dev/null
+++ b/dev-java/guice/files/2.0-common.xml.patch
@@ -0,0 +1,21 @@
+--- /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
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-2.0-r1.ebuild b/dev-java/guice/guice-2.0-r1.ebuild
new file mode 100644
index 000000000000..33bb66f57658
--- /dev/null
+++ b/dev-java/guice/guice-2.0-r1.ebuild
@@ -0,0 +1,51 @@
+# 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="http://code.google.com/p/google-guice/"
+SRC_URI="http://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
+}
diff --git a/dev-java/guice/guice-3.0-r1.ebuild b/dev-java/guice/guice-3.0-r1.ebuild
new file mode 100644
index 000000000000..82d861cda5b1
--- /dev/null
+++ b/dev-java/guice/guice-3.0-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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:3"
+
+RDEPEND=">=virtual/jre-1.6
+ ${COMMON_DEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+ ${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-3,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
+}
diff --git a/dev-java/guice/metadata.xml b/dev-java/guice/metadata.xml
new file mode 100644
index 000000000000..32433bd1dedb
--- /dev/null
+++ b/dev-java/guice/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>java</herd>
+ <upstream>
+ <remote-id type="google-code">google-guice</remote-id>
+ </upstream>
+</pkgmetadata>
+