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

(Portage version: 2.1.9.40/cvs/Linux x86_64)

6 files changed, 18 insertions, 166 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/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 ..