commit: 8bf5151f86da9f2ef3cb92870cb26440cabcbb9f Author: Justin Lecher <jlec <AT> gentoo <DOT> org> AuthorDate: Sat Jun 6 10:35:32 2015 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Sat Jun 6 10:35:32 2015 +0000 URL: https://gitweb.gentoo.org/proj/betagarden.git/commit/?id=8bf5151f
net-misc/mocha: Bump to EAPI=5 Package-Manager: portage-2.2.20 net-misc/mocha/ChangeLog | 4 ++++ net-misc/mocha/mocha-1.1.1.ebuild | 18 ++++++++++-------- net-misc/mocha/mocha-1.1.2.ebuild | 15 ++++++++------- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/net-misc/mocha/ChangeLog b/net-misc/mocha/ChangeLog index 67a0e8c..282dbff 100644 --- a/net-misc/mocha/ChangeLog +++ b/net-misc/mocha/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 06 Jun 2015; Justin Lecher <[email protected]> mocha-1.1.1.ebuild, + mocha-1.1.2.ebuild: + net-misc/mocha: Bump to EAPI=5 + 06 Jun 2015; Justin Lecher <[email protected]> metadata.xml: net-misc/mocha: Add github to remote-id in metadata.xml diff --git a/net-misc/mocha/mocha-1.1.1.ebuild b/net-misc/mocha/mocha-1.1.1.ebuild index f76964b..18b7def 100644 --- a/net-misc/mocha/mocha-1.1.1.ebuild +++ b/net-misc/mocha/mocha-1.1.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="2" +EAPI=5 inherit eutils java-pkg-2 java-ant-2 @@ -15,7 +15,8 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -COMMON_DEP="java-virtuals/javamail:0 +COMMON_DEP=" + java-virtuals/javamail:0 java-virtuals/jaf:0 dev-java/swing-layout:1" @@ -28,8 +29,9 @@ RDEPEND=">=virtual/jre-1.5 S=${WORKDIR}/nakkaya-${PN}-f3601d4 java_prepare() { - epatch "${FILESDIR}"/${P}-gtk.patch \ - "${FILESDIR}"/${P}-gentoo.patch + epatch \ + "${FILESDIR}"/${P}-gtk.patch \ + "${FILESDIR}"/${P}-gentoo.patch cd extLibs || die rm *.jar || die @@ -40,15 +42,15 @@ java_prepare() { } src_compile() { - eant linux || die + eant linux # Make sure that only mocha code goes into the .jar rm -Rf build/{com/sun,javax} || die # FIXME: Currently bundling system's dev-java/swing-layout - # rm -Rf build/org || die + # rm -Rf build/org || die - eant jar || die + eant jar } src_install() { diff --git a/net-misc/mocha/mocha-1.1.2.ebuild b/net-misc/mocha/mocha-1.1.2.ebuild index 9f15160..a8a0927 100644 --- a/net-misc/mocha/mocha-1.1.2.ebuild +++ b/net-misc/mocha/mocha-1.1.2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="2" +EAPI=5 inherit eutils java-pkg-2 java-ant-2 @@ -28,8 +28,9 @@ RDEPEND=">=virtual/jre-1.5 S=${WORKDIR}/nakkaya-${PN}-914b1aa java_prepare() { - epatch "${FILESDIR}"/${PN}-1.1.1-gtk.patch \ - "${FILESDIR}"/${PN}-1.1.1-gentoo.patch + epatch \ + "${FILESDIR}"/${PN}-1.1.1-gtk.patch \ + "${FILESDIR}"/${PN}-1.1.1-gentoo.patch cd extLibs || die rm *.jar || die @@ -40,15 +41,15 @@ java_prepare() { } src_compile() { - eant linux || die + eant linux # Make sure that only mocha code goes into the .jar rm -Rf build/{com/sun,javax} || die # FIXME: Currently bundling system's dev-java/swing-layout - # rm -Rf build/org || die + # rm -Rf build/org || die - eant jar || die + eant jar } src_install() {
