Fixed junit dependency to be in DEPEND and tests to only be present when the user or reverse dependencies force it by USE flag, removed old revisions.

(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

3 files changed, 21 insertions, 87 deletions

diff --git a/dev-java/bcprov/ChangeLog b/dev-java/bcprov/ChangeLog
index 71cc520d6e8c..9f8717e0d346 100644
--- a/dev-java/bcprov/ChangeLog
+++ b/dev-java/bcprov/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/bcprov
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcprov/ChangeLog,v 1.46 2013/06/01 14:51:29 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcprov/ChangeLog,v 1.47 2013/06/01 15:33:22 tomwij Exp $
+
+*bcprov-1.49-r2 (01 Jun 2013)
+
+  01 Jun 2013; Tom Wijsman <TomWij@gentoo.org> +bcprov-1.49-r2.ebuild,
+  -bcprov-1.49-r1.ebuild, -bcprov-1.49.ebuild:
+  Fixed junit dependency to be in DEPEND and tests to only be present when the
+  user or reverse dependencies force it by USE flag, removed old revisions.
 
 *bcprov-1.49-r1 (01 Jun 2013)
 
diff --git a/dev-java/bcprov/bcprov-1.49-r1.ebuild b/dev-java/bcprov/bcprov-1.49-r2.ebuild
index 3dafafd1ecdb..e0620e560b35 100644
--- a/dev-java/bcprov/bcprov-1.49-r1.ebuild
+++ b/dev-java/bcprov/bcprov-1.49-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcprov/bcprov-1.49-r1.ebuild,v 1.1 2013/06/01 14:51:29 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcprov/bcprov-1.49-r2.ebuild,v 1.1 2013/06/01 15:33:22 tomwij Exp $
 
 EAPI="5"
 
@@ -43,12 +43,22 @@ src_unpack() {
 java_prepare() {
 	mkdir "${S}"/classes || die
 
-	java-pkg_jar-from --build-only junit-4
+	if use test ; then
+		java-pkg_jar-from --build-only junit-4
+	fi
 }
 
 src_compile() {
 	find . -name "*.java" > "${T}"/src.list
-	ejavac -cp junit.jar -encoding ISO-8859-1 -d "${S}"/classes "@${T}"/src.list
+
+	local cp
+	if use test ; then
+		cp="-cp junit.jar"
+	else
+		sed -i '/\/test\//d' "${T}"/src.list || die "Failed to remove test classes"
+	fi
+	
+	ejavac $cp -encoding ISO-8859-1 -d "${S}"/classes "@${T}"/src.list
 
 	cd "${S}"/classes || die
 
diff --git a/dev-java/bcprov/bcprov-1.49.ebuild b/dev-java/bcprov/bcprov-1.49.ebuild
deleted file mode 100644
index c30908286448..000000000000
--- a/dev-java/bcprov/bcprov-1.49.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcprov/bcprov-1.49.ebuild,v 1.1 2013/06/01 14:09:07 tomwij Exp $
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}-jdk15on-${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 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos"
-
-# Tests are currently broken. Needs further investigation.
-# java.security.NoSuchAlgorithmException: Cannot find any provider supporting McElieceFujisakiWithSHA256
-RESTRICT="test"
-
-# The src_unpack find needs a new find
-# https://bugs.gentoo.org/show_bug.cgi?id=182276
-DEPEND=">=virtual/jdk-1.5
-	userland_GNU? ( >=sys-apps/findutils-4.3 )
-	app-arch/unzip
-	test? ( dev-java/junit:4 )"
-RDEPEND=">=virtual/jre-1.5"
-
-IUSE="userland_GNU"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	default
-
-	cd "${S}" || die
-	unpack ./src.zip
-}
-
-java_prepare() {
-	mkdir "${S}"/classes || die
-
-	java-pkg_jar-from --build-only junit-4
-}
-
-src_compile() {
-	local cp
-	if use test ; then
-		cp="-cp junit.jar"
-		find . -name "*.java" > "${T}"/src.list
-	else
-		find . -name "*.java" ! -path "*/test/*" > "${T}"/src.list
-	fi
-
-	ejavac $cp -encoding ISO-8859-1 -d "${S}"/classes "@${T}"/src.list
-
-	cd "${S}"/classes || die
-
-	if use test ; then
-		jar -cf "${S}"/${PN}-tests.jar * || die "Failed to create tests jar."
-		find . -path '*/test/*' -delete || die "Failed to remove tests files"
-	fi
-
-	jar -cf "${S}"/${PN}.jar * || die "Failed to create jar."
-}
-
-src_test() {
-	java -cp ${PN}-tests.jar:junit.jar org.bouncycastle.pqc.jcajce.provider.test.AllTests | tee pqc.tests
-	java -cp ${PN}-tests.jar:junit.jar org.bouncycastle.ocsp.test.AllTests | tee oscp.tests
-	java -cp ${PN}-tests.jar:junit.jar org.bouncycastle.jce.provider.test.AllTests | tee jce.tests
-
-	grep -q FAILURES *.tests && die "Tests failed."
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-
-	use source && java-pkg_dosrc org
-	use doc && java-pkg_dojavadoc docs
-}