From 138499ba3ae4dc465f9db3779f5e0588e48e5d35 Mon Sep 17 00:00:00 2001 From: Johann Schmitz Date: Thu, 13 Nov 2014 15:08:38 +0000 Subject: [PATCH] Fixed boot.properties generation Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64 Manifest-Sign-Key: 0x77C501ED --- dev-java/jffi/ChangeLog | 10 ++- dev-java/jffi/Manifest | 19 +++-- dev-java/jffi/jffi-1.0.0-r1.ebuild | 82 +++++++++++++++++++ dev-java/jffi/jffi-1.0.11-r1.ebuild | 107 ++++++++++++++++++++++++ dev-java/jffi/jffi-1.2.7-r1.ebuild | 123 ++++++++++++++++++++++++++++ 5 files changed, 332 insertions(+), 9 deletions(-) create mode 100644 dev-java/jffi/jffi-1.0.0-r1.ebuild create mode 100644 dev-java/jffi/jffi-1.0.11-r1.ebuild create mode 100644 dev-java/jffi/jffi-1.2.7-r1.ebuild diff --git a/dev-java/jffi/ChangeLog b/dev-java/jffi/ChangeLog index a08125bc2896..dffa17067b4f 100644 --- a/dev-java/jffi/ChangeLog +++ b/dev-java/jffi/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-java/jffi # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.34 2014/11/12 05:22:48 ercpe Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.35 2014/11/13 15:08:27 ercpe Exp $ + +*jffi-1.2.7-r1 (13 Nov 2014) +*jffi-1.0.11-r1 (13 Nov 2014) +*jffi-1.0.0-r1 (13 Nov 2014) + + 13 Nov 2014; Johann Schmitz +jffi-1.0.0-r1.ebuild, + +jffi-1.0.11-r1.ebuild, +jffi-1.2.7-r1.ebuild: + Fixed boot.properties generation 12 Nov 2014; Johann Schmitz +files/jffi-1.2.7_no-werror.patch, jffi-1.2.7.ebuild: diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest index a72e6a4772a7..2d25399270b5 100644 --- a/dev-java/jffi/Manifest +++ b/dev-java/jffi/Manifest @@ -14,21 +14,24 @@ DIST jffi-1.0.11.tar.gz 1899655 SHA256 b66781a07e095dbaf9d568b77762e06215da4458d DIST jffi-1.2.5.tar.gz 1798081 SHA256 2101c48855558902f2e21baacd0b2c8b7098feb3ca1487a195c2bc3d9116ebd4 SHA512 2613a1874899e1a734ad54d68f7d969fe3bc12bd1ae1aaf5a63a17d63ac6ac6b9812740b7c7a771e66ba0e4ff02105c6a2427771d4571be40ae869f3d6f077e3 WHIRLPOOL 174303fc9f10cf295e009ef2320f9b13295f5e96187ab2ae4599de891b27e1279645ea47409eb8aec9a8b247a5568cddd6f8566950b64be37e399cb0eda0219f DIST jffi-1.2.6.tar.gz 1850410 SHA256 b568d832828bf0cb980c545e8fd16147034048ca2d3ffc62cae4f844c8cc6cec SHA512 df178691e6894599f2a45146950cca7e4c81e92c38fc751c40b39e660970c19d0dce41c9192053dddf07f42317d28033f59b7140c904784c477526e7471b6938 WHIRLPOOL adb57b9ac981177ae7d697aae41bbaaff3a38dab4c4364258b13272023076dacdd93a751eb24a339ae17a4162d4511685a4aa67afd5d8fab2f852e0403ee73f1 DIST jffi-1.2.7.tar.gz 1908203 SHA256 25f1930f294cec9651447edd08a51a990b7c92c69eca87257233e86e4dd5f979 SHA512 837ebb0085ec2acc5dc688c3e1883a7c986df62a32a41887196b88f5b5714ee667f918f2bdf005f019faae02df2f7903f291fa32c5ec3cabc360d9b1d8e4548d WHIRLPOOL 0e9824d54b21eb61142f4a868cd10122d9837c34732fc4ff9ba3093c0d4c11ee25dc0e045a40a4157faed201de9498e7cea28df85e7f14d07b58d2f4d1fb26e1 +EBUILD jffi-1.0.0-r1.ebuild 2337 SHA256 16b7b8d99a4842a373ba2c793759a93339e7316da2ed88ac89c36dafdddbfb16 SHA512 00fa58f0b6817fd7f7070047a640a83dfbda3e7dc413043ea7893d30a105acd6d7ce066e8d00f733181e291f456ec6305585755638d211080f5f14d2a87877bd WHIRLPOOL 40d298507d308e40495040cb7a1106054c82bfae1486095483d1524261bfb563d3618aa4a80084c16a29fd10a70efb829af4b118bc223c5d4240060316508c1c EBUILD jffi-1.0.0.ebuild 2274 SHA256 a5fe1144dacf4f666105ef56cec8a8bf7b246a68dbde639ec4a0c9c867a2d4b1 SHA512 35894dc27f8b0d0f672d1d39548af68057f79e252663cf2c9ec8802e7dabb6d721afd3e1d030b37f7c7c37e395c39cbf5cda2a5b4b97f95d17fa3aa9b4d642cc WHIRLPOOL 986db534860b62f5dce5a12667410dfeb7c120a0a3f9e4fc5c57dca37d694204a4ac2b4b3d2b76bc7a961d15a88c7868c2290eab253a46f0f1b64a32d48191b8 +EBUILD jffi-1.0.11-r1.ebuild 2634 SHA256 f7d5d3069012f7839f3b5ae2a6f20cff965c3e9a28c0760992de258c355943ff SHA512 b2ccc23c5c13bcbba4de45df9bf551db5d59974805dfbc48b26a5d4f54bb29d98a7f2851c28502f6e60ea1fdcfb6ac83366e71b9483ee15a322f43f4214f44c5 WHIRLPOOL 01c81fd03063a061369bdef4fa0328f4262c2464598bb594c001c09f8b0bab2268728c49cb6b8907871b82049fd025a4c363802729227f90626b93682a73feaf EBUILD jffi-1.0.11.ebuild 2562 SHA256 e925f71ef49b9fb710f5f6ab0493a0099c57fc218aa939addf06868f51032092 SHA512 a99c55469211698e24257216249550d6f3d83d37a3a61c6887f3bc0e87ec1b5d88badb75af1eeb7955ab58da5f58621ea7e460b0b6355f4473e05c643e5ce0ab WHIRLPOOL 43eea302b639890b69014f1c3e97866a5afa5a80f84c5db0c15f872276846304c27ed966743426ba783f030060f0c85101148bb4e2275525a69ca10033fbf6cb EBUILD jffi-1.2.5.ebuild 2358 SHA256 89636672db08de6b69c64d1da78cad1e05679323d812900be1325202e9540707 SHA512 6df150b5bb15f94f937676b93a720c407a07dcaa646a6f72fd9bb706b61729da2332deec464f7cff0ef99c6d5716ca26dfc8ce4e821f9733db37e6387ab12a98 WHIRLPOOL 6c82cdc180b1cf9fce413facb9b4bdfcbc649f25fb5ae573b840d4deed72d0f3c66f5d459eedb1afb5b3dbf8cd873d8e6fc680c4eb944989605ec23e3914f737 EBUILD jffi-1.2.6.ebuild 3069 SHA256 52af5d368eff758bc0a6bbd7be7ac7188d13a473f0905744df1c37eb25dd7bdc SHA512 7329dd7ed5f7b9ae10a38684a9dcd3c5f725432aee173cfbe82602198292c91a084c02e90bcb413bd307c5e17abfabf710830189a4a8d09c214ac8543bd4836f WHIRLPOOL 7b770a7c295d3c5caa5fcf8ede7d3254090049a4d11b7c8cf5c01537cbcfeec5b7f9a11d1baed8af1a8eef3fa8ad968838e515e74d8dd66b711eb04514f9132b +EBUILD jffi-1.2.7-r1.ebuild 3173 SHA256 3ebb7943348f249f5f3c49b620f9f1e3a72c6672e644c19205120536c7b0d2ea SHA512 8a2adcbd6a1364f0bc63c57bdcd7f043a5589ea95f6a55a64901154cdb4daa23b7dd90c7b5e9cdaa420764e7ca23cb0d5ffa1cef9a8ba223b62c5fd36c8c7d0c WHIRLPOOL 969c41399e4985c8ce9dcf77c987dfbaf5c7dfe1d075af6ca846d6583b9756071529e26f50e6f7565fd7dca783c1aebcec19e363bb9a5dc64b7fea05f162b328 EBUILD jffi-1.2.7.ebuild 3115 SHA256 2627fbcedfa190b18fff8d122c7e401ce4293b042ab9724f3493ace323ba2bbd SHA512 9cd1a8b99943de798b527ef6b4e9be420aa7c4d258217e7504a2680675778c79e0e3ba4584cb74cfdb5ff5a4d5f88bc776c72778d0e63511dca696b3084e6caf WHIRLPOOL e4ee6cd5c6d5011c55c605031049e419697ad34a81d420a1f22814bdc7839eea1cf3a6e9633f79961ebdfc85579efd214aaa2964bd0205d93a51aaa98640fd64 -MISC ChangeLog 5825 SHA256 20150edbec8af4b9f25498bae084ed4316da9f8dd34948117d440956e3f21053 SHA512 d53c146cca899e760622675c85e125c1806a197075a0dc74553b175b60ea210115ec75bc173f04013323f3feb1580429ee5b9a9f683f4a051c5fc813336070c9 WHIRLPOOL 97e0ad70b14c6950129987d3718cbf16aea36ba4088fb64e2c8a764de0113dfc8d9b622359bddfa863b563b459ea66699fa43c908159ee1f74e678604ec3380c +MISC ChangeLog 6071 SHA256 76b26ac469bca29fb1dcb4671a839c539be5f18646d164b1be1967aa491a3d37 SHA512 97d2ae7f6448fc67bd8b040b07d2553efe9def3898ee7a2efd62a87746c504b699a57d14c3d68c9803d186aedb954666e0ee2db7a12f2caa1629e157dece87c3 WHIRLPOOL 1fe4e65790574bc744161361a5271c23e9c5f767e2ac3290d3adbb49ce19d924ba289dff32fd0e9413e0aee04f11b2acfd0347ad24a7a42f5cf3808ce5a1024e MISC metadata.xml 159 SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b SHA512 269cf19c37f2d136b926f546ec83ffdbc1374b2b6e26f8a31f21854143380386c31bfc7b2a0b9c47fb1f7c02607ddbdd43e517cb5c3270515e465c4dd7788843 WHIRLPOOL afb402fec04cddb3184b69eb8a8d36b404edd2870fd06c8f5e99be39c341ea6fa7542e0b680fac05529522ed33838e8279381d7a6de9dbc58fe55841229d8a51 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJUYu6tAAoJEKCEBkJ3xQHtPNcH/2iSXdICDBBGa0kzDomHA2vx -6LVw1QSHoeEfHOFEnWUoy45VV5QR4+gNBjqRtXi06d2/i/3fRuin8SAmTmn8Z3z4 -GuhNhz3q2O8WwSmMYXYyPRSEZu+jRauCwQzjNnJ392VLjlIRXKX3pLvg3w8NoGfd -gwYmVmbQzy6TKc7llchO+Hc9fjuKBaRsqaTJkEbZCQIt2gccRKeOLFq7beZNBcDJ -KP9kRevFPfJAnprU/FBWh1TRmWxBTr4rqViY3nY4Kfy7a8k3kjWpbXPvhMvmPDBB -tu1r0amABOkYc/hsc+HsdHmCh0jVydnEsHF0R9/k097pEd8l9SHPzWhTaEYcqKI= -=5QNs +iQEcBAEBCAAGBQJUZMlzAAoJEKCEBkJ3xQHtvG4IAJSLtGLlJDFhbuVTaeIEliNk +FaBB6ZO6h4WkIq9DE1C63ogyw4IbdRqeGAz4Cca8WkFZV5wLphI72s7HXwp93AcF +OuQ30/LmH5YDZ2WgWlGIE8cjNpThzXuTjwVbwXJ7FE7jCT6wex47+0CjzEm92sL2 +A2FPuMJj9WDWnXwYGslxa01yDOL9Y03K901yo/UDxXOWEc/ECTstf6WoatV3YxK5 +l0Vm7ffBOMvU4KPb5CTt++dFrE4X5G7A7lJU5yoDyEE1pbUEpUuFKeGS5i7ciMGG +mw6//03kuHinAx6vC3ptdFQhPgwrcuOVMWL+KZYvRNwHsfbU062tQ3nMLs9mbuI= +=xtEI -----END PGP SIGNATURE----- diff --git a/dev-java/jffi/jffi-1.0.0-r1.ebuild b/dev-java/jffi/jffi-1.0.0-r1.ebuild new file mode 100644 index 000000000000..7717178d09d2 --- /dev/null +++ b/dev-java/jffi/jffi-1.0.0-r1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-1.0.0-r1.ebuild,v 1.1 2014/11/13 15:08:27 ercpe Exp $ + +# Probably best to leave the CFLAGS as they are here. See... +# http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html + +EAPI="5" + +JAVA_PKG_IUSE="source test" +WANT_ANT_TASKS="ant-nodeps" +inherit java-pkg-2 java-ant-2 toolchain-funcs flag-o-matic versionator + +DESCRIPTION="An optimized Java interface to libffi" +HOMEPAGE="http://github.com/wmeissner/jffi" + +SRC_URI="mirror://gentoo/${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0.4" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +RDEPEND=">=virtual/jre-1.5 + virtual/libffi" + +DEPEND=">=virtual/jdk-1.5 + virtual/libffi + virtual/pkgconfig + test? ( dev-java/ant-junit4 )" + +JAVA_PKG_BSFIX_NAME="build-impl.xml custom-build.xml" +JAVA_PKG_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5" + +java_prepare() { + # Delete the bundled JARs. + find lib archive -name "*.jar" -delete || die + # Delete the bundled libffi + rm -rf jni/libffi || die + + epatch "${FILESDIR}/${P}-makefile.patch" + epatch "${FILESDIR}/1.0.0-gcc-3.4.patch" + + # any better function for this, excluding get_system_arch in java-vm-2 which is incorrect to inherit ? + local arch="" + use x86 && arch="i386" + use amd64 && arch="x86_64" + use ppc && arch="ppc" + + # Don't include prebuilt files for other archs. + sed -i '/ "${T}"/com/kenai/jffi/boot.properties </dev/null + jar -uf "${S}"/dist/${PN}.jar com + popd + + java-pkg_dojar dist/${PN}.jar + use source && java-pkg_dosrc src/* +} + +src_test() { + ANT_TASKS="ant-junit4 ant-nodeps" eant test \ + "${EANT_EXTRA_ARGS}" \ + -Dlibs.junit_4.classpath="$(java-pkg_getjars --with-dependencies junit-4)" +} diff --git a/dev-java/jffi/jffi-1.0.11-r1.ebuild b/dev-java/jffi/jffi-1.0.11-r1.ebuild new file mode 100644 index 000000000000..0dcdc43d3a1b --- /dev/null +++ b/dev-java/jffi/jffi-1.0.11-r1.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-1.0.11-r1.ebuild,v 1.1 2014/11/13 15:08:27 ercpe Exp $ + +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="http://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 ~ppc ~x86" +IUSE="" + +COMMON_DEP=" + virtual/libffi" +RDEPEND="${COMMON_DEP} + >=virtual/jre-1.5" +DEPEND="${COMMON_DEP} + >=virtual/jdk-1.5 + virtual/pkgconfig + test? ( + dev-java/ant-junit:0 + dev-java/junit:4 + )" + +src_unpack() { + unpack ${A} + mv jnr-jffi-* "${P}" || die +} + +java_prepare() { + 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 + + # 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/* +} diff --git a/dev-java/jffi/jffi-1.2.7-r1.ebuild b/dev-java/jffi/jffi-1.2.7-r1.ebuild new file mode 100644 index 000000000000..0d5ca4cc7d59 --- /dev/null +++ b/dev-java/jffi/jffi-1.2.7-r1.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-1.2.7-r1.ebuild,v 1.1 2014/11/13 15:08:27 ercpe Exp $ + +EAPI="5" + +JAVA_PKG_IUSE="doc source test" + +inherit eutils java-pkg-2 java-ant-2 versionator vcs-snapshot + +DESCRIPTION="An optimized Java interface to libffi" +HOMEPAGE="https://github.com/jnr/jffi" +SRC_URI="https://github.com/jnr/jffi/tarball/${PV} -> ${P}.tar.gz" + +LICENSE="|| ( Apache-2.0 LGPL-3 )" +SLOT="1.2" +KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x64-macos ~x86-macos" + +COMMON_DEP="virtual/libffi:0" + +RDEPEND="${COMMON_DEP} + >=virtual/jre-1.5" + +DEPEND="${COMMON_DEP} + >=virtual/jdk-1.5 + virtual/pkgconfig + test? ( + dev-java/ant-junit4:0 + dev-java/junit:4 + )" + +java_prepare() { + cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die + epatch "${FILESDIR}"/${P}_no-werror.patch + epatch "${FILESDIR}"/${P}-junit-4.11.patch + + # misc fixes for Darwin + if [[ ${CHOST} == *-darwin* ]] ; then + local uarch + # don't do multiarch + # avoid using Xcode stuff + # use Prefix' headers + # don't mess with deployment target + # set install_name + use x64-macos && uarch=x86_64 + use x86-macos && uarch=i386 + use ppc-macos && uarch=ppc + sed -i \ + -e "/ARCHES +=/s/=.*$/= ${uarch}/" \ + -e "/XCODE=/s:=.*$:=${EPREFIX}:" \ + -e "/MACSDK/s/^/#/" \ + -e "/MACOSX_DEPLOYMENT_TARGET=/s/MAC/NOMAC/" \ + -e "/SOFLAGS =/s:=.*:= -install_name ${EPREFIX}/usr/lib/jffi-${SLOT}/libjffi-${SLOT}.jnilib:" \ + jni/GNUmakefile || die + fi + + find "${WORKDIR}" -iname '*.jar' -delete +} + +JAVA_ANT_REWRITE_CLASSPATH="yes" + +EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}" +src_compile() { + # generate Version.java + cat > src/main/java/com/kenai/jffi/Version.java <<-EOF + 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 + 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="ant-junit4,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() { + local libname=".so" + + [[ ${CHOST} == *-darwin* ]] && libname=.jnilib + java-pkg_doso build/jni/lib${PN}-$(get_version_component_range 1-2)${libname} + + # must by after _doso to have JAVA_PKG_LIBDEST set + cat > boot.properties <<-EOF + 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/* +} -- 2.26.2