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).

8 files changed, 25 insertions, 18 deletions

diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20141212.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20141212.ebuild
index 48768c1cebb..b9f5da84dda 100644
--- 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 b0307ce01ed..ac42c2b53f3 100644
--- 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 6fd17f30f41..6f0d840fc01 100644
--- 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 629e443aaba..96523ebd6d7 100644
--- 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 fa2726044e8..0eebe3c7847 100644
--- 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 aee8f1d2405..eb326af2121 100644
--- 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 7b80201a616..86fa07a74b5 100644
--- 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 73e5022be6d..088a92f8068 100644
--- 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.