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