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

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 374 insertions, 9 deletions

diff --git a/media-plugins/gimp-gmic/ChangeLog b/media-plugins/gimp-gmic/ChangeLog
index fb0074c16635..e8b8a91993ca 100644
--- a/media-plugins/gimp-gmic/ChangeLog
+++ b/media-plugins/gimp-gmic/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/gimp-gmic
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-gmic/ChangeLog,v 1.44 2014/06/16 06:38:08 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-gmic/ChangeLog,v 1.45 2014/06/16 07:52:20 radhermit Exp $
+
+*gimp-gmic-1.5.9.2-r1 (16 Jun 2014)
+
+  16 Jun 2014; Tim Harder <radhermit@gentoo.org> +gimp-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 fully respected for all linked libs.
 
 *gimp-gmic-1.5.9.2 (16 Jun 2014)
 
diff --git a/media-plugins/gimp-gmic/Manifest b/media-plugins/gimp-gmic/Manifest
index 11b8436e0f99..fabdee978175 100644
--- a/media-plugins/gimp-gmic/Manifest
+++ b/media-plugins/gimp-gmic/Manifest
@@ -5,6 +5,7 @@ AUX gmic-1.5.8.0-makefile.patch 5485 SHA256 39b5ff20a26b620f7cda95e1fa62c69532df
 AUX gmic-1.5.8.3-makefile.patch 5037 SHA256 07e2f9d8a1c3d4a5053296f9b9a0f9a0718717e611493961d2907267c8cae380 SHA512 86f504b688bf4cc25fe698ed2d57d3bae719bb876688492b797927e76ac95326f6f2ab71fcc1e4b2f44d42500a90d6f7abe02d24dd7a22e4f617261f837fddb2 WHIRLPOOL f33a74d82fbeb91bd9712237f9e322b0f5aea426f2fff1da7088e0f90de8fb466f572fdc08eed8888dd51ba9235272b57f18de9d082724247bd6daa77355cf73
 AUX gmic-1.5.8.4-makefile.patch 5384 SHA256 48cd18f8e8086a21b62b59788d34185521dddfa9f42ec228f069d44aac2d7af0 SHA512 009cc63ce747ee0acd917795ff093d9aec4545105cb9a96f837d885d68f420b919557d569e2492cd016b96a723a932f8e7b19cf89f12b8ecb153b96dcf1e49b1 WHIRLPOOL 752c7849074e70f3bf10b5aa144917d9e18276c4d99a0a4b4139b217a1e8edd8036df0c95b9f7a3f3b12f03abc99e8c67666fab8365d5259e1e788096f512998
 AUX gmic-1.5.9.1-makefile.patch 5285 SHA256 75c0faee9e1fa0796ecd3583de9b81a7281be7fd80d46fede525d385f5c449c3 SHA512 71ffc20d5bc94766ed86012a3f720ab3c43fe229822ecd1325217713fcce4f4305ad34b6bb0a3fc07c1949bf0a1c581a22307b0f49a4302a58de7b3d0261de00 WHIRLPOOL df3b4b59b959e2a56ad829e2446295f6434a13c210d7c83b9dd173e54baf495dddbd71bfe3531670737ebe0769239e1a873635a11439f7cdf94b71ed3029aede
+AUX gmic-1.5.9.2-makefile.patch 16211 SHA256 222a8d530aab275b376b4272fc2f7a43fdfddf51a33fa70bd031ca05899b6bb7 SHA512 2e00b93ccc980823641a1704b2684e617ca64c44c00fb4aac0373f0338192b6c768356c806cef3b9baf86d299f492eb0414b7e7f42eb3bcae5e9ab04d8fe1013 WHIRLPOOL acb02abac8d6174afdbb982c29243b0a7e723b83b2d2c538fa9c77c99e1f09400960e0e8b108a770c75c9317ada029d6f8dea7ffe8de5dd14471262a7ccded21
 DIST gmic_1.5.8.0.tar.gz 2257558 SHA256 94382a599c23dd0be2ed9bf539072c057b7f780a8ac63b391a27522fec28f1e9 SHA512 46c7d46da2fd1f063dbb23df9cc8e894ff741871cc8d7ee570de54c5313ed101a3352915a71d952913e5bca97e35074fb025646aa05fd087d1575383ac2972b8 WHIRLPOOL 33ea1d72619bb40cc89357732b0f12c14377c9a5c7ab61d40300f9e81570d4e7fb01089597b9bb45e09358c67bbcf0ca2e25841e5e5e7c7b998feb870fccbad9
 DIST gmic_1.5.8.1.tar.gz 2265467 SHA256 2b0b813253e8c409a8535d350894245b35836cd849af31986055e0a09b8d1cea SHA512 6fea97ae18abe770ba827946457955c74cb4180a272e7fb0a6e2a0f612bec6f8fd83daa4c1010eb236886ebacef331d9b1b0a4f0c64dbde27261e76f71244ef7 WHIRLPOOL f9fc34c21f87c222b081bcef2ae819cbe6f25c1b66a890a569ffae667acbdc5f334496ba8d1d5ddf811550ec0844bd2936ee3564f131bb7f5b1b35ba7a70dcde
 DIST gmic_1.5.8.2.tar.gz 2319666 SHA256 459d0f8cf6ee0a9e8b2254ef93be18cf985bbec699de5354b52671e15f67c3b4 SHA512 5f54147a8903d49667c825afb28564753b0636d21812bc8f12fc1effc3586063c95fe5676c7e69924c69cd790cc4399c5a87a535195bbbecc1656d3de8bc398c WHIRLPOOL 07601508c81be6d3cc8b79ef0f524a36c507696148ec11524f978ae2df4c1326035de908f5d467d24b6482544a5a02f77f7a2847f74cef8806b50213d937e5a9
