Use vcs-snapshot eclass for github download.

Don't use xargs and also remove bundled libffi.
Drop libffi symlink workaround.

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

3 files changed, 23 insertions, 22 deletions

diff --git a/dev-java/jna/ChangeLog b/dev-java/jna/ChangeLog
index efa40e6dfd5f..c5cf25ab6126 100644
--- a/dev-java/jna/ChangeLog
+++ b/dev-java/jna/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jna
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/ChangeLog,v 1.11 2012/03/22 13:27:46 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/ChangeLog,v 1.12 2012/03/23 15:27:47 sera Exp $
+
+  23 Mar 2012; Ralph Sennhauser <sera@gentoo.org> jna-3.4.0.ebuild:
+  Use vcs-snapshot eclass for github download.
+  Don't use xargs and also remove bundled libffi.
+  Drop libffi symlink workaround.
 
   22 Mar 2012; Ralph Sennhauser <sera@gentoo.org> jna-3.0.3-r1.ebuild,
   jna-3.2.4.ebuild, jna-3.2.7.ebuild, jna-3.3.0.ebuild, jna-3.4.0.ebuild:
diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
index e0f1159a8768..5fa998dbfcb4 100644
--- a/dev-java/jna/Manifest
+++ b/dev-java/jna/Manifest
@@ -24,17 +24,17 @@ EBUILD jna-3.0.3-r1.ebuild 1654 RMD160 aa389e088321b3ca1a0c5da061b89ab3d23cbe66
 EBUILD jna-3.2.4.ebuild 1932 RMD160 dd4e3a811c157a3dd1ae2715b56002d76c2c3ef3 SHA1 ec04bf19956e98202b400088927c4f74c23cedb5 SHA256 1272efe3fc3c15fee490f062de173737cef7dc5858e66d93880bc86358a6e07d
 EBUILD jna-3.2.7.ebuild 2573 RMD160 4977dcd8112181b0e9b16b6df3a7de65bf09490f SHA1 44c5470dc925230cbac8b1c7a6ee3dae641b8408 SHA256 7217da3c285406209e6fb719f6139aa00ccb1bcab748a2fce82ef42c0eb89104
 EBUILD jna-3.3.0.ebuild 2580 RMD160 e745286209047192bec77b8ac8890d59327ade5a SHA1 11a6181ef3a256ffa96f7ad86d56be889a54c77b SHA256 7f3eb87b6ee0356f8c2c59f3f5585482da8ec5135d17e17e168de366bb4762ef
-EBUILD jna-3.4.0.ebuild 2089 RMD160 40d200635144cf765ddc12a8e940661baa4f895b SHA1 223abd6b749f2f92da9093ad07666fd5f70b7c54 SHA256 14c80ed790002b66f9cd85f93cd413720a84a5f2eb4f6208d97f55d2bff3b22a
-MISC ChangeLog 2199 RMD160 b118d472187f198bd33e4a8b1a98722727b0a069 SHA1 b784b4cc45d0342001a8883be9a1fd5a7f1ee82c SHA256 14e5085a187ef8a50cb6774ff6348cbcf86410f795cf9c6c69ccb3779a9e9757
+EBUILD jna-3.4.0.ebuild 1956 RMD160 07e264943374dedcfa26228cee5c93e6d8615685 SHA1 1554df4d1cf35f7422e39d288fa588d793055977 SHA256 768f40e6c8c7b484a7d0fdb555698f8dca92beae48e9f0d2e845a50c903562b6
+MISC ChangeLog 2399 RMD160 73905cd820101be237ff711790e30d494b5d010c SHA1 efab0409d11692a06e8b237664263a43fb177831 SHA256 4d4c3873d6600d5c0333083b1798f7c70a5cb38d3c473308a2adb1cc2feeb5d2
 MISC metadata.xml 295 RMD160 d7fc5e14f5b91d3271a001c1219c101b385253e0 SHA1 1882aa6897108b0bcb4ef1810ee6bf0c7ca42054 SHA256 7aeccd89219646978f39ce1d46b40051eb950e1452bd225e7dd8e2fe5267c8a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPayjgAAoJEIUJ+svaV163fFYH/R71DO6zxmcOr7rCISnMKcUg
