summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2010-01-16 23:20:48 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2010-01-16 23:20:48 +0000
commit832ad17db04b388e2ca18ebbcb711d05db781a40 (patch)
treeecbc7db5119ccbefb459ef60bda1f97df1eee132 /dev-java
parentUpdate jpeg mask message, it's not masked for testing, it's masked because we... (diff)
downloadhistorical-832ad17db04b388e2ca18ebbcb711d05db781a40.tar.gz
historical-832ad17db04b388e2ca18ebbcb711d05db781a40.tar.bz2
historical-832ad17db04b388e2ca18ebbcb711d05db781a40.zip
Revision bump, install the shared object with the stub library as well, otherwise JRuby will fail.
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/jffi/ChangeLog9
-rw-r--r--dev-java/jffi/Manifest9
-rw-r--r--dev-java/jffi/jffi-0.6.0.2-r1.ebuild69
3 files changed, 82 insertions, 5 deletions
diff --git a/dev-java/jffi/ChangeLog b/dev-java/jffi/ChangeLog
index 9caa731a9717..5dff291c3f0c 100644
--- a/dev-java/jffi/ChangeLog
+++ b/dev-java/jffi/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-java/jffi
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.7 2010/01/16 19:53:35 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.8 2010/01/16 23:20:48 flameeyes Exp $
+
+*jffi-0.6.0.2-r1 (16 Jan 2010)
+
+ 16 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+ +jffi-0.6.0.2-r1.ebuild:
+ Revision bump, install the shared object with the stub library as well,
+ otherwise JRuby will fail.
16 Jan 2010; Petteri Räty <betelgeuse@gentoo.org> -jffi-0.4.1-r1.ebuild,
-jffi-0.5.ebuild:
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index 0bc3a4e3ee3b..71d5db5d6fd1 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -8,13 +8,14 @@ AUX 0.6.0.2-makefile-flags.patch 1818 RMD160 8a2abc05364c2cc6adf95d6c1fad15f706c
DIST jffi-0.3.tar.bz2 1399294 RMD160 0bf761dae280e1201a971799cc1d1813657d05b7 SHA1 dafbbe968c9be0bc4fcb94618779d67cc1e65389 SHA256 5d3ee453e632824e09c102cf6d56f839de36b85a7882b7426f9f25e8c2d176c4
DIST jffi-0.6.0.2.tar.bz2 1855529 RMD160 be9ecd77eb17fb80c75f8dfe21f1bdd62d34596b SHA1 b957f8b52573f4e96a3c242d016cb7fc100a3399 SHA256 a2e5cd14484027807a2ab757d8010fb9903d33a4a0e5e1f045ad8de806a0cb24
EBUILD jffi-0.3-r3.ebuild 1779 RMD160 f11a5bded4536d18b77c10e00c081c2c67f2adab SHA1 19d1815c73d8ec2d646d512b7f4369ae6765809a SHA256 763f7639e5b1281e8290527041fbd2a7b976c8b67e1fee7541374357c1607ee2
+EBUILD jffi-0.6.0.2-r1.ebuild 2089 RMD160 82c7f13c240e33b591a4aa60b7358c51e1b7fefc SHA1 4478fdc89c9199fa4179d8d313745a825b7f48f9 SHA256 73f1edb32a6b3c8fb16d6f4d5f587275c15138d2214897264dd53daa919c621e
EBUILD jffi-0.6.0.2.ebuild 2001 RMD160 c451d40cb93da4761e01dd34089ba7ed8bba0f1f SHA1 25fa3f3a1cb9a3b73d283272c7023a62f767544c SHA256 df3c5514815568d8a62b2107cca68ed859b490469ec1d37573040fb6a62d0646
-MISC ChangeLog 1494 RMD160 77ba43598d6a345e96d928158718bb60f2fcf71f SHA1 baf44431451aeb839af6e906812467de5869c4d0 SHA256 00f2a3800f0773f18679472a22216ffc833410140eddaaefc1c01212741332a6
+MISC ChangeLog 1712 RMD160 f7fb940dbdd90973245d1c1dab0fe378ea2e031c SHA1 535ec48b9e9733f00a9f0ea31086d0dfacac1e59 SHA256 38b9afd0f29409ed59eac221698479bbeb66795b81a389ceb8c0cd2b0ac6b4e9
MISC metadata.xml 159 RMD160 5259d4be0ca7b74c28e711d45a289def9aeadbd9 SHA1 c4ec40cd8f19e0d780a5133941bc50043be198cf SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)
-iEYEARECAAYFAktSGUgACgkQcxLzpIGCsLR8BgCgmvv6VPa0XpGOGuhBSuTevzKx
-NvAAoIdIUVhHWh2tdhAqJrvgT8gVHmFb
-=ztH6
+iEYEARECAAYFAktSSaUACgkQAiZjviIA2Xh4vgCdGHZgkCRevLSCLYyB+O7wNb4K
+/jUAnA16mVoBG/Ae2+vN9Pr6UxBK8+3A
+=+LVR
-----END PGP SIGNATURE-----
diff --git a/dev-java/jffi/jffi-0.6.0.2-r1.ebuild b/dev-java/jffi/jffi-0.6.0.2-r1.ebuild
new file mode 100644
index 000000000000..433f65ddab49
--- /dev/null
+++ b/dev-java/jffi/jffi-0.6.0.2-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-0.6.0.2-r1.ebuild,v 1.1 2010/01/16 23:20:48 flameeyes 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="2"
+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://kenai.com/projects/jffi"
+SRC_URI="mirror://gentoo//${P}.tar.bz2"
+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
+ test? ( dev-java/ant-junit4 )"
+
+JAVA_PKG_BSFIX_NAME="build-impl.xml"
+
+java_prepare() {
+ # Delete the bundled JARs.
+ find lib -name "*.jar" -delete || die
+ # Delete the bundled libffi
+ rm -rf jni/libffi || die
+
+ # bug #271533 and #272058
+ epatch "${FILESDIR}/${PV}-makefile-flags.patch"
+
+ # bug #272058
+ append-cflags $(pkg-config --cflags-only-I libffi)
+
+ # 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"
+
+ # Fetch our own prebuilt libffi.
+ mkdir -p "build/jni/libffi-${arch}-linux/.libs" || die
+
+ ln -snf "/usr/$(get_libdir)/libffi.so" \
+ "build/jni/libffi-${arch}-linux/.libs/libffi_convenience.a" || die
+
+ # Don't include prebuilt files for other archs.
+ sed -i '/<zipfileset src="archive\//d' custom-build.xml || die
+ sed -i '/libs.CopyLibs.classpath/d' lib/nblibraries.properties || die
+ sed -i '/copylibstask.jar/d' lib/nblibraries.properties || die
+}
+
+src_install() {
+ java-pkg_dojar dist/${PN}.jar
+ java-pkg_doso build/jni/lib${PN}-$(get_version_component_range 1-2).so
+ use source && java-pkg_dosrc src/*
+}
+
+src_test() {
+ ANT_TASKS="ant-junit4 ant-nodeps" eant test \
+ -Dlibs.junit_4.classpath="$(java-pkg_getjars --with-dependencies junit-4)"
+}