diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2017-02-28 20:15:43 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2017-02-28 20:55:03 +0000 |
| commit | 9b66a7eb174707ed081dd5215a194e0bb5bfa352 (patch) | |
| tree | abbc3ed156ad708b746a9fe5269028000f70b288 | |
| parent | dev-java/fits: Bump to EAPI=6 (diff) | |
| download | sci-9b66a7eb174707ed081dd5215a194e0bb5bfa352.tar.gz sci-9b66a7eb174707ed081dd5215a194e0bb5bfa352.tar.bz2 sci-9b66a7eb174707ed081dd5215a194e0bb5bfa352.zip | |
dev-java/flexdock: QA fixes
Add missing die
Bump to EAPI=6
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Justin Lecher <jlec@gentoo.org>
| -rw-r--r-- | dev-java/flexdock/flexdock-1.1.1.ebuild | 12 | ||||
| -rw-r--r-- | dev-java/flexdock/flexdock-1.2.4.ebuild | 15 |
2 files changed, 16 insertions, 11 deletions
diff --git a/dev-java/flexdock/flexdock-1.1.1.ebuild b/dev-java/flexdock/flexdock-1.1.1.ebuild index 6ec833ddf..6d4af8963 100644 --- a/dev-java/flexdock/flexdock-1.1.1.ebuild +++ b/dev-java/flexdock/flexdock-1.1.1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 JAVA_PKG_IUSE="doc source" @@ -27,12 +27,14 @@ EANT_DOC_TARGET="doc" S="${WORKDIR}" -java_prepare() { - epatch "${FILESDIR}"/${P}-nodemo.patch +PATCHES=( "${FILESDIR}"/${P}-nodemo.patch ) +src_prepare() { + eapply ${PATCHES[@]} + java-pkg-2_src_prepare #some cleanups - find . -name '*.so' -exec rm -v {} \;|| die - find . -name '*.dll' -exec rm -v {} \;|| die + find . -type f -name '*.so' -exec rm -v {} \;|| die + find . -type f -name '*.dll' -exec rm -v {} \;|| die #remove built-in jars and use the system ones cd lib || die diff --git a/dev-java/flexdock/flexdock-1.2.4.ebuild b/dev-java/flexdock/flexdock-1.2.4.ebuild index 217371b87..d6ba473eb 100644 --- a/dev-java/flexdock/flexdock-1.2.4.ebuild +++ b/dev-java/flexdock/flexdock-1.2.4.ebuild @@ -1,7 +1,8 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 + JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-ant-2 @@ -13,7 +14,6 @@ SRC_URI="http://forge.scilab.org/index.php/p/flexdock/downloads/get/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~x86 ~amd64" - IUSE="" RDEPEND=">=virtual/jre-1.5" @@ -24,12 +24,15 @@ DEPEND=">=virtual/jdk-1.5 EANT_BUILD_TARGET="jar" EANT_DOC_TARGET="doc" -java_prepare() { - epatch "${FILESDIR}"/${P}-nodemo.patch +PATCHES=( "${FILESDIR}"/${P}-nodemo.patch ) + +src_prepare() { + eapply "${PATCHES[@]}" + java-pkg-2_src_prepare #some cleanups - find . -name '*.so' -exec rm -v {} \;|| die - find . -name '*.dll' -exec rm -v {} \;|| die + find . -type f -name '*.so' -exec rm -v {} + || die + find . -type f -name '*.dll' -exec rm -v {} + || die #remove built-in jars and use the system ones cd lib || die |