gentoo resync 08.09.2018

3 files changed, 101 insertions, 0 deletions

diff --git a/net-libs/nativebiginteger/Manifest b/net-libs/nativebiginteger/Manifest
index b49909cf5d3c..0b0625d4e033 100644
--- a/net-libs/nativebiginteger/Manifest
+++ b/net-libs/nativebiginteger/Manifest
@@ -3,6 +3,9 @@ AUX nativebiginteger-0.8.7-build-system.patch 907 BLAKE2B 1a50205946ef2327a5a00f
 AUX nativebiginteger-0.8.7-debug-all.patch 1215 BLAKE2B a3aadec849708231f5fc773134d1b85ad915bf2f0e587daeeb11ce2308660dc80f173f0de718bc2dfdd4fee0ac111028aea95fe3bc833bc6857c7a128218e92e SHA512 0e9abda1d39a9b0a7c24f13bcc909d15940dd81f2d6b87b4ae39227c0191629ed7a3cfd6be50e3692423d91e0b2931324ba384e736c1c4eaec656df8ee0da9f2
 AUX nativebiginteger-0.8.7-jcpuid-build-system.patch 761 BLAKE2B 7a7733e3179fd4b51d8fe40baf2e6112be223378eeb66b57be81a9f1f3d670bb8dcea427e78ef5578d7a3cd18967b063a9e9a6360c41b60cf0fa450ce64ad202 SHA512 9c2f0a458d4a240fc9998d28995a14742aa63873bb05479b296122a2a4f7f68caafe4df315f5ed709b4e1b92a12be22700cfe1792e7ad186feaf7cc1f97b6d86
 AUX nativebiginteger-0.8.7-non-android-warnings.patch 533 BLAKE2B 28df0a4576b0e1c0cc0f71f67cf14e22d8fef04ca5445a5e0012ec672ed656821c8e69e39326e03590377a52336b45c8fd00646dcb65751aadff2e02260b2887 SHA512 e9844d0c7fc93ed9ae9a63eba2eb737f9955c37e26e2c27e9c8ea71e098a3242d7ccc26319cfce361003b90f9831da357004567e398f4cecca2d838dc75632d8
+AUX nativebiginteger-0.9.36-asmfix.patch 588 BLAKE2B 5bfc18fad9965210068df8cc86ddfd3f99af9f5db9e39ec5eda9b51f357c0f41d6649bc92f3d1c15bbfcbb88210986ceb2a60cfe03f1c48ef4b5f3b4ae0b57a2 SHA512 70ee208ba6342633ae9cd81b38fc71024583933a4da5317d3407aacf5112672be0abbb872e1a7f617a4eee43c96fe9a64f09b9d315ad97519a6feb34755500f1
 DIST i2psource_0.8.7.tar.bz2 18473515 BLAKE2B 9f79cd2e69f26ba0fadc24b6cad0ff43301c65fd640313688687895de908c6a0c6fd9d1be6c82a6d7478cd4ecf633ce3b8fd4d200cce644512a7b4fa275a0927 SHA512 32b4eb4bf8bc7d6bb692b3ecd6b0a34c4d3d7c94b0d09a4ff330151979ccdaca9a6c88fef9b7e7965a1bba8ef54dbb710d89e0bb19265ee177ce547ff50ca969
+DIST i2psource_0.9.36.tar.bz2 29856168 BLAKE2B 0f10101b874bf6fc8415f10b08282947962a6fb8c3eaefde67d3f250d65a159551c24038625aa6712e88b368ccae38d136314025ac19fcb9dd9145251283b357 SHA512 e9023cae1c7dbdd92c9c4823497dfa8497cee3683de1232deddbdc548ba08edefe218bd81e00e952d8a95037c32de8359daaf43c2d5f25c75aba65554d2d47b4
 EBUILD nativebiginteger-0.8.7.ebuild 1760 BLAKE2B 2b5d1d3bccc75e254674b87f53563279dc474165f48d567e4e467dbcdb24f02c17f073e88ce597ff4948054af5e0f7d256109b3e90cd40cc0b83745ba190e5a4 SHA512 b6ea041425c3a69962dce78836aa0b0ec08d25cbbe513ddc9a0cf44cfb62d6686baf2491e600abe213b672d2fa675b7d1939284dc00b5210c8432c63426968ae
