Revbump for missing virtual support in 1.38. Restrict junit deps, remove unneeded versions.

(Portage version: 2.1.4_rc14)

8 files changed, 25 insertions, 73 deletions

diff --git a/dev-java/bcmail/ChangeLog b/dev-java/bcmail/ChangeLog
index d3e858ee17d8..dc3f579a9eff 100644
--- a/dev-java/bcmail/ChangeLog
+++ b/dev-java/bcmail/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/bcmail
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcmail/ChangeLog,v 1.18 2007/12/09 16:48:24 corsair Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcmail/ChangeLog,v 1.19 2008/01/10 22:15:31 caster Exp $
+
+*bcmail-1.38-r1 (10 Jan 2008)
+
+  10 Jan 2008; Vlastimil Babka <caster@gentoo.org> -bcmail-1.36.ebuild,
+  bcmail-1.37.ebuild, -bcmail-1.37-r1.ebuild, bcmail-1.38.ebuild,
+  +bcmail-1.38-r1.ebuild:
+  Revbump for missing virtual support in 1.38. Restrict junit deps, remove
+  unneeded versions.
 
   09 Dec 2007; Markus Rothe <corsair@gentoo.org> bcmail-1.37-r1.ebuild:
   Added ~ppc64; bug #200752
diff --git a/dev-java/bcmail/bcmail-1.36.ebuild b/dev-java/bcmail/bcmail-1.36.ebuild
deleted file mode 100644
index 4868a40b415e..000000000000
--- a/dev-java/bcmail/bcmail-1.36.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcmail/bcmail-1.36.ebuild,v 1.9 2007/10/05 07:34:47 tgall Exp $
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}-jdk14-${PV/./}"
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-COMMON_DEPEND="~dev-java/bcprov-${PV}
-		dev-java/junit
-		dev-java/sun-jaf
-		dev-java/sun-javamail"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	${COMMON_DEPEND}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	unpack ./src.zip
-}
-
-src_compile() {
-	mkdir "${S}/classes"
-
-	find org -name "*.java" > "${T}/src.list"
-	ejavac -d "${S}/classes" \
-		-classpath $(java-pkg_getjars bcprov,junit,sun-jaf,sun-javamail) \
-		"@${T}/src.list"
-
-	cd "${S}/classes"
-	jar -cf "${S}/${PN}.jar" * || die "failed to create jar"
-}
-
-src_install() {
-	java-pkg_dojar "${S}/${PN}.jar"
-
-	use source && java-pkg_dosrc org
-	use doc && java-pkg_dojavadoc docs
-}
diff --git a/dev-java/bcmail/bcmail-1.37.ebuild b/dev-java/bcmail/bcmail-1.37.ebuild
index 6bf7a375a1ce..eb51afb80f6d 100644
--- a/dev-java/bcmail/bcmail-1.37.ebuild
+++ b/dev-java/bcmail/bcmail-1.37.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcmail/bcmail-1.37.ebuild,v 1.5 2007/10/15 14:07:12 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcmail/bcmail-1.37.ebuild,v 1.6 2008/01/10 22:15:31 caster Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 
 COMMON_DEPEND="~dev-java/bcprov-${PV}
-		dev-java/junit
+		=dev-java/junit-3.8*
 		dev-java/sun-jaf
 		dev-java/sun-javamail"
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/bcmail/bcmail-1.37-r1.ebuild b/dev-java/bcmail/bcmail-1.38-r1.ebuild
index 9c342723c477..5089b70b209e 100644
--- a/dev-java/bcmail/bcmail-1.37-r1.ebuild
+++ b/dev-java/bcmail/bcmail-1.38-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcmail/bcmail-1.37-r1.ebuild,v 1.4 2007/12/09 16:48:24 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcmail/bcmail-1.38-r1.ebuild,v 1.1 2008/01/10 22:15:31 caster Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -16,14 +16,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 COMMON_DEPEND="~dev-java/bcprov-${PV}
-		dev-java/junit
+		=dev-java/junit-3.8*
 		dev-java/sun-jaf
 		java-virtuals/javamail"
 DEPEND=">=virtual/jdk-1.4
-		app-arch/unzip
-		${COMMON_DEPEND}"
+	app-arch/unzip
+	${COMMON_DEPEND}"
 RDEPEND=">=virtual/jre-1.4
-		${COMMON_DEPEND}"
+	${COMMON_DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-java/bcmail/bcmail-1.38.ebuild b/dev-java/bcmail/bcmail-1.38.ebuild
index 0c633b9a1e6f..5d86ffa0e2a1 100644
--- a/dev-java/bcmail/bcmail-1.38.ebuild
+++ b/dev-java/bcmail/bcmail-1.38.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcmail/bcmail-1.38.ebuild,v 1.1 2007/11/29 19:36:40 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcmail/bcmail-1.38.ebuild,v 1.2 2008/01/10 22:15:31 caster Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 COMMON_DEPEND="~dev-java/bcprov-${PV}
-		dev-java/junit
+		=dev-java/junit-3.8*
 		dev-java/sun-jaf
 		dev-java/sun-javamail"
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/bcmail/files/digest-bcmail-1.36 b/dev-java/bcmail/files/digest-bcmail-1.36
deleted file mode 100644
index b9e805de511b..000000000000
--- a/dev-java/bcmail/files/digest-bcmail-1.36
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 98d3cb5335f43dd31d28d0a0d96dcb10 bcmail-jdk14-136.tar.gz 366624
-RMD160 750e0ec71e46dcae19b7c5785e48bf5945cdf274 bcmail-jdk14-136.tar.gz 366624
-SHA256 832bc096dfe4e5dcb9c1c8256bffa8de249130b3d4f85ab3a2ffbada3d88a0ea bcmail-jdk14-136.tar.gz 366624
diff --git a/dev-java/bcmail/files/digest-bcmail-1.37-r1 b/dev-java/bcmail/files/digest-bcmail-1.37-r1
deleted file mode 100644
index dc0e4eb8895b..000000000000
--- a/dev-java/bcmail/files/digest-bcmail-1.37-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b802105780c4a464a3ed2d056911bf1e bcmail-jdk14-137.tar.gz 383382
-RMD160 fde025a6e68d8a12a1649279345a084e5014b505 bcmail-jdk14-137.tar.gz 383382
-SHA256 f13a04a83ed33232d23e223e4e8987486615ff0a960ddd81d5e04de8d327de4d bcmail-jdk14-137.tar.gz 383382
diff --git a/dev-java/bcmail/files/digest-bcmail-1.38-r1 b/dev-java/bcmail/files/digest-bcmail-1.38-r1
new file mode 100644
index 000000000000..4927d0f80a8f
--- /dev/null
+++ b/dev-java/bcmail/files/digest-bcmail-1.38-r1
@@ -0,0 +1,3 @@
+MD5 0544a57559dda235a431c8e6eb54626f bcmail-jdk14-138.tar.gz 386478
+RMD160 bff9151319bf1152f3ce7dc16fef1a17fb762e4c bcmail-jdk14-138.tar.gz 386478
+SHA256 629bbe7f00c96b201db4b76f777014763110d9de5021593505f906a31fa7bb7c bcmail-jdk14-138.tar.gz 386478