fix NTL test build wrt #516028

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

4 files changed, 44 insertions, 19 deletions

diff --git a/sci-mathematics/flint/ChangeLog b/sci-mathematics/flint/ChangeLog
index 26d282a38798..2276b549dff5 100644
--- a/sci-mathematics/flint/ChangeLog
+++ b/sci-mathematics/flint/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/flint
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/flint/ChangeLog,v 1.5 2014/06/20 20:57:18 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/flint/ChangeLog,v 1.6 2014/07/02 11:10:57 hasufell Exp $
+
+  02 Jul 2014; Julian Ospald <hasufell@gentoo.org> flint-2.4.4.ebuild,
+  +files/flint-2.4.4-test.patch:
+  fix NTL test build wrt #516028
 
 *flint-2.4.4 (20 Jun 2014)
 
diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index 3e2ebc707b32..b87c3ddb8365 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -4,30 +4,31 @@ Hash: SHA256
 AUX flint-2.4.3-cflags-ldflags.patch 1879 SHA256 a07c6d13a239a208f80561deb262af52c2d3da9bfb08744c10f4e50797f24408 SHA512 05fe22492d8e96eeabd30c5b28f8743354e8bf4e593eaf58d8be6bb47341a1c7148c13de681a5983fdae32cc246259ab69cff8b390002c0836ac2ae7d0a9b87e WHIRLPOOL 8210033b3ff8e1df2ad5a40ce9b4d6d34407b00c861b981cc785581099828a7a07c7f6d3f231d4ca7a5311bee26a39d880b3f89cc96378aa6b88791e7a008b65
 AUX flint-2.4.3-libdir.patch 1215 SHA256 def40bcf963341d11982f0ce2bd04567c0381ac085c9103320c780b95cd2d402 SHA512 92beca631043d9bf40f8174462a213e56963736b3b3926540cbd010938e57fd8eb3565185e1941d969700566e106adbd006396b65ba9877dbcf6c630287a7ac7 WHIRLPOOL 899eb997426883e49843a6dd998cce9842cd12446ba4037c03849fa7227eed877520341e95a0d2c22c9f3e4f2b78c8f4cc4af2020a9d2d09d4c4df5bb95dce10
 AUX flint-2.4.3-whitespaces.patch 1929 SHA256 e11afffa161207f73f905040dbede8246b4d96e2698ec780c9e1e1890f23bf71 SHA512 4bfa3bf3d7393ab577988b4def04fb2fe4107679a8f3eb2db7fd2c900d6ba0b79e685f5357d5d99633ea6eb8e4c7c38530f69f35fcfa250d6751e3d1f41a025f WHIRLPOOL 27b87df0bac1e74555c9f83cde575d1eaaeeec2a18245bd3df92b57b1c019168b33140275b18b7d89f67a69d0f3a488812e4a655d43d461fb6f34c6823d1ef86
