public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ntl/, dev-libs/ntl/files/
@ 2015-08-11 10:44 Thomas Kahle
  0 siblings, 0 replies; 3+ messages in thread
From: Thomas Kahle @ 2015-08-11 10:44 UTC (permalink / raw
  To: gentoo-commits

commit:     4505c68f5b9931562a484253d8b448d56330e883
Author:     Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 10 11:36:41 2015 +0000
Commit:     Thomas Kahle <tomka <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 10:43:59 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4505c68f

dev-libs/ntl: Remove old

Package-Manager: portage-2.2.20

 dev-libs/ntl/Manifest                              |   3 -
 .../ntl/files/ntl-8.1.2-sanitize-makefile.patch    | 158 ---------------------
 dev-libs/ntl/ntl-6.0.0.ebuild                      |  75 ----------
 dev-libs/ntl/ntl-8.1.2.ebuild                      |  75 ----------
 dev-libs/ntl/ntl-9.0.2.ebuild                      |  75 ----------
 5 files changed, 386 deletions(-)

diff --git a/dev-libs/ntl/Manifest b/dev-libs/ntl/Manifest
index 0a56760..bb34f48 100644
--- a/dev-libs/ntl/Manifest
+++ b/dev-libs/ntl/Manifest
@@ -1,6 +1,3 @@
 DIST ntl-5.5.2.tar.gz 707247 SHA256 ef7fe7c8b60ec6e05b2a279caad0081263f7fb68b7360120846644cde726ff56 SHA512 44892e00051ca743b1184c9ae30e62c8e2605edaa394358979ff990a535993a6f282d882871ca9ebb3c632971f806c41d9b8024c8fb2cc6fa0d22bc26c66db06 WHIRLPOOL 4587463c4b52be721a7feb164fab73341af97c6f451c0bb2fbf675503c8a5262a5d7615d628e97f082dde23ce49db0f0b314c625dae0526bb1abdfc88732896f
-DIST ntl-6.0.0.tar.gz 714741 SHA256 9342fa7d83a0ee6748ebae683368250eff06b19d7df5dfb85bcba8a896c0a29b SHA512 fa1f1745e75c7588ca5af437648ab0844281f5c6e6a22a3bcaf0409792f3d4c70f0b8050823d90d19673ebcecae18ce6d39e6c9b1fec9f2d79f87b788b58d261 WHIRLPOOL ba8d7355639d54c6b95b66f648330876a892223c2232ddd5dd7097c53b783f01a26c5da01e72c6ad4527c3829b3c9e7123b58e63ecb8d22b4940f71a9b8a422d
 DIST ntl-6.1.0.tar.gz 715439 SHA256 e16c30ceef1d47e94b8a37a8c4a1fb58729b8f8449c648e2a96280a3eecf9b6f SHA512 8c013bd4a250c8e29d57864585492be1f392c84356959d8100d5c45b420e411e5cd677524e2d50bbe265dda4c364185395780ba5d8490f6ac46da73c6a9728de WHIRLPOOL cf2a48cfe33cb58d8bda35d4a18d57a20ae23f2ba53f0f757d1bacc58ffa0bfdfd38363db38996e2e4069f5e3f2ad6a3ae9a859437a93404308512652190c765
-DIST ntl-8.1.2.tar.gz 865458 SHA256 35c71d63786a7d7aa60e70c838e662da771ff14c98d643213baeda09bcbbfab5 SHA512 40a3e9f49c8b0f654668ac2bbd4dc18824ede22841ab6c809886a4abbf2d0ce9e7e544be62cc705c31c452cac0e29be9f93345fcf4bb6554badcf17134c32f69 WHIRLPOOL 88d675cfc7153abce8bf409236eea86dcc9e649bf0028b5265f033316db399339a01196274379eb16793bbe538f4fb4a80af2f4ce50b18416eb52058fb75e543
-DIST ntl-9.0.2.tar.gz 872258 SHA256 9b961b5fef294784bd4ece994a8a623c90ae9f01231b269c390d44bb4be5e346 SHA512 c720b8e8d36e078e8d4f6f053bccc352758bac71ef868579482f4c847084cb4498b62e40a43de1bd7bcc2357a58f728fa092caef6019ec98f24853046549ba00 WHIRLPOOL b7cd955b7cd52252f1978aa85600105a21b3ecdc133b6af87ed171271f0a9c3144efa33325c2f1706efe059f0de4b198d713b69807314547e5c7f043bfa87294
 DIST ntl-9.3.0.tar.gz 888710 SHA256 8f31508a9176b3fc843f08468b1632017f2450677bfd5147ead5136e0f24b68f SHA512 dfb4ac7a66aaddcf5d0d0c9fcaff253b0196a9d9f727788127dd18e131528fe60dedf8bfb864503225fc5796987aec9c7019b74e0fc12cd12c20aa33a9cf9d7d WHIRLPOOL a1f7cf573d49a277f0b2f1d50d18e66ef83a54430c517fd5d3c75e800216b706e8b5ff10e6ed2dc02b6eb4f9290671b249c67f1937cced96ac987055aaa3ab99

diff --git a/dev-libs/ntl/files/ntl-8.1.2-sanitize-makefile.patch b/dev-libs/ntl/files/ntl-8.1.2-sanitize-makefile.patch
deleted file mode 100644
index a586887..0000000
--- a/dev-libs/ntl/files/ntl-8.1.2-sanitize-makefile.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-diff -U 3 -dHrN ntl-8.1.2/src/DoConfig ntl-8.1.2-shared/src/DoConfig
---- ntl-8.1.2/src/DoConfig	2015-01-31 14:07:38.000000000 +0100
-+++ ntl-8.1.2-shared/src/DoConfig	2015-03-26 10:23:41.117816775 +0100
-@@ -21,14 +21,16 @@
- 
- 'LDFLAGS'     => '',
- 'LDLIBS'      => '-lm',
-+'PICFLAG'     => '-fPIC',
- 'CPPFLAGS'    => '',
- 
--'DEF_PREFIX'  => '/usr/local',
-+'DEF_PREFIX'  => '/usr',
- 
- 'PREFIX'      => '$(DEF_PREFIX)',
- 'LIBDIR'      => '$(PREFIX)/lib',
- 'INCLUDEDIR'  => '$(PREFIX)/include',
- 'DOCDIR'      => '$(PREFIX)/share/doc',
-+'SHMAKE'      => 'non-gld',
- 
- 'GMP_PREFIX'  => '$(DEF_PREFIX)',
- 'GMP_INCDIR'  => '$(GMP_PREFIX)/include',
-diff -U 3 -dHrN ntl-8.1.2/src/mfile ntl-8.1.2-shared/src/mfile
---- ntl-8.1.2/src/mfile	2015-01-31 14:07:38.000000000 +0100
-+++ ntl-8.1.2-shared/src/mfile	2015-03-26 10:56:50.277826975 +0100
-@@ -109,6 +109,16 @@
- WIZARD=@{WIZARD}
- # Set to off if you want to bypass the wizard; otherwise, set to on.
- 
-+###############################################################
-+#
-+# New addition for shared library building. With gcc you need to
-+# choose the Position Indepent Code flag. You have a choice of 
-+# -fpic better code but in rare case not available (ppc)
-+# -fPIC slightly slower code but guaranted to work anywhere.
-+#
-+###############################################################
-+
-+PICFLAG=@{PICFLAG}
- 
- #################################################################
- #
-@@ -141,6 +151,8 @@
- 
- OBJ=$(O19)
- 
-+SHOBJ=$(subst .o,.lo,$(OBJ))
-+
- # library source files
- 
- 
-@@ -313,6 +325,8 @@
- 
- LINK = $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
- 
-+.SUFFIXES: .lo
-+
- 
- 
- # 'make all' does a complete make, including all setup.
-@@ -321,11 +335,11 @@
- # again.
- 
- all:
--	make setup1
--	make setup2
--	make setup3
--	make setup4
--	make ntl.a
-+	${MAKE} setup1
-+	${MAKE} setup2
-+	${MAKE} setup3
-+	${MAKE} setup4
-+	${MAKE} ntl.a
- 	touch all
- 
- 
-@@ -369,21 +383,34 @@
- lip.o:	lip.c g_lip_impl.h c_lip_impl.h 
- 	$(LCOMP) $(COMPILE) $(GMP_OPT_INCDIR) lip.c
- 
-+lip.lo: lip.c g_lip_impl.h c_lip_impl.h
-+	$(LCOMP) $(COMPILE) $(PICFLAG) $(GMP_INCDIR) lip.c -o lip.lo
-+
- ctools.o:	ctools.c
- 	$(LCOMP) $(COMPILE) ctools.c
- 
-+ctools.lo: 	 ctools.c
-+	$(LCOMP) $(COMPILE) $(PICFLAG) ctools.c -o ctools.lo
- 
--GetTime.o: GetTime.c 
-+GetTime.o: GetTime.c
- 	$(LCOMP) $(COMPILE) GetTime.c
- 
-+GetTime.lo: GetTime.c 
-+	$(LCOMP) $(COMPILE) $(PICFLAG) GetTime.c -o GetTime.lo
-+
- GetPID.o: GetPID.c 
- 	$(LCOMP) $(COMPILE) GetPID.c
- 
--
-+GetPID.lo: GetPID.c 
-+	$(LCOMP) $(COMPILE) $(PICFLAG) GetPID.c -o GetPID.lo
- 
- .c.o: 
- 	$(LCOMP) $(COMPILE) $(GF2X_OPT_INCDIR) $<
- 
-+.c.lo: 
-+	$(LCOMP) $(COMPILE) $(PICFLAG) $(GF2X_OPT_INCDIR) -o $@ $<
-+
-+
- .c: 
- @{LSTAT}	$(LINK) -o $@ $< ntl.a $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) $(LDLIBS) #LSTAT
- @{LSHAR}	$(LIBTOOL) --tag=CXX --mode=link $(LINK) -o $@ $< libntl.la #LSHAR
-@@ -397,7 +424,7 @@
- 
- check:
- 	sh RemoveProg $(PROGS)
--	make QuickTest
-+	${MAKE} QuickTest
- 	./QuickTest
- 	sh RemoveProg QuickTest
- 	sh TestScript
-@@ -454,19 +481,18 @@
- #
- #################################################################
- 
--clobber:	
-+clobber:	clean
- 	rm -f ntl.a mach_desc.h ../include/NTL/mach_desc.h  GetTime.c GetPID.c
- 	rm -f ../include/NTL/gmp_aux.h
--	sh RemoveProg $(PROGS) MakeDesc TestGetTime TestGetPID gen_gmp_aux
--	rm -f *.o
--	rm -rf small
-+	sh RemoveProg $(PROGS)
-+	rm -f libntl*.so*
- 	rm -f cfileout mfileout
- 	rm -rf .libs *.lo libntl.la
- 	rm -f all
- 
- clean:
- 	sh RemoveProg MakeDesc TestGetTime TestGetPID gen_gmp_aux
--	rm -f *.o 
-+	rm -f *.o *.lo
- 	rm -rf small
- @{LSHAR}	- $(LIBTOOL) --mode=clean rm -f libntl.la *.lo #LSHAR
- 
-@@ -551,4 +577,11 @@
- 
- 
- 
-+sharedso: DIRNAME $(SHOBJ)
-+	  $(LINK) $(PICFLAG) -shared -Wl,-soname,lib`cat DIRNAME`.so -o lib`cat DIRNAME`.so $(SHOBJ) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB)
-+	  ln -s lib`cat DIRNAME`.so libntl.so
-+
-+shareddylib: DIRNAME $(SHOBJ)
-+	     $(LINK) $(PICFLAG) -dynamiclib -install_name $(LIBDIR)/lib`cat DIRNAME`.dylib -o lib`cat DIRNAME`.dylib $(SHOBJ) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB)
-+	     ln -s lib`cat DIRNAME`.dylib libntl.dylib
- 

