[gentoo-commits] dev/maekke:master commit in: media-gfx/pfstools/files/, media-gfx/pfstools/

[gentoo-commits] dev/maekke:master commit in: media-gfx/pfstools/files/, media-gfx/pfstools/

[Markus Meier]

commit:     2e378224745d6ac1bb0672c3aa97af601aa96934
Author:     Max Argus <argus.max <AT> gmail <DOT> com>
AuthorDate: Wed Oct 23 00:19:59 2013 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Wed Oct 23 16:32:09 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=2e378224

Added support for pfsview qt viewer.

---
 media-gfx/pfstools/Manifest                        | 25 +++++++---------------
 .../pfstools/files/pfstools-1.8.4-fixmoc.patch     | 11 ++++++++++
 media-gfx/pfstools/pfstools-1.8.4.ebuild           | 25 +++++++++++++---------
 3 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/media-gfx/pfstools/Manifest b/media-gfx/pfstools/Manifest
index 7be0db1..2c2f837 100644
--- a/media-gfx/pfstools/Manifest
+++ b/media-gfx/pfstools/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX pfstools-1.8.1-glibc-2.10.patch 447 RMD160 1f6d28713e315734882f3183530e37a7fc0a5fa2 SHA1 d6e993c5ec6fd6364f566ca9ea455a4486d35add SHA256 30a4ffe98f68a082bad6938506f96f83151fb6a3c31400f1f22b6cbb260079de
-DIST pfstools-1.8.1.tar.gz 773999 RMD160 acc85ce60fc91a71411a6b929481fff3c21161d8 SHA1 4d2f3a18c270d2d5c4442eb6f6750eca2aa99976 SHA256 8c34445b4ac467f0bb5b2d69275257b335835ebf3a156bfbf08a7bb10652f59d
-DIST pfstools-1.8.4.tar.gz 843942 RMD160 955a07f5f42bb98ca501c561abdcc73bd2688863 SHA1 7090fcf05850ad3186d36f750cab6810fac4a753 SHA256 584ccd9d753428645053730c49802cc44a24839ca03fe1824ffb12efa6f70bcf
-EBUILD pfstools-1.8.1.ebuild 1335 RMD160 160fec6932a6b3dde2f7c325578f45c9803b78a0 SHA1 0e45ffa15ce81c67a678b9a175a2762e425a1751 SHA256 ce40b48c21393f59b3b7d3d04e43314a3cc526c898a8df15c4d89e19ea04a14a
-EBUILD pfstools-1.8.4.ebuild 1630 RMD160 083d5fbcffc1c1d9eed6ef2e2e9c3952ab0fadfd SHA1 8c86dc0eed15d62b87acf200decb0afd0ad68398 SHA256 6bad71108dfb70362be2caa6ead1dfbb4f5db049b5741aadc105fc499230ca7a
-MISC ChangeLog 754 RMD160 f28261dab9d76948d6aab5b916243a610e64be26 SHA1 5e20ccfdd2a2b2c517cbe497cabcd51ea406f9d2 SHA256 8045022f71dfe4655d0baccd6e316cd6ce8054692dd3ce466686f63a3ace4446
-MISC metadata.xml 717 RMD160 223938f59c3af0d913b1225b0cabf0b4c7819b75 SHA1 6993a603687165daf540c32ef1b08a8835797c34 SHA256 40274d0185631b8bb3dd8ded83ebeaac1349b89780dbf54e741f679bab54b3bd
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk4Te6kACgkQkKaRLQcq0GLGuQCePZj8u4Cj8Ofs3R9F63XkfOQ/
-c1IAnjj7I4cdGlg1vAXB0GZrh+8L9VH7
-=fvEp
------END PGP SIGNATURE-----
+AUX pfstools-1.8.1-glibc-2.10.patch 447 SHA256 30a4ffe98f68a082bad6938506f96f83151fb6a3c31400f1f22b6cbb260079de SHA512 d8aec79be9d8a8ae0132ccf58bb9b2d9b3b41d142dba075668d0b39f05dc0803ca5fff949cb3bef466f692e63f952aeb282b2eb358427827d679bbe119e5161c WHIRLPOOL 22a92dd372c4c4c8e1908cae7f476bbe223ead5af4c2c262f2e26bbdc03710bbdbe81a6c98bc814eba135cd0e67386d0d454b9bd0490a4ca21c16904e3848920
+AUX pfstools-1.8.4-fixmoc.patch 240 SHA256 e1e0b0c98b91d148a83121cdc40e79051fef719817e3ce4e59e3af41d81f4721 SHA512 435acce900e1f76adec9f4b4822363ccb1da3478edda57a293c1ee25cfad6efc12b1cbdc7dd7c6dda207b85aa93b586c4ecef75b1b86d73c978c7091361f8557 WHIRLPOOL 7dba063959012aabb0b83b1286b7ab771cf5e2fece744f243c94ce8daccd30d9e0a9587ca684a48201be7aa26c94e6f303130c4ab233a983e23034d549b9d7d9
+DIST pfstools-1.8.1.tar.gz 773999 SHA256 8c34445b4ac467f0bb5b2d69275257b335835ebf3a156bfbf08a7bb10652f59d
+DIST pfstools-1.8.4.tar.gz 843942 SHA256 584ccd9d753428645053730c49802cc44a24839ca03fe1824ffb12efa6f70bcf SHA512 925455b73439ecf119bd2d6afa5f39525c8bfca355837581759a67e9ac7fe0d1e05a365933b201cacc0691e68ad7ad10013e02f2ca94ad12d91d61557a0edd5e WHIRLPOOL 6a86945f3e9aa09600144432f0b5f9919ce56f476963ad90e78d699b9577492db493318c25ac62d73d29a6ab888bc262d690e96c67ccf37c55209edc14a8cdc6
+EBUILD pfstools-1.8.1.ebuild 1335 SHA256 ce40b48c21393f59b3b7d3d04e43314a3cc526c898a8df15c4d89e19ea04a14a SHA512 6ce1d1fb9253fa11623e193f3f393440acdd71994889d9177c71e3d925377c8c25a0efcbae8490b3e378e568ea25488a588b7d8ca29851eca1e29afbc5aeaba1 WHIRLPOOL 7f74ff132a82b8066d4bacdc07da212f98968fef019d228bd612e74ee3a2b70e346e048d7fcb0d7b2f7721740551c3c2dc713c1e2f821f2d8bbad47c4e428718
+EBUILD pfstools-1.8.4.ebuild 1742 SHA256 77bef1d50a89cc9bd6e898fe72f013ae6a446e866aab150ad1f3c9ec3c316ff6 SHA512 dfe3862d8742d662caf56b87f0ed58b14177474238b08633c73176d4267e4c3dd79085f76d76695664c0e2a65283a1b6f81ff0010b37f175f06e8b841cbbcad7 WHIRLPOOL bcc9c7cea88b4d07330281b572b4ee739e62483032579deffed1cfbd5bcd5a24f4e9253638e4e7fe32c1aa02210920ad962b0939575b9c4b601e0911cd3dca2e
+MISC ChangeLog 754 SHA256 8045022f71dfe4655d0baccd6e316cd6ce8054692dd3ce466686f63a3ace4446 SHA512 810bd918d55935a93f40118b3cacc00268f8f4a42f836448b2a89a0031b2dc33821c70feb4d81e494a8b517433034fbf8b01a51182907d191cd0ff7df5c5c296 WHIRLPOOL b0562bde4a977d20524ccec28ee1875205ccf4e577a0ff211846a405600ea564fd9b7e6c131694d1f69f22240e7686d7acff7402a4eaa682c76914547a51da8b
+MISC metadata.xml 717 SHA256 40274d0185631b8bb3dd8ded83ebeaac1349b89780dbf54e741f679bab54b3bd SHA512 05bc2ee037b6e7c4c64ab84f0a816ecdf4af6294cdf078ecf1f9e227a45584c36aae91243a9b010600447127e215ffce12044d0f03c52f92ab14bc0672ca8902 WHIRLPOOL fd57580ecb3c07df04eccb22b8ea13042137fc960a8c2271b05bcc21521c84dbada8e4d1048b97ac4ed6338e517d1cbb787a38ab5ada82fd57c53e5ad995cfde

