Version bump.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 167 insertions, 9 deletions

diff --git a/media-plugins/gimp-gmic/ChangeLog b/media-plugins/gimp-gmic/ChangeLog
index 2c15fd8f2bc4..505afd9321fb 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-gmic/ChangeLog,v 1.38 2014/01/27 02:41:55 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-gmic/ChangeLog,v 1.39 2014/02/11 05:38:56 radhermit Exp $
+
+*gimp-gmic-1.5.8.3 (11 Feb 2014)
+
+  11 Feb 2014; Tim Harder <radhermit@gentoo.org> +gimp-gmic-1.5.8.3.ebuild,
+  +files/gmic-1.5.8.3-makefile.patch:
+  Version bump.
 
 *gimp-gmic-1.5.8.2 (27 Jan 2014)
 
diff --git a/media-plugins/gimp-gmic/Manifest b/media-plugins/gimp-gmic/Manifest
index 409a0900d299..9cd3657d4d51 100644
--- a/media-plugins/gimp-gmic/Manifest
+++ b/media-plugins/gimp-gmic/Manifest
@@ -2,22 +2,25 @@
 Hash: SHA256
 
 AUX gmic-1.5.8.0-makefile.patch 5485 SHA256 39b5ff20a26b620f7cda95e1fa62c69532dfe3ecd34d8ef058f7144125ba564c SHA512 d8ea82f745f0bb5093ca328f569de74ba2e7a62f95045812b1932f086ebe9a2ac9adb645cc4a1d1b89f35c59f8bd10dac0a43f083ea6167ecbbb16a9a270f428 WHIRLPOOL 3d797b9d25966076c087ea87c07d9dc2aeceb1185cd4298a4ce2011864889d46aa8d2a2f6c01fe40dd78450b20661fb080a0aa3da4ea0e20634f28256680c4d6
+AUX gmic-1.5.8.3-makefile.patch 5037 SHA256 07e2f9d8a1c3d4a5053296f9b9a0f9a0718717e611493961d2907267c8cae380 SHA512 86f504b688bf4cc25fe698ed2d57d3bae719bb876688492b797927e76ac95326f6f2ab71fcc1e4b2f44d42500a90d6f7abe02d24dd7a22e4f617261f837fddb2 WHIRLPOOL f33a74d82fbeb91bd9712237f9e322b0f5aea426f2fff1da7088e0f90de8fb466f572fdc08eed8888dd51ba9235272b57f18de9d082724247bd6daa77355cf73
 DIST gmic_1.5.8.0.tar.gz 2257558 SHA256 94382a599c23dd0be2ed9bf539072c057b7f780a8ac63b391a27522fec28f1e9 SHA512 46c7d46da2fd1f063dbb23df9cc8e894ff741871cc8d7ee570de54c5313ed101a3352915a71d952913e5bca97e35074fb025646aa05fd087d1575383ac2972b8 WHIRLPOOL 33ea1d72619bb40cc89357732b0f12c14377c9a5c7ab61d40300f9e81570d4e7fb01089597b9bb45e09358c67bbcf0ca2e25841e5e5e7c7b998feb870fccbad9
 DIST gmic_1.5.8.1.tar.gz 2265467 SHA256 2b0b813253e8c409a8535d350894245b35836cd849af31986055e0a09b8d1cea SHA512 6fea97ae18abe770ba827946457955c74cb4180a272e7fb0a6e2a0f612bec6f8fd83daa4c1010eb236886ebacef331d9b1b0a4f0c64dbde27261e76f71244ef7 WHIRLPOOL f9fc34c21f87c222b081bcef2ae819cbe6f25c1b66a890a569ffae667acbdc5f334496ba8d1d5ddf811550ec0844bd2936ee3564f131bb7f5b1b35ba7a70dcde
 DIST gmic_1.5.8.2.tar.gz 2319666 SHA256 459d0f8cf6ee0a9e8b2254ef93be18cf985bbec699de5354b52671e15f67c3b4 SHA512 5f54147a8903d49667c825afb28564753b0636d21812bc8f12fc1effc3586063c95fe5676c7e69924c69cd790cc4399c5a87a535195bbbecc1656d3de8bc398c WHIRLPOOL 07601508c81be6d3cc8b79ef0f524a36c507696148ec11524f978ae2df4c1326035de908f5d467d24b6482544a5a02f77f7a2847f74cef8806b50213d937e5a9
