summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2020-01-24 04:48:37 +0100
committerAndreas K. Hüttel <dilfridge@gentoo.org>2020-01-24 04:49:57 +0100
commit1d8e6b79dfc15d2ebb3acdaf5bda27509da72c69 (patch)
tree8dc8717700dfcfecc4a0fe503d7c45814ca82f42
parentdev-lang/go: sync 1.13.6 with live (diff)
downloadgentoo-1d8e6b79dfc15d2ebb3acdaf5bda27509da72c69.tar.gz
gentoo-1d8e6b79dfc15d2ebb3acdaf5bda27509da72c69.tar.bz2
gentoo-1d8e6b79dfc15d2ebb3acdaf5bda27509da72c69.zip
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 <dilfridge@gentoo.org>
-rw-r--r--sci-visualization/gwyddion/files/gwyddion-2.47-cfitsio.patch19
-rw-r--r--sci-visualization/gwyddion/gwyddion-2.47-r1.ebuild19
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 00000000000..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.ac 2016-11-18 11:17:57.000000000 +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
-}