Remove old.

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

6 files changed, 14 insertions, 321 deletions

diff --git a/media-plugins/gimp-gmic/ChangeLog b/media-plugins/gimp-gmic/ChangeLog
index c6f9dd570104..108c6a4a73e0 100644
--- a/media-plugins/gimp-gmic/ChangeLog
+++ b/media-plugins/gimp-gmic/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/gimp-gmic
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-gmic/ChangeLog,v 1.23 2012/12/08 08:54:20 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-gmic/ChangeLog,v 1.24 2012/12/08 08:55:07 radhermit Exp $
+
+  08 Dec 2012; Tim Harder <radhermit@gentoo.org>
+  -files/gmic-1.5.1.7-makefile.patch, -gimp-gmic-1.5.1.9.ebuild,
+  -gimp-gmic-1.5.2.1.ebuild, -files/gmic-1.5.2.1-makefile.patch:
+  Remove old.
 
 *gimp-gmic-1.5.2.4 (08 Dec 2012)
 
diff --git a/media-plugins/gimp-gmic/Manifest b/media-plugins/gimp-gmic/Manifest
index 350743adab5d..f35705e3d377 100644
--- a/media-plugins/gimp-gmic/Manifest
+++ b/media-plugins/gimp-gmic/Manifest
@@ -1,27 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX gmic-1.5.1.7-makefile.patch 5485 SHA256 c3703b0c8e35cfd86a0b851da1a6b8b3da8776789d987ce395e5a772f6112411 SHA512 0e40fd978232680d08c1c36f01a86f9940fc34f7ef88465e67e52f23de821d13efec2dc931ae2bb9ac1daa464391b3784061ded738105ce0def330719a98c963 WHIRLPOOL 4a690fc8959d73209583a4b3a68d2d66854355e4d36564c1393a04396d033c8af4e6a43763739dee66db941b3cdd42b6ece7cafa0e1bfc5456b71f78886d7841
-AUX gmic-1.5.2.1-makefile.patch 5487 SHA256 ffec62289b6d13853a61a3bff389ffbb7c1530fa39c111837349adeb8803099f SHA512 e0c16322ce1b41626e9031a715f7893e0a1ae73cafe1905251219dc091919fe4e41c60384b4f9ece92cb8b6f7e8b2014c0ff65aa1f7c2970f2bb597d4ee0496e WHIRLPOOL 5dc7a731ccd1d113893f9e09b1d7e797b72cf46bd4d43ee1dcdcf132cddf7fad7cea043d2fe929dba257067e14a67973d0f7054cd0d9b430c3b1925d8df142e2
 AUX gmic-1.5.2.2-makefile.patch 4407 SHA256 db8acb3399e38a72aeee16d537f242d77b03ebd94987f47c9bc9cc3b2cea1c69 SHA512 83aed5494640a7e7e8db7500fe7dd0e46fd29b788caafde9c715c6c0de4f77a0137fed07a2c3606e8845d6cf66dcea9d68e57bbba03d509ec90dd2bb2f41f37e WHIRLPOOL ffefa2fb0187c7b8950e58630a4bd414a46480c037113e4b05ebbae6dfe3a339e2aada3f89065405b117ad876a51b3a2442a8c2c32430b62a8c354a8d74f122a
