Version bump.

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

3 files changed, 94 insertions, 9 deletions

diff --git a/media-gfx/gmic/ChangeLog b/media-gfx/gmic/ChangeLog
index 3e91c19983d3..eceafc9c5cde 100644
--- a/media-gfx/gmic/ChangeLog
+++ b/media-gfx/gmic/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/gmic
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.30 2013/01/09 03:05:09 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.31 2013/01/12 22:02:00 radhermit Exp $
+
+*gmic-1.5.3.0 (12 Jan 2013)
+
+  12 Jan 2013; Tim Harder <radhermit@gentoo.org> +gmic-1.5.3.0.ebuild:
+  Version bump.
 
 *gmic-1.5.2.5 (09 Jan 2013)
 
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index f55e8d08c455..901221c13c7f 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -6,22 +6,25 @@ AUX gmic-1.5.2.2-makefile.patch 4689 SHA256 bfc15f13d79b0be044add9f73fc927c63b5f
 DIST gmic_1.5.2.2.tar.gz 2187885 SHA256 e5e188e169bf9eebf47cd83d901ec2b44b0d5e5a06eadd734d51edce2202886d SHA512 757b331664178d857a241bf7a8ad8f3bafbbcf946000d0fd71cb717aa38210e34f4bf1e0df3c981fda8550722c7b6a2ee28c6a2d5d170d231127d5a0bc4fe6fe WHIRLPOOL c69e60e76ae354c258121461c334f40c34d32f4888bd41f2dfdfca6305b7bbf964a8c53a69fb6c782c51e33d814f5e498690c485bad1f8a10189dbb6c64363f8
 DIST gmic_1.5.2.4.tar.gz 2203118 SHA256 489f81653e3a7a00b5fa10d7d59c35de6a24de3ec24b57b4f6e4498743057c49 SHA512 ffa31dd118a847aefa2a9578803bbae1f3bdf65ad62de36ff68b8afc4e8dbe1459178b1552c2b84c4cdfad85c4bad9e3fd6fdb5d5f2bce713db655d69a48da29 WHIRLPOOL 70dbeb5b9e77fed1b191034f5395764914689117a71cd1d938ad78cd15ee00830936296b6c8531c3958b39274f2797135a0bc369d2c21c46e1e425c2d651bba4
 DIST gmic_1.5.2.5.tar.gz 2215262 SHA256 3b7a00898e6e06f1d5bdb0566ccd9422195135e297d25dd056a619c7394cb983 SHA512 bd76ac164f89f30cdcbcdda97f6816a661dd28b5f7364b68f61bdd6d1252e2bfb4a9fafc27d5f0720709c50421f80dbb8f899a0dfc13c2ed54cfbed02346ff73 WHIRLPOOL e8f64e1f8b1a3ca7e886faae20b88952a8d8ff65af870fd39a1ae5643a776a3fc0c531730f645ae8c24020cc58e526e941aa9f6784686217ba8622d2bbbe62d3
+DIST gmic_1.5.3.0.tar.gz 2217350 SHA256 667c5b065780362cb7a56593a518180e7fb47f19104898d3dce15f313084334f SHA512 5a72a5a4e470eb4c0c3ed1c3e59a63a122e0407bdcf0e7be5b2bb884f7fac156631e180769e0775cc28c250410fcd304c1b5031273421d17c0cffe598c5d3ab4 WHIRLPOOL d178d2792b24f3772624357b4827dcf6cb865e7a197dcf14b76421ab08b1999372e9799066f77037589e6181aaad84b2aa11e39baab6f6eeeaf681323ad989cc
 DIST gmic_reference-1.5.2.2.pdf.xz 14980944 SHA256 3d80b11f55f22c2c9b417c1e056c85a85bd5f8f6f322558fd6aaaa145f1a7651 SHA512 f801a37fb149879fd28f2f3939260d76205f226ac47ea86956d57bd8e1dbe079925cdb9a3ce8c60b08f57a9cf7b27462ffbd81803dac6f8276fa03ec7917a5f0 WHIRLPOOL ed612f38e50a9bf9d44ed7c018fdb284eeffabf930ab7e2deb28d9970b016ccdd3ae55c4748adf97f095583fe5bcaaa5d42b5ae951c12e0e6cec548500cddf8f
 DIST gmic_reference-1.5.2.4.pdf.xz 15101780 SHA256 b712c8780b3592c50d1bbc52b914b63e08f97b9c647b8c64fd1b9bc3d07fd9a6 SHA512 49f3f1ec744ba5db7c2585d7feb0bfba4d40b00ed0571d02fffc3662480ecc16b4ac7f3ae3392b4307dc470cea1f42913610e6320125e84d2785e9dc9632739e WHIRLPOOL 60571ce67e485608491b02ce12ca12c53a94843745a0e43eb75e1f0f3d73207f685cec5ec0837854826b9625ec7aa736dbb17b533053135c5477b90951514d4c
 DIST gmic_reference-1.5.2.5.pdf.xz 15078948 SHA256 37108d75e040be910ae77cb913ae10cf30bb12c4114cb62e2ea2739bf7c33165 SHA512 95112fc810280aad775bf3977c7e7e4bb9d3bea35a59e9fd542da15363ee6720651869d27e024be9fa4e50836e0a4de3197f36a71283a6cd7584233fcfb8c385 WHIRLPOOL a1744e5c2484c48cc7c383c23a62634e75b2e1042c11fb6bd5cdf43c135988d4ed0ede1c37dcbf0215ec0e3a5add3126e83a40d38ecd629564c34973ec775c04
