Version bump.

Package-Manager: portage-2.2.0_alpha173/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 5cc5ec825b67..cd14a79328bf 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.35 2013/04/01 08:00:08 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.36 2013/05/03 08:38:54 radhermit Exp $
+
+*gmic-1.5.5.2 (03 May 2013)
+
+  03 May 2013; Tim Harder <radhermit@gentoo.org> +gmic-1.5.5.2.ebuild:
+  Version bump.
 
   01 Apr 2013; Tim Harder <radhermit@gentoo.org> gmic-1.5.5.1.ebuild,
   +files/gmic-1.5.5.1-makefile.patch:
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 067d62a13565..a94fb868dbb3 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -11,6 +11,7 @@ DIST gmic_1.5.3.0.tar.gz 2217350 SHA256 667c5b065780362cb7a56593a518180e7fb47f19
 DIST gmic_1.5.4.0.tar.gz 2215090 SHA256 01241d48d567e1636b54514ab7237de943b8306f43250bf1d78d310b44cee5bd SHA512 52569616e754edfb451dfff999226b5ffa22feb9898c63df0c9c2681ca37e199593ef871c587b3ed3aaee00fc6c56040445dc747a1c62856116240a292be2aad WHIRLPOOL 09bb19bc4927fa3e45b35c4520be15dab4e0061c1d74c853ab46292220bac924909554e7b76440c84a038717342763971f1566dfcbd5c49843926d33f57402b7
 DIST gmic_1.5.5.0.tar.gz 1674452 SHA256 31b63c13b27ab8925ef1b6e4fd93851b517bdf3301956fb44e0ed64793a1c415 SHA512 70302c978409b6137110e0df4540d594b6c44aeda38ce591a53879b14ffc4fe61971b098bbe2929c244f4d12f3b64af42331d8dcf801664d28ed56b6e38d81fc WHIRLPOOL e1f8e7e63df454f2d8b6511dbf42b1f9328683a41aa3083300bc0e314d31b4578a071c7df702fed04932d1b4544a616944cf20a8dd93b7805ab84c64e867ddb5
 DIST gmic_1.5.5.1.tar.gz 1689227 SHA256 3079b203f524bdf1736994abbd03d66d586d6fd2f0c0af98ad3ffe563fbd9613 SHA512 532e9f21692aa36872dbb2c9ca798ccac187b5fda02ca9d36f01ef28bfc104e43dec312afa448779282da52b1766ca0c3c645ccf962a938d55c53d72f366a8f4 WHIRLPOOL 18f8fbd6aff67dcbfa58fce59ac1ebf3856113084a238aa52fc03f24f16d1d4acd5e6d97c32813576094c48b4008fa616cd7be87ebd2c2eb11e7f89ea54b508e
+DIST gmic_1.5.5.2.tar.gz 1683717 SHA256 4e1ff3dcd7dc79dcc7f8ac92cae49951854aea283751a83e90b9510de972382d SHA512 a0f2175aef8d93fa56bbc923793d59c716399231afedf391fcb1a9525ac2397ccb6ce1a542928f5c08d12ebd06af26ac5aec17fe7ae0d4c04e215bfac4ca586e WHIRLPOOL d59d4ab55b904ade2da5ab9ffb29329894cd3d8c009d5ed9f039b989f737502085e352f3a315cf1f287c60004a054e58955b2a189235497f70d25d48c48a2851
 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
