Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gwyddion/files/, sci-visualization/gwyddion/
Date: Tue, 02 Mar 2021 09:06:30
Message-Id: 1614675940.f42fa894b14082d3d46c67e22274778e71dbb462.mgorny@gentoo
1 commit: f42fa894b14082d3d46c67e22274778e71dbb462
2 Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
3 AuthorDate: Tue Mar 2 08:58:19 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 2 09:05:40 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f42fa894
7
8 sci-visualization/gwyddion: Remove old
9
10 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 sci-visualization/gwyddion/Manifest | 1 -
14 .../gwyddion/files/gwyddion-2.55-automagic.patch | 33 ----------
15 .../gwyddion/files/gwyddion-2.55-mime.patch | 15 -----
16 .../gwyddion/files/gwyddion-2.55-xml.patch | 15 -----
17 sci-visualization/gwyddion/gwyddion-2.55-r4.ebuild | 76 ----------------------
18 5 files changed, 140 deletions(-)
19
20 diff --git a/sci-visualization/gwyddion/Manifest b/sci-visualization/gwyddion/Manifest
21 index ad1a5fdc257..1accbe6e79f 100644
22 --- a/sci-visualization/gwyddion/Manifest
23 +++ b/sci-visualization/gwyddion/Manifest
24 @@ -1,2 +1 @@
25 -DIST gwyddion-2.55.tar.xz 4607560 BLAKE2B 30489d980d3feb6986be4041b59c847673ee589674d5913b4508f28f072eb2f570b98f0b1be01dcf6e1d45e86607582967fd83fe3c859172fcdef3c7bffae741 SHA512 680c33b1f7d36de31274869e7f0af9c06030e04779d6b59f06860ae3f47db4ad45bbf3ee2219bb7b6c01807a807aeafa4f5d0aefe20601e0dda1011acf59fc8e
26 DIST gwyddion-2.56.tar.xz 4645620 BLAKE2B f4f2ce2bf119a24c3e1919b14db409a81ad286ef2242918f356d2b4c56b498f41cbafa03a136eac5d87b4905529e06982694f19bdf30933454e94d34526962c3 SHA512 cf4a40367ea5b0a671c5df70123ef93f6aecc25322af7eb05e4f32d40e54d9b0d48ddd1df9f2589c468eb511ada3f3ef409603c1513de33ba2482078a9415eae
27
28 diff --git a/sci-visualization/gwyddion/files/gwyddion-2.55-automagic.patch b/sci-visualization/gwyddion/files/gwyddion-2.55-automagic.patch
29 deleted file mode 100644
30 index 405a2552f08..00000000000
31 --- a/sci-visualization/gwyddion/files/gwyddion-2.55-automagic.patch
32 +++ /dev/null
33 @@ -1,33 +0,0 @@
34 -diff -ruN gwyddion-2.55.orig/configure.ac gwyddion-2.55/configure.ac
35 ---- gwyddion-2.55.orig/configure.ac 2019-11-04 10:25:16.000000000 +0100
36 -+++ gwyddion-2.55/configure.ac 2020-01-24 05:22:15.264763441 +0100
37 -@@ -634,21 +634,25 @@
38 - #############################################################################
39 - # OpenEXR
40 - # Optional. Used for HDR greyscale OpenEXR pixmap import/export.
41 --enable_exr=$have_cxx
42 --PKG_CHECK_MODULES(EXR, [OpenEXR],
43 -+GWY_WITH([exr],,[build with OpenEXR support])
44 -+if test "x$enable_exr" != "xno" && "x$have_cxx" != "xno"; then
45 -+ PKG_CHECK_MODULES(EXR, [OpenEXR],
46 - [AC_DEFINE(HAVE_EXR,1,
47 - [Define if we have the OpenEXR package.])],
48 - [enable_exr=no])
49 -+fi
50 - AM_CONDITIONAL([HAVE_EXR],[test "x$enable_exr" != xno])
51 -
52 - #############################################################################
53 - # CFITSIO
54 - # Optional. Used for FITS image import.
55 --enable_cfitsio=yes
56 --PKG_CHECK_MODULES(CFITSIO, [cfitsio],
57 -+GWY_WITH([cfitsio],,[build with cfitsio support])
58 -+if test "x$enable_cfitsio" != "xno"; then
59 -+ PKG_CHECK_MODULES(CFITSIO, [cfitsio],
60 - [AC_DEFINE(HAVE_CFITSIO,1,
61 - [Define if we have the cfitsio package.])],
62 - [enable_cfitsio=no])
63 -+fi
64 - AM_CONDITIONAL([HAVE_CFITSIO],[test "x$enable_cfitsio" != xno])
65 -
66 - #############################################################################
67
68 diff --git a/sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch b/sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch
69 deleted file mode 100644
70 index 536790c1ac4..00000000000
71 --- a/sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch
72 +++ /dev/null
73 @@ -1,15 +0,0 @@
74 -Index: gwyddion/modules/file/ambprofile.c
75 -===================================================================
76 ---- gwyddion/modules/file/ambprofile.c (revision 22650)
77 -+++ gwyddion/modules/file/ambprofile.c (revision 22651)
78 -@@ -32,8 +32,8 @@
79 - * <comment>Ambios XML profile data</comment>
80 - * <magic priority="80">
81 - * <match type="string" offset="0" value="&lt;?xml">
82 -- * <match type="string" offset="40:120" value="<ProfilometerData>">
83 -- * <match type="string" offset="60:140" value="<Header>"/>
84 -+ * <match type="string" offset="40:120" value="&lt;ProfilometerData&gt;">
85 -+ * <match type="string" offset="60:140" value="&lt;Header&gt;"/>
86 - * </match>
87 - * </match>
88 - * </magic>
89
90 diff --git a/sci-visualization/gwyddion/files/gwyddion-2.55-xml.patch b/sci-visualization/gwyddion/files/gwyddion-2.55-xml.patch
91 deleted file mode 100644
92 index 3cebcc684b5..00000000000
93 --- a/sci-visualization/gwyddion/files/gwyddion-2.55-xml.patch
94 +++ /dev/null
95 @@ -1,15 +0,0 @@
96 -diff --git a/data/gwyddion.xml b/data/gwyddion.xml
97 -index d26089f..acb7b90 100644
98 ---- a/data/gwyddion.xml
99 -+++ b/data/gwyddion.xml
100 -@@ -55,8 +55,8 @@
101 - <comment>Ambios XML profile data</comment>
102 - <magic priority="80">
103 - <match type="string" offset="0" value="&lt;?xml">
104 -- <match type="string" offset="40:120" value="<ProfilometerData>">
105 -- <match type="string" offset="60:140" value="<Header>"/>
106 -+ <match type="string" offset="40:120" value="&lt;ProfilometerData&gt;">
107 -+ <match type="string" offset="60:140" value="&lt;Header&gt;"/>
108 - </match>
109 - </match>
110 - </magic>
111
112 diff --git a/sci-visualization/gwyddion/gwyddion-2.55-r4.ebuild b/sci-visualization/gwyddion/gwyddion-2.55-r4.ebuild
113 deleted file mode 100644
114 index 335e80a5c60..00000000000
115 --- a/sci-visualization/gwyddion/gwyddion-2.55-r4.ebuild
116 +++ /dev/null
117 @@ -1,76 +0,0 @@
118 -# Copyright 1999-2020 Gentoo Authors
119 -# Distributed under the terms of the GNU General Public License v2
120 -
121 -EAPI=6
122 -
123 -inherit autotools gnome2-utils xdg
124 -
125 -DESCRIPTION="Framework for Scanning Mode Microscopy data analysis"
126 -HOMEPAGE="http://gwyddion.net/"
127 -SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.xz"
128 -
129 -LICENSE="GPL-2"
130 -SLOT="0"
131 -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
132 -IUSE="doc fits gnome nls openexr perl ruby sourceview xml X"
133 -
134 -RDEPEND="
135 - >=dev-libs/glib-2.32
136 - dev-libs/libzip
137 - media-libs/libpng:0=
138 - >=sci-libs/fftw-3.1:3.0=
139 - x11-libs/cairo
140 - >=x11-libs/gtk+-2.18:2
141 - x11-libs/libXmu
142 - x11-libs/pango
143 - fits? ( sci-libs/cfitsio )
144 - gnome? ( gnome-base/gconf:2 )
145 - openexr? ( media-libs/openexr:= )
146 - perl? ( dev-lang/perl:= )
147 - ruby? ( dev-ruby/narray )
148 - sourceview? ( x11-libs/gtksourceview:2.0 )
149 - xml? ( dev-libs/libxml2:2 )"
150 -
151 -DEPEND="${RDEPEND}
152 - virtual/pkgconfig
153 - doc? ( dev-util/gtk-doc )
154 -"
155 -
156 -PATCHES=(
157 - "${FILESDIR}/${PN}-2.55-automagic.patch"
158 - "${FILESDIR}/${PN}-2.55-mime.patch"
159 - "${FILESDIR}/${PN}-2.55-xml.patch"
160 -)
161 -
162 -src_prepare() {
163 - default
164 - eautoreconf
165 -}
166 -
167 -src_configure() {
168 - econf \
169 - --disable-rpath \
170 - --without-kde4-thumbnailer \
171 - $(use_enable doc gtk-doc) \
172 - $(use_enable nls) \
173 - --disable-pygwy \
174 - $(use_with fits cfitsio) \
175 - $(use_with perl) \
176 - --without-python \
177 - $(use_with ruby) \
178 - --without-gl \
179 - $(use_with openexr exr) \
180 - $(use_with sourceview gtksourceview) \
181 - $(use_with xml libxml2) \
182 - $(use_with X x) \
183 - --with-zip=libzip
184 -}
185 -
186 -pkg_postinst() {
187 - use gnome && gnome2_gconf_install
188 - xdg_pkg_postinst
189 -}
190 -
191 -pkg_prerm() {
192 - use gnome && gnome2_gconf_uninstall
193 -}