Version bump.

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

4 files changed, 162 insertions, 9 deletions

diff --git a/media-plugins/gimp-gmic/ChangeLog b/media-plugins/gimp-gmic/ChangeLog
index 15938c12c164..a9bd61be52a3 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.21 2012/11/02 07:53:57 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-gmic/ChangeLog,v 1.22 2012/11/13 06:10:43 radhermit Exp $
+
+*gimp-gmic-1.5.2.2 (13 Nov 2012)
+
+  13 Nov 2012; Tim Harder <radhermit@gentoo.org> +gimp-gmic-1.5.2.2.ebuild,
+  +files/gmic-1.5.2.2-makefile.patch:
+  Version bump.
 
   02 Nov 2012; Tim Harder <radhermit@gentoo.org> -gimp-gmic-1.5.1.7.ebuild,
   -gimp-gmic-1.5.1.8.ebuild:
diff --git a/media-plugins/gimp-gmic/Manifest b/media-plugins/gimp-gmic/Manifest
index 3ba941dc5a37..da86f7d68457 100644
--- a/media-plugins/gimp-gmic/Manifest
+++ b/media-plugins/gimp-gmic/Manifest
@@ -3,20 +3,23 @@ Hash: SHA256
 
 AUX gmic-1.5.1.7-makefile.patch 5485 SHA256 c3703b0c8e35cfd86a0b851da1a6b8b3da8776789d987ce395e5a772f6112411 SHA512 0e40fd978232680d08c1c36f01a86f9940fc34f7ef88465e67e52f23de821d13efec2dc931ae2bb9ac1daa464391b3784061ded738105ce0def330719a98c963 WHIRLPOOL 4a690fc8959d73209583a4b3a68d2d66854355e4d36564c1393a04396d033c8af4e6a43763739dee66db941b3cdd42b6ece7cafa0e1bfc5456b71f78886d7841
 AUX gmic-1.5.2.1-makefile.patch 5487 SHA256 ffec62289b6d13853a61a3bff389ffbb7c1530fa39c111837349adeb8803099f SHA512 e0c16322ce1b41626e9031a715f7893e0a1ae73cafe1905251219dc091919fe4e41c60384b4f9ece92cb8b6f7e8b2014c0ff65aa1f7c2970f2bb597d4ee0496e WHIRLPOOL 5dc7a731ccd1d113893f9e09b1d7e797b72cf46bd4d43ee1dcdcf132cddf7fad7cea043d2fe929dba257067e14a67973d0f7054cd0d9b430c3b1925d8df142e2
+AUX gmic-1.5.2.2-makefile.patch 4407 SHA256 db8acb3399e38a72aeee16d537f242d77b03ebd94987f47c9bc9cc3b2cea1c69 SHA512 83aed5494640a7e7e8db7500fe7dd0e46fd29b788caafde9c715c6c0de4f77a0137fed07a2c3606e8845d6cf66dcea9d68e57bbba03d509ec90dd2bb2f41f37e WHIRLPOOL ffefa2fb0187c7b8950e58630a4bd414a46480c037113e4b05ebbae6dfe3a339e2aada3f89065405b117ad876a51b3a2442a8c2c32430b62a8c354a8d74f122a
 DIST gmic_1.5.1.9.tar.gz 2097627 SHA256 dc1f4d92f417b72e25e60fdde092b2c3e783af77c0595329aab471a1cf22d165 SHA512 723aaf092e79243e672d434f62c3fea8d1b723ad732034aa22225619233d76d32a4472b2b88fcee0a07cb468b85a81110fff5097dda32f2278e175fb338f87ba WHIRLPOOL b94b84a6369a647885f9edad21fd98ed1cb70d68d2bdcef479626d5f623d45490547aafe75f5195d68c1f90f201dee4544c1cd36ec6ccb54599a9550b434abb8
 DIST gmic_1.5.2.1.tar.gz 2170700 SHA256 8284ebc215b8fd7c8edca98f5b0c99e1d229d2123f3d1265758dbe80b6350547 SHA512 6629a13cf824ddbcf5ba292dc18a745af6b9b41cb58c81b790866a54f071af9fe47724d73f8979b310256857480032eeeedb2699502106b5d22188032b6ac03e WHIRLPOOL 24bc500567de777705b0bab58bfd8fec0e1eabda6e55c8635c75b27b398a51c50ac37fd29a07fcf262947e89a43d522333cb5aea22d98af34409ee3913623d85
