commit: 4a3119ad9ddedaad622f73cb8c4566f564f3e466 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Sun Oct 30 20:28:05 2016 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sun Oct 30 20:29:40 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a3119ad
dev-java/jffi: Remove old, closes bug #597550 Package-Manager: portage-2.3.2 dev-java/jffi/Manifest | 1 - dev-java/jffi/files/jffi-1.0.11_no-werror.patch | 13 --- dev-java/jffi/jffi-1.0.11-r1.ebuild | 116 ------------------------ 3 files changed, 130 deletions(-) diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest index 9430782..9df14b4 100644 --- a/dev-java/jffi/Manifest +++ b/dev-java/jffi/Manifest @@ -1,2 +1 @@ -DIST jffi-1.0.11.tar.gz 1899655 SHA256 b66781a07e095dbaf9d568b77762e06215da4458d963956ea22dd5adb5f3126a SHA512 0f98c1aa55dfd9fd9338399e173f118ef12d01a65429a49ed5264a23fa6700e7ebdf13ffb6b6318fcd8ea9dce66a47524c5cefa50f3f11a251ca44a4f38fd6aa WHIRLPOOL aa8c3f88b75a26221b3c41ed552fdd83c551ae05fc7455f072b8a3d7f3190cad26a638d1800a67b09d8074b5dfdd04f2be73287a7f22c0cfcc5dbc8df0d2ae12 DIST jffi-1.2.9.tar.gz 1952668 SHA256 1cb854a913d295cb9a41cdb1349f68efe3c5d750b3135a1fa07a365d6806f5ef SHA512 2fd9a95cce9a3406a09856761d1318d4c6b976b1f9b66c7c5b0b5e95d44b19ba654ab8288f396782c7bb53e6d9949e7cfa9c46763f2a0761c6e86f102cd202e4 WHIRLPOOL 79ed9433b2b475fd9f5ae228e54bef1d637c9cdac97e63bb16f5510933707c968a0989e6eb7f09a9a79f06bb725ab5267c2373657da1daddbbbe3b093479de3b diff --git a/dev-java/jffi/files/jffi-1.0.11_no-werror.patch b/dev-java/jffi/files/jffi-1.0.11_no-werror.patch deleted file mode 100644 index 25b7e4f..00000000 --- a/dev-java/jffi/files/jffi-1.0.11_no-werror.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/jni/GNUmakefile b/jni/GNUmakefile -index efe6230..25053c7 100755 ---- a/jni/GNUmakefile -+++ b/jni/GNUmakefile -@@ -64,7 +64,7 @@ JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing -DNDEBUG - OFLAGS = -O2 $(JFLAGS) - - # MacOS headers aren't completely warning free, so turn them off --WERROR = -Werror -+WERROR = - ifneq ($(OS),darwin) - WFLAGS += -Wundef $(WERROR) - endif diff --git a/dev-java/jffi/jffi-1.0.11-r1.ebuild b/dev-java/jffi/jffi-1.0.11-r1.ebuild deleted file mode 100644 index c09f166..00000000 --- a/dev-java/jffi/jffi-1.0.11-r1.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2016 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 - -DESCRIPTION="An optimized Java interface to libffi" -HOMEPAGE="https://github.com/jnr"; -SRC_URI="https://github.com/jnr/jffi/tarball/${PV} -> ${P}.tar.gz" - -LICENSE="|| ( Apache-2.0 LGPL-3 )" -SLOT="1.0" -KEYWORDS="amd64 ~ppc64 x86" -IUSE="" - -CDEPEND=" - virtual/libffi" - -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 "${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 -} - -JAVA_ANT_REWRITE_CLASSPATH="yes" -EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}" - -src_compile() { - # generate Version.java - cat <<-EOF > src/main/java/com/kenai/jffi/Version.java - package com.kenai.jffi; - public final class Version { - private Version() {} - public static final int MAJOR = $(get_version_component_range 1); - public static final int MINOR = $(get_version_component_range 2); - public static final int MICRO = $(get_version_component_range 3); - } - EOF - - java-pkg-2_src_compile - - # generate headers - mkdir -p build/jni || die - javah -d build/jni -classpath target/classes \ - com.kenai.jffi.Foreign \ - com.kenai.jffi.ObjectBuffer \ - com.kenai.jffi.Version \ - || die - - #build native library. - local args=( - SRC_DIR=jni - JNI_DIR=jni - BUILD_DIR=build/jni - VERSION=$(get_version_component_range 1-2) - USE_SYSTEM_LIBFFI=1 - -f jni/GNUmakefile - ) - emake "${args[@]}" -} - -EANT_TEST_GENTOO_CLASSPATH="junit-4" -src_test() { - # build native test library - emake BUILD_DIR=build -f libtest/GNUmakefile - - _JAVA_OPTIONS="-Djffi.boot.library.path=build/jni" \ - java-pkg-2_src_test -} - -src_install() { - java-pkg_doso build/jni/lib${PN}-$(get_version_component_range 1-2).so - - # must by after _doso to have JAVA_PKG_LIBDEST set - cat <<-EOF > boot.properties - jffi.boot.library.path = ${JAVA_PKG_LIBDEST} - EOF - jar -uf target/${PN}.jar boot.properties || die - - java-pkg_dojar target/${PN}.jar - - use doc && java-pkg_dojavadoc target/site/apidocs - use source && java-pkg_dosrc src/main/java/* -}
