From 14b84a8ace1ef6811ee08a872a2440bed6ddfdb4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tiziano=20M=C3=BCller?= <dev-zero@gentoo.org>
Date: Sun, 11 Feb 2007 21:20:32 +0000
Subject: [PATCH] Ebuild cleanup. Fixed bug #143484. Package-Manager:
 portage-2.1.2-r7

---
 dev-libs/ntl/ChangeLog                        |  8 ++-
 dev-libs/ntl/Manifest                         | 58 ++++++++++---------
 dev-libs/ntl/files/digest-ntl-5.3             |  2 +
 dev-libs/ntl/files/digest-ntl-5.3.2           |  2 +
 .../ntl/files/ntl-5.4-endless_testrun.patch   | 23 ++++++++
 dev-libs/ntl/ntl-5.4.ebuild                   | 54 +++++++++++------
 6 files changed, 99 insertions(+), 48 deletions(-)
 create mode 100644 dev-libs/ntl/files/ntl-5.4-endless_testrun.patch

diff --git a/dev-libs/ntl/ChangeLog b/dev-libs/ntl/ChangeLog
index d5289e547c07..ab52cdb75ad6 100644
--- a/dev-libs/ntl/ChangeLog
+++ b/dev-libs/ntl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/ntl
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ntl/ChangeLog,v 1.9 2006/04/14 00:16:38 halcy0n Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ntl/ChangeLog,v 1.10 2007/02/11 21:20:32 dev-zero Exp $
+
+  11 Feb 2007; Tiziano Müller <dev-zero@gentoo.org>
+  +files/ntl-5.4-endless_testrun.patch, ntl-5.4.ebuild:
+  Ebuild cleanup. Fixed bug #143484.
 
 *ntl-5.4 (14 Apr 2006)
 
diff --git a/dev-libs/ntl/Manifest b/dev-libs/ntl/Manifest
index 2815d469a672..3138ed05d933 100644
--- a/dev-libs/ntl/Manifest
+++ b/dev-libs/ntl/Manifest
@@ -1,34 +1,36 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8d4376cb33acc8d049df928794fd49d8 ChangeLog 1266
-RMD160 59afd4580afb3cd5611dc46749725ed9b42a5fad ChangeLog 1266
-SHA256 d4df4eb651696719911b4b39ffcdb92adc4e048ec37fb46b24b64d8711c53b3c ChangeLog 1266
-MD5 7407d1e929b8a4ab9a8f48dbd169b5d9 files/digest-ntl-5.3 59
-RMD160 affd29bb87bacaa6cd67c2d0e27420e1f8780c50 files/digest-ntl-5.3 59
-SHA256 b2a5de9dee15aa109815731f36fbf2f62b6d607dd595b47943b9df95a8ae8394 files/digest-ntl-5.3 59
-MD5 1b62f475ab5f21444d3ab92e16655f05 files/digest-ntl-5.3.2 61
-RMD160 7c8d1e2cac6de25cc7c12e5dd778b6b722e49b10 files/digest-ntl-5.3.2 61
-SHA256 408fb67ded42f39b2e4396c28b51af84a86c9855c8f55b592464e715e59573e0 files/digest-ntl-5.3.2 61
-MD5 7be4c92d4df6fde2fadba30e1c99e7b1 files/digest-ntl-5.4 223
-RMD160 4cc782639f0923bf41373d2fffdc079f2607980c files/digest-ntl-5.4 223
-SHA256 91e56628dce4e83fabbcd793c870f4e952f5229c6d5ea74ef7015364f11484be files/digest-ntl-5.4 223
-MD5 41d7ac32dc54956e937401bb5a2c3810 metadata.xml 156
-RMD160 537178ef5a820896e97475fb9aded47d50474bef metadata.xml 156
-SHA256 0e8490f9c62cb74e5894b52f643a02de0024d97dbfebad43082dce6bcb39555f metadata.xml 156
+AUX ntl-5.4-endless_testrun.patch 553 RMD160 8ceec8cd9a045cdcd1ccbe292505cf1fc61ecfd1 SHA1 4762cb521d2d79f75a9c7a9179814ac19f1b378e SHA256 0c136339945a59983b1bd284825443e543f77d8111fa645c32ed6cf00795f1c7
+MD5 e039571b0f60bbda44acca72d991a94e files/ntl-5.4-endless_testrun.patch 553
+RMD160 8ceec8cd9a045cdcd1ccbe292505cf1fc61ecfd1 files/ntl-5.4-endless_testrun.patch 553
+SHA256 0c136339945a59983b1bd284825443e543f77d8111fa645c32ed6cf00795f1c7 files/ntl-5.4-endless_testrun.patch 553
+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
+EBUILD ntl-5.3.2.ebuild 900 RMD160 50888985c7476775bac81b7aa7d51b52327c93e4 SHA1 f331bca4f0d6934a582c8e00670d99a86a2f72a3 SHA256 f93730d36a0178c5b0ec6eed6ae1ff72875683f46c2e4c2d5e6992bfe7110b70
 MD5 2ff1ea3c90415ebd57998ececad474ad ntl-5.3.2.ebuild 900
 RMD160 50888985c7476775bac81b7aa7d51b52327c93e4 ntl-5.3.2.ebuild 900
 SHA256 f93730d36a0178c5b0ec6eed6ae1ff72875683f46c2e4c2d5e6992bfe7110b70 ntl-5.3.2.ebuild 900
