dev-java/jffi: Stable for amd64. Retroactively mark stable for the remaining arches...

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>

diff --git a/dev-java/jffi/jffi-1.0.11-r1.ebuild b/dev-java/jffi/jffi-1.0.11-r1.ebuild
index 7af0347c5f3e968cb44cbb33f5c3fffd179b4407..271b085e8bd616d70966d829c0be03d32401c9bd 100644 (file)
--- a/dev-java/jffi/jffi-1.0.11-r1.ebuild
+++ b/dev-java/jffi/jffi-1.0.11-r1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
-
 JAVA_PKG_IUSE="doc source test"
 
 inherit eutils java-pkg-2 java-ant-2 versionator
@@ -14,32 +13,42 @@ SRC_URI="https://github.com/jnr/jffi/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 LGPL-3 )"
 SLOT="1.0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-COMMON_DEP="
+CDEPEND="
        virtual/libffi"
-RDEPEND="${COMMON_DEP}
-       >=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
-       >=virtual/jdk-1.5
+
+RDEPEND="
+       ${CDEPEND}
+       >=virtual/jre-1.6"
+
+DEPEND="
+       ${CDEPEND}
+       >=virtual/jdk-1.6
        virtual/pkgconfig
        test? (
                dev-java/ant-junit:0
                dev-java/junit:4
        )"
 
+PATCHES=(
+       "${FILESDIR}"/${P}_no-werror.patch
+)
+
 src_unpack() {
        unpack ${A}
        mv jnr-jffi-* "${P}" || die
 }
 
 java_prepare() {
+       java-pkg_clean
+
        cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-       epatch "${FILESDIR}"/${P}_no-werror.patch
-       sed -i -e 's/-Werror //' libtest/GNUmakefile || die
 
-       find "${WORKDIR}" -iname '*.jar' -delete || die
+       epatch "${PATCHES[@]}"
+
+       sed -i -e 's/-Werror //' libtest/GNUmakefile || die
 
        # Fix build with GCC 4.7 #421501
        sed -i -e "s|-mimpure-text||g" jni/GNUmakefile libtest/GNUmakefile || die