Fixed sandbox violation (bug #486690, thanks Joseph Booker), add missing link for shared lib

(Portage version: 2.2.8-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

3 files changed, 30 insertions, 13 deletions

diff --git a/sci-astronomy/funtools/ChangeLog b/sci-astronomy/funtools/ChangeLog
index 05b8c8821dc4..946606feabda 100644
--- a/sci-astronomy/funtools/ChangeLog
+++ b/sci-astronomy/funtools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-astronomy/funtools
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/funtools/ChangeLog,v 1.10 2014/02/23 20:18:40 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/funtools/ChangeLog,v 1.11 2014/03/04 16:48:24 bicatali Exp $
+
+*funtools-1.4.4-r4 (04 Mar 2014)
+
+  04 Mar 2014; Sébastien Fabbro <bicatali@gentoo.org> +funtools-1.4.4-r4.ebuild,
+  -funtools-1.4.4-r3.ebuild, files/funtools-1.4.4-makefiles.patch:
+  Fixed sandbox violation (bug #486690, thanks Joseph Booker), add missing link
+  for shared lib
 
 *funtools-1.4.4-r3 (23 Feb 2014)
 
diff --git a/sci-astronomy/funtools/files/funtools-1.4.4-makefiles.patch b/sci-astronomy/funtools/files/funtools-1.4.4-makefiles.patch
index 43306cee355f..d1045b643176 100644
--- a/sci-astronomy/funtools/files/funtools-1.4.4-makefiles.patch
+++ b/sci-astronomy/funtools/files/funtools-1.4.4-makefiles.patch
@@ -1,6 +1,6 @@
 diff -Nur funtools-1.4.4.orig/filter/Makefile.in funtools-1.4.4/filter/Makefile.in
---- funtools-1.4.4.orig/filter/Makefile.in	2013-07-08 14:28:30.169439760 -0700
-+++ funtools-1.4.4/filter/Makefile.in	2013-07-08 14:29:44.026841106 -0700
+--- funtools-1.4.4.orig/filter/Makefile.in	2014-03-04 08:35:59.665478514 -0800
++++ funtools-1.4.4/filter/Makefile.in	2014-03-04 08:36:38.196760766 -0800
 @@ -29,6 +29,9 @@
  
  prefix =		@prefix@
@@ -33,7 +33,7 @@ diff -Nur funtools-1.4.4.orig/filter/Makefile.in funtools-1.4.4/filter/Makefile.
  
  # wcs files are in the wcs subdirectory
 -WCS_INC =		-I../wcs
-+WCS_INC =		-I/usr/include/wcs
++#WCS_INC =		-I../wcs
  #WCS_LIBS =		-L../wcs -lwcs
  
  # extra includes for compiling
@@ -58,8 +58,8 @@ diff -Nur funtools-1.4.4.orig/filter/Makefile.in funtools-1.4.4/filter/Makefile.
  
  events_c.h:	evfilter.c inc.sed
 diff -Nur funtools-1.4.4.orig/fitsy/Makefile.in funtools-1.4.4/fitsy/Makefile.in
---- funtools-1.4.4.orig/fitsy/Makefile.in	2013-07-08 14:28:30.147439547 -0700
-+++ funtools-1.4.4/fitsy/Makefile.in	2013-07-08 14:29:44.026841106 -0700
+--- funtools-1.4.4.orig/fitsy/Makefile.in	2014-03-04 08:35:59.638478312 -0800
++++ funtools-1.4.4/fitsy/Makefile.in	2014-03-04 08:36:38.197760773 -0800
 @@ -28,6 +28,11 @@
  
  prefix =		@prefix@
@@ -99,8 +99,8 @@ diff -Nur funtools-1.4.4.orig/fitsy/Makefile.in funtools-1.4.4/fitsy/Makefile.in
  		else true; \
  		fi; \
 diff -Nur funtools-1.4.4.orig/gnu/Makefile.in funtools-1.4.4/gnu/Makefile.in
---- funtools-1.4.4.orig/gnu/Makefile.in	2013-07-08 14:28:30.151439619 -0700
-+++ funtools-1.4.4/gnu/Makefile.in	2013-07-08 14:29:44.026841106 -0700
+--- funtools-1.4.4.orig/gnu/Makefile.in	2014-03-04 08:35:59.642478341 -0800
++++ funtools-1.4.4/gnu/Makefile.in	2014-03-04 08:36:38.197760773 -0800
 @@ -21,6 +21,11 @@
  
  prefix =		@prefix@
@@ -131,8 +131,8 @@ diff -Nur funtools-1.4.4.orig/gnu/Makefile.in funtools-1.4.4/gnu/Makefile.in
  # There are just too many different versions of "install" around;
  # better to use the install-sh script that comes with the distribution,
 diff -Nur funtools-1.4.4.orig/Makefile.in funtools-1.4.4/Makefile.in
---- funtools-1.4.4.orig/Makefile.in	2013-07-08 14:28:30.170439766 -0700
-+++ funtools-1.4.4/Makefile.in	2013-07-08 15:49:21.427756907 -0700
+--- funtools-1.4.4.orig/Makefile.in	2014-03-04 08:35:59.665478514 -0800
++++ funtools-1.4.4/Makefile.in	2014-03-04 08:37:40.214224788 -0800
 @@ -28,28 +28,33 @@
  
  prefix =		@prefix@
@@ -233,6 +233,15 @@ diff -Nur funtools-1.4.4.orig/Makefile.in funtools-1.4.4/Makefile.in
  		(cd $(PACKAGE)tmp && ar x ../$(LIB) && ar x ../libtclfun.a); \
  		CC='$(CC)' CXX='$(CXX)' \
  		./mklib -o tclfun $(PACKAGE)tmp/*.o; \
+@@ -386,7 +391,7 @@
+ 		@for dir in $(SUBDIRS); do \
+ 		   echo " "; \
+ 		   echo Installing in $$dir ...; \
+-		   (cd $$dir; $(MAKE) $@) ; \
++		   (cd $$dir; $(MAKE) INSTALL_ROOT=$(INSTALL_ROOT) INCLUDE_INSTALL_DIR=$(INCLUDE_INSTALL_DIR) $@) ; \
+ 		done
+ 
+ install::	install-man
 @@ -422,7 +427,7 @@
  	    do \
  	    if [ ! -d $$i ] ; then \
@@ -261,8 +270,8 @@ diff -Nur funtools-1.4.4.orig/Makefile.in funtools-1.4.4/Makefile.in
  		    else true; \
  		fi; \
 diff -Nur funtools-1.4.4.orig/util/Makefile.in funtools-1.4.4/util/Makefile.in
---- funtools-1.4.4.orig/util/Makefile.in	2013-07-08 14:28:30.160439699 -0700
-+++ funtools-1.4.4/util/Makefile.in	2013-07-08 14:29:44.026841106 -0700
+--- funtools-1.4.4.orig/util/Makefile.in	2014-03-04 08:35:59.653478425 -0800
++++ funtools-1.4.4/util/Makefile.in	2014-03-04 08:36:38.197760773 -0800
 @@ -29,6 +29,11 @@
  
  prefix =		@prefix@
diff --git a/sci-astronomy/funtools/funtools-1.4.4-r3.ebuild b/sci-astronomy/funtools/funtools-1.4.4-r4.ebuild
index 362d5a20a4db..654ae1fd25d9 100644
--- a/sci-astronomy/funtools/funtools-1.4.4-r3.ebuild
+++ b/sci-astronomy/funtools/funtools-1.4.4-r4.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-astronomy/funtools/funtools-1.4.4-r3.ebuild,v 1.1 2014/02/23 20:18:40 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/funtools/funtools-1.4.4-r4.ebuild,v 1.1 2014/03/04 16:48:24 bicatali Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs multilib autotools
@@ -53,6 +53,7 @@ src_compile() {
 
 src_install () {
 	default
+	dosym libtclfun.so.1 /usr/$(get_libdir)/libtclfun.so
 	# install missing includes
 	insinto /usr/include/funtools/fitsy
 	doins fitsy/*.h