-DIST gmic_1.5.1.9.tar.gz 2097627 SHA256 dc1f4d92f417b72e25e60fdde092b2c3e783af77c0595329aab471a1cf22d165 SHA512 723aaf092e79243e672d434f62c3fea8d1b723ad732034aa22225619233d76d32a4472b2b88fcee0a07cb468b85a81110fff5097dda32f2278e175fb338f87ba WHIRLPOOL b94b84a6369a647885f9edad21fd98ed1cb70d68d2bdcef479626d5f623d45490547aafe75f5195d68c1f90f201dee4544c1cd36ec6ccb54599a9550b434abb8
-DIST gmic_1.5.2.1.tar.gz 2170700 SHA256 8284ebc215b8fd7c8edca98f5b0c99e1d229d2123f3d1265758dbe80b6350547 SHA512 6629a13cf824ddbcf5ba292dc18a745af6b9b41cb58c81b790866a54f071af9fe47724d73f8979b310256857480032eeeedb2699502106b5d22188032b6ac03e WHIRLPOOL 24bc500567de777705b0bab58bfd8fec0e1eabda6e55c8635c75b27b398a51c50ac37fd29a07fcf262947e89a43d522333cb5aea22d98af34409ee3913623d85
 DIST gmic_1.5.2.2.tar.gz 2187885 SHA256 e5e188e169bf9eebf47cd83d901ec2b44b0d5e5a06eadd734d51edce2202886d SHA512 757b331664178d857a241bf7a8ad8f3bafbbcf946000d0fd71cb717aa38210e34f4bf1e0df3c981fda8550722c7b6a2ee28c6a2d5d170d231127d5a0bc4fe6fe WHIRLPOOL c69e60e76ae354c258121461c334f40c34d32f4888bd41f2dfdfca6305b7bbf964a8c53a69fb6c782c51e33d814f5e498690c485bad1f8a10189dbb6c64363f8
 DIST gmic_1.5.2.4.tar.gz 2203118 SHA256 489f81653e3a7a00b5fa10d7d59c35de6a24de3ec24b57b4f6e4498743057c49 SHA512 ffa31dd118a847aefa2a9578803bbae1f3bdf65ad62de36ff68b8afc4e8dbe1459178b1552c2b84c4cdfad85c4bad9e3fd6fdb5d5f2bce713db655d69a48da29 WHIRLPOOL 70dbeb5b9e77fed1b191034f5395764914689117a71cd1d938ad78cd15ee00830936296b6c8531c3958b39274f2797135a0bc369d2c21c46e1e425c2d651bba4
-EBUILD gimp-gmic-1.5.1.9.ebuild 928 SHA256 448b7118adf1c4f623c6b908aa0ce277b2112db37954f2911c923c3a6dbb410f SHA512 630dd0caeaf15946743863a8449e34088c1fd6de9c5bca605330758abd7cf5583041c6209a149faf8000a2a8ae636533a67984b783210b049fb5af6d7b63e76c WHIRLPOOL c48d18089a7a94e607435256ab41787d11550f43a36d66351473763c16981ad98251d1bd1ecca3e6a8f05e2f5904c5e92fcf32edcde60ed157f4f84172576350
-EBUILD gimp-gmic-1.5.2.1.ebuild 926 SHA256 a0362efdf15d58cc34c955150d1d99615bb1d6c83cc8ed6a6c8a1f719055c0d7 SHA512 0d50792fcc5b26cdb5ce01139148bdbe9af5234f56afcf1dadf112ab38c3827958afa0d0d55ecea02b37a45d5239e90619ec5da519c223e9bb637481afb0c385 WHIRLPOOL e25ac7cdc9e4527d025fc1485a406608c95877808bb7bd758bf85b4da8d5491b3ca2da2bb6d2fd8c957b45e9225a95c35002b283dac23f37cfbc9c088f529ee9
 EBUILD gimp-gmic-1.5.2.2.ebuild 926 SHA256 517c20f87c617a92ac48739c9a4a960c20d7cb8034d8659c7c953b77e84b604c SHA512 bf782682a383f8e34818b5402d270c175b9e54089ae24604fe65175e5f6c8ee8ffa69f3072b57dc46c0e0816f88096c556632b62d869f58757808b71dd0e158c WHIRLPOOL ddc4ed3ae6cf10fbcd54501f96f6d37394a58f9c9c0a3fc5b1084dc69aaf696581f1f2ed7f674e030607172f1d83f07b16259cb75f958df22e7a7bb629386f3a
 EBUILD gimp-gmic-1.5.2.4.ebuild 949 SHA256 ac7f8dd6fed545c2c8fcfc20d73ce5bbd2b5783e2fb5b01d958d3e844eb32718 SHA512 9d5cd0ad9cce353c1f323e84af8f3d9834ffe108acde1236bd389aa220845880aa8ee0544e409834364343963c1ca27b1665045b23f0643e9c16dff87bb35e43 WHIRLPOOL 360367a858861d328d6200bfdadc82333658f8b1935490b83f3e61d5a8a47f0eb609c8bc398fc6d0734a789c430469074e4db56c7efc545b456aa428f3b81474
