[gentoo-commits] repo/gentoo:master commit in: net-libs/nativebiginteger/, net-libs/nativebiginteger/files/
commit: fd6e992a45c0835bca83f25237c2b928f743d57b
Author: tharvik users noreply github com>
AuthorDate: Sun Aug 26 14:18:14 2018 +
Commit: Patrice Clement gentoo org>
CommitDate: Fri Sep 7 08:23:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd6e992a
net-libs/nativebiginteger: bump to 0.9.36.
Closes: https://github.com/gentoo/gentoo/pull/9702
net-libs/nativebiginteger/Manifest | 1 +
.../files/nativebiginteger-0.9.36-asmfix.patch | 31 ++
.../nativebiginteger-0.9.36.ebuild | 67 ++
3 files changed, 99 insertions(+)
diff --git a/net-libs/nativebiginteger/Manifest
b/net-libs/nativebiginteger/Manifest
index 8bd47c53649..18eaf831a7c 100644
--- a/net-libs/nativebiginteger/Manifest
+++ b/net-libs/nativebiginteger/Manifest
@@ -1 +1,2 @@
DIST i2psource_0.8.7.tar.bz2 18473515 BLAKE2B
9f79cd2e69f26ba0fadc24b6cad0ff43301c65fd640313688687895de908c6a0c6fd9d1be6c82a6d7478cd4ecf633ce3b8fd4d200cce644512a7b4fa275a0927
SHA512
32b4eb4bf8bc7d6bb692b3ecd6b0a34c4d3d7c94b0d09a4ff330151979ccdaca9a6c88fef9b7e7965a1bba8ef54dbb710d89e0bb19265ee177ce547ff50ca969
+DIST i2psource_0.9.36.tar.bz2 29856168 BLAKE2B
0f10101b874bf6fc8415f10b08282947962a6fb8c3eaefde67d3f250d65a159551c24038625aa6712e88b368ccae38d136314025ac19fcb9dd9145251283b357
SHA512
e9023cae1c7dbdd92c9c4823497dfa8497cee3683de1232deddbdc548ba08edefe218bd81e00e952d8a95037c32de8359daaf43c2d5f25c75aba65554d2d47b4
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 000..cdb8c7f64cb
--- /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.0 -0400
c/jcpuid/src/jcpuid.c.new2 2010-12-27 09:41:53.0 -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 000..d327fc13809
--- /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
+}
[gentoo-commits] repo/gentoo:master commit in: net-libs/nativebiginteger/, net-libs/nativebiginteger/files/
commit: 20296d77c9dcf10009c4930be599f766e9075406
Author: Pacho Ramos gentoo org>
AuthorDate: Mon Feb 26 18:55:05 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Mon Feb 26 18:57:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20296d77
net-libs/nativebiginteger: Drop old
Package-Manager: Portage-2.3.24, Repoman-2.3.6
net-libs/nativebiginteger/Manifest | 1 -
.../files/nativebiginteger-0.6.4-asmfix.patch | 31 ---
.../files/nativebiginteger-0.6.4-ldflags.patch | 17 ---
.../nativebiginteger-0.6.4-r3.ebuild | 35 --
.../nativebiginteger/nativebiginteger-0.6.4.ebuild | 29 --
5 files changed, 113 deletions(-)
diff --git a/net-libs/nativebiginteger/Manifest
b/net-libs/nativebiginteger/Manifest
index 9a82aef1d48..8bd47c53649 100644
--- a/net-libs/nativebiginteger/Manifest
+++ b/net-libs/nativebiginteger/Manifest
@@ -1,2 +1 @@
DIST i2psource_0.8.7.tar.bz2 18473515 BLAKE2B
9f79cd2e69f26ba0fadc24b6cad0ff43301c65fd640313688687895de908c6a0c6fd9d1be6c82a6d7478cd4ecf633ce3b8fd4d200cce644512a7b4fa275a0927
SHA512
32b4eb4bf8bc7d6bb692b3ecd6b0a34c4d3d7c94b0d09a4ff330151979ccdaca9a6c88fef9b7e7965a1bba8ef54dbb710d89e0bb19265ee177ce547ff50ca969
-DIST nativebiginteger-0.6.4.tar.bz2 10248 BLAKE2B
aab73c107ab0efcafff123df7c24449ce92d29a1f766216efeebd2eab501978af83cd509419da2df0ad19d36a6c61cfeaed187a9aed72fb89fff104260b403cf
SHA512
626f036fbde09e22f44b7d2fdf64c0e0ce8a86aabc3d68512f0bdd83fc909404a1a50b76633abaa3a4db69dcb1e913f6d5665812595eecadae6a7be24646e0cf
diff --git
a/net-libs/nativebiginteger/files/nativebiginteger-0.6.4-asmfix.patch
b/net-libs/nativebiginteger/files/nativebiginteger-0.6.4-asmfix.patch
deleted file mode 100644
index 04cfa599413..000
--- a/net-libs/nativebiginteger/files/nativebiginteger-0.6.4-asmfix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
jcpuid/src/jcpuid.c2008-10-06 09:44:53.0 -0400
-+++ jcpuid/src/jcpuid.c.new2 2010-12-27 09:41:53.0 -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.6.4-ldflags.patch
b/net-libs/nativebiginteger/files/nativebiginteger-0.6.4-ldflags.patch
deleted file mode 100644
index 5d3c84cd641..000
--- a/net-libs/nativebiginteger/files/nativebiginteger-0.6.4-ldflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
Makefile 2008-11-06 21:09:54.0 +0100
-+++ Makefile.new 2010-12-27 14:26:45.0 +0100
-@@ -1,11 +1,11 @@
- libjbigi:
- cd jbigi && rm -f jbigi.o libjbigi.so && $(CC) $(CFLAGS) -c -I.
-Ijbigi/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux \
-- jbigi/src/jbigi.c && $(CC) -shared -Wl,-soname,libjbigi.so -I.
-Ijbigi/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -lgmp \
-- -o libjbigi.so jbigi.o
-+ jbigi/src/jbigi.c && $(CC) ${LDFLAGS} -shared -Wl,-soname,libjbigi.so
jbigi.o -I. -Ijbigi/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
-lgmp \
-+ -o libjbigi.so
-
-
- libjcpuid:
-- cd jcpuid && $(CC) $(CFLAGS) -shared -Wl,-soname,libjbigi-x86-linux.so
-I. -Iinclude -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux \
-+ cd jcpuid && $(CC) $(CFLAGS) ${LDFLAGS} -shared
-Wl,-soname,libjbigi-x86-linux.so -I. -Iinclude -I$(JAVA_HOME)/include
-I$(JAVA_HOME)/include/linux \
- src/*.c -o libjcpuid-x86-linux.so
-
- install:
diff --git a/net-libs/nativebiginteger/nativebiginteger-0.6.4-r3.ebuild
b/net-libs/nativebiginteger/nativebiginteger-0.6.4-r3.ebuild
deleted file mode 100644
index 51dda3f1547..000
--- a/net-libs/nativebiginteger/nativebiginteger-0.6.4-r3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit flag-o-matic multilib toolchain-funcs java-pkg-2
-
-DESCRIPTION="NativeBigInteger libs for Freenet taken from i2p"
-HOMEPAGE="http://www.i2p2.de;
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="|| ( public-domain BSD MIT )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/gmp
-
