Version bump.

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

diff --git a/media-gfx/gmic/ChangeLog b/media-gfx/gmic/ChangeLog
index 8be8458b25495beb6cc185b5f53eba93823f0907..69a5998dfed8f4ac0f9d379a043ec24b65c03670 100644 (file)
--- a/media-gfx/gmic/ChangeLog
+++ b/media-gfx/gmic/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/gmic
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.58 2015/02/04 17:21:23 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.59 2015/02/07 21:34:51 radhermit Exp $
+
+*gmic-1.6.0.4 (07 Feb 2015)
+
+  07 Feb 2015; Tim Harder <radhermit@gentoo.org> +gmic-1.6.0.4.ebuild:
+  Version bump.
 
   04 Feb 2015; Tim Harder <radhermit@gentoo.org> metadata.xml:
   Drop myself from metadata.

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 9e80b112b884bf64d44828e499dde853258e8b57..33dd026c98d49e233d1ccf6830018bc04325bda9 100644 (file)
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -4,18 +4,20 @@ Hash: SHA256
 AUX gmic-1.6.0.2-makefile.patch 6480 SHA256 b4b0b8834d784f8464bf0e836d10cd3f1c86fb6bf5d73f129222e3c824c05bc4 SHA512 7f69f20a8fa73e4b9bdfc9c4e222d80d8a87a0d18acded10af254806464c4b45280a596722859926d7b64b560f484501335f950c6dac7eb76b7b3f7d1a3a8a8c WHIRLPOOL 5f600fe95c3b1d2a61bc7b1f4b2c65f25f0648b44ee3fe40735c6f20ecbda2e57a2f88c19577841983499d19685b3902adb5b2d4ae1006ecdc50474b172660a2
 DIST gmic_1.6.0.2.tar.gz 3013936 SHA256 ec9fa41bb8c27f883b9f845258d41f8024936c80bdec723a1c67cfe05ef9b900 SHA512 9d754cc2c72835bd139a39f72863f5315bebc25716efadb023f54661a4bb3fbf29066ddcd258ab8f084164edc9bd02f77a5a801b5c0753322f959205ce0adaf1 WHIRLPOOL 1d8e7126901b7a269f0aae9bdc1bd05a859efa3269de892e712892aa0c06eeb856c27cf05564bac30abcacf27f3e11d2bcc8f179fc29a675960d6640567cdc0c
 DIST gmic_1.6.0.3.tar.gz 3019692 SHA256 91ce6cfe58e29a6819bf849346bf049d2d73f826bbd7b8b8de42dae7d54c7752 SHA512 377b361fc178ab73a7542a39243d32de970ad6ec5928c295d86acf1bd67efc2ebaf72ce818b55c6a7aeda17eb657fbf4176f4f4c90bc48179419842343e3619b WHIRLPOOL fb78366cd72467b2c1ac2e3f704061be173ba28cb888dabee56f7c4c7c2a4b870293c2e1ae88c87edad8f4e511944bb99218e9fae2d30226c1a4b07b001927f6
