[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gwyddion/files/, sci-visualization/gwyddion/

2022-03-28 Thread Andrew Ammerlaan 
commit: 6b07203c63d31ecd1ac1beb61a7229347634dacf
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Mon Mar 28 19:31:07 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Mon Mar 28 19:32:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b07203c

sci-visualization/gwyddion: add 2.60

Bug: https://bugs.gentoo.org/598682
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-visualization/gwyddion/Manifest|  1 +
 .../gwyddion/files/gwyddion-2.60-automagic.patch   | 35 +
 sci-visualization/gwyddion/gwyddion-2.60.ebuild| 83 ++
 sci-visualization/gwyddion/metadata.xml|  6 ++
 4 files changed, 125 insertions(+)

diff --git a/sci-visualization/gwyddion/Manifest 
b/sci-visualization/gwyddion/Manifest
index 1accbe6e79fe..17b49326cbea 100644
--- a/sci-visualization/gwyddion/Manifest
+++ b/sci-visualization/gwyddion/Manifest
@@ -1 +1,2 @@
 DIST gwyddion-2.56.tar.xz 4645620 BLAKE2B 
f4f2ce2bf119a24c3e1919b14db409a81ad286ef2242918f356d2b4c56b498f41cbafa03a136eac5d87b4905529e06982694f19bdf30933454e94d34526962c3
 SHA512 
cf4a40367ea5b0a671c5df70123ef93f6aecc25322af7eb05e4f32d40e54d9b0d48ddd1df9f2589c468eb511ada3f3ef409603c1513de33ba2482078a9415eae
+DIST gwyddion-2.60.tar.xz 4973404 BLAKE2B 
6ded40f34bfcd70db2e897abc1f07b070aca78e08c90661ee4fe281d19f16337ca81b5a4e2adaeb29e1870e8194eb77976910a54248842c8474864065d64defd
 SHA512 
e568df77ef580aaedfcdd1f746a78f3ca93676a07a331fc6e70f997780bb403d1c3967aa93440c7fa1f010bd01f5376700c869a38dacaf1f98b075c4c950cf54

diff --git a/sci-visualization/gwyddion/files/gwyddion-2.60-automagic.patch 
b/sci-visualization/gwyddion/files/gwyddion-2.60-automagic.patch
new file mode 100644
index ..ac68ac0a2861
--- /dev/null
+++ b/sci-visualization/gwyddion/files/gwyddion-2.60-automagic.patch
@@ -0,0 +1,35 @@
+diff --git a/configure.ac b/configure.ac
+index 5a7465a..cc5a54d 100644
+--- a/configure.ac
 b/configure.ac
+@@ -660,11 +660,13 @@ AM_CONDITIONAL([HAVE_CXX],[test "x$have_cxx" != xno])
+ #
+ # OpenEXR 2.x+
+ # Optional.  Used for HDR greyscale OpenEXR pixmap import/export.
+-enable_exr=$have_cxx
+-PKG_CHECK_MODULES(EXR, [OpenEXR >= 2.0],
++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 2.x+ package.])],
+   [enable_exr=no])
++fi
+ AM_CONDITIONAL([HAVE_EXR],[test "x$enable_exr" != xno])
+ 
+ #
+@@ -679,10 +681,13 @@ AM_CONDITIONAL([HAVE_HDF5],[test "x$enable_hdf5" != xno])
+ #
+ # CFITSIO
+ # Optional.  Used for FITS image import.
+-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/gwyddion-2.60.ebuild 
b/sci-visualization/gwyddion/gwyddion-2.60.ebuild
new file mode 100644
index ..ff875e5ab41d
--- /dev/null
+++ b/sci-visualization/gwyddion/gwyddion-2.60.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools 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="bzip2 doc fits jansson hdf5 nls openexr openmp perl ruby sourceview 
unique xml X zlib"
+
+RDEPEND="
+   >=dev-libs/glib-2.32
+   dev-libs/libzip
+   media-libs/libpng:0=
+   >=sci-libs/fftw-3.1:3.0=[openmp?]
+   virtual/libiconv
+   virtual/libintl
+   x11-libs/cairo
+   >=x11-libs/gtk+-2.18:2
+   x11-libs/libXmu
+   x11-libs/pango
+   bzip2? ( app-arch/bzip2 )
+   fits? ( sci-libs/cfitsio[bzip2?] )
+   jansson? ( dev-libs/jansson )
+   hdf5? ( sci-libs/hdf5[zlib?] )
+   openexr? ( media-libs/openexr:= )
+   perl? ( dev-lang/perl:= )
+   ruby? ( dev-ruby/narray )
+   unique? ( dev-libs/libunique:3 )
+   sourceview? ( x11-libs/gtksourceview:2.0 )
+   xml? ( dev-libs/libxml2:2 )
+   zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+   virtual/pkgconfig
+   doc? ( dev-util/gtk-doc )
+"
+

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gwyddion/files/, sci-visualization/gwyddion/