-MISC ChangeLog 3496 SHA256 da8cf6ea5d555d6f9d8fed3f57a0cd2c4987e9a0e3eeefc3e752251897b8e0a7 SHA512 a192be4e0fa2bea808918f4cea052f43ec2221c0c996e6357093c7d62b7f3ef48482e8330cd8459987e3517e65fbeb978fd56c648a352e8cffb8bd90a7f15644 WHIRLPOOL 17ace79e5b0364a1c36ca2d49bed4e991da9df5aa5f9da88af16a3548b855723cac185b957a052a9304d17222c26a6484e426817545e3aebb9a3359d5a640e0b
+MISC ChangeLog 3690 SHA256 21e76e2a2f698ad9fc7b4eff86150957935b4e138ffdf2418145260a1c619396 SHA512 7a96edc35c2b6975ecaf4177df5ca4512a7a2ce04e490dce9c812380f770aba71ab57ebef415fd14aa2e59f6552ebdd6b099cfebbcefbbad42214c9eba531265 WHIRLPOOL e16656096a317302cc61b027cea42ae1680692c373f4da210b10100adbb7f9037584fb1b2cec03511e5bdff8c5666bdf5eb1ed2e6c4c17094cd74292b8bb5204
 MISC metadata.xml 232 SHA256 a778e40f66cb2fa35529e4f45cb8356c8b1b109163cd939396f02e8ea6aa5f1a SHA512 6952f63da1c92a4ed7ddb87b5eb4003d123f0b7af6ffdbc9118159c97ddf18917e8ac7727285a42c07c64e52a40335bc2ef9f17261557617beb8c2226a391873 WHIRLPOOL 0a4441f075f8af01588da2aac3e03732f93463b8bea5e46749d37e1468452735d15f45243b930b3346c93734f8aa235a492030445fee471a95d2c5998f08e7de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQwwBBAAoJEEqz6FtPBkyjRrEH/2t32/R6Fe/jYv1wi8ReICab