+DIST gmic_1.6.0.4.tar.gz 3073596 SHA256 ef83e4efc31280e819d02315b1ebbaec6c0b8ebb960da3e785651572853b8f58 SHA512 75c0adc8a0460c140ec656403053e4533fc6434a0b23c2ac842045aeb788a8ce5da5338832574e76e06fd710bebf5ec627a5bc894f00081ffd1b37a5c6aa852e WHIRLPOOL 1eb3afc6c9fb9c07999e5e497e6d6c5075fda46293417e889511c28c9e0ce26b0070e1356dcf0db9bb49e76b83d75941ed917c01b61c98ab537430ea938c831d
 EBUILD gmic-1.6.0.2.ebuild 2094 SHA256 0a37c9b6f8d93dba698b3c232a5c8a55c6c710a9eda44b68d15705d49856c59d SHA512 a54a45a617fb6ee80db167237d0ba5b96f672f85368d2b2cdba9b4daefe24f6820ccebc858ffc422f97b2212bccd6e79e4c0563143fea9bee340579d0e10eeda WHIRLPOOL cca52c2758a18d3adfc5d22472e445dd07c663c1cc07b2921dcd4cd35bd26e82af860203fa482864cd60b30d5d3f0592256bcba6dbfb8074415772f4e8482834
 EBUILD gmic-1.6.0.3.ebuild 2222 SHA256 c85990628e05c259771f827b1eae6f038521eaaf4a1cc2ebb5440e9602d1493a SHA512 75a6029ac5f11948d51a36f89023c87df0d80db01954a097922580b0121cca03d3b0f1dea4bdf3035dc0b634da655829af65113e479d40a61dfcce09799681df WHIRLPOOL bdd27bad34942ec5eddd282320f026062721b080fc536e9fbc430614cd1f201a7881406d0d0fa8cb6fa8c8b1bf2af4a1226a5f30a6236a790126432d9e9d77f3
-MISC ChangeLog 8691 SHA256 f85f15ed796313efa1c0844f4040e291809e7fc7d4fd339633ed66ff30d2a39c SHA512 6655022a3635a84fb822f65924544c093b5883e462254ec52b19a600d8f1f0e52d688313edab10297c05423f1204f2f34812c1e7723639c703f84bf801b66ca3 WHIRLPOOL 1c73463a7e4c92d970049917a2f68834e5cf4f63f76709658c7550b579f0dbc50e9710998466ba287d9e7681da9888eda25eefb38e0f807bdf28b320160a2a24
+EBUILD gmic-1.6.0.4.ebuild 2222 SHA256 6aaad605f54ef4867fe6aaa90105eccb458fb16eb22c406b34592af92c9a5495 SHA512 fa091e5c4d3b56e30fb16b94a717260d3e2963105c99062d60497a6cf68189793837d606b63df4ce92cb339c1015b7ec9301e831d4db8d17918c15dfccd329cc WHIRLPOOL e944955b0da611c0cc0760dfbef548fb5f48a38e9437c78ec4c05e10ee6b18fd8079fb538cf9d236fd92779b62526faf53961fc47d0536315738fe39d217a0f5
+MISC ChangeLog 8808 SHA256 1d627318a3e73f360e55dd63f250dc3ef0f70332fb0599e401e3fc6326f875dd SHA512 6cc4312770c4c7f91bf46fd9a914585ddab711ecb940062da54aebe513cc25fa79ca93e3e0c1b3fdab76cb4716772094fcfb2f3d91b156db18b50cd82bcb87ac WHIRLPOOL 0fe069d8c3482b86e11f253b68b6abe0a67b0c88ffc2da8cc36943e7a48d03e799ca02553ae04f278ceb91b0f3dbe9be4d9602134a0cc4a81569fcb068884965
 MISC metadata.xml 380 SHA256 7bc861b2d7d49270c478e61fe61d113918612bd95839ed23a8be45ca56ca6ab5 SHA512 134f5153b46c762c63c715a801d9f4146f526e6a9a55e577d830c670b3b9674cc9959c7b9a2dcfbc7f3f31c6cedba8f09a3856aed66d539b9de122b9675d6e1e WHIRLPOOL ddc474aca39db894f52e65c975c10cb8f89aa28fa1adfb13fee93f3a0e1ecda569bdc1d9ececc3066c383bf90723cd2929dfc8691cc237291fef4fbe109e201a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJU0lUZAAoJEEqz6FtPBkyj7A4H/A3n6cezHskNpbS2BfLxqweg
