Fixed for R as-needed and for prefix

Package-Manager: portage-2.2.01.20796-prefix/cvs/Linux x86_64

4 files changed, 65 insertions, 12 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/Manifest b/sci-libs/shogun/Manifest
index 3abc58c3294c..b742211ffb7b 100644
--- a/sci-libs/shogun/Manifest
+++ b/sci-libs/shogun/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX shogun-1.1.0-as-needed.patch 2137 SHA256 de8bb8e6f42873b0fbc3c4f816869684b93d0ecceb6ea6db7c77e9e86bf79617 SHA512 c755d1f557eecd433ff8b2394ebb5d9687a5482ea081f2c9dd174492f5ab24f5bc4d50665491f40dbc01f8db1c6f5eec63c2e869f3f1ee3395e6587b227ef57a WHIRLPOOL 22421d20f345e3a8141d76fd6e0beebee32c9e1a0006f95331a3aaa2ef1736ddc18e5b0e3996ce42d0e9a540c8a91356832c7f84d6889edcb438769117a1f758
 AUX shogun-1.1.0-respect-ldflags.patch 332 SHA256 596e37d9bac7904808cf5cd58221f97f3ce3e583aed58697b4a4f995c9dd0eff SHA512 496a5dfd0da302fd333651e6e363bd01ecc6dcc6ec06f2589f8dc3d42999936817f41144f9814717d311e47611a31b2cb57bee7d46df30ea20c8afe909f5f376 WHIRLPOOL c7d3701e573be10157432352263df70905c4f720d7767361487742bcb925c25cb39d4252f165db4368d0599079756907192b28f7237be1f13a3564cc910ac7cf
 AUX shogun-1.1.0-test-readline.patch 352 SHA256 a8e0ecc78bf702bdfb8193fc94abd7745e8bfcee0fe1e6b4ba5efeac4c6df0cc SHA512 6963b8e66361b02b894d48e5b8b2dbc15b4569947ba5be7db56c4aeff142f2c949583cfbbc713cc5900815072e80999dd804f8a342011247b34c7ac30db0fd86 WHIRLPOOL f22f31a231a56f4d805539388ae96e4742f7bf99a0a49887daefad14bb1d13454e800050528df48b5bed0e5db51dd9d867812e148ec4e5533fd8b19758541bdf
 AUX shogun-1.1.0-test-snappy.patch 506 SHA256 ef0489b05cd1dd494c4a9b5070277dbd7733b920cfcf045e87d6abcbd871f01f SHA512 04b4f29ec7d23377fb31474c9ef9c7d243b8ed9ef8e81c6340462763a4dc6ac6361c4e067d680089192ccd5bf5d50ffc2fca6087d74e17341c9b4ae858851096 WHIRLPOOL 302365d7ecd2ed235536a886a3ff1d2834bf51885e4acd4dd0d2a581e8776c7cdcee8632a8470c6b2df969df7fe0cba1d5574c7c870323a866825a0235eb0b76
 DIST shogun-1.1.0.tar.bz2 3485714 SHA256 9f69638f0bc18995358c38cd6eed6437e6b90c1fceab7c6e64c9739b7e6cc40b SHA512 853168e3d68ad02ef543391b78c51682d004af46acddfa09a76b41e373e27199fc9be0598892207e116a82f24437e3f1c0dc97c3e28ca32879594fbe112bd157 WHIRLPOOL dd044ff2cc9fd9376b80f1efd9bbcf901b11765a2f85eb2325ddd640ea547e513df8c9da548634e49758ef124147666f86b6b4082e118c6d35ef2d5010527cf9
