Version bump.

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

4 files changed, 202 insertions, 10 deletions

diff --git a/media-gfx/gmic/ChangeLog b/media-gfx/gmic/ChangeLog
index 3adcc5207f1b..84c9db66d40d 100644
--- a/media-gfx/gmic/ChangeLog
+++ b/media-gfx/gmic/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/gmic
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.9 2011/12/31 22:32:36 radhermit Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.10 2012/01/24 11:39:26 radhermit Exp $
+
+*gmic-1.5.0.9 (24 Jan 2012)
+
+  24 Jan 2012; Tim Harder <radhermit@gentoo.org> +gmic-1.5.0.9.ebuild,
+  +files/gmic-1.5.0.9-makefile.patch:
+  Version bump.
 
   31 Dec 2011; Tim Harder <radhermit@gentoo.org>
   -files/gmic-1.5.0.4-makefile.patch, -gmic-1.5.0.6.ebuild:
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index ef9d92e11eed..b789ef70c99a 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -3,20 +3,23 @@ Hash: SHA512
 
 AUX gmic-1.5.0.7-ffmpeg.patch 1927 RMD160 bb0d018a362b84d9b9ecea1a82f5c46c9f620206 SHA1 075a441d8f9f0e62f7d507ad8d785462642c2d8e SHA256 57e36922ecd33f8b05666ff707ed7f8cba2d9c732ae3bad7bd379a52bf2c0b25
 AUX gmic-1.5.0.7-makefile.patch 6120 RMD160 83e29d43ad174a478efe89e6c455dccdafd451e5 SHA1 2ab0ea1e0c1f2da6c4ab3a41328ad3e62c548afa SHA256 5a6954258f0ed7ec82fa85ad548fb6df6fc4540bbb4c75908bc58a49aacddea0
+AUX gmic-1.5.0.9-makefile.patch 5719 RMD160 745e350bd25ed1b0862303903df7c1af9061429f SHA1 899023b36c4da45ffeb3870f35bef89d14090ac4 SHA256 6d30842378663dfec2dc1cb4277b986ca675daab54af34aa67fb112291dfb9cd
 DIST gmic_1.5.0.7.tar.gz 1228525 RMD160 c1fadcb904b25c8b0056204a9124ab461212c5f6 SHA1 45c85e0ed09caf6c2a41bd3d01747fcc5b5bf284 SHA256 b74d873d5d57947ae7848fb926faa73d98a0aea6fc7b5a305b3b824a67762f54
 DIST gmic_1.5.0.8.tar.gz 1250904 RMD160 99532589dab47f0e1b493e8b07853eac8543ae70 SHA1 f81c982686d6e434cce853366aec6e47a5a30ed1 SHA256 ded93e9b45513359d51512d547237bedfbc3f26a2e042b62e8ac8b44d0e5f2aa
+DIST gmic_1.5.0.9.tar.gz 1196717 RMD160 fdd779ecbe0bc33060641dcfd6b1f5e1d3db3d26 SHA1 0800997001cfff79a82a11e07239b5971316833a SHA256 d647a64bd25bf4146d1c755aa2d26f129605e03b3072dca2dc2e6ec5e38ed3b0
 EBUILD gmic-1.5.0.7.ebuild 1734 RMD160 30c0c89537d1b3865d9812e4a1d55bb96d08e700 SHA1 fd895cd386ad616693c8bd72fda0d3f1456bf80b SHA256 e47370b3bc19c29ed4201c1fd1ac55a1f42931e51eccb65ed115938c3cec6ff6
 EBUILD gmic-1.5.0.8.ebuild 1752 RMD160 28f89bd20c78ce8fb69c76d3a1c3f6c5f52ece2c SHA1 a066e2137814ceff76cb8af4eba3999065525ce9 SHA256 5ce8f4b25671fb856e44f5665ed1a33248bc2ad9440a58a4c6704292831fe435
-MISC ChangeLog 1440 RMD160 18081f648ae9f194b13af486e23d98d5e01fe417 SHA1 ba56cda8b8529d8324c2111f8b5d0f07f34f2274 SHA256 f598c90a7df8ce5002596314cdbb87538c77f3b1f506d9cf952d4e63d071bc0c
+EBUILD gmic-1.5.0.9.ebuild 1733 RMD160 773a61fa536bf52923db9deab49fce8ed8d3e448 SHA1 661b43be8595ed1aeaf17021293d8975fbfbce19 SHA256 0d751f47006fae542d2dc027efefd1d1085271bfd5e27659db19b340ed22a264
+MISC ChangeLog 1596 RMD160 73198a7e5722ec13d3240fe018fb7ecf8c1460f2 SHA1 ea0dd20d20bfe502d0de8327e11803bc405bc8c9 SHA256 0cd29251b97375289106b10989e61f8a40f8077363bb7ee8ac2a79e0bf1fb823
 MISC metadata.xml 473 RMD160 680f8739786ae6d9221c0f6d2734cb16682c1b7c SHA1 1ce57e832b27b5e349e070cdeaf37ff11f500b18 SHA256 def06af4d0283b01f9313231ff05df286129ff57afbcac23fcc7c45d8f735a6c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO/42JAAoJEEqz6FtPBkyjMv4IAKqZb6/yvVn3ma4U5PaQ44an
