commit: f5c36ee126821cfb52c4693cac8b47bf89abd8f0 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Sep 20 01:27:48 2020 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Sep 20 02:03:54 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5c36ee1
dev-java/miglayout: port to EAPI 7 Closes: https://bugs.gentoo.org/741008 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-java/miglayout/miglayout-4.0.ebuild | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dev-java/miglayout/miglayout-4.0.ebuild b/dev-java/miglayout/miglayout-4.0.ebuild index 95862c4d8e1..83297335bfb 100644 --- a/dev-java/miglayout/miglayout-4.0.ebuild +++ b/dev-java/miglayout/miglayout-4.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI=7 JAVA_PKG_IUSE="doc examples source" @@ -16,17 +16,22 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="swt" -COMMON_DEP=" - swt? ( dev-java/swt:3.7 )" -RDEPEND="${COMMON_DEP} - >=virtual/jre-1.5" -DEPEND="${COMMON_DEP} +COMMON_DEPEND="swt? ( dev-java/swt:3.7 )" +BDEPEND="app-arch/unzip" +RDEPEND=" + ${COMMON_DEPEND} + >=virtual/jre-1.5 +" +DEPEND=" + ${COMMON_DEPEND} >=virtual/jdk-1.5 - app-arch/unzip" +" S="${WORKDIR}" -java_prepare() { +src_prepare() { + default + mv net/miginfocom/{demo,examples} . || die mv demo/* examples || die