-DIST shogun-data-0.3.tar.bz2 126676026 SHA256 34272e3f5e6b6989a4941b925ab3a9cd1525d73180681884e948a673aff4ef89
-EBUILD shogun-1.1.0.ebuild 4405 SHA256 37d1057c9e2d89f808e019b51debcbb7cdd394a3ccef7e66b54c56cca9299b9f SHA512 9d995554d95e09bcff65dcdb26d9f74729c7f3e6f1ea7e1bca869e66a651abc4c5c7c0ebfe3c2d45b9ff15385afa680877a3c0a29c8b59f5debe92eea9b14808 WHIRLPOOL 74159247b6bb9a9e396081bbc6498ca1431260dcd75a3fc5ef911a14f46287e6043bd0578a998cdc60fe76cce875eef57d6a7bc87cd1adb51af1828c489b5810
-MISC ChangeLog 733 SHA256 380620b1f58874f6e367df82a3aa6e9cf4dec055e153517f15854f8a3464a0a8 SHA512 23da86f101ea796d5ad44b90234f506047ca43f94340c3f7aa5608ea58c22e7b8df829f0d52bc0afddb10263a7677562cd8e341e10e6f31eedc8ef71820d2ac9 WHIRLPOOL 0de057b4777249da09a56ed133b52638b0fd06a37babfa8e7425d6ee30b1057febbad40afa2a12a6203365e73572fa295c433ff4e739ab656732d33341f100cf
+DIST shogun-data-0.3.tar.bz2 126676026 SHA256 34272e3f5e6b6989a4941b925ab3a9cd1525d73180681884e948a673aff4ef89 SHA512 92c7e7dae1df5a7a79428a7f2116b1d9d825a37d4145edfdff1fb7b707853eab19ffe848c4ae2bc2338a93373e78c7cae4087df260411a9576b031e7a6f0de95 WHIRLPOOL 24987580c967b05e61ee5402fe30701cabe17d7ffb29b4966ff0abd0d03e197b928f018e617e254395c6939f93de3e397f5ce7df7c3d4ae7dfe4e782c345fe85
+EBUILD shogun-1.1.0.ebuild 4473 SHA256 78e015441f117b9b18d5a8ae3841d8667e1e5275f75ddcd5e58eba1d27e0c0cd SHA512 07adc8d587b7bd7e5bb57786bfcf4bebe26aebeb58a7b01d5294ada09680219571cffd5de76925cb8d7be72f1a073b1d5d4c7e14c72f1df40f4df5b23aed6562 WHIRLPOOL f48d1a713d168a78b98e09b8843ff2a30ef2d6d7cdd0e0a8f8bb632700943000b00d9308756da245bef395261a33440822d65c2d49fc68c8500e3c3ca65c5e81
+MISC ChangeLog 892 SHA256 b6547b52e2dca4365f4aa720da1a86d1377832f6bf4456b15399e61ced59fdb7 SHA512 9321f8ae8df4ed2b633b3d6a4daf5e824e022df11935a43ca988aceb4e1334c3ab32c5671beafb44a84baede014e23e66d792fd85b25a0adab9903755157f23a WHIRLPOOL 6c6c95dd432c8782ded5f1f7f71fdefce45fbe1b91823ce4c3ddb4ede403afc7047994e45f7c38be466d747105c35ed94e8af773cb7d8d41a83d089925f62459
 MISC metadata.xml 1932 SHA256 5a222b0b62edcd5ca620cd4df8c2349ff8924bfb1f649a431ee76b33e48f2767 SHA512 347aa7c3f9fc374853c8159c1d58d627000b144e8d9ce30fdcfc9d30d3420bd2fcd1b40271e2bc6d5f72be3874cf6fbe141c22217219e8f1ea755d218feaf4ea WHIRLPOOL 802af86128b6ab125b5e5c02022d03d64525d1ccd3c114f5a9896aa28ceaf5e2bc1cc1566c0318e10b19d5702b5502341711bf8767d995ed48b40cbd380c4645
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
 
-iEYEAREIAAYFAlAOqCMACgkQgAnW8HDreRYoswCfexTAzHfQD/9Kg+SebTqRUGOd
-PrUAnjMvOvURKa1H2Tx/exz6WM3B9N1q
-=bGXa
+iEYEAREIAAYFAlAdi0IACgkQ1ycZbhPLE2Bg4ACfa2x4W5CcJ9DVviyyf/YC77G2
+2jYAnjDNWYE1M4OLhHdz4og0cysJ2RtX
+=fp6n
 -----END PGP SIGNATURE-----
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