2021-03-02 Thread Michał Górny 
commit: f42fa894b14082d3d46c67e22274778e71dbb462
Author: Jakov Smolic  sartura  hr>
AuthorDate: Tue Mar  2 08:58:19 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Mar  2 09:05:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f42fa894

sci-visualization/gwyddion: Remove old

Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: Michał Górny  gentoo.org>

 sci-visualization/gwyddion/Manifest|  1 -
 .../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 --
 5 files changed, 140 deletions(-)

diff --git a/sci-visualization/gwyddion/Manifest 
b/sci-visualization/gwyddion/Manifest
index ad1a5fdc257..1accbe6e79f 100644
--- a/sci-visualization/gwyddion/Manifest
+++ b/sci-visualization/gwyddion/Manifest
@@ -1,2 +1 @@
-DIST gwyddion-2.55.tar.xz 4607560 BLAKE2B 
30489d980d3feb6986be4041b59c847673ee589674d5913b4508f28f072eb2f570b98f0b1be01dcf6e1d45e86607582967fd83fe3c859172fcdef3c7bffae741
 SHA512 
680c33b1f7d36de31274869e7f0af9c06030e04779d6b59f06860ae3f47db4ad45bbf3ee2219bb7b6c01807a807aeafa4f5d0aefe20601e0dda1011acf59fc8e
 DIST gwyddion-2.56.tar.xz 4645620 BLAKE2B 
f4f2ce2bf119a24c3e1919b14db409a81ad286ef2242918f356d2b4c56b498f41cbafa03a136eac5d87b4905529e06982694f19bdf30933454e94d34526962c3
 SHA512 
cf4a40367ea5b0a671c5df70123ef93f6aecc25322af7eb05e4f32d40e54d9b0d48ddd1df9f2589c468eb511ada3f3ef409603c1513de33ba2482078a9415eae

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 405a2552f08..000
--- 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.ac2019-11-04 10:25:16.0 +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 536790c1ac4..000
--- 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 3cebcc684b5..000
--- 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 335e80a5c60..000
--- 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

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gwyddion/files/, sci-visualization/gwyddion/

2020-06-30 Thread Andreas K. Hüttel 
commit: 6003608cab6ce45c6d88c02843f09d5300154a8a
Author: Andreas K. Huettel  gentoo  org>
AuthorDate: Tue Jun 30 10:47:10 2020 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Tue Jun 30 10:47:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6003608c

sci-visualization/gwyddion: Version bump 2.56

Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Andreas K. Huettel  gentoo.org>

 sci-visualization/gwyddion/Manifest|  1 +
 .../gwyddion/files/gwyddion-2.56-automagic.patch   | 34 ++
 sci-visualization/gwyddion/gwyddion-2.56.ebuild| 76 ++
 3 files changed, 111 insertions(+)

diff --git a/sci-visualization/gwyddion/Manifest 
b/sci-visualization/gwyddion/Manifest
index 5e4503a7e41..ad1a5fdc257 100644
--- a/sci-visualization/gwyddion/Manifest
+++ b/sci-visualization/gwyddion/Manifest
@@ -1 +1,2 @@
 DIST gwyddion-2.55.tar.xz 4607560 BLAKE2B 
30489d980d3feb6986be4041b59c847673ee589674d5913b4508f28f072eb2f570b98f0b1be01dcf6e1d45e86607582967fd83fe3c859172fcdef3c7bffae741
 SHA512 
