Gentoo Archives: gentoo-commits

From: "Andreas K. Hüttel" <dilfridge@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, 30 Jun 2020 10:47:45
Message-Id: 1593514030.6003608cab6ce45c6d88c02843f09d5300154a8a.dilfridge@gentoo
1 commit: 6003608cab6ce45c6d88c02843f09d5300154a8a
2 Author: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jun 30 10:47:10 2020 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 30 10:47:10 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6003608c
7
8 sci-visualization/gwyddion: Version bump 2.56
9
10 Package-Manager: Portage-2.3.99, Repoman-2.3.23
11 Signed-off-by: Andreas K. Huettel <dilfridge <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 | 76 ++++++++++++++++++++++
16 3 files changed, 111 insertions(+)
17
18 diff --git a/sci-visualization/gwyddion/Manifest b/sci-visualization/gwyddion/Manifest
19 index 5e4503a7e41..ad1a5fdc257 100644
20 --- a/sci-visualization/gwyddion/Manifest
21 +++ b/sci-visualization/gwyddion/Manifest
22 @@ -1 +1,2 @@
23 DIST gwyddion-2.55.tar.xz 4607560 BLAKE2B 30489d980d3feb6986be4041b59c847673ee589674d5913b4508f28f072eb2f570b98f0b1be01dcf6e1d45e86607582967fd83fe3c859172fcdef3c7bffae741 SHA512 680c33b1f7d36de31274869e7f0af9c06030e04779d6b59f06860ae3f47db4ad45bbf3ee2219bb7b6c01807a807aeafa4f5d0aefe20601e0dda1011acf59fc8e
24 +DIST gwyddion-2.56.tar.xz 4645620 BLAKE2B f4f2ce2bf119a24c3e1919b14db409a81ad286ef2242918f356d2b4c56b498f41cbafa03a136eac5d87b4905529e06982694f19bdf30933454e94d34526962c3 SHA512 cf4a40367ea5b0a671c5df70123ef93f6aecc25322af7eb05e4f32d40e54d9b0d48ddd1df9f2589c468eb511ada3f3ef409603c1513de33ba2482078a9415eae
25
26 diff --git a/sci-visualization/gwyddion/files/gwyddion-2.56-automagic.patch b/sci-visualization/gwyddion/files/gwyddion-2.56-automagic.patch
27 new file mode 100644
28 index 00000000000..72088057083
29 --- /dev/null
30 +++ b/sci-visualization/gwyddion/files/gwyddion-2.56-automagic.patch
31 @@ -0,0 +1,34 @@
32 +diff -ruN gwyddion-2.56.orig/configure.ac gwyddion-2.56/configure.ac
33 +--- gwyddion-2.56.orig/configure.ac 2020-06-30 11:04:55.000000000 +0300
34 ++++ gwyddion-2.56/configure.ac 2020-06-30 13:22:00.881313300 +0300
35 +@@ -646,11 +646,13 @@
36 + #############################################################################
37 + # OpenEXR
38 + # Optional. Used for HDR greyscale OpenEXR pixmap import/export.
39 +-enable_exr=$have_cxx
40 +-PKG_CHECK_MODULES(EXR, [OpenEXR],
41 ++GWY_WITH([exr],,[build with OpenEXR support])
42 ++if test "x$enable_exr" != "xno" && "x$have_cxx" != "xno"; then
43 ++ PKG_CHECK_MODULES(EXR, [OpenEXR],
44 + [AC_DEFINE(HAVE_EXR,1,
45 + [Define if we have the OpenEXR package.])],
46 + [enable_exr=no])
47 ++fi
48 + AM_CONDITIONAL([HAVE_EXR],[test "x$enable_exr" != xno])
49 +
50 + #############################################################################
51 +@@ -665,10 +667,13 @@
52 + #############################################################################
53 + # CFITSIO
54 + # Optional. Used for FITS image import.
55 +-PKG_CHECK_MODULES(CFITSIO, [cfitsio],
56 ++GWY_WITH([cfitsio],,[build with cfitsio support])
57 ++if test "x$enable_cfitsio" != "xno"; then
58 ++ PKG_CHECK_MODULES(CFITSIO, [cfitsio],
59 + [AC_DEFINE(HAVE_CFITSIO,1,
60 + [Define if we have the cfitsio package.])],
61 + [enable_cfitsio=no])
62 ++fi
63 + AM_CONDITIONAL([HAVE_CFITSIO],[test "x$enable_cfitsio" != xno])
64 +
65 + #############################################################################
66
67 diff --git a/sci-visualization/gwyddion/gwyddion-2.56.ebuild b/sci-visualization/gwyddion/gwyddion-2.56.ebuild
68 new file mode 100644
69 index 00000000000..de98686272c
70 --- /dev/null
71 +++ b/sci-visualization/gwyddion/gwyddion-2.56.ebuild
72 @@ -0,0 +1,76 @@
73 +# Copyright 1999-2020 Gentoo Authors
74 +# Distributed under the terms of the GNU General Public License v2
75 +
76 +EAPI=6
77 +
78 +inherit autotools gnome2-utils xdg
79 +
80 +DESCRIPTION="Framework for Scanning Mode Microscopy data analysis"
81 +HOMEPAGE="http://gwyddion.net/"
82 +SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.xz"
83 +
84 +LICENSE="GPL-2"
85 +SLOT="0"
86 +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
87 +IUSE="doc fits gnome hdf5 nls openexr perl ruby sourceview xml X"
88 +
89 +RDEPEND="
90 + >=dev-libs/glib-2.32
91 + dev-libs/libzip
92 + media-libs/libpng:0=
93 + >=sci-libs/fftw-3.1:3.0=
94 + x11-libs/cairo
95 + >=x11-libs/gtk+-2.18:2
96 + x11-libs/libXmu
97 + x11-libs/pango
98 + fits? ( sci-libs/cfitsio )
99 + gnome? ( gnome-base/gconf:2 )
100 + hdf5? ( sci-libs/hdf5 )
101 + openexr? ( media-libs/openexr:= )
102 + perl? ( dev-lang/perl:= )
103 + ruby? ( dev-ruby/narray )
104 + sourceview? ( x11-libs/gtksourceview:2.0 )
105 + xml? ( dev-libs/libxml2:2 )"
106 +
107 +DEPEND="${RDEPEND}
108 + virtual/pkgconfig
109 + doc? ( dev-util/gtk-doc )
110 +"
111 +
112 +PATCHES=(
113 + "${FILESDIR}/${PN}-2.56-automagic.patch"
114 +)
115 +
116 +src_prepare() {
117 + default
118 + eautoreconf
119 +}
120 +
121 +src_configure() {
122 + econf \
123 + --disable-rpath \
124 + --without-kde4-thumbnailer \
125 + $(use_enable doc gtk-doc) \
126 + $(use_enable nls) \
127 + $(use_with hdf5) \
128 + --disable-pygwy \
129 + $(use_with fits cfitsio) \
130 + $(use_with perl) \
131 + --without-python \
132 + $(use_with ruby) \
133 + --without-gl \
134 + $(use_with openexr exr) \
135 + $(use_with sourceview gtksourceview) \
136 + $(use_with xml libxml2) \
137 + $(use_with X x) \
138 + --with-zip=libzip
139 +}
140 +
141 +pkg_postinst() {
142 + use gnome && gnome2_gconf_install
143 + xdg_pkg_postinst
144 +}
145 +
146 +pkg_prerm() {
147 + use gnome && gnome2_gconf_uninstall
148 +}