+EBUILD ntl-5.3.ebuild 875 RMD160 c7a700f0c9a7d2a4eab8e69c6026d36597f586d1 SHA1 ec9fc1e9e1c5bb8ea5ad491c07610f41426df050 SHA256 ec52d42245d87a0a53b0928c65c5994a1970d3415c69583671515ff7613a2702
 MD5 246b175fa89c9a458eec9a625203d38f ntl-5.3.ebuild 875
 RMD160 c7a700f0c9a7d2a4eab8e69c6026d36597f586d1 ntl-5.3.ebuild 875
 SHA256 ec52d42245d87a0a53b0928c65c5994a1970d3415c69583671515ff7613a2702 ntl-5.3.ebuild 875
-MD5 4104e41afddd9b2332db214cd8b50b68 ntl-5.4.ebuild 899
-RMD160 9a046bdc9f98990358f9e30bc0ed28f59eb9766f ntl-5.4.ebuild 899
-SHA256 cbaf6d0db6e38a8e9098cf91776b40164a4570b9b9047e552be720b8589acd40 ntl-5.4.ebuild 899
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFEPunzCRZPokWLroQRAspIAKCFLfYhCUwIEgav7NNkdmhA9wsXmQCfeCO1
-AGylmck6fwQtECibeO8eGAw=
-=XxDP
------END PGP SIGNATURE-----
+EBUILD ntl-5.4.ebuild 1217 RMD160 2711cfbeb2afdfc190eae773334750223e16d7c6 SHA1 d84e2c3a4bb641138a6b0129d36c1573b7d1cebc SHA256 caac77bfc6db1f686f722010a9fd1dd9ba3a96395931dfb90773d7110c0a4ad2
+MD5 e815d2c352a1b6b77a7cba0257fc741e ntl-5.4.ebuild 1217
+RMD160 2711cfbeb2afdfc190eae773334750223e16d7c6 ntl-5.4.ebuild 1217
+SHA256 caac77bfc6db1f686f722010a9fd1dd9ba3a96395931dfb90773d7110c0a4ad2 ntl-5.4.ebuild 1217
+MISC ChangeLog 1415 RMD160 b28fb0fd95e4a82e62e6686d373ae08cd3f28753 SHA1 4d9102e98478dfdd81e69f39f6b204a7c6aee6ca SHA256 584c4cce8e097f5778bca82cf3895770f44893897e60c5e2a1484a43881e7658
+MD5 3142a3757c013dcb875ce68d22f9075a ChangeLog 1415
+RMD160 b28fb0fd95e4a82e62e6686d373ae08cd3f28753 ChangeLog 1415
+SHA256 584c4cce8e097f5778bca82cf3895770f44893897e60c5e2a1484a43881e7658 ChangeLog 1415
+MISC metadata.xml 156 RMD160 537178ef5a820896e97475fb9aded47d50474bef SHA1 2a4ef4879b918a28132d21cd6d1bbaa2a30dccde SHA256 0e8490f9c62cb74e5894b52f643a02de0024d97dbfebad43082dce6bcb39555f
+MD5 41d7ac32dc54956e937401bb5a2c3810 metadata.xml 156
+RMD160 537178ef5a820896e97475fb9aded47d50474bef metadata.xml 156
+SHA256 0e8490f9c62cb74e5894b52f643a02de0024d97dbfebad43082dce6bcb39555f metadata.xml 156
+MD5 7cc9cdb0b702bb817bbff163dec1e477 files/digest-ntl-5.3 223
+RMD160 e0307d72d61fa02d91f8c03aec3d141878be4376 files/digest-ntl-5.3 223
+SHA256 a53d703a3e211943660e59e5c98e698f8e67da1ebcebf3f82199c9c86ff27a94 files/digest-ntl-5.3 223
+MD5 f51e2d2ba646dfc562ada9f77b871dc3 files/digest-ntl-5.3.2 229
+RMD160 6d86db24b0b1ad192262dbfacc6e606372e629df files/digest-ntl-5.3.2 229
+SHA256 831c089387a5aeafb94dc33dce60980fe7781226f85469d48e2bed0ffe0afdc9 files/digest-ntl-5.3.2 229
+MD5 7be4c92d4df6fde2fadba30e1c99e7b1 files/digest-ntl-5.4 223
+RMD160 4cc782639f0923bf41373d2fffdc079f2607980c files/digest-ntl-5.4 223
+SHA256 91e56628dce4e83fabbcd793c870f4e952f5229c6d5ea74ef7015364f11484be files/digest-ntl-5.4 223
diff --git a/dev-libs/ntl/files/digest-ntl-5.3 b/dev-libs/ntl/files/digest-ntl-5.3
index 4004e6eb3503..64625d1c1d39 100644
--- a/dev-libs/ntl/files/digest-ntl-5.3
+++ b/dev-libs/ntl/files/digest-ntl-5.3
@@ -1 +1,3 @@
 MD5 0292a808e2d2420f8e00c1ac5da4b7a4 ntl-5.3.tar.gz 670004
