dont install versioned jar

Package-Manager: portage-2.0.51.22-r1

5 files changed, 26 insertions, 20 deletions

diff --git a/dev-java/axion/Manifest b/dev-java/axion/Manifest
index de4f55eec377..29e6a3881f27 100644
--- a/dev-java/axion/Manifest
+++ b/dev-java/axion/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7c9d18e06a5302c9a3c84e822da08bbe axion-1.0_rc2-r2.ebuild 1644
+MD5 695ac377e6506a73d9e226549c7eb44c axion-1.0_rc2-r2.ebuild 1529
 MD5 5c4fb6f8bd137222c9d3921053e1b733 ChangeLog 1995
 MD5 1efa58c8ec21eb8f929a4abccb0a543e metadata.xml 515
 MD5 40a767f2792e03e5e7b536b901a4417d files/digest-axion-1.0_rc2-r2 68
 MD5 da11842a1e904d37a02a64d8dfa3ed48 files/commons-codec.patch 2452
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCjj7p06ebR+OMO78RAjFdAJ96r2N/tw1bMnEheNvnHoaMRr0VVACfbpfF
-zBR1MwJVGvEIx4AtwLzn9Ss=
-=oBO4
------END PGP SIGNATURE-----
diff --git a/dev-java/commons-primitives/ChangeLog b/dev-java/commons-primitives/ChangeLog
index 74f468d4f931..74ae2cab25fd 100644
--- a/dev-java/commons-primitives/ChangeLog
+++ b/dev-java/commons-primitives/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-primitives
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-primitives/ChangeLog,v 1.10 2005/04/22 08:22:25 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-primitives/ChangeLog,v 1.11 2005/07/12 12:28:26 axxo Exp $
+
+*commons-primitives-1.0-r1 (12 Jul 2005)
+
+  12 Jul 2005; Thomas Matthijs <axxo@gentoo.org>
+  -commons-primitives-1.0.ebuild, +commons-primitives-1.0-r1.ebuild:
+  dont install versioned jar
 
   22 Apr 2005; Simon Stelling <blubb@gentoo.org>
   commons-primitives-1.0.ebuild:
diff --git a/dev-java/commons-primitives/Manifest b/dev-java/commons-primitives/Manifest
index a14f2408fbb5..32aa584b7760 100644
--- a/dev-java/commons-primitives/Manifest
+++ b/dev-java/commons-primitives/Manifest
@@ -1,4 +1,14 @@
-MD5 ca45fea79e4fd37363731d01a04376ea ChangeLog 1079
-MD5 4c67765396d69b77338e422429de8662 commons-primitives-1.0.ebuild 972
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 16bad637d20009d01f2662b387d1f533 commons-primitives-1.0-r1.ebuild 970
+MD5 a1f54cc6237bd7ac88c3a114bb686405 ChangeLog 1268
 MD5 0310767b2ff676820a832934e4121aef metadata.xml 510
-MD5 fc86ad5bce5744c5bb8b9e3f61f702d6 files/digest-commons-primitives-1.0 78
+MD5 fc86ad5bce5744c5bb8b9e3f61f702d6 files/digest-commons-primitives-1.0-r1 78
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC07eA/rLF9B432nYRAhY0AJwJYK/W4C0ru/fSZh5H6GxjypzBTQCgyufT
+Tf8qfpfVPohd5noM6yZ5K+k=
+=3q7v
+-----END PGP SIGNATURE-----
diff --git a/dev-java/commons-primitives/commons-primitives-1.0.ebuild b/dev-java/commons-primitives/commons-primitives-1.0-r1.ebuild
index 498aaf5a1a40..512f9ae1f5b7 100644
--- a/dev-java/commons-primitives/commons-primitives-1.0.ebuild
+++ b/dev-java/commons-primitives/commons-primitives-1.0-r1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-primitives/commons-primitives-1.0.ebuild,v 1.8 2005/04/22 08:22:25 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-primitives/commons-primitives-1.0-r1.ebuild,v 1.1 2005/07/12 12:28:26 axxo Exp $
 
 inherit java-pkg
 
 DESCRIPTION="The Jakarta-Commons Primitives Component"
 HOMEPAGE="http://jakarta.apache.org/commons/primitives/"
-SRC_URI="mirror://apache/jakarta/commons/primitives/source/${PN}-${PV}-src.tar.gz"
+SRC_URI="mirror://apache/jakarta/commons/primitives/source/${P}-src.tar.gz"
 DEPEND=">=virtual/jdk-1.3
-	>=dev-java/ant-1.4
+	dev-java/ant-core
 	jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jdk-1.3"
+RDEPEND=">=virtual/jre-1.3"
 LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="x86 amd64"
@@ -24,7 +24,7 @@ src_compile() {
 }
 
 src_install() {
-	java-pkg_dojar target/${PN}-${PV}.jar
+	java-pkg_newjar target/${P}.jar ${PN}.jar
 
 	use doc && java-pkg_dohtml -r target/docs/api/*
 	use source && java-pkg_dosrc src/java/*
diff --git a/dev-java/commons-primitives/files/digest-commons-primitives-1.0 b/dev-java/commons-primitives/files/digest-commons-primitives-1.0-r1
index 818681ba35d1..818681ba35d1 100644
--- a/dev-java/commons-primitives/files/digest-commons-primitives-1.0
+++ b/dev-java/commons-primitives/files/digest-commons-primitives-1.0-r1