+DIST gmic_1.5.2.2.tar.gz 2187885 SHA256 e5e188e169bf9eebf47cd83d901ec2b44b0d5e5a06eadd734d51edce2202886d SHA512 757b331664178d857a241bf7a8ad8f3bafbbcf946000d0fd71cb717aa38210e34f4bf1e0df3c981fda8550722c7b6a2ee28c6a2d5d170d231127d5a0bc4fe6fe WHIRLPOOL c69e60e76ae354c258121461c334f40c34d32f4888bd41f2dfdfca6305b7bbf964a8c53a69fb6c782c51e33d814f5e498690c485bad1f8a10189dbb6c64363f8
 EBUILD gimp-gmic-1.5.1.9.ebuild 928 SHA256 448b7118adf1c4f623c6b908aa0ce277b2112db37954f2911c923c3a6dbb410f SHA512 630dd0caeaf15946743863a8449e34088c1fd6de9c5bca605330758abd7cf5583041c6209a149faf8000a2a8ae636533a67984b783210b049fb5af6d7b63e76c WHIRLPOOL c48d18089a7a94e607435256ab41787d11550f43a36d66351473763c16981ad98251d1bd1ecca3e6a8f05e2f5904c5e92fcf32edcde60ed157f4f84172576350
 EBUILD gimp-gmic-1.5.2.1.ebuild 926 SHA256 a0362efdf15d58cc34c955150d1d99615bb1d6c83cc8ed6a6c8a1f719055c0d7 SHA512 0d50792fcc5b26cdb5ce01139148bdbe9af5234f56afcf1dadf112ab38c3827958afa0d0d55ecea02b37a45d5239e90619ec5da519c223e9bb637481afb0c385 WHIRLPOOL e25ac7cdc9e4527d025fc1485a406608c95877808bb7bd758bf85b4da8d5491b3ca2da2bb6d2fd8c957b45e9225a95c35002b283dac23f37cfbc9c088f529ee9
-MISC ChangeLog 3204 SHA256 be9a19014425ab315e427160f47b9c9c84f54cabb06fec41e2e8c0b2ccb827a2 SHA512 0689266e88a00f26b8bd029056c2a260c1b71b639780705c82d61006f6f1b45c1ccd2b44beab7e153e6af7734aebef995fd83473f6bb2abfc5a95302f3a3e2a8 WHIRLPOOL 2988e246f609babe0397a4642cac1e3857ca99a2e8185f2a573ca38e3098fcba38354fa97e32c2559b796b6a634aa5bace4a46fa540e951376e04204cba9809b
+EBUILD gimp-gmic-1.5.2.2.ebuild 926 SHA256 517c20f87c617a92ac48739c9a4a960c20d7cb8034d8659c7c953b77e84b604c SHA512 bf782682a383f8e34818b5402d270c175b9e54089ae24604fe65175e5f6c8ee8ffa69f3072b57dc46c0e0816f88096c556632b62d869f58757808b71dd0e158c WHIRLPOOL ddc4ed3ae6cf10fbcd54501f96f6d37394a58f9c9c0a3fc5b1084dc69aaf696581f1f2ed7f674e030607172f1d83f07b16259cb75f958df22e7a7bb629386f3a
+MISC ChangeLog 3369 SHA256 b015caa213634acc6c7755da62166d6ff26e14e857a573808d6628dd926079bb SHA512 58a2c72fb9b0758f5f39bba8d2f8f6e132b2e5d6db2ca267f1b68ff2307b28146a7e4c3ac8e641f474c649af6256752dbaa928fdd48845e52a95de616d365674 WHIRLPOOL 948733115f6b25db3628a848d4cd6a34953af25162d6606b2bfa0d6795cd7ca43b0db55002c400790424b3bf4c791e55cde744f9073043e2de1395a2443ae7fb
 MISC metadata.xml 232 SHA256 a778e40f66cb2fa35529e4f45cb8356c8b1b109163cd939396f02e8ea6aa5f1a SHA512 6952f63da1c92a4ed7ddb87b5eb4003d123f0b7af6ffdbc9118159c97ddf18917e8ac7727285a42c07c64e52a40335bc2ef9f17261557617beb8c2226a391873 WHIRLPOOL 0a4441f075f8af01588da2aac3e03732f93463b8bea5e46749d37e1468452735d15f45243b930b3346c93734f8aa235a492030445fee471a95d2c5998f08e7de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQk3wWAAoJEEqz6FtPBkyjezwH/3Z4ahEcudAo4bRRplCphKIf