@@ -22,17 +23,18 @@ EBUILD gimp-gmic-1.5.8.4.ebuild 983 SHA256 0c8a2e8cd24e3a4e95c067f02d7f0bc33d6bf
 EBUILD gimp-gmic-1.5.8.5.ebuild 985 SHA256 d98a03dcee1bcf80d778352f756cd03feed22eb9695cb1eb7a818185255bf3e8 SHA512 a0b21af8ebfd8651b30af346c453d803143f1da8db089afd436645c3835927a916da80db68c22719e7830e2fa0be526b290b07f2e7b6e504ecb3e92652ff2571 WHIRLPOOL 211cb4f0d7c5043aa8bd1f50158f8c0717d4de84ac14f75e0adb3ac93d3f7931a00d7f768484070b2c0c56ed996e0767bcccdee6989df7733541f78cf42ebf87
 EBUILD gimp-gmic-1.5.8.6.ebuild 1113 SHA256 c480650257f4dd49519e523658c89ac5ae83a2915601d1c41e7f1a0a528623dc SHA512 8c808e7b90a263cb54801f5dbf068efc5e95897dc22aaa72d70bc67f159f16467f0692df1bfe114575300dbea182cb1c40c4fff47c743135a5626d337be461e1 WHIRLPOOL b400bac0370313be50ce2dfd4cd5970dad68d94427d35380715f8db0bdf114f405cb8c5548581f6de817c3450e6adcc4b86e82cb4e549ba04b58fc628419ee16
 EBUILD gimp-gmic-1.5.9.1.ebuild 983 SHA256 8da0414b8d231712706269fedcf920554d25a2810a6a2a91aa2a6ef936d7c7bf SHA512 7d89345b119edb94f1d026c88309f50264e1403a9c07281694e323610a432e4ed82452d8ab21d7620f599d296f5299ae981073165414f5523da9ca093d2dec4f WHIRLPOOL 3b134de3c2baa9d634fd4b1696f50aa6e3bc1c4902a6e16b31d75fe6215912925d55afd5326ab9642f5efad6914d3f9970b663c4e27d520b94e5ecbe8c751283
+EBUILD gimp-gmic-1.5.9.2-r1.ebuild 986 SHA256 3c923737b802264cc8e900962f137d3d8431ec16444401939cff4cdf6debf5ca SHA512 10ccdee6e7f0f6121526f55405f8955af5ddd31f96008015ed976b06dddd7c5c6578b422e8795054ed668b2eb9431e517387ea1350c747fd8bef7e6a693ed8eb WHIRLPOOL 577e0725171115f3c44be7f2ff98a7da4522dfd310853db2407c77a70acdec8abce8035171552bcfc04d6d0969d31ae7420ec2cfab860cafde21ecc2656af7b8
 EBUILD gimp-gmic-1.5.9.2.ebuild 985 SHA256 385d4787e8431b1a06d0a817e04f74dd70b0b29bca198848bb9c2e5f7242c74b SHA512 b75fd31956f64d118a6ab3207d30318342bf8bac785c3766ace71f2b97421216917758b8dc940d0a6a024d985949ff76ee198bd1a55ff629c1d117ffbb3d6176 WHIRLPOOL d421828d4699d5143fc8ef45525b397b3c4456b54e068a39be42fb037cd474c86e407775e1f3fff7f80bd5f1cad03d0fb81386848e78f5de2ccf4086d55f1d20
