media-plugins/gimp-gmic: version bump

3 files changed, 212 insertions, 0 deletions

diff --git a/media-plugins/gimp-gmic/Manifest b/media-plugins/gimp-gmic/Manifest
index 86fa815b986f..0e0d1bb39eb2 100644
--- a/media-plugins/gimp-gmic/Manifest
+++ b/media-plugins/gimp-gmic/Manifest
@@ -2,3 +2,4 @@ DIST gmic_1.6.0.2.tar.gz 3013936 SHA256 ec9fa41bb8c27f883b9f845258d41f8024936c80
 DIST gmic_1.6.0.3.tar.gz 3019692 SHA256 91ce6cfe58e29a6819bf849346bf049d2d73f826bbd7b8b8de42dae7d54c7752 SHA512 377b361fc178ab73a7542a39243d32de970ad6ec5928c295d86acf1bd67efc2ebaf72ce818b55c6a7aeda17eb657fbf4176f4f4c90bc48179419842343e3619b WHIRLPOOL fb78366cd72467b2c1ac2e3f704061be173ba28cb888dabee56f7c4c7c2a4b870293c2e1ae88c87edad8f4e511944bb99218e9fae2d30226c1a4b07b001927f6
 DIST gmic_1.6.0.4.tar.gz 3073596 SHA256 ef83e4efc31280e819d02315b1ebbaec6c0b8ebb960da3e785651572853b8f58 SHA512 75c0adc8a0460c140ec656403053e4533fc6434a0b23c2ac842045aeb788a8ce5da5338832574e76e06fd710bebf5ec627a5bc894f00081ffd1b37a5c6aa852e WHIRLPOOL 1eb3afc6c9fb9c07999e5e497e6d6c5075fda46293417e889511c28c9e0ce26b0070e1356dcf0db9bb49e76b83d75941ed917c01b61c98ab537430ea938c831d
 DIST gmic_1.6.5.0.tar.gz 3005945 SHA256 ebc98c4f5848b8343d581104e072299529ac3edbcea7b565ffd6e1fb4bfd66ed SHA512 3feb5589dcc341106ce1305ce2d3f90776f074607bec3b8413519aa5f2c9dc9554a9ee7a5ba1d52d1a9e7676e6bff135d444276c989511f973cd456136d0e4e1 WHIRLPOOL 02f3f711fa9c876fba39e56a42c30f62a6c2d0848ae836f9635d7df0ef57f48f2a8f09ca361232c2239e473046fe7d085260ac365d2e7b6d49e65c3c0aa2e9bc