+EBUILD nativebiginteger-0.9.36.ebuild 1312 BLAKE2B 37b70378b5bdc948b8bf7e7df56f4b30ed5ee49ec3a697ef138a953703c79d2e81f5c9ed0b3188185d3b2907bae01b993888c9c6777d0151668313459a8ba3d1 SHA512 833b437b2ec891644617c766bad4d89cbabd2cbf5b5afc55a819ed2e041a6b07f06dc5a7d149faec10d9941b0fef220c1ecab8b24d3d91fb0a1929e478fe6b71
 MISC metadata.xml 256 BLAKE2B d4cddf1e47808cc6fed0829aa4bfe16d930ee2e12bb3e7355ed4871b41e42dac196735be01fe9b38464183039f2df7f88cdd26750461dc9a3268f9844e3373fd SHA512 26e53ead25d8fef36a3759518b200c6a4ea0fc24d2c1f054ed85772cba5644118b231438d723ca25c22a55ed2fcf54e2c467279c9f3b49b6c1ced9997e3f098c
diff --git a/net-libs/nativebiginteger/files/nativebiginteger-0.9.36-asmfix.patch b/net-libs/nativebiginteger/files/nativebiginteger-0.9.36-asmfix.patch
new file mode 100644
index 000000000000..cdb8c7f64cbb
--- /dev/null
+++ b/net-libs/nativebiginteger/files/nativebiginteger-0.9.36-asmfix.patch
@@ -0,0 +1,31 @@
+--- c/jcpuid/src/jcpuid.c	2008-10-06 09:44:53.000000000 -0400
++++ c/jcpuid/src/jcpuid.c.new2	2010-12-27 09:41:53.000000000 -0500
+@@ -19,6 +19,7 @@
+ 			mov d, edx
+ 		}
+ 	#else
++	#ifdef _LP64
+ 		//Use GCC assembler notation
+ 		asm
+ 		(
+@@ -29,6 +30,20 @@
+ 			  "=d"(d)
+ 			:"a"(iFunction)
+ 		);
++	#elif defined(__i386__)
++		asm
++		(
++			"pushl %%ebx\n\t"
++			"cpuid\n\t"
++			"movl %%ebx, %%edi\n\t"
++			"popl %%ebx"
++			: "=a" (a),
++			  "=D" (b),
++			  "=c" (c),
++			  "=d" (d)
++			:"a"(iFunction)
++		);
++	#endif
+ 	#endif
+ 	return (*env)->NewObject(env, clsResult,constructor,a,b,c,d);
+ }
diff --git a/net-libs/nativebiginteger/nativebiginteger-0.9.36.ebuild b/net-libs/nativebiginteger/nativebiginteger-0.9.36.ebuild
new file mode 100644
index 000000000000..d327fc138097
--- /dev/null
+++ b/net-libs/nativebiginteger/nativebiginteger-0.9.36.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs multilib java-pkg-opt-2
+
+DESCRIPTION="jbigi JNI library for net.i2p.util.NativeBigInteger java-class from I2P"
+HOMEPAGE="http://www.i2p2.de"
+SRC_URI="http://mirror.i2p2.de/i2psource_${PV}.tar.bz2"
+
+LICENSE="|| ( public-domain BSD MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="test"
+
+RDEPEND="dev-libs/gmp"
+DEPEND="
+	${RDEPEND}
+	test? ( >=virtual/jdk-1.7 )
+"
+
+S=${WORKDIR}/i2p-${PV}/core
+
+PATCHES=(
+	"${FILESDIR}/${P}"-asmfix.patch
+)
+
+src_compile() {
+	tc-export CC
+
+	cd c/jbigi/jbigi/src &&
+		../../build_jbigi.sh dynamic ||
+		die 'unable to build jbigi'
+
+	if use test
+	then
+		cd "${S}/java/src" &&
+			ejavac -encoding UTF-8 net/i2p/util/NativeBigInteger.java ||
+			die 'unable to build tests'
+	fi
+
+	if ( use amd64 || use x86 )
+	then
+		cd "${S}/c/jcpuid" &&
+			./build.sh ||
+			die 'unable to build jcpuid'
+	fi
+}
+
+src_test() {
+	cd java/src &&
+		java -Djava.library.path="${S}/c/jbigi/jbigi/src" net/i2p/util/NativeBigInteger ||
+		die 'unable to pass tests'
+}
+
+src_install() {
+	dolib c/jbigi/jbigi/src/libjbigi.so
+
+	if ( use amd64 || use x86 )
+	then
+		newlib.so \
+			"c/jcpuid/lib/freenet/support/CPUInformation/libjcpuid-$(tc-arch)-linux.so" \
+			libjcpuid.so
+	fi
+}