media-gfx/greycstoration: Make heavily use of pkg-config

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

4 files changed, 86 insertions, 17 deletions

diff --git a/media-gfx/greycstoration/ChangeLog b/media-gfx/greycstoration/ChangeLog
index 68efcb4d4574..0a4d5baa2cd2 100644
--- a/media-gfx/greycstoration/ChangeLog
+++ b/media-gfx/greycstoration/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/greycstoration
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/greycstoration/ChangeLog,v 1.8 2010/11/08 18:05:28 ssuominen Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/greycstoration/ChangeLog,v 1.9 2013/02/27 16:11:20 jlec Exp $
+
+*greycstoration-2.9-r1 (27 Feb 2013)
+
+  27 Feb 2013; Justin Lecher <jlec@gentoo.org> +greycstoration-2.9-r1.ebuild,
+  metadata.xml:
+  Make heavily use of pkg-config
 
   08 Nov 2010; Samuli Suominen <ssuominen@gentoo.org>
   greycstoration-2.9.ebuild:
diff --git a/media-gfx/greycstoration/Manifest b/media-gfx/greycstoration/Manifest
index 6e9a5ee256bc..4ae6051a2f29 100644
--- a/media-gfx/greycstoration/Manifest
+++ b/media-gfx/greycstoration/Manifest
@@ -1,17 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX greycstoration-2.9-libpng14.patch 839 RMD160 28f49c33e620135f0f722690d745b60859126e3c SHA1 2388447347ef1d3c5545fcc0ab6c340755016c3b SHA256 2fe78bf4b6b82d15c7f7965694614b376574e1fcbc7043ab046229de88f2fcfe
-DIST GREYCstoration-2.9.zip 3639412 RMD160 36aa8b2c261ff101a590dde2a136adebc0e56060 SHA1 afacea96db9cda6bd565055aff2a235572533d1a SHA256 dfc867bffd38fc204b5fe6a3952d7aa4ac53c2b75aabf45102ed7f6022c1c7be
-EBUILD greycstoration-2.9.ebuild 1653 RMD160 161410e429f9220a85d227965ecab912ba64fc2c SHA1 3efb1e584ca325516c8b82c1ea90017bb160bb66 SHA256 9fd76ae49b2dc8deea70a991935860c5141a54fd1b09d0f59ba4db60f14a2c4d
-MISC ChangeLog 1319 RMD160 59003569b54aa285687a4066933380f5fd22e71f SHA1 a9304e2a13145ee03a282c230c0bf3cafd892948 SHA256 012f6feef0b64077c190072ca90e035c02278eb4ad11bed50dcac43bf8c72365
-MISC metadata.xml 232 RMD160 4c7ab29da7172e74adfd87ebb5eb6fb5475a82be SHA1 7b98547e067cdaccb43f37be116d5b15befef8e9 SHA256 18d82999ae63f6a95f78867cc239598fd2eb8011c837dcbe85830d022e7e6aea
+AUX greycstoration-2.9-libpng14.patch 839 SHA256 2fe78bf4b6b82d15c7f7965694614b376574e1fcbc7043ab046229de88f2fcfe SHA512 a7327baf9611fd204d8d83d9be20bd96672388e74a2494fefe8911e5c8f89858c7c02ea494ca3581a341ad1ba7f7f533fa438819868ab173b513e1f48c53b59f WHIRLPOOL ed69f4be6a34e0104b6c99595f9dea89287fd96300ec35c0ed223d2f41a299fe45f4ebabc8128bcf8897f5fc1c997547968792a6db815c2417e7bf8b895e9948
+DIST GREYCstoration-2.9.zip 3639412 SHA256 dfc867bffd38fc204b5fe6a3952d7aa4ac53c2b75aabf45102ed7f6022c1c7be SHA512 f0f90e02087d2670213ed72876105202eab996bb483bed069046c0e01153eb05da91d92f00aa3ed5cc2fecba19f35e20739049c149426453e0e11efd446844ba WHIRLPOOL 667e7411261446d507f26a54d1a95691f81ca878908661ad0c51145a9956b872553b62eeb1937e72fb0d819c97f160af8479c544c9b7b7879afed297daf4f57e
+EBUILD greycstoration-2.9-r1.ebuild 1862 SHA256 766bee5bd826aaa62a97d285bdc2d6ccf6e5408d1823e59fa85fafa33f0a207a SHA512 a29b7407877c6434bb1324277b12c01f7f1fc44c909535958dd0b79d76168ffdee43315b94d77cdd6d1e310f241604fce3d52bf032bef14ebc435396e36a2a35 WHIRLPOOL b1bfe8e4c51d29d66502642f57957b1a5aa21cbb3dbf56290b27c5eae4d2a1ea29b3cbd0ea37a5e8f88dafbb2a4cc11ec434717d7a8e476507fce350ee2a11a3
+EBUILD greycstoration-2.9.ebuild 1653 SHA256 9fd76ae49b2dc8deea70a991935860c5141a54fd1b09d0f59ba4db60f14a2c4d SHA512 8685c67fdcbc7df703f4079bbb13fe82db90956f4aafc7a5c63ae4cee249bbf10e76f7f44a6d152abd3c6c467fe7d1e96051dfef868df428a3e79aa0eef2e65a WHIRLPOOL ea94deea98499a7bd31ecd94880681fec2a8b9954f043cfd065dc637c830db3c0d845918e3a3b87e1dfa460f756c92e846698ce365afa69e72bf0032d3235268
+MISC ChangeLog 1480 SHA256 86f144e5b8183bc55a7fe080d076887655367c2a3a69d27554856de36e52d338 SHA512 e96b1bd1f093738acb39b9bf114dc50260fb747de01857e8b04dd0671468149ea91c36fbfc8926c3138a5bfbe07f16d88a4c3b769e508c3db3a47166b48d39ed WHIRLPOOL b295a80246f14c0ce84009e3a37788aeaf0e09b86620c914e1b4c2c1fad2d087e3bc7817d746f2e0d97dbc6ca2dbf540bffc5030441a7e27afc975f61475c65a
+MISC metadata.xml 240 SHA256 aa3c8883b35b6d81c030fd9eebba39ef7cf9d6f5a9df710c9eb500cd47ba9976 SHA512 240762c00c1d233b5386c447b2fadffbae16aa818ad136bb9a9a7df96fedb2839fdfb6cc2cbe5368ee832fa5796fb9e6f21a4e0b040890b3f9a36574559253a5 WHIRLPOOL 5ceb0f296c6dbb4699a692d584f8392a3230815db54bc946ec287fd96b3e7d0fb7cc32cb391470a3c4db274a60d77431657d1eb9a312ee2cfde42dac50d62bae
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAk59ovoACgkQfXuS5UK5QB3LvgP+K8BvN6Rno/q1KRLu4tWwqRl6
-s1VtIIJVyLcklwoQ8IvLf3p8dW9Jp98z8EKaaep1l2PWo7rez85R50O39e9b3r90
-7q8pQg6oZwKrhEjImV05jnqP9X4icwOY9gVgXmWGb5Lo4fqE5Amhwq9zHA0GBomS
-fQi69KaoFqzYbLZ7RTg=
-=gLgG
+iEYEAREIAAYFAlEuMCkACgkQgAnW8HDreRbTLACguUBSSYhGlxsuGq16yG3+cijb
+1jYAn3ebduRUtEUdUQBe86/kScKYNihJ
+=8ABQ
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/greycstoration/greycstoration-2.9-r1.ebuild b/media-gfx/greycstoration/greycstoration-2.9-r1.ebuild
new file mode 100644
index 000000000000..7c5631c48267
--- /dev/null
+++ b/media-gfx/greycstoration/greycstoration-2.9-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/greycstoration/greycstoration-2.9-r1.ebuild,v 1.1 2013/02/27 16:11:20 jlec Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Image regularization algorithm for denoising, inpainting and resizing"
+HOMEPAGE="http://www.greyc.ensicaen.fr/~dtschump/greycstoration/"
+SRC_URI="mirror://sourceforge/cimg/GREYCstoration-${PV}.zip"
+
+LICENSE="CeCILL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="fftw imagemagick jpeg lapack png tiff"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	fftw? ( >=sci-libs/fftw-3 )
+	imagemagick? ( media-gfx/imagemagick )
+	jpeg? ( virtual/jpeg )
+	lapack? ( virtual/lapack )
+	png? ( >=media-libs/libpng-1.4 )
+	tiff? ( media-libs/tiff )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	fftw? ( virtual/pkgconfig )
+	lapack? ( virtual/pkgconfig )
+	png? ( virtual/pkgconfig )"
+
+S=${WORKDIR}/GREYCstoration-${PV}/src
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng14.patch
+
+	sed -i \
+		-e "s:../CImg.h:CImg.h:" \
+		greycstoration.cpp || die
+}
+
+src_compile() {
+	local myconf="-Dcimg_use_xshm -Dcimg_use_xrandr -lX11 -lXext -lXrandr"
+
+	use png && myconf+=" -Dcimg_use_png $($(tc-getPKG_CONFIG) --libs libpng) -lz"
+	use jpeg && myconf+=" -Dcimg_use_jpeg -ljpeg"
+	use tiff && myconf+=" -Dcimg_use_tiff -ltiff"
+	use imagemagick && \
+		myconf+=" -Dcimg_use_magick $(Magick++-config --cppflags) $(Magick++-config --libs)"
+	use fftw && myconf+=" -Dcimg_use_fftw3 $($(tc-getPKG_CONFIG) --libs fftw3)"
+	use lapack && myconf+=" -Dcimg_use_lapack $($(tc-getPKG_CONFIG) --libs lapack)"
+
+	_cmd="$(tc-getCXX) ${LDFLAGS} ${CXXFLAGS} -fno-tree-pre \
+		-o greycstoration greycstoration.cpp \
+		${myconf} -lm -lpthread"
+	einfo "${_cmd}"
+	eval ${_cmd} || die
+}
+
+src_install() {
+	dobin greycstoration
+}
diff --git a/media-gfx/greycstoration/metadata.xml b/media-gfx/greycstoration/metadata.xml
index 5b12ed78d92e..5b78d475c43f 100644
--- a/media-gfx/greycstoration/metadata.xml
+++ b/media-gfx/greycstoration/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>calchan@gentoo.org</email>
-  <name>Denis Dupeyron</name>
-</maintainer>
+  <maintainer>
+    <email>calchan@gentoo.org</email>
+    <name>Denis Dupeyron</name>
+  </maintainer>
 </pkgmetadata>