From e9d044d4b9b71200a96adfa280848858c0f468c9 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sat, 13 Nov 2021 13:10:00 +0000
Subject: gentoo resync : 13.11.2021

---
 dev-libs/ntl/Manifest             |  5 ++-
 dev-libs/ntl/ntl-11.4.3.ebuild    | 62 --------------------------------
 dev-libs/ntl/ntl-11.4.4-r1.ebuild | 74 +++++++++++++++++++++++++++++++++++++++
 dev-libs/ntl/ntl-11.4.4.ebuild    |  2 +-
 4 files changed, 77 insertions(+), 66 deletions(-)
 delete mode 100644 dev-libs/ntl/ntl-11.4.3.ebuild
 create mode 100644 dev-libs/ntl/ntl-11.4.4-r1.ebuild

(limited to 'dev-libs/ntl')

diff --git a/dev-libs/ntl/Manifest b/dev-libs/ntl/Manifest
index 6ee47d76cdc5..55e712bf29e5 100644
--- a/dev-libs/ntl/Manifest
+++ b/dev-libs/ntl/Manifest
@@ -1,5 +1,4 @@
-DIST ntl-11.4.3.tar.gz 2274421 BLAKE2B d2c2fe695b17f47b24ad714d51dd723cbba453cc0fd67b8f46392103ef2f40ba54246411c793f0f60d1d50aae27cb8e75f6e8526fa9592e04c2cd0bdecef760c SHA512 26515ed73c8e74d0ff8bc161101f1b815f2c23e4bd633cc426f6da2741c6d8f43ad4f8df2cb7ad915475933599e0ee01cc360e75569f6f5d49cb5e5eae37b3f5
 DIST ntl-11.4.4.tar.gz 2378708 BLAKE2B 9a4c85bbe2fd2d3360988e0c350864fc0a05714e39ce3972228d93aba17f0dc079c90fbe40ab9d72116d1e31f55328bbd5cc71cd080e42ea33bc92361b4462aa SHA512 ed89d82008ca8785cb3d69de9577f42abe464dabf167ea2aaf801951843fc427d41171cbaac2f0cf68f35110d029cc28a65bd5aad69d30e7312f5ebcb0b58911
-EBUILD ntl-11.4.3.ebuild 1618 BLAKE2B 9752c09cb92a1389910f53a49c1cc882f35f0627e622745a133b1697948d87197ecfdd322347feeebee1d280db45ec7e3d842b13ed368da1f559f860a500d5d5 SHA512 d32d3fc780fed344c5a9c01548de12d1326c9a7842dab8831dccdf39447db7a94ccd88df59484d79210fc1b647f8abfc0106238a4a5c6aa336b0ca8e558e1fe5
-EBUILD ntl-11.4.4.ebuild 1706 BLAKE2B d9f5e1b6455b53e06a3fa16a606af327d6d9e2ad5ec94520e5804a5efec609659043df8ad6c08ccdd4ba00f7a50760d216cd6166244629e6035259a56050c673 SHA512 8f645ae0b0abd0f6062430f17a066d72af733043fdb5b911ed89070bf737c272b457472a0c5f224bc30cb07345997d1506fb71fba447ce95d04b2c70f851ff9c
+EBUILD ntl-11.4.4-r1.ebuild 1895 BLAKE2B c69d28d11872336fb0b5d5ba7f7746a17bb7b26f90fc2c92f674d1a4a1210da9bfaabf76a27b351ad49ace945672f048c1d0ab79b1762c651d6de11ba837a55d SHA512 25b2c550afaa00dc0457863089b2c93439c03976c17b178c132dd23a4b5d8f2047205c9444c57f34064275c9fa3d6307043a51266be8b08a608729f9a8337727
+EBUILD ntl-11.4.4.ebuild 1704 BLAKE2B a32d148309c83276b1c56856917cb7c3a2b43c1ba4302cc6e6a634e63badf8d5aabdd48f534b72fa83718e1f797689df170ca88ea777d223a0ffeceab4f96688 SHA512 e20d5ba994de73f4762cf05a3a84ef14237849c9eae86c45f8a0ba40e8da08b2a3d855abfd8b921b95b25daeabff10bce1760ca5b263c341bcb256fff5c56d13
 MISC metadata.xml 553 BLAKE2B cdfae3ba1eecfe54b279aec52c8a122226eb0247dfad805feb9f0854705e99247f15e42dedd6d08164a8d9c9cc9db871a481f6bcebad3062ac32ad05c3c32b7b SHA512 ca5e891461461757b75aea48a2cf631cc871daf33159c1f2c2a9a9e6acad43db97733de1c24754709e9b4eb1173a50af3ce63690443ce5ddd6794de9580b0d19
