Version bump. Fixes bug #137536 and bug #142024.

Package-Manager: portage-2.1.2-r1

diff --git a/dev-java/commons-discovery/ChangeLog b/dev-java/commons-discovery/ChangeLog
index 73f5c1378965578fa7c724251927aef4fefb7cb7..bb789f9e8ff6a4b4a861f798a6f129b8401c24f8 100644 (file)
--- a/dev-java/commons-discovery/ChangeLog
+++ b/dev-java/commons-discovery/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-discovery
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-discovery/ChangeLog,v 1.16 2006/10/05 15:23:52 gustavoz Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-discovery/ChangeLog,v 1.17 2007/01/20 14:13:31 betelgeuse Exp $
+
+*commons-discovery-0.4 (20 Jan 2007)
+
+  20 Jan 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +files/0.4-jar-target.patch, +commons-discovery-0.4.ebuild:
+  Version bump. Fixes bug #137536 and bug #142024.
 
   05 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org>
   commons-discovery-0.2-r2.ebuild, commons-discovery-0.2-r3.ebuild:

diff --git a/dev-java/commons-discovery/Manifest b/dev-java/commons-discovery/Manifest
index 93831ba96cb154eb6a95955560d1f0659ec2d402..0c46ab515dc6a81e0c433eedd53451a6af79c667 100644 (file)
--- a/dev-java/commons-discovery/Manifest
+++ b/dev-java/commons-discovery/Manifest
@@ -1,11 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 0.4-jar-target.patch 1642 RMD160 448239da2c67cc85aba292adbf720072bdcc9b87 SHA1 2e1952e4cb54c6d0b19fb1e89db5bd77146d7d32 SHA256 76de845d48b94218441bb6decc53311953473fcdcb310d6be1580f23fed96e81
+MD5 991cd171cbb4bba8364ca864004f9135 files/0.4-jar-target.patch 1642
+RMD160 448239da2c67cc85aba292adbf720072bdcc9b87 files/0.4-jar-target.patch 1642
+SHA256 76de845d48b94218441bb6decc53311953473fcdcb310d6be1580f23fed96e81 files/0.4-jar-target.patch 1642
 AUX commons-discovery-0.2-gentoo.diff 2296 RMD160 db91f803ffbb596edb0eb3a3f7bd303298af2316 SHA1 1c261f960d1ff0b0992da3825efedb1d54809174 SHA256 63785107586dc354890cd97470911bb9324477715dcdce551e0acc2aa7028e58
 MD5 18c8ff24139983c581fa7dbb1d6983fa files/commons-discovery-0.2-gentoo.diff 2296
 RMD160 db91f803ffbb596edb0eb3a3f7bd303298af2316 files/commons-discovery-0.2-gentoo.diff 2296
 SHA256 63785107586dc354890cd97470911bb9324477715dcdce551e0acc2aa7028e58 files/commons-discovery-0.2-gentoo.diff 2296
 DIST commons-discovery-0.2-src.tar.gz 72783 RMD160 521a0439dd8f92d44dcf434abc0e3b6681c38048 SHA1 6fad15f3bc9f55175bb1319edf90533684250d14 SHA256 4c3d87c991ae2079a71b428077b1276de4fc68d7b5dd2bc2f6e084b3f286f22a
+DIST commons-discovery-0.4-src.tar.gz 78453 RMD160 2486848a6d754d522e7e87d5053a5c620b710346 SHA1 92ab3148ff2b94135c86b727f585297d770604bf SHA256 596242302be4f0502073f5a934c608289bba6221591e7dbea53ce629f67498a3
 EBUILD commons-discovery-0.2-r2.ebuild 1485 RMD160 52136aacf828ebd3d2ea550b42a79851ac685bdf SHA1 8d1ca8304c6ca75cb50b1bdd5f386495ec48fb27 SHA256 6c8cfbbdd8371b04ba40b6edaddc6904b97b143a53fbe9a87810c51d6fcb9bab
 MD5 7cd73399e22918ebe8a9d1705e3a989b commons-discovery-0.2-r2.ebuild 1485
 RMD160 52136aacf828ebd3d2ea550b42a79851ac685bdf commons-discovery-0.2-r2.ebuild 1485
