commit: df56bcef4e29687c3d2d9e5a1c442ce038243bbe Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> AuthorDate: Sun Jun 11 22:06:25 2017 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Mon Jun 12 21:34:09 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df56bcef
dev-java/jansi: EAPI 6 bump. Package-Manager: Portage-2.3.5, Repoman-2.3.1 RepoMan-Options: --force dev-java/jansi/jansi-1.5-r1.ebuild | 2 +- .../jansi/{jansi-1.5-r1.ebuild => jansi-1.5-r2.ebuild} | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dev-java/jansi/jansi-1.5-r1.ebuild b/dev-java/jansi/jansi-1.5-r1.ebuild index 3fdc5527a8d..9b26bc4f300 100644 --- a/dev-java/jansi/jansi-1.5-r1.ebuild +++ b/dev-java/jansi/jansi-1.5-r1.ebuild @@ -6,7 +6,7 @@ JAVA_PKG_IUSE="source doc" inherit java-pkg-2 java-pkg-simple -DESCRIPTION="A library that allows you to use ANSI escape sequences in your console output" +DESCRIPTION="Java library to output ANSI escape sequences in console" HOMEPAGE="http://jansi.fusesource.org/" SRC_URI="https://github.com/fusesource/${PN}/archive/${P}.zip" diff --git a/dev-java/jansi/jansi-1.5-r1.ebuild b/dev-java/jansi/jansi-1.5-r2.ebuild similarity index 69% copy from dev-java/jansi/jansi-1.5-r1.ebuild copy to dev-java/jansi/jansi-1.5-r2.ebuild index 3fdc5527a8d..c315202f350 100644 --- a/dev-java/jansi/jansi-1.5-r1.ebuild +++ b/dev-java/jansi/jansi-1.5-r2.ebuild @@ -1,25 +1,28 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=6 + JAVA_PKG_IUSE="source doc" inherit java-pkg-2 java-pkg-simple -DESCRIPTION="A library that allows you to use ANSI escape sequences in your console output" +DESCRIPTION="Java library to output ANSI escape sequences in console" HOMEPAGE="http://jansi.fusesource.org/" SRC_URI="https://github.com/fusesource/${PN}/archive/${P}.zip" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ppc64 x86" CDEPEND="dev-java/jansi-native:0" -DEPEND="${CDEPEND} +DEPEND=" + ${CDEPEND} >=virtual/jdk-1.6" -RDEPEND="${CDEPEND} +RDEPEND=" + ${CDEPEND} >=virtual/jre-1.6" S="${WORKDIR}/${PN}-${P}" @@ -27,6 +30,7 @@ S="${WORKDIR}/${PN}-${P}" JAVA_GENTOO_CLASSPATH="jansi-native" JAVA_SRC_DIR="src" -java_prepare() { - rm -rf src/test || die +src_prepare() { + default + rm -rv src/test || die }