-Sq2ay9dviXxJgtE6PL5knGFu3RPLlHsYeeYgZHtRWxdrMcfedwhE9Z8a5LuWZRHs
-EqZTU0onnz0zsDtxvujGZSdCYfP1wqS7hj8DsP1PMfuBMFp0Zjg5FdSNkSskoajx
-r9zrNXD4uNiYFl2olc0GQAKzhX/S8/VkQKFOY0RalfpgkVUMr3gggZB2QSqZ6k/j
-SsCw4/FF/V+Za/PfQHtNJA/B0Yg8NeuLuJ69QoWnQz5jzny9hMk0OeTKuNv5IX4t
-8OQegF2BkjHphFtjWiiCFKyUG3/lNB9f6fWKaVxM4hLewqO424NcjEiDlfR9zvY=
-=yr+w
+iQEcBAEBCAAGBQJQwwBsAAoJEEqz6FtPBkyjVDoH/06/V0R1bIJpoLtT4ncyPRuw
+UTgrOeOTUc8bm2V9JVdGNWCns0LJvZdSFIZYfu17oODfcQs3PYYC7MRV+jemWJ5z
+pi9xDjkzijEo5dLNfGO8T5WwkAYgpX6dyk0wBy9qJ+REdDIEP5omL2gmWO5V6tOz
+xT8bQwzeDc0BjYuf72p5fY+lLQx/yyMpc+326/HveYxiG8B8ZeuZxFQKLxnHjIZk
+dRFsn4/uM/RgxuhS0aLY6bQd3+wqv7F2WsIfkEuI4FeFcO/ubNRKAPnVkn3unWY6
+4HWW/2PGuJ6vLQ/A1Fu2Gfq98dGFvww6PY88PjMl8piOYGQjCzbHGksMK1awZkc=
+=vgCf
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/gimp-gmic/files/gmic-1.5.1.7-makefile.patch b/media-plugins/gimp-gmic/files/gmic-1.5.1.7-makefile.patch
deleted file mode 100644
index 505a1fbc20ce..000000000000
--- a/media-plugins/gimp-gmic/files/gmic-1.5.1.7-makefile.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- gmic-1.5.1.7/src/Makefile
-+++ gmic-1.5.1.7/src/Makefile
-@@ -89,7 +89,7 @@
- 
- # Flags that are mandatory to compile 'gmic'.
- MANDATORY_CFLAGS += -Dgmic_build -I$(USR)/include
--MANDATORY_LDFLAGS += -L$(USR)/lib
-+MANDATORY_LDFLAGS +=
- ifeq ($(IS_GCC),yes)
- MANDATORY_CFLAGS += -Wall -W
- MANDATORY_LDFLAGS += -lm
-@@ -97,15 +97,7 @@
- MANDATORY_CFLAGS+=$(IS_BETA_CFLAGS)
- 
- # Flags to enable debugging.
--DEBUG_CFLAGS = -Dcimg_use_vt100 -Dcimg_verbosity=3 -g
--
--# Flags to enable optimizations.
--ifeq ($(IS_GCC),yes)
--OPT_CFLAGS = -O3 -fno-tree-pre # -ffast-math
--endif
--ifeq ($(CC),icc)
--OPT_CFLAGS = -O3 -ipo -no-prec-div -override-limits
--endif
-+DEBUG_CFLAGS = -Dcimg_use_vt100 -Dcimg_verbosity=3
- 
- # Flags to enable image display, using X11
- # (keep /usr/ dirname here since X11 is located in /usr/ on Mac too).
-@@ -164,14 +156,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.
-@@ -216,11 +202,11 @@
- 	           $(EXR_LDFLAGS) $(FFTW_LDFLAGS) # $(OPENCV_LDFLAGS) $(FFMPEG_LDFLAGS) $(XSHM_LDFLAGS) # $(MAGICK_LDFLAGS)
- 
- CUST_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) $(PNG_CFLAGS) \
--                   $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(MINC2_CFLAGS) $(ZLIB_CFLAGS) \
--	           $(FFTW_CFLAGS) $(BOARD_CFLAGS) $(EXR_CFLAGS) $(MAGICK_CFLAGS) # $(FFMPEG_CFLAGS) $(OPENCV_CFLAGS)
-+                   $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) \
-+	           $(FFTW_CFLAGS) $(EXR_CFLAGS) $(MAGICK_CFLAGS) $(FFMPEG_CFLAGS) $(OPENCV_CFLAGS)
- CUST_UNIX_LDFLAGS = $(MANDATORY_LDFLAGS) $(X11_LDFLAGS) $(XSHM_LDFLAGS) $(PNG_LDFLAGS) \
--                    $(JPEG_LDFLAGS) $(TIFF_LDFLAGS) $(MINC2_LDFLAGS) $(ZLIB_LDFLAGS) \
--	    	    $(FFTW_LDFLAGS) $(BOARD_LDFLAGS) $(EXR_LDFLAGS) $(MAGICK_LDFLAGS) # $(FFMPEG_LDFLAGS) $(OPENCV_LDFLAGS)
-+                    $(JPEG_LDFLAGS) $(TIFF_LDFLAGS) $(ZLIB_LDFLAGS) \
-+	    	    $(FFTW_LDFLAGS) $(EXR_LDFLAGS) $(MAGICK_LDFLAGS) $(FFMPEG_LDFLAGS) $(OPENCV_LDFLAGS)
- 
- DEBUG_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(DEBUG_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) $(PNG_CFLAGS) \
-                     $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) $(FFTW_CFLAGS) \
-@@ -246,7 +232,7 @@
- STD_WINDOWS_LDFLAGS = $(MANDATORY_LDFLAGS) $(GDI32_LDFLAGS) $(ZLIB_LDFLAGS) $(PNG_LDFLAGS) $(JPEG_LDFLAGS) $(FFTW_LDFLAGS)
- 
- STD_GIMP_CFLAGS = -Dgmic_build -Dcimg_display=0 -Dcimg_use_rng -I$(USR)/include $(FFTW_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS) ${IS_BETA_CFLAGS}
--STD_GIMP_LDFLAGS = -L$(USR)/lib -lpthread $(FFTW_LDFLAGS) $(PNG_LDFLAGS) $(ZLIB_LDFLAGS)
-+STD_GIMP_LDFLAGS = -lpthread $(FFTW_LDFLAGS) $(PNG_LDFLAGS) $(ZLIB_LDFLAGS)
- ifeq ($(OS),MINGW32_NT-5.1)
- STD_GIMP_LDFLAGS += -mwindows
- endif
-@@ -289,10 +275,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)
-@@ -309,10 +295,10 @@
- 	$(MAKE) "CFLAGS+=$(DEBUG_UNIX_CFLAGS)" "LDFLAGS+=$(DEBUG_UNIX_LDFLAGS)" gmic_minimal
- 
- linux:
--	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic
-+	$(MAKE) "CFLAGS+=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_UNIX_LDFLAGS)" gmic_gmic
- 
- custom:
--	$(MAKE) "CFLAGS=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(CUST_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic
-+	$(MAKE) "CFLAGS+=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(CUST_UNIX_LDFLAGS)" gmic_gmic
- 
- solaris:
- 	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS) -R$(USR)/X11R6/lib -lrt -lnsl -lsocket" "STRIP_EXE=1" gmic_gmic
-@@ -342,7 +328,6 @@
- 	$(CC) -o gmic_gimp.o -c gmic.cpp -Dgmic_gimp -Dgmic_minimal -Dgmic_float $(CFLAGS)
- 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_minimal: gmic.cpp
- 	$(CC) -o gmic gmic.cpp -Dgmic_minimal -Dgmic_float -Dgmic_main $(CFLAGS) $(LDFLAGS)
-@@ -367,7 +352,6 @@
- 	$(CC) -o gmic_double.o -c gmic.cpp -Dgmic_separate_compilation -Dgmic_double $(CFLAGS)
- gmic_gmic: gmic.cpp 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.cpp -Dgmic_separate_compilation -Dgmic_main $(CFLAGS) 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)
- 
- def:
- 	@echo "#ifndef gmic_gimp" > gmic_def.h
diff --git a/media-plugins/gimp-gmic/files/gmic-1.5.2.1-makefile.patch b/media-plugins/gimp-gmic/files/gmic-1.5.2.1-makefile.patch
deleted file mode 100644
index c5b701344e8c..000000000000
--- a/media-plugins/gimp-gmic/files/gmic-1.5.2.1-makefile.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- gmic-1.5.2.1/src/Makefile
-+++ gmic-1.5.2.1/src/Makefile
-@@ -77,7 +77,7 @@
- 
- # Flags that are mandatory to compile 'gmic'.
- MANDATORY_CFLAGS += -Dgmic_build -I$(USR)/include
--MANDATORY_LDFLAGS += -L$(USR)/lib
-+MANDATORY_LDFLAGS +=
- ifeq ($(IS_GCC),yes)
- MANDATORY_CFLAGS += -Wall -W
- MANDATORY_LDFLAGS += -lm
-@@ -85,15 +85,7 @@
- MANDATORY_CFLAGS+=$(IS_BETA_CFLAGS)
- 
- # Flags to enable debugging.
--DEBUG_CFLAGS = -Dcimg_use_vt100 -Dcimg_verbosity=3 -g
--
--# Flags to enable optimizations.
--ifeq ($(IS_GCC),yes)
--OPT_CFLAGS = -O3 # -fno-tree-pre # -ffast-math
--endif
--ifeq ($(CC),icc)
--OPT_CFLAGS = -O3 -ipo -no-prec-div -override-limits
--endif
-+DEBUG_CFLAGS = -Dcimg_use_vt100 -Dcimg_verbosity=3
- 
- # Flags to enable image display, using X11
- # (keep /usr/ dirname here since X11 is located in /usr/ on Mac too).
-@@ -152,14 +144,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.
-@@ -204,11 +190,11 @@
- 	           $(EXR_LDFLAGS) $(FFTW_LDFLAGS) # $(OPENCV_LDFLAGS) $(FFMPEG_LDFLAGS) $(XSHM_LDFLAGS) # $(MAGICK_LDFLAGS)
- 
- CUST_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) $(PNG_CFLAGS) \
--                   $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(MINC2_CFLAGS) $(ZLIB_CFLAGS) \
--	           $(FFTW_CFLAGS) $(BOARD_CFLAGS) $(EXR_CFLAGS) $(MAGICK_CFLAGS) # $(FFMPEG_CFLAGS) $(OPENCV_CFLAGS)
-+                   $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) \
-+	           $(FFTW_CFLAGS) $(EXR_CFLAGS) $(MAGICK_CFLAGS) $(FFMPEG_CFLAGS) $(OPENCV_CFLAGS)
- CUST_UNIX_LDFLAGS = $(MANDATORY_LDFLAGS) $(X11_LDFLAGS) $(XSHM_LDFLAGS) $(PNG_LDFLAGS) \
--                    $(JPEG_LDFLAGS) $(TIFF_LDFLAGS) $(MINC2_LDFLAGS) $(ZLIB_LDFLAGS) \
--	    	    $(FFTW_LDFLAGS) $(BOARD_LDFLAGS) $(EXR_LDFLAGS) $(MAGICK_LDFLAGS) # $(FFMPEG_LDFLAGS) $(OPENCV_LDFLAGS)
-+                    $(JPEG_LDFLAGS) $(TIFF_LDFLAGS) $(ZLIB_LDFLAGS) \
-+	    	    $(FFTW_LDFLAGS) $(EXR_LDFLAGS) $(MAGICK_LDFLAGS) $(FFMPEG_LDFLAGS) $(OPENCV_LDFLAGS)
- 
- DEBUG_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(DEBUG_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) $(PNG_CFLAGS) \
-                     $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) $(FFTW_CFLAGS) \
-@@ -234,7 +220,7 @@
- STD_WINDOWS_LDFLAGS = $(MANDATORY_LDFLAGS) $(GDI32_LDFLAGS) $(ZLIB_LDFLAGS) $(PNG_LDFLAGS) $(JPEG_LDFLAGS) $(FFTW_LDFLAGS)
- 
- STD_GIMP_CFLAGS = -Dgmic_build -Dcimg_display=0 -Dcimg_use_rng -I$(USR)/include $(FFTW_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS) ${IS_BETA_CFLAGS}
--STD_GIMP_LDFLAGS = -L$(USR)/lib -lpthread $(FFTW_LDFLAGS) $(PNG_LDFLAGS) $(ZLIB_LDFLAGS)
-+STD_GIMP_LDFLAGS = -lpthread $(FFTW_LDFLAGS) $(PNG_LDFLAGS) $(ZLIB_LDFLAGS)
- ifeq ($(OS),MINGW32_NT-5.1)
- STD_GIMP_LDFLAGS += -mwindows
- endif
-@@ -287,10 +273,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)
-@@ -313,10 +299,10 @@
- 	$(MAKE) "CFLAGS+=$(DEBUG_UNIX_CFLAGS)" "LDFLAGS+=$(DEBUG_UNIX_LDFLAGS)" gmic_minimal
- 
- linux:
--	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic
-+	$(MAKE) "CFLAGS+=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_UNIX_LDFLAGS)" gmic_gmic
- 
- custom:
--	$(MAKE) "CFLAGS=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(CUST_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic
-+	$(MAKE) "CFLAGS+=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(CUST_UNIX_LDFLAGS)" gmic_gmic
- 
- solaris:
- 	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS) -R$(USR)/X11R6/lib -lrt -lnsl -lsocket" "STRIP_EXE=1" gmic_gmic
-@@ -346,7 +332,6 @@
- 	$(CC) -o gmic_gimp.o -c gmic.cpp -Dgmic_gimp -Dgmic_minimal -Dgmic_float $(CFLAGS)
- 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_minimal: gmic.cpp
- 	$(CC) -o gmic gmic.cpp -Dgmic_minimal -Dgmic_float -Dgmic_main $(CFLAGS) $(LDFLAGS)
-@@ -371,7 +356,6 @@
- 	$(CC) -o gmic_double.o -c gmic.cpp -Dgmic_separate_compilation -Dgmic_double $(CFLAGS)
- gmic_gmic: gmic.cpp 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.cpp -Dgmic_separate_compilation -Dgmic_main $(CFLAGS) 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)
- 
- def:
- 	@echo "#ifndef gmic_gimp" > gmic_def.h
diff --git a/media-plugins/gimp-gmic/gimp-gmic-1.5.1.9.ebuild b/media-plugins/gimp-gmic/gimp-gmic-1.5.1.9.ebuild
deleted file mode 100644
index 9c1449f4a763..000000000000
--- a/media-plugins/gimp-gmic/gimp-gmic-1.5.1.9.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 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.1.9.ebuild,v 1.1 2012/09/01 07:25:11 radhermit Exp $
-
-EAPI="4"
-
-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
-	sci-libs/fftw:3.0
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/gmic-${PV}/src
-
-src_prepare() {
-	epatch "${FILESDIR}"/gmic-1.5.1.7-makefile.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCXX)" 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.2.1.ebuild b/media-plugins/gimp-gmic/gimp-gmic-1.5.2.1.ebuild
deleted file mode 100644
index b7e6a19dddfc..000000000000
--- a/media-plugins/gimp-gmic/gimp-gmic-1.5.2.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 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.2.1.ebuild,v 1.1 2012/11/02 07:53:21 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
-	sci-libs/fftw:3.0
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/gmic-${PV}/src
-
-src_prepare() {
-	epatch "${FILESDIR}"/gmic-${PV}-makefile.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCXX)" 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"
-}