-atPGpBrXpCDmz+R0XhwUZDKx1guWipewu1IZE+xnXjew9m6tH0RgC/m42sjJibd4
-RWoo5bmezZBwmjRzCspSW4SyJV3EhLcTxNZQC1ufSpYkZZuiE7pZKw2xCOXq51Vp
-R/5echXzRt/Atva/vXwHbqsMpkKHHmVTBz1ed7mcG1kSQMaikZ2WYjfw5WS8xKTP
-V4Uz+5z+h4FQFOR16bZwdrK8SdlJFaKbcJtVP9Stjfd+Fhqp6nHwDo719ow6actb
-+uqWvAeWp0WM98QfsST2a/ViW1nDtj1kwwC4qbapzwunntAfpmv6d5DQZfxuc9g=
-=cPW/
+iQEcBAEBCgAGBQJPHph0AAoJEEqz6FtPBkyjk68H/AvSCWm2A65qHlX2sH1mBeMX
+LwP78K41ATCVRE+t4g9H2npkxHeDAaMBhRwiibaZYHZQJql6MCsCnnXmPlSseOzC
+jRN7mP1O79h2rsPhrLGTvZTlQMgGJwhmBYS50h7nS0zqHE/pKruVvMfWDPC3OESU
+e70BvsB4Nxh2HchGhPnCps8zae2Pyth3oB0agET97yprge+QMCyKeuMS5MYueinm
+Qj4/F4Ndb+hlVVfO1+wq1iGfPvtsbeonXf9u0hqov0xKq4CAn6IuK2gy2IzYK93l
+Tx7ElKQn6RN9uICV8sfC389AM2iY9yab3arBUN+ob7p69+Mc5hEhXjpQgofJWHI=
+=58a+
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gmic/files/gmic-1.5.0.9-makefile.patch b/media-gfx/gmic/files/gmic-1.5.0.9-makefile.patch
new file mode 100644
index 000000000000..05ab83fc559a
--- /dev/null
+++ b/media-gfx/gmic/files/gmic-1.5.0.9-makefile.patch
@@ -0,0 +1,119 @@
+--- gmic-1.5.0.9/src/Makefile.orig
++++ gmic-1.5.0.9/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
+@@ -100,12 +100,12 @@
+ 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
++#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
+ 
+ # Flags to enable image display, using X11
+ # (keep /usr/ dirname here since X11 is located in /usr/ on Mac too).
+@@ -165,12 +165,7 @@
+ # This requires the presence of the OpenCV include and library files.
+ # (package 'libcv3-2-dev' on Debian).
+ OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include/opencv
+-ifeq ($(OS),Darwin)
+ OPENCV_LDFLAGS = -lopencv_core -lopencv_highgui   # Use this for OpenCV 2.2.0 !
+-else
+-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.
+@@ -215,11 +210,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) \
+@@ -245,7 +240,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
+@@ -289,10 +284,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)" gmic_lib
++	$(MAKE) "CFLAGS+=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS)" gmic_lib
+ 
+ # Entries for non-default configurations.
+ minimal:
+@@ -302,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
+@@ -323,7 +318,7 @@
+ gmic_lib.o: gmic.cpp gmic_def.h
+ 	$(CC) -o gmic_lib.o -c gmic.cpp -fPIC -Dgmic_minimal -Dgmic_float $(CFLAGS)
+ gmic_lib: gmic_lib.o
+-	ar rcs libgmic.a gmic_lib.o
++	$(AR) rcs libgmic.a gmic_lib.o
+ 	$(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)
+ 
+@@ -331,7 +326,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)
+@@ -356,7 +350,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.0.9.ebuild b/media-gfx/gmic/gmic-1.5.0.9.ebuild
new file mode 100644
index 000000000000..dc4a720c12ac
--- /dev/null
+++ b/media-gfx/gmic/gmic-1.5.0.9.ebuild
@@ -0,0 +1,64 @@
+# 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.0.9.ebuild,v 1.1 2012/01/24 11:39:26 radhermit Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs bash-completion-r1
+
+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 ; }
+	use X || { sed -i -r -e "s/^((X11|XSHM)_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
+}
+
+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}
+}