Version bump, EAPI=5, python-single-r1, fixes build with Perl 5.20, bug 536150

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

4 files changed, 124 insertions, 9 deletions

diff --git a/sci-visualization/gwyddion/ChangeLog b/sci-visualization/gwyddion/ChangeLog
index 373d97a09f3a..81d7e2791f98 100644
--- a/sci-visualization/gwyddion/ChangeLog
+++ b/sci-visualization/gwyddion/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-visualization/gwyddion
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/ChangeLog,v 1.45 2013/01/23 10:21:53 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/ChangeLog,v 1.46 2015/01/09 20:32:27 dilfridge Exp $
+
+*gwyddion-2.39 (09 Jan 2015)
+
+  09 Jan 2015; Andreas K. Huettel <dilfridge@gentoo.org> +gwyddion-2.39.ebuild:
+  Version bump, EAPI=5, python-single-r1, fixes build with Perl 5.20, bug
+  536150
 
 *gwyddion-2.30-r1 (23 Jan 2013)
 
diff --git a/sci-visualization/gwyddion/Manifest b/sci-visualization/gwyddion/Manifest
index f383404515b3..7a6225a79694 100644
--- a/sci-visualization/gwyddion/Manifest
+++ b/sci-visualization/gwyddion/Manifest
@@ -1,20 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX gwyddion-2.25-libpng15.patch 158 SHA256 e039b79411177aeb4be582888503536984fc08d81f8d1d135298c3605b32e2ad SHA512 4d9646b63c4b0d20b7a080dbc7d5d053b721ddc9d708ba206f547d3ba98d9d6a09b1021a21466f5a50a4a250bb30cb13fe68835c00f2c356c307d4ceade636fc WHIRLPOOL 9de6d963ddb686b4910a1e1ffd2290f5eead2b13ee26e4fb36dcee600a89e7ac64343319f3865f48d80e6f3be3aa7917178c1257c31f6b954cd4a80d04b92cb7
 AUX gwyddion-2.30-BGRA.patch 471 SHA256 a96e82f1eb22f2c098fd5bf8fb517d038512e362ef4bec74849ff4bcd654a701 SHA512 64e50df0de885f74aece4e9b9e51dba928a8f9edc3ece766507d8ede101b674e1183d40e970a8c3e19ffd2e3d33a8aaa4f0b542246024886e4f2e610912aa698 WHIRLPOOL 7ab5a726b369fa9d128603837fdbd284e0544bd4fb1b5077b110b91588002b86e259da3145e6f4f05ab77f1518668d12421a773e968e1d924e56b0b9ed09e089
 AUX gwyddion-2.30-color-button-debris-crash.patch 1805 SHA256 b017da6d374f8b35760104010f6828e3195fb2ec59da9c294f81ca96a572866c SHA512 6990b2bfe218af0d4529158010c25901d59739deef10f2077a95d246d508c4f2f6ed03fa57e7d19f83b5bb1755d4c207f5f2b898f768ecafe9c1ee335d91e16f WHIRLPOOL ca3f709bc0234e1a8a014047c80a6d28a1219928e1c7cae039bce40d4f6eb24f78a9d921624a65cc8425806c8d73ff37cc1e60b146262326793a70ab6761224c
 DIST gwyddion-2.29.tar.xz 2808868 SHA256 d7dd3b5bfb254cf158cfed80ebd2495fb1142f8189594c7d6f8f6a9944e5c64b SHA512 2b88ea1a872e8b9a228248d2ba94d96000d46a1a483202ed830198829ff21de21f6d13a1ec833ad0b93a12e112415798963c48b9b8cfca05e9e3fe8c2bb28f2b WHIRLPOOL 025d1552df7871515db8a6d1157dcb1562d16db14007f5adc762f8a5b504d53cc1732400d9f4b32d5ff2ea06726e24b6513f13b2f9c7f058f0f602027560da66
 DIST gwyddion-2.30.tar.xz 2771208 SHA256 3778e56ec5f2d2333297c9aa2b850a1cb2b29b9e71421657223c44f30e05b140 SHA512 b311e086115446eb7d43cbcc2eee244ba145445f3742eb615efd02da4d95e68fc8d8d026ccb5869cd9c54b02978e27a9081aedc20afdb339c6636ee883e43734 WHIRLPOOL c696693f960006458a0af743057579d2516b15a97dff68dc780802c5800c5b14df1012059de83221f7bd0805e9ebbc44425144669f2ce78f32ee6f75a3669f0e
