diff options
6 files changed, 95 insertions, 135 deletions
diff --git a/dev-java/commons-discovery/ChangeLog b/dev-java/commons-discovery/ChangeLog index 265c10385627..4d64012ac733 100644 --- a/dev-java/commons-discovery/ChangeLog +++ b/dev-java/commons-discovery/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-java/commons-discovery # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-discovery/ChangeLog,v 1.12 2005/01/05 16:46:35 karltk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-discovery/ChangeLog,v 1.13 2005/04/17 14:41:16 luckyduck Exp $ + + 17 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> + files/commons-discovery-0.2-gentoo.diff, -commons-discovery-0.2-r1.ebuild, + commons-discovery-0.2-r2.ebuild: + 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. *commons-discovery-0.2-r2 (05 Jan 2005) diff --git a/dev-java/commons-discovery/Manifest b/dev-java/commons-discovery/Manifest index d5ee07cc0b38..e47aae520a24 100644 --- a/dev-java/commons-discovery/Manifest +++ b/dev-java/commons-discovery/Manifest @@ -1,7 +1,15 @@ -MD5 6409cda81e735af689f4f3b112e88d85 commons-discovery-0.2-r1.ebuild 1234 -MD5 009ad22a3663d3bf6cb0b1189294c4b8 commons-discovery-0.2-r2.ebuild 1597 -MD5 56dcf94202c6f0b7d7c326db81ea5c1b ChangeLog 1673 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 9b7c72d74c208485d7fa7cedb743971b commons-discovery-0.2-r2.ebuild 1616 +MD5 c25000b1ba7960bb7f0d32fb95d366b8 ChangeLog 2012 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 -MD5 c986a5b1efe7715c57da38bb9423ef86 files/digest-commons-discovery-0.2-r1 76 MD5 c986a5b1efe7715c57da38bb9423ef86 files/digest-commons-discovery-0.2-r2 76 -MD5 02122774d482c465b4d83bf79782c3f1 files/commons-discovery-0.2-gentoo.diff 3255 +MD5 18c8ff24139983c581fa7dbb1d6983fa files/commons-discovery-0.2-gentoo.diff 2296 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.0 (GNU/Linux) + +iD8DBQFCYnWf06ebR+OMO78RAtq5AJ9JuY+eD9hbY9vyy2OulrA6uy/3SACcDQEL +vBRtlQOCtdzCth5eP0TvEgM= +=EkDU +-----END PGP SIGNATURE----- diff --git a/dev-java/commons-discovery/commons-discovery-0.2-r1.ebuild b/dev-java/commons-discovery/commons-discovery-0.2-r1.ebuild deleted file mode 100644 index ffc29137778f..000000000000 --- a/dev-java/commons-discovery/commons-discovery-0.2-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-discovery/commons-discovery-0.2-r1.ebuild,v 1.7 2005/01/01 18:16:43 eradicator Exp $ - -inherit java-pkg - -DESCRIPTION="The Discovery component is about discovering, or finding, implementations for pluggable interfaces." -HOMEPAGE="http://jakarta.apache.org/commons/discovery.html" -SRC_URI="mirror://apache/jakarta/commons/discovery/source/${PN}-${PV}-src.tar.gz" -DEPEND=">=virtual/jdk-1.3 - >=dev-java/commons-logging-1.0 - dev-java/junit - >=dev-java/ant-1.4" -RDEPEND=">=virtual/jdk-1.3" -LICENSE="Apache-1.1" -SLOT="0" -KEYWORDS="x86 ppc ~sparc ~amd64" -IUSE="doc junit" - -S="${WORKDIR}/${P}-src/discovery" - -src_compile() { - [ -f LICENSE.txt ] && cp LICENSE.txt ../LICENSE - echo "logger.jar=`java-config --classpath=commons-logging | sed s/\=.*:/\=/`" >> build.properties - echo "junit.jar=`java-config -p junit`" >> build.properties - local antflags="dist" - use junit && antflags="${antflags} compile.tests" - ant ${antflags} -} - -src_install() { - java-pkg_dojar dist/${PN}.jar - use doc && java-pkg_dohtml -r dist/docs/ - dohtml PROPOSAL.html STATUS.html best-practices.html - dodoc TODO -} diff --git a/dev-java/commons-discovery/commons-discovery-0.2-r2.ebuild b/dev-java/commons-discovery/commons-discovery-0.2-r2.ebuild index a65f768a139f..fc2320106ae9 100644 --- a/dev-java/commons-discovery/commons-discovery-0.2-r2.ebuild +++ b/dev-java/commons-discovery/commons-discovery-0.2-r2.ebuild @@ -1,38 +1,42 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-discovery/commons-discovery-0.2-r2.ebuild,v 1.1 2005/01/05 16:46:35 karltk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-discovery/commons-discovery-0.2-r2.ebuild,v 1.2 2005/04/17 14:41:16 luckyduck Exp $ inherit java-pkg eutils -DESCRIPTION=" The Discovery Component is about discovering, or finding, implementations for pluggable interfaces. It provides facilities intantiating classes in general, and for lifecycle management of singleton (factory) classes." +DESCRIPTION="Commons Discovery: Service Discovery component" HOMEPAGE="http://jakarta.apache.org/commons/discovery" -SRC_URI="mirror://apache/jakarta/commons/discovery/source/${PN}-${PV}-src.tar.gz" -DEPEND=">=dev-java/ant-core-1.5.4-r2 +SRC_URI="mirror://apache/jakarta/commons/discovery/source/${P}-src.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="x86 ppc ~sparc amd64" +IUSE="source junit jikes doc" + +DEPEND="source? ( app-arch/zip ) jikes? ( >=dev-java/jikes-1.21 ) - junit? ( >=dev-java/junit-3.8 >=virtual/jdk-1.4 ) + junit? ( >=dev-java/junit-3.8 >=virtual/jdk-1.4 dev-java/ant ) dev-java/commons-logging - !junit? ( >=virtual/jdk-1.3 ) " + !junit? ( >=virtual/jdk-1.3 dev-java/ant-core )" RDEPEND=">=virtual/jdk-1.3" -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc ~amd64" -IUSE="junit jikes doc" S="${WORKDIR}/${P}-src/discovery" src_unpack() { unpack ${A} cd ${S} + + chmod u+w ${S}/../discovery epatch ${FILESDIR}/${PN}-${PV}-gentoo.diff - mkdir -p target/lib - cd target/lib + + mkdir -p ${S}/target/lib && cd ${S}/target/lib java-pkg_jar-from junit junit.jar || die "Could not link to junit" java-pkg_jar-from commons-logging || die "Could not link to commons-logging" } src_compile() { local antflags="dist" - use jikes && antflags="${antflags} -Dbuild.compiler=jikes" use doc && antflags="${antflags} javadoc" + use jikes && antflags="${antflags} -Dbuild.compiler=jikes" use junit && antflags="${antflags} test.discovery" ant ${antflags} || die "compile problem" } @@ -40,6 +44,10 @@ src_compile() { src_install() { java-pkg_dojar dist/${PN}.jar - dodoc RELEASE-NOTES.txt - dohtml PROPOSAL.html STATUS.html usersguide.html + if use doc; then + dodoc RELEASE-NOTES.txt + java-pkg_dohtml PROPOSAL.html STATUS.html usersguide.html + java-pkg_dohtml -r ${S}/dist/docs/api + fi + use source && java-pkg_dosrc ${S}/src/java/* } 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 |