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 CD035138CD3 for ; Sat, 6 Jun 2015 10:37:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3008BE0886; Sat, 6 Jun 2015 10:37:24 +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 60CC7E0885 for ; Sat, 6 Jun 2015 10:37:18 +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 D0D26340F47 for ; Sat, 6 Jun 2015 10:37:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6123EA36 for ; Sat, 6 Jun 2015 10:37:14 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1433586932.8bf5151f86da9f2ef3cb92870cb26440cabcbb9f.jlec@gentoo> Subject: [gentoo-commits] proj/betagarden:master commit in: net-misc/mocha/ X-VCS-Repository: proj/betagarden X-VCS-Files: net-misc/mocha/ChangeLog net-misc/mocha/mocha-1.1.1.ebuild net-misc/mocha/mocha-1.1.2.ebuild X-VCS-Directories: net-misc/mocha/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 8bf5151f86da9f2ef3cb92870cb26440cabcbb9f X-VCS-Branch: master Date: Sat, 6 Jun 2015 10:37:14 +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: 09cda07e-85fa-41ae-9130-68b3f9f2abd9 X-Archives-Hash: 4481ab7fcdbe5e406c8901c94057d2dc commit: 8bf5151f86da9f2ef3cb92870cb26440cabcbb9f Author: Justin Lecher gentoo org> AuthorDate: Sat Jun 6 10:35:32 2015 +0000 Commit: Justin Lecher gentoo 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 mocha-1.1.1.ebuild, + mocha-1.1.2.ebuild: + net-misc/mocha: Bump to EAPI=5 + 06 Jun 2015; Justin Lecher 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() {