| 1 |
commit: 1d8e6b79dfc15d2ebb3acdaf5bda27509da72c69 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 24 03:48:37 2020 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 24 03:49:57 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d8e6b79 |
| 7 |
|
| 8 |
sci-visualization/gwyddion: Use xdg eclass, fix cfitsio automagic |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/598682 |
| 11 |
Closes: https://bugs.gentoo.org/623314 |
| 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 |
.../gwyddion/files/gwyddion-2.47-cfitsio.patch | 19 +++++++++++++++++++ |
| 16 |
sci-visualization/gwyddion/gwyddion-2.47-r1.ebuild | 19 ++++++++++++------- |
| 17 |
2 files changed, 31 insertions(+), 7 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sci-visualization/gwyddion/files/gwyddion-2.47-cfitsio.patch b/sci-visualization/gwyddion/files/gwyddion-2.47-cfitsio.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..9380eafa905 |
| 22 |
--- /dev/null |
| 23 |
+++ b/sci-visualization/gwyddion/files/gwyddion-2.47-cfitsio.patch |
| 24 |
@@ -0,0 +1,19 @@ |
| 25 |
+diff -ruN gwyddion-2.47.orig/configure.ac gwyddion-2.47/configure.ac |
| 26 |
+--- gwyddion-2.47.orig/configure.ac 2016-11-18 11:17:57.000000000 +0100 |
| 27 |
++++ gwyddion-2.47/configure.ac 2020-01-24 04:39:18.892183563 +0100 |
| 28 |
+@@ -632,11 +632,13 @@ |
| 29 |
+ ############################################################################# |
| 30 |
+ # CFITSIO |
| 31 |
+ # Optional. Used for FITS image import. |
| 32 |
+-enable_cfitsio=yes |
| 33 |
+-PKG_CHECK_MODULES(CFITSIO, [cfitsio], |
| 34 |
++GWY_WITH([cfitsio],,[build with cfitsio support]) |
| 35 |
++if test "x$enable_cfitsio" != "xno"; then |
| 36 |
++ PKG_CHECK_MODULES(CFITSIO, [cfitsio], |
| 37 |
+ [AC_DEFINE(HAVE_CFITSIO,1, |
| 38 |
+ [Define if we have the cfitsio package.])], |
| 39 |
+ [enable_cfitsio=no]) |
| 40 |
++fi |
| 41 |
+ AM_CONDITIONAL([HAVE_CFITSIO],[test x$enable_cfitsio != xno]) |
| 42 |
+ |
| 43 |
+ ############################################################################# |
| 44 |
|
| 45 |
diff --git a/sci-visualization/gwyddion/gwyddion-2.47-r1.ebuild b/sci-visualization/gwyddion/gwyddion-2.47-r1.ebuild |
| 46 |
index 2ae4cecc209..d0ccf029613 100644 |
| 47 |
--- a/sci-visualization/gwyddion/gwyddion-2.47-r1.ebuild |
| 48 |
+++ b/sci-visualization/gwyddion/gwyddion-2.47-r1.ebuild |
| 49 |
@@ -3,7 +3,7 @@ |
| 50 |
|
| 51 |
EAPI=6 |
| 52 |
|
| 53 |
-inherit fdo-mime gnome2-utils |
| 54 |
+inherit autotools gnome2-utils xdg |
| 55 |
|
| 56 |
DESCRIPTION="Framework for Scanning Mode Microscopy data analysis" |
| 57 |
HOMEPAGE="http://gwyddion.net/" |
| 58 |
@@ -34,6 +34,15 @@ DEPEND="${RDEPEND} |
| 59 |
doc? ( dev-util/gtk-doc ) |
| 60 |
" |
| 61 |
|
| 62 |
+PATCHES=( |
| 63 |
+ "${FILESDIR}/${PN}-2.47-cfitsio.patch" |
| 64 |
+) |
| 65 |
+ |
| 66 |
+src_prepare() { |
| 67 |
+ default |
| 68 |
+ eautoreconf |
| 69 |
+} |
| 70 |
+ |
| 71 |
src_configure() { |
| 72 |
econf \ |
| 73 |
--disable-rpath \ |
| 74 |
@@ -41,7 +50,7 @@ src_configure() { |
| 75 |
$(use_enable doc gtk-doc) \ |
| 76 |
$(use_enable nls) \ |
| 77 |
--disable-pygwy \ |
| 78 |
- $(use_enable fits cfitsio) \ |
| 79 |
+ $(use_with fits cfitsio) \ |
| 80 |
$(use_with perl) \ |
| 81 |
--without-python \ |
| 82 |
$(use_with ruby) \ |
| 83 |
@@ -54,13 +63,9 @@ src_configure() { |
| 84 |
|
| 85 |
pkg_postinst() { |
| 86 |
use gnome && gnome2_gconf_install |
| 87 |
- fdo-mime_desktop_database_update |
| 88 |
+ xdg_pkg_postinst |
| 89 |
} |
| 90 |
|
| 91 |
pkg_prerm() { |
| 92 |
use gnome && gnome2_gconf_uninstall |
| 93 |
} |
| 94 |
- |
| 95 |
-pkg_postrm() { |
| 96 |
- fdo-mime_desktop_database_update |
| 97 |
-} |
Archives