+DIST gmic_1.6.5.1.tar.gz 3092777 SHA256 63737973848c292ef3877e1f6af3839e20fa209dd7a1bbacbdbac03bbb6fce85 SHA512 cfbb8db9a3f884ac27b4929a774c94372523a1e59a205180dde452d34310d32df4ef76c9cdfcc4ef5adf0ba72c5e1e44564cfeb2e9bc003ec8fae45df9c606c4 WHIRLPOOL e5e0e9d4dfff7a5b0da9d613bc998e32f71925cc44eb504519811327697fd13edf2abb1b94bd22619b17fa111d1e984944a01d7417ff0e328950b4258a7172fb
diff --git a/media-plugins/gimp-gmic/files/gmic-1.6.5.1-makefile.patch b/media-plugins/gimp-gmic/files/gmic-1.6.5.1-makefile.patch
new file mode 100644
index 000000000000..e2d0dd3133c2
--- /dev/null
+++ b/media-plugins/gimp-gmic/files/gmic-1.6.5.1-makefile.patch
@@ -0,0 +1,153 @@
+--- gmic-1.6.5.1/src/Makefile
++++ gmic-1.6.5.1/src/Makefile
+@@ -85,7 +85,6 @@
+ ifndef NO_STDLIB
+ MANDATORY_CFLAGS += -std=c++11
+ endif
+-MANDATORY_LIBS += -L$(USR)/$(LIB)
+ ifeq ($(notdir $(CC)),g++)
+ MANDATORY_CFLAGS += -Wall -W
+ MANDATORY_LIBS += -lm
+@@ -138,13 +137,13 @@
+ # 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.
+-X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include #-Dcimg_use_xrandr
+-X11_LIBS = -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.
+ XSHM_CFLAGS = -Dcimg_use_xshm
+-XSHM_LIBS = -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.
+@@ -168,8 +167,8 @@
+ 
+ # Flags to enable native support for MINC2 image files, using the MINC2 library.
+ # ( http://en.wikibooks.org/wiki/MINC/Reference/MINC2.0_Users_Guide )
+-MINC2_CFLAGS = -Dcimg_use_minc2 -I${HOME}/local/include
+-MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz -L${HOME}/local/lib
++MINC2_CFLAGS = -Dcimg_use_minc2
++MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz
+ 
+ # Flags to enable native support for downloading files from the network.
+ # ( http://curl.haxx.se/libcurl/ )
+@@ -308,7 +307,6 @@
+ 
+ cli:
+ 	$(MAKE) "CFLAGS+=$(STD_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_CLI_LIBS)" gmic
+-	strip gmic$(EXE)
+ 
+ gimp:
+ 	$(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GIMP_LIBS)" gmic_gimp
+@@ -318,11 +316,9 @@
+ 
+ gmicol:
+ 	$(MAKE) "CFLAGS+=$(STD_GMICOL_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GMICOL_LIBS)" gmic
+-	strip gmic$(EXE)
+ 
+ static:
+ 	$(MAKE) "CFLAGS+=$(STATIC_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STATIC_CLI_LIBS)" gmic
+-	strip gmic$(EXE)
+ 
+ debug:
+ 	$(MAKE) "CFLAGS+=$(STD_CLI_CFLAGS) $(DEBUG_CFLAGS)" "LIBS+=$(STD_CLI_LIBS)" gmic
+@@ -338,24 +334,22 @@
+ libgmic.o: gmic.cpp gmic.h gmic_def.h CImg.h
+ 	$(CC) -o libgmic.o -c gmic.cpp -fPIC $(CFLAGS)
+ 
+-libgmic: libgmic.o gmic_use_lib.cpp
+-	ar rcs libgmic.a libgmic.o
++libgmic: libgmic.o
++	$(AR) rcs libgmic.a libgmic.o
+ ifeq ($(OS),Darwin)
+-	$(CC) -shared -o libgmic.so libgmic.o $(LIBS)
++	$(CC) $(LDFLAGS) -shared -o libgmic.so libgmic.o $(LIBS)
+ else
+-	$(CC) -shared -Wl,-soname,libgmic.so.1 -o libgmic.so libgmic.o $(LIBS)
+-	$(CC) -o gmic_use_lib gmic_use_lib.cpp -L. -lgmic
++	$(CC) $(LDFLAGS) -shared -Wl,-soname,libgmic.so.1 -o libgmic.so libgmic.o $(LIBS)
+ endif
+ 
+ gmic_gimp.o: gmic.cpp gmic.h gmic_def.h CImg.h
+ 	$(CC) -o gmic_gimp.o -c gmic.cpp -Dgmic_gimp $(CFLAGS)
+ 
+ gmic_gimp : gmic_gimp.o gmic_gimp.cpp
+-	$(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o -Dgmic_gimp `gimptool-2.0$(EXE) --cflags` $(CFLAGS) `gimptool-2.0$(EXE) --libs` $(LIBS)
+-	strip gmic_gimp$(EXE)
++	$(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o -Dgmic_gimp `gimptool-2.0$(EXE) --cflags` $(CFLAGS) $(LDFLAGS) `gimptool-2.0$(EXE) --libs` $(LIBS)
+ 
+ gmic: gmic.cpp gmic.h gmic_def.h CImg.h
+-	$(CC) -o gmic gmic.cpp -Dgmic_main $(CFLAGS) $(LIBS)
++	$(CC) -o gmic gmic.cpp -Dgmic_main $(CFLAGS) $(LDFLAGS) $(LIBS)
+ 
+ gmic_def.h:
+ 	@wget --quiet -O gmic_def.h http://gmic.eu/gmic_def.h
+@@ -380,38 +374,43 @@
+ # Generate bash completion script (requires 'gmic' to be installed first).
+ bashcompletion:
+ 	@mkdir -p ../resources
+-	@\gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -document_gmic bash 2> ../resources/gmic_bashcompletion.sh
++	@./gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -document_gmic bash 2> ../resources/gmic_bashcompletion.sh
+ 
+ # Generate man page (requires 'gmic' to be installed first).
+ man:
+ 	@mkdir -p ../man
+-	@\gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -__help man 2> ../man/gmic.1
+-	@gzip -f ../man/gmic.1
++	@./gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -__help man 2> ../man/gmic.1
+ 
+ # Install/uninstall/clean procedures.
+-install:
++install-gimp:
+ 	mkdir -p $(DESTDIR)$(PLUGINDIR)/
+ 	cp -f gmic_gimp $(DESTDIR)$(PLUGINDIR)/
++
++install-bin:
+ 	mkdir -p $(DESTDIR)$(USR)/$(BIN)/
+ 	cp -f gmic $(DESTDIR)$(USR)/$(BIN)/
++
++install-lib:
+ 	mkdir -p $(DESTDIR)$(USR)/$(INCLUDE)/
+ 	cp -f gmic.h $(DESTDIR)$(USR)/$(INCLUDE)/
+-
+ ifneq ($(OS),Darwin)
+ 	mkdir -p $(DESTDIR)$(USR)/share
+ 	mkdir -p $(DESTDIR)$(USR)/$(LIB)
+ 	cp -f libgmic.so $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1.6.5
+ 	ln -fs libgmic.so.1.6.5 $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1
+ 	ln -fs libgmic.so.1 $(DESTDIR)$(USR)/$(LIB)/libgmic.so
+-	cp -f ../zart/zart $(DESTDIR)$(USR)/$(BIN)/
+ endif
++
++install-zart:
++	cp -f ../zart/zart $(DESTDIR)$(USR)/$(BIN)/
++
++install-man:
+ 	mkdir -p $(DESTDIR)$(USR)/share/man/
+ 	mkdir -p $(DESTDIR)$(USR)/share/man/man1/
+-	mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/
+-	cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
+-	cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
++	cp -f ../man/gmic.1 $(DESTDIR)$(USR)/share/man/man1/gmic.1
++
++install-bash:
+ 	if [ -d /etc/bash_completion.d/ ]; then mkdir -p $(DESTDIR)/etc/bash_completion.d/; cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/etc/bash_completion.d/gmic; fi
+-	if [ -d /opt/local/etc/bash_completion.d/ ]; then mkdir -p $(DESTDIR)/opt/local/etc/bash_completion.d/; cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic; fi
+ 
+ uninstall:
+ 	rm -f $(DESTDIR)$(USR)/$(BIN)/gmic
+@@ -421,8 +420,7 @@
+ 	rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1
+ 	rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so
+ 	rm -rf $(DESTDIR)$(USR)/share/doc/gmic/
+-	rm -f $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
+-	rm -f $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
++	rm -f $(DESTDIR)$(USR)/share/man/man1/gmic.1
+ 
+ distclean: clean
+ 
diff --git a/media-plugins/gimp-gmic/gimp-gmic-1.6.5.1.ebuild b/media-plugins/gimp-gmic/gimp-gmic-1.6.5.1.ebuild
new file mode 100644
index 000000000000..f40254714c6f
--- /dev/null
+++ b/media-plugins/gimp-gmic/gimp-gmic-1.6.5.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="G'MIC GIMP plugin"
+HOMEPAGE="http://gmic.eu/"
+SRC_URI="http://gmic.eu/files/source/gmic_${PV}.tar.gz"
+
+LICENSE="CeCILL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="openmp"
+
+RDEPEND="
+	>=media-gfx/gimp-2.4.0
+	media-libs/libpng:0=
+	sci-libs/fftw:3.0[threads]
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/gmic-${PV}/src
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+
+	if ! test-flag-CXX -std=c++11 ; then
+		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/gmic-${PV}-makefile.patch
+
+	if ! use openmp ; then
+		sed -i -r "s/^(OPENMP_(CFLAGS|LIBS) =).*/\1/" Makefile || die
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" OPT_CFLAGS= DEBUG_CFLAGS= gimp
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-gimp
+	dodoc ../README
+}
+
+pkg_postinst() {
+	elog "The G'MIC plugin is accessible from the menu:"
+	elog "Filters -> G'MIC"
+}