@@ -14,10 +19,14 @@ EBUILD commons-discovery-0.2-r3.ebuild 1402 RMD160 3bdfa91140ac1b6a3a6b0a2311e2a
 MD5 a33f1d1e8669856f01829016cad6d9fe commons-discovery-0.2-r3.ebuild 1402
 RMD160 3bdfa91140ac1b6a3a6b0a2311e2ab505a26f553 commons-discovery-0.2-r3.ebuild 1402
 SHA256 e53b2999dffcffb0b31f5347ac8ab7b355864e2304619b4e6425058446cd54e4 commons-discovery-0.2-r3.ebuild 1402
-MISC ChangeLog 2565 RMD160 fc9250dcfaf84f0e0feb2d380aeacb4906a8aed0 SHA1 d2c13accea570fa8d95f3fde2caaa6588df24f94 SHA256 ee7fb97c8c92fc945583cccd9565c1c7f6e2f77da49e06382380c4adcbab800b
-MD5 5feb86f9a2a991aa41e704b53707d419 ChangeLog 2565
-RMD160 fc9250dcfaf84f0e0feb2d380aeacb4906a8aed0 ChangeLog 2565
-SHA256 ee7fb97c8c92fc945583cccd9565c1c7f6e2f77da49e06382380c4adcbab800b ChangeLog 2565
+EBUILD commons-discovery-0.4.ebuild 1353 RMD160 1622569cc5c2b179b5ec39863a190dd6119f4aa5 SHA1 d504c2bfa12ef9368ae06d671f04372be194000f SHA256 eb3695f43c6a5f1ce0f69642126dc1dae0ac1cdf021976a543e1ef12832bd604
+MD5 89a5ae580bd49ef16500ddb1ef358481 commons-discovery-0.4.ebuild 1353
+RMD160 1622569cc5c2b179b5ec39863a190dd6119f4aa5 commons-discovery-0.4.ebuild 1353
+SHA256 eb3695f43c6a5f1ce0f69642126dc1dae0ac1cdf021976a543e1ef12832bd604 commons-discovery-0.4.ebuild 1353
+MISC ChangeLog 2772 RMD160 45ee5d2def3b7840f79791016ddf40fe32235e22 SHA1 de5d0dcf1a414e2cf5ff022cc04627626b67d134 SHA256 a53e40027b788b8ac3db70fd4593df359d419a99997402dd0ce6619cca191ba8
+MD5 42350300f3588394b0a83df7fbf286d4 ChangeLog 2772
+RMD160 45ee5d2def3b7840f79791016ddf40fe32235e22 ChangeLog 2772
+SHA256 a53e40027b788b8ac3db70fd4593df359d419a99997402dd0ce6619cca191ba8 ChangeLog 2772
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -28,10 +37,13 @@ SHA256 7384263519a45bae509e8ffb52da92a27603b82a5c074032d5471dd7b064ad43 files/di
 MD5 21791a839076b34fa6b2109d5b796cfd files/digest-commons-discovery-0.2-r3 274
 RMD160 26da92a2e8db5a0fe0068e3c4d2085aacf1c456a files/digest-commons-discovery-0.2-r3 274
 SHA256 7384263519a45bae509e8ffb52da92a27603b82a5c074032d5471dd7b064ad43 files/digest-commons-discovery-0.2-r3 274
+MD5 896a421db2ecd08ccdffafa875fc0094 files/digest-commons-discovery-0.4 274
+RMD160 e293ae8fbcdd75ccf07a24e2ab98ba13664e4987 files/digest-commons-discovery-0.4 274
+SHA256 22aedba3a064a3fb3185429018f43b8d650d418616390840bb7a5d99e957d7c2 files/digest-commons-discovery-0.4 274
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFJSOUKRy60XGEcJIRAlnvAKChYQNtfDum4sHzU6WOZrN/fyE1fgCfcTVj
-CQ3zHiBfX0H/b4cQbgayqYg=
-=7DD2
+iD8DBQFFsiOVcxLzpIGCsLQRAqh0AKCdrBT5xPNRqdY8Alfx1q/MQE5VwQCgh07E
+eivsqZz2jvddI3DJIpofzzw=
+=ej/f
 -----END PGP SIGNATURE-----