diff --git a/media-gfx/pfstools/files/pfstools-1.8.4-fixmoc.patch b/media-gfx/pfstools/files/pfstools-1.8.4-fixmoc.patch
new file mode 100644
index 0000000..dfdefc0
--- /dev/null
+++ b/media-gfx/pfstools/files/pfstools-1.8.4-fixmoc.patch
@@ -0,0 +1,11 @@
+--- configure.ac	2011-05-20 12:34:05.000000000 +0200
++++ new_configure.ac	2013-10-23 02:11:15.108528609 +0200
+@@ -315,7 +315,7 @@
+ 
+ ## Look for MOC
+ if test -z "$QTDIR"; then
+-  MOC="moc-qt4"
++  MOC="moc"
+ else
+   MOC="$QTDIR/bin/moc"
+ fi

diff --git a/media-gfx/pfstools/pfstools-1.8.4.ebuild b/media-gfx/pfstools/pfstools-1.8.4.ebuild
index 74dc555..01ab8ae 100644
--- a/media-gfx/pfstools/pfstools-1.8.4.ebuild
+++ b/media-gfx/pfstools/pfstools-1.8.4.ebuild
@@ -15,7 +15,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 # TODO qt4 - detection doesn't work yet
-IUSE="debug gdal imagemagick netpbm octave openexr opengl static-libs tiff"
+IUSE="debug gdal imagemagick netpbm octave openexr opengl static-libs tiff qt4"
 
 RDEPEND="
 	gdal? ( sci-libs/gdal )
