Version bump. #417889

New soname, new slot.

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

4 files changed, 129 insertions, 6 deletions

diff --git a/dev-java/jffi/ChangeLog b/dev-java/jffi/ChangeLog
index dd721c579917..db6077198808 100644
--- a/dev-java/jffi/ChangeLog
+++ b/dev-java/jffi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jffi
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.20 2012/05/09 17:10:15 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.21 2012/05/28 10:06:09 sera Exp $
+
+*jffi-1.2.2 (28 May 2012)
+
+  28 May 2012; Ralph Sennhauser <sera@gentoo.org> +jffi-1.2.2.ebuild,
+  +files/jffi-1.2.2_no-werror.patch:
+  Version bump. #417889
+  New soname, new slot.
 
   09 May 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> jffi-1.0.11.ebuild:
   x86 stable wrt bug #396305
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index 4b773ccf52ac..25e12906056d 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX 0.3-makefile-flags.patch 1081 RMD160 8882e26ed7d63ffe960e4a1b58c756fbade234c9 SHA1 67b95d1e1d87f429a70a59b416a52663b6ccb647 SHA256 1ad484484c226704c5d4f70c027fe2124cb63ec9721ab09ab239080b5b027840
 AUX 0.4.1-makefile-flags.patch 1004 RMD160 3e0494367fab8c4f05dfa51d3627c256bda7801d SHA1 8cdb06a1940372ea9c2d07a97bc7647f83872d15 SHA256 da66a889fa0500c1242a40cf7568b61943171d60586498cd16026081a89530bd
@@ -9,22 +9,29 @@ AUX 1.0.0-gcc-3.4.patch 327 RMD160 2425bf5a97893fbb300bb0a01d86c7595acb3a31 SHA1
 AUX jffi-0.7-makefile-flags.patch 6079 RMD160 80ac08701b4d675746a635c821ba0f53c9c56f38 SHA1 b29666fa499e9f6bf7ac5b7551895a0968f60b9c SHA256 cbe88df14f6cc99367e1d5140483d4f6c0b3f057e6a8a7e6a1d15eea91f89105
 AUX jffi-1.0.0-makefile.patch 3196 RMD160 ed9ff4ca88b326c46e4b089e5f1c51fff5e65583 SHA1 71f37c938454f6d309c90338a102ca3030a5bd36 SHA256 51d5299b057924f37727baf34cf4ba8915fe967e5ad1a60e673d6c241c6c4740
 AUX jffi-1.0.11_no-werror.patch 382 RMD160 4c71e7ec264b96340a19c2ef6492d6a1d8a9b4d1 SHA1 7129d85400c017d33cc682a14e8893b8e4e8c4fb SHA256 24fb274a3ec39eb94d6f9d3401df2127518b00a30d1f06276cb880b70f769f63
+AUX jffi-1.2.2_no-werror.patch 382 RMD160 4c71e7ec264b96340a19c2ef6492d6a1d8a9b4d1 SHA1 7129d85400c017d33cc682a14e8893b8e4e8c4fb SHA256 24fb274a3ec39eb94d6f9d3401df2127518b00a30d1f06276cb880b70f769f63
 AUX jffi_maven-build.xml 11287 RMD160 ff4159b0904b0d9c2ad8454ee5b1926611280c36 SHA1 ec77644d2821669098ff109943e5fa6f20ec6c5b SHA256 fa81bee544d5304731268fd807c5176ffeca6d50c0882aebd2d9510118782a0b
 DIST jffi-0.6.0.2.tar.bz2 1855529 RMD160 be9ecd77eb17fb80c75f8dfe21f1bdd62d34596b SHA1 b957f8b52573f4e96a3c242d016cb7fc100a3399 SHA256 a2e5cd14484027807a2ab757d8010fb9903d33a4a0e5e1f045ad8de806a0cb24
 DIST jffi-1.0.0.tar.gz 1627422 RMD160 0b20a343239b8480e1b6ee787288862b02a4f575 SHA1 fa7d9c3ca58afea36e9ef643f882c828e7ce96d0 SHA256 9950edbaf897cc1fa10fb944336a86ceba92674f54a1eaf59b2ab4881825d25e
 DIST jffi-1.0.11.tar.gz 1899655 RMD160 7780cc45e4c777d5d70814bc3a25bbd96bb9146e SHA1 744fa907573b37801c9a4085f83cdc8b1ed2f2c6 SHA256 b66781a07e095dbaf9d568b77762e06215da4458d963956ea22dd5adb5f3126a
