From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B2A9D13888F for ; Sat, 17 Oct 2015 15:16:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ECEA221C04E; Sat, 17 Oct 2015 15:16:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 06CDE21C039 for ; Sat, 17 Oct 2015 15:16:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8C4BC3408F9 for ; Sat, 17 Oct 2015 15:16:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0D29511A0 for ; Sat, 17 Oct 2015 15:16:16 +0000 (UTC) From: "Patrice Clement" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrice Clement" Message-ID: <1445093006.d5766ee0e57dca0ff92479fd51d61256b3bb22c9.monsieurp@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/bcmail/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/bcmail/bcmail-1.38-r5.ebuild dev-java/bcmail/bcmail-1.45-r4.ebuild dev-java/bcmail/bcmail-1.50-r2.ebuild dev-java/bcmail/bcmail-1.52-r2.ebuild X-VCS-Directories: dev-java/bcmail/ X-VCS-Committer: monsieurp X-VCS-Committer-Name: Patrice Clement X-VCS-Revision: d5766ee0e57dca0ff92479fd51d61256b3bb22c9 X-VCS-Branch: master Date: Sat, 17 Oct 2015 15:16:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 750b88a8-aac1-4ef3-9980-00b8b539c08f X-Archives-Hash: 1558857490218eadfd871d1cc49f4f07 commit: d5766ee0e57dca0ff92479fd51d61256b3bb22c9 Author: Patrice Clement gentoo org> AuthorDate: Sat Oct 17 14:43:26 2015 +0000 Commit: Patrice Clement gentoo org> CommitDate: Sat Oct 17 14:43:26 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5766ee0 dev-java/bcmail: Remove dev-java/sun-jaf dependency and swap it for java-virtuals/jaf. Fixes bug 548726. Package-Manager: portage-2.2.20.1 Signed-off-by: Patrice Clement gentoo.org> ...bcmail-1.50-r2.ebuild => bcmail-1.38-r5.ebuild} | 38 ++++++++-------------- ...bcmail-1.50-r2.ebuild => bcmail-1.45-r4.ebuild} | 38 ++++++++-------------- dev-java/bcmail/bcmail-1.50-r2.ebuild | 10 +++--- dev-java/bcmail/bcmail-1.52-r2.ebuild | 4 +-- 4 files changed, 33 insertions(+), 57 deletions(-) diff --git a/dev-java/bcmail/bcmail-1.50-r2.ebuild b/dev-java/bcmail/bcmail-1.38-r5.ebuild similarity index 55% copy from dev-java/bcmail/bcmail-1.50-r2.ebuild copy to dev-java/bcmail/bcmail-1.38-r5.ebuild index f8a2985..3ff2db8 100644 --- a/dev-java/bcmail/bcmail-1.50-r2.ebuild +++ b/dev-java/bcmail/bcmail-1.38-r5.ebuild @@ -4,59 +4,47 @@ EAPI=5 -JAVA_PKG_IUSE="doc source test" +JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-pkg-simple -MY_P="${PN}-jdk15on-${PV/./}" - +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.50" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" - -CDEPEND="dev-java/bcprov:${SLOT} - dev-java/bcpkix:${SLOT} - dev-java/sun-jaf:0 - dev-java/junit:0 - dev-java/oracle-javamail:0" - +SLOT="1.38" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + +CDEPEND=" + dev-java/bcprov:${SLOT} + dev-java/junit:0 + java-virtuals/jaf:0 + dev-java/oracle-javamail:0 +" DEPEND=">=virtual/jdk-1.6 app-arch/unzip ${CDEPEND}" - RDEPEND=">=virtual/jre-1.6 ${CDEPEND}" +IUSE="" S="${WORKDIR}/${MY_P}" JAVA_GENTOO_CLASSPATH=" + jaf junit bcprov-${SLOT} - bcpkix-${SLOT} - sun-jaf oracle-javamail " -# Package can't be built with test as bcprov and bcpkix can't be built with test. -RESTRICT="test" - src_unpack() { default cd "${S}" unpack ./src.zip } -java_prepare() { - JAVA_RM_FILES=( - org/bouncycastle/mail/smime/test/* - org/bouncycastle/mail/smime/examples/CreateSignedMail.java - ) -} - src_compile() { java-pkg-simple_src_compile } diff --git a/dev-java/bcmail/bcmail-1.50-r2.ebuild b/dev-java/bcmail/bcmail-1.45-r4.ebuild similarity index 55% copy from dev-java/bcmail/bcmail-1.50-r2.ebuild copy to dev-java/bcmail/bcmail-1.45-r4.ebuild index f8a2985..0c6fd86 100644 --- a/dev-java/bcmail/bcmail-1.50-r2.ebuild +++ b/dev-java/bcmail/bcmail-1.45-r4.ebuild @@ -4,59 +4,47 @@ EAPI=5 -JAVA_PKG_IUSE="doc source test" +JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-pkg-simple -MY_P="${PN}-jdk15on-${PV/./}" - +MY_P="${PN}-jdk15-${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.50" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" - -CDEPEND="dev-java/bcprov:${SLOT} - dev-java/bcpkix:${SLOT} - dev-java/sun-jaf:0 - dev-java/junit:0 - dev-java/oracle-javamail:0" - +SLOT="1.45" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + +CDEPEND=" + dev-java/bcprov:${SLOT} + dev-java/junit:0 + java-virtuals/jaf:0 + dev-java/oracle-javamail:0 +" DEPEND=">=virtual/jdk-1.6 app-arch/unzip ${CDEPEND}" - RDEPEND=">=virtual/jre-1.6 ${CDEPEND}" +IUSE="" S="${WORKDIR}/${MY_P}" JAVA_GENTOO_CLASSPATH=" + jaf junit bcprov-${SLOT} - bcpkix-${SLOT} - sun-jaf oracle-javamail " -# Package can't be built with test as bcprov and bcpkix can't be built with test. -RESTRICT="test" - src_unpack() { default cd "${S}" unpack ./src.zip } -java_prepare() { - JAVA_RM_FILES=( - org/bouncycastle/mail/smime/test/* - org/bouncycastle/mail/smime/examples/CreateSignedMail.java - ) -} - src_compile() { java-pkg-simple_src_compile } diff --git a/dev-java/bcmail/bcmail-1.50-r2.ebuild b/dev-java/bcmail/bcmail-1.50-r2.ebuild index f8a2985..625fc0c 100644 --- a/dev-java/bcmail/bcmail-1.50-r2.ebuild +++ b/dev-java/bcmail/bcmail-1.50-r2.ebuild @@ -19,10 +19,10 @@ SLOT="1.50" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" CDEPEND="dev-java/bcprov:${SLOT} - dev-java/bcpkix:${SLOT} - dev-java/sun-jaf:0 - dev-java/junit:0 - dev-java/oracle-javamail:0" + dev-java/bcpkix:${SLOT} + java-virtuals/jaf:0 + dev-java/junit:0 + dev-java/oracle-javamail:0" DEPEND=">=virtual/jdk-1.6 app-arch/unzip @@ -34,10 +34,10 @@ RDEPEND=">=virtual/jre-1.6 S="${WORKDIR}/${MY_P}" JAVA_GENTOO_CLASSPATH=" + jaf junit bcprov-${SLOT} bcpkix-${SLOT} - sun-jaf oracle-javamail " diff --git a/dev-java/bcmail/bcmail-1.52-r2.ebuild b/dev-java/bcmail/bcmail-1.52-r2.ebuild index bd9c911..b298d16 100644 --- a/dev-java/bcmail/bcmail-1.52-r2.ebuild +++ b/dev-java/bcmail/bcmail-1.52-r2.ebuild @@ -20,8 +20,8 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux CDEPEND="dev-java/bcprov:${SLOT} dev-java/bcpkix:${SLOT} - dev-java/sun-jaf:0 dev-java/junit:0 + java-virtuals/jaf:0 dev-java/oracle-javamail:0" DEPEND=">=virtual/jdk-1.6 @@ -34,10 +34,10 @@ RDEPEND=">=virtual/jre-1.6 S="${WORKDIR}/${MY_P}" JAVA_GENTOO_CLASSPATH=" + jaf junit bcprov-${SLOT} bcpkix-${SLOT} - sun-jaf oracle-javamail "