monsieurp 15/08/06 17:24:10 Modified: ChangeLog Added: bcmail-1.52-r1.ebuild bcmail-1.50-r1.ebuild bcmail-1.45-r3.ebuild bcmail-1.38-r4.ebuild Log: Remove java-virtuals/javamail dependency and replace it with oracle-javamail. Also, convert two ebuilds to EAPI 5 and rely on java-pkg-simple to do away with hacks. Fixes bug 553186. Signed-off-by: Patrice Clement <monsie...@gentoo.org> (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)
Revision Changes Path 1.49 dev-java/bcmail/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/bcmail/ChangeLog?rev=1.49&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/bcmail/ChangeLog?rev=1.49&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/bcmail/ChangeLog?r1=1.48&r2=1.49 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/bcmail/ChangeLog,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- ChangeLog 1 Aug 2015 16:33:30 -0000 1.48 +++ ChangeLog 6 Aug 2015 17:24:10 -0000 1.49 @@ -1,6 +1,17 @@ # ChangeLog for dev-java/bcmail # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/bcmail/ChangeLog,v 1.48 2015/08/01 16:33:30 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/bcmail/ChangeLog,v 1.49 2015/08/06 17:24:10 monsieurp Exp $ + +*bcmail-1.50-r1 (06 Aug 2015) +*bcmail-1.38-r4 (06 Aug 2015) +*bcmail-1.45-r3 (06 Aug 2015) +*bcmail-1.52-r1 (06 Aug 2015) + + 06 Aug 2015; Patrice Clement <monsie...@gentoo.org> +bcmail-1.38-r4.ebuild, + +bcmail-1.45-r3.ebuild, +bcmail-1.50-r1.ebuild, +bcmail-1.52-r1.ebuild: + Remove java-virtuals/javamail dependency and replace it with oracle-javamail. + Also, convert two ebuilds to EAPI 5 and rely on java-pkg-simple to do away + with hacks. Fixes bug 553186. *bcmail-1.52 (01 Aug 2015) 1.1 dev-java/bcmail/bcmail-1.52-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/bcmail/bcmail-1.52-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/bcmail/bcmail-1.52-r1.ebuild?rev=1.1&content-type=text/plain Index: bcmail-1.52-r1.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-java/bcmail/bcmail-1.52-r1.ebuild,v 1.1 2015/08/06 17:24:10 monsieurp Exp $ EAPI=5 JAVA_PKG_IUSE="doc source test" inherit java-pkg-2 java-pkg-simple 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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" CDEPEND="dev-java/bcprov:0[test?] dev-java/bcpkix:0[test?] dev-java/sun-jaf:0 dev-java/junit:0 dev-java/oracle-javamail:0" DEPEND=">=virtual/jdk-1.6 app-arch/unzip ${CDEPEND}" RDEPEND=">=virtual/jre-1.6 ${CDEPEND}" S="${WORKDIR}/${MY_P}" JAVA_GENTOO_CLASSPATH=" junit bcprov bcpkix sun-jaf oracle-javamail " # Package can't be build 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 } src_install() { java-pkg-simple_src_install use source && java-pkg_dosrc org } 1.1 dev-java/bcmail/bcmail-1.50-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/bcmail/bcmail-1.50-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/bcmail/bcmail-1.50-r1.ebuild?rev=1.1&content-type=text/plain Index: bcmail-1.50-r1.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-java/bcmail/bcmail-1.50-r1.ebuild,v 1.1 2015/08/06 17:24:10 monsieurp Exp $ EAPI=5 JAVA_PKG_IUSE="doc source test" inherit java-pkg-2 java-pkg-simple 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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" CDEPEND="dev-java/bcprov:0[test?] dev-java/bcpkix:0[test?] dev-java/sun-jaf:0 dev-java/junit:0 dev-java/oracle-javamail:0" DEPEND=">=virtual/jdk-1.6 app-arch/unzip ${CDEPEND}" RDEPEND=">=virtual/jre-1.6 ${CDEPEND}" S="${WORKDIR}/${MY_P}" JAVA_GENTOO_CLASSPATH=" junit bcprov bcpkix sun-jaf oracle-javamail " # Package can't be build 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 } src_install() { java-pkg-simple_src_install use source && java-pkg_dosrc org } 1.1 dev-java/bcmail/bcmail-1.45-r3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/bcmail/bcmail-1.45-r3.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/bcmail/bcmail-1.45-r3.ebuild?rev=1.1&content-type=text/plain Index: bcmail-1.45-r3.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-java/bcmail/bcmail-1.45-r3.ebuild,v 1.1 2015/08/06 17:24:10 monsieurp Exp $ EAPI=5 JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-pkg-simple 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.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 dev-java/sun-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=" junit sun-jaf bcprov-${SLOT} oracle-javamail " src_unpack() { default cd "${S}" unpack ./src.zip } src_compile() { java-pkg-simple_src_compile } src_install() { java-pkg-simple_src_install use source && java-pkg_dosrc org } 1.1 dev-java/bcmail/bcmail-1.38-r4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/bcmail/bcmail-1.38-r4.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/bcmail/bcmail-1.38-r4.ebuild?rev=1.1&content-type=text/plain Index: bcmail-1.38-r4.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-java/bcmail/bcmail-1.38-r4.ebuild,v 1.1 2015/08/06 17:24:10 monsieurp Exp $ EAPI=5 JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-pkg-simple 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" CDEPEND=" dev-java/bcprov:${SLOT} dev-java/junit:0 dev-java/sun-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=" junit sun-jaf bcprov-${SLOT} oracle-javamail " src_unpack() { default cd "${S}" unpack ./src.zip } src_compile() { java-pkg-simple_src_compile } src_install() { java-pkg-simple_src_install use source && java-pkg_dosrc org }