+AUX flint-2.4.4-test.patch 709 SHA256 41ba827bffa88c62ecdb93a2a7b1ddd01a3ad395e36b34b93a05c7c26e76ee57 SHA512 46f66ef5104b535c0004b63cac30bd0dcd66ff554502387597d0ab5f8d7a8189431872510c0666ad99dd7c15ec7756a87b670ef162ad6b085150c6eee7a7a376 WHIRLPOOL 29d73e80b43b06e7111dae44722967b5910850f7416aa03e5fd054aee8009a256fdf05e49b61370b8d4f9dd91aef1a5fc9535822c870cc9217fe45f75a2ee618
 DIST flint-2.3.tar.gz 830837 SHA256 6bb059048f822dc9291567949f1baed8c77f337ff2601e91a8e9d20936291a75 SHA512 8b5cb41ef9616c984554f7085dcd914d8d91b0f8b3964939c740336e79cfcc6e81fc9135084845615f56429952a4fc0eb3960c6df13d5f779c997c3b53763e56 WHIRLPOOL 12ee4c4e6efadbe2913783fcfe7583f084c6c10777e04293de6748cf177423f7652e5cd8bcdd0f412be73a40f4c5fc744a84c0de89f6c1ff527c20e55e102258
 DIST flint-2.4.3.tar.gz 1636527 SHA256 93585cd321c5a2fad053c903ba7cd947f54de71d31cf1dd1af6814906c1ee763 SHA512 d7cecb7116c458f554e09524b9df25784ed32f889a4d83a3fc6fbf16f08ace68890b3a748a8b1b03e543c121994ed7e5efbdca9e7dbb694a4571c8d25e983aa9 WHIRLPOOL 4ec1ce3447218c9a45a9548284b7948714327bf264e9087d7c0687936a586cb96eb921079770d78c482af158ca78c65193ccbf489a789771ae527eed4d75d588
 DIST flint-2.4.4.tar.gz 1639262 SHA256 c4799e9394ef06d7b8625f7fd74ba2d8ca115dbb2aa506dcc6e369b49d0e5bc7 SHA512 236997cf64bdc96741740889f450fdbaf7d7e9b58252645f864d28005c9e7bdf87f7187cd17526606c605f0489f026398a1361b8f209f71158ca3b31c42d86d2 WHIRLPOOL 299820bc656e955d54dd06be3a1ba68440e8d9c72785ac54e7d9559da073b31c07b73598c9b18c98889f836dfd25ed8cd96d62a901a12a529698ae00ba30f1d1
 EBUILD flint-2.3.ebuild 816 SHA256 8bea0e8340b2d6c5197e1ac93fb71e64e84ec5d1cc50a3ac72e0e8ba84eca575 SHA512 844d698e5a10133960b662bffdeffccd7b9696cc3932462d744455e27321fb08bb56c3ac39d91b628282d3958c34d7c892808468453a18c36e207a64ec0a6233 WHIRLPOOL b4aa7a8bbfdc1620cefa04168afe94c21373e56c704e5bae66eb9dda23e2dab68bf69736a85238092f6df8c18385dc4a0aba057a5d99adf6be963deb205e7a45
 EBUILD flint-2.4.3.ebuild 1413 SHA256 42f6f0b9e043953bc258d1418977b887544c4992c5c0b162e9318bdfa8924ef3 SHA512 2402f6a6f57d4882c74b459d8e38fc5c321c0643607335c87f3ddf6bcbb7b472d0c7fc22f6eeb5160af1ae9cfbbb2820ed33512c46afe0e596200b90dd022b7c WHIRLPOOL e6e6873575a3f71ddb8080204e5fb95881fa8e0c185dff5e808d080e08dcc4a8a05e8d2b3d5ccc03e83183c6cbbe6e5ed6ebd9ca3126d96d31f45eac8278eae1
