Version bump.

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

3 files changed, 76 insertions, 9 deletions

diff --git a/media-plugins/gimp-gmic/ChangeLog b/media-plugins/gimp-gmic/ChangeLog
index 7bc72caae40d..4667facc3594 100644
--- a/media-plugins/gimp-gmic/ChangeLog
+++ b/media-plugins/gimp-gmic/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/gimp-gmic
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-gmic/ChangeLog,v 1.51 2015/02/04 17:22:19 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-gmic/ChangeLog,v 1.52 2015/02/07 21:35:43 radhermit Exp $
+
+*gimp-gmic-1.6.0.4 (07 Feb 2015)
+
+  07 Feb 2015; Tim Harder <radhermit@gentoo.org> +gimp-gmic-1.6.0.4.ebuild:
+  Version bump.
 
   04 Feb 2015; Tim Harder <radhermit@gentoo.org> metadata.xml:
   Drop myself from metadata.
diff --git a/media-plugins/gimp-gmic/Manifest b/media-plugins/gimp-gmic/Manifest
index 648232678777..0f6e6aed704a 100644
--- a/media-plugins/gimp-gmic/Manifest
+++ b/media-plugins/gimp-gmic/Manifest
@@ -4,18 +4,20 @@ Hash: SHA256
 AUX gmic-1.6.0.2-makefile.patch 6480 SHA256 b4b0b8834d784f8464bf0e836d10cd3f1c86fb6bf5d73f129222e3c824c05bc4 SHA512 7f69f20a8fa73e4b9bdfc9c4e222d80d8a87a0d18acded10af254806464c4b45280a596722859926d7b64b560f484501335f950c6dac7eb76b7b3f7d1a3a8a8c WHIRLPOOL 5f600fe95c3b1d2a61bc7b1f4b2c65f25f0648b44ee3fe40735c6f20ecbda2e57a2f88c19577841983499d19685b3902adb5b2d4ae1006ecdc50474b172660a2
 DIST gmic_1.6.0.2.tar.gz 3013936 SHA256 ec9fa41bb8c27f883b9f845258d41f8024936c80bdec723a1c67cfe05ef9b900 SHA512 9d754cc2c72835bd139a39f72863f5315bebc25716efadb023f54661a4bb3fbf29066ddcd258ab8f084164edc9bd02f77a5a801b5c0753322f959205ce0adaf1 WHIRLPOOL 1d8e7126901b7a269f0aae9bdc1bd05a859efa3269de892e712892aa0c06eeb856c27cf05564bac30abcacf27f3e11d2bcc8f179fc29a675960d6640567cdc0c
 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
 EBUILD gimp-gmic-1.6.0.2-r1.ebuild 1315 SHA256 8b45f6744aeb8fe54a568beecc441568143a0ccaa9f130624937f640b48bd4ad SHA512 b188d0268b261dd511e00cad9616ae16458f6c97d6ec402b2e1c7b3c09f04c41d275541332e96b9ff32476c474dfd83d061596772e4a038f331abdf38853e0e2 WHIRLPOOL 06e933bae7823c65b956d79f7e59aee7b9968c0402cfd2821dafa30d04532ae3dcd0c6d608d025b168d299c12d52fd2e2b5f5faef082b9eabf6d7737ba8251ac
 EBUILD gimp-gmic-1.6.0.3.ebuild 1431 SHA256 ef46080d84b667c544ecaf6e56968aa2269623c857e031de664d9d65eef6f5d2 SHA512 a11356282525f917ef0cca508005cdf4f79ff70f426c32c4600bb71447d89a9cb26d2168960dda6eed25160cc146d16ccfae5f09a6de01e35824b62dab302ebf WHIRLPOOL 90d96301c41891de5e41da053e9c4c9c62f67336797b075ad2da23e6bd8c728aea00514ee114c95035fe58c21910763df54ebadef0774e37f65430799ded6a66
