bump to 8.1.2

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x565C32BC

diff --git a/dev-libs/ntl/ChangeLog b/dev-libs/ntl/ChangeLog
index 7431f056ee66cc44fa973f4d8c6ae016002fd76e..292e08637d7198889394b8de595476d3f1e0b942 100644 (file)
--- a/dev-libs/ntl/ChangeLog
+++ b/dev-libs/ntl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/ntl
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ntl/ChangeLog,v 1.25 2014/06/19 13:08:44 jauhien Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ntl/ChangeLog,v 1.26 2015/03/26 10:19:22 tomka Exp $
+
+*ntl-8.1.2 (26 Mar 2015)
+
+  26 Mar 2015; Thomas Kahle <tomka@gentoo.org>
+  +files/ntl-8.1.2-sanitize-makefile.patch, +ntl-8.1.2.ebuild:
+  bump to 8.1.2
 
   19 Jun 2014; Jauhien Piatlicki <jauhien@gentoo.org>
   +files/ntl-5.5.2-shared-r1.patch:

diff --git a/dev-libs/ntl/Manifest b/dev-libs/ntl/Manifest
index 232233738bb70cc221c9e0e46a43d734a48de17d..25c3ccb98f9ab90e0680233225b72395c517f094 100644 (file)
--- a/dev-libs/ntl/Manifest
+++ b/dev-libs/ntl/Manifest
@@ -7,28 +7,21 @@ AUX ntl-5.5.2-shared.patch 4343 SHA256 38b298b4f4b6fa7083bc7a86dfb2dcc19e5fcbb2c
 AUX ntl-5.5.2-singular.patch 324 SHA256 2b9c1b1504ede6d9332fcb6e63bba93f81d528f0d035ebdbd8f32b2085c1f110 SHA512 8b62628b352ca8b15e894461c70a14b4d8ac87781d7bffaa2953d2ae3acca4a9a223d51da40ac76e553d0ea9a2ee1ea1a7c8c221a5e009771774e0ce7a50da95 WHIRLPOOL 2429ad058a8d97b3c2002d2369ff1b877135903f8c462ab4ccb6b95fb5d40e68dd2a927355152e132fec709d9d378c98f3ff0c0399faba673f16e93754f9a295
 AUX ntl-6.0.0-sage-tools.patch 1557 SHA256 dd999071c247c20b1030ec4f07e0f9fbd1ab3c978d06f4abb8c6abdf1578e7ac SHA512 5b028ef0b00d7ef0f82a260232bc130b300e175d31681b8f994e9037bc82d2d49491d8b495725388137cf3a2f73d17cdd6266592b3894189e11484159c70ce73 WHIRLPOOL c36cf93d45e481dcf95542d41aed81dc40be2973fdef4df9384dfaacb20450dc89306105f5a4ad1843ae3c825076f4a44049571dc6380d4ecf73af7d6e785568
 AUX ntl-6.0.0-singular.patch 330 SHA256 a09dec321bbbc5f88288b6d09a8c641b23cb658bb8ae467ab92a2c8ee0a62d6b SHA512 ea8fa036a3032231435de13578f01ce038d89ca35d1ff6250a72b6129cdcae1da329b3d273c98e34ed40dc09ac2cc172a5f1614184d44325a35ddc10b59e5fe5 WHIRLPOOL f87ef9128c9044842549568ab47f06f5687bee766768130d3b986a441eda127dd6facd4c113081e9bf6ac5462740374d703e835f1921fd179d2558de3af7fd02
+AUX ntl-8.1.2-sanitize-makefile.patch 4167 SHA256 4d399749b97d71a15c226d3dbfaf651d42f10e9b4384384aa6cfffd28215458c SHA512 85b792e257a874105a3b558bfae1588f9961ca994e9799ada83aa4081cb8035d60794ebcc7affe34b20d1487a0fb0514fb9c9208226c46d87304771345f21a89 WHIRLPOOL 1bc4482f007fdafc2e1639ad1335b38d31db2d030adf025838a57aa1668d9850cf4fe093b86acfa4b93d56db9cc307e386b30d05193ec5f902cf2cb14f00a40e
 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
 EBUILD ntl-5.5.2.ebuild 2140 SHA256 013bf8253651a5c6c50fc3b1fedbff948e973c70b71e3012d382751eac54a693 SHA512 6f0180db3097c30450c745f397a4c4961d7d8ba4ffca38565bf3c11d0b9b7c50a3842227fee7bc78a608b0a9c4442532bc03b0c12863167d0e2b99235d46231d WHIRLPOOL f5855d5bda710ddfa86449fc2ea5d9c7022d76b5867787a8ee0c2b903bb5248200f6079888d565c3a5478f45628173d575c57e9aa47c3f38f0b93641c9fac315
 EBUILD ntl-6.0.0.ebuild 1905 SHA256 75c7224175b354e6ce7714bb51aa28def47d7187e99aead4bb11f63ac289c8ac SHA512 5da85d3390b538069e9aef78449170fb21f55cf8f9b11f4bafa38a488a8c8d02db7965ad59ed1d08c31a11ee07a7812bc394f9ba1b55a10f0527c0e38f7b6f68 WHIRLPOOL e3deb6534f1ff1c8bbe65497c3cc2823bf54b6c0d427a794d875e6d8720272bd2502131cbd57b3b45a55df04e956f941987f12513aaf988600f8e29c526df194
 EBUILD ntl-6.1.0.ebuild 2188 SHA256 0992e4f2176a5fdf03a6c1f64c674ba5381c9c27c4e58b4f3cc8d882667bb0f6 SHA512 81e3ef37e4b03a693ee294768a63a37af6d3817a6b6d2af27a90656061cc9d6f03c692ada7da2f6ec9bf9c5a9a9437b5b6cf91f3e42cf20681e0edb8195b864d WHIRLPOOL cd7e974f415cc691bf7da58b2d59509f6857353a26942f1ef3a481b3546c433073d2e30826475c4ecb00b24f3f9cf57aae08fc57f988c5e2419420bf735b150d