-EBUILD flint-2.4.4.ebuild 1413 SHA256 e6590aa9526cb92535ce569e529f663c348fbb328eb59c7674421a2e8cce848a SHA512 8a5154c6f3ab6ed4d2b8611a9cef0ef15dc3956707b87ee01a7d78c599388cec344b6a19cf90b0c5fe4901a4aeefbfa42c55d38ed7c3b63e8306e108e80bc9ac WHIRLPOOL 12966cdbc3bb6436a1a1529449f1889da075304d506d7de9dec409cb9ef48e1e7267f7c7409d616d802491471a00ceb51efb32f79f971b4d681379b3ae188463
-MISC ChangeLog 939 SHA256 45c06178257038f8fa2d8a39cc8194b01024bf1433156ac39d2adc948d60ef62 SHA512 d6e54e21390508a5e3073489ff9bd95bbfb5cadc46900acca42104da625010a0bef9f461a2643518f5cfa08dc929139f5b80f11e0f1abb8fff3c1b2f4df2ad74 WHIRLPOOL c90acc9e9a9fde8ea4bf2b87824938f28333ccc1bee0aa7d6037f0e7b29f9af2562f59489a17aa85aed2fc40eaae440f88ba778f0b492d011f39e9a3580a41cf
+EBUILD flint-2.4.4.ebuild 1454 SHA256 39a929a6aedc39f7812a1136767d14f9a0596f74875560eee7c27759fd3fcee3 SHA512 4785c3822dcc57b7a250fc7b80a86f040bd92e26c6b2a522d95a766190106979202598b326f5233414645d1d3ff5e619da6a3c9c514e2c897bcc7b5c47509089 WHIRLPOOL d6590a23a10d55c5d7f126c685eec188c87602e478e6a7bfcf3a6e723d8a749f5e63c1e3214ab3bb5ef6f20cc52e5c4fa90e90368fb87a2b4f15fba487f5a5b7
+MISC ChangeLog 1077 SHA256 2135512b9f45260c1706bf3a64f7259f8137375023ad054c1dff29aeb0a7568b SHA512 ec6a9f61300483fd9473533514313ff3d085129c6ab6f4fb17167fd0c6289a047f36a5973a3c755baa767e824539214c304f22caa52dfdd576764d179ea446ca WHIRLPOOL d3522276fda6a69de8b930f9cd4153f74977e3ea97fae0ea10c9619aa1510b7fdf00a896963d4506e48e4f8ea5b51ef6d3b2d9af8f339af2e4a8083cc7edbd86
 MISC metadata.xml 562 SHA256 989326dbe72984d9e92a6602862b222ff7480e56ddef8e4a72442ea5457edc24 SHA512 240715cd0ae2da1fe1637beafce2e97ee9c6c442417747006b18601d57d7d0687380b575f5ccd63e386bbf87419b3facbb669bceb18aaa3c5a69ff25464a2650 WHIRLPOOL aaca043886ade55e57140c3a26bc3ad5db283e7a943aeafaeb755f8632a0ca14124b97fdc44c5e664da604dba1bfa3a8ccda0e4c15aa6b1b0f0862620888a41b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTpKAwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTs+jCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgiGoP/2ywP6iSARlUMb2chQ9P6N2k
