dont install versioned jar files

Package-Manager: portage-2.0.51.19

10 files changed, 25 insertions, 71 deletions

diff --git a/dev-java/jgoodies-forms/ChangeLog b/dev-java/jgoodies-forms/ChangeLog
index c5c4a3f4adc1..cfb53faece01 100644
--- a/dev-java/jgoodies-forms/ChangeLog
+++ b/dev-java/jgoodies-forms/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jgoodies-forms
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-forms/ChangeLog,v 1.4 2005/04/03 09:13:57 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-forms/ChangeLog,v 1.5 2005/04/03 10:32:48 axxo Exp $
+
+*jgoodies-forms-1.0.5-r1 (03 Apr 2005)
+
+  03 Apr 2005; Thomas Matthijs <axxo@gentoo.org>
+  -jgoodies-forms-1.0.5.ebuild, +jgoodies-forms-1.0.5-r1.ebuild:
+  dont install versioned jar files
 
   03 Apr 2005; <SeJo@gentoo.org> jgoodies-forms-1.0.5.ebuild:
   added ~ppc keyword
diff --git a/dev-java/jgoodies-forms/Manifest b/dev-java/jgoodies-forms/Manifest
index f5d6325efaad..9ff14a5167a1 100644
--- a/dev-java/jgoodies-forms/Manifest
+++ b/dev-java/jgoodies-forms/Manifest
@@ -1,15 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 93595c9c3006767a0d42a39e7af681d0 jgoodies-forms-1.0.5-r1.ebuild 1373
 MD5 f9862cc751b78ac75b97bd95b7cfc04e ChangeLog 839
-MD5 52bcdbfb26d12ffdc729ff96aa93600c jgoodies-forms-1.0.5.ebuild 1349
 MD5 0a7e021f886fb1b2e57c3ceb9eb8f9e7 metadata.xml 308
 MD5 70ea49a2adf28cc8e1f6bcab10f3ec6a files/build.xml 2228
+MD5 c16aedc8761321cd512f9d3b7497195a files/digest-jgoodies-forms-1.0.5-r1 61
 MD5 c16aedc8761321cd512f9d3b7497195a files/digest-jgoodies-forms-1.0.5 61
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCT7PaMXMsRNMHhmARArMtAKDypQojOQoTscG+s0ZL3sl6wyCGwACgysz4
-fHlaqeQX81PeOby4IRtDqiI=
-=WHGu
------END PGP SIGNATURE-----
diff --git a/dev-java/jgoodies-forms/files/digest-jgoodies-forms-1.0.5 b/dev-java/jgoodies-forms/files/digest-jgoodies-forms-1.0.5-r1
index cd2c61a15f01..cd2c61a15f01 100644
--- a/dev-java/jgoodies-forms/files/digest-jgoodies-forms-1.0.5
+++ b/dev-java/jgoodies-forms/files/digest-jgoodies-forms-1.0.5-r1
diff --git a/dev-java/jgoodies-forms/jgoodies-forms-1.0.5.ebuild b/dev-java/jgoodies-forms/jgoodies-forms-1.0.5-r1.ebuild
index 3a0548aa8a2a..43a71648c9c3 100644
--- a/dev-java/jgoodies-forms/jgoodies-forms-1.0.5.ebuild
+++ b/dev-java/jgoodies-forms/jgoodies-forms-1.0.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-forms/jgoodies-forms-1.0.5.ebuild,v 1.4 2005/04/03 09:13:57 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-forms/jgoodies-forms-1.0.5-r1.ebuild,v 1.1 2005/04/03 10:32:48 axxo Exp $
 
 inherit java-pkg
 
