Remove old.

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

7 files changed, 8 insertions, 667 deletions

diff --git a/media-plugins/gimp-gmic/ChangeLog b/media-plugins/gimp-gmic/ChangeLog
index 22760f51ee7e..d3a04b7f0254 100644
--- a/media-plugins/gimp-gmic/ChangeLog
+++ b/media-plugins/gimp-gmic/ChangeLog
@@ -1,6 +1,12 @@
 # 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.48 2014/12/08 03:23:48 radhermit Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-gmic/ChangeLog,v 1.49 2015/01/08 04:44:15 radhermit Exp $
+
+  08 Jan 2015; Tim Harder <radhermit@gentoo.org> -gimp-gmic-1.5.8.6.ebuild,
+  -gimp-gmic-1.5.9.1.ebuild, -gimp-gmic-1.5.9.2-r1.ebuild,
+  -files/gmic-1.5.8.4-makefile.patch, -files/gmic-1.5.9.1-makefile.patch,
+  -files/gmic-1.5.9.2-makefile.patch:
+  Remove old.
 
 *gimp-gmic-1.6.0.2-r1 (08 Dec 2014)
 
diff --git a/media-plugins/gimp-gmic/files/gmic-1.5.8.4-makefile.patch b/media-plugins/gimp-gmic/files/gmic-1.5.8.4-makefile.patch
deleted file mode 100644
index 53f511fdfba9..000000000000
--- a/media-plugins/gimp-gmic/files/gmic-1.5.8.4-makefile.patch
+++ /dev/null
@@ -1,109 +0,0 @@
---- gmic-1.5.8.4/src/Makefile
-+++ gmic-1.5.8.4/src/Makefile
-@@ -77,7 +77,6 @@
- 

- # 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

-@@ -121,14 +120,14 @@
- # (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_LDFLAGS = -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_LDFLAGS = -lXext

- 

- # Flags to enable image display, using GDI32.

- # This requires the presence of the GDI32 include and library files.

-@@ -163,7 +162,7 @@
- # 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_LDFLAGS = -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.

-@@ -174,14 +173,8 @@
- # 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

- 

- # 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.

-@@ -308,10 +301,10 @@
- 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)" "LDFLAGS+=$(STD_GIMP_LDFLAGS) $(OPT_LDFLAGS)" 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)" "LDFLAGS+=$(STD_LIB_LDFLAGS) $(OPT_LDFLAGS)" gmic_lib

- 

- zart: lib

- ifneq ($(OS),Darwin)

-@@ -331,13 +324,13 @@
- 	$(MAKE) "CFLAGS+=$(MINIMAL_UNIX_CFLAGS)" "LDFLAGS+=$(MINIMAL_UNIX_LDFLAGS)" gmic_cli_standard

- 

- 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)" "LDFLAGS+=$(STD_UNIX_LDFLAGS)" gmic_cli_standard

- 

- linux_alltypes:

- 	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_cli_alltypes

- 

- custom:

--	$(MAKE) "CFLAGS=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(CUST_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_cli_alltypes

-+	$(MAKE) "CFLAGS+=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(CUST_UNIX_LDFLAGS)" gmic_cli_alltypes

- 

- 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

-@@ -355,10 +348,9 @@
- gmic_lib.o: gmic.cpp gmic_def.h

- 	$(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)

- else

- 	$(CC) -shared -o libgmic.so gmic_lib.o $(LDFLAGS)

- endif

-@@ -367,7 +359,6 @@
- 	$(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)

- 

- gmic_bool.o: gmic.cpp

- 	$(CC) -o gmic_bool.o -c gmic.cpp $(CFLAGS) -Dgmic_split_compilation -Dgmic_bool

-@@ -389,7 +380,6 @@
- 	$(CC) -o gmic_double.o -c gmic.cpp $(CFLAGS) -Dgmic_split_compilation -Dgmic_double

- gmic_cli_alltypes: 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 gmic_def.h

- 	$(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)

- 

- gmic_cli_standard: gmic.cpp

- 	$(CC) -o gmic gmic.cpp $(CFLAGS) -Dgmic_float_only -Dgmic_main $(LDFLAGS)