-5hFBVgcGZ0zLGdqhiDUOODuTCvGrkyOPTbsF+GdrDPE5N9gB7vIogIPWPIaruacj
-dv6AzgwUJT0JODBif5WUintdPcTM0ppalCL7roDZD6yVZfGLoEwDL9TzzAMFMy8s
-bFbLyxjuIC23c5zRgLRwzXWGwooDfg7YpZH6GKc5ThEoE60bVa8BlBdk8mNSaBuy
-mjGnQAshu9zvsiYQB0klL1UpvAHP9sH4Yi2d7tv3lxxbmdFHffCSYfeesAa1lcA2
-FLAElLCTiYDwaxD3qXqeTlOKXEjEK7jknGvliYTURMrw+ZeUAMYnoryV1pJ3aFg=
-=fDsg
+iQEcBAEBCAAGBQJQoeRkAAoJEEqz6FtPBkyjDjAIAIGO3gWxgUT+Yuwtdsw6HBnZ
+Dnyf0rJHXVlrxuRs65GIU/hDIclkssTT3jNx4QQe2muRmEw3tuSUsPnWqM+6jsMm
+2EBx1FBgvl/+ANWRTn7CMwITcX0uf0nXlrm35QcrHFrvSDsqC7anF4kBjPNIdxsY
+Ym2J/9JzWtvhrRNIVym+y973ER/ix++ZpeDTYRqYoRB/Dk5ZshCu/aljHLbn3f7m
+RwoB8lFAES0nvSqlEmSoucOhmJ2uRh5p9FNAEi+yQkWVitWrxIaxbsutNgkl3S86
+s7WtieiKVxB4ZW9m6OgdYRvLgkptdQmUFA6Qe24S7wyjDxHlGEdQDFT98+AtZ+I=
+=RIK9
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/gimp-gmic/files/gmic-1.5.2.2-makefile.patch b/media-plugins/gimp-gmic/files/gmic-1.5.2.2-makefile.patch
new file mode 100644
index 000000000000..c93c639fdaf1
--- /dev/null
+++ b/media-plugins/gimp-gmic/files/gmic-1.5.2.2-makefile.patch
@@ -0,0 +1,101 @@
+--- gmic-1.5.2.2/src/Makefile
++++ gmic-1.5.2.2/src/Makefile
+@@ -77,7 +77,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
+@@ -85,28 +85,20 @@
+ 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).
+ # 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.
+@@ -152,14 +144,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.
+@@ -287,10 +273,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)
+@@ -313,10 +299,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
+@@ -346,7 +332,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)
+@@ -371,7 +356,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.2.2.ebuild b/media-plugins/gimp-gmic/gimp-gmic-1.5.2.2.ebuild
new file mode 100644
index 000000000000..3f7bd4d143e0
--- /dev/null
+++ b/media-plugins/gimp-gmic/gimp-gmic-1.5.2.2.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.2.2.ebuild,v 1.1 2012/11/13 06:10:43 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
+	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"
+}