+DIST gwyddion-2.39.tar.xz 3130844 SHA256 f2346a706fa097e9186339f7e10b7837b20ce403b44bc7a85bc78b6b78a506d2 SHA512 5b9631c9eeb71a10d0be3533585eb61e8d27bc1147a1f3cf1ca333020271b579025ce752d302bd9474f1b3ed8c55ce679ac6a75bfb4a1093adef0727b824d435 WHIRLPOOL 90262b86d1bb01b6fdf5a67b447dc1177a523df368fbd040a87d7261e071844b86624dd6bb303c8a32302d16e5f7cb11e5f0744b2808e4f6d467cd27652efe23
 EBUILD gwyddion-2.29.ebuild 1947 SHA256 49abc89d267e719efbed54ef7d2cde26df64919d78662671eb4a2c2bf6bbfb85 SHA512 247fb9b41b847e36c36d4b5bf07f1f5b41f1bffe5d58d396efb1ea24553809bb01f51387ab62804a1517beddc038670b09e838f8c616ec0a028cdc3bb333b60d WHIRLPOOL 3bce8bb89fa841faae87daa453e114a3868f19a4b7d9d8575b42b77f7dff8154e23ab3e3f348f0aed4f8bf10f7958f77d57b3331838d071a8a2460de5fd3e27a
 EBUILD gwyddion-2.30-r1.ebuild 2012 SHA256 09bb4b86a433b5dbcfd608fc12a48e96359780d734336965e9e7c98082690c03 SHA512 f430f3e307a8678c12adf06721876c8a3f9c7bc8fac6ab373516e437fb719e9c42d9369b18cabf6322ca500b056a2f76f5cb99a734b4c1cb3d6e517f28816da4 WHIRLPOOL bafa916aea528fabf77cef109132d483bdf082e6575e3e9f8e2cebffba4e475f8fa255b2827f53f710a407d5c92df7a1d395c15d37a973f83bb95d7a2cbd66ed
 EBUILD gwyddion-2.30.ebuild 1947 SHA256 c80b6e6e8b4d2a639f9a9b5b483e56a3cb3280b84bbce1008b93fd87cc8a65c7 SHA512 623e031bcdf70db2f28df50f70e3b0c61883e9fc291f01d5add7eddd39114c66dac28efb65ca085bf5e74d458ad872b4a0e23666123843364d609aaf4cee882c WHIRLPOOL adf446fcb0581955aba71c572f8c550194f630ff23b6fe72f38c3e3200c21b6d293910ebca0e27ced1d865611f06e737af2526c294f447d0e9e9244b275be405