diff --git a/dev-libs/ntl/ntl-6.0.0.ebuild b/dev-libs/ntl/ntl-6.0.0.ebuild
deleted file mode 100644
index 967eac6..0000000
--- a/dev-libs/ntl/ntl-6.0.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit toolchain-funcs eutils multilib flag-o-matic
-
-DESCRIPTION="High-performance and portable Number Theory C++ library"
-HOMEPAGE="http://shoup.net/ntl/"
-SRC_URI="http://www.shoup.net/ntl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos"
-IUSE="doc static-libs test"
-
-RDEPEND="
-	dev-libs/gmp:0=
-	dev-libs/gf2x:0="
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	# fix parallel make
-	sed -i -e "s/make/make ${MAKEOPTS}/g" WizardAux || die
-	cd ..
-	# enable compatibility with singular
-	# implement a call back framework (submitted upstream)
-	# sanitize the makefile and allow the building of shared library
-	epatch \
-		"${FILESDIR}"/${PN}-6.0.0-singular.patch \
-		"${FILESDIR}"/${PN}-6.0.0-sage-tools.patch \
-		"${FILESDIR}"/${PN}-5.5.2-shared.patch
-	replace-flags -O[3-9] -O2
-}
-
-src_configure() {
-	perl DoConfig \
-		PREFIX="${EPREFIX}"/usr \
-		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
-		NTL_STD_CXX=on NTL_GMP_LIP=on NTL_GF2X_LIB=on \
-		|| die "DoConfig failed"
-}
-
-src_compile() {
-	# split the targets to allow parallel make to run properly
-	emake setup1 setup2
-	emake setup3
-	sh Wizard on || die "Tuning wizard failed"
-	if use static-libs || use test; then
-		emake ntl.a
-	fi
-	local trg=so
-	[[ ${CHOST} == *-darwin* ]] && trg=dylib
-	emake shared${trg}
-}
-
-src_install() {
-	dolib.so lib*$(get_libname)
-	use static-libs && newlib.a ntl.a libntl.a
-
-	cd ..
-	insinto /usr/include
-	doins -r include/NTL
-
-	dodoc README
-	if use doc ; then
-		dodoc doc/*.txt
-		dohtml doc/*
-	fi
-}

diff --git a/dev-libs/ntl/ntl-8.1.2.ebuild b/dev-libs/ntl/ntl-8.1.2.ebuild
deleted file mode 100644
index b8d3149..0000000
--- a/dev-libs/ntl/ntl-8.1.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit toolchain-funcs eutils multilib flag-o-matic
-
-DESCRIPTION="High-performance and portable Number Theory C++ library"
-HOMEPAGE="http://shoup.net/ntl/"
-SRC_URI="http://www.shoup.net/ntl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos"
-IUSE="doc static-libs test"
-
-RDEPEND=">=dev-libs/gmp-4.3
-	>=dev-libs/gf2x-0.9"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	# fix parallel make
-	sed -i -e "s/make/make ${MAKEOPTS}/g" WizardAux || die
-	cd ..
-	# enable compatibility with singular
-	epatch "$FILESDIR/${PN}-6.0.0-singular.patch"
-	# sanitize the makefile and allow the building of shared library
-	epatch "$FILESDIR/${PN}-8.1.2-sanitize-makefile.patch"
-	replace-flags -O[3-9] -O2
-}
-
-src_configure() {
-	perl DoConfig \
-		PREFIX="${EPREFIX}"/usr \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		NTL_GMP_LIP=on NTL_GF2X_LIB=on \
-		|| die "DoConfig failed"
-}
-
-src_compile() {
-	# split the targets to allow parallel make to run properly
-	emake setup1 setup2 || die "emake setup failed"
-	emake setup3 || die "emake setup failed"
-	sh Wizard on || die "Tuning wizard failed"
-	if use static-libs || use test; then
-		emake ntl.a  || die "emake static failed"
-	fi
-	local trg=so
-	[[ ${CHOST} == *-darwin* ]] && trg=dylib
-	emake shared${trg} || die "emake shared failed"
-}
-
-src_install() {
-	if use static-libs; then
-		newlib.a ntl.a libntl.a || die "installation of static library failed"
-	fi
-	dolib.so lib*$(get_libname) || die "installation of shared library failed"
-
-	cd ..
-	insinto /usr/include
-	doins -r include/NTL || die "installation of the headers failed"
-
-	dodoc README
-	if use doc ; then
-		dodoc doc/*.txt || die
-		dohtml doc/* || die
-	fi
-}

diff --git a/dev-libs/ntl/ntl-9.0.2.ebuild b/dev-libs/ntl/ntl-9.0.2.ebuild
deleted file mode 100644
index b8d3149..0000000
--- a/dev-libs/ntl/ntl-9.0.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit toolchain-funcs eutils multilib flag-o-matic
-
-DESCRIPTION="High-performance and portable Number Theory C++ library"
-HOMEPAGE="http://shoup.net/ntl/"
-SRC_URI="http://www.shoup.net/ntl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos"
-IUSE="doc static-libs test"
-
-RDEPEND=">=dev-libs/gmp-4.3
-	>=dev-libs/gf2x-0.9"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	# fix parallel make
-	sed -i -e "s/make/make ${MAKEOPTS}/g" WizardAux || die
-	cd ..
-	# enable compatibility with singular
-	epatch "$FILESDIR/${PN}-6.0.0-singular.patch"
-	# sanitize the makefile and allow the building of shared library
-	epatch "$FILESDIR/${PN}-8.1.2-sanitize-makefile.patch"
-	replace-flags -O[3-9] -O2
-}
-
-src_configure() {
-	perl DoConfig \
-		PREFIX="${EPREFIX}"/usr \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		NTL_GMP_LIP=on NTL_GF2X_LIB=on \
-		|| die "DoConfig failed"
-}
-
-src_compile() {
-	# split the targets to allow parallel make to run properly
-	emake setup1 setup2 || die "emake setup failed"
-	emake setup3 || die "emake setup failed"
-	sh Wizard on || die "Tuning wizard failed"
-	if use static-libs || use test; then
-		emake ntl.a  || die "emake static failed"
-	fi
-	local trg=so
-	[[ ${CHOST} == *-darwin* ]] && trg=dylib
-	emake shared${trg} || die "emake shared failed"
-}
-
-src_install() {
-	if use static-libs; then
-		newlib.a ntl.a libntl.a || die "installation of static library failed"
-	fi
-	dolib.so lib*$(get_libname) || die "installation of shared library failed"
-
-	cd ..
-	insinto /usr/include
-	doins -r include/NTL || die "installation of the headers failed"
-
-	dodoc README
-	if use doc ; then
-		dodoc doc/*.txt || die
-		dohtml doc/* || die
-	fi
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ntl/, dev-libs/ntl/files/
@ 2015-09-20 11:31 Justin Lecher
  0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher @ 2015-09-20 11:31 UTC (permalink / raw
  To: gentoo-commits

commit:     fbec1fd4628a54d93cb2fdb98b548c83ec7ea751
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 11:31:02 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 11:31:51 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbec1fd4

Revert "dev-libs/ntl: Clean old"

This reverts commit 532a9b6c9bdc1a4011d9733c679a5b67cd0fd5c1.

Version still required

 dev-libs/ntl/Manifest                              |   1 +
 dev-libs/ntl/files/ntl-5.5.2-sage-tools.patch      |  53 +++++++
 dev-libs/ntl/files/ntl-5.5.2-shared.patch          | 166 +++++++++++++++++++++
 dev-libs/ntl/files/ntl-5.5.2-singular.patch        |  12 ++
 dev-libs/ntl/metadata.xml                          |   6 +-
 .../ntl/{ntl-6.1.0.ebuild => ntl-5.5.2.ebuild}     |  38 +++--
 dev-libs/ntl/ntl-6.1.0.ebuild                      |  28 ++--
 7 files changed, 266 insertions(+), 38 deletions(-)

diff --git a/dev-libs/ntl/Manifest b/dev-libs/ntl/Manifest
index a8c8131..bb34f48 100644
--- a/dev-libs/ntl/Manifest
+++ b/dev-libs/ntl/Manifest
@@ -1,2 +1,3 @@
+DIST ntl-5.5.2.tar.gz 707247 SHA256 ef7fe7c8b60ec6e05b2a279caad0081263f7fb68b7360120846644cde726ff56 SHA512 44892e00051ca743b1184c9ae30e62c8e2605edaa394358979ff990a535993a6f282d882871ca9ebb3c632971f806c41d9b8024c8fb2cc6fa0d22bc26c66db06 WHIRLPOOL 4587463c4b52be721a7feb164fab73341af97c6f451c0bb2fbf675503c8a5262a5d7615d628e97f082dde23ce49db0f0b314c625dae0526bb1abdfc88732896f
 DIST ntl-6.1.0.tar.gz 715439 SHA256 e16c30ceef1d47e94b8a37a8c4a1fb58729b8f8449c648e2a96280a3eecf9b6f SHA512 8c013bd4a250c8e29d57864585492be1f392c84356959d8100d5c45b420e411e5cd677524e2d50bbe265dda4c364185395780ba5d8490f6ac46da73c6a9728de WHIRLPOOL cf2a48cfe33cb58d8bda35d4a18d57a20ae23f2ba53f0f757d1bacc58ffa0bfdfd38363db38996e2e4069f5e3f2ad6a3ae9a859437a93404308512652190c765
 DIST ntl-9.3.0.tar.gz 888710 SHA256 8f31508a9176b3fc843f08468b1632017f2450677bfd5147ead5136e0f24b68f SHA512 dfb4ac7a66aaddcf5d0d0c9fcaff253b0196a9d9f727788127dd18e131528fe60dedf8bfb864503225fc5796987aec9c7019b74e0fc12cd12c20aa33a9cf9d7d WHIRLPOOL a1f7cf573d49a277f0b2f1d50d18e66ef83a54430c517fd5d3c75e800216b706e8b5ff10e6ed2dc02b6eb4f9290671b249c67f1937cced96ac987055aaa3ab99

diff --git a/dev-libs/ntl/files/ntl-5.5.2-sage-tools.patch b/dev-libs/ntl/files/ntl-5.5.2-sage-tools.patch
new file mode 100644
index 0000000..fafa973
--- /dev/null
+++ b/dev-libs/ntl/files/ntl-5.5.2-sage-tools.patch
@@ -0,0 +1,53 @@
+--- include/NTL/tools.h.orig	2008-05-06 22:14:06.000000000 +1200
++++ include/NTL/tools.h	2008-05-06 22:14:23.000000000 +1200
+@@ -249,6 +249,12 @@
+ char IntValToChar(long a);
+ 
+ 
++/*
++  This function is not present in vanilla NTL
++  See tools.c for documentation.
++ */
++void SetErrorCallbackFunction(void (*func)(const char *s, void *context), void *context);
++
+ 
+ void Error(const char *s);
+ 
+--- src/tools.c.orig	2008-05-06 22:15:32.000000000 +1200
++++ src/tools.c	2008-05-06 22:15:45.000000000 +1200
+@@ -8,8 +8,35 @@
+ NTL_START_IMPL
+ 
+ 
++/*
++   The following code differs from vanilla NTL
++
++   We add a SetErrorCallbackFunction(). This sets a global callback function _function_,
++   which gets called with parameter _context_ and an error message string whenever Error()
++   gets called.
++
++   Note that if the custom error handler *returns*, then NTL will dump the error message
++   back to stderr and abort() as it habitually does.
++
++   -- David Harvey (2008-04-12)
++*/
++
++void (*ErrorCallbackFunction)(const char*, void*) = NULL;
++void *ErrorCallbackContext = NULL;
++
++
++void SetErrorCallbackFunction(void (*function)(const char*, void*), void *context)
++{
++   ErrorCallbackFunction = function;
++   ErrorCallbackContext = context;
++}
++
++
+ void Error(const char *s)
+ {
++   if (ErrorCallbackFunction != NULL)
++      ErrorCallbackFunction(s, ErrorCallbackContext);
++
+    cerr << s << "\n";
+    abort();
+ }

diff --git a/dev-libs/ntl/files/ntl-5.5.2-shared.patch b/dev-libs/ntl/files/ntl-5.5.2-shared.patch
new file mode 100644
index 0000000..1ddd745
--- /dev/null
+++ b/dev-libs/ntl/files/ntl-5.5.2-shared.patch
@@ -0,0 +1,166 @@
+--- src/DoConfig.orig	2009-05-05 07:46:39.000000000 +0100
++++ src/DoConfig	2009-08-10 19:24:43.000000000 +0100
+@@ -25,14 +25,16 @@
+ 'LDFLAGS_CXX' => '$(LDFLAGS)',
+ 'LDLIBS'      => '-lm',
+ 'LDLIBS_CXX'  => '$(LDLIBS)',
++'PICFLAG'     => '-fPIC',
+ 'CPPFLAGS'    => '',
+ 
+-'DEF_PREFIX'  => '/usr/local',
++'DEF_PREFIX'  => '/usr',
+ 
+ 'PREFIX'      => '$(DEF_PREFIX)',
+ 'LIBDIR'      => '$(PREFIX)/lib',
+ 'INCLUDEDIR'  => '$(PREFIX)/include',
+ 'DOCDIR'      => '$(PREFIX)/share/doc',
++'SHMAKE'      => 'non-gld',
+ 
+ 'GMP_PREFIX'  => '$(DEF_PREFIX)',
+ 'GMP_INCDIR'  => '$(GMP_PREFIX)/include',
+@@ -87,11 +89,6 @@
+ 
+ foreach $arg (@ARGV) {
+ 
+-   if ($arg =~ '-h|help|-help|--help') {
+-      system("more ../doc/config.txt");
+-      exit;
+-   }
+-
+    if (($name, $val) = ($arg =~ /(.*?)=(.*)/)) {
+       
+       if (exists($MakeFlag{$name}) && ($val =~ 'on|off')) {
+
+
+
+--- src/mfile.orig	2009-05-05 07:46:39.000000000 +0100
++++ src/mfile	2009-08-10 20:31:36.000000000 +0100
+@@ -141,6 +146,16 @@
+ WIZARD=@{WIZARD}
+ # Set to off if you want to bypass the wizard; otherwise, set to on.
+ 
++###############################################################
++#
++# New addition for shared library building. With gcc you need to
++# choose the Position Indepent Code flag. You have a choice of 
++# -fpic better code but in rare case not available (ppc)
++# -fPIC slightly slower code but guaranted to work anywhere.
++#
++###############################################################
++
++PICFLAG=@{PICFLAG}
+ 
+ #################################################################
+ #
+@@ -173,6 +188,8 @@
+ 
+ OBJ=$(O19)
+ 
++SHOBJ=$(subst .o,.lo,$(OBJ))
++
+ # library source files
+ 
+ 
+@@ -320,7 +356,7 @@
+ LINK = $(CC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
+ LINK_CXX = $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS_CXX)
+ 
+-
++.SUFFIXES: .lo
+ 
+ # 'make all' does a complete make, including all setup.
+ # It also creates the file 'all', which means you should
+@@ -328,11 +364,11 @@
+ # again.
+ 
+ all:
+-	make setup1
+-	make setup2
+-	make setup3
+-	make setup4
+-	make ntl.a
++	$(MAKE) setup1
++	$(MAKE) setup2
++	$(MAKE) setup3
++	$(MAKE) setup4
++	$(MAKE) ntl.a
+ 	touch all
+ 
+ 
+@@ -378,18 +414,31 @@
+ lip.o:	lip.c g_lip_impl.h c_lip_impl.h lip_gmp_aux_impl.h
+ 	$(LCOMP) $(COMPILE) $(GMP_OPT_INCDIR) lip.c
+ 
++lip.lo: lip.c g_lip_impl.h c_lip_impl.h lip_gmp_aux_impl.h
++	$(LCOMP) $(COMPILE) $(PICFLAG) $(GMP_INCDIR) lip.c -o lip.lo
++
++
++
+ ctools.o:	ctools.c
+ 	$(LCOMP) $(COMPILE) ctools.c
+ 
++ctools.lo: 	 ctools.c
++	$(LCOMP) $(COMPILE) $(PICFLAG) ctools.c -o ctools.lo
++
+ 
+ GetTime.o: GetTime.c 
+ 	$(LCOMP) $(COMPILE) GetTime.c
+ 
+-
++GetTime.lo: GetTime.c 
++	$(LCOMP) $(COMPILE) $(PICFLAG) GetTime.c -o GetTime.lo
+ 
+ .c.o: 
+ 	$(LCOMP) $(COMPILE_CXX) $(GF2X_OPT_INCDIR) $<
+ 
++.c.lo: 
++	$(LCOMP) $(COMPILE_CXX) $(PICFLAG) $(GF2X_OPT_INCDIR) -o $@ $<
++
++
+ .c: 
+ @{LSTAT}	$(LINK_CXX) -o $@ $< ntl.a $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) $(LDLIBS_CXX) #LSTAT
+ @{LSHAR}	$(LIBTOOL) --mode=link $(LINK_CXX) -o $@ $< libntl.la #LSHAR
+@@ -403,7 +452,7 @@
+ 
+ check:
+ 	sh RemoveProg $(PROGS)
+-	make QuickTest
++	$(MAKE) QuickTest
+ 	./QuickTest
+ 	sh RemoveProg QuickTest
+ 	sh TestScript
+@@ -460,19 +509,18 @@
+ #
+ #################################################################
+ 
+-clobber:	
++clobber:	clean
+ 	rm -f ntl.a mach_desc.h ../include/NTL/mach_desc.h  GetTime.c 
+ 	rm -f lip_gmp_aux_impl.h ../include/NTL/gmp_aux.h
+-	sh RemoveProg $(PROGS) MakeDesc TestGetTime gen_lip_gmp_aux gen_gmp_aux
+-	rm -f *.o
+-	rm -rf small
++	sh RemoveProg $(PROGS)
++	rm -f libntl*.so*
+ 	rm -f cfileout mfileout
+ 	rm -rf .libs *.lo libntl.la
+ 	rm -f all
+ 
+ clean:
+ 	sh RemoveProg MakeDesc TestGetTime gen_lip_gmp_aux gen_gmp_aux
+-	rm -f *.o 
++	rm -f *.o  *.lo
+ 	rm -rf small
+ @{LSHAR}	- $(LIBTOOL) --mode=clean rm -f libntl.la *.lo #LSHAR
+ 
+@@ -549,3 +597,10 @@
+ 
+ 
+ 
++sharedso: DIRNAME $(SHOBJ)
++	 $(LINK_CXX) $(PICFLAG) -shared -Wl,-soname,lib`cat DIRNAME`.so -o lib`cat DIRNAME`.so $(SHOBJ) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB)
++	 ln -s lib`cat DIRNAME`.so libntl.so
++
++shareddylib: DIRNAME $(SHOBJ)
++	 $(LINK_CXX) $(PICFLAG) -dynamiclib -install_name $(LIBDIR)/lib`cat DIRNAME`.dylib -o lib`cat DIRNAME`.dylib $(SHOBJ) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB)
++	 ln -s lib`cat DIRNAME`.dylib libntl.dylib

diff --git a/dev-libs/ntl/files/ntl-5.5.2-singular.patch b/dev-libs/ntl/files/ntl-5.5.2-singular.patch
new file mode 100644
index 0000000..9f0d131
--- /dev/null
+++ b/dev-libs/ntl/files/ntl-5.5.2-singular.patch
@@ -0,0 +1,12 @@
+--- include/NTL/new.h.orig	2008-05-06 21:56:16.000000000 +1200
++++ include/NTL/new.h	2008-05-06 21:56:33.000000000 +1200
+@@ -12,7 +12,8 @@
+ 
+ #include <new>
+ 
+-#define NTL_NEW_OP new (std::nothrow)
++// uncommenting std::nothrow makes this ntl work properly with Singular
++#define NTL_NEW_OP new //(std::nothrow) 
+ 
+ 
+ #else

diff --git a/dev-libs/ntl/metadata.xml b/dev-libs/ntl/metadata.xml
index b3a0b3a..480588c 100644
--- a/dev-libs/ntl/metadata.xml
+++ b/dev-libs/ntl/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-mathematics</herd>
-  <herd>cpp</herd>
-  <longdescription lang="en">
+<herd>sci-mathematics</herd>
+<herd>cpp</herd>
+<longdescription lang="en">
   NTL is a high-performance, portable C++ library providing data
   structures and algorithms for manipulating signed, arbitrary length
   integers, and for vectors, matrices, and polynomials over the

diff --git a/dev-libs/ntl/ntl-6.1.0.ebuild b/dev-libs/ntl/ntl-5.5.2.ebuild
similarity index 64%
copy from dev-libs/ntl/ntl-6.1.0.ebuild
copy to dev-libs/ntl/ntl-5.5.2.ebuild
index 09dfcc9..a25ddcf 100644
--- a/dev-libs/ntl/ntl-6.1.0.ebuild
+++ b/dev-libs/ntl/ntl-5.5.2.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-
+EAPI=3
 inherit toolchain-funcs eutils multilib flag-o-matic
 
 DESCRIPTION="High-performance and portable Number Theory C++ library"
@@ -12,11 +11,10 @@ SRC_URI="http://www.shoup.net/ntl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc static-libs test"
 
-RDEPEND="
-	>=dev-libs/gmp-4.3:0=
+RDEPEND=">=dev-libs/gmp-4.3
 	>=dev-libs/gf2x-0.9"
 DEPEND="${RDEPEND}
 	dev-lang/perl"
@@ -26,13 +24,13 @@ S="${WORKDIR}/${P}/src"
 src_prepare() {
 	# fix parallel make
 	sed -i -e "s/make/make ${MAKEOPTS}/g" WizardAux || die
-	cd .. || die
+	cd ..
 	# enable compatibility with singular
-	epatch "$FILESDIR/${PN}-6.0.0-singular.patch"
+	epatch "$FILESDIR/${P}-singular.patch"
 	# implement a call back framework (submitted upstream)
-	epatch "$FILESDIR/${PN}-6.0.0-sage-tools.patch"
+	epatch "$FILESDIR/${P}-sage-tools.patch"
 	# sanitize the makefile and allow the building of shared library
-	epatch "$FILESDIR/${PN}-5.5.2-shared-r1.patch"
+	epatch "$FILESDIR/${P}-shared.patch"
 	replace-flags -O[3-9] -O2
 }
 
@@ -48,30 +46,30 @@ src_configure() {
 
 src_compile() {
 	# split the targets to allow parallel make to run properly
-	emake setup1 setup2
-	emake setup3
+	emake setup1 setup2 || die "emake setup failed"
+	emake setup3 || die "emake setup failed"
 	sh Wizard on || die "Tuning wizard failed"
 	if use static-libs || use test; then
-		emake ntl.a
+		emake ntl.a  || die "emake static failed"
 	fi
 	local trg=so
 	[[ ${CHOST} == *-darwin* ]] && trg=dylib
-	emake shared${trg}
+	emake shared${trg} || die "emake shared failed"
 }
 
 src_install() {
 	if use static-libs; then
-		newlib.a ntl.a libntl.a
+		newlib.a ntl.a libntl.a || die "installation of static library failed"
 	fi
-	dolib.so lib*$(get_libname)
+	dolib.so lib*$(get_libname) || die "installation of shared library failed"
 
-	cd .. || die
+	cd ..
 	insinto /usr/include
-	doins -r include/NTL
+	doins -r include/NTL || die "installation of the headers failed"
 
 	dodoc README
 	if use doc ; then
-		dodoc doc/*.txt
-		dohtml doc/*
+		dodoc doc/*.txt || die
+		dohtml doc/* || die
 	fi
 }

diff --git a/dev-libs/ntl/ntl-6.1.0.ebuild b/dev-libs/ntl/ntl-6.1.0.ebuild
index 09dfcc9..dfaa592 100644
--- a/dev-libs/ntl/ntl-6.1.0.ebuild
+++ b/dev-libs/ntl/ntl-6.1.0.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-
 inherit toolchain-funcs eutils multilib flag-o-matic
 
 DESCRIPTION="High-performance and portable Number Theory C++ library"
@@ -15,8 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos"
 IUSE="doc static-libs test"
 
-RDEPEND="
-	>=dev-libs/gmp-4.3:0=
+RDEPEND=">=dev-libs/gmp-4.3
 	>=dev-libs/gf2x-0.9"
 DEPEND="${RDEPEND}
 	dev-lang/perl"
@@ -26,7 +24,7 @@ S="${WORKDIR}/${P}/src"
 src_prepare() {
 	# fix parallel make
 	sed -i -e "s/make/make ${MAKEOPTS}/g" WizardAux || die
-	cd .. || die
+	cd ..
 	# enable compatibility with singular
 	epatch "$FILESDIR/${PN}-6.0.0-singular.patch"
 	# implement a call back framework (submitted upstream)
@@ -48,30 +46,30 @@ src_configure() {
 
 src_compile() {
 	# split the targets to allow parallel make to run properly
-	emake setup1 setup2
-	emake setup3
+	emake setup1 setup2 || die "emake setup failed"
+	emake setup3 || die "emake setup failed"
 	sh Wizard on || die "Tuning wizard failed"
 	if use static-libs || use test; then
-		emake ntl.a
+		emake ntl.a  || die "emake static failed"
 	fi
 	local trg=so
 	[[ ${CHOST} == *-darwin* ]] && trg=dylib
-	emake shared${trg}
+	emake shared${trg} || die "emake shared failed"
 }
 
 src_install() {
 	if use static-libs; then
-		newlib.a ntl.a libntl.a
+		newlib.a ntl.a libntl.a || die "installation of static library failed"
 	fi
-	dolib.so lib*$(get_libname)
+	dolib.so lib*$(get_libname) || die "installation of shared library failed"
 
-	cd .. || die
+	cd ..
 	insinto /usr/include
-	doins -r include/NTL
+	doins -r include/NTL || die "installation of the headers failed"
 
 	dodoc README
 	if use doc ; then
-		dodoc doc/*.txt
-		dohtml doc/*
+		dodoc doc/*.txt || die
+		dohtml doc/* || die
 	fi
 }


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ntl/, dev-libs/ntl/files/
@ 2020-04-24 21:43 Michael Orlitzky
  0 siblings, 0 replies; 3+ messages in thread
From: Michael Orlitzky @ 2020-04-24 21:43 UTC (permalink / raw
  To: gentoo-commits

commit:     16bf0e7f6968b4a6eff5a3139a79d26871a37037
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 24 21:24:57 2020 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri Apr 24 21:41:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16bf0e7f

dev-libs/ntl: remove old "unused" versions.

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 dev-libs/ntl/Manifest                              |   3 -
 .../ntl/files/ntl-9.2.0-sanitize-makefile.patch    | 160 ---------------------
 dev-libs/ntl/files/ntl-9.2.0-singular.patch        |  13 --
 .../ntl/files/ntl-9.6.4-sanitize-makefile.patch    | 160 ---------------------
 dev-libs/ntl/ntl-10.5.0.ebuild                     |  62 --------
 dev-libs/ntl/ntl-9.3.0.ebuild                      |  82 -----------
 dev-libs/ntl/ntl-9.6.4.ebuild                      |  85 -----------
 7 files changed, 565 deletions(-)

diff --git a/dev-libs/ntl/Manifest b/dev-libs/ntl/Manifest
index 3ae669d70fb..c1c7dc4d859 100644
--- a/dev-libs/ntl/Manifest
+++ b/dev-libs/ntl/Manifest
@@ -1,4 +1 @@
-DIST ntl-10.5.0.tar.gz 1278729 BLAKE2B a061ac4e0989ea671c51a22904851e5b7919f3a7e55624048c576d6f48d2ba3d6f88baa6c656c9ef43ad2145a03df9d891372f8462a1c5b6b53bc1d05301d9f6 SHA512 b299dfc29005079470972c2a9ca02acd0ebdbc31ff8923df02f3627dbc66daa0f527226972cef032e1e488c4272554634a96456e94653fdf8b01356160319aa0
 DIST ntl-11.4.3.tar.gz 2274421 BLAKE2B d2c2fe695b17f47b24ad714d51dd723cbba453cc0fd67b8f46392103ef2f40ba54246411c793f0f60d1d50aae27cb8e75f6e8526fa9592e04c2cd0bdecef760c SHA512 26515ed73c8e74d0ff8bc161101f1b815f2c23e4bd633cc426f6da2741c6d8f43ad4f8df2cb7ad915475933599e0ee01cc360e75569f6f5d49cb5e5eae37b3f5
-DIST ntl-9.3.0.tar.gz 888710 BLAKE2B 153a6f1bd11f27ef2944e4df5e941c4ddbb1783449e2a72aa1a272fcf169997b01646cfac63ac3af5a85a7f9a4db99a664503615d323ba54784849e764316b0c SHA512 dfb4ac7a66aaddcf5d0d0c9fcaff253b0196a9d9f727788127dd18e131528fe60dedf8bfb864503225fc5796987aec9c7019b74e0fc12cd12c20aa33a9cf9d7d
-DIST ntl-9.6.4.tar.gz 915256 BLAKE2B 78d8415bb1fe858881f997383ca9adcc8af2499251fc1b2e8e2211a8c7b8edc249ef28f3705e302d438c19cc07bd31d8b36681cb6b5a846d4f0b35ff09d310ff SHA512 ec8a4deb6996b31140edff978e07844ea8e30327491a6777d3982bffec01599b0cb5cc5dca297c8610ecb7ac9a4eae3407a59736fed840a2415a52a159370868

diff --git a/dev-libs/ntl/files/ntl-9.2.0-sanitize-makefile.patch b/dev-libs/ntl/files/ntl-9.2.0-sanitize-makefile.patch
deleted file mode 100644
index 2e8b77ae4b9..00000000000
--- a/dev-libs/ntl/files/ntl-9.2.0-sanitize-makefile.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-diff -Naur ntl-9.2.0.orig/src/DoConfig ntl-9.2.0/src/DoConfig
---- ntl-9.2.0.orig/src/DoConfig	2015-07-09 21:45:26.959930693 +1200
-+++ ntl-9.2.0/src/DoConfig	2015-07-09 21:46:52.250122780 +1200
-@@ -38,14 +38,16 @@
- 
- 'LDFLAGS'     => '',
- 'LDLIBS'      => '-lm',
-+'PICFLAG'     => '-fPIC',
- 'CPPFLAGS'    => '',
- 
--'DEF_PREFIX'  => '/usr/local',
-+'DEF_PREFIX'  => '/usr',
- 
- 'PREFIX'      => '$(DEF_PREFIX)',
- 'LIBDIR'      => '$(PREFIX)/lib',
- 'INCLUDEDIR'  => '$(PREFIX)/include',
- 'DOCDIR'      => '$(PREFIX)/share/doc',
-+'SHMAKE'      => 'non-gld',
- 
- 'GMP_PREFIX'  => '$(DEF_PREFIX)',
- 'GMP_INCDIR'  => '$(GMP_PREFIX)/include',
-diff -Naur ntl-9.2.0.orig/src/mfile ntl-9.2.0/src/mfile
---- ntl-9.2.0.orig/src/mfile	2015-07-09 21:45:26.959930693 +1200
-+++ ntl-9.2.0/src/mfile	2015-07-09 21:57:40.631583489 +1200
-@@ -109,6 +109,16 @@
- WIZARD=@{WIZARD}
- # Set to off if you want to bypass the wizard; otherwise, set to on.
- 
-+###############################################################
-+#
-+# New addition for shared library building. With gcc you need to
-+# choose the Position Indepent Code flag. You have a choice of 
-+# -fpic better code but in rare case not available (ppc)
-+# -fPIC slightly slower code but guaranted to work anywhere.
-+#
-+###############################################################
-+
-+PICFLAG=@{PICFLAG}
- 
- #################################################################
- #
-@@ -141,6 +151,8 @@
- 
- OBJ=$(O19)
- 
-+SHOBJ=$(subst .o,.lo,$(OBJ))
-+
- # library source files
- 
- 
-@@ -314,6 +326,8 @@
- 
- LINK = $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
- 
-+.SUFFIXES: .lo
-+
- 
- 
- # 'make all' does a complete make, including all setup.
-@@ -322,11 +336,11 @@
- # again.
- 
- all:
--	make setup1
--	make setup2
--	make setup3
--	make setup4
--	make ntl.a
-+	${MAKE} setup1
-+	${MAKE} setup2
-+	${MAKE} setup3
-+	${MAKE} setup4
-+	${MAKE} ntl.a
- 	touch all
- 
- 
-@@ -373,22 +387,37 @@
- lip.o:	lip.c g_lip_impl.h c_lip_impl.h 
- 	$(LCOMP) $(COMPILE) $(GMP_OPT_INCDIR) lip.c
- 
-+lip.lo:	lip.c g_lip_impl.h c_lip_impl.h 
-+	$(LCOMP) $(COMPILE) $(PICFLAG) $(GMP_OPT_INCDIR) lip.c -o lip.lo
-+
- ctools.o:	ctools.c
- 	$(LCOMP) $(COMPILE) ctools.c
- 
-+ctools.lo:	ctools.c
-+	$(LCOMP) $(COMPILE) $(PICFLAG) ctools.c -o ctools.lo
-+
- 
- GetTime.o: GetTime.c 
- 	$(LCOMP) $(COMPILE) GetTime.c
- 
-+GetTime.lo: GetTime.c 
-+	$(LCOMP) $(COMPILE) $(PICFLAG) GetTime.c -o GetTime.lo
-+
- GetPID.o: GetPID.c 
- 	$(LCOMP) $(COMPILE) GetPID.c
- 
-+GetPID.lo: GetPID.c 
-+	$(LCOMP) $(COMPILE) $(PICFLAG) GetPID.c -o GetPID.lo
-+
- CheckPCLMUL: CheckPCLMUL.c
- 	$(LINK) -o  CheckPCLMUL CheckPCLMUL.c $(LDLIBS)
- 
- .c.o: 
- 	$(LCOMP) $(COMPILE) $(GF2X_OPT_INCDIR) $<
- 
-+.c.lo: 
-+	$(LCOMP) $(COMPILE) $(PICFLAG) $(GF2X_OPT_INCDIR) -o $@ $<
-+
- .c: 
- @{LSTAT}	$(LINK) -o $@ $< ntl.a $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) $(LDLIBS) #LSTAT
- @{LSHAR}	$(LIBTOOL) --tag=CXX --mode=link $(LINK) -o $@ $< libntl.la #LSHAR
-@@ -402,7 +431,7 @@
- 
- check:
- 	sh RemoveProg $(PROGS)
--	make QuickTest
-+	${MAKE} QuickTest
- 	./QuickTest
- 	sh RemoveProg QuickTest
- 	sh TestScript
-@@ -459,21 +488,19 @@
- #
- #################################################################
- 
--clobber:	
-+clobber:	clean
- 	rm -f ntl.a mach_desc.h ../include/NTL/mach_desc.h  GetTime.c GetPID.c
- 	cp ../include/NTL/have_LL_no.h ../include/NTL/have_LL.h
- 	cp ../include/NTL/have_builtin_clzl_no.h ../include/NTL/have_builtin_clzl.h
- 	rm -f ../include/NTL/gmp_aux.h
--	sh RemoveProg $(PROGS) MakeDesc TestGetTime TestGetPID gen_gmp_aux
--	rm -f *.o
--	rm -rf small
-+	sh RemoveProg $(PROGS)
- 	rm -f cfileout mfileout
- 	rm -rf .libs *.lo libntl.la
- 	rm -f all
- 
- clean:
- 	sh RemoveProg MakeDesc TestGetTime TestGetPID gen_gmp_aux
--	rm -f *.o 
-+	rm -f *.o *.lo
- 	rm -rf small
- @{LSHAR}	- $(LIBTOOL) --mode=clean rm -f libntl.la *.lo #LSHAR
- 
-@@ -558,4 +585,11 @@
- 
- 
- 
-+sharedso: DIRNAME $(SHOBJ)
-+	  $(LINK) $(PICFLAG) -shared -Wl,-soname,lib`cat DIRNAME`.so -o lib`cat DIRNAME`.so $(SHOBJ) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB)
-+	  ln -s lib`cat DIRNAME`.so libntl.so
-+
-+shareddylib: DIRNAME $(SHOBJ)
-+	     $(LINK) $(PICFLAG) -dynamiclib -install_name $(LIBDIR)/lib`cat DIRNAME`.dylib -o lib`cat DIRNAME`.dylib $(SHOBJ) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB)
-+	     ln -s lib`cat DIRNAME`.dylib libntl.dylib
- 

diff --git a/dev-libs/ntl/files/ntl-9.2.0-singular.patch b/dev-libs/ntl/files/ntl-9.2.0-singular.patch
deleted file mode 100644
index 58f9491c12a..00000000000
--- a/dev-libs/ntl/files/ntl-9.2.0-singular.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Modfiy new.h to accomodate Singular.
---- src.orig/include/NTL/new.h	2012-08-06 17:12:25.658913083 +0200
-+++ src/include/NTL/new.h	2012-08-06 17:11:15.002915713 +0200
-@@ -12,7 +12,8 @@
- #include <NTL/config.h>
- #include <new>
- 
--#define NTL_NEW_OP new (std::nothrow)
-+// commenting std::nothrow makes this ntl work properly with Singular
-+#define NTL_NEW_OP new //(std::nothrow) 
- 
- 
- #endif

diff --git a/dev-libs/ntl/files/ntl-9.6.4-sanitize-makefile.patch b/dev-libs/ntl/files/ntl-9.6.4-sanitize-makefile.patch
deleted file mode 100644
index ed2e533fe43..00000000000
--- a/dev-libs/ntl/files/ntl-9.6.4-sanitize-makefile.patch
+++ /dev/null
@@ -1,160 +0,0 @@
---- ntl-9.6.4/src/DoConfig
-+++ ntl-9.6.4/src/DoConfig
-@@ -24,14 +24,16 @@
- 
- 'LDFLAGS'     => '',
- 'LDLIBS'      => '-lm',
-+'PICFLAG'     => '-fPIC',
- 'CPPFLAGS'    => '',
- 
--'DEF_PREFIX'  => '/usr/local',
-+'DEF_PREFIX'  => '/usr',
- 
- 'PREFIX'      => '$(DEF_PREFIX)',
- 'LIBDIR'      => '$(PREFIX)/lib',
- 'INCLUDEDIR'  => '$(PREFIX)/include',
- 'DOCDIR'      => '$(PREFIX)/share/doc',
-+'SHMAKE'      => 'non-gld',
- 
- 'GMP_PREFIX'  => '$(DEF_PREFIX)',
- 'GMP_INCDIR'  => '$(GMP_PREFIX)/include',
---- ntl-9.6.4/src/mfile
-+++ ntl-9.6.4/src/mfile
-@@ -113,6 +113,18 @@
- # Set to off if you want to bypass the wizard; otherwise, set to on.
- 
- 
-+###############################################################
-+#
-+# New addition for shared library building. With gcc you need to
-+# choose the Position Indepent Code flag. You have a choice of 
-+# -fpic better code but in rare case not available (ppc)
-+# -fPIC slightly slower code but guaranted to work anywhere.
-+#
-+###############################################################
-+
-+PICFLAG=@{PICFLAG}
-+
-+
- #################################################################
- #
- #  That's it!  You can ignore everything else in this file!
-@@ -144,6 +156,8 @@
- 
- OBJ=$(O19)
- 
-+SHOBJ=$(subst .o,.lo,$(OBJ))
-+
- # library source files
- 
- 
-@@ -317,6 +331,7 @@
- 
- LINK = $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXAUTOFLAGS) $(CXXFLAGS) $(LDFLAGS)
- 
-+.SUFFIXES: .lo
- 
- 
- # 'make all' does a complete make, including all setup.
-@@ -325,11 +340,11 @@
- # again.
- 
- all:
--	make setup1
--	make setup2
--	make setup3
--	make setup4
--	make ntl.a
-+	${MAKE} setup1
-+	${MAKE} setup2
-+	${MAKE} setup3
-+	${MAKE} setup4
-+	${MAKE} ntl.a
- 	touch all
- 
- 
-@@ -378,16 +393,28 @@
- lip.o:	lip.c g_lip_impl.h c_lip_impl.h 
- 	$(LCOMP) $(COMPILE) $(GMP_OPT_INCDIR) lip.c
- 
-+lip.lo:	lip.c g_lip_impl.h c_lip_impl.h 
-+	$(LCOMP) $(COMPILE) $(PICFLAG) $(GMP_OPT_INCDIR) lip.c -o lip.lo
-+
- ctools.o:	ctools.c
- 	$(LCOMP) $(COMPILE) ctools.c
- 
-+ctools.lo:	ctools.c
-+	$(LCOMP) $(COMPILE) $(PICFLAG) ctools.c -o ctools.lo
-+
- 
- GetTime.o: GetTime.c 
- 	$(LCOMP) $(COMPILE) GetTime.c
- 
-+GetTime.lo: GetTime.c 
-+	$(LCOMP) $(COMPILE) $(PICFLAG) GetTime.c -o GetTime.lo
-+
- GetPID.o: GetPID.c 
- 	$(LCOMP) $(COMPILE) GetPID.c
- 
-+GetPID.lo: GetPID.c 
-+	$(LCOMP) $(COMPILE) $(PICFLAG) GetPID.c -o GetPID.lo
-+
- CheckCompile: CheckCompile.c
- 	$(LINK) -o  CheckCompile CheckCompile.c $(LDLIBS)
- 
-@@ -395,6 +422,9 @@
- .c.o: 
- 	$(LCOMP) $(COMPILE) $(GF2X_OPT_INCDIR) $<
- 
-+.c.lo: 
-+	$(LCOMP) $(COMPILE) $(PICFLAG) $(GF2X_OPT_INCDIR) -o $@ $<
-+
- .c: 
- @{LSTAT}	$(LINK) -o $@ $< ntl.a $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) $(LDLIBS) #LSTAT
- @{LSHAR}	$(LIBTOOL) --tag=CXX --mode=link $(LINK) -o $@ $< libntl.la #LSHAR
-@@ -408,7 +438,7 @@
- 
- check:
- 	sh RemoveProg $(PROGS)
--	make QuickTest
-+	${MAKE} QuickTest
- 	./QuickTest
- 	sh RemoveProg QuickTest
- 	sh TestScript
-@@ -465,20 +495,18 @@
- #
- #################################################################
- 
--clobber:	
-+clobber:	clean
- 	rm -f ntl.a mach_desc.h ../include/NTL/mach_desc.h  GetTime.c GetPID.c
- 	sh ResetFeatures '..'
- 	rm -f ../include/NTL/gmp_aux.h
--	sh RemoveProg $(PROGS) MakeDesc $(AUXPROGS) gen_gmp_aux
--	rm -f *.o
--	rm -rf small
-+	sh RemoveProg $(PROGS)
- 	rm -f cfileout mfileout
- 	rm -rf .libs *.lo libntl.la
- 	rm -f all
- 
- clean:
- 	sh RemoveProg $(PROGS) MakeDesc $(AUXPROGS) gen_gmp_aux
--	rm -f *.o 
-+	rm -f *.o *.lo
- 	rm -rf small
- @{LSHAR}	- $(LIBTOOL) --mode=clean rm -f libntl.la *.lo #LSHAR
- 
-@@ -570,5 +598,11 @@
- 	$(LINK) -o DispSettings DispSettings.c $(LDLIBS)
- 
- 
--
-+sharedso: DIRNAME $(SHOBJ)
-+	$(LINK) $(PICFLAG) -shared -Wl,-soname,lib`cat DIRNAME`.so -o lib`cat DIRNAME`.so $(SHOBJ) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB)
-+	ln -s lib`cat DIRNAME`.so libntl.so
-+
-+shareddylib: DIRNAME $(SHOBJ)
-+	$(LINK) $(PICFLAG) -dynamiclib -install_name $(LIBDIR)/lib`cat DIRNAME`.dylib -o lib`cat DIRNAME`.dylib $(SHOBJ) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB)
-+	ln -s lib`cat DIRNAME`.dylib libntl.dylib
- 

diff --git a/dev-libs/ntl/ntl-10.5.0.ebuild b/dev-libs/ntl/ntl-10.5.0.ebuild
deleted file mode 100644
index 4987f69dd78..00000000000
--- a/dev-libs/ntl/ntl-10.5.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic ltprune toolchain-funcs
-
-DESCRIPTION="High-performance and portable Number Theory C++ library"
-HOMEPAGE="http://shoup.net/ntl/"
-SRC_URI="http://www.shoup.net/ntl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/35"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc static-libs test threads bindist"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/gmp:0=
-	>=dev-libs/gf2x-0.9"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}/${P}/src"
-
-pkg_setup() {
-	replace-flags -O[3-9] -O2
-}
-
-src_configure() {
-	# Currently the build system can build a static library or
-	# both static and shared libraries. But not only shared libraries.
-	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 \
-		$(usex threads NTL_THREADS= NTL_THREADS= on off) \
-		$(usex bindist NATIVE= NATIVE= off on) \
-		|| die "DoConfig failed"
-}
-
-src_install() {
-	default
-	if ! use static-libs; then
-		prune_libtool_files --all
-		rm -f "${ED}"/usr/$(get_libdir)/libntl.a
-	fi
-
-	cd ..
-	rm -rf "${ED}"/usr/share/doc/NTL
-	dodoc README
-	if use doc ; then
-		dodoc doc/*.txt
-		docinto html
-		dodoc doc/*.html doc/*.gif
-	fi
-}

diff --git a/dev-libs/ntl/ntl-9.3.0.ebuild b/dev-libs/ntl/ntl-9.3.0.ebuild
deleted file mode 100644
index e2a691d8a31..00000000000
--- a/dev-libs/ntl/ntl-9.3.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs eutils multilib flag-o-matic
-
-DESCRIPTION="High-performance and portable Number Theory C++ library"
-HOMEPAGE="http://shoup.net/ntl/"
-SRC_URI="http://www.shoup.net/ntl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/gmp:=
-	>=dev-libs/gf2x-0.9"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	# fix parallel make
-	sed -i -e "s/make/make ${MAKEOPTS}/g" WizardAux || die
-	cd ..
-	# sanitize the makefile and allow the building of shared library
-	epatch "${FILESDIR}"/${PN}-9.2.0-sanitize-makefile.patch
-	# enable compatibility with singular
-	epatch "${FILESDIR}"/${PN}-9.2.0-singular.patch
-	replace-flags -O[3-9] -O2
-}
-
-src_configure() {
-	perl DoConfig \
-		PREFIX="${EPREFIX}"/usr \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		NTL_GMP_LIP=on NTL_GF2X_LIB=on NTL_LEGACY_SP_MULMOD=on \
-		|| die "DoConfig failed"
-}
-
-src_compile() {
-	# split the targets to allow parallel make to run properly
-	emake setup1 setup2
-	emake setup3
-	sh Wizard on || die "Tuning wizard failed"
-	if use static-libs; then
-		emake ntl.a
-	fi
-	local trg=so
-	[[ ${CHOST} == *-darwin* ]] && trg=dylib
-	emake shared${trg}
-}
-
-src_install() {
-	if use static-libs; then
-		newlib.a ntl.a libntl.a
-	fi
-	dolib.so lib*$(get_libname)
-
-	cd ..
-	insinto /usr/include
-	doins -r include/NTL
-
-	dodoc README
-	if use doc ; then
-		dodoc doc/*.txt
-		dohtml doc/*
-	fi
-}
-
-src_test() {
-	# the current ebuild need static library to run tests
-	emake ntl.a
-
-	default
-}

diff --git a/dev-libs/ntl/ntl-9.6.4.ebuild b/dev-libs/ntl/ntl-9.6.4.ebuild
deleted file mode 100644
index e672e758c1b..00000000000
--- a/dev-libs/ntl/ntl-9.6.4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="High-performance and portable Number Theory C++ library"
-HOMEPAGE="http://shoup.net/ntl/"
-SRC_URI="http://www.shoup.net/ntl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/gmp:0=
-	>=dev-libs/gf2x-0.9"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}/${P}/src"
-PATCHES=(
-	"${FILESDIR}/${P}-sanitize-makefile.patch"
-	"${FILESDIR}/${PN}-9.2.0-singular.patch"
-)
-
-src_prepare() {
-	# fix parallel make
-	sed -i -e "s/make/make ${MAKEOPTS}/g" WizardAux || die
-	cd .. || die
-	default
-
-	replace-flags -O[3-9] -O2
-}
-
-src_configure() {
-	perl DoConfig \
-		PREFIX="${EPREFIX}"/usr \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		NTL_GMP_LIP=on NTL_GF2X_LIB=on NTL_LEGACY_SP_MULMOD=on \
-		|| die "DoConfig failed"
-}
-
-src_compile() {
-	# split the targets to allow parallel make to run properly
-	emake setup1 setup2
-	emake setup3
-	sh Wizard on || die "Tuning wizard failed"
-	if use static-libs; then
-		emake ntl.a
-	fi
-	local trg=so
-	[[ ${CHOST} == *-darwin* ]] && trg=dylib
-	emake shared${trg}
-}
-
-src_install() {
-	if use static-libs; then
-		newlib.a ntl.a libntl.a
-	fi
-	dolib.so lib*$(get_libname)
-
-	cd .. || die
-	insinto /usr/include
-	doins -r include/NTL
-
-	dodoc README
-	if use doc ; then
-		dodoc doc/*.txt
-		docinto html
-		dodoc doc/*.html doc/*.gif
-	fi
-}
-
-src_test() {
-	# the current ebuild need static library to run tests
-	emake ntl.a
-
-	default
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-04-24 21:43 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-24 21:43 [gentoo-commits] repo/gentoo:master commit in: dev-libs/ntl/, dev-libs/ntl/files/ Michael Orlitzky
  -- strict thread matches above, loose matches on Subject: below --
2015-09-20 11:31 Justin Lecher
2015-08-11 10:44 Thomas Kahle

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox