Fixed for R as-needed and for prefix

(Portage version: 2.2.01.20796-prefix/cvs/Linux x86_64)

3 files changed, 58 insertions, 5 deletions

diff --git a/sci-libs/shogun/ChangeLog b/sci-libs/shogun/ChangeLog
index a64a2f382805..a222d3e00229 100644
--- a/sci-libs/shogun/ChangeLog
+++ b/sci-libs/shogun/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/shogun
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/shogun/ChangeLog,v 1.3 2012/07/24 13:50:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/shogun/ChangeLog,v 1.4 2012/08/04 20:51:03 bicatali Exp $
+
+  04 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/shogun-1.1.0-as-needed.patch, shogun-1.1.0.ebuild:
+  Fixed for R as-needed and for prefix
 
   24 Jul 2012; Justin Lecher <jlec@gentoo.org> shogun-1.1.0.ebuild,
   metadata.xml:
diff --git a/sci-libs/shogun/files/shogun-1.1.0-as-needed.patch b/sci-libs/shogun/files/shogun-1.1.0-as-needed.patch
new file mode 100644
index 000000000000..5d365472c2ce
--- /dev/null
+++ b/sci-libs/shogun/files/shogun-1.1.0-as-needed.patch
@@ -0,0 +1,48 @@
+diff -Nur src.orig/configure src/configure
+--- src.orig/configure	2012-08-04 12:58:58.230092977 -0700
++++ src/configure	2012-08-04 13:30:14.441859756 -0700
+@@ -4470,7 +4470,8 @@
+ 				COMPFLAGS_C_R="$COMPFLAGS_C_R `R CMD config CPICFLAGS`"
+ 				COMPFLAGS_CPP_R="$COMPFLAGS_CPP_R `R CMD config CXXPICFLAGS`"
+ 				INCLUDES_R="$INCLUDES_R `R CMD config --cppflags`"
+-				LINKFLAGS_R="$LINKFLAGS_R `R CMD config --ldflags` `R CMD config DYLIB_LDFLAGS`"
++				PRELINKFLAGS_R="$PRELINKFLAGS_R `R CMD config DYLIB_LDFLAGS`"
++				LINKFLAGS_R="$LINKFLAGS_R `R CMD config --ldflags`"
+ 			fi
+ 
+ 
+diff -Nur src.orig/Makefile.template src/Makefile.template
+--- src.orig/Makefile.template	2012-08-04 12:58:58.229092986 -0700
++++ src/Makefile.template	2012-08-04 13:00:21.340525955 -0700
+@@ -515,7 +515,7 @@
+ else
+ $(TEMPLATE_TARGET): .depend $(OBJFILES) $(SRCFILES) $(HEADERFILES) $(OTHERDEPS)
+ 	$(LINK) $(PRELINKFLAGS) $(shell find $(SRCDIR) -name "*.$(EXT_OBJ_CPP)" -o \
+-		-name "*.$(EXT_OBJ_C)" 2>/dev/null) $(LINKFLAGS) -o $@ $(POSTLINKFLAGS)
++		-name "*.$(EXT_OBJ_C)" 2>/dev/null) $(LINKFLAGS) $(POSTLINKFLAGS) -o $@
+ 	@$(POSTLINKCMD) $@
+ 	@$(LIBSYMLINKCMD)
+ endif
+@@ -530,18 +530,18 @@
+ 		($(LIBRARY_PATH)=$(CONFIGPATH)/../shogun R --no-save)
+ 
+ $(PRE_LIB_SWIG_TEMPLATE)%${EXT_LIB_SWIG_TEMPLATE}:	%$(EXT_OBJ_SWIG)
+-	$(LINK) $(LINKFLAGS) -o $@ $^ $(POSTLINKFLAGS)
++	$(LINK) $(LINKFLAGS) $^ $(POSTLINKFLAGS) -o $@
+ 
+ %${EXT_OBJ_SWIG}:	%$(EXT_SRC_SWIG)
+-	$(COMP_CPP) $(COMPFLAGS_SWIG_CPP) $(DEFINES) -c $(INCLUDES) -o $@ $<
++	$(COMP_CPP) $(COMPFLAGS_SWIG_CPP) $(DEFINES) -c $(INCLUDES) $< -o $@
+ 
+ %.$(EXT_OBJ_CPP):	%.$(EXT_SRC_CPP)
+-	$(COMP_CPP) $(COMPFLAGS_CPP) $(DEFINES) -c $(INCLUDES) -o $@ $<
++	$(COMP_CPP) $(COMPFLAGS_CPP) $(DEFINES) -c $(INCLUDES) $< -o $@
+ 	@test -f $*.$(EXT_CPP_TMP) && test "$(SRCDIR)" != "." \
+ 	  && rm -f $< || true
+ 
+ %.$(EXT_OBJ_C):	%.$(EXT_SRC_C)
+-	$(COMP_C) $(COMPFLAGS_C) $(DEFINES) -c $(INCLUDES) -o $@ $<
++	$(COMP_C) $(COMPFLAGS_C) $(DEFINES) -c $(INCLUDES) $< -o $@
+ 
+ %.$(EXT_SRC_CPP): %.$(EXT_CPP_TMP) %.$(EXT_CPP_SH) $(HEADERFILES)
+ 	@echo "generating $@ from $*.$(EXT_CPP_TMP) by running $*.$(EXT_CPP_SH)"
diff --git a/sci-libs/shogun/shogun-1.1.0.ebuild b/sci-libs/shogun/shogun-1.1.0.ebuild
index 1fc70df921e2..0ce734dccaa0 100644
--- a/sci-libs/shogun/shogun-1.1.0.ebuild
+++ b/sci-libs/shogun/shogun-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/shogun/shogun-1.1.0.ebuild,v 1.3 2012/07/24 13:50:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/shogun/shogun-1.1.0.ebuild,v 1.4 2012/08/04 20:51:03 bicatali Exp $
 
 EAPI=4
 
@@ -17,7 +17,7 @@ SRC_URI="ftp://shogun-toolbox.org/shogun/releases/${MYPV}/sources/${P}.tar.bz2
 
 LICENSE="GPL-3 free-noncomm"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="arpack bzip2 doc examples glpk gzip hdf5 json lapack lpsolve mono lua lzma
 	lzo java R ruby	octave python readline snappy static-libs superlu test xml"
 
@@ -58,7 +58,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-respect-ldflags.patch \
 		"${FILESDIR}"/${P}-test-snappy.patch \
-		"${FILESDIR}"/${P}-test-readline.patch
+		"${FILESDIR}"/${P}-test-readline.patch \
+		"${FILESDIR}"/${P}-as-needed.patch
 
 	# dist-packages is only for debian
 	# remove exagarated optimizations (-O9 does not exist...)
@@ -134,7 +135,7 @@ src_compile() {
 src_test() {
 	use lapack || return
 	ln -s ../../${MYPD}/* ../data/
-	emake DESTDIR="${D}" install
+	emake DESTDIR="${ED}" install
 	# disable because very long and buggy dynamic paths (assumed install)
 	# emake tests
 	emake -C shogun check-examples