680c33b1f7d36de31274869e7f0af9c06030e04779d6b59f06860ae3f47db4ad45bbf3ee2219bb7b6c01807a807aeafa4f5d0aefe20601e0dda1011acf59fc8e
+DIST gwyddion-2.56.tar.xz 4645620 BLAKE2B 
f4f2ce2bf119a24c3e1919b14db409a81ad286ef2242918f356d2b4c56b498f41cbafa03a136eac5d87b4905529e06982694f19bdf30933454e94d34526962c3
 SHA512 
cf4a40367ea5b0a671c5df70123ef93f6aecc25322af7eb05e4f32d40e54d9b0d48ddd1df9f2589c468eb511ada3f3ef409603c1513de33ba2482078a9415eae

diff --git a/sci-visualization/gwyddion/files/gwyddion-2.56-automagic.patch 
b/sci-visualization/gwyddion/files/gwyddion-2.56-automagic.patch
new file mode 100644
index 000..72088057083
--- /dev/null
+++ b/sci-visualization/gwyddion/files/gwyddion-2.56-automagic.patch
@@ -0,0 +1,34 @@
+diff -ruN gwyddion-2.56.orig/configure.ac gwyddion-2.56/configure.ac
+--- gwyddion-2.56.orig/configure.ac2020-06-30 11:04:55.0 +0300
 gwyddion-2.56/configure.ac 2020-06-30 13:22:00.881313300 +0300
+@@ -646,11 +646,13 @@
+ #
+ # 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])
+ 
+ #
+@@ -665,10 +667,13 @@
+ #
+ # CFITSIO
+ # Optional.  Used for FITS image import.
+-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/gwyddion-2.56.ebuild 
b/sci-visualization/gwyddion/gwyddion-2.56.ebuild
new file mode 100644
index 000..de98686272c
--- /dev/null
+++ b/sci-visualization/gwyddion/gwyddion-2.56.ebuild
@@ -0,0 +1,76 @@
+# 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 hdf5 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 )
+   hdf5? ( sci-libs/hdf5 )
+   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.56-automagic.patch"
+)
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   --disable-rpath \
+   --without-kde4-thumbnailer \
+   $(use_enable doc gtk-doc) \

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gwyddion/files/, sci-visualization/gwyddion/

2020-03-09 Thread Andreas K. Hüttel 
commit: d31f43e4f2935e8cca08ca8f1205a4ec21575eeb
Author: Andreas K. Huettel  gentoo  org>
AuthorDate: Mon Mar  9 08:32:26 2020 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Mon Mar  9 08:41:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d31f43e4

sci-visualization/gwyddion: Really fix bug 706790 and bug 710664 now

Last fix didn't work properly in all cases, so also patch
generated xml file ...

Closes: https://bugs.gentoo.org/706790
Closes: https://bugs.gentoo.org/710664
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas K. Huettel  gentoo.org>

 sci-visualization/gwyddion/files/gwyddion-2.55-xml.patch  | 15 +++
 .../{gwyddion-2.55-r2.ebuild => gwyddion-2.55-r4.ebuild}  |  1 +
 2 files changed, 16 insertions(+)

diff --git a/sci-visualization/gwyddion/files/gwyddion-2.55-xml.patch 
b/sci-visualization/gwyddion/files/gwyddion-2.55-xml.patch
new file mode 100644
index 000..3cebcc684b5
--- /dev/null
+++ b/sci-visualization/gwyddion/files/gwyddion-2.55-xml.patch
@@ -0,0 +1,15 @@
+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-r2.ebuild 
b/sci-visualization/gwyddion/gwyddion-2.55-r4.ebuild
similarity index 97%
rename from sci-visualization/gwyddion/gwyddion-2.55-r2.ebuild
rename to sci-visualization/gwyddion/gwyddion-2.55-r4.ebuild
index 81eb34a955a..335e80a5c60 100644
--- a/sci-visualization/gwyddion/gwyddion-2.55-r2.ebuild
+++ b/sci-visualization/gwyddion/gwyddion-2.55-r4.ebuild
@@ -39,6 +39,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
"${FILESDIR}/${PN}-2.55-automagic.patch"
"${FILESDIR}/${PN}-2.55-mime.patch"
+   "${FILESDIR}/${PN}-2.55-xml.patch"
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gwyddion/files/, sci-visualization/gwyddion/

