gentoo resync : 05.02.2020

5 files changed, 22 insertions, 86 deletions

diff --git a/sci-visualization/gwyddion/Manifest b/sci-visualization/gwyddion/Manifest
index 79064794b2b4..68260f06708e 100644
--- a/sci-visualization/gwyddion/Manifest
+++ b/sci-visualization/gwyddion/Manifest
@@ -1,9 +1,8 @@
 AUX gwyddion-2.47-cfitsio.patch 863 BLAKE2B 9bfb48ba7fc3dd75cba86a0ca1910c68f6affa78722723ab5945354e9d7fd477ed5b7d5df320b031a693fa9c3187270f7a1bbf37ee3d914a215f18af7ae0ae94 SHA512 5558022a002e589a358e2560ea23eb68b1b3c01536663f11dfd6e84f8927220b56ca16b00ffc9481a14b3fb0b605d1fcb71ff9529a5b3561a6f83a2aa7785db8
 AUX gwyddion-2.55-automagic.patch 1441 BLAKE2B 3f6096392742beea11c908035efebb24129ebd8a4c7207f35615c7c1b97842f5ad774bcf24369d50cb7e0270db8b46c39dd4c4074c660dd00e1a2a9150c6fa3a SHA512 6a83a723e5a82c8123b0739aba8d638d641a776fd807f8dedbff68cd035256cf3b1941b89a039bf5fd5ad24b3bf2f25237dc13f89797e7eace0e1832f74a8c7e
-DIST gwyddion-2.44.tar.xz 3517624 BLAKE2B c32dd33e2fe6c6a09062807db1a25fd54d3becc12bb806a21572f992429cc52a2180221c5627ab49d44f24c13f9928e3825c1b833adff1523d0caa092829ecf7 SHA512 c80a0e4e9dde2f669763629d34dacc0015770c4704a10fc820f4d8e75b4f4275852162653f0c6c52674ed76162861af860de6741466d939066bfea3fb584d2ff
+AUX gwyddion-2.55-mime.patch 726 BLAKE2B fde2a0b132fbc484f905a0c06a9b666b8bd57a33b9804e7db56b58bf543947434e2f15eb82d6c2cddc066bbc575412461b57fd3be4c3668ec35e69af3081b3dc SHA512 8703b8a09fb84a979afef5a921e29af8514318d47d184ece66f3caae45639fa643701be29bc78ea541f13dc7018950f75a5f5c7099ce2275004ddf768b5c68a1
 DIST gwyddion-2.47.tar.xz 3974120 BLAKE2B c9a0241fe509a2f067c16f77d2b02885505d47c3ba0f25a44449e0d5ad05ce8596784392d8f1265823577aeebbab7ad9c96a39625b01bf11da3cebeb1c6453cc SHA512 a6bbda2d32ec013a9d6c7e2b6dbf2cef08d8f964099c0fda511bc92c16c943459f29d52f784a599466af65027aaae3aaeb1b79e56c40e39bc47019044eecd3e6
 DIST gwyddion-2.55.tar.xz 4607560 BLAKE2B 30489d980d3feb6986be4041b59c847673ee589674d5913b4508f28f072eb2f570b98f0b1be01dcf6e1d45e86607582967fd83fe3c859172fcdef3c7bffae741 SHA512 680c33b1f7d36de31274869e7f0af9c06030e04779d6b59f06860ae3f47db4ad45bbf3ee2219bb7b6c01807a807aeafa4f5d0aefe20601e0dda1011acf59fc8e
-EBUILD gwyddion-2.44-r1.ebuild 1625 BLAKE2B f22904c93c4938729297f920ac8a9bf1c231f9c75ea7d983bd24f960a6207812a599306be9f4390a790f54dc13320af2725303ff868dc174878591ea0d051c16 SHA512 f476b7f13e496cde117de6fded22676324bb76d093e2aee05c0291c45a242372f7c315c9a4975fa99e0085a38ecb4f274cb0c34bdece7cc51101d58e37ddecfa
-EBUILD gwyddion-2.47-r1.ebuild 1478 BLAKE2B 4cfc6c856151e096736b0f88bee67fd2f32969ea3cce0de7479e3acb01dae033e0ea09ff69edc3fb90e8ca9d7f1ce9700b93fc7ae794e1329e2a69342df4085c SHA512 84f1b06f7dc4c0c896cb0b3f8467c6cb732024abaa44d62087f73bdb77d0c5f3c314fb34990b596e3aeb9ba9474a1a04c7c2969d77a4056a374af0f2c5a63380
-EBUILD gwyddion-2.55.ebuild 1584 BLAKE2B 16f5b61c897c112a9009661318570ffeb43178d4424f7fe7725860819eeb74d1bb9aed279c69c0d2db29db5d74323567b4e843b12b24855a46f7162e1dd86f0a SHA512 4c7e96cca6efcc0348d278e1e696be31463c744b4c498153c16820eaa594fd34c6a35c8c729a1752856ec0275ea934e7724806ac01eaf61d2db2d81bd10e2b01
+EBUILD gwyddion-2.47-r1.ebuild 1477 BLAKE2B a1840c25a0f5f073bc77843b964cd58a919dfaffc6e54f43aeefbdb1bf7ffed1c06f48c1a48b66bbd937bdec0d5ab32a5dcca3770183f4acc3e4c18f9065a7d6 SHA512 75d698162922c955ab0d46890eb99646a5d5ec3a6c805c59455e073e4bc38a66cc6f3009b1771b53117e91752e046d82f8d259b1602df2fff62e3d0701e9a392
+EBUILD gwyddion-2.55-r2.ebuild 1559 BLAKE2B 6905a712d6672c928840f36fc4150d7f4ad3a85c8bd505b5a415cb94476a616bb933590130373c63f47be36f0bfb7ef4e0a2cd3544e9c994f3d3262afbf84fbd SHA512 2c172f1d9df59c72a800336035c1839f69a1e5fab98a5f49a90024e4d4fe74bd7150dd7de8ccfa7480eabf2dbe2eef5fd1de649881222cfb130bab579fc86036
 MISC metadata.xml 938 BLAKE2B a6bdd3f5aa17f3846d6e44ebbb6f7e230253df851819bd3ce27be44d6e288590f149576fb2bbd8e19ad04c757d58675f6b96d57571c0c92eae8dde432a08b2ee SHA512 2e90996291b1a4ca744a87af2621e3f8afcf39660a550e82d1b018ffffc41123897a923702ba61718ca97586d95672dee8777579cc4f666e57df88e534f555b1