+DIST gmic_1.5.8.3.tar.gz 2341936 SHA256 ed200f839c6b7cfa7df37a5b286d6dc106708a4466fe8d5e316b0a92681ad983 SHA512 70824a618365c9a0a46604ee3892f48284199b34888fc020860091e7ec9f93f5754d030427faa164c3542fa85a198f1dda82e4b7ee598958acfb48269c255663 WHIRLPOOL a0d677dead2038bf286d0e03a000c8c95971ab0868f375febf6637caddf7f1a0bdd90f49e5a9e71b1234a6b1711afa1559d9da37b589e07de7e2255f1c1d1e38
 EBUILD gimp-gmic-1.5.8.0.ebuild 959 SHA256 c5555501f48d99a54e0143cfee544ef376a8a52ca6073053798b6ca052ddd939 SHA512 84f6355025d33136ae6e5e29db22b5c6a52c73275ada189f9383fdd8ded4cbfd70ab552e07c15ebb983f730da8f32d2a022dbba8442a8112b66e309f75653b51 WHIRLPOOL 1dde2743003f764cb1426e22b9e0ea778f63815db43e0ff13df38fcf21bc5c62f0f306d99b17066434b3c91e123ac8e3101460fb46b186b6251bb2a82f70f002
 EBUILD gimp-gmic-1.5.8.1.ebuild 959 SHA256 55414a8506243befbc664178c34b555ca7fbe91978e3e170e16d5e807529ff00 SHA512 820f6396fc3bc29148f0bc2b621eb64523c00880147966bdbd66571e96c29d6cbc6dd8f9846c2f0ce2827216e07393c41558242a1095f02fdcf77ae78402c9d1 WHIRLPOOL b6865965a586d3507925f5834f729ec9ab02a94046f8101dd51c8375764f6fea019e84d52d34c2017130ebd0297862690287ed65eef6f0388133cc323b7cf5d7
 EBUILD gimp-gmic-1.5.8.2.ebuild 959 SHA256 b8ef032965f2b92a862a404cd1adec330986b4d6e460c609145cda573efdf16d SHA512 3b1ed57ccb8c4b61bdcff17e5867ef96ec632279facf51cf82f32bda5f35cb3fdb69f63925ee1539dae536e6356510eb4d11700d37623235146e862453776ccd WHIRLPOOL 257bffd496a9bd4cbeecce122ab930d2ec6099e5828460479a8ac6243c7cedcaaaad17e23fc0ef6d142d0bc33438f2fedeb43d87fb23c86b0c75f39f1dc78244
