Version bump.

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

4 files changed, 200 insertions, 9 deletions

diff --git a/media-gfx/gmic/ChangeLog b/media-gfx/gmic/ChangeLog
index 4ab2521f31d0..f3b98e79d825 100644
--- a/media-gfx/gmic/ChangeLog
+++ b/media-gfx/gmic/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/gmic
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.16 2012/05/30 06:01:03 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.17 2012/06/21 21:05:23 radhermit Exp $
+
+*gmic-1.5.1.6 (21 Jun 2012)
+
+  21 Jun 2012; Tim Harder <radhermit@gentoo.org> +gmic-1.5.1.6.ebuild,
+  +files/gmic-1.5.1.6-makefile.patch:
+  Version bump.
 
 *gmic-1.5.1.4 (30 May 2012)
 
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 87974dfcb655..8eb5899c3c0b 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -4,21 +4,24 @@ Hash: SHA512
 AUX gmic-1.5.0.7-ffmpeg.patch 1927 RMD160 bb0d018a362b84d9b9ecea1a82f5c46c9f620206 SHA1 075a441d8f9f0e62f7d507ad8d785462642c2d8e SHA256 57e36922ecd33f8b05666ff707ed7f8cba2d9c732ae3bad7bd379a52bf2c0b25
 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
 DIST gmic_reference-1.5.1.0.pdf.xz 15783964 RMD160 390c3321d03eb1bcb9a9e3919e34052c73cbf838 SHA1 5bbc8e0e44cd664ed8bf97be20dda21463162bcb SHA256 044a028b8c977354702a721512503bcf61b7eff2c7a3b834a73477129fda73a8
 EBUILD gmic-1.5.1.0.ebuild 2040 RMD160 39cd8ee422618752bd1b98daa49a622b3d963df2 SHA1 464691d44f417360b617dbcea1ecba958ac6cf8a SHA256 00ef68a5e80b223d1c6bd0112247757e85ad2463896a3d1b12fd81651d3f80ed
 EBUILD gmic-1.5.1.4.ebuild 1853 RMD160 7cfc58dd5b57bb72de43ba2bc8c8a696e3ab0800 SHA1 c915d1d7ad3cf64cbbd96550c28df32f9a599674 SHA256 dbddc3123457343624636e04d2bcd80637b0f80555d26f17b5eb3652adaad7f8
-MISC ChangeLog 2299 RMD160 d25af0091df8931b62a3c0ed87ed73b77e426ba9 SHA1 5af46f7e9757a11b9e30164cf9dc17d209105954 SHA256 360a7dc2725287ba4ca9bbef61a89dfb30a90bd65da39836d060ff8e98256ee9
+EBUILD gmic-1.5.1.6.ebuild 1853 RMD160 b4af5aac9771acc69530df42ba9da04633c9604e SHA1 319a802151a6d705bf968f83715b056ff2361408 SHA256 22330a10ecd68a93abc8754ad1606229879b1b87e51f69028a443909d79ff5e7
+MISC ChangeLog 2454 RMD160 a776154ecbd25b8d0bb1b1ab859f698bec13f1bc SHA1 a40dce8225aca125bc5f4a2f10e8ed8e0c4a66e9 SHA256 2c7deeadabe86ef2f2418c08212f85385732c0b43da19a9f5cf6e2a28f2c5670
 MISC metadata.xml 473 RMD160 680f8739786ae6d9221c0f6d2734cb16682c1b7c SHA1 1ce57e832b27b5e349e070cdeaf37ff11f500b18 SHA256 def06af4d0283b01f9313231ff05df286129ff57afbcac23fcc7c45d8f735a6c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPxberAAoJEEqz6FtPBkyjcJYIAJzYtuLietDmUzf0YTNd3Sx2