-MISC ChangeLog 6683 SHA256 1ee6b8da2f6433a4faad03431f82078f89e15cc27ff7c91e5dbd1566f9d0a2f5 SHA512 170da585ac308b576d85fc0c7d1833d1300991813835df828107ebb9a55996cf57328177852f832c5dded2c209f0de60b684111201048d242ca5c0b959df998f WHIRLPOOL 4b7b73c27868957c4f97e0e8e4265412db5effae687217609b44c065ee6d8399c288cb6b20471affb693d0ed6d793ddd3a51ec71a2a2b011873cd7d7d5becbd3
+MISC ChangeLog 6958 SHA256 977bb39b37f9ecd01bc1f6ea62ee789c0419881b2ae96318b88789d4a7654ebe SHA512 8b1aac6b9158b7dc1bde7b56a6627ab1254f557fb2681598bb7fbcc485caf2dbb18144019f417be807fc04cc2e260b37d7ca1269ee875244d05091f46f822cf5 WHIRLPOOL a5f2d0cb8da0129e906f830b676da164879692da2c0f321e346ef0f27dcd33143c575f39bb35352df053f40fcf0a80d3a2cb59310c771256e067d66b9529c1b4
 MISC metadata.xml 232 SHA256 a778e40f66cb2fa35529e4f45cb8356c8b1b109163cd939396f02e8ea6aa5f1a SHA512 6952f63da1c92a4ed7ddb87b5eb4003d123f0b7af6ffdbc9118159c97ddf18917e8ac7727285a42c07c64e52a40335bc2ef9f17261557617beb8c2226a391873 WHIRLPOOL 0a4441f075f8af01588da2aac3e03732f93463b8bea5e46749d37e1468452735d15f45243b930b3346c93734f8aa235a492030445fee471a95d2c5998f08e7de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTnpDSAAoJEEqz6FtPBkyjt+kIAJx/ashVNbn9xssT89ObfzpD
-gWjBTHlg2bImVsuIoP3K2dNKHi+xDYocU2HAiLGb5PAiDzumaVKX58ffnKRj1BXp
-+WgsJv18nmc3RTUu3Xfn1wR3kJvitN3UznDCEGOcaeeREJYGKPiKlewOWCerl1Kf
-ZihjIqzv2ivpQQwzwcu4vY6+bP9KZmLhc5XLBlq5FU5KAxO59ee4zepXrZ9i8wqj
-Dgj92S3yZFgG67MJ2XOTfhV3nAIYOUzBTz32W7CmNgJlyO5o2v0bmEPZK1yZOyKG
-Yf/WPGV99mRDgzdXSt2z8u8wNbNLA16a8vhSRp0/X25Agh0c5WGP9VioTbd/Mpk=
-=UPay
+iQEcBAEBCAAGBQJTnqI1AAoJEEqz6FtPBkyjplMH/juZkc0aI2s4BzuxzHyaa3jY
+hs3Zog2CFwDO1U0OXy/uYBLLhbQ9Cwg06v80OHXH1kiXhJeLhPiL5R2YIZZ8Gj0F
+MfVJqUBdv97sEntJcEvdXEHrCHLZUEJ1hsVi5wGeG7JvjyowM4wH0M5ZChOFcK2l
+KLwHGoyFTFO0W9pd5KPYWhfW98CvdK76ZE6jue4m62CiI4U+UqwO3Os5HqslvWPr
+AZ1eSSApjQjjljrxhdLiVrQtu+jBmFuUlZ6IMZ9Q+gXFxeuzwAzY2LbdfXUOI3YM
+I6fSk7o5SvRFGB8NZCWDJHSeMsNWzIUQxdsRScV2GXtXKEuZnX2KqGhJh7MO/uc=
+=tgX0
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/gimp-gmic/files/gmic-1.5.9.2-makefile.patch b/media-plugins/gimp-gmic/files/gmic-1.5.9.2-makefile.patch
new file mode 100644
index 000000000000..6a7d99dc5146
--- /dev/null
+++ b/media-plugins/gimp-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-plugins/gimp-gmic/gimp-gmic-1.5.9.2-r1.ebuild b/media-plugins/gimp-gmic/gimp-gmic-1.5.9.2-r1.ebuild
new file mode 100644
index 000000000000..d1b0bb8e4c39
--- /dev/null
+++ b/media-plugins/gimp-gmic/gimp-gmic-1.5.9.2-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-gmic/gimp-gmic-1.5.9.2-r1.ebuild,v 1.1 2014/06/16 07:52:20 radhermit Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="G'MIC GIMP plugin"
+HOMEPAGE="http://gmic.sourceforge.net/gimp.shtml"
+SRC_URI="mirror://sourceforge/gmic/gmic_${PV}.tar.gz"
+
+LICENSE="CeCILL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-gfx/gimp-2.4.0
+	media-libs/libpng:0=
+	sci-libs/fftw:3.0[threads]
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/gmic-${PV}/src
+
+src_prepare() {
+	epatch "${FILESDIR}"/gmic-${PV}-makefile.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" OPT_CFLAGS= DEBUG_CFLAGS= gimp
+}
+
+src_install() {
+	exeinto $(gimptool-2.0 --gimpplugindir)/plug-ins
+	doexe gmic_gimp
+	dodoc ../README
+}
+
+pkg_postinst() {
+	elog "The G'MIC plugin is accessible from the menu:"
+	elog "Filters -> G'MIC"
+}