2020-02-24 Thread Andreas Sturmlechner 
commit: 6d042c7824487c60ab67da55b9f7cbbf2e756d4d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Feb 24 13:31:42 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Feb 24 13:36:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d042c78

sci-visualization/gwyddion: Drop 2.47-r1

Closes: https://bugs.gentoo.org/710156
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-visualization/gwyddion/Manifest|  1 -
 .../gwyddion/files/gwyddion-2.47-cfitsio.patch | 19 --
 sci-visualization/gwyddion/gwyddion-2.47-r1.ebuild | 71 --
 3 files changed, 91 deletions(-)

diff --git a/sci-visualization/gwyddion/Manifest 
b/sci-visualization/gwyddion/Manifest
index 344cbeac8b5..5e4503a7e41 100644
--- a/sci-visualization/gwyddion/Manifest
+++ b/sci-visualization/gwyddion/Manifest
@@ -1,2 +1 @@
-DIST gwyddion-2.47.tar.xz 3974120 BLAKE2B 
c9a0241fe509a2f067c16f77d2b02885505d47c3ba0f25a9e0d5ad05ce8596784392d8f1265823577aeebbab7ad9c96a39625b01bf11da3cebeb1c6453cc
 SHA512 
a6bbda2d32ec013a9d6c7e2b6dbf2cef08d8f964099c0fda511bc92c16c943459f29d52f784a599466af65027aaae3aaeb1b79e56c40e39bc47019044eecd3e6
 DIST gwyddion-2.55.tar.xz 4607560 BLAKE2B 
30489d980d3feb6986be4041b59c847673ee589674d5913b4508f28f072eb2f570b98f0b1be01dcf6e1d45e86607582967fd83fe3c859172fcdef3c7bffae741
 SHA512 
680c33b1f7d36de31274869e7f0af9c06030e04779d6b59f06860ae3f47db4ad45bbf3ee2219bb7b6c01807a807aeafa4f5d0aefe20601e0dda1011acf59fc8e

diff --git a/sci-visualization/gwyddion/files/gwyddion-2.47-cfitsio.patch 
b/sci-visualization/gwyddion/files/gwyddion-2.47-cfitsio.patch
deleted file mode 100644
index 9380eafa905..000
--- a/sci-visualization/gwyddion/files/gwyddion-2.47-cfitsio.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ruN gwyddion-2.47.orig/configure.ac gwyddion-2.47/configure.ac
 gwyddion-2.47.orig/configure.ac2016-11-18 11:17:57.0 +0100
-+++ gwyddion-2.47/configure.ac 2020-01-24 04:39:18.892183563 +0100
-@@ -632,11 +632,13 @@
- #
- # 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/gwyddion-2.47-r1.ebuild 
b/sci-visualization/gwyddion/gwyddion-2.47-r1.ebuild
deleted file mode 100644
index 1e7286e2d11..000
--- a/sci-visualization/gwyddion/gwyddion-2.47-r1.ebuild
+++ /dev/null
@@ -1,71 +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 fftw gnome nls opengl perl ruby sourceview xml X"
-
-RDEPEND="
-   media-libs/libpng:0=
-   x11-libs/cairo
-   x11-libs/gtk+:2
-   x11-libs/libXmu
-   x11-libs/pango
-   fits? ( sci-libs/cfitsio )
-   fftw? ( sci-libs/fftw:3.0= )
-   gnome? ( gnome-base/gconf:2 )
-   opengl? ( virtual/opengl x11-libs/gtkglext )
-   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.47-cfitsio.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) \
-   $(use_with fftw fftw3) \
-   $(use_with opengl gl) \
-   $(use_with sourceview gtksourceview) \
-   $(use_with xml libxml2) \
-   $(use_with X x)
-}
-
-pkg_postinst() {
-   use gnome && gnome2_gconf_install
-   xdg_pkg_postinst
-}
-
-pkg_prerm() {
-   use gnome && gnome2_gconf_uninstall
-}

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gwyddion/files/, sci-visualization/gwyddion/