-MISC ChangeLog 5807 SHA256 8270927fda6718ef65b855aa2cfda8b22793a5a821b34a4302403b1cd6202655 SHA512 68b79609b2565e4caafa3ccfc79762f18ad0c41c9658c6b5c23858b5ab6a5ff0abaa1e471a55ba00cac8d41e7337a7d83d1ca5bd22dfb3c33fd40e7d61c8c1c0 WHIRLPOOL e5ad00273725403ada491874609f72fabbb1d51db6bce8416b56876a089efb48c9583ab455691800c2f352b439f0d98ab05772422616ec0775f7413096232f1f
+EBUILD gimp-gmic-1.5.8.3.ebuild 983 SHA256 442172f79b36d148d50bf97160d02330ac9a06f02202cd8922deaf6f53122364 SHA512 f3065340823c20b608aa206f27981aa8b2fa24a203f2d53493952c6a2763ff2f8656136b85cbbfebecf22480438d74e457914eac52b91cb2092a7a0a34788496 WHIRLPOOL 279036e593789d1f51266f212f850879e0cdf7b1bb3861c538e717eeff478a0d9232dd92e4904c446f63c8408c834bba2c36e59462a1c4f34099add01bebf80c
+MISC ChangeLog 5972 SHA256 ae917db0d3b589ff2d18aca2029280a94f14623342c01b8d24ce585074805f7d SHA512 57c254e7e62bfa616744a724252a5b60a080c08e3b971fff8879a5649bf169c5fd3cabbdbc62a08a051265a9a9646c1c2c1982814ecb283507da5752086804b0 WHIRLPOOL cfe455192bcf5395a8be1c1313e4c30bcdd55339fffc79b89ca171b3f3616745afb2bb12519fa4841f6bbccb30d7f059360e58a18789f8d6b82aa14e6e952cf8
 MISC metadata.xml 232 SHA256 a778e40f66cb2fa35529e4f45cb8356c8b1b109163cd939396f02e8ea6aa5f1a SHA512 6952f63da1c92a4ed7ddb87b5eb4003d123f0b7af6ffdbc9118159c97ddf18917e8ac7727285a42c07c64e52a40335bc2ef9f17261557617beb8c2226a391873 WHIRLPOOL 0a4441f075f8af01588da2aac3e03732f93463b8bea5e46749d37e1468452735d15f45243b930b3346c93734f8aa235a492030445fee471a95d2c5998f08e7de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJS5cd3AAoJEEqz6FtPBkyjb5EH/2bEwor7ZvDpxDFc9hG/mhkt
