Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gwyddion/files/, sci-visualization/gwyddion/
Date: Mon, 24 Feb 2020 13:36:47
Message-Id: 1582551386.6d042c7824487c60ab67da55b9f7cbbf2e756d4d.asturm@gentoo
1 commit: 6d042c7824487c60ab67da55b9f7cbbf2e756d4d
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 24 13:31:42 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 24 13:36:26 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d042c78
7
8 sci-visualization/gwyddion: Drop 2.47-r1
9
10 Closes: https://bugs.gentoo.org/710156
11 Package-Manager: Portage-2.3.89, Repoman-2.3.20
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 sci-visualization/gwyddion/Manifest | 1 -
15 .../gwyddion/files/gwyddion-2.47-cfitsio.patch | 19 ------
16 sci-visualization/gwyddion/gwyddion-2.47-r1.ebuild | 71 ----------------------
17 3 files changed, 91 deletions(-)
18
19 diff --git a/sci-visualization/gwyddion/Manifest b/sci-visualization/gwyddion/Manifest
20 index 344cbeac8b5..5e4503a7e41 100644
21 --- a/sci-visualization/gwyddion/Manifest
22 +++ b/sci-visualization/gwyddion/Manifest
23 @@ -1,2 +1 @@
24 -DIST gwyddion-2.47.tar.xz 3974120 BLAKE2B c9a0241fe509a2f067c16f77d2b02885505d47c3ba0f25a44449e0d5ad05ce8596784392d8f1265823577aeebbab7ad9c96a39625b01bf11da3cebeb1c6453cc SHA512 a6bbda2d32ec013a9d6c7e2b6dbf2cef08d8f964099c0fda511bc92c16c943459f29d52f784a599466af65027aaae3aaeb1b79e56c40e39bc47019044eecd3e6
25 DIST gwyddion-2.55.tar.xz 4607560 BLAKE2B 30489d980d3feb6986be4041b59c847673ee589674d5913b4508f28f072eb2f570b98f0b1be01dcf6e1d45e86607582967fd83fe3c859172fcdef3c7bffae741 SHA512 680c33b1f7d36de31274869e7f0af9c06030e04779d6b59f06860ae3f47db4ad45bbf3ee2219bb7b6c01807a807aeafa4f5d0aefe20601e0dda1011acf59fc8e
26
27 diff --git a/sci-visualization/gwyddion/files/gwyddion-2.47-cfitsio.patch b/sci-visualization/gwyddion/files/gwyddion-2.47-cfitsio.patch
28 deleted file mode 100644
29 index 9380eafa905..00000000000
30 --- a/sci-visualization/gwyddion/files/gwyddion-2.47-cfitsio.patch
31 +++ /dev/null
32 @@ -1,19 +0,0 @@
33 -diff -ruN gwyddion-2.47.orig/configure.ac gwyddion-2.47/configure.ac
34 ---- gwyddion-2.47.orig/configure.ac 2016-11-18 11:17:57.000000000 +0100
35 -+++ gwyddion-2.47/configure.ac 2020-01-24 04:39:18.892183563 +0100
36 -@@ -632,11 +632,13 @@
37 - #############################################################################
38 - # CFITSIO
39 - # Optional. Used for FITS image import.
40 --enable_cfitsio=yes
41 --PKG_CHECK_MODULES(CFITSIO, [cfitsio],
42 -+GWY_WITH([cfitsio],,[build with cfitsio support])
43 -+if test "x$enable_cfitsio" != "xno"; then
44 -+ PKG_CHECK_MODULES(CFITSIO, [cfitsio],
45 - [AC_DEFINE(HAVE_CFITSIO,1,
46 - [Define if we have the cfitsio package.])],
47 - [enable_cfitsio=no])
48 -+fi
49 - AM_CONDITIONAL([HAVE_CFITSIO],[test x$enable_cfitsio != xno])
50 -
51 - #############################################################################
52
53 diff --git a/sci-visualization/gwyddion/gwyddion-2.47-r1.ebuild b/sci-visualization/gwyddion/gwyddion-2.47-r1.ebuild
54 deleted file mode 100644
55 index 1e7286e2d11..00000000000
56 --- a/sci-visualization/gwyddion/gwyddion-2.47-r1.ebuild
57 +++ /dev/null
58 @@ -1,71 +0,0 @@
59 -# Copyright 1999-2020 Gentoo Authors
60 -# Distributed under the terms of the GNU General Public License v2
61 -
62 -EAPI=6
63 -
64 -inherit autotools gnome2-utils xdg
65 -
66 -DESCRIPTION="Framework for Scanning Mode Microscopy data analysis"
67 -HOMEPAGE="http://gwyddion.net/"
68 -SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.xz"
69 -
70 -LICENSE="GPL-2"
71 -SLOT="0"
72 -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
73 -IUSE="doc fits fftw gnome nls opengl perl ruby sourceview xml X"
74 -
75 -RDEPEND="
76 - media-libs/libpng:0=
77 - x11-libs/cairo
78 - x11-libs/gtk+:2
79 - x11-libs/libXmu
80 - x11-libs/pango
81 - fits? ( sci-libs/cfitsio )
82 - fftw? ( sci-libs/fftw:3.0= )
83 - gnome? ( gnome-base/gconf:2 )
84 - opengl? ( virtual/opengl x11-libs/gtkglext )
85 - perl? ( dev-lang/perl:= )
86 - ruby? ( dev-ruby/narray )
87 - sourceview? ( x11-libs/gtksourceview:2.0 )
88 - xml? ( dev-libs/libxml2:2 )"
89 -
90 -DEPEND="${RDEPEND}
91 - virtual/pkgconfig
92 - doc? ( dev-util/gtk-doc )
93 -"
94 -
95 -PATCHES=(
96 - "${FILESDIR}/${PN}-2.47-cfitsio.patch"
97 -)
98 -
99 -src_prepare() {
100 - default
101 - eautoreconf
102 -}
103 -
104 -src_configure() {
105 - econf \
106 - --disable-rpath \
107 - --without-kde4-thumbnailer \
108 - $(use_enable doc gtk-doc) \
109 - $(use_enable nls) \
110 - --disable-pygwy \
111 - $(use_with fits cfitsio) \
112 - $(use_with perl) \
113 - --without-python \
114 - $(use_with ruby) \
115 - $(use_with fftw fftw3) \
116 - $(use_with opengl gl) \
117 - $(use_with sourceview gtksourceview) \
118 - $(use_with xml libxml2) \
119 - $(use_with X x)
120 -}
121 -
122 -pkg_postinst() {
123 - use gnome && gnome2_gconf_install
124 - xdg_pkg_postinst
125 -}
126 -
127 -pkg_prerm() {
128 - use gnome && gnome2_gconf_uninstall
129 -}