diff --git a/dev-java/commons-discovery/commons-discovery-0.4.ebuild b/dev-java/commons-discovery/commons-discovery-0.4.ebuild
new file mode 100644 (file)
index 0000000..99a573d
--- /dev/null
+++ b/dev-java/commons-discovery/commons-discovery-0.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2007 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.4.ebuild,v 1.1 2007/01/20 14:13:31 betelgeuse Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Commons Discovery: Service Discovery component"
+HOMEPAGE="http://jakarta.apache.org/commons/discovery"
+SRC_URI="mirror://apache/jakarta/commons/discovery/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc source test"
+
+RDEPEND=">=virtual/jre-1.4
+       dev-java/commons-logging"
+
+DEPEND=">=virtual/jdk-1.4
+       ${RDEPEND}
+       dev-java/ant-core
+       source? ( app-arch/zip )
+       test? ( >=dev-java/junit-3.8 )"
+
+S="${WORKDIR}/${P}-src/"
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       # https://issues.apache.org/jira/browse/DISCOVERY-10
+       epatch "${FILESDIR}/0.4-jar-target.patch"
+}
+
+src_compile() {
+       java-pkg-2_src_compile \
+               -Dlogger.jar="$(java-pkg_getjar commons-logging commons-logging.jar)"
+}
+
+src_test() {
+       eant test.discovery \
+               -Djunit.jar="$(java-pkg_getjar junit junit.jar)" \
+               -Dlogger.jar="$(java-pkg_getjar commons-logging commons-logging.jar)"
+}
+
+src_install() {
+       java-pkg_dojar dist/${PN}.jar
+
+       dodoc NOTICE.txt RELEASE-NOTES.txt || die
+
+       use doc &&      java-pkg_dojavadoc dist/docs/api
+       use source && java-pkg_dosrc src/java/*
+}

diff --git a/dev-java/commons-discovery/files/0.4-jar-target.patch b/dev-java/commons-discovery/files/0.4-jar-target.patch
new file mode 100644 (file)
index 0000000..7cc3c98
--- /dev/null
+++ b/dev-java/commons-discovery/files/0.4-jar-target.patch
@@ -0,0 +1,41 @@
+Index: build.xml
+===================================================================
+--- build.xml  (revision 498103)
++++ build.xml  (working copy)
+@@ -175,23 +175,26 @@
+     </javadoc>
+   </target>
+ 
++  <target name="jar" depends="compile"
++   description="Create the jar file">
++    <mkdir      dir="${build.home}/classes/META-INF"/>
++    <copy      file="LICENSE.txt"
++             tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
++    <copy      file="NOTICE.txt"
++             tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
++    <mkdir      dir="${dist.home}"/>
++    <jar   jarfile="${dist.home}/${component.name}.jar"
++           basedir="${build.home}/classes"
++          manifest="${build.home}/conf/MANIFEST.MF"/>
++  </target>
+ 
+-  <target name="dist" depends="compile,javadoc"
++  <target name="dist" depends="jar,javadoc"
+    description="Create binary distribution">
+     <!-- TODO: top level files like LICENSE and README -->
+-    <mkdir      dir="${dist.home}"/>
+     <copy      file="LICENSE.txt"
+               todir="${dist.home}"/>
+     <copy      file="NOTICE.txt"
+               todir="${dist.home}"/>
+-    <mkdir      dir="${build.home}/classes/META-INF"/>
+-    <copy      file="LICENSE.txt"
+-             tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
+-    <copy      file="NOTICE.txt"
+-             tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
+-    <jar    jarfile="${dist.home}/${component.name}.jar"
+-            basedir="${build.home}/classes"
+-           manifest="${build.home}/conf/MANIFEST.MF"/>
+   </target>
+ 
+ <!-- ========== Testing section ======================================== -->

diff --git a/dev-java/commons-discovery/files/digest-commons-discovery-0.4 b/dev-java/commons-discovery/files/digest-commons-discovery-0.4
new file mode 100644 (file)
index 0000000..249329c
--- /dev/null
+++ b/dev-java/commons-discovery/files/digest-commons-discovery-0.4
@@ -0,0 +1,3 @@
+MD5 1275ad4c6ce54b9323269e30dc42dd0e commons-discovery-0.4-src.tar.gz 78453
+RMD160 2486848a6d754d522e7e87d5053a5c620b710346 commons-discovery-0.4-src.tar.gz 78453
+SHA256 596242302be4f0502073f5a934c608289bba6221591e7dbea53ce629f67498a3 commons-discovery-0.4-src.tar.gz 78453