Version bump.

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

3 files changed, 95 insertions, 10 deletions

diff --git a/media-gfx/gmic/ChangeLog b/media-gfx/gmic/ChangeLog
index 977a14e895e8..ea300f43546b 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.37 2013/05/03 08:45:30 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.38 2013/07/04 11:22:53 radhermit Exp $
+
+*gmic-1.5.6.1 (04 Jul 2013)
+
+  04 Jul 2013; Tim Harder <radhermit@gentoo.org> +gmic-1.5.6.1.ebuild:
+  Version bump.
 
   03 May 2013; Tim Harder <radhermit@gentoo.org> -gmic-1.5.2.2.ebuild,
   -files/gmic-1.5.2.2-makefile.patch, -gmic-1.5.2.4.ebuild,
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index b8aeab4e274a..54ebee385e9a 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -5,20 +5,23 @@ AUX gmic-1.5.2.2-ffmpeg.patch 716 SHA256 068c3bbb808b8e68a8826203e124d8cc86c937b
 AUX gmic-1.5.5.1-makefile.patch 5313 SHA256 9871db2facbf096643727b2a38f3799ab9ebf33521ad8e25bc4f2c6099290626 SHA512 aaeab86291892d52170557dddf28b9879121a84bfa63ae7c4105e4e542c2c99c6f3f29f291725dd9221c58d88be4dce9e02da3750a9936f29253f04092f6d04d WHIRLPOOL cb7b8d5012bd637f4574b491369215ef4881974fa61f1109abd9b4722eae53d229c81bae017439cf70c5db1a56c97dcb4032e918d11bf4feb8a119028c733658
 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_1.5.6.1.tar.gz 2137616 SHA256 8399a97f4479a379d8e7fda6a0a73bde0ac120f781111b9ed8a2e28e5a3ed22f SHA512 3c3af5e071dc53c6f6971c494ceaec0d08a34ffc9595dea8c03c56be7ce6eb9dc4c0a91c49b93b01fc112192703aa0f53b2a859b855c4d5ab1f57ca22a45e0eb WHIRLPOOL 8071751c1e318e7aeac28a98c9a89e15008d5799422445cd9ca5e95c1ad9cbbd8ce1d703518a3f9ede5ed00d7deb5cf078a36d15122e4bf01d84069e20ab5321
 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
+DIST gmic_reference-1.5.6.1.pdf.xz 15629240 SHA256 e5fbaf82a68f19fd5914c26fb3eb8fe4888b94508c2893658adc132d72289221 SHA512 45eee7d021ff071edadb89c355dd1a7906bf9dc2166a8401509b61059b6e1005a07ed087a8cc260959d7e204cbacc014064aa3bf9a5db7bf1fdc3812e18764c7 WHIRLPOOL 9ba89f40a1746b45be13659aa1dd4580607e4f9467841897e584a860715e1b033fecfc11a13d4886f4698b569b68bed268706f80b668cb4534e286b77837b03c
 EBUILD gmic-1.5.5.1.ebuild 2030 SHA256 15953b873974ad6bdd490f69de2cae8489def7f652c96376449056b3b9abb400 SHA512 2403dbd95ec0273509e1277d0eac61a525f05f2ccc8ac7d0d0474a1f251996dda12111f0211f272b8ed3049fea9afebc0d49c99e95c3d3bc4c6595961b1102ca WHIRLPOOL 3b62144036efce0217f6ffbf97f8a408b5b1313f025d173d93f44dde272d9e2d5ac790f42c51a749431bff57e6bd75140f1ee52d0fb60f4258b495c2d5ad197b
 EBUILD gmic-1.5.5.2.ebuild 2039 SHA256 3dcfe6b2e4aa5420aa010608fbc5f4da54781a0c3103a7875d60c3f5cdc20f0e SHA512 d5227309021823fa5f7518624d5835f0c01bb49eb27eee70caafe8fcf6a0636bb2d304382dcc2301c6b0eb33c2e43f9da35597ad49a1907365cb3d23bd280b22 WHIRLPOOL 56ca7ae11765722a64791ee8def149b332d088b41050a6f1a250c07cd9c2b7873e3b395f667d328f2c46fa687bfd885de6db813c8037c3de2f5e9df094f36e35
