gentoo resync : 18.11.2019

9 files changed, 73 insertions, 271 deletions

diff --git a/net-libs/nativebiginteger/Manifest b/net-libs/nativebiginteger/Manifest
index 0efc1efb3304..7e7137c3581f 100644
--- a/net-libs/nativebiginteger/Manifest
+++ b/net-libs/nativebiginteger/Manifest
@@ -1,12 +1,6 @@
-AUX nativebiginteger-0.8.7-asmfix.patch 590 BLAKE2B ca93b019518afe5e1af85c42d35435d34f3f7138e18cc23b8c5c49f953a9afe7dc663933699a45e5a301ab44c63b4328691723d6e85985e601fe72f27d8b4a40 SHA512 0efbf7f8e0767e2636bea21fd5020860bd6dc86bc6bb562b50bf40bd8ab0f83f9219fb031e93eedfa6d7f54027e5fdeb88aa64c283861963d1fd34e3dd4bbd05
-AUX nativebiginteger-0.8.7-build-system.patch 907 BLAKE2B 1a50205946ef2327a5a00f651a180e605d7a4b92d43bda0f9ad8b8ae81dd3910bd34cf98d792b79a47bbc0a37389d74ff1750650aa8c0b70165c704bbfff792a SHA512 13b7e8d2764ee0b86924854ee99a0c220f9b213d868460a39ad448e510cf33d4d747bfebb0b7273d70ca1cb15151324fea446431d9301973c0f2a0bd381a5dc3
-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
+DIST i2psource_0.9.42.tar.bz2 31523717 BLAKE2B 7f110f282a91fa0de700bfaee95968bb534f6f2c7d097c2d70fc9e6bda3ac583762b6b974b38b5947b15a77f91a8d595c957b35838456280236cd88c25d3d47b SHA512 bf8d83c1b1607f5ecf16d33d16cc760eb982d65ef0f89ebd5c61208a38a23f08f465e04889b8ef1d05df4d02a095d85a80077a5b10253d96023f056d01efacef
 EBUILD nativebiginteger-0.9.36-r1.ebuild 1450 BLAKE2B 56c42caa16590ca0bf44f401f0a3b75b6400d71f876bc0a0279ac27b2032450fbf68af66d066d9d10804b3284ff910dda9cf7984ad1612cb177262837a618dfa SHA512 31731ab0a369bb304e45bfca41ad42f0464601a97df1202ec9d7a5e8e2734ba9e06f817416631da18594fe2e5de8342e9f9ee965524a17274d81085710a787e6
-EBUILD nativebiginteger-0.9.36.ebuild 1528 BLAKE2B 6743746aca34ab8a4032a968e5bf2e1036707055ec7bbfe1f5a8cb3a1956cd1f274437db14d3e99c0f1f0732f0302e4dfdb9eb69d6c7e76bff8ddfa81ef83f6f SHA512 c9e455cd73955dbc6a65f39e4c6d83ddf5680d879871893a01656313f72fd7fcb890fa7c2cac3faf85cd1fd9606c575727ce4a6251dab1a1dfefa0ce7c71a661
+EBUILD nativebiginteger-0.9.42.ebuild 1597 BLAKE2B 92b144c717a511aa85491e72204e2522e901d37cbee29e2323fc8dd4afb3d798cdce5edda60f36d5ba9d78a0adfad7ed88c8dec603a5514620d26f54b032532d SHA512 548eea57016ca6100587a8521cc8383b999f5299a99fd577e54542e46f46254cea00ed009a568d906374a6e81a8072242855a1ee86abbaa9c937352e0c9a550a
 MISC metadata.xml 367 BLAKE2B e6ae176d14b1c47214343a27d2fe27d22f354879bbe3e27d01fd9fb06944ad57ca6791765dec8246e6a1583e9f66cfc72867b0f85a66f4d0752a64344d9fb5bc SHA512 a568f5918a48ac57cebe1bc19c22f8e7ee2f2e1e9710b088ae7411ae1435bc170a7e81307da909bea3781e2e3217f8791623e3b0f4a50658232af9b000bf4f2e
