dev-libs/libsecp256k1: Implement suggestions re asm & doc USE flags, and gmp dependency

- asm USE flag is masked on unsupported architectures.
- asm USE flag is enabled by default on supported architectures.
- gmp dependency indicates package breaks if the subslot changes.
- New versions only: README.md is now installed without the doc USE flag (which is removed).

diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20141212.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20141212.ebuild
index 48768c1cebb95c4baaacc4be97f71f9ce920000d..b9f5da84dda46c0a5ffd1e112b3d8d69822a93bb 100644 (file)
--- a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20141212.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20141212.ebuild
@@ -15,13 +15,13 @@ SRC_URI="https://github.com/bitcoin/${MyPN}/archive/${COMMITHASH}.tar.gz -> ${My
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 arm x86"
-IUSE="asm doc endomorphism gmp test"
+IUSE="+asm doc endomorphism gmp test"
 
 REQUIRED_USE="
        asm? ( amd64 )
 "
 RDEPEND="
-       gmp? ( dev-libs/gmp:0 )
+       gmp? ( dev-libs/gmp:0= )
 "
 DEPEND="${RDEPEND}
        virtual/pkgconfig

diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20150423.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20150423.ebuild
index b0307ce01edb29109d34e8239906320d869f378f..ac42c2b53f369c8eaa22c5b5dd7f8e8f4cfce0f7 100644 (file)
--- a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20150423.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20150423.ebuild
@@ -15,13 +15,13 @@ SRC_URI="https://github.com/bitcoin/${MyPN}/archive/${COMMITHASH}.tar.gz -> ${My
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="asm doc endomorphism gmp libressl test"
+IUSE="+asm doc endomorphism gmp libressl test"
 
 REQUIRED_USE="
        asm? ( amd64 )
 "
 RDEPEND="
-       gmp? ( dev-libs/gmp:0 )
+       gmp? ( dev-libs/gmp:0= )
 "
 DEPEND="${RDEPEND}
        virtual/pkgconfig

diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20151118.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20151118.ebuild
index 6fd17f30f41f8f63566b066e72f8191085f44ec9..6f0d840fc0106c89082a261a47a90c00851d7ec6 100644 (file)
--- a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20151118.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20151118.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/bitcoin/${MyPN}/archive/${COMMITHASH}.tar.gz -> ${My
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="asm doc ecdh endomorphism experimental gmp libressl +recovery schnorr test"
+IUSE="+asm doc ecdh endomorphism experimental gmp libressl +recovery schnorr test"
 
 REQUIRED_USE="
        asm? ( amd64 )
@@ -23,7 +23,7 @@ REQUIRED_USE="
        schnorr? ( experimental )
 "
 RDEPEND="
-       gmp? ( dev-libs/gmp:0 )
+       gmp? ( dev-libs/gmp:0= )
 "
 DEPEND="${RDEPEND}
        virtual/pkgconfig

diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20161213.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20161213.ebuild
index 629e443aaba7b7fc014ff66243244cec07632024..96523ebd6d78e82edbb2940f688de1049fdb2186 100644 (file)
--- a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20161213.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20161213.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/bitcoin/${MyPN}/archive/${COMMITHASH}.tar.gz -> ${PN
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="asm doc ecdh endomorphism experimental gmp java +recovery test test_openssl"
+IUSE="+asm ecdh endomorphism experimental gmp java +recovery test test_openssl"
 
 REQUIRED_USE="
        asm? ( || ( amd64 arm ) arm? ( experimental ) )
@@ -24,7 +24,7 @@ REQUIRED_USE="
        test_openssl? ( test )
 "
 RDEPEND="
-       gmp? ( dev-libs/gmp:0 )
+       gmp? ( dev-libs/gmp:0= )
 "
 DEPEND="${RDEPEND}
        virtual/pkgconfig
@@ -64,10 +64,7 @@ src_configure() {
 }
 
 src_install() {
-       if use doc; then
-               dodoc README.md
-       fi
-
+       dodoc README.md
        emake DESTDIR="${D}" install
        prune_libtool_files
 }

diff --git a/dev-libs/libsecp256k1/libsecp256k1-9999.ebuild b/dev-libs/libsecp256k1/libsecp256k1-9999.ebuild
index fa2726044e8e9cdbee276d9f5a38c30c60124e15..0eebe3c7847c4193757513a10c16c2452b3bd179 100644 (file)
--- a/dev-libs/libsecp256k1/libsecp256k1-9999.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-9999.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/bitcoin/${MyPN}"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="asm doc ecdh endomorphism experimental gmp java +recovery test test_openssl"
+IUSE="+asm ecdh endomorphism experimental gmp java +recovery test test_openssl"
 
 REQUIRED_USE="
        asm? ( || ( amd64 arm ) arm? ( experimental ) )
@@ -23,7 +23,7 @@ REQUIRED_USE="
        test_openssl? ( test )
 "
 RDEPEND="
-       gmp? ( dev-libs/gmp:0 )
+       gmp? ( dev-libs/gmp:0= )
 "
 DEPEND="${RDEPEND}
        virtual/pkgconfig
@@ -61,10 +61,7 @@ src_configure() {
 }
 
 src_install() {
-       if use doc; then
-               dodoc README.md
-       fi
-
+       dodoc README.md
        emake DESTDIR="${D}" install
        prune_libtool_files
 }

diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index aee8f1d2405ef8edfed0bfc63aba6cb85178ade1..eb326af2121dd42e9b54b861cc37207322b9600d 100644 (file)
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -18,6 +18,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (04 Jan 2017)
+# Assembly optimisations are supported on amd64 for all versions
+dev-libs/libsecp256k1 -asm
+
 # Andreas Sturmlechner <asturm@gentoo.org> (31 Dec 2016)
 # on behalf of Andreas K. Hüttel <dilfridge@gentoo.org> (14 Dec 2016)
 # Fails to build with newly unmasked ffmpeg-3, so mask this useflag

diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 7b80201a6160f5c894aba94ede3ecc330596c0fe..86fa07a74b58f8a563b8a7a7a25f419534a88069 100644 (file)
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -2,6 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (04 Jan 2017)
+# Assembly optimisations are supported on arm since 0.0.0_pre20161213
+dev-libs/libsecp256k1 -asm
+<dev-libs/libsecp256k1-0.0.0_pre20161213 asm
+
 # Davide Pesavento <pesa@gentoo.org> (19 Dec 2016)
 # Various unkeyworded deps: >=sys-devel/clang-3.9 (#591822),
 # dev-qt/qtquickcontrols2 (#603054), dev-qt/qtwebengine (#581478)

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 73e5022be6d0539994abc121e0a5eb25d5dcc9b8..088a92f8068002164ae9d9c5b2e00d02f2b18ece 100644 (file)
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -5,6 +5,10 @@
 # This file requires >=portage-2.1.1
 # New entries go on top.
 
+# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (04 Jan 2017)
+# Mask assembly optimisations that are platform-specific
+dev-libs/libsecp256k1 asm
+
 # Patrice Clement <monsieurp@gentoo.org> (26 Dec 2016)
 # on behalf of Ilya Tumaykin <itumaykin+gentoo@gmail.com>
 # Requires masked media-video/libav-12. See bug #603726.