Version bump.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 210 insertions, 18 deletions

diff --git a/media-gfx/gmic/ChangeLog b/media-gfx/gmic/ChangeLog
index 5cf1e8b56081..0e26d7e880b3 100644
--- a/media-gfx/gmic/ChangeLog
+++ b/media-gfx/gmic/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/gmic
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.18 2012/06/21 21:06:10 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.19 2012/07/26 02:12:13 radhermit Exp $
+
+*gmic-1.5.1.7 (26 Jul 2012)
+
+  26 Jul 2012; Tim Harder <radhermit@gentoo.org> +gmic-1.5.1.7.ebuild,
+  +files/gmic-1.5.1.7-makefile.patch:
+  Version bump.
 
   21 Jun 2012; Tim Harder <radhermit@gentoo.org>
   -files/gmic-1.5.0.9-makefile.patch, -gmic-1.5.1.0.ebuild:
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index a08acb18e398..958bd9b12068 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,23 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX gmic-1.5.0.7-ffmpeg.patch 1927 RMD160 bb0d018a362b84d9b9ecea1a82f5c46c9f620206 SHA1 075a441d8f9f0e62f7d507ad8d785462642c2d8e SHA256 57e36922ecd33f8b05666ff707ed7f8cba2d9c732ae3bad7bd379a52bf2c0b25
-AUX gmic-1.5.1.4-makefile.patch 5333 RMD160 add86345ebd6714e54b504260c054af1ef40aeca SHA1 0dd4074b40365b785028857c486cc3e44ed7b2b9 SHA256 a0f09d0d3387879fa252297f0baff4dbdab18d7f462b38850aea9c4686fe7e83
-AUX gmic-1.5.1.6-makefile.patch 5517 RMD160 287c67dc8debc8d69ed006d2e4c939a5b52defed SHA1 4976b598844b8fc5f0b5d917c9918507d33b73b6 SHA256 66ecf6cded9f8404c7ff075cd8d37b3e4861b61ec6bf2c0d50d548635e2c2a66
-DIST gmic_1.5.1.4.tar.gz 1935597 RMD160 7f7912ad2aed75266b45e301aa257aa9b932d2e2 SHA1 15fb5e9617595dfcc4ae07302e498b99e5ca78ae SHA256 f59e4a7f8d4d657590073cfb07d9e611bcd8988662c914e5bbd9fa40ff51f31a
-DIST gmic_1.5.1.6.tar.gz 1957144 RMD160 984361cfd96815a07b2e4c9f6ab7ae515de8b344 SHA1 c0bdee15db24b4528548df55d78668c3aca7c9ff SHA256 e3db47c8a3102f0e22620991c0ecfec82ad46dd11449d7c85aed3d4607c458b9
-EBUILD gmic-1.5.1.4.ebuild 1853 RMD160 7cfc58dd5b57bb72de43ba2bc8c8a696e3ab0800 SHA1 c915d1d7ad3cf64cbbd96550c28df32f9a599674 SHA256 dbddc3123457343624636e04d2bcd80637b0f80555d26f17b5eb3652adaad7f8
-EBUILD gmic-1.5.1.6.ebuild 1853 RMD160 b4af5aac9771acc69530df42ba9da04633c9604e SHA1 319a802151a6d705bf968f83715b056ff2361408 SHA256 22330a10ecd68a93abc8754ad1606229879b1b87e51f69028a443909d79ff5e7
-MISC ChangeLog 2578 RMD160 bb6c14e931136563001c392877773cf3737f5b03 SHA1 96bdfcc9973690daf185ba4fb49dfd831375294c SHA256 742eb5f486c65158da6bf03a452db05165324a7c20d3540d1015a646c1d9b55e
-MISC metadata.xml 473 RMD160 680f8739786ae6d9221c0f6d2734cb16682c1b7c SHA1 1ce57e832b27b5e349e070cdeaf37ff11f500b18 SHA256 def06af4d0283b01f9313231ff05df286129ff57afbcac23fcc7c45d8f735a6c
+AUX gmic-1.5.0.7-ffmpeg.patch 1927 SHA256 57e36922ecd33f8b05666ff707ed7f8cba2d9c732ae3bad7bd379a52bf2c0b25 SHA512 9240966708b0aed5bcb04e0e15650f5697c06ab8f7a0bd16529071e4f17562f4a9ab7e28aaf31b8835d1d04876febd1c2883242c1d7279f913ff66cb04a3c27c WHIRLPOOL 97d82dc3300eb4b364f94fa2990d676f60a3ef644cb34a2ff8c5ecc24cff38d25fe3aefe846e316768a1b7a03d9178fd16db9cb0568612f7c7a425de9b22afba
+AUX gmic-1.5.1.4-makefile.patch 5333 SHA256 a0f09d0d3387879fa252297f0baff4dbdab18d7f462b38850aea9c4686fe7e83 SHA512 82693956a262e388d71fa214207d16173dc0310ac9b3558e59a2ab97cfcf6f7dd39adbc9d1c1a38aa4e60cc6304eb52d4b8fbfc8069ddd6eb4ed2107f32938f5 WHIRLPOOL 24db2dfce32b6d10794760bef9967f2a769bad978a034dba9ae2ac5c68e64bcb09e3fe96b838a6ede310cb52de5e1a70c88c9314843ba0f1bf037daaa4d060f6
+AUX gmic-1.5.1.6-makefile.patch 5517 SHA256 66ecf6cded9f8404c7ff075cd8d37b3e4861b61ec6bf2c0d50d548635e2c2a66 SHA512 eaa8e8d1f1ef0e73834771b956d23e6ea33ab3202da9997d0ad45ffb2ffbd3a46b70690de3513944a9cb50171344bec5a89064e314789acfb84c60d97f553a18 WHIRLPOOL b7caa7391e2a9c348e13cf9eda5a556d4cacf1966241764548054435757ee839698b8875bc05926343abd9f47e4cb28857be4963b435a4ef920ab7a676fc092a
+AUX gmic-1.5.1.7-makefile.patch 5485 SHA256 c3703b0c8e35cfd86a0b851da1a6b8b3da8776789d987ce395e5a772f6112411 SHA512 0e40fd978232680d08c1c36f01a86f9940fc34f7ef88465e67e52f23de821d13efec2dc931ae2bb9ac1daa464391b3784061ded738105ce0def330719a98c963 WHIRLPOOL 4a690fc8959d73209583a4b3a68d2d66854355e4d36564c1393a04396d033c8af4e6a43763739dee66db941b3cdd42b6ece7cafa0e1bfc5456b71f78886d7841
+DIST gmic_1.5.1.4.tar.gz 1935597 SHA256 f59e4a7f8d4d657590073cfb07d9e611bcd8988662c914e5bbd9fa40ff51f31a SHA512 18a2e01bb5816d73b70dd0099e2bc9e478500168f3bece2a2ef735962612b3d710a72300274b6b8528ea87e5d628d6fb8e5268540132b879fcb3ac60684f2dbc WHIRLPOOL ba0ba2b3c2cd7d0bbda0b1f459189a9a583d404b232e947bb8215d04206a044b9a31125a4b4aab6e6c81216fe1f6b4ac320c8e97560a3a98ad9fbf232d58a09f
+DIST gmic_1.5.1.6.tar.gz 1957144 SHA256 e3db47c8a3102f0e22620991c0ecfec82ad46dd11449d7c85aed3d4607c458b9 SHA512 fb399f9e64328c0dba680599828f4ad5a517c9b872dd6c46c5a3769014805710929f7503d17c2c830258d49651e9e0c2b59135565b241c165f5dbb9a799342b3 WHIRLPOOL 47aa7faf5d04242288f4e954215fce8b9cfcda36f5e9062561b0edd63f4938f7d35e35e5c60ed74cae60b2515726cfaa623e9f9c86f71f15735a0eed1cb5454a
+DIST gmic_1.5.1.7.tar.gz 2090431 SHA256 13d7030099f5a485a11b178d19a882ee776c40d6029a7351bfc2bdc7dcb9e665 SHA512 2ae3fbefc8fe865f7ece6e93008650bad946019da3fd6cf50ab61d3895dbddc2ff89cdb35d2bf65c76aa5d188341c25a5c34978414a7635291b2a4d5d0a52740 WHIRLPOOL 1d293b334743ba901ff151e0dcb3d631b72c5298e7ef77d402223c003a5972c06f1f2c844e35116815b2a4857046aaf8c91dbee248367ddc6bbfea9e34e11ac7
+EBUILD gmic-1.5.1.4.ebuild 1853 SHA256 dbddc3123457343624636e04d2bcd80637b0f80555d26f17b5eb3652adaad7f8 SHA512 efe0d9923cee5f919c2ea7c188367c39d5582e2f5c2e716921cf66678077683c59360d261cd64ca33ff96c2057a9091a40bf96707ea074dac5d1367c50f966d7 WHIRLPOOL cb338735163b00130bf5b5ce62c28e0da445c2d79a0e9a3535fa30672985fdb1cd6cfbefd1906aae8a909acd9406674f7fcad95e3f90c28e62b7b0cdfbbbb97e
+EBUILD gmic-1.5.1.6.ebuild 1853 SHA256 22330a10ecd68a93abc8754ad1606229879b1b87e51f69028a443909d79ff5e7 SHA512 b19b255065cc5e7aedd56726ba2c0a7f3e81c15784735d8ee0f2732c774b73b1e8f1e1166e436f7fd69975720ce6816db40aa3c2d55149b3c4fb9202735bce23 WHIRLPOOL 62b27ba962032519fb1fa516b2b47153285bb19a8c91cac529722e0d183992bfd0301c746708cd842ca5c2870bcd5ad70937b98355ba9294400386c0a6700944
+EBUILD gmic-1.5.1.7.ebuild 1838 SHA256 38de549cab03e77ca53b8353843b1029222947516085ac9416b7e1fae2c5e390 SHA512 7b77c7d918bfa2caf98550a60c0547c4b4e4e1a9296ee607c394b81335ec388c996c4817881e3c4dc7914a5230bf9237fd1125b63ada1f4dc65f1d0c604ac4db WHIRLPOOL 942ce4a78b4ff76d9f644a0cb29a2a300e987232d162163686c735f9f3768afa7adc4bcc6ced8d41e1eca5f27d5dd3231f5b344e5c158d75cccee8c8a23be8dd
+MISC ChangeLog 2733 SHA256 156fe28f8c8b3bd5030f3ae48fa6827dedf7779e8365bc9424d1a1571f73fc1c SHA512 433cc0ca1f534e21f1459779f5ddd57d91af95793701db65684a2b8d560c31957b9da35e63f3090518555f7fd6fd69ca2e8e1d1ddd8617ebbddc709226217482 WHIRLPOOL fb4cc013654f0fe098ec6aa4155a53ecfa11a5ad57076300e4e2814ff6e8e8918cbe03e4481c654bf942b1eb2ce71b4330134797dd66db8e9a8ca64d88be5d5b
+MISC metadata.xml 473 SHA256 def06af4d0283b01f9313231ff05df286129ff57afbcac23fcc7c45d8f735a6c SHA512 4bd720129471c24a6b71e32f11054d96bd2eefb3316489806a06b8deed45e5544fe1c74a73c129ec90fe30c8a4c0646c50e6690717046ad93255771627588f32 WHIRLPOOL 9a356f4c399b7a6fdf217b2dbeaeb4fd40dffc080b86c0ad913690c0b0007aaad52ea79d3b7b5b21591432c99a1e59ed02ead94e2578f1915afe2ee0c9f7d090
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJP44zHAAoJEEqz6FtPBkyj0zIH/1luKyqb3McBuAiwGYQgAlrB
-L4KyqkLh22V8j/HY7YfIgNxVQiCraui6YJtTHqEsdfnZKowqkywZn5wRLrNkXT1H
-TemswI0Xj9FZ3dZ5WRKE1gYe1Em3MmaSSXe7NTLPSHIzPgpWDGFjw28CFRopI+RM
-z9cf8cjO5v0XlQ+iwl7S9br9ODBC00+EZS1mq/vcY1elFvyRbStiacPANtZhRG34
-ZdErWc5PHNVxr7TG3LIs2T5NICQXnCnkwkvvu76D8c2ZqkMLrJTxHh2NxkVJzaRn
-3hwMNIrKS+C0tobCr2BaBql8mlC6Ngchn5tRVmx/Q8DBNMhqSimcfCi567sUO1s=
-=XlHH
+iQEcBAEBCAAGBQJQEKeGAAoJEEqz6FtPBkyjVSgIAIjwDvvc2h2VzSUochY35WVt
+kj/O8wfsGp/c02v7dkJLhWpRxvlN5U3Vu1/D5rR7v2l9QgRN44L1ASMJ3akCT2PF
+QmSgGbMPdiA4plAL9lS2Bt1K3wfPbC3S6gZW4MJpgGiGEWK7+NfbXs+h4MGBVdg+
+KXzXOEJqLhKVxr5/9Qmhi9uKFteHHT6AkaaksCLinFmZFGnNbQOqwB46qMg808XB
+urX5i9qNEe2wT6dKh8gLnZQX0oJgDFWoq7O3Hg8u4pEUOHeGrnkgfkpHki8Yz8R7
+KJV7nJEGg6r0czak/pntIARyLoL+7E/b0/t9qZUFNZRituoml9py78Y9KqKA8y0=
+=3SzN
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gmic/files/gmic-1.5.1.7-makefile.patch b/media-gfx/gmic/files/gmic-1.5.1.7-makefile.patch
new file mode 100644
index 000000000000..505a1fbc20ce
--- /dev/null
+++ b/media-gfx/gmic/files/gmic-1.5.1.7-makefile.patch
@@ -0,0 +1,110 @@
+--- 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-gfx/gmic/gmic-1.5.1.7.ebuild b/media-gfx/gmic/gmic-1.5.1.7.ebuild
new file mode 100644
index 000000000000..4c1e16d8aecf
--- /dev/null
+++ b/media-gfx/gmic/gmic-1.5.1.7.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/gmic-1.5.1.7.ebuild,v 1.1 2012/07/26 02:12:13 radhermit Exp $
+
+EAPI="4"
+
+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"
+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 )
+	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.0.7-ffmpeg.patch
+
+	for i in ffmpeg fftw jpeg opencv png tiff zlib ; do
+		use $i || { sed -i -r -e "s/^(${i}_(C|LD)FLAGS =).*/\1/I" Makefile || die ; }
+	done
+
+	use graphicsmagick || { sed -i -r -e "s/^(MAGICK_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
+	use openexr || { sed -i -r -e "s/^(EXR_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
+
+	if ! use X ; then
+		sed -i -r -e "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)" 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}
+}