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/commons-fileupload/files
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/commons-fileupload/files')
-rw-r--r--dev-java/commons-fileupload/files/0001-Remove-bogous-manifest-entry.patch29
-rw-r--r--dev-java/commons-fileupload/files/0002-Fix-running-tests.patch25
-rw-r--r--dev-java/commons-fileupload/files/commons-fileupload-1.2.1-gentoo.patch45
3 files changed, 99 insertions, 0 deletions
diff --git a/dev-java/commons-fileupload/files/0001-Remove-bogous-manifest-entry.patch b/dev-java/commons-fileupload/files/0001-Remove-bogous-manifest-entry.patch
new file mode 100644
index 000000000000..0c5be867489d
--- /dev/null
+++ b/dev-java/commons-fileupload/files/0001-Remove-bogous-manifest-entry.patch
@@ -0,0 +1,29 @@
+From 88920db784bbb37c1043371548642a9ad529d600 Mon Sep 17 00:00:00 2001
+From: Ralph Sennhauser <sera@gentoo.org>
+Date: Sat, 20 Apr 2013 09:51:46 +0200
+Subject: [PATCH 1/2] Remove bogous manifest entry
+
+---
+ build.xml | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index b207f76..1e18fec 100644
+--- a/build.xml
++++ b/build.xml
+@@ -252,12 +252,8 @@
+ <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
+ compress="true"
+ index="false"
+- manifest="${commons.manifestfile}"
+ basedir="${maven.build.outputDir}"
+ excludes="**/package.html">
+- <manifest>
+- <attribute name="Main-Class"/>
+- </manifest>
+ </jar>
+ </target>
+
+--
+1.8.1.5
+
diff --git a/dev-java/commons-fileupload/files/0002-Fix-running-tests.patch b/dev-java/commons-fileupload/files/0002-Fix-running-tests.patch
new file mode 100644
index 000000000000..0eb41212cd29
--- /dev/null
+++ b/dev-java/commons-fileupload/files/0002-Fix-running-tests.patch
@@ -0,0 +1,25 @@
+From ec99347a09caeae147c075813543fc839d5b4562 Mon Sep 17 00:00:00 2001
+From: Ralph Sennhauser <sera@gentoo.org>
+Date: Sat, 20 Apr 2013 09:57:06 +0200
+Subject: [PATCH 2/2] Fix running tests
+
+---
+ build.xml | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/build.xml b/build.xml
+index 1e18fec..947f325 100644
+--- a/build.xml
++++ b/build.xml
+@@ -172,6 +172,8 @@
+ <include name="**/*Test.java"/>
+ <include name="**/*TestCase.java"/>
+ <exclude name="**/*Abstract*Test.java"/>
++ <!-- base class without tests violationg naming scheme -->
++ <exclude name="**/FileUploadTestCase.java"/>
+ </fileset>
+ </batchtest>
+ <batchtest todir="${maven.test.reports}" if="test">
+--
+1.8.1.5
+
diff --git a/dev-java/commons-fileupload/files/commons-fileupload-1.2.1-gentoo.patch b/dev-java/commons-fileupload/files/commons-fileupload-1.2.1-gentoo.patch
new file mode 100644
index 000000000000..852de25cd2a3
--- /dev/null
+++ b/dev-java/commons-fileupload/files/commons-fileupload-1.2.1-gentoo.patch
@@ -0,0 +1,45 @@
+--- build.xml.orig 2008-06-21 20:06:11.000000000 +0200
++++ build.xml 2008-06-21 20:07:03.000000000 +0200
+@@ -14,7 +14,7 @@
+
+ <property name="defaulttargetdir" value="${basedir}/target">
+ </property>
+- <property name="libdir" value="${user.home}/.maven/repository">
++ <property name="libdir" value="target/lib">
+ </property>
+ <property name="classesdir" value="${basedir}/target/classes">
+ </property>
+@@ -74,7 +74,7 @@
+ </and>
+ </condition>
+ </target>
+- <target name="compile" description="o Compile the code" depends="get-deps">
++ <target name="compile" description="o Compile the code" depends="">
+ <mkdir dir="${classesdir}">
+ </mkdir>
+ <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
+@@ -94,7 +94,7 @@
+ </fileset>
+ </copy>
+ </target>
+- <target name="jar" description="o Create the jar" depends="compile,test">
++ <target name="jar" description="o Create the jar" depends="compile">
+ <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
+ </jar>
+ </target>
+@@ -172,7 +172,7 @@
+ </fileset>
+ </copy>
+ </target>
+- <target name="javadoc" description="o Generate javadoc" depends="get-deps">
++ <target name="javadoc" description="o Generate javadoc" depends="">
+ <mkdir dir="${javadocdir}">
+ </mkdir>
+ <tstamp>
+@@ -295,4 +295,4 @@
+ <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
+ </unjar>
+ </target>
+-</project>
+\ Chybí znak konce řádku na konci souboru
++</project>