-eg9PIONnMoTdDbAOiABSSiOcvNZ2Q7MpO5ovwuKqtRFcGjoUJfEA6rTHOaytgx9U
-ZBneuck6MzitdfjEpZYThkHXZcofNps82vEUm8DYXFEtd4wELruBpErpsM/MxXl+
-46/m8XYw9TUhI+unM/XCSm/GXEXEylvrJoflhaB/DKVIa3H9MbnyT82iZwVcl6rQ
-3RmiVNf74Ye4UuJkiypa5Kif64eAGuMy1MsV0AUCR+zWwpqyV+K45ct3CdMV9Vd5
-0F/B38MXBCJGsibs0+lYrXqeVSGVx1ta8Vo5+sF+effGahTw5h8kzWOyRt3o/LA=
-=rnB2
+iQEcBAEBCAAGBQJU1oUCAAoJEEqz6FtPBkyjWewH/1rn54VhCdu0QX+PAmCHWcUQ
+Ni8sTSzOGQXPenaktg7Km1FNq2JjESbC+o5NcxcN77F/Xesgl6jG/O/js+4qg/iT
+vAc3tcnqmD8+pH2TNnL9beqEYnFY3h5HezDFanyp/0vz3YfvgbSMZalK+V8Cpb67
+lcOk4bWLcqS1Oa+DWD96yhnOpIFS+q5Rxbxq9hM/GQRWhHmdI84rr07VzUPyfF6b
+sLKH53hriiJFvvMPCyrZGqneDsPYfuEL2prRfccrd4DVi5gzRlfkYCZ1onOITSLY
+K8nxUZZG5ADq75lyywKuS063LT4cmv9UT+IB3mnjGkplqx/H56vTHWpfUPlte8s=
+=wadN
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/gmic/gmic-1.6.0.4.ebuild b/media-gfx/gmic/gmic-1.6.0.4.ebuild
new file mode 100644 (file)
index 0000000..a8ed7a7
--- /dev/null
+++ b/media-gfx/gmic/gmic-1.6.0.4.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/gmic-1.6.0.4.ebuild,v 1.1 2015/02/07 21:34:51 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"
+
+LICENSE="CeCILL-2 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ffmpeg fftw graphicsmagick jpeg opencv openexr openmp png tiff X zlib"
+
+DEPEND="
+       fftw? ( sci-libs/fftw:3.0[threads] )
+       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 )"
+RDEPEND="${DEPEND}
+       ffmpeg? ( media-video/ffmpeg:0 )
+"
+
+S=${WORKDIR}/${P}/src
+
+pkg_pretend() {
+       if use openmp ; then
+               tc-has-openmp || die "Please switch to an openmp compatible compiler"
+       fi
+
+       if ! test-flag-CXX -std=c++11 ; then
+               die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+       fi
+}
+
+src_prepare() {
+       cp "${FILESDIR}"/${PN}-1.6.0.2-makefile.patch "${WORKDIR}" || die
+       edos2unix "${WORKDIR}"/${PN}-1.6.0.2-makefile.patch
+       epatch "${WORKDIR}"/${PN}-1.6.0.2-makefile.patch
+
+       for i in fftw jpeg opencv openmp png tiff zlib ; do
+               use $i || { sed -i -r "s/^(${i}_(CFLAGS|LIBS) =).*/\1/I" Makefile || die ; }
+       done
+
+       use graphicsmagick || { sed -i -r "s/^(MAGICK_(CFLAGS|LIBS) =).*/\1/" Makefile || die ; }
+       use openexr || { sed -i -r "s/^(EXR_(CFLAGS|LIBS) =).*/\1/" Makefile || die ; }
+
+       if ! use X ; then
+               sed -i -r "s/^((X11|XSHM)_(CFLAGS|LIBS) =).*/\1/" Makefile || die
+
+               # disable display capabilities when X support is disabled
+               append-cxxflags -Dcimg_display=0
+       fi
+}
+
+src_compile() {
+       emake AR="$(tc-getAR)" CC="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" \
+               LIB="$(get_libdir)" OPT_CFLAGS= DEBUG_CFLAGS= linux lib
+       emake man bashcompletion
+}
+
+src_install() {
+       emake DESTDIR="${D}" LIB="$(get_libdir)" install-bin install-lib install-man install-bash
+       dodoc ../README
+}