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/files/2.0-common.xml.patch
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/files/2.0-common.xml.patch')
-rw-r--r--dev-java/guice/files/2.0-common.xml.patch21
1 files changed, 21 insertions, 0 deletions
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>