diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2013-09-01 14:39:23 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2013-09-01 14:39:23 +0000 |
| commit | 04a4415ec8a090e4150b6f455b592f4a81af3084 (patch) | |
| tree | ec2031b27063424a2d3685156e0af0626c2b5285 /dev-java/jffi | |
| parent | Do not pull in corefonts when USE=truetype; users who need the original coref... (diff) | |
| download | historical-04a4415ec8a090e4150b6f455b592f4a81af3084.tar.gz historical-04a4415ec8a090e4150b6f455b592f4a81af3084.tar.bz2 historical-04a4415ec8a090e4150b6f455b592f4a81af3084.zip | |
Fixed for and marked *-macos
Package-Manager: portage-2.2.01.22288-prefix/cvs/SunOS i386
Manifest-Sign-Key: 0x5F75F607C5C74E89
Diffstat (limited to 'dev-java/jffi')
| -rw-r--r-- | dev-java/jffi/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/jffi/Manifest | 12 | ||||
| -rw-r--r-- | dev-java/jffi/jffi-1.2.6.ebuild | 30 |
3 files changed, 37 insertions, 10 deletions
diff --git a/dev-java/jffi/ChangeLog b/dev-java/jffi/ChangeLog index f181f47ac742..0e684bad5040 100644 --- a/dev-java/jffi/ChangeLog +++ b/dev-java/jffi/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/jffi # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.27 2013/08/31 15:01:48 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.28 2013/09/01 14:39:19 grobian Exp $ + + 01 Sep 2013; Fabian Groffen <grobian@gentoo.org> jffi-1.2.6.ebuild: + Fixed for and marked *-macos 31 Aug 2013; Pacho Ramos <pacho@gentoo.org> jffi-1.0.11.ebuild: Drop -Werror usage in tests and fix tests building with gcc-4.7 (#438130) diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest index 1e5cccd75428..bc560a7f1b3d 100644 --- a/dev-java/jffi/Manifest +++ b/dev-java/jffi/Manifest @@ -14,13 +14,13 @@ DIST jffi-1.2.6.tar.gz 1850410 SHA256 b568d832828bf0cb980c545e8fd16147034048ca2d EBUILD jffi-1.0.0.ebuild 2274 SHA256 a5fe1144dacf4f666105ef56cec8a8bf7b246a68dbde639ec4a0c9c867a2d4b1 SHA512 35894dc27f8b0d0f672d1d39548af68057f79e252663cf2c9ec8802e7dabb6d721afd3e1d030b37f7c7c37e395c39cbf5cda2a5b4b97f95d17fa3aa9b4d642cc WHIRLPOOL 986db534860b62f5dce5a12667410dfeb7c120a0a3f9e4fc5c57dca37d694204a4ac2b4b3d2b76bc7a961d15a88c7868c2290eab253a46f0f1b64a32d48191b8 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 2358 SHA256 d7b4e29598f7e71a1235279c6f04aadaa41167ebde25fb520980c2b1a5f23084 SHA512 5b30160dace64ab895426c397223f7f9208f0600d20cac3bac5684400a244941437880a51d6637029a7e8f95b0c430c6ff9ce6156323baf63a7b55bbb667cdff WHIRLPOOL e397fcb8fb9f56334c4ee14907e56a0f6b2935e167b627f88255b88a7b1c5fc7f2ce2ff1d95fdf527117dc1d29e49009bef3711596c588aa360b0b6455675064 -MISC ChangeLog 4850 SHA256 f8562d768a502c37028d757cc2f2b863e9deec21ec538fb2a0ec57cee6c55f09 SHA512 78521b10fec7bb1ebc9fa6d9d4cdc8152e289d401abfc663a8c3f6d2dc66dd5dc1283127e65268dd60137be9c392e98f0668139344fdeeefcbc7a7b5fce49738 WHIRLPOOL dddb204cfa756488d571b65c5c36f2cf46d63ccf3cbad977bb0a20b835afce603b1edb85beeb83085abbf494d7da52a92aaed00055057af5f310d31af3a74375 +EBUILD jffi-1.2.6.ebuild 3069 SHA256 52af5d368eff758bc0a6bbd7be7ac7188d13a473f0905744df1c37eb25dd7bdc SHA512 7329dd7ed5f7b9ae10a38684a9dcd3c5f725432aee173cfbe82602198292c91a084c02e90bcb413bd307c5e17abfabf710830189a4a8d09c214ac8543bd4836f WHIRLPOOL 7b770a7c295d3c5caa5fcf8ede7d3254090049a4d11b7c8cf5c01537cbcfeec5b7f9a11d1baed8af1a8eef3fa8ad968838e515e74d8dd66b711eb04514f9132b +MISC ChangeLog 4954 SHA256 b62c95f440fea046cac3a47b5ea2c85de282c9dee3ed1cc22d4d39f7d390ea6b SHA512 b2cb64a619fb8d4c9fe9a62863c4d3efa6f918dfceeaee35a3cc13f5eb6c9eee9ea304120a87f2b6bacfb97b7ce8a40fc74ebd162474538f02a0e8510070b909 WHIRLPOOL 7fc56d7f848ab7b63d48ee84f1d3fccd079f6106c793098c41541638bcb6f6292a75f8962ffd3ad8d0d4a9c0c5b959490821cc5da70110c2e86f342b6393a06c MISC metadata.xml 159 SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b SHA512 269cf19c37f2d136b926f546ec83ffdbc1374b2b6e26f8a31f21854143380386c31bfc7b2a0b9c47fb1f7c02607ddbdd43e517cb5c3270515e465c4dd7788843 WHIRLPOOL afb402fec04cddb3184b69eb8a8d36b404edd2870fd06c8f5e99be39c341ea6fa7542e0b680fac05529522ed33838e8279381d7a6de9dbc58fe55841229d8a51 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.20 (GNU/Linux) +Version: GnuPG v2.0.21 (SunOS) -iEYEAREIAAYFAlIiBV4ACgkQCaWpQKGI+9TyLACfaXGM2ZoeOyi8l4MN3BLuJPvT -YWEAni333CSZYXOAEJpZ6Mao+5YWDfA+ -=gzu5 +iEYEAREIAAYFAlIjUZgACgkQX3X2B8XHTollrQCgnAochVCFvcT2U+r/iROL8S6t +0TEAn0We6yeohzp/xPSKnQkj7V0AHpMA +=qtSX -----END PGP SIGNATURE----- diff --git a/dev-java/jffi/jffi-1.2.6.ebuild b/dev-java/jffi/jffi-1.2.6.ebuild index f9b1d6a8471f..9c7c51f7b186 100644 --- a/dev-java/jffi/jffi-1.2.6.ebuild +++ b/dev-java/jffi/jffi-1.2.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-1.2.6.ebuild,v 1.1 2013/02/07 13:15:36 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-1.2.6.ebuild,v 1.2 2013/09/01 14:39:19 grobian Exp $ EAPI="5" @@ -14,7 +14,7 @@ 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" +KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x64-macos ~x86-macos" IUSE="" COMMON_DEP=" @@ -33,6 +33,26 @@ java_prepare() { cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die epatch "${FILESDIR}"/${P}_no-werror.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 } @@ -83,13 +103,17 @@ src_test() { } src_install() { + local libname=".so" + cat > boot.properties <<-EOF jffi.boot.library.path = ${JAVA_PKG_LIBDEST} EOF jar -uf target/${PN}.jar boot.properties || die + [[ ${CHOST} == *-darwin* ]] && libname=.jnilib + java-pkg_dojar target/${PN}.jar - java-pkg_doso build/jni/lib${PN}-$(get_version_component_range 1-2).so + java-pkg_doso build/jni/lib${PN}-$(get_version_component_range 1-2)${libname} use doc && java-pkg_dojavadoc target/site/apidocs use source && java-pkg_dosrc src/main/java/* |