Fix build system to split LDFLAGS and LIBS so the --as-needed linker option is full respected for all linked libs.

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

3 files changed, 394 insertions, 1 deletions

diff --git a/media-gfx/gmic/ChangeLog b/media-gfx/gmic/ChangeLog
index 41fb34a1ca00..9aa5c327067e 100644
--- a/media-gfx/gmic/ChangeLog
+++ b/media-gfx/gmic/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/gmic
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.50 2014/06/16 06:37:59 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.51 2014/06/16 07:46:39 radhermit Exp $
+
+*gmic-1.5.9.2-r1 (16 Jun 2014)
+
+  16 Jun 2014; Tim Harder <radhermit@gentoo.org> +gmic-1.5.9.2-r1.ebuild,
+  +files/gmic-1.5.9.2-makefile.patch:
+  Fix build system to split LDFLAGS and LIBS so the --as-needed linker option
+  is full respected for all linked libs.
 
 *gmic-1.5.9.2 (16 Jun 2014)
 
diff --git a/media-gfx/gmic/files/gmic-1.5.9.2-makefile.patch b/media-gfx/gmic/files/gmic-1.5.9.2-makefile.patch
new file mode 100644
index 000000000000..6a7d99dc5146
--- /dev/null
+++ b/media-gfx/gmic/files/gmic-1.5.9.2-makefile.patch
@@ -0,0 +1,313 @@
+--- gmic-1.5.9.2/src/Makefile
++++ gmic-1.5.9.2/src/Makefile
+@@ -77,10 +77,9 @@
+ 
+ # Flags that are mandatory to compile 'gmic'.
+ MANDATORY_CFLAGS += -Dgmic_build -I$(USR)/include
+-MANDATORY_LDFLAGS += -L$(USR)/lib
+ ifeq ($(CC),g++)
+ MANDATORY_CFLAGS += -Wall -W
+-MANDATORY_LDFLAGS += -lm
++MANDATORY_LIBS = -lm
+ endif
+ MANDATORY_CFLAGS+=$(IS_BETA_CFLAGS)
+ ifeq ($(OS),Unix)
+@@ -108,7 +107,7 @@
+ ifneq ($(OS),Darwin)
+ PARALLEL_CFLAGS = -Dgmic_is_parallel
+ ifneq ($(OSTYPE),msys)
+-PARALLEL_LDFLAGS = -lpthread
++PARALLEL_LIBS = -lpthread
+ endif
+ endif
+ 
+@@ -121,98 +120,92 @@
+ # (keep /usr/ dirname here since X11 is located in /usr/ on Mac too).
+ # This requires the presence of the X11 include and library files.
+ # (package 'libx11-dev' on Debian).
+-X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include #-Dcimg_use_xrandr
+-X11_LDFLAGS = -L/usr/X11R6/lib -lX11 -lpthread #-lXrandr
++X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" #-Dcimg_use_xrandr
++X11_LIBS = -lX11 -lpthread #-lXrandr
+ 
+ # Flags to enable fast display, using XShm.
+ # This requires the presence of the X11 extension include and library files.
+ # (package 'libx11-dev' on Debian).
+ XSHM_CFLAGS = -Dcimg_use_xshm
+-XSHM_LDFLAGS = -L$(USR)/X11R6/lib -lXext
++XSHM_LIBS = -lXext
+ 
+ # Flags to enable image display, using GDI32.
+ # This requires the presence of the GDI32 include and library files.
+ GDI32_CFLAGS = -Dcimg_display=2 -Dcimg_appname=\\\"gmic\\\"
+-GDI32_LDFLAGS = -lgdi32
++GDI32_LIBS = -lgdi32
+ 
+ # Flags to enable native support for PNG image files, using the PNG library.
+ # This requires the presence of the libpng include and library files.
+ # (package 'libpng12-dev' on Debian).
+ PNG_CFLAGS = -Dcimg_use_png
+-PNG_LDFLAGS = -lpng -lz
++PNG_LIBS = -lpng -lz
+ 
+ # Flags to enable native support for JPEG image files, using the JPEG library.
+ # This requires the presence of the libjpeg include and library files.
+ # (package 'libjpeg62-dev' on Debian).
+ JPEG_CFLAGS = -Dcimg_use_jpeg
+-JPEG_LDFLAGS = -ljpeg
++JPEG_LIBS = -ljpeg
+ 
+ # Flags to enable native support for TIFF image files, using the TIFF library.
+ # This requires the presence of the libtiff include and library files.
+ # (package 'libtiff4-dev' on Debian).
+ TIFF_CFLAGS = -Dcimg_use_tiff
+-TIFF_LDFLAGS = -ltiff
++TIFF_LIBS = -ltiff
+ 
+ # Flags to enable native support for MINC2 image files, using the MINC2 library.
+ # ( http://en.wikibooks.org/wiki/MINC/Reference/MINC2.0_Users_Guide )
+ # (package 'libminc-dev' on Debian).
+ MINC2_CFLAGS = -Dcimg_use_minc2 -I${HOME}/local/include
+-MINC2_LDFLAGS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz -L${HOME}/local/lib
++MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz -L${HOME}/local/lib
+ 
+ # Flags to enable native support for various video files, using the FFMPEG library.
+ # This requires the presence of the FFMPEG include and library files.
+ # (packages 'libavcodec-dev', 'libavutil-dev', 'libavformat-dev' and 'libswscale-dev' on Debian).
+ FFMPEG_CFLAGS = -Dcimg_use_ffmpeg -D__STDC_CONSTANT_MACROS -I$(USR)/include/libavcodec -I$(USR)/include/libavformat -I$(USR)/include/libswscale -I$(USR)/include/ffmpeg
+-FFMPEG_LDFLAGS = -lavcodec -lavformat -lswscale
++FFMPEG_LIBS = -lavcodec -lavformat -lavutil -lswscale
+ 
+ # Flags to enable native support for compressed .cimgz files, using the Zlib library.
+ # This requires the presence of the Zlib include and library files.
+ # (package 'zlib1g-dev' on Debian).
+ ZLIB_CFLAGS = -Dcimg_use_zlib
+-ZLIB_LDFLAGS = -lz
++ZLIB_LIBS = -lz
+ 
+ # Flags to enable native support of webcams, using the OpenCV library.
+ # This requires the presence of the OpenCV include and library files.
+ # (package 'libcv3-2-dev' on Debian).
+-ifeq ($(OS),Darwin)
+-OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv
+-OPENCV_LDFLAGS = `pkg-config opencv --libs`   #-> Use this for OpenCV 2.2.0 !
+-else
+ OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv
+-# OPENCV_LDFLAGS = -lcv -lhighgui
+-OPENCV_LDFLAGS = -lopencv_core -lopencv_highgui   #-> Use this for OpenCV >= 2.2.0 !
+-endif
++OPENCV_LIBS = `pkg-config opencv --libs`   #-> Use this for OpenCV 2.2.0 !
+ 
+ # Flags to enable native support of most classical image file formats, using the GraphicsMagick++ library.
+ # This requires the presence of the GraphicsMagick++ include and library files.
+ # (package 'libgraphicsmagick++1-dev' on Debian).
+ MAGICK_CFLAGS = -Dcimg_use_magick -I$(USR)/include/GraphicsMagick
+ ifeq ($(OS),Darwin)
+-MAGICK_LDFLAGS = -L$(USR)/lib -lGraphicsMagick++ -lGraphicsMagick -llcms -ltiff -lfreetype -ljpeg -lpng -lbz2 -lxml2 -lz -lm -lltdl
++MAGICK_LIBS = -L$(USR)/lib -lGraphicsMagick++ -lGraphicsMagick -llcms -ltiff -lfreetype -ljpeg -lpng -lbz2 -lxml2 -lz -lm -lltdl
+ else
+-MAGICK_LDFLAGS = -lGraphicsMagick++
++MAGICK_LIBS = -lGraphicsMagick++
+ endif
+ 
+ # Flags to enable native support of EXR file format, using the OpenEXR library/
+ # This requires the presence of the OpenEXR include and library files.
+ # (package 'libopenexr-dev' on Debian).
+ EXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/include/OpenEXR
+-EXR_LDFLAGS = -lIlmImf -lHalf
++EXR_LIBS = -lIlmImf -lHalf
+ 
+ # Flags to enable the use of the FFTW3 library.
+ # This requires the presence of the FFTW3 include and library files.
+ # (package 'libfftw3-dev' on Debian).
+ FFTW_CFLAGS = -Dcimg_use_fftw3
+-FFTW_LDFLAGS = -lfftw3 -lfftw3_threads
++FFTW_LIBS = -lfftw3 -lfftw3_threads
+ ifeq ($(OSTYPE),msys)
+-FFTW_LDFLAGS = -lfftw3-3
++FFTW_LIBS = -lfftw3-3
+ endif
+ 
+ # Flags to enable the use of the BOARD library.
+ # This requires the presence of the BOARD include and library files.
+ # (no packages exist for Debian at this time).
+ BOARD_CFLAGS = -Dcimg_use_board
+-BOARD_LDFLAGS = -lboard
++BOARD_LIBS = -lboard
+ 
+ #----------------------------------------------------------------
+ # Predefined sets of flags for different default configurations.
+@@ -222,21 +215,21 @@
+ STD_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(X11_CFLAGS) $(PNG_CFLAGS) \
+                   $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) \
+ 	  	  $(EXR_CFLAGS) $(FFTW_CFLAGS) # $(XSHM_CFLAGS) $(OPENCV_CFLAGS) $(FFMPEG_CFLAGS) # $(MAGICK_CFLAGS)
+-STD_UNIX_LDFLAGS = $(MANDATORY_LDFLAGS) $(PARALLEL_LDFLAGS) $(X11_LDFLAGS) $(PNG_LDFLAGS) \
+-		   $(JPEG_LDFLAGS) $(TIFF_LDFLAGS) $(ZLIB_LDFLAGS) \
+-	           $(EXR_LDFLAGS) $(FFTW_LDFLAGS) # $(XSHM_LDFLAGS) $(OPENCV_LDFLAGS) $(FFMPEG_LDFLAGS) # $(MAGICK_LDFLAGS)
++STD_UNIX_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(X11_LIBS) $(PNG_LIBS) \
++		   $(JPEG_LIBS) $(TIFF_LIBS) $(ZLIB_LIBS) \
++	           $(EXR_LIBS) $(FFTW_LIBS) # $(XSHM_LIBS) $(OPENCV_LIBS) $(FFMPEG_LIBS) # $(MAGICK_LIBS)
+ 
+ # Unix : Minimal build.
+ MINIMAL_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(DEBUG_CFLAGS) $(X11_CFLAGS) \
+ 	              ${TIFF_CFLAGS} ${PNG_CFLAGS} $(ZLIB_CFLAGS) $(FFTW_CFLAGS) $(CHECKIMAGE_CFLAGS) # $(OPENCV_CFLAGS)
+-MINIMAL_UNIX_LDFLAGS = $(MANDATORY_LDFLAGS) $(PARALLEL_LDFLAGS) $(X11_LDFLAGS) \
+-	               ${TIFF_LDFLAGS} ${PNG_LDFLAGS} $(ZLIB_LDFLAGS) $(FFTW_LDFLAGS) # $(OPENCV_LDFLAGS)
++MINIMAL_UNIX_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(X11_LIBS) \
++	               ${TIFF_LIBS} ${PNG_LIBS} $(ZLIB_LIBS) $(FFTW_LIBS) # $(OPENCV_LIBS)
+ 
+ # Unix : Static build.
+ STATIC_PATH = /usr/lib/
+ STATIC_EXTRA =
+ STATIC_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(ZLIB_CFLAGS) $(FFTW_CFLAGS) -Dcimg_display=0
+-STATIC_UNIX_LDFLAGS = $(PARALLEL_LDFLAGS) \
++STATIC_UNIX_LIBS = $(PARALLEL_LIBS) \
+ 	              $(STATIC_PATH)/libpng.a \
+ 	              $(STATIC_PATH)/libjpeg.a \
+                       $(STATIC_PATH)/libz.a \
+@@ -246,40 +239,40 @@
+ FULL_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(OPT_CFLAGS) $(DEBUG_CFLAGS) $(X11_CFLAGS) $(PNG_CFLAGS) \
+                      $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) \
+ 	             $(FFTW_CFLAGS) $(EXR_CFLAGS) $(OPENCV_CFLAGS) # $(XSHM_CFLAGS) $(FFMPEG_CFLAGS) $(MAGICK_CFLAGS)  $(BOARD_CFLAGS) $(MINC2_CFLAGS)
+-FULL_UNIX_LDFLAGS = $(MANDATORY_LDFLAGS) $(PARALLEL_LDFLAGS) $(X11_LDFLAGS) $(PNG_LDFLAGS) \
+-                      $(JPEG_LDFLAGS) $(TIFF_LDFLAGS) $(ZLIB_LDFLAGS) \
+-	       	      $(FFTW_LDFLAGS) $(EXR_LDFLAGS) $(OPENCV_LDFLAGS) # $(XSHM_LDFLAGS) $(FFMPEG_LDFLAGS) $(MAGICK_LDFLAGS) $(BOARD_LDFLAGS) $(MINC2_LDFLAGS)
++FULL_UNIX_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(X11_LIBS) $(PNG_LIBS) \
++                      $(JPEG_LIBS) $(TIFF_LIBS) $(ZLIB_LIBS) \
++	       	      $(FFTW_LIBS) $(EXR_LIBS) $(OPENCV_LIBS) # $(XSHM_LIBS) $(FFMPEG_LIBS) $(MAGICK_LIBS) $(BOARD_LIBS) $(MINC2_LIBS)
+ 
+ # Windows : Standard build.
+ STD_WINDOWS_CFLAGS= $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(GDI32_CFLAGS) $(ZLIB_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(FFTW_CFLAGS)
+-STD_WINDOWS_LDFLAGS = $(MANDATORY_LDFLAGS) $(PARALLEL_LDFLAGS) $(GDI32_LDFLAGS) $(ZLIB_LDFLAGS) $(PNG_LDFLAGS) $(JPEG_LDFLAGS) $(TIFF_LDFLAGS) $(FFTW_LDFLAGS)
++STD_WINDOWS_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(GDI32_LIBS) $(ZLIB_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(TIFF_LIBS) $(FFTW_LIBS)
+ 
+ # Windows : Minimal build.
+ MINIMAL_WINDOWS_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(DEBUG_CFLAGS) $(GDI32_CFLAGS) $(CHECKIMAGE_CFLAGS)
+-MINIMAL_WINDOWS_LDFLAGS = $(MANDATORY_LDFLAGS) $(PARALLEL_LDFLAGS) $(GDI32_LDFLAGS)
++MINIMAL_WINDOWS_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(GDI32_LIBS)
+ 
+ # Mac-OSX : Standard build.
+ STD_MACOSX_CFLAGS= $(MANDATORY_CFLAGS) $(X11_CFLAGS) $(ZLIB_CFLAGS) $(PNG_CFLAGS) \
+                    $(JPEG_CFLAGS) $(TIFF_CFLAGS) \
+ 		   $(EXR_CFLAGS) $(FFTW_CFLAGS) # $(MAGICK_CFLAGS)
+-STD_MACOSX_LDFLAGS = $(MANDATORY_LDFLAGS) $(X11_LDFLAGS) $(ZLIB_LDFLAGS) \
+-		     $(PNG_LDFLAGS) $(JPEG_LDFLAGS) $(TIFF_LDFLAGS) \
+-		     $(EXR_LDFLAGS) $(FFTW_LDFLAGS) # $(MAGICK_LDFLAGS)
++STD_MACOSX_LIBS = $(MANDATORY_LIBS) $(X11_LIBS) $(ZLIB_LIBS) \
++		     $(PNG_LIBS) $(JPEG_LIBS) $(TIFF_LIBS) \
++		     $(EXR_LIBS) $(FFTW_LIBS) # $(MAGICK_LIBS)
+ 
+ # GIMP plug-in : Standard build.
+ STD_GIMP_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(FFTW_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS) ${IS_BETA_CFLAGS} -Dcimg_display=0 -Dcimg_use_rng
+-STD_GIMP_LDFLAGS = $(MANDATORY_LDFLAGS) $(PARALLEL_LDFLAGS) $(FFTW_LDFLAGS) $(PNG_LDFLAGS) $(ZLIB_LDFLAGS)
++STD_GIMP_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(FFTW_LIBS) $(PNG_LIBS) $(ZLIB_LIBS)
+ ifeq ($(OSTYPE),msys)
+-STD_GIMP_LDFLAGS += -mwindows -lpthread
++STD_GIMP_LIBS += -mwindows -lpthread
+ endif
+ 
+ # Libgmic : Standard build.
+ STD_LIB_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(FFTW_CFLAGS) -Dcimg_display=0 # -fno-ipa-sra
+-STD_LIB_LDFLAGS = $(MANDATORY_LDFLAGS) $(PARALLEL_LDFLAGS) $(FFTW_LDFLAGS)
++STD_LIB_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(FFTW_LIBS)
+ 
+ # GMICol : Standard build.
+ GMICOL_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(ZLIB_CFLAGS) $(FFTW_CFLAGS) -Dcimg_display=0
+-GMICOL_UNIX_LDFLAGS = $(MANDATORY_LDFLAGS) $(PARALLEL_LDFLAGS) $(PNG_LDFLAGS) $(JPEG_LDFLAGS) $(ZLIB_LDFLAGS) /usr/lib/x86_64-linux-gnu/libfftw3.a /usr/lib/x86_64-linux-gnu/libfftw3_threads.a
++GMICOL_UNIX_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) /usr/lib/x86_64-linux-gnu/libfftw3.a /usr/lib/x86_64-linux-gnu/libfftw3_threads.a
+ 
+ #--------------------------
+ # Define Makefile entries.
+@@ -307,63 +300,61 @@
+ endif
+ 
+ gimp:
+-	$(MAKE) "CFLAGS=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_GIMP_LDFLAGS) $(OPT_LDFLAGS)" "STRIP_EXE=1" gmic_gimp
++	$(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_GIMP_LIBS)" gmic_gimp
+ 
+ lib:
+-	$(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS) $(OPT_LDFLAGS)" gmic_lib
++	$(MAKE) "CFLAGS+=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_LIB_LIBS)" gmic_lib
+ 
+ zart: lib
+ ifneq ($(OS),Darwin)
+ 	cd ../zart && qmake-qt4 zart.pro && $(MAKE) && strip zart
+ else
+-	cd ../zart && qmake zart.pro && $(MAKE) "CFLAGS=$(STD_MACOSX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_MACOSX_LDFLAGS) $(OPT_LDFLAGS)"
++	cd ../zart && qmake zart.pro && $(MAKE) "CFLAGS=$(STD_MACOSX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_MACOSX_LIBS) $(OPT_LDFLAGS)"
+ endif
+ 
+ # Entries for other configurations.
+ linux:
+-	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_cli_standard
++	$(MAKE) "CFLAGS+=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_UNIX_LIBS)" gmic_cli_standard
+ 
+ solaris:
+-	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS) -R$(USR)/X11R6/lib -lrt -lnsl -lsocket" "STRIP_EXE=1" gmic_cli_standard
++	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_UNIX_LIBS) -R$(USR)/X11R6/lib -lrt -lnsl -lsocket" "STRIP_EXE=1" gmic_cli_standard
+ 
+ macosx:
+-	$(MAKE) "CFLAGS=$(STD_MACOSX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_MACOSX_LDFLAGS) $(OPT_LDFLAGS)" gmic_cli_standard
++	$(MAKE) "CFLAGS=$(STD_MACOSX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_MACOSX_LIBS) $(OPT_LDFLAGS)" gmic_cli_standard
+ 
+ windows:
+-	$(MAKE) "CFLAGS=$(STD_WINDOWS_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_WINDOWS_LDFLAGS)" "STRIP_EXE=1" gmic_cli_standard
++	$(MAKE) "CFLAGS=$(STD_WINDOWS_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_WINDOWS_LIBS)" "STRIP_EXE=1" gmic_cli_standard
+ 
+ gmicol:
+-	$(MAKE) "CFLAGS+=$(GMICOL_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(GMICOL_UNIX_LDFLAGS)" gmic_cli_standard
++	$(MAKE) "CFLAGS+=$(GMICOL_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(GMICOL_UNIX_LIBS)" gmic_cli_standard
+ 
+ static:
+-	$(MAKE) "CFLAGS+=$(STATIC_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STATIC_UNIX_LDFLAGS)" gmic_cli_standard
++	$(MAKE) "CFLAGS+=$(STATIC_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STATIC_UNIX_LIBS)" gmic_cli_standard
+ 
+ minimal:
+-	$(MAKE) "CFLAGS+=$(MINIMAL_UNIX_CFLAGS)" "LDFLAGS+=$(MINIMAL_UNIX_LDFLAGS)" gmic_cli_standard
++	$(MAKE) "CFLAGS+=$(MINIMAL_UNIX_CFLAGS)" "LIBS=$(MINIMAL_UNIX_LIBS)" gmic_cli_standard
+ 
+ full:
+-	$(MAKE) "CFLAGS=$(FULL_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(FULL_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_cli_full
++	$(MAKE) "CFLAGS+=$(FULL_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(FULL_UNIX_LIBS)" gmic_cli_full
+ 
+ winminimal:
+-	$(MAKE) "CFLAGS=$(MINIMAL_WINDOWS_CFLAGS)" "LDFLAGS=$(MINIMAL_WINDOWS_LDFLAGS)" gmic_cli_standard
++	$(MAKE) "CFLAGS=$(MINIMAL_WINDOWS_CFLAGS)" "LIBS=$(MINIMAL_WINDOWS_LIBS)" gmic_cli_standard
+ 
+ # Internal rules to build compilation modules.
+ gmic_lib.o: gmic.cpp
+ 	$(CC) -o gmic_lib.o -c gmic.cpp -fPIC $(CFLAGS) -Dgmic_float_only
+ gmic_lib: gmic_lib.o
+-	ar rcs libgmic.a gmic_lib.o
++	$(AR) rcs libgmic.a gmic_lib.o
+ ifneq ($(OS),Darwin)
+-	$(CC) -shared -Wl,-soname,libgmic.so.1 -o libgmic.so gmic_lib.o $(LDFLAGS)
+-	$(CC) -o gmic_use_lib gmic_use_lib.cpp -L. -lgmic $(FFTW_LDFLAGS)
++	$(CC) $(LDFLAGS) -shared -Wl,-soname,libgmic.so.1 -o libgmic.so gmic_lib.o $(LIBS)
+ else
+-	$(CC) -shared -o libgmic.so gmic_lib.o $(LDFLAGS)
++	$(CC) $(LDFLAGS) -shared -o libgmic.so gmic_lib.o $(LIBS)
+ endif
+ 
+ gmic_gimp.o: gmic.cpp
+ 	$(CC) -o gmic_gimp.o -c gmic.cpp $(CFLAGS) -Dgmic_gimp -Dgmic_float_only
+ gmic_gimp : gmic_gimp.o gmic_gimp.cpp
+-	$(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o `gimptool-2.0$(EXE) --cflags` $(CFLAGS) `gimptool-2.0$(EXE) --libs` $(LDFLAGS)
+-	strip gmic_gimp$(EXE)
++	$(CC) `gimptool-2.0$(EXE) --cflags` $(CFLAGS) $(LDFLAGS) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o `gimptool-2.0$(EXE) --libs` $(LIBS)
+ 
+ gmic_bool.o: gmic.cpp
+ 	$(CC) -o gmic_bool.o -c gmic.cpp $(CFLAGS) -Dgmic_split_compilation -Dgmic_bool
+@@ -384,10 +375,9 @@
+ gmic_double.o: gmic.cpp
+ 	$(CC) -o gmic_double.o -c gmic.cpp $(CFLAGS) -Dgmic_split_compilation -Dgmic_double
+ gmic_cli_full: gmic_bool.o gmic_uchar.o gmic_char.o gmic_ushort.o gmic_short.o gmic_uint.o gmic_int.o gmic_float.o gmic_double.o
+-	$(CC) -o gmic gmic_bool.o gmic_uchar.o gmic_char.o gmic_ushort.o gmic_short.o gmic_uint.o gmic_int.o gmic_float.o gmic_double.o $(LDFLAGS)
+-	strip gmic$(EXE)
++	$(CC) $(LDFLAGS) -o gmic gmic_bool.o gmic_uchar.o gmic_char.o gmic_ushort.o gmic_short.o gmic_uint.o gmic_int.o gmic_float.o gmic_double.o $(LIBS)
+ gmic_cli_standard: gmic.cpp
+-	$(CC) -o gmic gmic.cpp $(CFLAGS) -Dgmic_float_only -Dgmic_main $(LDFLAGS)
++	$(CC) $(CFLAGS) -Dgmic_float_only -Dgmic_main $(LDFLAGS) -o gmic gmic.cpp $(LIBS)
+ 
+ gmic_def: gmic_def.gmic
+ 	@echo "#ifndef gmic_gimp" > gmic_def.h
diff --git a/media-gfx/gmic/gmic-1.5.9.2-r1.ebuild b/media-gfx/gmic/gmic-1.5.9.2-r1.ebuild
new file mode 100644
index 000000000000..ca01b07e7865
--- /dev/null
+++ b/media-gfx/gmic/gmic-1.5.9.2-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/gmic-1.5.9.2-r1.ebuild,v 1.1 2014/06/16 07:46:39 radhermit Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs bash-completion-r1 flag-o-matic
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="http://gmic.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="CeCILL-2 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ffmpeg fftw graphicsmagick jpeg opencv openexr png tiff X zlib"
+
+RDEPEND="
+	ffmpeg? ( virtual/ffmpeg )
+	fftw? ( sci-libs/fftw:3.0[threads] )
+	graphicsmagick? ( media-gfx/graphicsmagick )
+	jpeg? ( virtual/jpeg )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1 )
+	openexr? (
+		media-libs/ilmbase
+		media-libs/openexr
+	)
+	png? ( media-libs/libpng )
+	tiff? ( media-libs/tiff )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P}/src
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	epatch "${FILESDIR}"/${PN}-1.5.8.2-ffmpeg.patch
+
+	for i in ffmpeg fftw jpeg opencv png tiff zlib ; do
+		use $i || { sed -i -r "s/^(${i}_(CFLAGS|LIBS) =).*/\1/I" Makefile || die ; }
+	done
+
+	use graphicsmagick || { sed -i -r "s/^(MAGICK_(CFLAGS|LIBS) =).*/\1/" Makefile || die ; }
+	use openexr || { sed -i -r "s/^(EXR_(CFLAGS|LIBS) =).*/\1/" Makefile || die ; }
+
+	if ! use X ; then
+		sed -i -r "s/^((X11|XSHM)_(CFLAGS|LIBS) =).*/\1/" Makefile || die
+
+		# disable display capabilities when X support is disabled
+		append-cppflags -Dcimg_display=0
+	fi
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)" CC="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" OPT_CFLAGS= DEBUG_CFLAGS= linux lib
+}
+
+src_install() {
+	dobin gmic
+	newlib.so libgmic.so libgmic.so.1
+
+	insinto /usr/include
+	doins gmic.h
+
+	doman ../man/gmic.1.gz
+	dodoc ../README
+
+	newbashcomp ../resources/gmic_bashcompletion.sh ${PN}
+}