Version bump.

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

4 files changed, 170 insertions, 10 deletions

diff --git a/media-plugins/gimp-gmic/ChangeLog b/media-plugins/gimp-gmic/ChangeLog
index e27f4ee0e575..7d325b0addbb 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-gmic/ChangeLog,v 1.10 2012/03/01 22:29:30 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-gmic/ChangeLog,v 1.11 2012/05/30 06:08:47 radhermit Exp $
+
+*gimp-gmic-1.5.1.4 (30 May 2012)
+
+  30 May 2012; Tim Harder <radhermit@gentoo.org> +gimp-gmic-1.5.1.4.ebuild,
+  +files/gmic-1.5.1.4-makefile.patch:
+  Version bump.
 
   01 Mar 2012; Tim Harder <radhermit@gentoo.org> -gimp-gmic-1.5.0.7.ebuild,
   -files/gmic-1.5.0.7-makefile.patch, -gimp-gmic-1.5.0.8.ebuild:
diff --git a/media-plugins/gimp-gmic/Manifest b/media-plugins/gimp-gmic/Manifest
index 982c1429e1c1..ce81af1a7837 100644
--- a/media-plugins/gimp-gmic/Manifest
+++ b/media-plugins/gimp-gmic/Manifest
@@ -2,20 +2,23 @@
 Hash: SHA512
 
 AUX gmic-1.5.0.9-makefile.patch 5719 RMD160 745e350bd25ed1b0862303903df7c1af9061429f SHA1 899023b36c4da45ffeb3870f35bef89d14090ac4 SHA256 6d30842378663dfec2dc1cb4277b986ca675daab54af34aa67fb112291dfb9cd
+AUX gmic-1.5.1.4-makefile.patch 5333 RMD160 add86345ebd6714e54b504260c054af1ef40aeca SHA1 0dd4074b40365b785028857c486cc3e44ed7b2b9 SHA256 a0f09d0d3387879fa252297f0baff4dbdab18d7f462b38850aea9c4686fe7e83
 DIST gmic_1.5.0.9.tar.gz 1196717 RMD160 fdd779ecbe0bc33060641dcfd6b1f5e1d3db3d26 SHA1 0800997001cfff79a82a11e07239b5971316833a SHA256 d647a64bd25bf4146d1c755aa2d26f129605e03b3072dca2dc2e6ec5e38ed3b0
 DIST gmic_1.5.1.0.tar.gz 1958110 RMD160 e683d04588e3b5b5e186a61e5cf8ddbf87944aa3 SHA1 34f22eda7fdb730718ab1c9de15f5c721c5ef163 SHA256 1622d3d8365e3b8720e13f5fc4eb58dfecb944535f9334255a5ea99e14ba6074
+DIST gmic_1.5.1.4.tar.gz 1935597 RMD160 7f7912ad2aed75266b45e301aa257aa9b932d2e2 SHA1 15fb5e9617595dfcc4ae07302e498b99e5ca78ae SHA256 f59e4a7f8d4d657590073cfb07d9e611bcd8988662c914e5bbd9fa40ff51f31a
 EBUILD gimp-gmic-1.5.0.9.ebuild 928 RMD160 b1294a92d68c05756538906fe22134ddd1d64d95 SHA1 e9f9228853a67539645eb2415c35690fc7ad1610 SHA256 62bd44db55b2a3c68cdf3aab52cbcc2496c0b2bddf27cf7cdca23ed76e81df08
 EBUILD gimp-gmic-1.5.1.0.ebuild 930 RMD160 57a7c63a58e58c43d726c08d479d74d385f24222 SHA1 74c4014edabad7939bc0d26a7ad7568a278e199c SHA256 6e16a8a50c93d38d35a3cee3246ddff8a6e77d8fddbc1746721802f3e1a2ba39
