Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gwyddion/, sci-visualization/gwyddion/files/
Date: Tue, 30 Aug 2022 18:26:36
Message-Id: 1661883987.5b3f0d7261de9021367be928a5169ac8b342fac1.asturm@gentoo
1 commit: 5b3f0d7261de9021367be928a5169ac8b342fac1
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 30 18:25:36 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 30 18:26:27 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b3f0d72
7
8 sci-visualization/gwyddion: drop 2.56, EAPI-6--
9
10 Closes: https://bugs.gentoo.org/851699
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 sci-visualization/gwyddion/Manifest | 1 -
14 .../gwyddion/files/gwyddion-2.56-automagic.patch | 34 ----------
15 sci-visualization/gwyddion/gwyddion-2.56.ebuild | 79 ----------------------
16 3 files changed, 114 deletions(-)
17
18 diff --git a/sci-visualization/gwyddion/Manifest b/sci-visualization/gwyddion/Manifest
19 index 707291aef688..f0a82e062181 100644
20 --- a/sci-visualization/gwyddion/Manifest
21 +++ b/sci-visualization/gwyddion/Manifest
22 @@ -1,3 +1,2 @@
23 -DIST gwyddion-2.56.tar.xz 4645620 BLAKE2B f4f2ce2bf119a24c3e1919b14db409a81ad286ef2242918f356d2b4c56b498f41cbafa03a136eac5d87b4905529e06982694f19bdf30933454e94d34526962c3 SHA512 cf4a40367ea5b0a671c5df70123ef93f6aecc25322af7eb05e4f32d40e54d9b0d48ddd1df9f2589c468eb511ada3f3ef409603c1513de33ba2482078a9415eae
24 DIST gwyddion-2.60.tar.xz 4973404 BLAKE2B 6ded40f34bfcd70db2e897abc1f07b070aca78e08c90661ee4fe281d19f16337ca81b5a4e2adaeb29e1870e8194eb77976910a54248842c8474864065d64defd SHA512 e568df77ef580aaedfcdd1f746a78f3ca93676a07a331fc6e70f997780bb403d1c3967aa93440c7fa1f010bd01f5376700c869a38dacaf1f98b075c4c950cf54
25 DIST gwyddion-2.61.tar.xz 4982092 BLAKE2B e4949558c52d2a6e97415b65e6816061c117868bdd2f39b341c3f740500f71dd38500323a389058b65f9c30feb9d5fd1e93bc29881b464cdb66981639fe280ed SHA512 c2fff49d52e4c439bf96e68be3534948c1fd48ade9b1e59e2d2d7d607170b5e7ce09e9cde3873ecca526de1561b028f39785dc363186f9f3d4ef0d259d313675
26
27 diff --git a/sci-visualization/gwyddion/files/gwyddion-2.56-automagic.patch b/sci-visualization/gwyddion/files/gwyddion-2.56-automagic.patch
28 deleted file mode 100644
29 index 720880570830..000000000000
30 --- a/sci-visualization/gwyddion/files/gwyddion-2.56-automagic.patch
31 +++ /dev/null
32 @@ -1,34 +0,0 @@
33 -diff -ruN gwyddion-2.56.orig/configure.ac gwyddion-2.56/configure.ac
34 ---- gwyddion-2.56.orig/configure.ac 2020-06-30 11:04:55.000000000 +0300
35 -+++ gwyddion-2.56/configure.ac 2020-06-30 13:22:00.881313300 +0300
36 -@@ -646,11 +646,13 @@
37 - #############################################################################
38 - # OpenEXR
39 - # Optional. Used for HDR greyscale OpenEXR pixmap import/export.
40 --enable_exr=$have_cxx
41 --PKG_CHECK_MODULES(EXR, [OpenEXR],
42 -+GWY_WITH([exr],,[build with OpenEXR support])
43 -+if test "x$enable_exr" != "xno" && "x$have_cxx" != "xno"; then
44 -+ PKG_CHECK_MODULES(EXR, [OpenEXR],
45 - [AC_DEFINE(HAVE_EXR,1,
46 - [Define if we have the OpenEXR package.])],
47 - [enable_exr=no])
48 -+fi
49 - AM_CONDITIONAL([HAVE_EXR],[test "x$enable_exr" != xno])
50 -
51 - #############################################################################
52 -@@ -665,10 +667,13 @@
53 - #############################################################################
54 - # CFITSIO
55 - # Optional. Used for FITS image import.
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/gwyddion-2.56.ebuild b/sci-visualization/gwyddion/gwyddion-2.56.ebuild
69 deleted file mode 100644
70 index 2a71870ce0e1..000000000000
71 --- a/sci-visualization/gwyddion/gwyddion-2.56.ebuild
72 +++ /dev/null
73 @@ -1,79 +0,0 @@
74 -# Copyright 1999-2021 Gentoo Authors
75 -# Distributed under the terms of the GNU General Public License v2
76 -
77 -EAPI=6
78 -
79 -inherit autotools gnome2-utils xdg
80 -
81 -DESCRIPTION="Framework for Scanning Mode Microscopy data analysis"
82 -HOMEPAGE="http://gwyddion.net/"
83 -SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.xz"
84 -
85 -LICENSE="GPL-2"
86 -SLOT="0"
87 -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
88 -IUSE="doc fits gnome hdf5 nls openexr perl ruby sourceview xml X"
89 -
90 -RDEPEND="
91 - >=dev-libs/glib-2.32
92 - dev-libs/libzip
93 - media-libs/libpng:0=
94 - >=sci-libs/fftw-3.1:3.0=
95 - x11-libs/cairo
96 - >=x11-libs/gtk+-2.18:2
97 - x11-libs/libXmu
98 - x11-libs/pango
99 - fits? ( sci-libs/cfitsio )
100 - gnome? ( gnome-base/gconf:2 )
101 - hdf5? ( sci-libs/hdf5 )
102 - openexr? ( media-libs/openexr:= )
103 - perl? ( dev-lang/perl:= )
104 - ruby? ( dev-ruby/narray )
105 - sourceview? ( x11-libs/gtksourceview:2.0 )
106 - xml? ( dev-libs/libxml2:2 )"
107 -
108 -DEPEND="${RDEPEND}
109 - virtual/pkgconfig
110 - doc? ( dev-util/gtk-doc )
111 -"
112 -
113 -PATCHES=(
114 - "${FILESDIR}/${PN}-2.56-automagic.patch"
115 -)
116 -
117 -src_prepare() {
118 - default
119 - eautoreconf
120 -}
121 -
122 -src_configure() {
123 - # hack for bug 741840
124 - use doc && export GTK_DOC_PATH=/usr/share/gtk-doc
125 -
126 - econf \
127 - --disable-rpath \
128 - --without-kde4-thumbnailer \
129 - $(use_enable doc gtk-doc) \
130 - $(use_enable nls) \
131 - $(use_with hdf5) \
132 - --disable-pygwy \
133 - $(use_with fits cfitsio) \
134 - $(use_with perl) \
135 - --without-python \
136 - $(use_with ruby) \
137 - --without-gl \
138 - $(use_with openexr exr) \
139 - $(use_with sourceview gtksourceview) \
140 - $(use_with xml libxml2) \
141 - $(use_with X x) \
142 - --with-zip=libzip
143 -}
144 -
145 -pkg_postinst() {
146 - use gnome && gnome2_gconf_install
147 - xdg_pkg_postinst
148 -}
149 -
150 -pkg_prerm() {
151 - use gnome && gnome2_gconf_uninstall
152 -}