-ALg7h2s/OqNIbnoFrlbkAfUnE2fsd9Ie1GYKnYGbS8EnoKhMDwXBPyWm394R18df
-516U0IxnjP+yI6QcHiVB20le6SSBtrHmCAFuPgFKSxdxqU+KjetdfRCGC2dglcRR
-1C4PZRRbWeBzHx3/pZSBdMD3gikojrhvQqR2EvjkwzVfwzd17BL2Jqn4VnZaS/uh
-QtHpUKSC1gzy3Ji9sAvf2fVQnkgZL+mZOEsjRkO11as6lQ/U3qb03ZCS8y5jiYMn
-lkj8titOIIa3ctSiSWUpjNRML9zDDsW4rOYUmdP8GedFaCpe8CwAMB3JKt1GJag=
-=LBRI
+iQEcBAEBCgAGBQJP44yZAAoJEEqz6FtPBkyjCxMIAIBsNb5dOrGt0i1kzBhcsg5H
+YJvI2FR3S66f3upLi69N9mkyukggmixL8s7tGg8mF027K0tSpOE/j5j1+AT3/qvL
+QYDSALPpxZOzkqdcAr5WAKglEXgxrXFH+cvpCnRInR6tMboa3Q8KCPZm/Ky3gecv
+dzEK4vdstJFBz8pGGHcrNL9TBjLHHtX04hScCYp3zYm7qEoOpT8FANbHlxAwzVJS
+q7+fmmdpArdJAG7uKgQtl2WTw+XnG0Z2PM3EEtSaa/FCFfx0gAse8kfafGCMXV5v
+Go/m/wdCdKKF0I4JYKA+LXkg+5XcDhL9WQEvimPS/3C/KwSyEsZEw5lGDiBhBlY=
+=KA+R
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gmic/files/gmic-1.5.1.6-makefile.patch b/media-gfx/gmic/files/gmic-1.5.1.6-makefile.patch
new file mode 100644
index 000000000000..4a8c52323833
--- /dev/null
+++ b/media-gfx/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-gfx/gmic/gmic-1.5.1.6.ebuild b/media-gfx/gmic/gmic-1.5.1.6.ebuild
new file mode 100644
index 000000000000..05194063bd50
--- /dev/null
+++ b/media-gfx/gmic/gmic-1.5.1.6.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/gmic-1.5.1.6.ebuild,v 1.1 2012/06/21 21:05:23 radhermit Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs bash-completion-r1 flag-o-matic
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="http://gmic.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="CeCILL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ffmpeg fftw graphicsmagick jpeg opencv openexr png tiff X zlib"
+
+RDEPEND="
+	ffmpeg? ( virtual/ffmpeg )
+	fftw? ( sci-libs/fftw:3.0 )
+	graphicsmagick? ( media-gfx/graphicsmagick )
+	jpeg? ( virtual/jpeg )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1 )
+	openexr? (
+		media-libs/ilmbase
+		media-libs/openexr
+	)
+	png? ( media-libs/libpng )
+	tiff? ( media-libs/tiff )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P}/src
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	epatch "${FILESDIR}"/${PN}-1.5.0.7-ffmpeg.patch
+
+	for i in ffmpeg fftw jpeg opencv png tiff zlib ; do
+		use $i || { sed -i -r -e "s/^(${i}_(C|LD)FLAGS =).*/\1/I" Makefile || die ; }
+	done
+
+	use graphicsmagick || { sed -i -r -e "s/^(MAGICK_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
+	use openexr || { sed -i -r -e "s/^(EXR_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
+
+	if ! use X ; then
+		sed -i -r -e "s/^((X11|XSHM)_(C|LD)FLAGS =).*/\1/" Makefile || die
+
+		# Disable display capabilities when X support is disabled
+		append-cppflags -Dcimg_display=0
+	fi
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)" CC="$(tc-getCXX)" custom bashcompletion lib
+}
+
+src_install() {
+	dobin gmic
+	newlib.so libgmic.so libgmic.so.1
+
+	insinto /usr/include
+	doins gmic.h
+
+	doman ../man/gmic.1.gz
+	dodoc ../README
+
+	newbashcomp gmic_bashcompletion.sh ${PN}
+}