2020-01-23 Thread Andreas K. Hüttel 
commit: 71a32d3caaec80cfe64a7f536b0b05bd484567c2
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Fri Jan 24 04:34:48 2020 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Fri Jan 24 04:35:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71a32d3c

sci-visualization/gwyddion: Version bump; fix openexr automagic

Bug: https://bugs.gentoo.org/598682
Closes: https://bugs.gentoo.org/582454
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 sci-visualization/gwyddion/Manifest|  1 +
 .../gwyddion/files/gwyddion-2.55-automagic.patch   | 33 ++
 sci-visualization/gwyddion/gwyddion-2.55.ebuild| 75 ++
 3 files changed, 109 insertions(+)

diff --git a/sci-visualization/gwyddion/Manifest 
b/sci-visualization/gwyddion/Manifest
index 247e6b83c98..703a0064d39 100644
--- a/sci-visualization/gwyddion/Manifest
+++ b/sci-visualization/gwyddion/Manifest
@@ -1,2 +1,3 @@
 DIST gwyddion-2.44.tar.xz 3517624 BLAKE2B 
c32dd33e2fe6c6a09062807db1a25fd54d3becc12bb806a21572f992429cc52a2180221c5627ab49d44f24c13f9928e3825c1b833adff1523d0caa092829ecf7
 SHA512 
c80a0e4e9dde2f669763629d34dacc0015770c4704a10fc820f4d8e75b4f4275852162653f0c6c52674ed76162861af860de6741466d939066bfea3fb584d2ff
 DIST gwyddion-2.47.tar.xz 3974120 BLAKE2B 
c9a0241fe509a2f067c16f77d2b02885505d47c3ba0f25a9e0d5ad05ce8596784392d8f1265823577aeebbab7ad9c96a39625b01bf11da3cebeb1c6453cc
 SHA512 
a6bbda2d32ec013a9d6c7e2b6dbf2cef08d8f964099c0fda511bc92c16c943459f29d52f784a599466af65027aaae3aaeb1b79e56c40e39bc47019044eecd3e6
+DIST gwyddion-2.55.tar.xz 4607560 BLAKE2B 
30489d980d3feb6986be4041b59c847673ee589674d5913b4508f28f072eb2f570b98f0b1be01dcf6e1d45e86607582967fd83fe3c859172fcdef3c7bffae741
 SHA512 
680c33b1f7d36de31274869e7f0af9c06030e04779d6b59f06860ae3f47db4ad45bbf3ee2219bb7b6c01807a807aeafa4f5d0aefe20601e0dda1011acf59fc8e

diff --git a/sci-visualization/gwyddion/files/gwyddion-2.55-automagic.patch 
b/sci-visualization/gwyddion/files/gwyddion-2.55-automagic.patch
new file mode 100644
index 000..405a2552f08
--- /dev/null
+++ b/sci-visualization/gwyddion/files/gwyddion-2.55-automagic.patch
@@ -0,0 +1,33 @@
+diff -ruN gwyddion-2.55.orig/configure.ac gwyddion-2.55/configure.ac
+--- gwyddion-2.55.orig/configure.ac2019-11-04 10:25:16.0 +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/gwyddion-2.55.ebuild 
b/sci-visualization/gwyddion/gwyddion-2.55.ebuild
new file mode 100644
index 000..38eb5f9eca4
--- /dev/null
+++ b/sci-visualization/gwyddion/gwyddion-2.55.ebuild
@@ -0,0 +1,75 @@
+# 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 opengl 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:= )
+   opengl? ( virtual/opengl x11-libs/gtkglext )
+   perl? ( dev-lang/perl:= )
+   ruby? ( dev-ruby/narray )
+   sourceview? ( x11-libs/gtksourceview:2.0 )
+   xml? ( dev-libs/libxml2:2 )"
+
+DEPEND="${RDEPEND}

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gwyddion/files/, sci-visualization/gwyddion/

2020-01-23 Thread Andreas K. Hüttel 
commit: 1d8e6b79dfc15d2ebb3acdaf5bda27509da72c69
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Fri Jan 24 03:48:37 2020 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Fri Jan 24 03:49:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d8e6b79

sci-visualization/gwyddion: Use xdg eclass, fix cfitsio automagic

