Remove old.

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

9 files changed, 15 insertions, 796 deletions

diff --git a/media-gfx/gmic/ChangeLog b/media-gfx/gmic/ChangeLog
index 536c36283fd4..4f7208e67a57 100644
--- a/media-gfx/gmic/ChangeLog
+++ b/media-gfx/gmic/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/gmic
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.55 2015/01/08 04:41:01 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.56 2015/01/08 04:41:57 radhermit Exp $
+
+  08 Jan 2015; Tim Harder <radhermit@gentoo.org> -gmic-1.5.8.6.ebuild,
+  -gmic-1.5.9.1.ebuild, -gmic-1.5.9.2-r1.ebuild,
+  -files/gmic-1.5.8.2-ffmpeg.patch, -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.
 
   08 Jan 2015; Tim Harder <radhermit@gentoo.org> gmic-1.6.0.2.ebuild:
   Append to C++ flags instead of C preprocessor flags (fixes bug #533016).
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 02ac056b5629..3608682ef7d7 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,29 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX gmic-1.5.8.2-ffmpeg.patch 750 SHA256 14eff8233639c8e3384b9abf4acfa08af72595f4f64df015e28a918a23d4cb07 SHA512 51e767fd4f4a9a6bc0090a22502c9ffc1ba41cbbd59223b8fb880ca252d5f49166db5b6a9abf83e5d8c24a893e404823e72336dc0a7b493825cfab868bba2b55 WHIRLPOOL b5793611498cc0483241b615147184bff6b2f10ceb398473c7ee6fc0b89a79ccd572671dc80652dd8e45effe09430891fa52528c21edbc405ede67424f98c215
-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
 AUX gmic-1.6.0.2-makefile.patch 6480 SHA256 b4b0b8834d784f8464bf0e836d10cd3f1c86fb6bf5d73f129222e3c824c05bc4 SHA512 7f69f20a8fa73e4b9bdfc9c4e222d80d8a87a0d18acded10af254806464c4b45280a596722859926d7b64b560f484501335f950c6dac7eb76b7b3f7d1a3a8a8c WHIRLPOOL 5f600fe95c3b1d2a61bc7b1f4b2c65f25f0648b44ee3fe40735c6f20ecbda2e57a2f88c19577841983499d19685b3902adb5b2d4ae1006ecdc50474b172660a2
-DIST gmic_1.5.8.6.tar.gz 2691672 SHA256 21f90a37f2b63070c3d31ad19139c90d3241e62c3b1cca04eb1a5ca45838ad91 SHA512 1687fac247b922cc1d4c42821d3d79eb25e5ab6be0bf6b9b5bf026edec71ba39d2a627cfa604ae9779c49b66e12c56dae2dfdae163e5a3c13d2cf21b2ad5f3a6 WHIRLPOOL c106a7780ef1c542974a78ae2208dcd7dbf8ec714746264ee124876651b7bf3590d75c8c0fef27b3e2fd63627644da52b5572be9935209958a8aa3b5eae7edb8
-DIST gmic_1.5.9.1.tar.gz 2780328 SHA256 6ef0f700a34398c550ec8c44c53393ef222c0bf6dc998fe14b6e434069158cc9 SHA512 a0298925fca007fc95a4d892e41785050bddff4d891e996217af5110c34d550f935cdd1033338e30495fbcb27b76f16a9f201b7b4ce5eb6af2e030c61a040e85 WHIRLPOOL 7b3e9ec6a38369feea423ebf9e76787e8135a8985a164789e45493b98448f97524508d18d2ae9dd784e5b53f94e22702d0c48f871d283c5544c4f4fcd4a42a08
-DIST gmic_1.5.9.2.tar.gz 2784355 SHA256 8fffca4cf2964f75961f165e507101444da593da8a525551bc359a3e7542d3dc SHA512 f451baabfc3a4e51a9e882a970bb26551c72f3802d3c6bdf76ffe37be9dd69eeada75e02457572037124f914fbed6f96ddf0620771b6c71901a4478f38ad3e53 WHIRLPOOL 9760484589e1e84949e6059d0b681644773259ed9242dfcc43440a6bfedec75fa8e969b4e7eb74c6208b0d21a9d311a6751916850dccfd903593c4b78cc7d659
 DIST gmic_1.6.0.2.tar.gz 3013936 SHA256 ec9fa41bb8c27f883b9f845258d41f8024936c80bdec723a1c67cfe05ef9b900 SHA512 9d754cc2c72835bd139a39f72863f5315bebc25716efadb023f54661a4bb3fbf29066ddcd258ab8f084164edc9bd02f77a5a801b5c0753322f959205ce0adaf1 WHIRLPOOL 1d8e7126901b7a269f0aae9bdc1bd05a859efa3269de892e712892aa0c06eeb856c27cf05564bac30abcacf27f3e11d2bcc8f179fc29a675960d6640567cdc0c
-EBUILD gmic-1.5.8.6.ebuild 2021 SHA256 ab9535da9cac4aee07f2611903b29a0d7422f44d801c04f6dc6546d0f4f30171 SHA512 39f750fd7313ff1a12acdb031fda95c559844d36f1e90d124fb9aedce830b028da0da0b3275a08649c13bbc1a0c45cd52ae5ef8c295c523b9b0f6d0c1c4ed2d3 WHIRLPOOL 711186da5d60281273b1368438d86f022884cfe5827dc8f4eabcb21ba17d117f99655584216774df18a75d2528cd2efd910945c8f64b041b3900d9f2c328b475
-EBUILD gmic-1.5.9.1.ebuild 1900 SHA256 c14987c386db5af951cab7c0b090c4f0ff1e7c9f6cf33d6a9fbf02e208df9cf1 SHA512 bf8b3a56ac3a4b2f79b52da03dba5568aaedfdaabd8a73e3b2b44d4dfb539c82f203629724bc5b53e5179a2e5be06a7b725fdabb2f3c9ca7a123aefec7f94c24 WHIRLPOOL c706d64909e6831ab30ad4ef81a0c774a8c5c4df1027258f77230ca73cf914f9e32de09b59748ffbd6a45badb973fc878d0e5a7c8db2582cf366b28ae8940a80
-EBUILD gmic-1.5.9.2-r1.ebuild 1911 SHA256 6370dee1e51c1e299c1a503966eddc857e8fb33c8f5270f960035011f95faad7 SHA512 5905eb47378d61fe0eafec3d834ba0232e17f8097351a5c44487019a08c0c3c860a6c6766cd6d62dc7d08755b4f2ca45467f408dbd0b95d4f89bead93a84ead4 WHIRLPOOL 589162076161c3e95adffe0e56c82970542531a33d7dcd0f789429d84524c69263479bea2358774f3a631decbb4be2ed72dddaf46cc78c1b8036c2d579b2d653
 EBUILD gmic-1.6.0.2.ebuild 2094 SHA256 0a37c9b6f8d93dba698b3c232a5c8a55c6c710a9eda44b68d15705d49856c59d SHA512 a54a45a617fb6ee80db167237d0ba5b96f672f85368d2b2cdba9b4daefe24f6820ccebc858ffc422f97b2212bccd6e79e4c0563143fea9bee340579d0e10eeda WHIRLPOOL cca52c2758a18d3adfc5d22472e445dd07c663c1cc07b2921dcd4cd35bd26e82af860203fa482864cd60b30d5d3f0592256bcba6dbfb8074415772f4e8482834
-MISC ChangeLog 8200 SHA256 1cc6dd2398862725c979f5dadf96a61c64f446cefbd438a390e26246a942d182 SHA512 e2f856e5c36dc050c8201b60f672e7a477b67719827386dd3a8eeec1dbebe2c495e2fdf7e7ebb528e9ae59eb30bbeb6f1c7f261a10bc83a04aed451fa9c7509e WHIRLPOOL 801cac9cf3d33d74e6073ab09245b64f2c4002cf2e7993426b9664defdb51e73dd0831a3c7c51aff54969d6208e92f468d828c76d605c85fcb28d78733fb53ea
+MISC ChangeLog 8481 SHA256 2c6fae5f176f928446e1e3adf4ebd1e66600d0cf0deabe17c8b0335b758eb8e1 SHA512 301e496060b395a6129a613f7c91b14a95bce9bad2b8701bb1d065f9bd3b07aa41ca127ff76f2b79a861ba954139bdf255f65bcb42ab9b71ae407cb87038fff9 WHIRLPOOL 137d0e63f06fad0c699913334aa2e7b5226e98a02d2ff2fcf8c6dca11068dc39d5f3ed3b61f84f0cd7b5d37ad3c736985f955b02bfbe12389c05a28e47674188
 MISC metadata.xml 473 SHA256 def06af4d0283b01f9313231ff05df286129ff57afbcac23fcc7c45d8f735a6c SHA512 4bd720129471c24a6b71e32f11054d96bd2eefb3316489806a06b8deed45e5544fe1c74a73c129ec90fe30c8a4c0646c50e6690717046ad93255771627588f32 WHIRLPOOL 9a356f4c399b7a6fdf217b2dbeaeb4fd40dffc080b86c0ad913690c0b0007aaad52ea79d3b7b5b21591432c99a1e59ed02ead94e2578f1915afe2ee0c9f7d090
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUrgp0AAoJEEqz6FtPBkyjqeQH/3Xfk4DvoSXuFxaaIfrLkFVV
-TEY3S6zl+B4n+zvG3gkXZgtd+U3HsJDCISYXpyXVuWZmwEV1HzkNvONHmzfOX3OY
-4CE4Cg1DwnhrloOSiuObigXNYJ5xiR2vyB3dkqe3PlTOZYnz54AhclqxD5JoDtX/
-x67ATFc9vtGXAo5jsEQYeQ8UXbH9bxFUfigAG0nuK7KMAVax5Sq2mTvGIMh1kQ3N
-lHzPGljF+cKwipGiuSPpfHx2iVfJsAIOQbqX8qmfhZoNt6yV+TqaB19C2lLmXG/5
-Z/wLeTt37IfroV0G66I1y+/tJPVTj0Rhbz1ytSiaKya14ykiUWVDWe24o26uAkY=
-=z76N
+iQEcBAEBCAAGBQJUrgqkAAoJEEqz6FtPBkyj9IcH/3QfhGSHEGvWhpipAF7369eY
+v8rLfBP7L7eK/Vr2C7EHDVKxj9Qf0+z6wV//Zy0qtE6bs2rZa127LUa6RDgPb4j4
+CjjDd5Oh3ekmblySAjaf6oDCRz76rl+6bcItk2BNtQ0mEovn76P4qYgcplkZImW/
+fw7zXXdDkEFyJzSoXNsCm7T/4nro7rtwflbQ6qXVSl5BK/NGWSFgG4xZJGE+NpqC
+XmkhFbpH6OqVp59oSNpUYaoq2SrhbXh2QJwM9B9mbmiEbOrcGGkPtwxICmAObSBM
+HkhVMh9wRH8LP4Al8yIEePulN22QVN9yegOd1wHgGRCt/MThXPG5SiUDZmRidZM=
+=q0rP
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gmic/files/gmic-1.5.8.2-ffmpeg.patch b/media-gfx/gmic/files/gmic-1.5.8.2-ffmpeg.patch
deleted file mode 100644
index 474dae9f8016..000000000000
--- a/media-gfx/gmic/files/gmic-1.5.8.2-ffmpeg.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- gmic-1.5.8.2/src/CImg.h
-+++ gmic-1.5.8.2/src/CImg.h
-@@ -319,6 +319,7 @@
- extern "C" {
- #include <libavformat/avformat.h>
- #include <libavcodec/avcodec.h>
-+#include <libavutil/mathematics.h>
- #include <libswscale/swscale.h>
- }
- #endif
-@@ -45789,7 +45790,11 @@
-         AVPacket pkt;
-         int got_packet;
-         av_init_packet(&pkt);
-+#if LIBAVCODEC_VERSION_INT<AV_VERSION_INT(54,1,0)
-+        out_size = avcodec_encode_video(c,video_outbuf,video_outbuf_size,picture);
-+#else
-         out_size = avcodec_encode_video2(c,&pkt,picture,&got_packet);
-+#endif
-         if (got_packet) {
-           pkt.pts = av_rescale_q(c->coded_frame->pts,c->time_base,video_str->time_base);
-           if (c->coded_frame->key_frame) pkt.flags|=AV_PKT_FLAG_KEY;
diff --git a/media-gfx/gmic/files/gmic-1.5.8.4-makefile.patch b/media-gfx/gmic/files/gmic-1.5.8.4-makefile.patch
deleted file mode 100644
index 53f511fdfba9..000000000000
--- a/media-gfx/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-gfx/gmic/files/gmic-1.5.9.1-makefile.patch b/media-gfx/gmic/files/gmic-1.5.9.1-makefile.patch
deleted file mode 100644
index fd69a7c9c3ec..000000000000
--- a/media-gfx/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-gfx/gmic/files/gmic-1.5.9.2-makefile.patch b/media-gfx/gmic/files/gmic-1.5.9.2-makefile.patch
deleted file mode 100644
index 6a7d99dc5146..000000000000
--- a/media-gfx/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-gfx/gmic/gmic-1.5.8.6.ebuild b/media-gfx/gmic/gmic-1.5.8.6.ebuild
deleted file mode 100644
index 0e58b8b11e01..000000000000
--- a/media-gfx/gmic/gmic-1.5.8.6.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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.8.6.ebuild,v 1.1 2014/04/25 05:35:03 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() {
-	cp "${FILESDIR}"/${PN}-1.5.8.4-makefile.patch "${T}"/${PN}-1.5.8.4-makefile.patch
-	edos2unix "${T}"/${PN}-1.5.8.4-makefile.patch
-
-	epatch "${T}"/${PN}-1.5.8.4-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}_(C|LD)FLAGS =).*/\1/I" Makefile || die ; }
-	done
-
-	use graphicsmagick || { sed -i -r "s/^(MAGICK_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
-	use openexr || { sed -i -r "s/^(EXR_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
-
-	if ! use X ; then
-		sed -i -r "s/^((X11|XSHM)_(C|LD)FLAGS =).*/\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= custom 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 gmic_bashcompletion.sh ${PN}
-}
diff --git a/media-gfx/gmic/gmic-1.5.9.1.ebuild b/media-gfx/gmic/gmic-1.5.9.1.ebuild
deleted file mode 100644
index ae8c0573819b..000000000000
--- a/media-gfx/gmic/gmic-1.5.9.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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.1.ebuild,v 1.1 2014/06/06 06:16: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}_(C|LD)FLAGS =).*/\1/I" Makefile || die ; }
-	done
-
-	use graphicsmagick || { sed -i -r "s/^(MAGICK_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
-	use openexr || { sed -i -r "s/^(EXR_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
-
-	if ! use X ; then
-		sed -i -r "s/^((X11|XSHM)_(C|LD)FLAGS =).*/\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}
-}
diff --git a/media-gfx/gmic/gmic-1.5.9.2-r1.ebuild b/media-gfx/gmic/gmic-1.5.9.2-r1.ebuild
deleted file mode 100644
index ca01b07e7865..000000000000
--- a/media-gfx/gmic/gmic-1.5.9.2-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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}
-}