sci-libs/openlibm: Updated patches with new upstream

Package-Manager: portage-2.2.01.22124-prefix

5 files changed, 34 insertions, 16 deletions

diff --git a/sci-libs/openlibm/ChangeLog b/sci-libs/openlibm/ChangeLog
index 801309400..244b38004 100644
--- a/sci-libs/openlibm/ChangeLog
+++ b/sci-libs/openlibm/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Jul 2013; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/openlibm-extras-soname.patch, -files/openlibmextras-soname.patch,
+  files/openlibm-respect-toolchain.patch, files/openlibm-soname.patch,
+  openlibm-9999.ebuild:
+  sci-libs/openlibm: Updated patches with new upstream
+
 *openlibm-9999 (03 Mar 2013)
 
   03 Mar 2013; Sébastien Fabbro <bicatali@gentoo.org>
diff --git a/sci-libs/openlibm/files/openlibmextras-soname.patch b/sci-libs/openlibm/files/openlibm-extras-soname.patch
index 7ee69a2ba..7ee69a2ba 100644
--- a/sci-libs/openlibm/files/openlibmextras-soname.patch
+++ b/sci-libs/openlibm/files/openlibm-extras-soname.patch
diff --git a/sci-libs/openlibm/files/openlibm-respect-toolchain.patch b/sci-libs/openlibm/files/openlibm-respect-toolchain.patch
index 687c8b71d..365aa17ec 100644
--- a/sci-libs/openlibm/files/openlibm-respect-toolchain.patch
+++ b/sci-libs/openlibm/files/openlibm-respect-toolchain.patch
@@ -1,30 +1,42 @@
---- Make.inc.orig	2013-07-02 22:11:50.789319117 -0400
-+++ Make.inc	2013-07-02 22:15:03.526313473 -0400
-@@ -2,24 +2,15 @@
+--- Make.inc.orig	2013-07-16 15:50:21.227405299 -0700
++++ Make.inc	2013-07-16 15:52:17.539087715 -0700
+@@ -2,26 +2,18 @@
  
  OS := $(shell uname)
  
 -FC = gfortran
 -FFLAGS += -O3
++FC := gfortran
  
 -USEGCC = 1
 -USECLANG = 0
+ 
+-ifeq ($(OS), Darwin)
+-USEGCC = 0
+-USECLANG = 1
+-endif
 -
--
+-AR = ar
++AR := ar
+ 
 -ifeq ($(USECLANG),1)
--USEGCC = 0
--CC = clang
 +ifneq (,$(findstring clang,$(CC)))
+ USEGCC = 0
+ CC = clang
  CFLAGS_add += -fno-builtin
  endif
  
 -ifeq ($(USEGCC),1)
--CC = gcc
 +ifneq (,$(findstring gcc,$(CC)))
+ CC = gcc
  CFLAGS_add += -fno-gnu89-inline
  endif
--AR = ar
-+AR = :ar
+@@ -31,7 +23,7 @@
+ $(error "the mingw32 compiler you are using fails the openblas testsuite. please see the Julia README.windows.md document for a replacement")
+ endif
+ 
+-CFLAGS_add += -std=c99 -Wall -O3 -I$(OPENLIBM_HOME) -I$(OPENLIBM_HOME)/include -I$(OPENLIBM_HOME)/ld80 -I$(OPENLIBM_HOME)/$(ARCH) -I$(OPENLIBM_HOME)/src -DASSEMBLER -D__BSD_VISIBLE -Wno-implicit-function-declaration
++CFLAGS_add += -std=c99 -Wall -I$(OPENLIBM_HOME) -I$(OPENLIBM_HOME)/include -I$(OPENLIBM_HOME)/ld80 -I$(OPENLIBM_HOME)/$(ARCH) -I$(OPENLIBM_HOME)/src -DASSEMBLER -D__BSD_VISIBLE -Wno-implicit-function-declaration
+ 
+ default: all
  
- ARCH := $(shell $(CC) -dumpmachine | sed "s/\([^-]*\).*$$/\1/")
- ifeq ($(ARCH),mingw32)
diff --git a/sci-libs/openlibm/files/openlibm-soname.patch b/sci-libs/openlibm/files/openlibm-soname.patch
index b30caed48..8852e0aef 100644
--- a/sci-libs/openlibm/files/openlibm-soname.patch
+++ b/sci-libs/openlibm/files/openlibm-soname.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2013-03-03 09:41:33.534481539 -0800
-+++ Makefile	2013-03-03 10:00:21.008239835 -0800
+--- Makefile.orig	2013-07-16 15:55:33.481244590 -0700
++++ Makefile	2013-07-16 15:56:15.535491859 -0700
 @@ -26,7 +26,7 @@
  libopenlibm.a: $(OBJS)  
  	$(AR) -rcs libopenlibm.a $(OBJS)
diff --git a/sci-libs/openlibm/openlibm-9999.ebuild b/sci-libs/openlibm/openlibm-9999.ebuild
index 434c252ce..14f6b9606 100644
--- a/sci-libs/openlibm/openlibm-9999.ebuild
+++ b/sci-libs/openlibm/openlibm-9999.ebuild
@@ -22,9 +22,9 @@ DEPEND="${RDEPEND}"
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}/${PN}-respect-toolchain.patch" \
-		"${FILESDIR}/${PN}-soname.patch" \
-		"${FILESDIR}/${PN}extras-soname.patch"
+		"${FILESDIR}"/${PN}-respect-toolchain.patch \
+		"${FILESDIR}"/${PN}-soname.patch \
+		"${FILESDIR}"/${PN}-extras-soname.patch
 }
 
 src_compile() {