+DIST jffi-1.2.2.tar.gz 1759433 RMD160 58b3ba123b9578952ada20dff9510f1e6091faec SHA1 3a79e197c9a9cf7df95b80e2d38c3bd27ca21799 SHA256 c4afe6e3c67f600f9f838c8526a711c5c7859d3d05f7ccb6e7926ef5e484edbd
 DIST jffi-git-0.7_pre20100131.tgz 1484965 RMD160 8efaecd9575926e268a3b63160a196f6ea466ce2 SHA1 b58cd19600acf6ea8a2adf04b1f1d72b7f84bce5 SHA256 b2256550a38cd120cd61bebd61a76dd373994b62a1c31191c74aec3a0970e30a
 EBUILD jffi-0.6.0.2-r1.ebuild 2141 RMD160 adf9806e42fe085a749aed6648fa119bdf5f6e2d SHA1 ce17b7146d6b1098106bc7a9e14d0527187c3530 SHA256 e6fa781e9156c8e8466af23430281863bc6107fe6a0dbbd647e031030b530084
 EBUILD jffi-0.6.0.2.ebuild 2001 RMD160 c451d40cb93da4761e01dd34089ba7ed8bba0f1f SHA1 25fa3f3a1cb9a3b73d283272c7023a62f767544c SHA256 df3c5514815568d8a62b2107cca68ed859b490469ec1d37573040fb6a62d0646
 EBUILD jffi-0.7_pre20100131.ebuild 2518 RMD160 d2a6d6858524991e9f84b517f4fabe9541068db1 SHA1 a618b3f8074ed9488b60faa947e60812a49e2b4d SHA256 cfeb96732184fe01425a6206f0f59438e20136d8e9dfed111d2582c76f5da702
 EBUILD jffi-1.0.0.ebuild 2181 RMD160 cdc0a360f45ebf9060f61e60a8c4fbd13c092757 SHA1 a46c485d8bdd5f08008ec467493871a58140704e SHA256 898cf1ff8a0f672556e154f6e5bdb1493c26c84bb7701e45c88025de9d6a9c58
 EBUILD jffi-1.0.11.ebuild 2404 RMD160 a43d50c5f7ee3c9f2c5a8c7beabc25989d2a64a3 SHA1 7851b78b0aa72abdd8a980dd06f27d8c99443794 SHA256 771e941cf8b81cdad4eb64ebc75b49587b687bed5745a61022af65fbef2b4cfd
-MISC ChangeLog 3557 RMD160 3d27071a7215d189699a27621854ec5c7410290e SHA1 5cf0f05038ca3cafde3066725109d49e0917a79c SHA256 8c3fdd24061e7b1c1f4cc2d82d741e0d2d17f85ee3a735911368d77b3ab92dd8
+EBUILD jffi-1.2.2.ebuild 2357 RMD160 d0bc35816d7ab38fccdc993633af1e34427ae4b5 SHA1 6124610945a50ac45e2e8b535db79be0e9ceee50 SHA256 d0bbcc540e596f15a10546457f1e3ec6b9272dd3fba714037855be9cf2c18385
+MISC ChangeLog 3734 RMD160 bc0f9f51918777d850ea9952f8c9cbe4c17eb79c SHA1 11f727e3a38991d39723a54ce342e82a8681aee2 SHA256 c54b926bebaf29f40d1c3626363c1a3f36034f0cd0f686c86296c8a3d96ee464
 MISC metadata.xml 159 RMD160 5259d4be0ca7b74c28e711d45a289def9aeadbd9 SHA1 c4ec40cd8f19e0d780a5133941bc50043be198cf SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk+qpP0ACgkQuUQtlDBCeQLIHQCaAu5sRa9BL2hT+vJ/ykatcOV/
-WJ4AnjerUDZ00MdWpUPOI7TyMQwhYCFH
-=xy09
+iQEcBAEBAgAGBQJPw04gAAoJEIUJ+svaV163l/AH/0NdQ8PoP0s2O/il6G9uSqOd
+mdqqTsY3lTEDnT5+0mmEk5Y9vJt1b/1PQoHkiqAvqRXKozY/WXPFgT2WnYMaejtX
+29xJJYA/7FJnluA+9lUDOxqFkRCk3DpnQ0nyK7kiVP+2+V0ho6E9TxNxT0OXr5BG
+Vdj/g+4NcQbnCy+inO1P1YjeRoDLEUi6vKNkk+q9ZlMTLhJ7uRlRQP55Ovqivfee
++cK4wIIZwBUUSjeifYRl6aI377LfnEgjNs3KmYg/X/DVzdwqLExYvqis8UNoxSrM
+0xSz9St/GbHBEH1lNrF7jjFFGSL/YpglpFie65lPHtmTsobTp9RtCRuyB7V0yuw=
+=CiZc
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jffi/files/jffi-1.2.2_no-werror.patch b/dev-java/jffi/files/jffi-1.2.2_no-werror.patch
new file mode 100644
index 000000000000..25b7e4f8ec00
--- /dev/null
+++ b/dev-java/jffi/files/jffi-1.2.2_no-werror.patch
@@ -0,0 +1,13 @@
+diff --git a/jni/GNUmakefile b/jni/GNUmakefile
+index efe6230..25053c7 100755
+--- a/jni/GNUmakefile
++++ b/jni/GNUmakefile
+@@ -64,7 +64,7 @@ JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing -DNDEBUG
+ OFLAGS = -O2 $(JFLAGS)
+ 
+ # MacOS headers aren't completely warning free, so turn them off
+-WERROR = -Werror
++WERROR =
+ ifneq ($(OS),darwin)
+   WFLAGS += -Wundef $(WERROR)
+ endif
diff --git a/dev-java/jffi/jffi-1.2.2.ebuild b/dev-java/jffi/jffi-1.2.2.ebuild
new file mode 100644
index 000000000000..d7aea9ae3302
--- /dev/null
+++ b/dev-java/jffi/jffi-1.2.2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-1.2.2.ebuild,v 1.1 2012/05/28 10:06:09 sera Exp $
+
+EAPI="4"
+
+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="http://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"
+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
+	)"
+
+java_prepare() {
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+	epatch "${FILESDIR}"/${P}_no-werror.patch
+
+	find "${WORKDIR}" -iname '*.jar' -delete
+}
+
+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
+	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() {
+	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
+	java-pkg_doso build/jni/lib${PN}-$(get_version_component_range 1-2).so
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}