diff options
author | Patrice Clement <monsieurp@gentoo.org> | 2015-08-06 22:27:42 +0000 |
---|---|---|
committer | Patrice Clement <monsieurp@gentoo.org> | 2015-08-06 22:27:42 +0000 |
commit | 7925c87bf33a77b08712e3d663be3b4ee2c6a53d (patch) | |
tree | 3a932f4acf5b97f68ae798f5279de733b32bca0b /dev-java | |
parent | Remove java-virtuals/javamail dependency and replace it with oracle-javamail.... (diff) | |
download | gentoo-2-7925c87bf33a77b08712e3d663be3b4ee2c6a53d.tar.gz gentoo-2-7925c87bf33a77b08712e3d663be3b4ee2c6a53d.tar.bz2 gentoo-2-7925c87bf33a77b08712e3d663be3b4ee2c6a53d.zip |
Remove java-virtuals/javamail dependency and replace it with oracle-javamail. Fixes bug 553186.
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)
Diffstat (limited to 'dev-java')
-rw-r--r-- | dev-java/logback/ChangeLog | 10 | ||||
-rw-r--r-- | dev-java/logback/logback-1.0.13-r1.ebuild | 62 |
2 files changed, 70 insertions, 2 deletions
diff --git a/dev-java/logback/ChangeLog b/dev-java/logback/ChangeLog index d8e2db81f424..53827b4cda74 100644 --- a/dev-java/logback/ChangeLog +++ b/dev-java/logback/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/logback -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/logback/ChangeLog,v 1.1 2013/12/23 07:38:53 ercpe Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/logback/ChangeLog,v 1.2 2015/08/06 22:27:42 monsieurp Exp $ + +*logback-1.0.13-r1 (06 Aug 2015) + + 06 Aug 2015; Patrice Clement <monsieurp@gentoo.org> +logback-1.0.13-r1.ebuild: + Remove java-virtuals/javamail dependency and replace it with oracle-javamail. + Fixes bug 553186. *logback-1.0.13 (23 Dec 2013) diff --git a/dev-java/logback/logback-1.0.13-r1.ebuild b/dev-java/logback/logback-1.0.13-r1.ebuild new file mode 100644 index 000000000000..3031f697c7cf --- /dev/null +++ b/dev-java/logback/logback-1.0.13-r1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/logback/logback-1.0.13-r1.ebuild,v 1.1 2015/08/06 22:27:42 monsieurp Exp $ + +EAPI=5 + +JAVA_PKG_IUSE="doc source examples" + +inherit java-pkg-2 java-ant-2 + +DESCRIPTION="A generic, reliable, fast & flexible logging framework for Java" +HOMEPAGE="http://logback.qos.ch/" +SRC_URI="http://logback.qos.ch/dist/${PN}-${PV}.tar.gz + http://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}-build.tar.bz2" + +LICENSE="|| ( EPL-1.0 LGPL-2.1 )" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="tomcat" + +CDEPEND=" + dev-java/jansi:0 + dev-java/janino:0 + dev-java/slf4j-api:0 + dev-java/oracle-javamail:0 + java-virtuals/servlet-api:3.0 + tomcat? ( www-servers/tomcat:7 ) +" + +RDEPEND="${CDEPEND} + >=virtual/jre-1.6" +DEPEND="${CDEPEND} + >=virtual/jdk-1.6" + +JAVA_ANT_REWRITE_CLASSPATH="true" +EANT_GENTOO_CLASSPATH=" + jansi + janino + slf4j-api + oracle-javamail + servlet-api-3.0 +" +EANT_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-core/target/${PN}-core.jar" + +java_prepare() { + find "${S}" -name "*.jar" -delete || die + + use tomcat || rm -r "${S}"/${PN}-access/src/main/java/ch/qos/logback/access/tomcat/ || die + # remove the next line when we have jetty in the tree + rm -r "${S}"/${PN}-access/src/main/java/ch/qos/logback/access/jetty/ || die + + use tomcat && EANT_GENTOO_CLASSPATH+=",tomcat-7" +} + +src_install() { + java-pkg_dojar "${S}"/${PN}-core/target/${PN}-core.jar + java-pkg_dojar "${S}"/${PN}-access/target/${PN}-access.jar + + use source && java-pkg_dosrc "${S}"/${PN}-core/src/main/java "${S}"/${PN}-access/src/main/java + use doc && java-pkg_dojavadoc "${S}"/${PN}-core/target/site/apidocs + use examples && java-pkg_doexamples "${S}"/${PN}-examples/src/main/java/chapters/* +} |