-KxJSRaGGoQl3aOi+ibiVKROzDOk5KxXISDnHBgGQhPhiS1FzJM4Zk9vGqXQa+AFq
-mJNYxYHgJ+ovdzxrbZZM+FuW3LiMwtMMmVxpw7IA4uCUuTwP4NyQe98h5EmPHtJw
-kkJA4BdqMDvEiBLXzSqaAMRikhjbqkNjUMBzZQQJxaQXB10WZmExB9cH3wR/qska
-A8mSu2F5RslAkUK4rTnYv9KXezhRiuuIIYj6njXNP7FIFgVs4+JYvgK6osNjUDch
-3fLJ6ITc1+orcfeXEGSvohmWDG3q8r1PCG2ziGCuKIUAsjloKxp8KGP1IdS/pARz
-nv27VZsfO8Tb5cOYXwQC6DGCZN7oIka1teqFDQ5QEzqHjyLUQdTXZgd3xQ4/CuYS
-WQfuLMMrf1Dw5KKayEKlxPHW0/DX+rPet588StvC4QGn1UCJgdMrRpdHIdTzarI0
-2lxIIute4AV3EkMnLfAICX+86p2SV6k7CPbtAnj1viEQo8kNCIG0Lh4B+r9Ck2RD
-lY9TFVBGOMxByiLB01D57mfjWP3nvP5hFi5S9uZJxeaSCxYcVD7sSkhEOJMS6z3n
-PeyE4/PnITb5zYI0EOvN4RvOnQXcnFUcyOet/rJ1JcT43VIi7mVixs557H/sNVsF
-YVXgSr6crwkVwJqC5Yos
-=0chp
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgB3gP/Aoclmp+xdarbHX4nFYsnwCd
+eopL+aaQeWTVGLXSiOEqU97Bu28g/XDpArrYcGhBGKtqsvBGYPADHNavUUnWdQW0
+/QmQJ3VVhFQo9b0qTV+UU0hhCCQB4Ljcc7AhIvEiopzDUFUUs/hBRKbBTcKEUs9c
+dkz5fG+f93PIWb9tPtItKZ++Z1HSdvzmutvVwTV4Kq5q4WV1ioQt2fkaULoFWNSb
+1yGyHQPEsa0+DF4GuJJC7Z54+ecIKZ7mDSucgFFEVBFeKOB8WOSdGLdKxi4GXGWO
+C4NiVV3V2WGn0Y0d9gBn0tnaGsvRRBQHK+Tk2ysozeZGNnAIECZxbQsNHMAYDHvy
+RZXfi1fcXgfQt8E3nkh1bPr5Xy3BB7BHKsxPk+WtiMRn0jCzPQx45QT0app6zAIo
+4sIV0gXZTz01w+Cj4NrnKxG+PApUkggX8PHIK+GWdny8kPyuz3nLrhMjxqBi+9xz
+XhCrcGIAagJgQwAKBhWz2Ud3y7IWCEF0RJ6SstqVHvri3YIswAzA4twczVnqrlru
+082y0bhSBmeprqGOxSVeAffdcu3mnkOKWl5FWG9cdSv/VHAWFtoiB0C/AQtbebRu
+k34jkLQa15cmnLZNCGLKH4KJwQgRWhkvC0rEEKqoNHYlX7sucfmuAZTWir9H5fP3
+j5K7oQNME2mj9Ig2s1Rb
+=GqFV
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/flint/files/flint-2.4.4-test.patch b/sci-mathematics/flint/files/flint-2.4.4-test.patch
new file mode 100644
index 000000000000..11b7cfe21115
--- /dev/null
+++ b/sci-mathematics/flint/files/flint-2.4.4-test.patch
@@ -0,0 +1,19 @@
+commit 5e3d4a0504158f70d227e7cfc03985fe9a646797
+Author: hasufell <hasufell@hasufell.de>
+Date:   Wed Jul 2 12:58:50 2014 +0200
+
+    Fix NTL test build
+
+diff --git a/Makefile.in b/Makefile.in
+index 6dda689..e9de7da 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -214,7 +214,7 @@ build/interfaces/NTL-interface.o: interfaces/NTL-interface.cpp NTL-interface.h
+ 	$(QUIET_CXX) $(CXX) $(CFLAGS) $(INCS) -c $< -o $@;
+ 
+ build/interfaces/test/t-NTL-interface$(EXEEXT): interfaces/test/t-NTL-interface.cpp
+-	$(QUIET_CXX) $(CXX) $(CFLAGS) $(INCS) $< build/interfaces/NTL-interface.o -o $@ $(LIBS);
++	$(QUIET_CXX) $(CXX) $(CFLAGS) $(INCS) $< build/interfaces/NTL-interface.lo -o $@ $(LIBS);
+ 
+ print-%:
+ 	@echo '$*=$($*)'
diff --git a/sci-mathematics/flint/flint-2.4.4.ebuild b/sci-mathematics/flint/flint-2.4.4.ebuild
index a02be8ffaa0e..ae16d0049427 100644
--- a/sci-mathematics/flint/flint-2.4.4.ebuild
+++ b/sci-mathematics/flint/flint-2.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/flint/flint-2.4.4.ebuild,v 1.1 2014/06/20 20:57:18 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/flint/flint-2.4.4.ebuild,v 1.2 2014/07/02 11:10:57 hasufell Exp $
 
 EAPI="5"
 
@@ -26,7 +26,8 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.4.3-libdir.patch \
 		"${FILESDIR}"/${PN}-2.4.3-whitespaces.patch \
-		"${FILESDIR}"/${PN}-2.4.3-cflags-ldflags.patch
+		"${FILESDIR}"/${PN}-2.4.3-cflags-ldflags.patch \
+		"${FILESDIR}"/${PN}-2.4.4-test.patch
 }
 
 src_configure() {