From d99093fb4bb5652015c06274d64083daa2439e4f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Mar 2021 10:28:17 +0000 Subject: gentoo resync : 03.03.2021 --- sci-visualization/gwyddion/Manifest | 7 +- .../gwyddion/files/gwyddion-2.55-automagic.patch | 33 ---------- .../gwyddion/files/gwyddion-2.55-mime.patch | 15 ----- .../gwyddion/files/gwyddion-2.55-xml.patch | 15 ----- sci-visualization/gwyddion/gwyddion-2.55-r4.ebuild | 76 ---------------------- sci-visualization/gwyddion/gwyddion-2.56.ebuild | 4 +- 6 files changed, 3 insertions(+), 147 deletions(-) delete mode 100644 sci-visualization/gwyddion/files/gwyddion-2.55-automagic.patch delete mode 100644 sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch delete mode 100644 sci-visualization/gwyddion/files/gwyddion-2.55-xml.patch delete 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 7ed92156335a..98f4e7927eb4 100644 --- a/sci-visualization/gwyddion/Manifest +++ b/sci-visualization/gwyddion/Manifest @@ -1,9 +1,4 @@ -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 AUX gwyddion-2.56-automagic.patch 1522 BLAKE2B c760f952221ee4cd2e36572bef682ca45b8adbc962c63b9664d02bdc2a3fca405b9d58fed7a18a53da89eb6577cba93e17dd713598897629a10eba0e2c2f4bd9 SHA512 4e3a4761d1858803a6b35bd66c0516fd4ac733be7337298bd56454bde9253685b3622ea47a8759a3f512fb6c13a95ae3efb834cc9d9160608f85c3c26fd1e7d0 -DIST gwyddion-2.55.tar.xz 4607560 BLAKE2B 30489d980d3feb6986be4041b59c847673ee589674d5913b4508f28f072eb2f570b98f0b1be01dcf6e1d45e86607582967fd83fe3c859172fcdef3c7bffae741 SHA512 680c33b1f7d36de31274869e7f0af9c06030e04779d6b59f06860ae3f47db4ad45bbf3ee2219bb7b6c01807a807aeafa4f5d0aefe20601e0dda1011acf59fc8e DIST gwyddion-2.56.tar.xz 4645620 BLAKE2B f4f2ce2bf119a24c3e1919b14db409a81ad286ef2242918f356d2b4c56b498f41cbafa03a136eac5d87b4905529e06982694f19bdf30933454e94d34526962c3 SHA512 cf4a40367ea5b0a671c5df70123ef93f6aecc25322af7eb05e4f32d40e54d9b0d48ddd1df9f2589c468eb511ada3f3ef409603c1513de33ba2482078a9415eae -EBUILD gwyddion-2.55-r4.ebuild 1593 BLAKE2B c814b8d1298723a73b4d3dc3c07be13a5394029c230d5964412320c7e57ce45173ce6e67ce919ede30c8f760c1315ad515bab550349796c96750439e0e0203d3 SHA512 c89856d8061168bc4800484adefbb48484bcdabe7030621935227885bd5d107ad26c506b867233705bad8b8bc3610d587256c6919e550c857e94f9cea1f9229a -EBUILD gwyddion-2.56.ebuild 1648 BLAKE2B 60ecf19f3ec568a6f0d5e7dc41f3e29f4f36fd02190f3d32ef898ddeb283b699d8a864cb67268fe5ab1b9b76f29d1f8e148a63c6b5e57a76fb94a0a3659bb85e SHA512 4557739fb1a01e6b7ffbcc194f422167dc2bb6b792a27b0c827209e313acf0cc61e5b985ff54dc2dcf11235578f8b5c29361266ba7da9ee6af2373713e341edf +EBUILD gwyddion-2.56.ebuild 1646 BLAKE2B 56173da9c59cff136b908ae5a1eac7767199a73a3fa09c2b1a5480cc9d5d191ba7604e731a1b0c43b2f65f19a0580481efe91742cdb0581645c43215daf8768c SHA512 1205b0dc85fd5c418089555b3a31ab555576ff91fcddfe925595e29a2f31de2d529269aa7092eb80e9a0995e4a0627dc19edbc6de88e58b35ab1e209c1b8e6da MISC metadata.xml 938 BLAKE2B a6bdd3f5aa17f3846d6e44ebbb6f7e230253df851819bd3ce27be44d6e288590f149576fb2bbd8e19ad04c757d58675f6b96d57571c0c92eae8dde432a08b2ee SHA512 2e90996291b1a4ca744a87af2621e3f8afcf39660a550e82d1b018ffffc41123897a923702ba61718ca97586d95672dee8777579cc4f666e57df88e534f555b1 diff --git a/sci-visualization/gwyddion/files/gwyddion-2.55-automagic.patch b/sci-visualization/gwyddion/files/gwyddion-2.55-automagic.patch deleted file mode 100644 index 405a2552f08b..000000000000 --- a/sci-visualization/gwyddion/files/gwyddion-2.55-automagic.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -ruN gwyddion-2.55.orig/configure.ac gwyddion-2.55/configure.ac ---- gwyddion-2.55.orig/configure.ac 2019-11-04 10:25:16.000000000 +0100 -+++ gwyddion-2.55/configure.ac 2020-01-24 05:22:15.264763441 +0100 -@@ -634,21 +634,25 @@ - ############################################################################# - # OpenEXR - # Optional. Used for HDR greyscale OpenEXR pixmap import/export. --enable_exr=$have_cxx --PKG_CHECK_MODULES(EXR, [OpenEXR], -+GWY_WITH([exr],,[build with OpenEXR support]) -+if test "x$enable_exr" != "xno" && "x$have_cxx" != "xno"; then -+ PKG_CHECK_MODULES(EXR, [OpenEXR], - [AC_DEFINE(HAVE_EXR,1, - [Define if we have the OpenEXR package.])], - [enable_exr=no]) -+fi - AM_CONDITIONAL([HAVE_EXR],[test "x$enable_exr" != xno]) - - ############################################################################# - # CFITSIO - # Optional. Used for FITS image import. --enable_cfitsio=yes --PKG_CHECK_MODULES(CFITSIO, [cfitsio], -+GWY_WITH([cfitsio],,[build with cfitsio support]) -+if test "x$enable_cfitsio" != "xno"; then -+ PKG_CHECK_MODULES(CFITSIO, [cfitsio], - [AC_DEFINE(HAVE_CFITSIO,1, - [Define if we have the cfitsio package.])], - [enable_cfitsio=no]) -+fi - AM_CONDITIONAL([HAVE_CFITSIO],[test "x$enable_cfitsio" != xno]) - - ############################################################################# diff --git a/sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch b/sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch deleted file mode 100644 index 536790c1ac46..000000000000 --- a/sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: gwyddion/modules/file/ambprofile.c -=================================================================== ---- gwyddion/modules/file/ambprofile.c (revision 22650) -+++ gwyddion/modules/file/ambprofile.c (revision 22651) -@@ -32,8 +32,8 @@ - * Ambios XML profile data - * - * -- * -- * -+ * -+ * - * - * - * diff --git a/sci-visualization/gwyddion/files/gwyddion-2.55-xml.patch b/sci-visualization/gwyddion/files/gwyddion-2.55-xml.patch deleted file mode 100644 index 3cebcc684b50..000000000000 --- a/sci-visualization/gwyddion/files/gwyddion-2.55-xml.patch +++ /dev/null @@ -1,15 +0,0 @@ -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-r4.ebuild b/sci-visualization/gwyddion/gwyddion-2.55-r4.ebuild deleted file mode 100644 index 335e80a5c600..000000000000 --- a/sci-visualization/gwyddion/gwyddion-2.55-r4.ebuild +++ /dev/null @@ -1,76 +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" - "${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 -} diff --git a/sci-visualization/gwyddion/gwyddion-2.56.ebuild b/sci-visualization/gwyddion/gwyddion-2.56.ebuild index 85f881ab3d16..2a71870ce0e1 100644 --- a/sci-visualization/gwyddion/gwyddion-2.56.ebuild +++ b/sci-visualization/gwyddion/gwyddion-2.56.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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 gnome hdf5 nls openexr perl ruby sourceview xml X" RDEPEND=" -- cgit v1.2.3