+DIST gmic_reference-1.5.3.0.pdf.xz 15083988 SHA256 c4c904791a75db96dc5c9293987c106b27dd08f4ab72ccfa54857094145cdb4e SHA512 8a59cd3f18e2730b208d193c3791f4d8873336eae76695fe68f6a0eb188e605157fc6f70fea0c433b1c6ca171232729238824c03b17438acc54e5f68646778cc WHIRLPOOL 845ef9bc08a1fc22aba13d57796f0d1939c82cff1627e2899cad0ad081b3404ddffd5ecd69cd733ae2fa38ac04962ab09fc15f0b80c02c26835da09c52cdcfb4
 EBUILD gmic-1.5.2.2.ebuild 1992 SHA256 f258e75cdeac769e3ff0dc06ef4c567a3ae439a2a918e566edbb2e3c88afb956 SHA512 5a3bfe2ab280c918ca6aae091f44172ba8a61aa7d0b296933403979d7602ba08807d97be87ba7ceb41cec80f78bd30e5c563cb19800acf835769ce3777492961 WHIRLPOOL 343eb97ad4766eeea9857332ae78f2107475e7e7878e0b888fd0c3d10cfcef03840f75f666ca294d60e9eca051484833e88c16d6e0fe2d7c840e3cb21be9833a
 EBUILD gmic-1.5.2.4.ebuild 2041 SHA256 b1ff9ce2c6ab6f572749f0203039233a9d1baa255e0e71d1d733a4b688209266 SHA512 11ebdcfbe78285a03a47e9bfbdebd32d66a1bbef62692f71d410afba7d5c1d70b4202a430cb3ed38a23f6993ead6f8ec86f3900659506d23973f9ec21ce3a712 WHIRLPOOL 769faf3b2ef78bcfab99b44c1bbae7208e82bfb71e16120294abe3e60db2bab14685e7e8a618246c3a3dbc47948a842452c89a844b687ade3568152c4c41a0e9
 EBUILD gmic-1.5.2.5.ebuild 2041 SHA256 c90c40d373f4f843f8c7a5f30e422ba24cdf3cae39ccfee3812276158a62ad45 SHA512 dd2368c66b6f9e99712c17228f616ac44dcbf95cf41dd834cad768cd71da060524ff08fd3d237976c8308343aa8d76efea6c366d5d0e62cc3e9b3e53cf4011a5 WHIRLPOOL f2937b1ee17428ba54c3cb880e23d33b57a8741353aa4f64ae8897ebf5ed4a5af3ba8c960b881b4ea100e78518c54fb479712b654ea6d0763ecb4cc3baf9b1fd