@@ -25,16 +25,18 @@ RDEPEND="
 	openexr? ( >=media-libs/openexr-1.0 )
 	opengl? ( media-libs/freeglut )
 	tiff? ( media-libs/tiff )"
-DEPEND="${DEPEND}"
-#	qt4? ( x11-libs/qt-gui:4 )
+DEPEND="${DEPEND}
+	qt4? ( dev-qt/qtgui:4 )"
 
-PATCHES=( "${FILESDIR}"/${PN}-1.8.1-glibc-2.10.patch )
+PATCHES=( "${FILESDIR}"/${PN}-1.8.1-glibc-2.10.patch
+		  "${FILESDIR}"/${PN}-1.8.4-fixmoc.patch )
 
 src_configure() {
 	# TODO set current octave version --with-octversion
 	econf \
 		--disable-jpeghdr \
 		--disable-matlab \
+		
 		$(use_enable debug) \
 		$(use_enable gdal) \
 		$(use_enable imagemagick) \
@@ -44,12 +46,15 @@ src_configure() {
 		$(use_enable opengl) \
 		$(use_enable static-libs static) \
 		$(use_enable tiff) \
-		--disable-qt
-#		$(use_enable qt4 qt) \
-#		$(use_with qt4 moc moc) \
-#		$(use_with qt4 qtinclude /usr/include/qt4) \
-#		$(use_with qt4 qtlibs /usr/$(get_libdir)/qt4) \
-#		$(use_with qt4 qtdir /usr/$(get_libdir)/qt4)
+		#--disable-qt
+		--with-moc moc
+		$(use_with qt4 x)\
+		$(use_enable qt4 gui qt)\
+		#$(use_enable qt4 qt) \
+		$(use_with qt4 moc moc) \
+		#$(use_with qt4 qtinclude /usr/include/qt4) \
+		#$(use_with qt4 qtlibs /usr/$(get_libdir)/qt4) \
+		#$(use_with qt4 qtdir /usr/$(get_libdir)/qt4)
 }
 
 src_install() {