diff options
| author |   Jan Brinkmann <luckyduck@gentoo.org> | 2005-04-17 14:41:16 +0000 |
|---|---|---|
| committer | Jan Brinkmann <luckyduck@gentoo.org> | 2005-04-17 14:41:16 +0000 |
| commit | a5433d60ecc9ac588fe52af52fc843009d2f2e77 (patch) | |
| tree | 027fa12367bce8f8bc7174b0ca0653ba4f40e739 /dev-java/commons-discovery/files | |
| parent | Stable on hppa. (diff) | |
| download | historical-a5433d60ecc9ac588fe52af52fc843009d2f2e77.tar.gz historical-a5433d60ecc9ac588fe52af52fc843009d2f2e77.tar.bz2 historical-a5433d60ecc9ac588fe52af52fc843009d2f2e77.zip | |
commited new version of the patch, fixes #81837. marked stable on amd64, ppc, and x86. also introduced support for the source useflag. cosmetic changes and cleanup.
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'dev-java/commons-discovery/files')
| -rw-r--r-- | dev-java/commons-discovery/files/commons-discovery-0.2-gentoo.diff | 128 | ||||
| -rw-r--r-- | dev-java/commons-discovery/files/digest-commons-discovery-0.2-r1 | 1 |
2 files changed, 51 insertions, 78 deletions
diff --git a/dev-java/commons-discovery/files/commons-discovery-0.2-gentoo.diff b/dev-java/commons-discovery/files/commons-discovery-0.2-gentoo.diff index bb9453934d5d..b55e10f5a0c2 100644 --- a/dev-java/commons-discovery/files/commons-discovery-0.2-gentoo.diff +++ b/dev-java/commons-discovery/files/commons-discovery-0.2-gentoo.diff @@ -1,77 +1,51 @@ -*** build.xml.orig Wed Nov 10 11:46:21 2004 ---- build.xml Wed Nov 10 12:49:12 2004 -*************** -*** 14,26 **** - <property file="../build.properties"/> <!-- Commons local -->
- <property file="${user.home}/build.properties"/> <!-- User local -->
-
-
- <!-- ========== External Dependencies ===================================== -->
-
-
- <!-- The directories corresponding to your necessary dependencies -->
-! <property name="junit.jar" value="../../junit3.7/junit.jar"/>
-! <property name="logger.jar" value="../../jakarta-commons/logging/target/commons-logging.jar"/>
-
-
- <!-- ========== Component Declarations ==================================== -->
---- 14,28 ---- - <property file="../build.properties"/> <!-- Commons local -->
- <property file="${user.home}/build.properties"/> <!-- User local -->
-
-+ <!-- The base directory for compilation targets -->
-+ <property name="build.home" value="target"/>
-
- <!-- ========== External Dependencies ===================================== -->
-
-
- <!-- The directories corresponding to your necessary dependencies -->
-! <property name="junit.jar" value="${build.home}/lib/junit.jar"/>
-! <property name="logger.jar" value="${build.home}/lib/commons-logging.jar"/>
-
-
- <!-- ========== Component Declarations ==================================== -->
-*************** -*** 38,45 **** - <!-- The current version number of this component -->
- <property name="component.version" value="0.2"/>
-
-- <!-- The base directory for compilation targets -->
-- <property name="build.home" value="target"/>
-
- <!-- The base directory for component configuration files -->
- <property name="conf.home" value="src/conf"/>
---- 40,45 ---- -*************** -*** 116,121 **** ---- 116,122 ---- -
-
- <target name="compile" depends="prepare" description="Compile shareable components">
-+
- <javac srcdir="${source.home}"
- destdir="${build.home}/classes"
- debug="${compile.debug}"
-*************** -*** 163,172 **** - description="Create binary distribution">
- <!-- TODO: top level files like LICENSE and README -->
- <mkdir dir="${dist.home}"/>
-! <copy file="../LICENSE"
-! todir="${dist.home}"/>
- <mkdir dir="${build.home}/classes/META-INF"/>
-! <copy file="../LICENSE"
- tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
- <jar jarfile="${dist.home}/commons-${component.name}.jar"
- basedir="${build.home}/classes"
---- 164,173 ---- - description="Create binary distribution">
- <!-- TODO: top level files like LICENSE and README -->
- <mkdir dir="${dist.home}"/>
-! <!--<copy file="LICENSE"
-! todir="${dist.home}"/>-->
- <mkdir dir="${build.home}/classes/META-INF"/>
-! <copy file="LICENSE.txt"
- tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
- <jar jarfile="${dist.home}/commons-${component.name}.jar"
- basedir="${build.home}/classes"
+--- build.xml.orig 2005-04-17 16:14:52.000000000 +0200 ++++ build.xml 2005-04-17 16:14:57.000000000 +0200 +@@ -14,13 +14,15 @@ + <property file="../build.properties"/> <!-- Commons local -->
+ <property file="${user.home}/build.properties"/> <!-- User local -->
+
++ <!-- The base directory for compilation targets -->
++ <property name="build.home" value="target"/>
+
+ <!-- ========== External Dependencies ===================================== -->
+
+
+ <!-- The directories corresponding to your necessary dependencies -->
+- <property name="junit.jar" value="../../junit3.7/junit.jar"/>
+- <property name="logger.jar" value="../../jakarta-commons/logging/target/commons-logging.jar"/>
++ <property name="junit.jar" value="${build.home}/lib/junit.jar"/>
++ <property name="logger.jar" value="${build.home}/lib/commons-logging.jar"/>
+
+
+ <!-- ========== Component Declarations ==================================== -->
+@@ -38,8 +40,6 @@ + <!-- The current version number of this component -->
+ <property name="component.version" value="0.2"/>
+
+- <!-- The base directory for compilation targets -->
+- <property name="build.home" value="target"/>
+
+ <!-- The base directory for component configuration files -->
+ <property name="conf.home" value="src/conf"/>
+@@ -116,6 +116,7 @@ +
+
+ <target name="compile" depends="prepare" description="Compile shareable components">
++
+ <javac srcdir="${source.home}"
+ destdir="${build.home}/classes"
+ debug="${compile.debug}"
+@@ -163,10 +164,10 @@ + description="Create binary distribution">
+ <!-- TODO: top level files like LICENSE and README -->
+ <mkdir dir="${dist.home}"/>
+- <copy file="../LICENSE"
+- todir="${dist.home}"/>
++ <!--<copy file="LICENSE"
++ todir="${dist.home}"/>-->
+ <mkdir dir="${build.home}/classes/META-INF"/>
+- <copy file="../LICENSE"
++ <copy file="LICENSE.txt"
+ tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
+ <jar jarfile="${dist.home}/commons-${component.name}.jar"
+ basedir="${build.home}/classes"
diff --git a/dev-java/commons-discovery/files/digest-commons-discovery-0.2-r1 b/dev-java/commons-discovery/files/digest-commons-discovery-0.2-r1 deleted file mode 100644 index 2db042643727..000000000000 --- a/dev-java/commons-discovery/files/digest-commons-discovery-0.2-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 57968a150ea9b7158ac0e995c8f24080 commons-discovery-0.2-src.tar.gz 72783 |