-MISC ChangeLog 8121 SHA256 2135541bde28df3368be27cdd802962937674a3475d98efbfe86c2374e2166df SHA512 503fa33c8a4c54b922983e67e78598b84f994b813560a284303f95adb49570e8dae10399fab5f26d271baa49c0c1c6b3966fba030c6d30d3b9a0e7dbf439de13 WHIRLPOOL ebd47985f679acee2c5b2277388cc468c02335ca816c49517d0cdbf154c19bd62dd01388d32cc473173045de6c9f7a870ca526e0119efe11b1ab8ebceb8efc44
+EBUILD gimp-gmic-1.6.0.4.ebuild 1431 SHA256 3299e2afe51ea59886dd7a0a76aca9e1b9bb9af821c0b30ce92edd898eca2aae SHA512 373fccd540df94ebcf32734316b81f86fc6654f9a6b9901fa74477a6c7a34faa67d0ed14586e4bef8042c33909f93330ac919fc060581c534009ec6df2c46eb1 WHIRLPOOL 1960e1e28c1e731fbdc35c8bb86fbf394184c401d2ac54043f65a5bec44db207b93e605b08e4c56e878c54ee399848a05f40601ab6b57caf082ea1050fcc7a56
+MISC ChangeLog 8248 SHA256 f61da3cacd3c4f4e3bd31514764c1e49922ea7a6991658e393ac7d05cae0a3f3 SHA512 8771c86a9dd2a2d569647666e38cd7f24cec52cd0a08bbf49f75917e081e69ac4fc93a8696ae4c07922876231a1c2780037b6e5e1ebf082f4993ecb359237564 WHIRLPOOL c2f17865e7c1470bd9e6014216e2fae8e852dfec8097e7a5d3394d9860e8fd8bbcf48e97d7a35c34f0dd49206760cb4f05e66a85e5326853eff66181d44e47ec
 MISC metadata.xml 161 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1 SHA512 425caf0160f1410ce7bf1d4639020be7f6335152c339edbce80676bff4166f1cab3ae9e13161c47b98dc00741dab3bfa45e9572a3314844476e480f5c2b58d7d WHIRLPOOL ad7cdd3352dbc12cb4181fb5d63b5aee5ce3a151b975c12a96c4a5c91f751736d27282ad22633c7e768230266bce5d17947735d33ef5c5c2341c3f9435b9ebb0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJU0lVRAAoJEEqz6FtPBkyjLWwIALkHuqRvX3zPZdmrjLYX4tSw
-x4R3wvAJRFUIouuZON0ZWAX7tr+fyEAxS5o7dEgSNNtup8wpUEub3nk4+U7sEWfE
-r3qLj7Ck444VDnp5EQFJPYH99OnbeOwGr5Ut+vTjc4d02kJyiFfpyGlYdrq/pcvT
-uHZOGE0mcIMcEcQzF+6AMTr211YEhY/nIn+1gmTzlBHUg2g4oPjTTpgurHyt3gcP
-oRf6xYVFyIJygb+n65c0uorPb7HU4ZwdAkVJiSWJ19871hl3+KNQcdgYNHeTJWrr
-zdiGCmA/CHZGwySdBepCi/QbATjQAx54Y3bVpB+ZCoIh1vb+Z+z3OufB22pW2JA=
-=6BUm
+iQEcBAEBCAAGBQJU1oU1AAoJEEqz6FtPBkyj3FkH/23Qyk7QkuRLIMWEIgpahIbC
+Z0erJSbD46ZM4iBjviW54RaOosO9a2UwVWMLtr8bqII8RfvfojuGK6gGRrlMUEdb
+i6Yj38OUcu4Pqx2II9No9moU3x1aT0XpWvn5UkbNrpdS0Ozgaa9kDhjrXvcSehcV
+NBQAbDYnterhW/42pzaLrQ57efu966STckwrCLWlLXqPNknUfTvnHDRn4B2Luk2X
+kD5eO3R0TSoqkDrsULOvLNHmM20fSC35oDw44Ps4xzM5UiQJIFCAtjl2Xf7gMPqd
+2CEmKdg//tVGiVEkxqKKbSUapDXeatKCXX4Pdh2x1lFN+v0NZd9jbih5zftzQBM=
+=Z4fd
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/gimp-gmic/gimp-gmic-1.6.0.4.ebuild b/media-plugins/gimp-gmic/gimp-gmic-1.6.0.4.ebuild
new file mode 100644
index 000000000000..c13d05e92c54
--- /dev/null
+++ b/media-plugins/gimp-gmic/gimp-gmic-1.6.0.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 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.6.0.4.ebuild,v 1.1 2015/02/07 21:35:43 radhermit Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs flag-o-matic
+
+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="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() {
+	cp "${FILESDIR}"/gmic-1.6.0.2-makefile.patch "${WORKDIR}" || die
+	edos2unix "${WORKDIR}"/gmic-1.6.0.2-makefile.patch
+	epatch "${WORKDIR}"/gmic-1.6.0.2-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"
+}