-MISC ChangeLog 6880 SHA256 a7d8a74aaad53e9dbc35d7f3bed18ff33c6e764c1c8df61a82ec8a8205375965 SHA512 dbd403f208a20edf5c42e76fe288f942e2f3fa2a767b85016015198138912188d9e0d3ef940abc3adb61fccbc951e86803dc90262ff61911b72eeb01406ca7a8 WHIRLPOOL 35d474c9a0cd63b6f923aef494c84a6f4977d45c3d7bc882f2c0351c9f7bfa9f2bc3992a68261314ba243b8daed8cef9b6e1e23da80665643a43b659afec4e8d
-MISC metadata.xml 614 SHA256 987e2c48924636f8812052f16627d0ab1366e5428656c743d796ffe641b8bb0e SHA512 15d7aad4ea047e0af1e31a9dd5043733b31810f690c1163948dcc916102d90992180e50f7c4590cc032b47915b9bc95a8b4655375c08a6a3043a569bdc0a7654 WHIRLPOOL baeaf0dc4506ee222b0fa56cf197b1941ddf3641f32cb1cf3995c7f5650fda0ca17d69cfefa5c40e00f1acdd2f0b5a908a1619f9f9f2514aa7fbc70db2f7e76a
+EBUILD gwyddion-2.39.ebuild 2027 SHA256 62e5d5ee592e8b5924e69eeb8697673bae6f3aaa92207c4d30584d9899adcf35 SHA512 783e909558691e7f6fae4fa886f6cd44c5c7ad9a8d041b5dbcc4b1b1868b9884449bc0a77be1e83a90b342d5a35a39f3ec09fe3d5f143338408b18b6ae2f47ba WHIRLPOOL 88253a69bca97914745ba28a41bdd231a1fd6e5de40d881e3335ce892c9819ac8d806b9a1ddd7031dd114531b0ad109e9f43ea90f9396a05ef111fb8e7bf4a60
+MISC ChangeLog 7079 SHA256 f65c758d9826329777a8bc4f8b4aa98c8d186a878ceb9c6c221e70510e9e1fa9 SHA512 1e974d8251a1c52976235a59f87c06e719613afdfef698e484db86f7fbdc9e234cdaa260c318866baa1c304cf80e01bd25bc28647a8388eb42e7872ecfa8c13a WHIRLPOOL 42276a5d9514fe6af52a4a5c9fc6b4aadc6a64d49915198710b88ad24dcdeb2cc31fa08b5d4b2f0261da6edc507e69efc5e6a368d565e5698b17b69f94d92afc
+MISC metadata.xml 725 SHA256 9761b27b1b1f63c7b41453fbc30af328fd5b1b3692c39988f803d2b255f3feca SHA512 54dddc7f44ce5a0b1e0adf7616bffddd912940be499a6d5c280808724d8a9021e81666262fb68aeddb46b7aec4862527cafa65cd9062ab4e5c25f5e252881bf2 WHIRLPOOL 41e1c69e256d41961ffc03f0470439cc401e3d1dc6ec6a0f9e17ce292d668befa8a6e8910eed282e0afb68adab7e1c96727e21bbf806268360ce28190aa07858
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREKAAYFAlD/ucIACgkQgAnW8HDreRZxAACgjZ7kDZzleEcO/+yxS3mmkJF5
-xF4An05ZEAHkgY0F3UJW52TEBNN3Od8v
-=+L+c
+iQJ8BAEBCABmBQJUsDrhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOctisP/3K7VOunR/ZHeoDESGyCjg2D
+Z/b9gwwEVy6ccCm87pzuYnuP1WlSnwg8mGhrodbUCtyfn9Y0YbwEqRMrGHAnaAUa
+BZdY5XiQmQ6LHpgz90J2wUJWiCfxTCGo5YkzXZUZ8SQWo9/on+eEMW5JiSW2e22M
+2qILrLP0auRjSi669XG4Qz2rEPr/1icY3av3u223qn0C9tUzAQouWQ9ENMSgDLHj
+zVFYUJFldq9frXiwhucEq+Pex3ov3IN4keBtzrHxiAo0sZrJ2PLor0qO5eAeAD3C
+RAXCHqwIcWWTVlEsOlwDEvv1aVV8zt0PvSFv4xr2HbTsZfcEuhD7qqk8edhno6qY
+feOuYUOa8d3vF4sFlAdFyTCajZQdG/571b7MxeOuTZBT78NYDZn7Q8yMULnEPpaQ
+cIoDpDDV17DNpAmZT5hdNdJNAzBGzBQdnn3A4G5Si5rLEfQnOa+lQXrNMfRFsZGj
+MeivfuS4N6VjSjZDT7d1kQM2CRzEpOORJH4GezA92Tv717qcVTEH0On3O9XdV6ub
+0eHTz9pmAK06PwJIohKuu9M0AYuUL/ThRuJNx5hTB+/q9recF4sGKeA7Ohhp0TWE
+SUKNLWaJgbE+nd8PR9mB+Uk9q0+wrVcEPV4oDFN3oYAVwaOFdlyCrWwtWXBYICQa
+V/3RpM128Iy+qx7cZvvV
+=/cKP
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/gwyddion/gwyddion-2.39.ebuild b/sci-visualization/gwyddion/gwyddion-2.39.ebuild
new file mode 100644
index 000000000000..d90eb7c80e12
--- /dev/null
+++ b/sci-visualization/gwyddion/gwyddion-2.39.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/gwyddion-2.39.ebuild,v 1.1 2015/01/09 20:32:27 dilfridge Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit autotools-utils fdo-mime gnome2-utils python-single-r1
+
+DESCRIPTION="Framework for Scanning Mode Microscopy data analysis"
+HOMEPAGE="http://gwyddion.net/"
+SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc fits fftw gnome kde nls opengl perl python ruby sourceview xml X"
+
+RDEPEND="
+	media-libs/libpng:0
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/libXmu
+	x11-libs/pango
+	fits? ( sci-libs/cfitsio )
+	fftw? ( sci-libs/fftw:3.0 )
+	gnome? ( gnome-base/gconf:2 )
+	kde? ( kde-base/kdelibs:4 )
+	opengl? ( virtual/opengl x11-libs/gtkglext )
+	perl? ( dev-lang/perl )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+	)
+	ruby? ( dev-ruby/narray )
+	sourceview? ( x11-libs/gtksourceview:2.0 )
+	xml? ( dev-libs/libxml2:2 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+MAKEOPTS+=" V=1"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-rpath
+		$(use_enable doc gtk-doc)
+		$(use_enable nls)
+		$(use_enable python pygwy)
+		$(use_enable fits cfitsio)
+		$(use_with perl)
+		$(use_with python)
+		$(use_with ruby)
+		$(use_with fftw fftw3)
+		$(use_with opengl gl) \
+		$(use_with sourceview gtksourceview)
+		$(use_with xml libxml2)
+		$(use_with X x)
+		$(use_with kde kde4-thumbnailer)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	use python && dodoc modules/pygwy/README.pygwy
+}
+
+pkg_postinst() {
+	use gnome && gnome2_gconf_install
+	fdo-mime_desktop_database_update
+}
+
+pkg_prerm() {
+	use gnome && gnome2_gconf_uninstall
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/sci-visualization/gwyddion/metadata.xml b/sci-visualization/gwyddion/metadata.xml
index 3f27823a6510..2079a95b89c8 100644
--- a/sci-visualization/gwyddion/metadata.xml
+++ b/sci-visualization/gwyddion/metadata.xml
@@ -14,4 +14,9 @@
     Enable support for <pkg>x11-libs/gtksourceview</pkg>
   </flag>
   </use>
+  <use>
+    <flag name="fits">
+    Enable FITS image import via <pkg>sci-libs/cfitsio</pkg>
+  </flag>
+  </use>
 </pkgmetadata>