@@ -18,6 +19,7 @@ DIST gmic_reference-1.5.3.0.pdf.xz 15083988 SHA256 c4c904791a75db96dc5c9293987c1
 DIST gmic_reference-1.5.4.0.pdf.xz 14736428 SHA256 99493779d01da4ad94e05e074a870f0ce868fb7ba09ed5e50b3d9495fd8b58dd SHA512 6274192817d7bbf9cdf6e692ee1c7de54e9b370f69993b50e58173b89f0762de105a066f8a21bf3b61ff466594c184f50cab5b76f366f9e0a18394b525d939d4 WHIRLPOOL 076c449483f438144dc10919ee6faabe1551ed47c21a66df8a8b49ad115cae8c101f8f80f1a4b5ddcccfaa4e0601740b5cb4960361a92ee8e6b93ba71fd9e3cf
 DIST gmic_reference-1.5.5.0.pdf.xz 15312880 SHA256 4518a1485d62497d5c07bf31982c02e777d50d3028cc17dc7328a12884a0ca79 SHA512 1b9e8a119911046a01eb10c862877412801096770e9ba0c0884ee8ea876200f82a624b87bdd7e0ffc5fa49208fcfd5093884fdac766e9ef34100727db7b26dd2 WHIRLPOOL f430a2c3f54481718d26eb8b2142d521c9d949d97a9acbfc260aaeb3cd7c132414b77bdca39d914625568199c34184329065df9816050b9c918e9488ce9522a0
 DIST gmic_reference-1.5.5.1.pdf.xz 15343940 SHA256 c8649d36b87c24743f3afb0f0b0cb03699d65b7eac86d5ee1c33e36ebb76e1e2 SHA512 becec9f9d7ba8b716eda85aab49c9d091cdbbf7e643911639b21a15e9c9b10e450316094a3c5f52b407c73ca31c4675a25dc318360716cbca7ac593d686b44dc WHIRLPOOL ecf048a48d18eb4f4f736621e0e6f08f98e4c9513ab27e4e323b889a40c694c4830312e8add94aa8de640de6b129b5d6158beff61f695cee59abff1130bd3a2b
+DIST gmic_reference-1.5.5.2.pdf.xz 15384132 SHA256 d0fd745ec708ccd4c63e817a9de20833bfa64c5d3365356bc680a2be05814e80 SHA512 eaeebef81d7df2ed98d52a0519161edba570ae1002d1cf9601f4dc672aef51a42a18a3d7c9b6a8c0872e16574d82586f9d080dad7ad68c151cd9ae3087156c1e WHIRLPOOL eb97ab3508d57313d257fe90f9dde0649b4787664ac17cde3e5fc354b2bf53eb1bcd5bd3c6cb79c92f69d80a4fa0b0a2a703f83fd3e4773844a243b0eaa146f4
 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
@@ -25,16 +27,17 @@ EBUILD gmic-1.5.3.0.ebuild 2041 SHA256 23dee2e1ba5919a2e3483d154d7d650af7cab7ff7
 EBUILD gmic-1.5.4.0.ebuild 2039 SHA256 4c2af9d5b0a4edd4853393136bac2bc9a1aaeb204f26320dbd07d718703f4380 SHA512 8bb4134c6e9d686f0cb14c4c5743986bc5b82e77c8425e2c5f608646de72de653c4b6e716e38f62f6291f45c7dbd8074ce23dc71f1a92bfe51e7595489ca2fa2 WHIRLPOOL 2b8bb570d8e64893a0bb882172b3fe54056a46f376c6b5c62c3384daccd52ca6a63a2bfadca3bcd5e512ba68aec429e3bc4bebc974946800d3c419635012d093
 EBUILD gmic-1.5.5.0.ebuild 2039 SHA256 bd59780b4601c19297ad14894ae022918caa0d0ccd36c0176bfdc27e1b626c12 SHA512 2a8ed57022f9bc2540293fdbacc96803233b2b2220d6c90b33b839556057b93310fa6ebda7168b0fdd878b7e03ffac80a5d899ceb8892ec3d6719822cb5e9699 WHIRLPOOL 9de893474ffc86cc1c4b08ead559916cf2badcf2be853b3d890f4729c9fcc6b1a6db49e6768b8b739d63c3d3d77ad58b124da9c8c576568b6b43b4d11fcf012e
 EBUILD gmic-1.5.5.1.ebuild 2030 SHA256 15953b873974ad6bdd490f69de2cae8489def7f652c96376449056b3b9abb400 SHA512 2403dbd95ec0273509e1277d0eac61a525f05f2ccc8ac7d0d0474a1f251996dda12111f0211f272b8ed3049fea9afebc0d49c99e95c3d3bc4c6595961b1102ca WHIRLPOOL 3b62144036efce0217f6ffbf97f8a408b5b1313f025d173d93f44dde272d9e2d5ac790f42c51a749431bff57e6bd75140f1ee52d0fb60f4258b495c2d5ad197b