-4L2iOKFsGht4XLQLiPbprgasMQKFbC493g+aEccDqa1WXd4k8usUeGG386w8WnBQ
-EVzHkoVQGGm7BD2ObtHmhmrWfio5FDN5MSkwxliyyrCKM9CD7yJJtmuFwvA5qis5
-wZHXxKf+o4nwmW7FYUT4xxwYGhqu48mvH+6XPp3SgEoLwze83m7TfQrw8eQYlRYu
-r86aiFZiku0F+X839fE3zvWWulk6qXCHnk4GZaOrEv1By+YWhUXGgoXUABNyWKk6
-VJYoHuq9A92ptWttsMEJgz2YWdspsAWkARcxfUElmbn2ywP17Ps3k1jqxQGWKMo=
-=/yBL
+iQEcBAEBCAAGBQJS+bdxAAoJEEqz6FtPBkyjHQAIAJeDmoM1xm4K6RlCPTFqJT/l
+VQmqXBHuk84bO3byC2ijP4uzMJH8Kkm8tjEM3S4ChHuHTJM1owhuGNiS6FUuocjZ
+PwA5a35Kr+wBd0oj2hWsYbE+PJS6Vnvpz/LCVQmxmMKG9gFtYvgrclL686dRq0M3
+AwD4tLaPaun2FQeJdbo+cE+jIwAlEW0+o4VzipMJmRQmWq1pAWvA4sdO3/zL8W9s
+PP482bH0Be/uC+JjbfTIUgpsoyqibI++n8PJsJK84C53YpOc04ozA92zSh2nSoWN
+9eM1tI3crVVQO0ICehh5gTrHNrAH+aobCCUT0lJSlYxeQnEkYvjfz+OpZt+ZFiE=
+=IsLA
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/gimp-gmic/files/gmic-1.5.8.3-makefile.patch b/media-plugins/gimp-gmic/files/gmic-1.5.8.3-makefile.patch
new file mode 100644
index 000000000000..24045124c19a
--- /dev/null
+++ b/media-plugins/gimp-gmic/files/gmic-1.5.8.3-makefile.patch
@@ -0,0 +1,106 @@
+--- gmic-1.5.8.3/src/Makefile
++++ gmic-1.5.8.3/src/Makefile
+@@ -77,7 +77,6 @@
+ 
+ # Flags that are mandatory to compile 'gmic'.
+ MANDATORY_CFLAGS += -Dgmic_build -I$(USR)/include
+-MANDATORY_LDFLAGS += -L$(USR)/lib
+ ifeq ($(CC),g++)
+ MANDATORY_CFLAGS += -Wall -W
+ MANDATORY_LDFLAGS += -lm
+@@ -118,14 +117,14 @@
+ # (keep /usr/ dirname here since X11 is located in /usr/ on Mac too).
+ # This requires the presence of the X11 include and library files.
+ # (package 'libx11-dev' on Debian).
+-X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include #-Dcimg_use_xrandr
+-X11_LDFLAGS = -L/usr/X11R6/lib -lX11 -lpthread #-lXrandr
++X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" #-Dcimg_use_xrandr
++X11_LDFLAGS = -lX11 -lpthread #-lXrandr
+ 
+ # Flags to enable fast display, using XShm.
+ # This requires the presence of the X11 extension include and library files.
+ # (package 'libx11-dev' on Debian).
+ XSHM_CFLAGS = -Dcimg_use_xshm
+-XSHM_LDFLAGS = -L$(USR)/X11R6/lib -lXext
++XSHM_LDFLAGS = -lXext
+ 
+ # Flags to enable image display, using GDI32.
+ # This requires the presence of the GDI32 include and library files.
+@@ -160,7 +159,7 @@
+ # This requires the presence of the FFMPEG include and library files.
+ # (packages 'libavcodec-dev', 'libavutil-dev', 'libavformat-dev' and 'libswscale-dev' on Debian).
+ FFMPEG_CFLAGS = -Dcimg_use_ffmpeg -D__STDC_CONSTANT_MACROS -I$(USR)/include/libavcodec -I$(USR)/include/libavformat -I$(USR)/include/libswscale -I$(USR)/include/ffmpeg
+-FFMPEG_LDFLAGS = -lavcodec -lavformat -lswscale
++FFMPEG_LDFLAGS = -lavcodec -lavformat -lavutil -lswscale
+ 
+ # Flags to enable native support for compressed .cimgz files, using the Zlib library.
+ # This requires the presence of the Zlib include and library files.
+@@ -171,14 +170,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.
+@@ -311,10 +304,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)
+@@ -334,10 +327,10 @@
+ 	$(MAKE) "CFLAGS+=$(MINIMAL_UNIX_CFLAGS)" "LDFLAGS+=$(MINIMAL_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
+@@ -355,10 +348,9 @@
+ gmic_lib.o: gmic.cpp gmic_def.h
+ 	$(CC) -o gmic_lib.o -c gmic.cpp -fPIC $(CFLAGS) -Dgmic_float_only
+ gmic_lib: gmic_lib.o
+-	ar rcs libgmic.a gmic_lib.o
++	$(AR) rcs libgmic.a gmic_lib.o
+ ifneq ($(OS),Darwin)
+ 	$(CC) -shared -Wl,-soname,libgmic.so.1 -o libgmic.so gmic_lib.o $(LDFLAGS)
+-	$(CC) -o gmic_use_lib gmic_use_lib.cpp -L. -lgmic $(FFTW_LDFLAGS)
+ else
+ 	$(CC) -shared -o libgmic.so gmic_lib.o $(LDFLAGS)
+ endif
+@@ -367,7 +359,6 @@
+ 	$(CC) -o gmic_gimp.o -c gmic.cpp $(CFLAGS) -Dgmic_gimp -Dgmic_float_only
+ 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 $(CFLAGS) -Dgmic_float_only -Dgmic_main $(LDFLAGS)
+@@ -392,7 +383,6 @@
+ 	$(CC) -o gmic_double.o -c gmic.cpp $(CFLAGS) -Dgmic_split_compilation -Dgmic_double
+ gmic_gmic: 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_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.8.3.ebuild b/media-plugins/gimp-gmic/gimp-gmic-1.5.8.3.ebuild
new file mode 100644
index 000000000000..6e57579649af
--- /dev/null
+++ b/media-plugins/gimp-gmic/gimp-gmic-1.5.8.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 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.8.3.ebuild,v 1.1 2014/02/11 05:38:56 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:0=
+	sci-libs/fftw:3.0[threads]
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/gmic-${PV}/src
+
+src_prepare() {
+	epatch "${FILESDIR}"/gmic-${PV}-makefile.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" OPT_CFLAGS= DEBUG_CFLAGS= 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"
+}