@@ -49,7 +49,8 @@ src_compile() {
 }
 
 src_install() {
-	java-pkg_dojar forms-${PV}.jar
+	mv forms-${PV}.jar forms.jar
+	java-pkg_dojar forms.jar
 
 	dodoc LICENSE.txt RELEASE-NOTES.txt
 
diff --git a/dev-java/jgoodies-looks/ChangeLog b/dev-java/jgoodies-looks/ChangeLog
index 765a7656e7b9..6879e1ec7857 100644
--- a/dev-java/jgoodies-looks/ChangeLog
+++ b/dev-java/jgoodies-looks/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jgoodies-looks
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-looks/ChangeLog,v 1.7 2005/03/30 23:33:42 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-looks/ChangeLog,v 1.8 2005/04/03 10:32:24 axxo Exp $
+
+*jgoodies-looks-1.3.1-r1 (03 Apr 2005)
+
+  03 Apr 2005; Thomas Matthijs <axxo@gentoo.org>
+  -jgoodies-looks-1.3_beta1.ebuild, -jgoodies-looks-1.3.1.ebuild,
+  +jgoodies-looks-1.3.1-r1.ebuild:
+  dont install versioned jar files
 
 *jgoodies-looks-1.3.1 (30 Mar 2005)
 
diff --git a/dev-java/jgoodies-looks/Manifest b/dev-java/jgoodies-looks/Manifest
index 927f7583a938..17ddfd5fc9e0 100644
--- a/dev-java/jgoodies-looks/Manifest
+++ b/dev-java/jgoodies-looks/Manifest
@@ -1,13 +1,11 @@
-MD5 cd7303e490cfcf502dfe3e729930a942 jgoodies-looks-1.3.1.ebuild 1392
-MD5 688af1a7af38caf2f9f96d70b268cfdc jgoodies-looks-1.3_beta1.ebuild 1186
+MD5 c5f88bde82a952dd966aada94f4c6d27 jgoodies-looks-1.3.1-r1.ebuild 1416
 MD5 b2df73267e64875f3c4bfeaefa71e173 jgoodies-looks-1.2.2.ebuild 1123
 MD5 25ee2b5ce69e2cfe092827fbbc1d1681 ChangeLog 1455
 MD5 0a7e021f886fb1b2e57c3ceb9eb8f9e7 metadata.xml 308
 MD5 6db5ee70549a0394991a60109a91fb61 files/build-1.3.1.xml 3009
+MD5 9dc8f7791da2ee77ebc1735f47cbcf05 files/digest-jgoodies-looks-1.3.1-r1 61
 MD5 2fc5e251f1e1d30940ddf2f332678890 files/plastic-1.3.1.txt 305
 MD5 15cde7bcfb76ac46139e101823ff4401 files/digest-jgoodies-looks-1.2.2 61
-MD5 9dc8f7791da2ee77ebc1735f47cbcf05 files/digest-jgoodies-looks-1.3.1 61
 MD5 f237f515cdae3f2d57a487ea09a68880 files/plastic.txt 308
 MD5 4a14ed9ab3e6203cbb6637a867dab1e3 files/1.3_beta1-build.xml 1659
 MD5 0ab2689d7f18b425aa99581d541fb83d files/build.xml 3035
-MD5 7f442fc8252a64c191058ec08c51bcdf files/digest-jgoodies-looks-1.3_beta1 71
diff --git a/dev-java/jgoodies-looks/files/digest-jgoodies-looks-1.3.1 b/dev-java/jgoodies-looks/files/digest-jgoodies-looks-1.3.1-r1
index 48e3e8c1180c..48e3e8c1180c 100644
--- a/dev-java/jgoodies-looks/files/digest-jgoodies-looks-1.3.1
+++ b/dev-java/jgoodies-looks/files/digest-jgoodies-looks-1.3.1-r1
diff --git a/dev-java/jgoodies-looks/files/digest-jgoodies-looks-1.3_beta1 b/dev-java/jgoodies-looks/files/digest-jgoodies-looks-1.3_beta1
deleted file mode 100644
index f59bc0e158d1..000000000000
--- a/dev-java/jgoodies-looks/files/digest-jgoodies-looks-1.3_beta1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3e4f365d9bdda6a9106a4e7e6429e6c4 looks-1_3_b1-20050108.zip 1764270
diff --git a/dev-java/jgoodies-looks/jgoodies-looks-1.3.1.ebuild b/dev-java/jgoodies-looks/jgoodies-looks-1.3.1-r1.ebuild
index 7e3c63f81ea8..1d5fdd481f8b 100644
--- a/dev-java/jgoodies-looks/jgoodies-looks-1.3.1.ebuild
+++ b/dev-java/jgoodies-looks/jgoodies-looks-1.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-looks/jgoodies-looks-1.3.1.ebuild,v 1.1 2005/03/30 23:33:42 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-looks/jgoodies-looks-1.3.1-r1.ebuild,v 1.1 2005/04/03 10:32:24 axxo Exp $
 
 inherit java-pkg
 
@@ -47,7 +47,8 @@ src_compile() {
 }
 
 src_install() {
-	java-pkg_dojar looks-${PV}.jar
+	mv looks-${PV}.jar looks.jar
+	java-pkg_dojar looks.jar
 
 	dodoc LICENSE.txt RELEASE-NOTES.txt
 	if use doc ; then
diff --git a/dev-java/jgoodies-looks/jgoodies-looks-1.3_beta1.ebuild b/dev-java/jgoodies-looks/jgoodies-looks-1.3_beta1.ebuild
deleted file mode 100644
index ca411f83ba21..000000000000
--- a/dev-java/jgoodies-looks/jgoodies-looks-1.3_beta1.ebuild
+++ /dev/null
@@ -1,49 +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/jgoodies-looks/jgoodies-looks-1.3_beta1.ebuild,v 1.2 2005/03/30 18:59:54 compnerd Exp $
-
-inherit java-pkg
-
-DESCRIPTION="JGoodies Looks Library"
-HOMEPAGE="http://www.jgoodies.com/"
-SRC_URI="http://www.jgoodies.com/download/libraries/looks-1_3_b1-20050108.zip"
-
-LICENSE="BSD"
-SLOT="1.3"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="doc jikes"
-
-DEPEND=">=virtual/jdk-1.4.2
-		>=dev-java/ant-core-1.4
-		  app-arch/unzip
-		jikes? ( >=dev-java/jikes-1.21 )"
-RDEPEND=">=virtual/jre-1.4.2"
-
-S="${WORKDIR}/looks-1.3b1"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	rm *.jar
-	mkdir ${S}/srcdir
-	unzip -d ${S}/srcdir -q looks-1.3b1-src.zip  || die "Unpack Failed"
-	cp ${FILESDIR}/${PV}-build.xml ./build.xml
-	cp ${FILESDIR}/plastic.txt .
-}
-
-src_compile() {
-	local antflags="jar"
-	use doc && antflags="${antflags} docs"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} || die "Compile failed"
-}
-
-src_install() {
-	java-pkg_dojar dist/looks.jar
-
-	dodoc LICENSE.txt RELEASE-NOTES.txt
-	if use doc ; then
-		java-pkg_dohtml -r build/doc
-	fi
-}