diff --git a/dev-libs/ntl/ntl-11.4.3.ebuild b/dev-libs/ntl/ntl-11.4.3.ebuild
deleted file mode 100644
index 130a7bf8c352..000000000000
--- a/dev-libs/ntl/ntl-11.4.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="High-performance and portable C++ number theory library"
-HOMEPAGE="https://www.shoup.net/ntl/"
-SRC_URI="https://www.shoup.net/ntl/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/43"
-KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="bindist doc static-libs threads cpu_flags_x86_avx2"
-
-BDEPEND="dev-lang/perl"
-DEPEND="dev-libs/gmp:0=
-	dev-libs/gf2x
-	threads? ( >=dev-libs/gf2x-1.2 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}/src"
-
-REQUIRED_USE="bindist? ( !cpu_flags_x86_avx2 )"
-
-DOCS=( "${WORKDIR}/${P}"/README )
-
-src_configure() {
-	# Currently the build system can build a static library or both
-	# static and shared libraries, but not only shared libraries. The
-	# name NTL_GMP_LIP is *not* a typo.
-	perl DoConfig \
-		PREFIX="${EPREFIX}"/usr \
-		LIBDIR="${EPREFIX}"/usr/$(get_libdir) \
-		CXXFLAGS="${CXXFLAGS}" \
-		CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		SHARED=on \
-		NTL_GMP_LIP=on \
-		NTL_GF2X_LIB=on \
-		NTL_THREADS=$(usex threads on off) \
-		NTL_ENABLE_AVX_FFT=$(usex cpu_flags_x86_avx2 on off) \
-		NATIVE=$(usex bindist off on) \
-		|| die "DoConfig failed"
-
-	if use doc; then
-		DOCS+=( "${WORKDIR}/${P}"/doc/*.txt )
-		HTML_DOCS=( "${WORKDIR}/${P}"/doc/*.html "${WORKDIR}/${P}"/doc/*.gif )
-	fi
-}
-
-src_install() {
-	default
-	if ! use static-libs; then
-		rm "${ED}/usr/$(get_libdir)"/libntl.{la,a} || die
-	fi
-
-	rm -r "${ED}"/usr/share/doc/NTL || die
-}
diff --git a/dev-libs/ntl/ntl-11.4.4-r1.ebuild b/dev-libs/ntl/ntl-11.4.4-r1.ebuild
new file mode 100644
index 000000000000..05f9388f8c54
--- /dev/null
+++ b/dev-libs/ntl/ntl-11.4.4-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs gnuconfig
+
+DESCRIPTION="High-performance and portable C++ number theory library"
+HOMEPAGE="https://www.shoup.net/ntl/ https://github.com/libntl/ntl"
+SRC_URI="https://www.shoup.net/ntl/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/43"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="bindist doc static-libs threads cpu_flags_x86_avx2"
+
+BDEPEND="dev-lang/perl"
+DEPEND="dev-libs/gmp:0=
+	dev-libs/gf2x
+	threads? ( >=dev-libs/gf2x-1.2 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+REQUIRED_USE="bindist? ( !cpu_flags_x86_avx2 )"
+
+DOCS=( "${WORKDIR}/${P}"/README )
+
+src_unpack() {
+	default
+	gnuconfig_update "${S}/libtool-origin/"
+}
+
+src_configure() {
+	# Currently the build system can build a static library or both
+	# static and shared libraries, but not only shared libraries. The
+	# name NTL_GMP_LIP is *not* a typo.
+	perl DoConfig \
+		PREFIX="${EPREFIX}"/usr \
+		LIBDIR="${EPREFIX}"/usr/$(get_libdir) \
+		CXXFLAGS="${CXXFLAGS}" \
+		CPPFLAGS="${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CXX="$(tc-getCXX)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
+		SHARED=on \
+		NTL_GMP_LIP=on \
+		NTL_GF2X_LIB=on \
+		NTL_THREADS=$(usex threads on off) \
+		NTL_ENABLE_AVX_FFT=$(usex cpu_flags_x86_avx2 on off) \
+		NATIVE=$(usex bindist off on) \
+		|| die "DoConfig failed"
+
+	if use doc; then
+		DOCS+=( "${WORKDIR}/${P}"/doc/*.txt )
+		HTML_DOCS=( "${WORKDIR}/${P}"/doc/*.html "${WORKDIR}/${P}"/doc/*.gif )
+	fi
+}
+
+src_install() {
+	default
+
+	if ! use static-libs; then
+		# bug #775884
+		find "${ED}" -name '*.la' -delete || die
+
+		# Use rm -f because the static archive may not be created when
+		# using (for example) slibtool-shared.
+		rm -f "${ED}/usr/$(get_libdir)"/libntl.a || die
+	fi
+
+	rm -r "${ED}"/usr/share/doc/NTL || die
+}
diff --git a/dev-libs/ntl/ntl-11.4.4.ebuild b/dev-libs/ntl/ntl-11.4.4.ebuild
index 9b4ebf81f549..38b47b4ab714 100644
--- a/dev-libs/ntl/ntl-11.4.4.ebuild
+++ b/dev-libs/ntl/ntl-11.4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.shoup.net/ntl/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/43"
-KEYWORDS="~amd64 ~arm64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist doc static-libs threads cpu_flags_x86_avx2"
 
 BDEPEND="dev-lang/perl"
-- 
cgit v1.2.3