diff --git a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-asmfix.patch b/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-asmfix.patch
deleted file mode 100644
index 3443a91c288b..000000000000
--- a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-asmfix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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/files/nativebiginteger-0.8.7-build-system.patch b/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-build-system.patch
deleted file mode 100644
index ea298b5d0358..000000000000
--- a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-build-system.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- i2p-0.8.7/core/c/jbigi/build_jbigi.sh.orig	2011-07-29 11:52:43.000000000 +0200
-+++ i2p-0.8.7/core/c/jbigi/build_jbigi.sh	2011-07-29 11:53:43.000000000 +0200
-@@ -3,8 +3,8 @@
- # When executed in Linux/FreeBSD: Produces an libjbigi.so
- # Darwin produces libjbigi.jnilib, right?
- 
--CC="gcc"
-+test -z "$CC" && CC="gcc"
- 
- case `uname -sr` in
- MINGW*)
- 	JAVA_HOME="c:/software/j2sdk1.4.2_05"
-@@ -57,5 +55,7 @@
- 
- echo "Compiling C code..."
- rm -f jbigi.o $LIBFILE
--$CC -c $COMPILEFLAGS $INCLUDES ../../jbigi/src/jbigi.c
--$CC $LINKFLAGS $INCLUDES $INCLUDELIBS -o $LIBFILE jbigi.o $STATICLIBS
-+echo $CC -c $COMPILEFLAGS $CFLAGS $CPPFLAGS $INCLUDES ../../jbigi/src/jbigi.c
-+$CC -c $COMPILEFLAGS $CFLAGS $CPPFLAGS $INCLUDES ../../jbigi/src/jbigi.c
-+echo $CC $LINKFLAGS $LDFLAGS $INCLUDES -o $LIBFILE jbigi.o $STATICLIBS $INCLUDELIBS
-+$CC $LINKFLAGS $LDFLAGS $INCLUDES -o $LIBFILE jbigi.o $STATICLIBS $INCLUDELIBS
diff --git a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-debug-all.patch b/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-debug-all.patch
deleted file mode 100644
index 07dd05227582..000000000000
--- a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-debug-all.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- core/java/src/net/i2p/util/NativeBigInteger.java.orig	2011-07-29 13:14:05.000000000 +0200
-+++ core/java/src/net/i2p/util/NativeBigInteger.java	2011-07-29 13:15:16.000000000 +0200
-@@ -481,14 +481,12 @@
-     
-     /** @since 0.8.7 */
-     private static void debug(String s) {
--        I2PAppContext.getGlobalContext().logManager().getLog(NativeBigInteger.class).debug(s);
-+		System.err.println("DEBUG: " + s);
-     }
- 
-     
-     private static void info(String s) {
--        if(_doLog)
--            System.err.println("INFO: " + s);
--        I2PAppContext.getGlobalContext().logManager().getLog(NativeBigInteger.class).info(s);
-+		System.err.println("INFO: " + s);
-         _loadStatus = s;
-     }
- 
-@@ -496,12 +496,9 @@
- 
-     /** @since 0.8.7 */
-     private static void warn(String s, Throwable t) {
--        if(_doLog) {
--            System.err.println("WARNING: " + s);
--            if (t != null)
--                t.printStackTrace();
--        }
--        I2PAppContext.getGlobalContext().logManager().getLog(NativeBigInteger.class).warn(s, t);
-+		System.err.println("WARNING: " + s);
-+		if (t != null)
-+			t.printStackTrace();
-         if (t != null)
-             _loadStatus = s + ' ' + t;
-         else
diff --git a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-jcpuid-build-system.patch b/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-jcpuid-build-system.patch
deleted file mode 100644
index a4020a012b98..000000000000
--- a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-jcpuid-build-system.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- i2p-0.8.7/core/c/jcpuid/build.sh.orig	2011-07-29 18:38:44.554000219 +0200
-+++ i2p-0.8.7/core/c/jcpuid/build.sh	2011-07-29 18:38:13.789000172 +0200
-@@ -24,8 +24,8 @@
- mkdir lib/freenet/support
- mkdir lib/freenet/support/CPUInformation
- 
--CC="gcc"
-+test -z "$CC" && CC="gcc"
- 
- case `uname -sr` in
- MINGW*)
- 	JAVA_HOME="/c/software/j2sdk1.4.2_05"
-@@ -50,8 +52,8 @@
- 
- echo "Compiling C code..."
- rm -f $LIBFILE
--$CC $COMPILEFLAGS $LINKFLAGS $INCLUDES src/*.c -o $LIBFILE
--strip $LIBFILE
-+echo $CC $COMPILEFLAGS $CPPFLAGS $CFLAGS $LINKFLAGS $LDFLAGS $INCLUDES src/*.c -o $LIBFILE
-+$CC $COMPILEFLAGS $CPPFLAGS $CFLAGS $LINKFLAGS $LDFLAGS $INCLUDES src/*.c -o $LIBFILE
- echo Built $LIBFILE
- 
- #g++ -shared -static -static-libgcc -Iinclude -I$JAVA_HOME/include \
diff --git a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-non-android-warnings.patch b/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-non-android-warnings.patch
deleted file mode 100644
index 6240d25bcd9b..000000000000
--- a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-non-android-warnings.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- core/java/src/net/i2p/util/NativeBigInteger.java.orig	2011-07-29 13:22:39.000000000 +0200
-+++ core/java/src/net/i2p/util/NativeBigInteger.java	2011-07-29 13:22:55.000000000 +0200
-@@ -526,7 +526,7 @@
-             System.loadLibrary(name);
-             return true;
-         } catch (UnsatisfiedLinkError ule) {
--            if (_isAndroid) {
-+            if (!_isAndroid) {
-                 // Unfortunately,
-                 // this is not interesting on Android, it says "file not found"
-                 // on link errors too.
diff --git a/net-libs/nativebiginteger/nativebiginteger-0.8.7.ebuild b/net-libs/nativebiginteger/nativebiginteger-0.8.7.ebuild
deleted file mode 100644
index 243ce87fb2a1..000000000000
--- a/net-libs/nativebiginteger/nativebiginteger-0.8.7.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs multilib java-pkg-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"
-
-DEPEND="${RDEPEND}
-	>=virtual/jdk-1.5"
-RDEPEND="dev-libs/gmp"
-
-S=${WORKDIR}/i2p-${PV}/core/
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}"-build-system.patch \
-		"${FILESDIR}/${P}"-jcpuid-build-system.patch \
-		"${FILESDIR}/${P}"-debug-all.patch \
-		"${FILESDIR}/${P}"-non-android-warnings.patch \
-		"${FILESDIR}/${P}"-asmfix.patch
-}
-
-src_compile() {
-	tc-export CC
-
-	cd c/jbigi/jbigi/src || die
-	../../build_jbigi.sh dynamic || die
-
-	if use test ; then
-		einfo "Building tests ..."
-		cd "${S}"java/src || die
-		ejavac net/i2p/util/NativeBigInteger.java || die
-		eend $?
-	fi
-	if ( use amd64 || use x86 ) ; then
-		cd "${S}"c/jcpuid
-		./build.sh || die
-	fi
-}
-
-src_test() {
-		cd java/src || die
-	java -Djava.library.path="${S}"/c/jbigi/jbigi/src net/i2p/util/NativeBigInteger || die
-}
-
-src_install() {
-	local os arch
-
-	dolib c/jbigi/jbigi/src/libjbigi.so
-	( use amd64 || use x86 ) && dolib c/jcpuid/lib/freenet/support/CPUInformation/libjcpuid-x86-linux.so
-
-	## The following is needed for compatibility with earlier versions of NativeBigInteger ##
-
-	# arch list found by "none" + grep 'JBIGI_OPTIMIZATION_.*=' core/java/src/net/i2p/util/NativeBigInteger.java
-	for arch in none arm k6 k62 k63 athlon x86_64 x86_64_32 pentium pentiummmx pentium2 pentium3 pentium4 ppc ; do
-		dosym libjbigi.so /usr/$(get_libdir)/libjbigi-linux-$arch.so
-	done
-}
diff --git a/net-libs/nativebiginteger/nativebiginteger-0.9.36.ebuild b/net-libs/nativebiginteger/nativebiginteger-0.9.36.ebuild
deleted file mode 100644
index 6e2963035dd2..000000000000
--- a/net-libs/nativebiginteger/nativebiginteger-0.9.36.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2"
-
-LICENSE="|| ( public-domain BSD MIT )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="test"
-
-RDEPEND="dev-libs/gmp:0="
-DEPEND="
-	${RDEPEND}
-	test? ( >=virtual/jdk-1.7 )"
-
-S="${WORKDIR}/i2p-${PV}/core"
-
-PATCHES=(
-	"${FILESDIR}/${P}"-asmfix.patch
-)
-
-QA_PRESTRIPPED="usr/lib64/libjcpuid.so"
-
-QA_SONAME="usr/lib64/libjcpuid.so"
-
-pkg_setup() {
-	if use test; then
-		java-pkg-opt-2_pkg_setup
-		export JAVA_HOME=$(java-config -O)
-	fi
-}
-
-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-config -J) -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
-}
diff --git a/net-libs/nativebiginteger/nativebiginteger-0.9.42.ebuild b/net-libs/nativebiginteger/nativebiginteger-0.9.42.ebuild
new file mode 100644
index 000000000000..efe1d0774d35
--- /dev/null
+++ b/net-libs/nativebiginteger/nativebiginteger-0.9.42.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2 toolchain-funcs
+
+DESCRIPTION="jbigi library used by net-vpn/i2p"
+HOMEPAGE="https://geti2p.net"
+SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/gmp:0=
+	virtual/jdk:1.8
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/i2p-${PV}/core"
+
+PATCHES=(
+	"${FILESDIR}/${P}-asmfix.patch"
+)
+
+src_compile() {
+	local compile_lib
+	compile_lib() {
+		local name="${1}"
+		local file="${2}"
+		shift 2
+
+		"$(tc-getCC)" "${@}" ${CFLAGS} $(java-pkg_get-jni-cflags) \
+			${LDFLAGS} -shared -fPIC "-Wl,-soname,lib${name}.so" \
+			"${file}" -o "lib${name}.so"
+	}
+
+	cd "${S}/c/jbigi/jbigi" || die "unable to cd to jbigi"
+	compile_lib jbigi src/jbigi.c -Iinclude -lgmp ||
+		die "unable to build jbigi"
+
+	if use amd64 || use x86; then
+		cd "${S}/c/jcpuid" || die "unable to cd to jcpuid"
+		compile_lib jcpuid src/jcpuid.c -Iinclude ||
+			die "unable to build jcpuid"
+	fi
+
+	if use test; then
+		cd "${S}/java/src" || die "unable to cd to java/src"
+		ejavac -encoding UTF-8 net/i2p/util/NativeBigInteger.java ||
+			die "unable to build tests"
+	fi
+}
+
+src_test() {
+	cd "${S}/java/src" || die "unable to cd to java/src"
+	"$(java-config -J)" -Djava.library.path="${S}/c/jbigi/jbigi" net/i2p/util/NativeBigInteger ||
+		die "unable to pass tests"
+}
+
+src_install() {
+	dolib.so c/jbigi/jbigi/libjbigi.so
+
+	if use amd64 || use x86; then
+		dolib.so c/jcpuid/libjcpuid.so
+	fi
+}