updated commons-beanutils dependency to reflect new slotting. see #71952

(Portage version: 2.0.51.21)

6 files changed, 15 insertions, 48 deletions

diff --git a/app-text/jasperreports/ChangeLog b/app-text/jasperreports/ChangeLog
index c136a0b075ee..b88ccb99d462 100644
--- a/app-text/jasperreports/ChangeLog
+++ b/app-text/jasperreports/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/jasperreports
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jasperreports/ChangeLog,v 1.9 2005/01/20 16:02:31 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jasperreports/ChangeLog,v 1.10 2005/05/14 16:09:11 luckyduck Exp $
+
+*jasperreports-0.6.1-r3 (14 May 2005)
+
+  14 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -jasperreports-0.6.1-r1.ebuild, -jasperreports-0.6.1-r2.ebuild,
+  +jasperreports-0.6.1-r3.ebuild:
+  updated commons-beanutils dependency to reflect new slotting. see #71952
 
   20 Jan 2005; Michael Sterrett <mr_bones_@gentoo.org>
   jasperreports-0.6.1-r1.ebuild, jasperreports-0.6.1-r2.ebuild:
diff --git a/app-text/jasperreports/Manifest b/app-text/jasperreports/Manifest
index 08a56becc57d..4c4af8c9673f 100644
--- a/app-text/jasperreports/Manifest
+++ b/app-text/jasperreports/Manifest
@@ -1,6 +1,4 @@
-MD5 13e0085829057a3de11fb61f23e4690b ChangeLog 1491
+MD5 e248aa3f97e76a718efa807a5779c02d jasperreports-0.6.1-r3.ebuild 1832
+MD5 fb49bd9e4b372985419c05c5c325065a ChangeLog 1758
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 b5b029ee917890d393fa3714e49741b5 jasperreports-0.6.1-r1.ebuild 1183
-MD5 4c29d38584b076d5c02b3ae3f60715be jasperreports-0.6.1-r2.ebuild 1874
-MD5 7c129dc0ae90126adb4848378fe1b872 files/digest-jasperreports-0.6.1-r1 78
-MD5 7c129dc0ae90126adb4848378fe1b872 files/digest-jasperreports-0.6.1-r2 78
+MD5 7c129dc0ae90126adb4848378fe1b872 files/digest-jasperreports-0.6.1-r3 78
diff --git a/app-text/jasperreports/files/digest-jasperreports-0.6.1-r2 b/app-text/jasperreports/files/digest-jasperreports-0.6.1-r2
deleted file mode 100644
index 73beb3c18a75..000000000000
--- a/app-text/jasperreports/files/digest-jasperreports-0.6.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 51ea86014463f03c8450a72960d62d88 jasperreports-0.6.1-project.zip 16362336
diff --git a/app-text/jasperreports/files/digest-jasperreports-0.6.1-r1 b/app-text/jasperreports/files/digest-jasperreports-0.6.1-r3
index 73beb3c18a75..73beb3c18a75 100644
--- a/app-text/jasperreports/files/digest-jasperreports-0.6.1-r1
+++ b/app-text/jasperreports/files/digest-jasperreports-0.6.1-r3
diff --git a/app-text/jasperreports/jasperreports-0.6.1-r1.ebuild b/app-text/jasperreports/jasperreports-0.6.1-r1.ebuild
deleted file mode 100644
index a4b6adcc859d..000000000000
--- a/app-text/jasperreports/jasperreports-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jasperreports/jasperreports-0.6.1-r1.ebuild,v 1.5 2005/01/20 16:02:31 mr_bones_ Exp $
-
-inherit java-pkg
-
-DESCRIPTION="JasperReports is a powerful report-generating tool that has the ability to deliver rich content onto the screen, to the printer or into PDF, HTML, XLS, CSV and XML files."
-HOMEPAGE="http://jasperreports.sourceforge.net/"
-SRC_URI="mirror://sourceforge/jasperreports/${P}-project.zip"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="jikes doc"
-DEPEND=">=virtual/jdk-1.2
-	app-arch/unzip
-	>=dev-java/ant-1.4
-	jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jdk-1.2
-	dev-java/gnu-jaxp
-	dev-java/commons-digester
-	dev-java/commons-beanutils
-	dev-java/commons-collections
-	dev-java/commons-logging
-	dev-java/itext
-	dev-java/poi"
-
-src_compile() {
-	local antflags="jar"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	use doc && antflags="${antflags} docs"
-	ant ${antflags} || die "Compilation failed"
-}
-
-src_install() {
-	java-pkg_dojar dist/*.jar || die "Missing jars"
-	use doc && java-pkg_dohtml -r docs/*
-}
diff --git a/app-text/jasperreports/jasperreports-0.6.1-r2.ebuild b/app-text/jasperreports/jasperreports-0.6.1-r3.ebuild
index 343cf8c69ac3..a303131c99ee 100644
--- a/app-text/jasperreports/jasperreports-0.6.1-r2.ebuild
+++ b/app-text/jasperreports/jasperreports-0.6.1-r3.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/app-text/jasperreports/jasperreports-0.6.1-r2.ebuild,v 1.3 2005/01/20 16:02:31 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jasperreports/jasperreports-0.6.1-r3.ebuild,v 1.1 2005/05/14 16:09:11 luckyduck Exp $
 
 inherit java-pkg
 
@@ -19,7 +19,7 @@ RDEPEND=">=virtual/jre-1.4
 	dev-java/gnu-jaxp
 	>=dev-java/itext-1.02
 	>=dev-java/bsh-1.99
-	>=dev-java/commons-beanutils-1.6.1
+	=dev-java/commons-beanutils-1.6*
 	>=dev-java/commons-collections-3.1
 	>=dev-java/commons-digester-1.5
 	>=dev-java/commons-logging-1.0.4
@@ -39,7 +39,7 @@ src_unpack() {
 	java-pkg_jar-from itext iText.jar
 	java-pkg_jar-from ant-core ant.jar
 	java-pkg_jar-from bsh bsh.jar
-	java-pkg_jar-from commons-beanutils commons-beanutils.jar
+	java-pkg_jar-from commons-beanutils-1.6
 	java-pkg_jar-from commons-collections
 	java-pkg_jar-from commons-digester
 	java-pkg_jar-from commons-logging
@@ -58,6 +58,6 @@ src_compile() {
 }
 
 src_install() {
-	java-pkg_dojar dist/*.jar || die "Missing jars"
+	java-pkg_dojar dist/*.jar
 	use doc && java-pkg_dohtml -r docs/*
 }