diff --git a/sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch b/sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch
new file mode 100644
index 000000000000..536790c1ac46
--- /dev/null
+++ b/sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch
@@ -0,0 +1,15 @@
+Index: gwyddion/modules/file/ambprofile.c
+===================================================================
+--- gwyddion/modules/file/ambprofile.c	(revision 22650)
++++ gwyddion/modules/file/ambprofile.c	(revision 22651)
+@@ -32,8 +32,8 @@
+  *   <comment>Ambios XML profile data</comment>
+  *   <magic priority="80">
+  *     <match type="string" offset="0" value="&lt;?xml">
+- *       <match type="string" offset="40:120" value="<ProfilometerData>">
+- *          <match type="string" offset="60:140" value="<Header>"/>
++ *       <match type="string" offset="40:120" value="&lt;ProfilometerData&gt;">
++ *          <match type="string" offset="60:140" value="&lt;Header&gt;"/>
+  *       </match>
+  *     </match>
+  *   </magic>
diff --git a/sci-visualization/gwyddion/gwyddion-2.44-r1.ebuild b/sci-visualization/gwyddion/gwyddion-2.44-r1.ebuild
deleted file mode 100644
index 47c8b1ba0853..000000000000
--- a/sci-visualization/gwyddion/gwyddion-2.44-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils fdo-mime gnome2-utils
-
-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 nls opengl perl 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 )
-	opengl? ( virtual/opengl x11-libs/gtkglext )
-	perl? ( dev-lang/perl )
-	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"
-
-src_configure() {
-	local myeconfargs=(
-		--disable-rpath
-		--without-kde4-thumbnailer
-		$(use_enable doc gtk-doc)
-		$(use_enable nls)
-		$(use_enable python pygwy)
-		$(use_enable fits cfitsio)
-		$(use_with perl)
-		--without-python
-		$(use_with ruby)
-		$(use_with fftw fftw3)
-		$(use_with opengl gl)
-		$(use_with sourceview gtksourceview)
-		$(use_with xml libxml2)
-		$(use_with X x)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-}
-
-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/gwyddion-2.47-r1.ebuild b/sci-visualization/gwyddion/gwyddion-2.47-r1.ebuild
index d79ead6a58a8..1e7286e2d11b 100644
--- a/sci-visualization/gwyddion/gwyddion-2.47-r1.ebuild
+++ b/sci-visualization/gwyddion/gwyddion-2.47-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc fits fftw gnome nls opengl perl ruby sourceview xml X"
 
 RDEPEND="
diff --git a/sci-visualization/gwyddion/gwyddion-2.55.ebuild b/sci-visualization/gwyddion/gwyddion-2.55-r2.ebuild
index 38eb5f9eca44..af6b46015063 100644
--- a/sci-visualization/gwyddion/gwyddion-2.55.ebuild
+++ b/sci-visualization/gwyddion/gwyddion-2.55-r2.ebuild
@@ -12,7 +12,7 @@ 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 gnome nls openexr opengl perl ruby sourceview xml X"
+IUSE="doc fits gnome nls openexr perl ruby sourceview xml X"
 
 RDEPEND="
 	>=dev-libs/glib-2.32
@@ -26,7 +26,6 @@ RDEPEND="
 	fits? ( sci-libs/cfitsio )
 	gnome? ( gnome-base/gconf:2 )
 	openexr? ( media-libs/openexr:= )
-	opengl? ( virtual/opengl x11-libs/gtkglext )
 	perl? ( dev-lang/perl:= )
 	ruby? ( dev-ruby/narray )
 	sourceview? ( x11-libs/gtksourceview:2.0 )
@@ -39,6 +38,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.55-automagic.patch"
+	"${FILESDIR}/${PN}-2.55-mime.patch"
 )
 
 src_prepare() {
@@ -57,7 +57,7 @@ src_configure() {
 		$(use_with perl) \
 		--without-python \
 		$(use_with ruby) \
-		$(use_with opengl gl) \
+		--without-gl \
 		$(use_with openexr exr) \
 		$(use_with sourceview gtksourceview) \
 		$(use_with xml libxml2) \