From 020838c01bd9c80a23a70203531a1dd634dc810c Mon Sep 17 00:00:00 2001
From: Tom Wijsman <tomwij@gentoo.org>
Date: Thu, 5 Sep 2013 22:34:27 +0000
Subject: Properly SLOT bcprov dependency with one that's exactly the same
 (except for the SLOT) to resolve a blocker.
 (http://forums.gentoo.org/viewtopic-p-7389618.html#7389618)

(Portage version: 2.2.1/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 6D34E57D)
---
 dev-java/bcmail/ChangeLog             | 10 ++++++-
 dev-java/bcmail/bcmail-1.38-r2.ebuild | 56 -----------------------------------
 dev-java/bcmail/bcmail-1.38-r3.ebuild | 56 +++++++++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 57 deletions(-)
 delete mode 100644 dev-java/bcmail/bcmail-1.38-r2.ebuild
 create mode 100644 dev-java/bcmail/bcmail-1.38-r3.ebuild

(limited to 'dev-java/bcmail')

diff --git a/dev-java/bcmail/ChangeLog b/dev-java/bcmail/ChangeLog
index a02a047cc1b7..9c010c8669b8 100644
--- a/dev-java/bcmail/ChangeLog
+++ b/dev-java/bcmail/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/bcmail
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcmail/ChangeLog,v 1.40 2013/09/01 11:38:21 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcmail/ChangeLog,v 1.41 2013/09/05 22:34:27 tomwij Exp $
+
+*bcmail-1.38-r3 (05 Sep 2013)
+
+  05 Sep 2013; Tom Wijsman <TomWij@gentoo.org> +bcmail-1.38-r3.ebuild,
+  -bcmail-1.38-r2.ebuild:
+  Properly SLOT bcprov dependency with one that's exactly the same (except for
+  the SLOT) to resolve a blocker.
+  (http://forums.gentoo.org/viewtopic-p-7389618.html#7389618)
 
   01 Sep 2013; Fabian Groffen <grobian@gentoo.org> bcmail-1.38-r2.ebuild:
   Marked *-macos
diff --git a/dev-java/bcmail/bcmail-1.38-r2.ebuild b/dev-java/bcmail/bcmail-1.38-r2.ebuild
deleted file mode 100644
index 060e4c806179..000000000000
--- a/dev-java/bcmail/bcmail-1.38-r2.ebuild
+++ /dev/null
@@ -1,56 +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/bcmail/bcmail-1.38-r2.ebuild,v 1.2 2013/09/01 11:38:21 grobian Exp $
-
-EAPI=1
-
-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="1.38"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-COMMON_DEPEND="~dev-java/bcprov-${PV}:0
-		=dev-java/junit-3.8*
-		dev-java/sun-jaf
-		java-virtuals/javamail"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	${COMMON_DEPEND}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEPEND}"
-IUSE=""
-
-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,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.38-r3.ebuild b/dev-java/bcmail/bcmail-1.38-r3.ebuild
new file mode 100644
index 000000000000..2cd9c392b327
--- /dev/null
+++ b/dev-java/bcmail/bcmail-1.38-r3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcmail/bcmail-1.38-r3.ebuild,v 1.1 2013/09/05 22:34:27 tomwij Exp $
+
+EAPI=1
+
+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="1.38"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+COMMON_DEPEND="dev-java/bcprov:${SLOT}
+		=dev-java/junit-3.8*
+		dev-java/sun-jaf
+		java-virtuals/javamail"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${COMMON_DEPEND}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEPEND}"
+IUSE=""
+
+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-${SLOT},junit,sun-jaf,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
+}
-- 
cgit v1.2.3-65-gdbad