Bug: https://bugs.gentoo.org/598682
Closes: https://bugs.gentoo.org/623314
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 .../gwyddion/files/gwyddion-2.47-cfitsio.patch| 19 +++
 sci-visualization/gwyddion/gwyddion-2.47-r1.ebuild| 19 ---
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/sci-visualization/gwyddion/files/gwyddion-2.47-cfitsio.patch 
b/sci-visualization/gwyddion/files/gwyddion-2.47-cfitsio.patch
new file mode 100644
index 000..9380eafa905
--- /dev/null
+++ b/sci-visualization/gwyddion/files/gwyddion-2.47-cfitsio.patch
@@ -0,0 +1,19 @@
+diff -ruN gwyddion-2.47.orig/configure.ac gwyddion-2.47/configure.ac
+--- gwyddion-2.47.orig/configure.ac2016-11-18 11:17:57.0 +0100
 gwyddion-2.47/configure.ac 2020-01-24 04:39:18.892183563 +0100
+@@ -632,11 +632,13 @@
+ #
+ # 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/gwyddion-2.47-r1.ebuild 
b/sci-visualization/gwyddion/gwyddion-2.47-r1.ebuild
index 2ae4cecc209..d0ccf029613 100644
--- a/sci-visualization/gwyddion/gwyddion-2.47-r1.ebuild
+++ b/sci-visualization/gwyddion/gwyddion-2.47-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit fdo-mime gnome2-utils
+inherit autotools gnome2-utils xdg
 
 DESCRIPTION="Framework for Scanning Mode Microscopy data analysis"
 HOMEPAGE="http://gwyddion.net/;
@@ -34,6 +34,15 @@ DEPEND="${RDEPEND}
doc? ( dev-util/gtk-doc )
 "
 
