From c9002c5e5fa0c587031643b4063ba05d75d4488c Mon Sep 17 00:00:00 2001
From: Karl Trygve Kalleberg <karltk@gentoo.org>
Date: Wed, 5 Jan 2005 16:46:35 +0000
Subject: [PATCH] Updated ebuild by Vibhav Garg <vibhavgarg@gmail.com>. Fixes
 #70845.

---
 dev-java/commons-discovery/ChangeLog          |  9 ++-
 dev-java/commons-discovery/Manifest           |  5 +-
 .../commons-discovery-0.2-r2.ebuild           | 45 +++++++++++
 .../files/commons-discovery-0.2-gentoo.diff   | 77 +++++++++++++++++++
 .../files/digest-commons-discovery-0.2-r2     |  1 +
 5 files changed, 135 insertions(+), 2 deletions(-)
 create mode 100644 dev-java/commons-discovery/commons-discovery-0.2-r2.ebuild
 create mode 100644 dev-java/commons-discovery/files/commons-discovery-0.2-gentoo.diff
 create mode 100644 dev-java/commons-discovery/files/digest-commons-discovery-0.2-r2

diff --git a/dev-java/commons-discovery/ChangeLog b/dev-java/commons-discovery/ChangeLog
index a4b17862f1b7..265c10385627 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.11 2005/01/01 18:16:43 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-discovery/ChangeLog,v 1.12 2005/01/05 16:46:35 karltk Exp $
+
+*commons-discovery-0.2-r2 (05 Jan 2005)
+
+  05 Jan 2005; Karl Trygve Kalleberg <karltk@gentoo.org>
+  +files/commons-discovery-0.2-gentoo.diff,
+  +commons-discovery-0.2-r2.ebuild:
+  Updated ebuild by Vibhav Garg <vibhavgarg@gmail.com>. Fixes #70845.
 
   20 Oct 2004; Dylan Carlson <absinthe@gentoo.org>
   commons-discovery-0.2-r1.ebuild:
diff --git a/dev-java/commons-discovery/Manifest b/dev-java/commons-discovery/Manifest
index 418aab4591bc..d5ee07cc0b38 100644
--- a/dev-java/commons-discovery/Manifest
+++ b/dev-java/commons-discovery/Manifest
@@ -1,4 +1,7 @@
-MD5 8b99e3dbb37586cad8655023f2da06e4 ChangeLog 1428
 MD5 6409cda81e735af689f4f3b112e88d85 commons-discovery-0.2-r1.ebuild 1234
+MD5 009ad22a3663d3bf6cb0b1189294c4b8 commons-discovery-0.2-r2.ebuild 1597
+MD5 56dcf94202c6f0b7d7c326db81ea5c1b ChangeLog 1673
 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
diff --git a/dev-java/commons-discovery/commons-discovery-0.2-r2.ebuild b/dev-java/commons-discovery/commons-discovery-0.2-r2.ebuild
new file mode 100644
index 000000000000..a65f768a139f
--- /dev/null
+++ b/dev-java/commons-discovery/commons-discovery-0.2-r2.ebuild
@@ -0,0 +1,45 @@
+# 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 $
+
+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."
+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
+	jikes? ( >=dev-java/jikes-1.21 )
+	junit? ( >=dev-java/junit-3.8 >=virtual/jdk-1.4 )
+	dev-java/commons-logging
+	!junit? ( >=virtual/jdk-1.3 ) "
+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}
+	epatch ${FILESDIR}/${PN}-${PV}-gentoo.diff
+	mkdir -p target/lib
+	cd 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 junit && antflags="${antflags} test.discovery"
+	ant ${antflags} || die "compile problem"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+
+	dodoc RELEASE-NOTES.txt
+	dohtml PROPOSAL.html STATUS.html usersguide.html
+}
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
new file mode 100644
index 000000000000..bb9453934d5d
--- /dev/null
+++ b/dev-java/commons-discovery/files/commons-discovery-0.2-gentoo.diff
@@ -0,0 +1,77 @@
+*** 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"
diff --git a/dev-java/commons-discovery/files/digest-commons-discovery-0.2-r2 b/dev-java/commons-discovery/files/digest-commons-discovery-0.2-r2
new file mode 100644
index 000000000000..2db042643727
--- /dev/null
+++ b/dev-java/commons-discovery/files/digest-commons-discovery-0.2-r2
@@ -0,0 +1 @@
+MD5 57968a150ea9b7158ac0e995c8f24080 commons-discovery-0.2-src.tar.gz 72783
-- 
2.26.2