Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@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, 02 Jan 2017 22:09:16
Message-Id: 1483394945.83cda917ea4d29220b464980c85edd006c17bc4b.jlec@gentoo
1 commit: 83cda917ea4d29220b464980c85edd006c17bc4b
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 2 21:49:57 2017 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 2 22:09:05 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83cda917
7
8 sci-visualization/gwyddion: Drop old
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
12
13 sci-visualization/gwyddion/Manifest | 1 -
14 .../gwyddion/files/gwyddion-2.25-libpng15.patch | 10 ---
15 .../gwyddion/files/gwyddion-2.30-BGRA.patch | 22 ------
16 .../gwyddion-2.30-color-button-debris-crash.patch | 37 ---------
17 sci-visualization/gwyddion/gwyddion-2.39.ebuild | 90 ----------------------
18 5 files changed, 160 deletions(-)
19
20 diff --git a/sci-visualization/gwyddion/Manifest b/sci-visualization/gwyddion/Manifest
21 index 5d8336b..0a88a1a 100644
22 --- a/sci-visualization/gwyddion/Manifest
23 +++ b/sci-visualization/gwyddion/Manifest
24 @@ -1,2 +1 @@
25 -DIST gwyddion-2.39.tar.xz 3130844 SHA256 f2346a706fa097e9186339f7e10b7837b20ce403b44bc7a85bc78b6b78a506d2 SHA512 5b9631c9eeb71a10d0be3533585eb61e8d27bc1147a1f3cf1ca333020271b579025ce752d302bd9474f1b3ed8c55ce679ac6a75bfb4a1093adef0727b824d435 WHIRLPOOL 90262b86d1bb01b6fdf5a67b447dc1177a523df368fbd040a87d7261e071844b86624dd6bb303c8a32302d16e5f7cb11e5f0744b2808e4f6d467cd27652efe23
26 DIST gwyddion-2.44.tar.xz 3517624 SHA256 e7ee7545770a276e78fdff1b51e547d5d0ba39b94995da91e0d6797122b7eda5 SHA512 c80a0e4e9dde2f669763629d34dacc0015770c4704a10fc820f4d8e75b4f4275852162653f0c6c52674ed76162861af860de6741466d939066bfea3fb584d2ff WHIRLPOOL 56f78efb477da520a65473ce6be9eff88897198e8a80e5971a2280755fdc61925405c0a464572cf7887689746d140eefc855562569919bc17e057f472ac0b597
27
28 diff --git a/sci-visualization/gwyddion/files/gwyddion-2.25-libpng15.patch b/sci-visualization/gwyddion/files/gwyddion-2.25-libpng15.patch
29 deleted file mode 100644
30 index f13eaa9..00000000
31 --- a/sci-visualization/gwyddion/files/gwyddion-2.25-libpng15.patch
32 +++ /dev/null
33 @@ -1,10 +0,0 @@
34 ---- modules/file/pixmap.c
35 -+++ modules/file/pixmap.c
36 -@@ -39,6 +39,7 @@
37 - #include <gtk/gtk.h>
38 -
39 - #ifdef HAVE_PNG
40 -+#include <zlib.h>
41 - #include <png.h>
42 - #endif
43 -
44
45 diff --git a/sci-visualization/gwyddion/files/gwyddion-2.30-BGRA.patch b/sci-visualization/gwyddion/files/gwyddion-2.30-BGRA.patch
46 deleted file mode 100644
47 index c3b5912..00000000
48 --- a/sci-visualization/gwyddion/files/gwyddion-2.30-BGRA.patch
49 +++ /dev/null
50 @@ -1,22 +0,0 @@
51 -Index: libgwydgets/gwy3dview.c
52 -===================================================================
53 ---- libgwydgets/gwy3dview.c (revision 13961)
54 -+++ libgwydgets/gwy3dview.c (working copy)
55 -@@ -48,7 +48,6 @@
56 - #include <GL/glext.h>
57 - #endif
58 - #endif
59 --#endif
60 -
61 - #ifndef GL_BGRA
62 - #ifdef GL_BGRA_EXT
63 -@@ -57,6 +56,7 @@
64 - #error FIXME: GL_BGRA is not available, should work around it.
65 - #endif
66 - #endif
67 -+#endif
68 -
69 - #include <libgwyddion/gwymacros.h>
70 - #include <libgwyddion/gwymath.h>
71 -
72 -
73
74 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
75 deleted file mode 100644
76 index e6ceedf..00000000
77 --- a/sci-visualization/gwyddion/files/gwyddion-2.30-color-button-debris-crash.patch
78 +++ /dev/null
79 @@ -1,37 +0,0 @@
80 -Index: modules/file/pixmap.c
81 -===================================================================
82 ---- modules/file/pixmap.c (revision 13902)
83 -+++ modules/file/pixmap.c (revision 13903)
84 -@@ -2933,8 +2933,6 @@
85 - gwy_rgba_to_gdk_color(&controls->args->inset_color, &gdkcolor);
86 -
87 - dialog = gtk_color_selection_dialog_new(_("Change Inset Color"));
88 -- if (gtk_major_version == 2 && gtk_minor_version < 10)
89 --
90 - selector = GTK_COLOR_SELECTION_DIALOG(dialog)->colorsel;
91 - gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(selector),
92 - &gdkcolor);
93 -Index: libgwydgets/gwygraphareadialog.c
94 -===================================================================
95 ---- libgwydgets/gwygraphareadialog.c (revision 13902)
96 -+++ libgwydgets/gwygraphareadialog.c (revision 13903)
97 -@@ -383,7 +383,6 @@
98 - dialog->color_dialog = selector;
99 - dialog->old_color = cmodel->color;
100 -
101 -- if (gtk_major_version == 2 && gtk_minor_version < 10)
102 - colorsel = GTK_COLOR_SELECTION_DIALOG(selector)->colorsel;
103 - g_signal_connect(selector, "response",
104 - G_CALLBACK(colorsel_response_cb), dialog);
105 -Index: libgwydgets/gwydgetutils.c
106 -===================================================================
107 ---- libgwydgets/gwydgetutils.c (revision 13902)
108 -+++ libgwydgets/gwydgetutils.c (revision 13903)
109 -@@ -561,7 +561,6 @@
110 - dialog = gtk_color_selection_dialog_new(dialog_title
111 - ? dialog_title
112 - : _("Change Mask Color"));
113 -- if (gtk_major_version == 2 && gtk_minor_version < 10)
114 - selector = GTK_COLOR_SELECTION_DIALOG(dialog)->colorsel;
115 - gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(selector),
116 - &gdkcolor);
117
118 diff --git a/sci-visualization/gwyddion/gwyddion-2.39.ebuild b/sci-visualization/gwyddion/gwyddion-2.39.ebuild
119 deleted file mode 100644
120 index 818e984..00000000
121 --- a/sci-visualization/gwyddion/gwyddion-2.39.ebuild
122 +++ /dev/null
123 @@ -1,90 +0,0 @@
124 -# Copyright 1999-2016 Gentoo Foundation
125 -# Distributed under the terms of the GNU General Public License v2
126 -# $Id$
127 -
128 -EAPI=5
129 -
130 -PYTHON_COMPAT=( python2_7 )
131 -AUTOTOOLS_IN_SOURCE_BUILD=1
132 -
133 -inherit autotools-utils fdo-mime gnome2-utils python-single-r1
134 -
135 -DESCRIPTION="Framework for Scanning Mode Microscopy data analysis"
136 -HOMEPAGE="http://gwyddion.net/"
137 -SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.xz"
138 -
139 -LICENSE="GPL-2"
140 -SLOT="0"
141 -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
142 -IUSE="doc fits fftw gnome kde nls opengl perl python ruby sourceview xml X"
143 -
144 -RDEPEND="
145 - media-libs/libpng:0
146 - x11-libs/cairo
147 - x11-libs/gtk+:2
148 - x11-libs/libXmu
149 - x11-libs/pango
150 - fits? ( sci-libs/cfitsio )
151 - fftw? ( sci-libs/fftw:3.0 )
152 - gnome? ( gnome-base/gconf:2 )
153 - kde? ( kde-frameworks/kdelibs:4 )
154 - opengl? ( virtual/opengl x11-libs/gtkglext )
155 - perl? ( dev-lang/perl )
156 - python? (
157 - ${PYTHON_DEPS}
158 - dev-python/pygtk:2[${PYTHON_USEDEP}]
159 - )
160 - ruby? ( dev-ruby/narray )
161 - sourceview? ( x11-libs/gtksourceview:2.0 )
162 - xml? ( dev-libs/libxml2:2 )"
163 -
164 -DEPEND="${RDEPEND}
165 - virtual/pkgconfig
166 - doc? ( dev-util/gtk-doc )
167 -"
168 -
169 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
170 -
171 -MAKEOPTS+=" V=1"
172 -
173 -pkg_setup() {
174 - use python && python-single-r1_pkg_setup
175 -}
176 -
177 -src_configure() {
178 - local myeconfargs=(
179 - --disable-rpath
180 - $(use_enable doc gtk-doc)
181 - $(use_enable nls)
182 - $(use_enable python pygwy)
183 - $(use_enable fits cfitsio)
184 - $(use_with perl)
185 - $(use_with python)
186 - $(use_with ruby)
187 - $(use_with fftw fftw3)
188 - $(use_with opengl gl) \
189 - $(use_with sourceview gtksourceview)
190 - $(use_with xml libxml2)
191 - $(use_with X x)
192 - $(use_with kde kde4-thumbnailer)
193 - )
194 - autotools-utils_src_configure
195 -}
196 -
197 -src_install() {
198 - autotools-utils_src_install
199 - use python && dodoc modules/pygwy/README.pygwy
200 -}
201 -
202 -pkg_postinst() {
203 - use gnome && gnome2_gconf_install
204 - fdo-mime_desktop_database_update
205 -}
206 -
207 -pkg_prerm() {
208 - use gnome && gnome2_gconf_uninstall
209 -}
210 -
211 -pkg_postrm() {
212 - fdo-mime_desktop_database_update
213 -}