+PATCHES=(
+   "${FILESDIR}/${PN}-2.47-cfitsio.patch"
+)
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
 src_configure() {
econf \
--disable-rpath \
@@ -41,7 +50,7 @@ src_configure() {
$(use_enable doc gtk-doc) \
$(use_enable nls) \
--disable-pygwy \
-   $(use_enable fits cfitsio) \
+   $(use_with fits cfitsio) \
$(use_with perl) \
--without-python \
$(use_with ruby) \
@@ -54,13 +63,9 @@ src_configure() {
 
 pkg_postinst() {
use gnome && gnome2_gconf_install
-   fdo-mime_desktop_database_update
+   xdg_pkg_postinst
 }
 
 pkg_prerm() {
use gnome && gnome2_gconf_uninstall
 }
-
-pkg_postrm() {
-   fdo-mime_desktop_database_update
-}

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gwyddion/files/, sci-visualization/gwyddion/

2017-01-02 Thread Justin Lecher 
commit: 83cda917ea4d29220b464980c85edd006c17bc4b
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Jan  2 21:49:57 2017 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Jan  2 22:09:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83cda917

sci-visualization/gwyddion: Drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Justin Lecher  gentoo.org>

 sci-visualization/gwyddion/Manifest|  1 -
 .../gwyddion/files/gwyddion-2.25-libpng15.patch| 10 ---
 .../gwyddion/files/gwyddion-2.30-BGRA.patch| 22 --
 .../gwyddion-2.30-color-button-debris-crash.patch  | 37 -
 sci-visualization/gwyddion/gwyddion-2.39.ebuild| 90 --
 5 files changed, 160 deletions(-)

diff --git a/sci-visualization/gwyddion/Manifest 
b/sci-visualization/gwyddion/Manifest
index 5d8336b..0a88a1a 100644
--- a/sci-visualization/gwyddion/Manifest
+++ b/sci-visualization/gwyddion/Manifest
@@ -1,2 +1 @@
-DIST gwyddion-2.39.tar.xz 3130844 SHA256 
f2346a706fa097e9186339f7e10b7837b20ce403b44bc7a85bc78b6b78a506d2 SHA512 
5b9631c9eeb71a10d0be3533585eb61e8d27bc1147a1f3cf1ca333020271b579025ce752d302bd9474f1b3ed8c55ce679ac6a75bfb4a1093adef0727b824d435
 WHIRLPOOL 
90262b86d1bb01b6fdf5a67b447dc1177a523df368fbd040a87d7261e071844b86624dd6bb303c8a32302d16e5f7cb11e5f0744b2808e4f6d467cd27652efe23
 DIST gwyddion-2.44.tar.xz 3517624 SHA256 
e7ee7545770a276e78fdff1b51e547d5d0ba39b94995da91e0d6797122b7eda5 SHA512 
c80a0e4e9dde2f669763629d34dacc0015770c4704a10fc820f4d8e75b4f4275852162653f0c6c52674ed76162861af860de6741466d939066bfea3fb584d2ff
 WHIRLPOOL 
56f78efb477da520a65473ce6be9eff88897198e8a80e5971a2280755fdc61925405c0a464572cf7887689746d140eefc855562569919bc17e057f472ac0b597

diff --git a/sci-visualization/gwyddion/files/gwyddion-2.25-libpng15.patch 
b/sci-visualization/gwyddion/files/gwyddion-2.25-libpng15.patch
deleted file mode 100644
index f13eaa9..
--- a/sci-visualization/gwyddion/files/gwyddion-2.25-libpng15.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 modules/file/pixmap.c
-+++ modules/file/pixmap.c
-@@ -39,6 +39,7 @@
- #include 
- 
- #ifdef HAVE_PNG
-+#include 
- #include 
- #endif
- 

diff --git a/sci-visualization/gwyddion/files/gwyddion-2.30-BGRA.patch 
b/sci-visualization/gwyddion/files/gwyddion-2.30-BGRA.patch
deleted file mode 100644
index c3b5912..
--- a/sci-visualization/gwyddion/files/gwyddion-2.30-BGRA.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: libgwydgets/gwy3dview.c
-===
 libgwydgets/gwy3dview.c(revision 13961)
-+++ libgwydgets/gwy3dview.c(working copy)
-@@ -48,7 +48,6 @@
- #include 
- #endif
- #endif
--#endif
- 
- #ifndef GL_BGRA
- #ifdef GL_BGRA_EXT
-@@ -57,6 +56,7 @@
- #error FIXME: GL_BGRA is not available, should work around it.
- #endif
- #endif
-+#endif
- 
- #include 
- #include 
-
-

diff --git 
a/sci-visualization/gwyddion/files/gwyddion-2.30-color-button-debris-crash.patch
 
b/sci-visualization/gwyddion/files/gwyddion-2.30-color-button-debris-crash.patch
deleted file mode 100644
index e6ceedf..
--- 
a/sci-visualization/gwyddion/files/gwyddion-2.30-color-button-debris-crash.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: modules/file/pixmap.c
-===
 modules/file/pixmap.c  (revision 13902)
-+++ modules/file/pixmap.c  (revision 13903)
-@@ -2933,8 +2933,6 @@
- gwy_rgba_to_gdk_color(>args->inset_color, );
- 
- dialog = gtk_color_selection_dialog_new(_("Change Inset Color"));
--if (gtk_major_version == 2 && gtk_minor_version < 10)
--
- selector = GTK_COLOR_SELECTION_DIALOG(dialog)->colorsel;
- gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(selector),
-   );
-Index: libgwydgets/gwygraphareadialog.c
-===
 libgwydgets/gwygraphareadialog.c   (revision 13902)
-+++ libgwydgets/gwygraphareadialog.c   (revision 13903)
-@@ -383,7 +383,6 @@
- dialog->color_dialog = selector;
- dialog->old_color = cmodel->color;
- 
--if (gtk_major_version == 2 && gtk_minor_version < 10)
- colorsel = GTK_COLOR_SELECTION_DIALOG(selector)->colorsel;
- g_signal_connect(selector, "response",
-  G_CALLBACK(colorsel_response_cb), dialog);
-Index: libgwydgets/gwydgetutils.c
-===
 libgwydgets/gwydgetutils.c (revision 13902)
-+++ libgwydgets/gwydgetutils.c (revision 13903)
-@@ -561,7 +561,6 @@
- dialog = gtk_color_selection_dialog_new(dialog_title
- ? dialog_title
- : _("Change Mask Color"));
--if (gtk_major_version == 2 && gtk_minor_version < 10)
- selector = GTK_COLOR_SELECTION_DIALOG(dialog)->colorsel;
-