version bump wrt #507572

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BDEED020)

6 files changed, 207 insertions, 2 deletions

diff --git a/sci-mathematics/flint/ChangeLog b/sci-mathematics/flint/ChangeLog
index a6f17743485d..bc78c68a64a0 100644
--- a/sci-mathematics/flint/ChangeLog
+++ b/sci-mathematics/flint/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/flint
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/flint/ChangeLog,v 1.2 2013/05/21 07:10:10 patrick Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/flint/ChangeLog,v 1.3 2014/05/18 17:58:55 hasufell Exp $
+
+*flint-2.4.3 (18 May 2014)
+
+  18 May 2014; Julian Ospald <hasufell@gentoo.org> +flint-2.4.3.ebuild,
+  +files/flint-2.4.3-cflags-ldflags.patch, +files/flint-2.4.3-libdir.patch,
+  +files/flint-2.4.3-whitespaces.patch, metadata.xml:
+  version bump wrt #507572
 
   21 May 2013; Patrick Lauer <patrick@gentoo.org> flint-2.3.ebuild:
   Fixing libdir for #470732
diff --git a/sci-mathematics/flint/files/flint-2.4.3-cflags-ldflags.patch b/sci-mathematics/flint/files/flint-2.4.3-cflags-ldflags.patch
new file mode 100644
index 000000000000..f0a2ec8531b0
--- /dev/null
+++ b/sci-mathematics/flint/files/flint-2.4.3-cflags-ldflags.patch
@@ -0,0 +1,33 @@
+commit afadc8d05674a0e3e2fcf6dfbcf5f3c8f9133119
+Author: hasufell <hasufell@hasufell.de>
+Date:   Sun May 18 19:32:59 2014 +0200
+
+    Respect CFLAGS/CXXFLAGS/LDFLAGS, fixes #66
+    
+    Even in linking command CFLAGS should be respected, no matter
+    if all objects have already been compiled or not. Some flags
+    affect both linking and object compilation and users shouldn't
+    be required to figure them out. This is standard in most build
+    systems anyway.
+    
+    Reorderd the linker line a bit, so it matches common practice,
+    although this doesn't matter technically (except that LDFLAGS
+    must go before libraries we link against).
+
+diff --git a/Makefile.in b/Makefile.in
+index a522ac1..6dda689 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -104,10 +104,10 @@ $(FLINT_LIB): $(LOBJS) $(LIB_SOURCES) $(EXT_SOURCES) $(HEADERS) $(EXT_HEADERS) |
+ 	$(AT)$(foreach dir, $(BUILD_DIRS), mkdir -p build/$(dir); BUILD_DIR=../build/$(dir); export BUILD_DIR; MOD_DIR=$(dir); export MOD_DIR; $(MAKE) -f ../Makefile.subdirs -C $(dir) shared || exit $$?;)
+ 	$(AT)if [ "$(WANT_NTL)" -eq "1" ]; then \
+ 	  $(MAKE) build/interfaces/NTL-interface.lo; \
+-	  $(CXX) $(ABI_FLAG) -shared $(EXTRA_SHARED_FLAGS) build/interfaces/NTL-interface.lo $(LOBJS) $(MOD_LOBJS) $(EXT_OBJS) $(LIBS2) -o $(FLINT_LIB); \
++	  $(CXX) $(CXXFLAGS) $(ABI_FLAG) -shared $(EXTRA_SHARED_FLAGS) build/interfaces/NTL-interface.lo $(LOBJS) $(MOD_LOBJS) $(EXT_OBJS) -o $(FLINT_LIB) $(LDFLAGS) $(LIBS2); \
+ 	fi
+ 	$(AT)if [ "$(WANT_NTL)" -ne "1" ]; then \
+-	  $(CC) $(ABI_FLAG) -shared $(EXTRA_SHARED_FLAGS) $(LOBJS) $(MOD_LOBJS) $(EXT_OBJS) $(LIBS2) -o $(FLINT_LIB); \
++	  $(CC) $(CFLAGS) $(ABI_FLAG) -shared $(EXTRA_SHARED_FLAGS) $(LOBJS) $(MOD_LOBJS) $(EXT_OBJS) -o $(FLINT_LIB) $(LDFLAGS) $(LIBS2); \
+ 	fi
+ 
+ libflint.a: $(OBJS) $(LIB_SOURCES) $(EXT_SOURCES) $(HEADERS) $(EXT_HEADERS) | build build/interfaces
diff --git a/sci-mathematics/flint/files/flint-2.4.3-libdir.patch b/sci-mathematics/flint/files/flint-2.4.3-libdir.patch
new file mode 100644
index 000000000000..a569be40b8b8
--- /dev/null
+++ b/sci-mathematics/flint/files/flint-2.4.3-libdir.patch
@@ -0,0 +1,44 @@
+From 27eb23c1844029ee64907500bd8aa87097ffcd32 Mon Sep 17 00:00:00 2001
+From: hasufell <hasufell@hasufell.de>
+Date: Sun, 18 May 2014 18:46:24 +0200
+Subject: [PATCH] Allow to control LIBDIR
+
+Some distributions have lib32/lib64 and need to control
+the destination properly.
+---
+ Makefile.in | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index c16f838..b6ea4c9 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -4,6 +4,8 @@ else
+   $(DLPATH):=$(DLPATH_ADD)
+ endif
+ 
++LIBDIR=lib
++
+ QUIET_CC  = @echo '   ' CC  ' ' $@;
+ QUIET_CXX = @echo '   ' CXX ' ' $@;
+ QUIET_AR  = @echo '   ' AR  ' ' $@;
+@@ -169,13 +171,13 @@ else
+ endif
+ 
+ install: library
+-	mkdir -p $(DESTDIR)$(PREFIX)/lib
++	mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR)
+ 	mkdir -p $(DESTDIR)$(PREFIX)/include/flint
+ 	$(AT)if [ "$(FLINT_SHARED)" -eq "1" ]; then \
+-		cp $(FLINT_LIB) $(DESTDIR)$(PREFIX)/lib; \
++		cp $(FLINT_LIB) $(DESTDIR)$(PREFIX)/$(LIBDIR); \
+ 	fi
+ 	$(AT)if [ "$(FLINT_STATIC)" -eq "1" ]; then \
+-		cp libflint.a $(DESTDIR)$(PREFIX)/lib; \
++		cp libflint.a $(DESTDIR)$(PREFIX)/$(LIBDIR); \
+ 	fi
+ 	cp $(HEADERS) $(DESTDIR)$(PREFIX)/include/flint
+ 	$(AT)if [ ! -z $(EXT_HEADERS) ]; then \
+-- 
+1.9.3
+
diff --git a/sci-mathematics/flint/files/flint-2.4.3-whitespaces.patch b/sci-mathematics/flint/files/flint-2.4.3-whitespaces.patch
new file mode 100644
index 000000000000..3d63aedeab3c
--- /dev/null
+++ b/sci-mathematics/flint/files/flint-2.4.3-whitespaces.patch
@@ -0,0 +1,54 @@
+From 3506d617ef9dfc5184aa99be05a25e4f73d6c3f6 Mon Sep 17 00:00:00 2001
+From: hasufell <hasufell@hasufell.de>
+Date: Sun, 18 May 2014 18:47:27 +0200
+Subject: [PATCH] Quote variables that could contain whitespaces
+
+Make does NOT take care of this in this context. It's
+not a variable assignment and installation would fail
+if DESTDIR contains any whitespace.
+---
+ Makefile.in | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index b6ea4c9..a522ac1 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -171,23 +171,23 @@ else
+ endif
+ 
+ install: library
+-	mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR)
+-	mkdir -p $(DESTDIR)$(PREFIX)/include/flint
++	mkdir -p "$(DESTDIR)$(PREFIX)/$(LIBDIR)"
++	mkdir -p "$(DESTDIR)$(PREFIX)/include/flint"
+ 	$(AT)if [ "$(FLINT_SHARED)" -eq "1" ]; then \
+-		cp $(FLINT_LIB) $(DESTDIR)$(PREFIX)/$(LIBDIR); \
++		cp $(FLINT_LIB) "$(DESTDIR)$(PREFIX)/$(LIBDIR)"; \
+ 	fi
+ 	$(AT)if [ "$(FLINT_STATIC)" -eq "1" ]; then \
+-		cp libflint.a $(DESTDIR)$(PREFIX)/$(LIBDIR); \
++		cp libflint.a "$(DESTDIR)$(PREFIX)/$(LIBDIR)"; \
+ 	fi
+-	cp $(HEADERS) $(DESTDIR)$(PREFIX)/include/flint
++	cp $(HEADERS) "$(DESTDIR)$(PREFIX)/include/flint"
+ 	$(AT)if [ ! -z $(EXT_HEADERS) ]; then \
+-		cp $(EXT_HEADERS) $(DESTDIR)$(PREFIX)/include/flint; \
++		cp $(EXT_HEADERS) "$(DESTDIR)$(PREFIX)/include/flint"; \
+ 	fi
+-	mkdir -p $(DESTDIR)$(FLINT_CPIMPORT_DIR)
+-	cp qadic/CPimport.txt $(DESTDIR)$(FLINT_CPIMPORT_DIR)
+-	mkdir -p $(DESTDIR)$(PREFIX)/include/flint/flintxx
+-	cp flintxx/*.h $(DESTDIR)$(PREFIX)/include/flint/flintxx
+-	cp *xx.h $(DESTDIR)$(PREFIX)/include/flint
++	mkdir -p "$(DESTDIR)$(FLINT_CPIMPORT_DIR)"
++	cp qadic/CPimport.txt "$(DESTDIR)$(FLINT_CPIMPORT_DIR)"
++	mkdir -p "$(DESTDIR)$(PREFIX)/include/flint/flintxx"
++	cp flintxx/*.h "$(DESTDIR)$(PREFIX)/include/flint/flintxx"
++	cp *xx.h "$(DESTDIR)$(PREFIX)/include/flint"
+ 
+ build:
+ 	mkdir -p build
+-- 
+1.9.3
+
diff --git a/sci-mathematics/flint/flint-2.4.3.ebuild b/sci-mathematics/flint/flint-2.4.3.ebuild
new file mode 100644
index 000000000000..a78c90be73d1
--- /dev/null
+++ b/sci-mathematics/flint/flint-2.4.3.ebuild
@@ -0,0 +1,62 @@
+# 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.3.ebuild,v 1.1 2014/05/18 17:58:55 hasufell Exp $
+
+EAPI="5"
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Fast Library for Number Theory"
+HOMEPAGE="http://www.flintlib.org/"
+SRC_URI="http://www.flintlib.org/${P}.tar.gz"
+
+RESTRICT="mirror"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gc ntl static-libs test"
+
+RDEPEND="dev-libs/gmp
+	dev-libs/mpfr
+	gc? ( dev-libs/boehm-gc )
+	ntl? ( dev-libs/ntl )"
+DEPEND="${RDEPEND}
+	doc? ( app-text/texlive-core )"
+
+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
+}
+
+src_configure() {
+	./configure \
+		--prefix="${EPREFIX}/usr" \
+		--with-gmp="${EPREFIX}/usr" \
+		--with-mpfr="${EPREFIX}/usr" \
+		$(usex ntl "--with-ntl=${EPREFIX}/usr" "") \
+		$(use_enable static-libs static) \
+		$(usex gc "--with-gc=${EPREFIX}/usr" "") \
+		CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) \
+		AR=$(tc-getAR) \
+		|| die
+}
+
+src_compile() {
+	emake verbose
+
+	if use doc ; then
+		emake -C doc/latex
+	fi
+}
+
+src_test() {
+	emake AT= QUIET_CC= QUIET_CXX= QUIET_AR= check
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install
+	einstalldocs
+	use doc && dodoc doc/latex/flint-manual.pdf
+}
diff --git a/sci-mathematics/flint/metadata.xml b/sci-mathematics/flint/metadata.xml
index 24cbb90cf0c4..a9f94773995a 100644
--- a/sci-mathematics/flint/metadata.xml
+++ b/sci-mathematics/flint/metadata.xml
@@ -5,4 +5,9 @@
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
+	<use>
+		<flag name='gc'>Enable garbage collection
+			support via <pkg>dev-libs/boehm-gc</pkg></flag>
+		<flag name='ntl'>Build NTL interface</flag>
+	</use>
 </pkgmetadata>