-MISC ChangeLog 4261 SHA256 67c80921ba1155ef23151543148359a280f2ac16f1aadaf1354867ad570c979d SHA512 dcda5c9653f7721e24e3f02788eb28ba45b0d0c9a8871ecf3c851ea1e0fad0a6eb84aedbd83293bf085a66ceb323c949280a881c6a229fed0913700f45f3e095 WHIRLPOOL ec9ba18704264c10cb70cf6dc95882f9dd3ebd19c2acf914216339f30a7da40075f2038faab1faa8e4b782cd195c980071bfd0dea3dac31fee5d7680f85334cb
+EBUILD gmic-1.5.3.0.ebuild 2041 SHA256 23dee2e1ba5919a2e3483d154d7d650af7cab7ff76f5fe6b4aa9834af4e25c7e SHA512 152c675ec47cbce218e674dcd8f6fbccdf6ed63dc42c55bb6447c4ff061aa0fdfabeb553545ff12d350833285461c56bd4ae4d58c70347499ba0cdcb7bab10f6 WHIRLPOOL 7cfd271d43e4584825a8d20f1e8486a06e51ac1f58b046c4759cd5638974d5f163e742e645c2f4eccc83f702bfdca061d80e0d03119a5597cb315f0b51040752
+MISC ChangeLog 4378 SHA256 c502fb0bab6801540ab2c7717dc8d7f5528ce149b7c0592cb3d0ae508a45d7b0 SHA512 34f0366d6f502ce987ea28518bf9bdc4d384db2d3030f980e57f5dfbf067f3035c46bd6540296ed23e17ae64c1146d65b06aa84f9271b8baa7872c11fbce822c WHIRLPOOL ca16e9a53d707ddf676061b345b92f938ffb0dc2cfe75034d5b0c9d33750f94501786cb412b28c9086d865230d397fe531e3602ba025f4f7b224d682658ba8a1
 MISC metadata.xml 473 SHA256 def06af4d0283b01f9313231ff05df286129ff57afbcac23fcc7c45d8f735a6c SHA512 4bd720129471c24a6b71e32f11054d96bd2eefb3316489806a06b8deed45e5544fe1c74a73c129ec90fe30c8a4c0646c50e6690717046ad93255771627588f32 WHIRLPOOL 9a356f4c399b7a6fdf217b2dbeaeb4fd40dffc080b86c0ad913690c0b0007aaad52ea79d3b7b5b21591432c99a1e59ed02ead94e2578f1915afe2ee0c9f7d090
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ7N5nAAoJEEqz6FtPBkyjnvwIAKemacwbMeVZMakHoO3flHvy
-qymAjUJcFQfWO+wAz/8e2nRhdxB2dvf0sG4J0SBxEv18nOboxsJq5YQbOcFmjugT
-dUGD9+DrSbnS8Ees8n0RuUGvuZOssPwEvexn5vV1qSxYdTpFM+Er70Qp0ONWUFjX
-ExQwNEzsFe1AmbzH/W842puCIKmGXN8qpqLKwnhAJl3ii3gxWIhH9hGHKAlJFNSK
-vpnJvNFgaxv0GfvsF7/KjRIw0kA+fxsVT/BYCSN91R7rFTc2qUjkt2fuf0FaHwu3
-i+SKS6jTBnHyD1dps7c3isAyPhHAbANNjiSHqZWVcX6SWjWdtyyuT8Fxb2SHh1Y=
-=p+0y
+iQEcBAEBCAAGBQJQ8d1aAAoJEEqz6FtPBkyjpNoH/1AgW0lAQT/LIhNGVQVGZkCd
+kUl1FCrnIz2XRIDfIP0kkIprtX0G1+Wu0dwFMs6EIzWnltu090TMYi52mT1XPUH4
+w3nyq2yH7pWAHdfyktJ1lKcP5LqG/tljrgcm+S0ykdptR7okuzqltT5GBu63kB76
+3SEivvUNFkWKWmfs9oZrX/pJdaZ+aybEXaYoz0u2JPj6QHikwK076r2Noj8ceHXj
+9DdhIaeD3ugWCChqItxAgSg/3A9HiH/0wE/Lqb81OpwiIsaEVPCef/0sdfCxtdgD
+xkfS4Qevb7WpzjXO+1QFMq5ccI7/i635dmzcWsIbLIHKCgvHAnCcsEeumxiBKqY=
+=3zdS
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gmic/gmic-1.5.3.0.ebuild b/media-gfx/gmic/gmic-1.5.3.0.ebuild
new file mode 100644
index 000000000000..a101df9b4394
--- /dev/null
+++ b/media-gfx/gmic/gmic-1.5.3.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/gmic-1.5.3.0.ebuild,v 1.1 2013/01/12 22:02:00 radhermit Exp $
+
+EAPI="5"
+
+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
+	doc? ( http://dev.gentoo.org/~radhermit/dist/gmic_reference-${PV}.pdf.xz )"
+
+LICENSE="CeCILL-2 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc 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}
+	doc? ( app-arch/xz-utils )"
+
+S=${WORKDIR}/${P}/src
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.5.2.2-makefile.patch
+	epatch "${FILESDIR}"/${PN}-1.5.2.2-ffmpeg.patch
+
+	for i in ffmpeg fftw jpeg opencv png tiff zlib ; do
+		use $i || { sed -i -r "s/^(${i}_(C|LD)FLAGS =).*/\1/I" Makefile || die ; }
+	done
+
+	use graphicsmagick || { sed -i -r "s/^(MAGICK_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
+	use openexr || { sed -i -r "s/^(EXR_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
+
+	if ! use X ; then
+		sed -i -r "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)" CFLAGS="${CXXFLAGS} ${CPPFLAGS}" custom 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
+
+	use doc && dodoc "${WORKDIR}"/gmic_reference-${PV}.pdf
+
+	newbashcomp gmic_bashcompletion.sh ${PN}
+}