monsieurp    15/06/13 18:26:12

  Modified:             ChangeLog
  Added:                mx4j-3.0.2-r1.ebuild
  Log:
  EAPI 5 bump. Update dependencies. Fix bug 551988.
  
  Signed-off-by: Patrice Clement <[email protected]>
  (Portage version: 2.2.14/cvs/Linux x86_64, RepoMan options: --force, signed 
Manifest commit with key 93491BB8)

Revision  Changes    Path
1.32                 dev-java/mx4j/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/mx4j/ChangeLog?rev=1.32&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/mx4j/ChangeLog?rev=1.32&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/mx4j/ChangeLog?r1=1.31&r2=1.32

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/mx4j/ChangeLog,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ChangeLog   9 Jun 2015 13:55:41 -0000       1.31
+++ ChangeLog   13 Jun 2015 18:26:12 -0000      1.32
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/mx4j
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/ChangeLog,v 1.31 2015/06/09 
13:55:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/ChangeLog,v 1.32 2015/06/13 
18:26:12 monsieurp Exp $
+
+*mx4j-3.0.2-r1 (13 Jun 2015)
+
+  13 Jun 2015; Patrice Clement <[email protected]> +mx4j-3.0.2-r1.ebuild:
+  EAPI 5 bump. Update dependencies. Fix bug 551988.
 
   09 Jun 2015; Justin Lecher <[email protected]> metadata.xml:
   Updating remote-id in metadata.xml



1.1                  dev-java/mx4j/mx4j-3.0.2-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/mx4j/mx4j-3.0.2-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/mx4j/mx4j-3.0.2-r1.ebuild?rev=1.1&content-type=text/plain

Index: mx4j-3.0.2-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/mx4j/mx4j-3.0.2-r1.ebuild,v 1.1 
2015/06/13 18:26:12 monsieurp Exp $

EAPI=5

JAVA_PKG_IUSE="examples source doc"

inherit java-pkg-2 java-ant-2

DESCRIPTION="Metapackage for mx4j"
HOMEPAGE="http://mx4j.sourceforge.net/";

SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz
        doc? ( mirror://sourceforge/${PN}/${P}.tar.gz )"

LICENSE="GPL-2"
SLOT="3.0"

KEYWORDS="~amd64 ~x86"

IUSE=""

CDEPEND="examples? (
                dev-java/bcel:0
                dev-java/log4j:0
                dev-java/commons-logging:0
                www-servers/axis:1
                java-virtuals/servlet-api:3.0
                dev-java/hessian:4.0
                dev-java/jython:2.7
                dev-java/gnu-jaf:1
                java-virtuals/javamail:0
        )
        dev-java/mx4j-core:3.0
        dev-java/mx4j-tools:3.0
        !<dev-java/mx4j-tools-3.0.1-r1
        "

RDEPEND="
        ${CDEPEND}
        examples? ( >=virtual/jre-1.6 )"

# We always depend on a jdk to get the package.env created
DEPEND=">=virtual/jdk-1.6
        ${CDEPEND}"

src_prepare() {
        epatch "${FILESDIR}/${P}-new-hessian.patch"

        if use doc; then
                mkdir binary && cd binary
                unpack "${P}.tar.gz"
        fi

        if use examples; then
                cd "${S}/lib"
                java-pkg_jar-from bcel bcel.jar
                java-pkg_jar-from log4j
                java-pkg_jar-from commons-logging commons-logging.jar
                java-pkg_jar-from axis-1
                java-pkg_jar-from hessian-4.0
                java-pkg_jar-from jython-2.7 jython.jar
                java-pkg_jar-from gnu-jaf-1 activation.jar
                java-pkg_jar-from --virtual javamail mail.jar
                java-pkg_jar-from --virtual servlet-api-3.0 servlet-api.jar
        fi
}

src_compile() {
        cd build
        if use examples; then
                eant compile.examples
        fi
}

src_install() {
        dodoc README.txt RELEASE-NOTES-* || die

        if use examples; then
                java-pkg_dojar dist/examples/mx4j-examples.jar
                dodir /usr/share/doc/${PF}/examples
                cp -r src/examples/mx4j/examples/* 
"${D}usr/share/doc/${PF}/examples"
        fi

        use source && java-pkg_dosrc src/examples/mx4j

        if use doc; then
                local docdir="${WORKDIR}/${P}/binary/${P}/docs"
                java-pkg_dojavadoc "${docdir}/api"
                dohtml -r "${docdir}/images"
                dohtml "${docdir}"/{*.html,*.css}
        fi

        # Recording jars to get the same behaviour as before
        local jars="$(java-pkg_getjars mx4j-core-3.0,mx4j-tools-3.0)"
        for jar in ${jars//:/ }; do
                java-pkg_regjar "${jar}"
        done
}

pkg_postinst() {
        elog "Although this package can be used directly with java-config,"
        elog "ebuild developers should use mx4j-core and mx4j-tools directly."
}




Reply via email to