Added static-libs flag and downgrade O3 and above flags to O2 (bug #356087)

Package-Manager: portage-2.1.9.40/cvs/Linux x86_64

7 files changed, 30 insertions, 175 deletions

diff --git a/dev-libs/ntl/ChangeLog b/dev-libs/ntl/ChangeLog
index 46b35c7b86de..61f12e4fbfdd 100644
--- a/dev-libs/ntl/ChangeLog
+++ b/dev-libs/ntl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/ntl
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ntl/ChangeLog,v 1.21 2010/12/25 12:07:27 grobian Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ntl/ChangeLog,v 1.22 2011/02/24 04:56:07 bicatali Exp $
+
+  24 Feb 2011; Sébastien Fabbro <bicatali@gentoo.org> -ntl-5.3.ebuild,
+  -ntl-5.3.2.ebuild, -ntl-5.4-r1.ebuild, -files/ntl-5.4-endless_testrun.patch,
+  ntl-5.5.2.ebuild:
+  Added static-libs flag and downgrade O3 and above flags to O2 (bug #356087)
 
   25 Dec 2010; Fabian Groffen <grobian@gentoo.org> ntl-5.5.2.ebuild,
   files/ntl-5.5.2-shared.patch:
diff --git a/dev-libs/ntl/Manifest b/dev-libs/ntl/Manifest
index 330db6f54e8a..a2587fb70e23 100644
--- a/dev-libs/ntl/Manifest
+++ b/dev-libs/ntl/Manifest
@@ -1,14 +1,17 @@
-AUX ntl-5.4-endless_testrun.patch 553 RMD160 8ceec8cd9a045cdcd1ccbe292505cf1fc61ecfd1 SHA1 4762cb521d2d79f75a9c7a9179814ac19f1b378e SHA256 0c136339945a59983b1bd284825443e543f77d8111fa645c32ed6cf00795f1c7
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ntl-5.5.2-sage-tools.patch 1411 RMD160 b02476fed551c847dc44e11f5f24a60c48248e74 SHA1 a4edfaa1357317f223f58ada12bb3ea995c602b0 SHA256 ca3ab5d6fc295d8825c32e307086b686ccc56f58d3aa69bb810d1a50c4f05a27
 AUX ntl-5.5.2-shared.patch 4343 RMD160 d1e27917dae53518af0ba5c6c075a3ec2c4c61ad SHA1 3aa23768dcb4c394d4d0a00bc44754605d0af11e SHA256 38b298b4f4b6fa7083bc7a86dfb2dcc19e5fcbb2cad90a216b28110e8f0642a9
 AUX ntl-5.5.2-singular.patch 324 RMD160 72995f19869a21384e6c3750f4630415263c0187 SHA1 4e11406616217bcf6619221108a4b595483ba090 SHA256 2b9c1b1504ede6d9332fcb6e63bba93f81d528f0d035ebdbd8f32b2085c1f110
-DIST ntl-5.3.2.tar.gz 669944 RMD160 981fa271f607aa30603084abcff25f055c267daa SHA1 6fa67ab5ca5d228938a62d3a069d9163492cbcee SHA256 a8d140f30657a7554a0d984d18cf057312f0f77d8da05ea11a50b8a2701d7c32
-DIST ntl-5.3.tar.gz 670004 RMD160 0dcbc7fec88b7be9189a7b9717f75e4bf9c73b94 SHA1 e38628c3aa8bcc17460e652344af7f7c8a21b96d SHA256 8cf6284f251063eb8b13767b0d63fec8888ac96ffc9239bf6df6f787a414333f
-DIST ntl-5.4.tar.gz 681173 RMD160 4bb73568aaaa13a861df62e0b6d8470d70ce96ad SHA1 a39542a3df1d29c51923a22700e1b40680ba0d19 SHA256 aa24084151235932c29d08377c2c1b2a8a907d1aa1b608103cc4dc42f38bb9bd
 DIST ntl-5.5.2.tar.gz 707247 RMD160 3ba508219276b3922ec6def391100a23b79f6193 SHA1 b45e3858f7f351afeb7fbb831b256befc4892b06 SHA256 ef7fe7c8b60ec6e05b2a279caad0081263f7fb68b7360120846644cde726ff56
-EBUILD ntl-5.3.2.ebuild 900 RMD160 50888985c7476775bac81b7aa7d51b52327c93e4 SHA1 f331bca4f0d6934a582c8e00670d99a86a2f72a3 SHA256 f93730d36a0178c5b0ec6eed6ae1ff72875683f46c2e4c2d5e6992bfe7110b70
-EBUILD ntl-5.3.ebuild 875 RMD160 c7a700f0c9a7d2a4eab8e69c6026d36597f586d1 SHA1 ec9fc1e9e1c5bb8ea5ad491c07610f41426df050 SHA256 ec52d42245d87a0a53b0928c65c5994a1970d3415c69583671515ff7613a2702
-EBUILD ntl-5.4-r1.ebuild 1226 RMD160 0bcfd914be46a714c109edb2a7e9b246ffa5a1e4 SHA1 d4cb8ab675e62643c0a12c2254b03e5b6e1a7b5d SHA256 ac61a4d20b9b9d3fdcb1b0a766f017e09a03b81abb695612db0ffaca48802d4e
-EBUILD ntl-5.5.2.ebuild 2008 RMD160 533aad3a34f00251eed3112d2276bde0a0ffbf15 SHA1 0037890866e1a9baddd587b23e6badc49bca3e68 SHA256 e0c973d7689fb20923944b3b2b0ae5dd344fe60a96b4fd14bd351078757a02f5
-MISC ChangeLog 3332 RMD160 50dbfab6900565d6373b546c0c403b03504f1d5a SHA1 f1ccf658ce8aa7603db0976befcac86d62e9d59d SHA256 cbaba1a62f546f70d2dde6992daf3b7f9417b38c40ad203dad8b26825e837cf0
+EBUILD ntl-5.5.2.ebuild 2140 RMD160 71851972d3e8bb917de117215c6ca6e26f63f1f9 SHA1 5d5c4d1af7f5bf12d2e382f07a4b523cf633b9bb SHA256 013bf8253651a5c6c50fc3b1fedbff948e973c70b71e3012d382751eac54a693
+MISC ChangeLog 3583 RMD160 e1666638fa39b91e0c62ee9dc59bba1429814e8d SHA1 70b1053e7d4ac9890b166ccd9dc8aa363a0bc666 SHA256 9a5f8b608d394d56dbab70d1e93d2c79e664303c0f5ad234113b2015afb3b0d3
 MISC metadata.xml 466 RMD160 b2604991746dd4cfb5cddaf2abe21dfd2c131f28 SHA1 d0d776cb4f12cd43710c84ec3e89986a5b17469a SHA256 9b0633c6003b9cb406f4407b15cf094ddedd24d6c502024a6e30f996617f1808
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk1l5PAACgkQ1ycZbhPLE2CUbgCgicEWVXkJWfMpdL+rSppV+CGP
+X3IAnRqOYnWbGtvMuKy9sInwP8bS+stF
+=gzV0
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/ntl/files/ntl-5.4-endless_testrun.patch b/dev-libs/ntl/files/ntl-5.4-endless_testrun.patch
deleted file mode 100644
index 76861dab64c0..000000000000
--- a/dev-libs/ntl/files/ntl-5.4-endless_testrun.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/TestScript.orig	2007-02-10 23:18:14.000000000 +0100
-+++ src/TestScript	2007-02-10 23:19:56.000000000 +0100
-@@ -143,14 +143,14 @@
- echo "---------------------------------"
- echo "making subset"
- make subset
--echo "subset 40 40 20 10 999999 f"
-+echo "subset 10 10 20 10 999999 f"
- ./subset <<here
--  40 40 20 10 999999 f
--here
--echo "subset 40 40 20 10 999999 q"
--./subset <<here
--  40 40 20 10 999999 q
-+  10 10 20 10 999999 f
- here
-+#echo "subset 40 40 20 10 999999 q"
-+#./subset <<here
-+#  40 40 20 10 999999 q
-+#here
- 
- sh RemoveProg subset
- 
diff --git a/dev-libs/ntl/ntl-5.3.2.ebuild b/dev-libs/ntl/ntl-5.3.2.ebuild
deleted file mode 100644
index 034f7c25c5a8..000000000000
--- a/dev-libs/ntl/ntl-5.3.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ntl/ntl-5.3.2.ebuild,v 1.2 2004/09/30 22:27:39 george Exp $
-
-DESCRIPTION="high-performance, portable C++ ci-computational ibrar"
-HOMEPAGE="http://shoup.net/ntl/"
-SRC_URI="http://www.shoup.net/ntl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE=""
-
-DEPEND=">=dev-libs/gmp-4.1-r1"
-
-src_compile() {
-	cd src
-	./configure \
-		PREFIX=/usr \
-		NTL_GMP_LIP=on NTL_STD_CXX=on\
-		"CFLAGS=$CFLAGS -Wno-deprecated" || die "./configure failed"
-
-	make || die "make failed"
-	make check || die "make check failed - make did not make something good..."
-}
-
-src_install() {
-	cd src
-	make PREFIX=${D}/usr/ install || die
-
-	#now somewhat clean-up docs
-	cd ${S}
-	dodoc README
-	cd ${S}/doc
-	dodoc *.txt
-	dohtml *.html *.gif
-
-	rm -rf ${D}/usr/doc
-}
diff --git a/dev-libs/ntl/ntl-5.3.ebuild b/dev-libs/ntl/ntl-5.3.ebuild
deleted file mode 100644
index fe8a7d2864d0..000000000000
--- a/dev-libs/ntl/ntl-5.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ntl/ntl-5.3.ebuild,v 1.7 2005/08/07 13:02:00 hansmi Exp $
-
-DESCRIPTION="high-performance, portable C++ ci-computational ibrar"
-HOMEPAGE="http://shoup.net/ntl/"
-SRC_URI="http://www.shoup.net/ntl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc x86"
-IUSE=""
-
-DEPEND=">=dev-libs/gmp-4.1-r1"
-
-src_compile() {
-	cd src
-	./configure \
-		PREFIX=/usr \
-		NTL_GMP_LIP=on \
-		"CFLAGS=$CFLAGS -Wno-deprecated" || die "./configure failed"
-
-	make || die "make failed"
-	make check || die "make check failed - make did not make something good..."
-}
-
-src_install() {
-	cd src
-	make PREFIX=${D}/usr/ install || die
-
-	#now somewhat clean-up docs
-	cd ${S}
-	dodoc README
-	cd ${S}/doc
-	dodoc *.txt
-	dohtml *.html *.gif
-
-	rm -rf ${D}/usr/doc
-}
diff --git a/dev-libs/ntl/ntl-5.4-r1.ebuild b/dev-libs/ntl/ntl-5.4-r1.ebuild
deleted file mode 100644
index 25cb43ebaae8..000000000000
--- a/dev-libs/ntl/ntl-5.4-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ntl/ntl-5.4-r1.ebuild,v 1.2 2007/02/18 15:13:09 nixnut Exp $
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="A high-performance, portable C++ Library for doing Number Theory"
-HOMEPAGE="http://shoup.net/ntl/"
-SRC_URI="http://www.shoup.net/ntl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE="doc gmp"
-
-RDEPEND="gmp? ( >=dev-libs/gmp-4.1-r1 )"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-endless_testrun.patch"
-}
-
-src_compile() {
-	local myconf=""
-	use gmp && myconf="${myconf} NTL_GMP_LIP=on"
-	cd src
-	perl DoConfig \
-		PREFIX=/usr \
-		${myconf} \
-		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
-		|| die "DoConfig failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	newlib.a src/ntl.a libntl.a
-	insinto /usr/include
-	doins -r include/NTL
-
-	dodoc README
-
-	if use doc ; then
-		dodoc doc/*.txt
-		dohtml doc/*.{html,gif}
-	fi
-}
-
-src_test() {
-	cd src
-	emake check || die "emake check failed"
-}
diff --git a/dev-libs/ntl/ntl-5.5.2.ebuild b/dev-libs/ntl/ntl-5.5.2.ebuild
index dd7653641ade..b6b1bd157533 100644
--- a/dev-libs/ntl/ntl-5.5.2.ebuild
+++ b/dev-libs/ntl/ntl-5.5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ntl/ntl-5.5.2.ebuild,v 1.6 2010/12/25 12:07:27 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ntl/ntl-5.5.2.ebuild,v 1.7 2011/02/24 04:56:07 bicatali Exp $
 
 EAPI=3
-inherit toolchain-funcs eutils multilib
+inherit toolchain-funcs eutils multilib flag-o-matic
 
 DESCRIPTION="High-performance and portable Number Theory C++ library"
 HOMEPAGE="http://shoup.net/ntl/"
@@ -12,7 +12,7 @@ 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"
-IUSE="doc"
+IUSE="doc static-libs test"
 
 RDEPEND=">=dev-libs/gmp-4.3
 	>=dev-libs/gf2x-0.9"
@@ -31,6 +31,7 @@ src_prepare() {
 	epatch "$FILESDIR/${P}-sage-tools.patch"
 	# sanitize the makefile and allow the building of shared library
 	epatch "$FILESDIR/${P}-shared.patch"
+	replace-flags -O[3-9] -O2
 }
 
 src_configure() {
@@ -48,14 +49,18 @@ src_compile() {
 	emake setup1 setup2 || die "emake setup failed"
 	emake setup3 || die "emake setup failed"
 	sh Wizard on || die "Tuning wizard failed"
-	emake ntl.a  || die "emake static 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() {
-	newlib.a ntl.a libntl.a || die "installation of static library failed"
+	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 ..