-MISC ChangeLog 4884 SHA256 fed18c5f46b253585ee6aeb5ac542d774506a3c9475b5af6caa8ee1e8ef521cf SHA512 6203575cc1d3f82441f7cfc8b0feac74e669649a37684c7150de377303d7b58852c5395c5fee758492cd16bb89fca2defc31a37729dd4e01ee28378a6e82fd99 WHIRLPOOL 556caf3b7f8b9a0d5df98bb10116bc5df9cd28b757eac5b051b0ab3ae2a3007947cdc84d6c729da7ae3173b87075bdc58e76ff176bfe107e408519dda146da42
+EBUILD gmic-1.5.5.2.ebuild 2039 SHA256 3dcfe6b2e4aa5420aa010608fbc5f4da54781a0c3103a7875d60c3f5cdc20f0e SHA512 d5227309021823fa5f7518624d5835f0c01bb49eb27eee70caafe8fcf6a0636bb2d304382dcc2301c6b0eb33c2e43f9da35597ad49a1907365cb3d23bd280b22 WHIRLPOOL 56ca7ae11765722a64791ee8def149b332d088b41050a6f1a250c07cd9c2b7873e3b395f667d328f2c46fa687bfd885de6db813c8037c3de2f5e9df094f36e35
+MISC ChangeLog 5001 SHA256 a1c36e440e62a2aa041689f6fb11fe8474e1f88b67e51c7e0430da2bbf9963c6 SHA512 b7ee4687d44189733b71a642b42e27484370bd2a7430e19e7c3116c86ea72af4e4e0f6dbec16a314ecebd8945700bccd9a4d2e61ec2b38fde5882358a06b299e WHIRLPOOL 242633884314c706e717df11064680340814b02f15b624651807741ddc65f44663e8d910a4b3dfccc6f28d142c044483ec8d8cf3cec61eca9ba8c0cc50cb3819
 MISC metadata.xml 473 SHA256 def06af4d0283b01f9313231ff05df286129ff57afbcac23fcc7c45d8f735a6c SHA512 4bd720129471c24a6b71e32f11054d96bd2eefb3316489806a06b8deed45e5544fe1c74a73c129ec90fe30c8a4c0646c50e6690717046ad93255771627588f32 WHIRLPOOL 9a356f4c399b7a6fdf217b2dbeaeb4fd40dffc080b86c0ad913690c0b0007aaad52ea79d3b7b5b21591432c99a1e59ed02ead94e2578f1915afe2ee0c9f7d090
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRWT6KAAoJEEqz6FtPBkyjKGoIALTZZpT+QL+5MUWiXDG8rA8o
-HURMlcr0T8Ngk/LX1S7SDUJDRsY74XKfExHEHiVOJd7lTZJEMGBAR1GDPUPnnm0Q
-UpecghGK03mhsrkBTDNwrARRmyEHqT4oyOprSzbJ61CQCQf+kzph47Y8oSVO84hH
-h7ljN4OcI9O78Jd5GYw3obfU6vhbz9zzJDvBiq2QaWn63HmW2ZrYykj0xkOOYccR
-Be5lSrFQadk576cUO8oMRc4kuw/A8Ozu2HZ6Rq1kIAR7O1Vox3Zzb+dQqs7C5ur6
-m948AkpfpFhAVBpx5T5kJv6lf5ZSHZtqWEdz2as5O6wx21CtMPVj2bArFhpxzWs=
-=z1ZL
+iQEcBAEBCAAGBQJRg3efAAoJEEqz6FtPBkyjE54H/296FED9J8h+kzjMZqwB7Idh
+5ICq0Lm6W8KAVT1DAgWrlBTGBBKT7VTlNI576Jm3VtppQy7curkdflSydlESXnFK
+iCL8fWdLHzLT1uUDPd72ufY4Fsey1nkwU7qIwKcSIioD0Y5T7aaFTIRRdMwWWDLf
+g10Xr/rt+rSUETZ/Kqkjjl2PiM9ZQYanE5ZDX10Kf11g+LNe+ObYHj598PeeoRp7
+0QJAxdv9iMNfGXgiIA5q6PrcUOTwl0qC5iNJC8gCpj622Fno+Z20ahJbHzjsT2Td
+OEX4cCFMl24cfeD2YNYpr4/c7FzYT2iC9IehSljNDQXceSI3bu15aRKuRzfQs5Y=
+=j/Ga
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gmic/gmic-1.5.5.2.ebuild b/media-gfx/gmic/gmic-1.5.5.2.ebuild
new file mode 100644
index 000000000000..8c80a52cf5bd
--- /dev/null
+++ b/media-gfx/gmic/gmic-1.5.5.2.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.5.2.ebuild,v 1.1 2013/05/03 08:38:54 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.5.1-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}
+}