+RMD160 0dcbc7fec88b7be9189a7b9717f75e4bf9c73b94 ntl-5.3.tar.gz 670004
+SHA256 8cf6284f251063eb8b13767b0d63fec8888ac96ffc9239bf6df6f787a414333f ntl-5.3.tar.gz 670004
diff --git a/dev-libs/ntl/files/digest-ntl-5.3.2 b/dev-libs/ntl/files/digest-ntl-5.3.2
index c394ba396e70..6eca4aeff7da 100644
--- a/dev-libs/ntl/files/digest-ntl-5.3.2
+++ b/dev-libs/ntl/files/digest-ntl-5.3.2
@@ -1 +1,3 @@
 MD5 a0eac4f3988f3f3f20dcc5491aee9e31 ntl-5.3.2.tar.gz 669944
+RMD160 981fa271f607aa30603084abcff25f055c267daa ntl-5.3.2.tar.gz 669944
+SHA256 a8d140f30657a7554a0d984d18cf057312f0f77d8da05ea11a50b8a2701d7c32 ntl-5.3.2.tar.gz 669944
diff --git a/dev-libs/ntl/files/ntl-5.4-endless_testrun.patch b/dev-libs/ntl/files/ntl-5.4-endless_testrun.patch
new file mode 100644
index 000000000000..76861dab64c0
--- /dev/null
+++ b/dev-libs/ntl/files/ntl-5.4-endless_testrun.patch
@@ -0,0 +1,23 @@
+--- 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.4.ebuild b/dev-libs/ntl/ntl-5.4.ebuild
index 7db6a809a739..6b0696f1c318 100644
--- a/dev-libs/ntl/ntl-5.4.ebuild
+++ b/dev-libs/ntl/ntl-5.4.ebuild
@@ -1,39 +1,57 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.ebuild,v 1.1 2006/04/14 00:16:38 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ntl/ntl-5.4.ebuild,v 1.2 2007/02/11 21:20:32 dev-zero Exp $
 
-DESCRIPTION="high-performance, portable C++ ci-computational ibrar"
+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="~x86 ~ppc ~amd64"
-IUSE=""
+IUSE="doc gmp"
+
+RDEPEND="gmp? ( >=dev-libs/gmp-4.1-r1 )"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
 
-DEPEND=">=dev-libs/gmp-4.1-r1"
+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
-	./configure \
+	perl DoConfig \
 		PREFIX=/usr \
-		NTL_GMP_LIP=on NTL_STD_CXX=on\
-		"CFLAGS=$CFLAGS -Wno-deprecated" || die "./configure failed"
+		${myconf} \
+		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
+		AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
+		|| die "DoConfig failed"
 
-	make || die "make failed"
-	make check || die "make check failed - make did not make something good..."
+	emake || die "emake failed"
 }
 
 src_install() {
-	cd src
-	make PREFIX=${D}/usr/ install || die
+	dolib.a src/ntl.a
+	insinto /usr/include
+	doins -r include/NTL
 
-	#now somewhat clean-up docs
-	cd ${S}
 	dodoc README
-	cd ${S}/doc
-	dodoc *.txt
-	dohtml *.html *.gif
 
-	rm -rf ${D}/usr/doc
+	if use doc ; then
+		dodoc doc/*.txt
+		dohtml doc/*.{html,gif}
+	fi
+}
+
+src_test() {
+	cd src
+	emake check || die "emake check failed"
 }
-- 
2.26.2