gentoo resync : 10.02.2019

3 files changed, 11 insertions, 74 deletions

diff --git a/dev-libs/libtommath/Manifest b/dev-libs/libtommath/Manifest
index 8b815ec93287..c499711841a3 100644
--- a/dev-libs/libtommath/Manifest
+++ b/dev-libs/libtommath/Manifest
@@ -1,9 +1,8 @@
 AUX libtommath-0.42.0-makefile.patch 1694 BLAKE2B 37c2e368bb4f2d6f7738e3f110bb55686983fb701c4eb3513fd1779572a8d8449a305e34c2194fa07fe7b74a63572addb764f3ba8c7cd3285a25c5502c25f842 SHA512 3ba5253df119d57e598167d4ea0c3cbc000c50395598a953462d24e21832d41bdb16631688a99266f533e133fa39a58cc271e32d05e61b3756697ddb06898999
 DIST libtommath-0.42.0.tar.gz 1732144 BLAKE2B 624697bfa0bab0244783c3d2c92df2a1c0418611dc7f25989d038a5689beae325a426d8de38967ec856bd1e6f2d9413615333eebbf9316add838deda5b122de3 SHA512 d26e7737e5750530a7b96432502f0d458931e67af528872c46ad8dfc921b8f6ef4b3e05cb07d22bd13a8b24db65812928ae4c381250a4df95f6ca55efc3dae23
 DIST ltm-1.0.1.tar.xz 2210120 BLAKE2B e616f0359a1fffe8e1280dc24df1a83eb568d55f9f8acd0e4016fdd63b8ef10d939a8acbd4d49d70a69adf0e492ea5127200798f02af6af1c30e2e1f57870e3a SHA512 f98f7b0f91268e898803478fd52f578f476d378d096a25e48fa2e291159dc89bd1a6dc7d8c5c2254df840c731e5d009ec9728b72190318b6d1ba2916f5c66fb6
-DIST ltm-1.0.tar.xz 2191540 BLAKE2B 8794d81558f8e4236256c12201e03aad423b9e69ebd35fde941bd0e70174509a09973ad5cdf432c5c0cbf43f78693351782d9c2ea1085f2fa2a5bb77bafa89c5 SHA512 da2ced516106fb056373d97f9ac443805c57ebeb0a33982c14703d6dd8c3925e49aeb690b790ba91768ed5d41f5875dc50a3d3435dbb4088cfa3fddee9162082
+DIST ltm-1.1.0.tar.xz 2125456 BLAKE2B 3aca7993704341f6a81e7fbef35389ac8ecd957dd78b5d576f0305d37493c3ddc32462cd787de2fb67d8e165417b18fcfde70accf991cd9433ff87591d8265ac SHA512 6d1b8b09d5b975a2b84ef6ab9cb1cc63db2f0503a906e499cb9d7eaba3f487be6e7f69bf692b188f888418c61ea563aa7e2411638d8979eac426b3d603ad1b91
 EBUILD libtommath-0.42.0-r1.ebuild 1436 BLAKE2B 8a51bb249ec1c3dbccc9615dd815342224796215ccb4469ec7ed6cef2c1a1af460579cdf14430e15e1d54f7825b8bee1744b4ef2d7790408a900e3af0d27713c SHA512 83dc7913ebfad16d431bb6524b5a2fe032b52dd15cbc6d127b1e78785f36bd7787624d3459ff23cea37c29acd0db763b646e093cdad9292fb446829a526b3707
-EBUILD libtommath-1.0-r1.ebuild 1509 BLAKE2B 6b8f688f1b653f0c9f3c04f8c5f512fd651c723aeb61ab8ced2d7c0383d7e4147b898b6176d4d8aed4066a9829c8553151b8a67f9e2dedb2874d40d8aee95e54 SHA512 dcaca3dd34a3b669ea284bf63e61f473bbdf25936d16e7bb9fbe49285afdad4d3ce32c7a2dda8b3fce3fbc54231d172209836692b82f2809309b27589588d72e
 EBUILD libtommath-1.0.1.ebuild 1507 BLAKE2B 980126c931a91612084f917867db29fc6cb0b46f03237321fa33fa6d72dfa9f67932425b723a7b463e7982b583afad5b386ad872882329da1c771e7167034c88 SHA512 2dee1c3229776885d089af70b3112243e67592eb23e20e5b231dab738e9a09a12a4035267b3992195290d6a16fe3c0680e1f6f87d3ed9202613b18ee3c561eb7