-zHtkgZMfz6BDYsSSmHaoobzcFvdPD//UAxUiemBPuNxOO3XosJh8EvwlRDXtfwN8
-fMc1ZAvCzLOr/n262JbfkAsZILqVx28gKrX1Vf/J5ubi6wm4ZGvzTqNnBmFBsecd
-t/RyOBkvhwWhKkg4pizSfjQRjXhy9yY2nJx9SV2WuEHsQXK5yMGwpv7BNh50Nafl
-BoJGPgDd1fxYrWORyrw/dYJGmokUfDpC/JEI7iWlBKS9ohmu2sclv5s2rP1Y2vBr
-wsMCczZnGn/3K7Pg4xlnLXKK5YOtqPuQaALk5GJUAk+E1SdFrqKyszSYJW5+qXM=
-=r6h7
+iQEcBAEBAgAGBQJPbJaCAAoJEIUJ+svaV163WA0H/2rU0g0cpWUX9bKfU+rpy/qO
+6EuWz0NjaY6Xwpf2xjEvcrDcb8ZRyqWN/3crjPq4jGiyiC0ZvOBBqdcSvJ9mSuFj
+4ZZd3Jd5R5moWc0tdyriKv9HF7h5yNiRTsGpbMRp70xb4yGNS4yVl52wB6AXlOM8
+w5wc5ebCvVR5VJC5mmW1HuHxH6kIKMscnTdkr9XJ+vlKMLDhgCbSQUcfrVzUPaSR
+wvNBV84/C+QcOQuI22/e5DgMS3ePdLdfx1F/00PxsGCMml+EdvP2Lcd8wpFOlP7f
+9OCOeJwXc1htl/6W0rxmIFVR8XAKkE7tV1JQrpBvC3BrzLUR19MeLHV9CzfSoNQ=
+=uNoD
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jna/jna-3.4.0.ebuild b/dev-java/jna/jna-3.4.0.ebuild
index 0b64280a0fff..0c79717b7a6e 100644
--- a/dev-java/jna/jna-3.4.0.ebuild
+++ b/dev-java/jna/jna-3.4.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/jna-3.4.0.ebuild,v 1.2 2012/03/22 13:27:46 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/jna-3.4.0.ebuild,v 1.3 2012/03/23 15:27:47 sera Exp $
 
 EAPI="4"
 
 JAVA_PKG_IUSE="test doc source"
 WANT_ANT_TASKS="ant-nodeps"
 
-inherit java-pkg-2 java-ant-2 toolchain-funcs flag-o-matic
+inherit java-pkg-2 java-ant-2 toolchain-funcs flag-o-matic vcs-snapshot
 
 DESCRIPTION="Java Native Access (JNA)"
 HOMEPAGE="https://github.com/twall/jna#readme"
@@ -16,7 +16,6 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="+awt +nio-buffers"
-S="${WORKDIR}/twall-jna-3e5b84f"
 
 COMMON_DEP="
 	virtual/libffi"
@@ -35,27 +34,24 @@ JAVA_ANT_REWRITE_CLASSPATH="true"
 EANT_BUILD_TARGET="jar contrib-jars"
 
 java_prepare() {
-	# delete bundled jars
-	find -name "*.jar" | xargs rm -v
+	# delete bundled jars and copy of libffi
+	find -name "*.jar" -exec rm -v {} + || die
+	rm -r native/libffi || die
 
 	# respect CFLAGS, don't inhibit warnings, honour CC
 	# fix build.xml file
 	epatch "${FILESDIR}/${PV}-makefile-flags.patch" "${FILESDIR}/${PV}-build.xml.patch"
 
-	# Fetch our own prebuilt libffi.
-	mkdir -p build/native/libffi/.libs || die
-	ln -snf "/usr/$(get_libdir)/libffi.so" \
-		build/native/libffi/.libs/libffi_convenience.a || die
-
 	# Build to same directory on 64-bit archs.
+	mkdir build || die
 	ln -snf build build-d64 || die
 
 	if ! use awt ; then
-		sed -i -E "s/^(CDEFINES=.*)/\1 -DNO_JAWT/g" "${S}"/native/Makefile || die
+		sed -i -E "s/^(CDEFINES=.*)/\1 -DNO_JAWT/g" native/Makefile || die
 	fi
 
 	if ! use nio-buffers ; then
-		sed -i -E "s/^(CDEFINES=.*)/\1 -DNO_NIO_BUFFERS/g" "${S}"/native/Makefile || die
+		sed -i -E "s/^(CDEFINES=.*)/\1 -DNO_NIO_BUFFERS/g" native/Makefile || die
 	fi
 }