-MISC ChangeLog 5239 SHA256 2901f53df91bcf2e8775575c99a404e6e84267760dcf5bd47fe156e853bc1b8e SHA512 a033db6718a56b04aece635e4332d4b21d1ea228e4047bdb7502b1d8b1ec0117e6dbcdecc820a719d8de3b8e38b02ad489f08d4a598ce17d5c67b87aa4acf7a6 WHIRLPOOL 8969f77ac5c22fab85fd5ba5162a68926d84d703bfbbbcd55937bcedeba004967344a02923b061b7935ecdb78b68965b6e26fb57617cc6d369c7ac82335d7638
+EBUILD gmic-1.5.6.1.ebuild 2039 SHA256 7a8c8730d5da6b6ae06ced9bbca7829b95e09d22e0c90d3271a07bb5b9f96e4e SHA512 734b12e3370deb94800061c6d57617480bf2379911958dbae32d413de470728c621e849781bbbe2e80370b4bb681ac65d234fa27fde5f8b09e3debd84ed71eb8 WHIRLPOOL 24a1c159343878b23dcad8c09cc286285c81e6854fd1cbb0581702bf4cede20bf2c1cff6d2b18187eaefc919f80316c1117d198cc3506c98424411989b948541
+MISC ChangeLog 5356 SHA256 2accc93cb1757dd08c2443cea27284109901fc45077e542e2bd8d03de5f8ab1d SHA512 9765ecd5a4433a87bd984529d9662c3bab3f3b90e915c68ecac88814f478420922ece294dc423693abb8d0e5549a31894e5fa7f00dac44447193f4b6ecd46eb8 WHIRLPOOL 51ee8b54fb5e838a46b5fc826843e36c861d99411a63575057d82b08c492996e031767e35e2ae65808713b4713da9455b5b0285657af4c9c6e44e7725abfd3c1
 MISC metadata.xml 473 SHA256 def06af4d0283b01f9313231ff05df286129ff57afbcac23fcc7c45d8f735a6c SHA512 4bd720129471c24a6b71e32f11054d96bd2eefb3316489806a06b8deed45e5544fe1c74a73c129ec90fe30c8a4c0646c50e6690717046ad93255771627588f32 WHIRLPOOL 9a356f4c399b7a6fdf217b2dbeaeb4fd40dffc080b86c0ad913690c0b0007aaad52ea79d3b7b5b21591432c99a1e59ed02ead94e2578f1915afe2ee0c9f7d090
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRg3krAAoJEEqz6FtPBkyjQYkH/R4pS32cdV5xujUlRAACwV4O
-Cfs/oZVNHAluvfcplOPiOcpRGJZ/KzIswoOsjN2qx5nAjWXF15jujXJ8ATQ/Wu8a
-vGb8mpTLtYHBgubAikWUUhP816uv4fmTQYZRTpmTAH7SjHaL1QaodDKTCfTEtaHo
-nBorfvGVliNcHRSSUaTjYPUpcDIJ550wTS66GsuK1y+63nuqmQTtAvervIVzr35h
-KwfjY9yQ4i+nmqv9BzAxza/OoEcKQQ7Hyi1YkQbFN3m1BdEVFJ3JGqCcRqoltg7/
-Izf//7AJbya/Dcw4i0QitHBCWwE7zZ64CkTv2SWnxlyqqBCH5HIDex0JkRWjFWQ=
-=Mu45
+iQEcBAEBCAAGBQJR1VsOAAoJEEqz6FtPBkyjG60H/RCXTmfYkqygDMfq61MAWSnA
+wGO2a5vG9u3IWqMixyRmlgaJRZwCNenJRtPUiXYpjdp5SouuwLKZIke8MAQES7N2
+075GAKiACLXDjxpH5uI7MKQPwsAcUDPOlWQY7XCYpvYl/AEFdTTyx82u+/JRjz9/
+z/LyeTsfPVLCtIJhEwapv9KrmbFErKdEajvzC0WWVQkaejbVtKr/kEBkAWmaGeEZ
+jTSMHfNPsP3fdhc6/fHcfPdzHjIc5UcRjkTYfT60Ibw/+L5mxNjdaYC05al4niT3
+6PU3bYf9AdKgKx9rLxh8LkvydDJmjDwD9Bpyb+k3bQhaNnHPKmVFUx77x7hWMjo=
+=W25G
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gmic/gmic-1.5.6.1.ebuild b/media-gfx/gmic/gmic-1.5.6.1.ebuild
new file mode 100644
index 000000000000..a9f3e1e77a3f
--- /dev/null
+++ b/media-gfx/gmic/gmic-1.5.6.1.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.6.1.ebuild,v 1.1 2013/07/04 11:22:53 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}
+}