From 474366dad65b7205550ebdaccbecc231a639f638 Mon Sep 17 00:00:00 2001 From: "Andreas K. Hüttel" Date: Tue, 28 Jan 2020 01:07:46 +0100 Subject: sci-visualization/gwyddion: Fix generated mime data MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch backported from upstream trunk Closes: https://bugs.gentoo.org/706790 Package-Manager: Portage-2.3.85, Repoman-2.3.20 Signed-off-by: Andreas K. Hüttel --- .../gwyddion/files/gwyddion-2.55-mime.patch | 15 +++++ sci-visualization/gwyddion/gwyddion-2.55-r1.ebuild | 74 --------------------- sci-visualization/gwyddion/gwyddion-2.55-r2.ebuild | 75 ++++++++++++++++++++++ 3 files changed, 90 insertions(+), 74 deletions(-) create mode 100644 sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch delete mode 100644 sci-visualization/gwyddion/gwyddion-2.55-r1.ebuild create mode 100644 sci-visualization/gwyddion/gwyddion-2.55-r2.ebuild diff --git a/sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch b/sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch new file mode 100644 index 000000000000..536790c1ac46 --- /dev/null +++ b/sci-visualization/gwyddion/files/gwyddion-2.55-mime.patch @@ -0,0 +1,15 @@ +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/gwyddion-2.55-r1.ebuild b/sci-visualization/gwyddion/gwyddion-2.55-r1.ebuild deleted file mode 100644 index 7029da852fcc..000000000000 --- a/sci-visualization/gwyddion/gwyddion-2.55-r1.ebuild +++ /dev/null @@ -1,74 +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 gnome 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 ) - 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.55-automagic.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) \ - --without-gl \ - $(use_with openexr exr) \ - $(use_with sourceview gtksourceview) \ - $(use_with xml libxml2) \ - $(use_with X x) \ - --with-zip=libzip -} - -pkg_postinst() { - use gnome && gnome2_gconf_install - xdg_pkg_postinst -} - -pkg_prerm() { - use gnome && gnome2_gconf_uninstall -} diff --git a/sci-visualization/gwyddion/gwyddion-2.55-r2.ebuild b/sci-visualization/gwyddion/gwyddion-2.55-r2.ebuild new file mode 100644 index 000000000000..af6b46015063 --- /dev/null +++ b/sci-visualization/gwyddion/gwyddion-2.55-r2.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 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:= ) + 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.55-automagic.patch" + "${FILESDIR}/${PN}-2.55-mime.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) \ + --without-gl \ + $(use_with openexr exr) \ + $(use_with sourceview gtksourceview) \ + $(use_with xml libxml2) \ + $(use_with X x) \ + --with-zip=libzip +} + +pkg_postinst() { + use gnome && gnome2_gconf_install + xdg_pkg_postinst +} + +pkg_prerm() { + use gnome && gnome2_gconf_uninstall +} -- cgit v1.2.3-65-gdbad