-MISC ChangeLog 4101 SHA256 7d5c812ccba1174aaa8cdc42fccc424cfcb965dc3ed1cb4a40efbcf2ac37160e SHA512 95dfe13e2d6c3868a5c7f6dae5d6b2d589ce92a7d451de32b1a5e4291ebc3c741107608c857464f02135fd8bbd1c1f26d93694f6a4423374f977b15e57b1d8d7 WHIRLPOOL 9d12a635b9978e6d557a7b0660217e66f4cab249350163ce6b17b41e3014aaa6861d9d302fc9fe85e7ea1b42482f8a5c46886b4beeb6b3503c6ef22eb23d68e0
+EBUILD ntl-8.1.2.ebuild 2046 SHA256 a9bc820601d20c19bc839a8b5fc054ede895a621b74bbf468089bd8071b52cc6 SHA512 b22af76544bc07ff48c9a3729a152a1add550798e3a47ad82848c59b1340f85cfe2d804ae8b69656f67dd6df3ef86d2296c10bb1c5ad4f70171f4e3bf7a4407d WHIRLPOOL 6dc86967ce16b365130014f78829835686bd392bca9c36b61eb7b596cb22dc6c75c0e2b9f74ab844e2da6e7fd8cab7e785acb2ba81a7f86a07f7ba2a30bb378b
+MISC ChangeLog 4252 SHA256 4c343d476d39ac5b53a2c4ec3a36a8a620c71adb84504f96843586f8659fd5f5 SHA512 0f29d54340977d32967800b444a5de3b3af521c16a766b158b674a2528f5cc33a00de18847f21d8908b6562ecfa7cc4bdc5937ba38c2bf8f747246673d7ef395 WHIRLPOOL 5521f3af652684155c5d02fbca06faf7cac1c55bfaeeb577de6a795d25353cd1ed5ddff8b976e273ad9815de329e7e3c56fe808c6cc32ab2032b274188b70e17
 MISC metadata.xml 466 SHA256 9b0633c6003b9cb406f4407b15cf094ddedd24d6c502024a6e30f996617f1808 SHA512 1c16b66249a73ed824dac46382ba18575e49cc2be8c86f978a2689d00bcd3510b5a3cd8b47f822d505aea9b3325728b06e7ee3292b25c834528846382dbd4905 WHIRLPOOL 4fad2f00acb9abd766641efad477443ee86c9d043403470ce11bd3177a951db30183aa6460cbb8159ef3250760a9ab96e2b9d7e6b0ae5fc6c90e53d9b0f3f2fb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTouDjAAoJELvuk32y76HUBj4P/itym6knVRqat2YHOK+Muuag
-ZWZbU4D9JxReVeiOW9FA7YL7q0K33AiCrrcUPpNjYcqj3t/7uPzVRpMFWmShuvrq
-DChE2EcElA6n6ye1yZhXOwEtlUVtiYTJbDTcLqzAvkexrzcELCiIb3w3SCS+d4HT
-WaP8l8FnXLdw7YNLVLdZ65FI2f8htBxJhKreHotaPhHvjElc9VrZe8avmaF/WkxJ
-58U3S1IOHcYS08/S4g/QOdGnf7HpGGrNfWTi+4HF1y1F13CPIOmP/Phz6QKkMKuP
-XuJrbARBtX4f9jsD1r1dyComERTrSp7g3vV7YfPOOhVWbM09Bujze3YGAtSDJgFz
-F96jS3O4r0XwxSG9B60+sgAl+4qWfy1V4nSufRe9Nm1nfy9h1KtOLSBG22DFRPCZ
-SYgbvk9cwhVhhcIbuMWPJ6dote/c9bc2lyHN4mX/lsNjrKus3OBsCn5QLfL0ON3H
-ljS2MTzqZfqNevm8kl5RtCpXq4mLIsuFKlnaqAkixU6tLBObXe39WYxd0MauYqrK
-XwEGiwLSnxAikqxX8BlHnjxrL34d0KFif97GXPdv1lFSbNeB0DIJqCBKl2gTkMLf
-LLTX/ujqF36IW1UCF8KNEk0IW/wtxClRsGHmTeF8vLKR4xqtsxPunlVqUZRGHvC0
-J3MqqgHm3I1Q2nQUZmzK
-=wEHY
+iF4EAREIAAYFAlUT3aQACgkQid6yGVZcMrywFgD+LtWkLnxklj8/1+rQFUB1k+kK
+WizAccEloPFA4eZeUhkA/08c2GjVfRooxHN3I0PPth3VsYm428HHzfNCllN73eDc
+=mjqi
 -----END PGP SIGNATURE-----

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
new file mode 100644 (file)
index 0000000..a586887
--- /dev/null
+++ b/dev-libs/ntl/files/ntl-8.1.2-sanitize-makefile.patch
@@ -0,0 +1,158 @@
+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-8.1.2.ebuild b/dev-libs/ntl/ntl-8.1.2.ebuild
new file mode 100644 (file)
index 0000000..b2320e0
--- /dev/null
+++ b/dev-libs/ntl/ntl-8.1.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ntl/ntl-8.1.2.ebuild,v 1.1 2015/03/26 10:19:22 tomka Exp $
+
+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
+}