From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- sci-visualization/gwyddion/Manifest | 3 +- .../gwyddion/files/gwyddion-2.55-xml.patch | 15 +++++ sci-visualization/gwyddion/gwyddion-2.55-r2.ebuild | 75 --------------------- sci-visualization/gwyddion/gwyddion-2.55-r4.ebuild | 76 ++++++++++++++++++++++ 4 files changed, 93 insertions(+), 76 deletions(-) create mode 100644 sci-visualization/gwyddion/files/gwyddion-2.55-xml.patch delete mode 100644 sci-visualization/gwyddion/gwyddion-2.55-r2.ebuild create mode 100644 sci-visualization/gwyddion/gwyddion-2.55-r4.ebuild (limited to 'sci-visualization/gwyddion') diff --git a/sci-visualization/gwyddion/Manifest b/sci-visualization/gwyddion/Manifest index d3e4f09a2863..fb59a1b7c780 100644 --- a/sci-visualization/gwyddion/Manifest +++ b/sci-visualization/gwyddion/Manifest @@ -1,5 +1,6 @@ AUX gwyddion-2.55-automagic.patch 1441 BLAKE2B 3f6096392742beea11c908035efebb24129ebd8a4c7207f35615c7c1b97842f5ad774bcf24369d50cb7e0270db8b46c39dd4c4074c660dd00e1a2a9150c6fa3a SHA512 6a83a723e5a82c8123b0739aba8d638d641a776fd807f8dedbff68cd035256cf3b1941b89a039bf5fd5ad24b3bf2f25237dc13f89797e7eace0e1832f74a8c7e AUX gwyddion-2.55-mime.patch 726 BLAKE2B fde2a0b132fbc484f905a0c06a9b666b8bd57a33b9804e7db56b58bf543947434e2f15eb82d6c2cddc066bbc575412461b57fd3be4c3668ec35e69af3081b3dc SHA512 8703b8a09fb84a979afef5a921e29af8514318d47d184ece66f3caae45639fa643701be29bc78ea541f13dc7018950f75a5f5c7099ce2275004ddf768b5c68a1 +AUX gwyddion-2.55-xml.patch 603 BLAKE2B e50a97f2c39dbf83aa6dd6cdd9b3a3a1f3a4aa7101b41f57a79d09b2474a8ed9fbd7e1817fdfddc22b27ed11282397b0c118d7f7d610e89f599cc4022ce1065a SHA512 6f8943247493518f85159ce259305bf2e822ee16d5d334c342955b1fb183a491202c8db879b8cfd8f5d95a4ee2fb709ee1e0221c8fe10d2f11b6f7457051b6b5 DIST gwyddion-2.55.tar.xz 4607560 BLAKE2B 30489d980d3feb6986be4041b59c847673ee589674d5913b4508f28f072eb2f570b98f0b1be01dcf6e1d45e86607582967fd83fe3c859172fcdef3c7bffae741 SHA512 680c33b1f7d36de31274869e7f0af9c06030e04779d6b59f06860ae3f47db4ad45bbf3ee2219bb7b6c01807a807aeafa4f5d0aefe20601e0dda1011acf59fc8e -EBUILD gwyddion-2.55-r2.ebuild 1557 BLAKE2B d416e4970e7fc6b2ac16b6b0193b23a1eeda1234cc8660f7eb0fd33b3a7cb8d17211cffd09806b4a0ecf774d93abafb8696104c41948124d4bb1725f842746ce SHA512 645959f0196192f08d16534674f45dc437b2fec0ccc89971dc14551f2d7ee7747547f569941d332d4bba43688a7dbb940f0ae06be2eaa9aa68f96501ff4436be +EBUILD gwyddion-2.55-r4.ebuild 1593 BLAKE2B c814b8d1298723a73b4d3dc3c07be13a5394029c230d5964412320c7e57ce45173ce6e67ce919ede30c8f760c1315ad515bab550349796c96750439e0e0203d3 SHA512 c89856d8061168bc4800484adefbb48484bcdabe7030621935227885bd5d107ad26c506b867233705bad8b8bc3610d587256c6919e550c857e94f9cea1f9229a MISC metadata.xml 938 BLAKE2B a6bdd3f5aa17f3846d6e44ebbb6f7e230253df851819bd3ce27be44d6e288590f149576fb2bbd8e19ad04c757d58675f6b96d57571c0c92eae8dde432a08b2ee SHA512 2e90996291b1a4ca744a87af2621e3f8afcf39660a550e82d1b018ffffc41123897a923702ba61718ca97586d95672dee8777579cc4f666e57df88e534f555b1 diff --git a/sci-visualization/gwyddion/files/gwyddion-2.55-xml.patch b/sci-visualization/gwyddion/files/gwyddion-2.55-xml.patch new file mode 100644 index 000000000000..3cebcc684b50 --- /dev/null +++ b/sci-visualization/gwyddion/files/gwyddion-2.55-xml.patch @@ -0,0 +1,15 @@ +diff --git a/data/gwyddion.xml b/data/gwyddion.xml +index d26089f..acb7b90 100644 +--- a/data/gwyddion.xml ++++ b/data/gwyddion.xml +@@ -55,8 +55,8 @@ + Ambios XML profile data + + +- +- ++ ++ + + + diff --git a/sci-visualization/gwyddion/gwyddion-2.55-r2.ebuild b/sci-visualization/gwyddion/gwyddion-2.55-r2.ebuild deleted file mode 100644 index 81eb34a955ae..000000000000 --- a/sci-visualization/gwyddion/gwyddion-2.55-r2.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools gnome2-utils xdg - -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 gnome nls openexr perl ruby sourceview xml X" - -RDEPEND=" - >=dev-libs/glib-2.32 - dev-libs/libzip - media-libs/libpng:0= - >=sci-libs/fftw-3.1:3.0= - x11-libs/cairo - >=x11-libs/gtk+-2.18:2 - x11-libs/libXmu - x11-libs/pango - fits? ( sci-libs/cfitsio ) - gnome? ( gnome-base/gconf:2 ) - openexr? ( media-libs/openexr:= ) - 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 ) -" - -PATCHES=( - "${FILESDIR}/${PN}-2.55-automagic.patch" - "${FILESDIR}/${PN}-2.55-mime.patch" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - --disable-rpath \ - --without-kde4-thumbnailer \ - $(use_enable doc gtk-doc) \ - $(use_enable nls) \ - --disable-pygwy \ - $(use_with fits cfitsio) \ - $(use_with perl) \ - --without-python \ - $(use_with ruby) \ - --without-gl \ - $(use_with openexr exr) \ - $(use_with sourceview gtksourceview) \ - $(use_with xml libxml2) \ - $(use_with X x) \ - --with-zip=libzip -} - -pkg_postinst() { - use gnome && gnome2_gconf_install - xdg_pkg_postinst -} - -pkg_prerm() { - use gnome && gnome2_gconf_uninstall -} diff --git a/sci-visualization/gwyddion/gwyddion-2.55-r4.ebuild b/sci-visualization/gwyddion/gwyddion-2.55-r4.ebuild new file mode 100644 index 000000000000..335e80a5c600 --- /dev/null +++ b/sci-visualization/gwyddion/gwyddion-2.55-r4.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools gnome2-utils xdg + +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 gnome nls openexr perl ruby sourceview xml X" + +RDEPEND=" + >=dev-libs/glib-2.32 + dev-libs/libzip + media-libs/libpng:0= + >=sci-libs/fftw-3.1:3.0= + x11-libs/cairo + >=x11-libs/gtk+-2.18:2 + x11-libs/libXmu + x11-libs/pango + fits? ( sci-libs/cfitsio ) + gnome? ( gnome-base/gconf:2 ) + openexr? ( media-libs/openexr:= ) + 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 ) +" + +PATCHES=( + "${FILESDIR}/${PN}-2.55-automagic.patch" + "${FILESDIR}/${PN}-2.55-mime.patch" + "${FILESDIR}/${PN}-2.55-xml.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --disable-rpath \ + --without-kde4-thumbnailer \ + $(use_enable doc gtk-doc) \ + $(use_enable nls) \ + --disable-pygwy \ + $(use_with fits cfitsio) \ + $(use_with perl) \ + --without-python \ + $(use_with ruby) \ + --without-gl \ + $(use_with openexr exr) \ + $(use_with sourceview gtksourceview) \ + $(use_with xml libxml2) \ + $(use_with X x) \ + --with-zip=libzip +} + +pkg_postinst() { + use gnome && gnome2_gconf_install + xdg_pkg_postinst +} + +pkg_prerm() { + use gnome && gnome2_gconf_uninstall +} -- cgit v1.2.3