Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/files/, dev-java/jffi/
Date: Sun, 30 Oct 2016 20:29:56
Message-Id: 1477859380.4a3119ad9ddedaad622f73cb8c4566f564f3e466.chewi@gentoo
1 commit: 4a3119ad9ddedaad622f73cb8c4566f564f3e466
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 30 20:28:05 2016 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 30 20:29:40 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a3119ad
7
8 dev-java/jffi: Remove old, closes bug #597550
9
10 Package-Manager: portage-2.3.2
11
12 dev-java/jffi/Manifest | 1 -
13 dev-java/jffi/files/jffi-1.0.11_no-werror.patch | 13 ---
14 dev-java/jffi/jffi-1.0.11-r1.ebuild | 116 ------------------------
15 3 files changed, 130 deletions(-)
16
17 diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
18 index 9430782..9df14b4 100644
19 --- a/dev-java/jffi/Manifest
20 +++ b/dev-java/jffi/Manifest
21 @@ -1,2 +1 @@
22 -DIST jffi-1.0.11.tar.gz 1899655 SHA256 b66781a07e095dbaf9d568b77762e06215da4458d963956ea22dd5adb5f3126a SHA512 0f98c1aa55dfd9fd9338399e173f118ef12d01a65429a49ed5264a23fa6700e7ebdf13ffb6b6318fcd8ea9dce66a47524c5cefa50f3f11a251ca44a4f38fd6aa WHIRLPOOL aa8c3f88b75a26221b3c41ed552fdd83c551ae05fc7455f072b8a3d7f3190cad26a638d1800a67b09d8074b5dfdd04f2be73287a7f22c0cfcc5dbc8df0d2ae12
23 DIST jffi-1.2.9.tar.gz 1952668 SHA256 1cb854a913d295cb9a41cdb1349f68efe3c5d750b3135a1fa07a365d6806f5ef SHA512 2fd9a95cce9a3406a09856761d1318d4c6b976b1f9b66c7c5b0b5e95d44b19ba654ab8288f396782c7bb53e6d9949e7cfa9c46763f2a0761c6e86f102cd202e4 WHIRLPOOL 79ed9433b2b475fd9f5ae228e54bef1d637c9cdac97e63bb16f5510933707c968a0989e6eb7f09a9a79f06bb725ab5267c2373657da1daddbbbe3b093479de3b
24
25 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
26 deleted file mode 100644
27 index 25b7e4f..00000000
28 --- a/dev-java/jffi/files/jffi-1.0.11_no-werror.patch
29 +++ /dev/null
30 @@ -1,13 +0,0 @@
31 -diff --git a/jni/GNUmakefile b/jni/GNUmakefile
32 -index efe6230..25053c7 100755
33 ---- a/jni/GNUmakefile
34 -+++ b/jni/GNUmakefile
35 -@@ -64,7 +64,7 @@ JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing -DNDEBUG
36 - OFLAGS = -O2 $(JFLAGS)
37 -
38 - # MacOS headers aren't completely warning free, so turn them off
39 --WERROR = -Werror
40 -+WERROR =
41 - ifneq ($(OS),darwin)
42 - WFLAGS += -Wundef $(WERROR)
43 - endif
44
45 diff --git a/dev-java/jffi/jffi-1.0.11-r1.ebuild b/dev-java/jffi/jffi-1.0.11-r1.ebuild
46 deleted file mode 100644
47 index c09f166..00000000
48 --- a/dev-java/jffi/jffi-1.0.11-r1.ebuild
49 +++ /dev/null
50 @@ -1,116 +0,0 @@
51 -# Copyright 1999-2016 Gentoo Foundation
52 -# Distributed under the terms of the GNU General Public License v2
53 -# $Id$
54 -
55 -EAPI="5"
56 -JAVA_PKG_IUSE="doc source test"
57 -
58 -inherit eutils java-pkg-2 java-ant-2 versionator
59 -
60 -DESCRIPTION="An optimized Java interface to libffi"
61 -HOMEPAGE="https://github.com/jnr"
62 -SRC_URI="https://github.com/jnr/jffi/tarball/${PV} -> ${P}.tar.gz"
63 -
64 -LICENSE="|| ( Apache-2.0 LGPL-3 )"
65 -SLOT="1.0"
66 -KEYWORDS="amd64 ~ppc64 x86"
67 -IUSE=""
68 -
69 -CDEPEND="
70 - virtual/libffi"
71 -
72 -RDEPEND="
73 - ${CDEPEND}
74 - >=virtual/jre-1.6"
75 -
76 -DEPEND="
77 - ${CDEPEND}
78 - >=virtual/jdk-1.6
79 - virtual/pkgconfig
80 - test? (
81 - dev-java/ant-junit:0
82 - dev-java/junit:4
83 - )"
84 -
85 -PATCHES=(
86 - "${FILESDIR}"/${P}_no-werror.patch
87 -)
88 -
89 -src_unpack() {
90 - unpack ${A}
91 - mv jnr-jffi-* "${P}" || die
92 -}
93 -
94 -java_prepare() {
95 - java-pkg_clean
96 -
97 - cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
98 -
99 - epatch "${PATCHES[@]}"
100 -
101 - sed -i -e 's/-Werror //' libtest/GNUmakefile || die
102 -
103 - # Fix build with GCC 4.7 #421501
104 - sed -i -e "s|-mimpure-text||g" jni/GNUmakefile libtest/GNUmakefile || die
105 -}
106 -
107 -JAVA_ANT_REWRITE_CLASSPATH="yes"
108 -EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
109 -
110 -src_compile() {
111 - # generate Version.java
112 - cat <<-EOF > src/main/java/com/kenai/jffi/Version.java
113 - package com.kenai.jffi;
114 - public final class Version {
115 - private Version() {}
116 - public static final int MAJOR = $(get_version_component_range 1);
117 - public static final int MINOR = $(get_version_component_range 2);
118 - public static final int MICRO = $(get_version_component_range 3);
119 - }
120 - EOF
121 -
122 - java-pkg-2_src_compile
123 -
124 - # generate headers
125 - mkdir -p build/jni || die
126 - javah -d build/jni -classpath target/classes \
127 - com.kenai.jffi.Foreign \
128 - com.kenai.jffi.ObjectBuffer \
129 - com.kenai.jffi.Version \
130 - || die
131 -
132 - #build native library.
133 - local args=(
134 - SRC_DIR=jni
135 - JNI_DIR=jni
136 - BUILD_DIR=build/jni
137 - VERSION=$(get_version_component_range 1-2)
138 - USE_SYSTEM_LIBFFI=1
139 - -f jni/GNUmakefile
140 - )
141 - emake "${args[@]}"
142 -}
143 -
144 -EANT_TEST_GENTOO_CLASSPATH="junit-4"
145 -src_test() {
146 - # build native test library
147 - emake BUILD_DIR=build -f libtest/GNUmakefile
148 -
149 - _JAVA_OPTIONS="-Djffi.boot.library.path=build/jni" \
150 - java-pkg-2_src_test
151 -}
152 -
153 -src_install() {
154 - java-pkg_doso build/jni/lib${PN}-$(get_version_component_range 1-2).so
155 -
156 - # must by after _doso to have JAVA_PKG_LIBDEST set
157 - cat <<-EOF > boot.properties
158 - jffi.boot.library.path = ${JAVA_PKG_LIBDEST}
159 - EOF
160 - jar -uf target/${PN}.jar boot.properties || die
161 -
162 - java-pkg_dojar target/${PN}.jar
163 -
164 - use doc && java-pkg_dojavadoc target/site/apidocs
165 - use source && java-pkg_dosrc src/main/java/*
166 -}