-EBUILD libtommath-1.0.ebuild 1396 BLAKE2B e64cd2f80efb2ea6145c79a1b192e2f943a01a0cfca065cb652e1aa70f0da9ee54877df7dc441b892140239ed06ac588be969deab13d7015ae90163d59d9a78b SHA512 28f0b82b39166e74f7a6e87f5a992815f6465c05301a735ec4f2dcd9f6f64734d2cd0073fac5c015a06c79fb005cc2796497e104ad5e9bc6c2b5f41ae9e6d0f0
+EBUILD libtommath-1.1.0.ebuild 1547 BLAKE2B dfb9732b03aeff6ddc194fd1d1687bfccd3cabd3495265357e9fbd10a76258aed63879f6be81f5df05952da05737eff3b6a4731bdd39d6354c28c24607543a34 SHA512 d5d7fa2e02c0d0cd6718e5cdf4332d776727f1a5b4700289860ff69a95696c1f375279eee906481a1df69e012cc5c691a26d13a8906952ebf2eaaec238b49667
 MISC metadata.xml 2967 BLAKE2B 8adab466c3bf4d4e4b2368e56c7cf35c6a0e03f0dc9a237070e56bc224333876accb0c229d520f863041c0ee48b380225121d47554bb5aa511ff5689dd0e4e9b SHA512 73ce667c4bd2943f848274ee3952961d8b09c2c1faa4920cb74f9d8630470119c7e55a112b3c7dc2243c3746f75fa15db5c143e05e6739d2c9c19536f09a937f
diff --git a/dev-libs/libtommath/libtommath-1.0.ebuild b/dev-libs/libtommath/libtommath-1.0.ebuild
deleted file mode 100644
index 855b05e61649..000000000000
--- a/dev-libs/libtommath/libtommath-1.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils multilib toolchain-funcs
-
-DESCRIPTION="Optimized and portable routines for integer theoretic applications"
-HOMEPAGE="http://www.libtom.net/"
-SRC_URI="https://github.com/libtom/libtommath/releases/download/v${PV}/ltm-${PV}.tar.xz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc examples static-libs"
-
-DEPEND="sys-devel/libtool"
-RDEPEND=""
-
-src_prepare() {
-	# need libtool for cross compilation. Bug #376643
-	cat <<-EOF > configure.ac
-	AC_INIT(libtommath, 0)
-	AM_INIT_AUTOMAKE
-	LT_INIT
-	AC_CONFIG_FILES(Makefile)
-	AC_OUTPUT
-	EOF
-	touch NEWS README AUTHORS ChangeLog Makefile.am
-	eautoreconf
-	export LT="${S}"/libtool
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-_emake() {
-	emake CC="$(tc-getCC)" -f makefile.shared \
-		IGNORE_SPEED=1 \
-		LIBPATH="${EPREFIX}/usr/$(get_libdir)" \
-		INCPATH="${EPREFIX}/usr/include" \
-		"$@"
-}
-
-src_compile() {
-	_emake
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-	# We only link against -lc, so drop the .la file.
-	find "${ED}" -name '*.la' -delete
-
-	dodoc changes.txt
-
-	use doc && dodoc *.pdf
-
-	if use examples ; then
-		docinto demo
-		dodoc demo/*.c
-	fi
-}
diff --git a/dev-libs/libtommath/libtommath-1.0-r1.ebuild b/dev-libs/libtommath/libtommath-1.1.0.ebuild
index c647c55ef31d..d240a0bcc5ff 100644
--- a/dev-libs/libtommath/libtommath-1.0-r1.ebuild
+++ b/dev-libs/libtommath/libtommath-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools eutils multilib toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Optimized and portable routines for integer theoretic applications"
 HOMEPAGE="http://www.libtom.net/"
@@ -14,10 +14,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc examples static-libs"
 
-DEPEND="sys-devel/libtool"
-RDEPEND=""
-
 src_prepare() {
+	default
 	# need libtool for cross compilation. Bug #376643
 	cat <<-EOF > configure.ac
 	AC_INIT(libtommath, 0)
@@ -28,7 +26,7 @@ src_prepare() {
 	EOF
 	touch NEWS README AUTHORS ChangeLog Makefile.am
 	eautoreconf
-	export LT="${S}"/libtool
+	export LIBTOOL="${S}"/libtool
 }
 
 src_configure() {
@@ -59,7 +57,10 @@ src_test() {
 src_install() {
 	_emake DESTDIR="${D}" install
 	# We only link against -lc, so drop the .la file.
-	find "${ED}" -name '*.la' -delete
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
 
 	dodoc changes.txt