Version bump.

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

4 files changed, 170 insertions, 9 deletions

diff --git a/media-plugins/gimp-gmic/ChangeLog b/media-plugins/gimp-gmic/ChangeLog
index 091e129a84f9..9fda1ddbb77c 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.12 2012/05/30 06:10:04 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-gmic/ChangeLog,v 1.13 2012/06/21 21:10:48 radhermit Exp $
+
+*gimp-gmic-1.5.1.6 (21 Jun 2012)
+
+  21 Jun 2012; Tim Harder <radhermit@gentoo.org> +gimp-gmic-1.5.1.6.ebuild,
+  +files/gmic-1.5.1.6-makefile.patch:
+  Version bump.
 
   30 May 2012; Tim Harder <radhermit@gentoo.org> -gimp-gmic-1.5.0.9.ebuild:
   Remove old.
diff --git a/media-plugins/gimp-gmic/Manifest b/media-plugins/gimp-gmic/Manifest
index a771e4de359b..16a4ad257a8d 100644
--- a/media-plugins/gimp-gmic/Manifest
+++ b/media-plugins/gimp-gmic/Manifest
@@ -3,20 +3,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
+AUX gmic-1.5.1.6-makefile.patch 5517 RMD160 287c67dc8debc8d69ed006d2e4c939a5b52defed SHA1 4976b598844b8fc5f0b5d917c9918507d33b73b6 SHA256 66ecf6cded9f8404c7ff075cd8d37b3e4861b61ec6bf2c0d50d548635e2c2a66
 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
+DIST gmic_1.5.1.6.tar.gz 1957144 RMD160 984361cfd96815a07b2e4c9f6ab7ae515de8b344 SHA1 c0bdee15db24b4528548df55d78668c3aca7c9ff SHA256 e3db47c8a3102f0e22620991c0ecfec82ad46dd11449d7c85aed3d4607c458b9
 EBUILD gimp-gmic-1.5.1.0.ebuild 930 RMD160 57a7c63a58e58c43d726c08d479d74d385f24222 SHA1 74c4014edabad7939bc0d26a7ad7568a278e199c SHA256 6e16a8a50c93d38d35a3cee3246ddff8a6e77d8fddbc1746721802f3e1a2ba39
 EBUILD gimp-gmic-1.5.1.4.ebuild 926 RMD160 ce859581534a4addbf06f78398a71ef08cdf7b1c SHA1 3dd69113fc8f10a4bc9145cbc4aaf5093b211e9c SHA256 0f3fbddf520f78d87013572d902dfc47d8aca76c0004c0ed734e85c45e1d97b1
-MISC ChangeLog 1948 RMD160 9e6db7a5ec6834d834c8ed236f07fcb370e4bb5e SHA1 1e3412ea1625ef04e6ebc1b7ee07f5740f7b6149 SHA256 9e3a7458bebac91eacd6f6aed8d88ee5fe1138986422fc300d54691547e9f509
+EBUILD gimp-gmic-1.5.1.6.ebuild 926 RMD160 83ce6a3b1659af1c6a9a779435a32f7696080811 SHA1 eb0f3140f1408f2f0cceecdb5d9eaf1ed483736e SHA256 dce617077e04286d78cdac1c15e4503847c2e07f4f6ee8504b24453b6298a3ea
+MISC ChangeLog 2113 RMD160 f48922fb1ac6bc1f90fc94b60bad75fef6d370da SHA1 b148dd22390cae4236d9233764ee4552b9db7c6c SHA256 71fb1db26a0115861f677e135acc8ad51a7a7e399fd0aec5063651b836e71a47
 MISC metadata.xml 232 RMD160 9725fc18735b1d8d4079f25759ee0823a0c6795d SHA1 ec75efe30e67f74a4f315324afc75ed2a8d30bb4 SHA256 a778e40f66cb2fa35529e4f45cb8356c8b1b109163cd939396f02e8ea6aa5f1a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPxbnBAAoJEEqz6FtPBkyjYM8IAIoF1SDaqEQsvQzLoBuF0MCX
-7uFGC9QkgRrts2+E/3gwGVIL7lfE1hSDye0Ot7JocqFirOf1k8vHVZ9ZzjisY0/M
-yDDLzNJ4StMrbC4jzy8MgDaKfsePylvGkcfs1ZNbQvGyWvfjIpJHkal/3yMhHn24
-u6RaYmFbPPfsi8EB51ZM9hfsaaI2SPieypiiQuLU4HJ3u4ys1eED97tJj/ND7BXF
-GFN80oqvvvjFG4N7djd47frCcfv0w9LUojMAYwzK008a5pQI+0971Pq2E/o24w8P
-TfbvPNtAwMTQiepYXbaork4H04Bt9mFP+5tg16X1WASvIngrSjgZFljyLkdWqPk=
-=gTEp
+iQEcBAEBCgAGBQJP443dAAoJEEqz6FtPBkyjhqsIAJY5/DKRNBlAZq+gZqR25YE0
+gXluNe/X8ftaXUAqs8btO8La+4t2ksxtbuTFQUfP/huAIq6R93FgoWDcGUtcC+2R
+88+2FomfCFcD31CGl5JaQHMvKyuiTKGY2mLeat84FK9xz1MDqGK3ORhTIWi8hi8a
+8vJFavwB8+psvDBT7bCxmiuZHwiWnKE1o9aQMepK1MOZAvbHdz2HZNCUgQJ5TJjL
+MBK7cUuUSm5D8nK6vvZk3zKCUgeq+0TaF26Ey3z7J2UiOIcRCSTpH8nweO6XYJMQ
+lxtJEIuQjq1RHFlGt53nKtOeAWIqZ+FEl0txJxSiIvv15dC3FPUtTtVicBKpILc=
+=/7MN
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/gimp-gmic/files/gmic-1.5.1.6-makefile.patch b/media-plugins/gimp-gmic/files/gmic-1.5.1.6-makefile.patch
new file mode 100644
index 000000000000..4a8c52323833
--- /dev/null
+++ b/media-plugins/gimp-gmic/files/gmic-1.5.1.6-makefile.patch
@@ -0,0 +1,109 @@
+--- gmic-1.5.1.6/src/Makefile
++++ gmic-1.5.1.6/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
+@@ -99,14 +98,6 @@
+ # 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).
+ # This requires the presence of the X11 include and library files.
+@@ -164,14 +155,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 +201,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 +231,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
+@@ -292,10 +277,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)
+@@ -312,10 +297,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
+@@ -345,7 +330,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)
+@@ -370,7 +354,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.6.ebuild b/media-plugins/gimp-gmic/gimp-gmic-1.5.1.6.ebuild
new file mode 100644
index 000000000000..22cc1495768e
--- /dev/null
+++ b/media-plugins/gimp-gmic/gimp-gmic-1.5.1.6.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.6.ebuild,v 1.1 2012/06/21 21:10: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"
+}