-MISC ChangeLog 1692 RMD160 bb11670aa86cb689cff94ab4136682aaede4d03f SHA1 f03757e03836c2606cafb3bc619f3a7f5507a543 SHA256 7d199693a0fe249574bf00745a08a61a59be249cdc087db19e4c0235993fbe52
+EBUILD gimp-gmic-1.5.1.4.ebuild 926 RMD160 ce859581534a4addbf06f78398a71ef08cdf7b1c SHA1 3dd69113fc8f10a4bc9145cbc4aaf5093b211e9c SHA256 0f3fbddf520f78d87013572d902dfc47d8aca76c0004c0ed734e85c45e1d97b1
+MISC ChangeLog 1857 RMD160 d2b40c32929c7312bc0fe9776700aac19b0a38c4 SHA1 d3e4741f73a75af18e026a98c5a75a424a365b47 SHA256 235a6fe79d1deb5683306f05eed89b3293073373bb402496eb9599a70fecdd5a
 MISC metadata.xml 232 RMD160 9725fc18735b1d8d4079f25759ee0823a0c6795d SHA1 ec75efe30e67f74a4f315324afc75ed2a8d30bb4 SHA256 a778e40f66cb2fa35529e4f45cb8356c8b1b109163cd939396f02e8ea6aa5f1a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPT/hQAAoJEEqz6FtPBkyjKSAIAKDFcdnKNWIf5BXt2V/Gu3yu
-6I3s6DZ9gxtH3aCl9lE6h303Dc2zlfp5kShRx0zOQ9BrhnJ3e2mx4U4Z8+3ltMgZ
-YvT/6XbeW0x9hHU6LDDXvlkocgxhmnpnKlDH/q2lztRMxPk2tr26BLejwyPpoBya
-vmMmExwhUQo4524qkwrPFxUgQa0bAzXQmEL44LfFj5dIIKBDnTU5wVc6KVqtAajo
-+fw7Fr1cnmVb6IbararyQbykmsYhofBoZCF1FXXrjOMvjqDwA84W5DN1C8ohYQqQ
-BTptxb01ypdAa6+Gp9ja29rD9vxbG4TLn/N8XFUX7k7wIAVzAoZCOULfjtiPgB8=
-=Gkwp
+iQEcBAEBCgAGBQJPxbl1AAoJEEqz6FtPBkyjx8EIAJ34CQutmBorJDRHrq965xhK
+slc6h1noQsW7PZ5OOffARK0qfuzW7L8nNSm8yuaQ8qiPNkC78CmJoY+ueFLVC/sf
+yY0VyIwTu3tReFugcWmooWFyjneoE1XaP5l2gIiQC5aZYrtSh9Acr8Hj5aMVWGmt
+2K4HvSc2MNckqJReI6gdXFqGkcpdFy7K+jpNqvZOc+yh1dTAJODN4GFAaFAGejv9
+Am3AKchqQSQxC53xOAC4wlxLOkTwyA3xW+hCCkLda6Hiv4YmehTC0eiHTD2Nrp8R
+9gZRmpBWX01q1r3NiCttYf8fplxKyCev+33I+sg/PUgn03GGCjJA2TDxwxgav6s=
+=CJdb
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/gimp-gmic/files/gmic-1.5.1.4-makefile.patch b/media-plugins/gimp-gmic/files/gmic-1.5.1.4-makefile.patch
new file mode 100644
index 000000000000..fdb966da99df
--- /dev/null
+++ b/media-plugins/gimp-gmic/files/gmic-1.5.1.4-makefile.patch
@@ -0,0 +1,108 @@
+--- gmic-1.5.1.4/src/Makefile
++++ gmic-1.5.1.4/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).
+@@ -165,12 +157,7 @@
+ # This requires the presence of the OpenCV include and library files.
+ # (package 'libcv3-2-dev' on Debian).
+ OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv
+-ifeq ($(OS),Darwin)
+ OPENCV_LDFLAGS = `pkg-config opencv --libs`   # Use this for OpenCV 2.2.0 !
+-else
+-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.
+@@ -215,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) \
+@@ -245,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
+@@ -291,10 +278,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)
+@@ -311,10 +298,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
+@@ -344,7 +331,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)
+@@ -369,7 +355,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.4.ebuild b/media-plugins/gimp-gmic/gimp-gmic-1.5.1.4.ebuild
new file mode 100644
index 000000000000..bde1e005c0f2
--- /dev/null
+++ b/media-plugins/gimp-gmic/gimp-gmic-1.5.1.4.ebuild
@@ -0,0 +1,43 @@
+# 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.4.ebuild,v 1.1 2012/05/30 06:08:48 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-${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"
+}