diff --git a/media-plugins/gimp-gmic/files/gmic-1.5.9.1-makefile.patch b/media-plugins/gimp-gmic/files/gmic-1.5.9.1-makefile.patch
deleted file mode 100644
index fd69a7c9c3ec..000000000000
--- a/media-plugins/gimp-gmic/files/gmic-1.5.9.1-makefile.patch
+++ /dev/null
@@ -1,111 +0,0 @@
---- gmic-1.5.9.1/src/Makefile
-+++ gmic-1.5.9.1/src/Makefile
-@@ -77,7 +77,6 @@
- 
- # 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
-@@ -121,14 +120,14 @@
- # (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_LDFLAGS = -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_LDFLAGS = -lXext
- 
- # Flags to enable image display, using GDI32.
- # This requires the presence of the GDI32 include and library files.
-@@ -163,7 +162,7 @@
- # 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_LDFLAGS = -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.
-@@ -174,14 +173,8 @@
- # 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
- 
- # 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.
-@@ -307,10 +300,10 @@
- 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)" "LDFLAGS+=$(STD_GIMP_LDFLAGS) $(OPT_LDFLAGS)" 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)" "LDFLAGS+=$(STD_LIB_LDFLAGS) $(OPT_LDFLAGS)" gmic_lib
- 
- zart: lib
- ifneq ($(OS),Darwin)
-@@ -321,7 +314,7 @@
- 
- # 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)" "LDFLAGS=$(STD_UNIX_LDFLAGS)" 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
-@@ -342,7 +335,7 @@
- 	$(MAKE) "CFLAGS+=$(MINIMAL_UNIX_CFLAGS)" "LDFLAGS+=$(MINIMAL_UNIX_LDFLAGS)" 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)" "LDFLAGS=$(FULL_UNIX_LDFLAGS)" gmic_cli_full
- 
- winminimal:
- 	$(MAKE) "CFLAGS=$(MINIMAL_WINDOWS_CFLAGS)" "LDFLAGS=$(MINIMAL_WINDOWS_LDFLAGS)" gmic_cli_standard
-@@ -351,10 +344,9 @@
- 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)
- else
- 	$(CC) -shared -o libgmic.so gmic_lib.o $(LDFLAGS)
- endif
-@@ -363,7 +355,6 @@
- 	$(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)
- 
- gmic_bool.o: gmic.cpp
- 	$(CC) -o gmic_bool.o -c gmic.cpp $(CFLAGS) -Dgmic_split_compilation -Dgmic_bool
-@@ -385,7 +376,6 @@
- 	$(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)
- gmic_cli_standard: gmic.cpp
- 	$(CC) -o gmic gmic.cpp $(CFLAGS) -Dgmic_float_only -Dgmic_main $(LDFLAGS)
- 
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
deleted file mode 100644
index 6a7d99dc5146..000000000000
--- a/media-plugins/gimp-gmic/files/gmic-1.5.9.2-makefile.patch
+++ /dev/null
@@ -1,313 +0,0 @@
---- 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.8.6.ebuild b/media-plugins/gimp-gmic/gimp-gmic-1.5.8.6.ebuild
deleted file mode 100644
index b93538cb40fa..000000000000
--- a/media-plugins/gimp-gmic/gimp-gmic-1.5.8.6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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.8.6.ebuild,v 1.1 2014/04/25 05:29:24 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() {
-	cp "${FILESDIR}"/gmic-1.5.8.4-makefile.patch "${T}"/gmic-1.5.8.4-makefile.patch || die
-	edos2unix "${T}"/gmic-1.5.8.4-makefile.patch
-
-	epatch "${T}"/gmic-1.5.8.4-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"
-}
diff --git a/media-plugins/gimp-gmic/gimp-gmic-1.5.9.1.ebuild b/media-plugins/gimp-gmic/gimp-gmic-1.5.9.1.ebuild
deleted file mode 100644
index 83bc5fb2c962..000000000000
--- a/media-plugins/gimp-gmic/gimp-gmic-1.5.9.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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.1.ebuild,v 1.1 2014/06/06 06:12:59 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"
-}
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
deleted file mode 100644
index d1b0bb8e4c39..000000000000
--- a/media-plugins/gimp-gmic/gimp-gmic-1.5.9.2-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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"
-}