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-mathematics/pspp/files/, sci-mathematics/pspp/
Date: Mon, 02 Jan 2017 22:09:16
Message-Id: 1483394944.3e4571238378271fe7d9b0b7b2e3aababc169991.jlec@gentoo
1 commit: 3e4571238378271fe7d9b0b7b2e3aababc169991
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 2 21:49:13 2017 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 2 22:09:04 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e457123
7
8 sci-mathematics/pspp: 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-mathematics/pspp/Manifest | 2 -
14 .../pspp/files/pspp-0.8.0-gettext.patch | 10 ---
15 sci-mathematics/pspp/files/pspp-0.8.1-oos.patch | 28 -------
16 .../pspp/files/pspp-0.8.1-underlinking.patch | 29 -------
17 sci-mathematics/pspp/pspp-0.8.1-r1.ebuild | 91 ----------------------
18 sci-mathematics/pspp/pspp-0.8.3.ebuild | 90 ---------------------
19 6 files changed, 250 deletions(-)
20
21 diff --git a/sci-mathematics/pspp/Manifest b/sci-mathematics/pspp/Manifest
22 index 2a524b4..3c578d0 100644
23 --- a/sci-mathematics/pspp/Manifest
24 +++ b/sci-mathematics/pspp/Manifest
25 @@ -1,4 +1,2 @@
26 DIST pspp-0.10.1.tar.gz 7269109 SHA256 44cc08864de736880bc0d7e2b1f8c8493ac0e0c2164a4f9471077608f00c8677 SHA512 a7f4eec3858340743ff845e67028af76d79a58968ceaa19a87e0443751917b2d70251e53231ecce15c937c9640ac733e00603baa76b4266d693375ab70b870b5 WHIRLPOOL 9a195051d5279a86cd05d586ca5a845443f08346f47aec859a3e768c38d5517f23f47d40cc6fb00c6af6c01af624d251575edfb34dfb0f7c7ee3def1a008a1c7
27 DIST pspp-0.10.2.tar.gz 7316470 SHA256 f77cacae6948689a60f1a5808a5d2e183c1cd0847c7fc6142646c63814c0daa9 SHA512 7d6656c03da46b088e87cba7a947d1e56031ff50d704be8201a38563515cf5cf324a05f1d4999ba8aec7b2269a8fdbd09374a11374c9c1b9dd6d78d34fda4b76 WHIRLPOOL f66f0ca98dce4de4b323aa42445d0c8fe3c7d252cd8ed6d1ad1dd961186bf063b9c92114a92e9afb2149b35c03fa595720c8a35b33ff81a56eb5e9e029c85119
28 -DIST pspp-0.8.1.tar.gz 6514528 SHA256 fd48145d2ff77c39f624e26bf3c9a5623c2afaee7c040675b06cb4ce57d31d62 SHA512 2df758b3a2d8eba724d84ce7d77a6c0bbe469a11b86a8eb4227ec12a4957f468e74b3af0f81c953d87403a962937eef2680979a21ceba4fe8b93b55252b84a18 WHIRLPOOL 5be6ebcecffc3d8a7da669ea49028307b784a5b8b5d8a510d0f9e82a3740800966da5390f8abc120b55c9c621850be906f7610f86404b92c994d9a72697d413d
29 -DIST pspp-0.8.3.tar.gz 6247760 SHA256 adb8de281098b0d8632a8f2ea2af6514100786cf946f07a3c268d4baff15316f SHA512 7645a2de09ed1d6f1a53900961791b64b9420f457278d19e62ca7dabdb02b01ee78cdab0efddae384dc7deff65f7c5256227538caed89537efa014437937a61c WHIRLPOOL cff5921acce8bb3654ab0d10d63c42af8d5a9745263f423900ee290a30f1748aff023739ba49fabca33517e3deaf3fb0513a5fac7d0cf50170ba4b870d0ededf
30
31 diff --git a/sci-mathematics/pspp/files/pspp-0.8.0-gettext.patch b/sci-mathematics/pspp/files/pspp-0.8.0-gettext.patch
32 deleted file mode 100644
33 index 73fb8dc..00000000
34 --- a/sci-mathematics/pspp/files/pspp-0.8.0-gettext.patch
35 +++ /dev/null
36 @@ -1,10 +0,0 @@
37 ---- configure.ac.orig 2013-08-06 10:18:37.329909242 -0700
38 -+++ configure.ac 2013-08-06 10:18:51.011975942 -0700
39 -@@ -30,6 +30,7 @@
40 -
41 - dnl Disable automatic po/ support, because PSPP provides its own po/ support.
42 - AC_PROVIDE([AM_PO_SUBDIRS])
43 -+AM_GNU_GETTEXT_VERSION([0.17])
44 - AM_GNU_GETTEXT([external], [need-ngettext])
45 - LIBS="$LIBINTL $LIBS"
46 -
47
48 diff --git a/sci-mathematics/pspp/files/pspp-0.8.1-oos.patch b/sci-mathematics/pspp/files/pspp-0.8.1-oos.patch
49 deleted file mode 100644
50 index 51612b9..00000000
51 --- a/sci-mathematics/pspp/files/pspp-0.8.1-oos.patch
52 +++ /dev/null
53 @@ -1,28 +0,0 @@
54 - src/ui/gui/automake.mk | 8 ++++----
55 - 1 file changed, 4 insertions(+), 4 deletions(-)
56 -
57 -diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
58 -index 47a3215..24f5b0b 100644
59 ---- a/src/ui/gui/automake.mk
60 -+++ b/src/ui/gui/automake.mk
61 -@@ -333,16 +333,16 @@ PHONY += yelp-check
62 - AM_CPPFLAGS += -Isrc
63 -
64 - src/ui/gui/pspp.desktop: src/ui/gui/gen-dot-desktop.sh $(POFILES)
65 -- POFILES="$(POFILES)" top_builddir="$(top_builddir)" $(SHELL) $< > $@
66 -+ POFILES="$(POFILES)" top_builddir="$(top_builddir)" $(SHELL) $< > ${top_srcdir}/$@
67 -
68 - CLEANFILES+=src/ui/gui/pspp.desktop
69 -
70 - src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list
71 -- echo '#include <config.h>' > $@
72 -- $(GLIB_GENMARSHAL) --body --prefix=psppire_marshal $? >> $@
73 -+ echo '#include <config.h>' > ${top_srcdir}/$@
74 -+ $(GLIB_GENMARSHAL) --body --prefix=psppire_marshal $? >> ${top_srcdir}/$@
75 -
76 - src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list
77 -- $(GLIB_GENMARSHAL) --header --prefix=psppire_marshal $? > $@
78 -+ $(GLIB_GENMARSHAL) --header --prefix=psppire_marshal $? > ${top_srcdir}/$@
79 -
80 - desktopdir = $(datadir)/applications
81 - desktop_DATA = src/ui/gui/pspp.desktop
82
83 diff --git a/sci-mathematics/pspp/files/pspp-0.8.1-underlinking.patch b/sci-mathematics/pspp/files/pspp-0.8.1-underlinking.patch
84 deleted file mode 100644
85 index 2c533ee..00000000
86 --- a/sci-mathematics/pspp/files/pspp-0.8.1-underlinking.patch
87 +++ /dev/null
88 @@ -1,29 +0,0 @@
89 - src/automake.mk | 5 +++--
90 - 1 file changed, 3 insertions(+), 2 deletions(-)
91 -
92 -diff --git a/src/automake.mk b/src/automake.mk
93 -index 73ff813..8524000 100644
94 ---- a/src/automake.mk
95 -+++ b/src/automake.mk
96 -@@ -20,7 +20,7 @@ src_libpspp_core_la_LIBADD = \
97 - src/data/libdata.la \
98 - src/libpspp/liblibpspp.la \
99 - $(LIBXML2_LIBS) $(PG_LIBS) \
100 -- gl/libgl.la
101 -+ gl/libgl.la $(CAIRO_LIBS)
102 -
103 - src_libpspp_la_SOURCES =
104 -
105 -@@ -28,10 +28,11 @@ src_libpspp_la_CFLAGS = $(GSL_CFLAGS)
106 - src_libpspp_la_LDFLAGS = -release $(VERSION)
107 -
108 - src_libpspp_la_LIBADD = \
109 -+ src/libpspp-core.la \
110 - src/language/liblanguage.la \
111 - src/math/libpspp-math.la \
112 - src/output/liboutput.la \
113 -- $(GSL_LIBS)
114 -+ $(GSL_LIBS) $(CAIRO_LIBS) $(LIBXML2_LIBS)
115 -
116 - include $(top_srcdir)/src/math/automake.mk
117 - include $(top_srcdir)/src/output/automake.mk
118
119 diff --git a/sci-mathematics/pspp/pspp-0.8.1-r1.ebuild b/sci-mathematics/pspp/pspp-0.8.1-r1.ebuild
120 deleted file mode 100644
121 index 194c4cc..00000000
122 --- a/sci-mathematics/pspp/pspp-0.8.1-r1.ebuild
123 +++ /dev/null
124 @@ -1,91 +0,0 @@
125 -# Copyright 1999-2016 Gentoo Foundation
126 -# Distributed under the terms of the GNU General Public License v2
127 -# $Id$
128 -
129 -EAPI=5
130 -
131 -AUTOTOOLS_AUTORECONF=1
132 -
133 -inherit eutils elisp-common autotools-utils multilib
134 -
135 -DESCRIPTION="Program for statistical analysis of sampled data"
136 -HOMEPAGE="https://www.gnu.org/software/pspp/pspp.html"
137 -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
138 -
139 -LICENSE="GPL-3"
140 -SLOT="0"
141 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
142 -IUSE="cairo doc emacs examples gtk ncurses nls perl postgres static-libs"
143 -
144 -RDEPEND="
145 - dev-libs/libxml2:2
146 - sci-libs/gsl
147 - sys-devel/gettext
148 - sys-libs/readline:0
149 - sys-libs/zlib
150 - virtual/libiconv
151 - cairo? ( x11-libs/cairo )
152 - emacs? ( virtual/emacs )
153 - gtk? (
154 - gnome-base/libglade:2.0
155 - x11-libs/gtk+:2
156 - >=x11-libs/gtksourceview-2.2:2.0 )
157 - ncurses? ( sys-libs/ncurses:0= )
158 - postgres? ( dev-db/postgresql:*[server] )"
159 -DEPEND="${RDEPEND}
160 - virtual/pkgconfig
161 - doc? ( virtual/latex-base )"
162 -
163 -SITEFILE=50${PN}-gentoo.el
164 -
165 -PATCHES=(
166 - "${FILESDIR}"/${PN}-0.8.0-gettext.patch
167 - "${FILESDIR}"/${P}-underlinking.patch
168 - "${FILESDIR}"/${P}-oos.patch
169 -)
170 -
171 -src_configure() {
172 - local myeconfargs=(
173 - --disable-rpath
174 - $(use_enable nls)
175 - $(use_with cairo)
176 - $(use_with gtk gui)
177 - $(use_with ncurses libncurses)
178 - $(use_with perl perl-module)
179 - $(use_with postgres libpq)
180 - )
181 - autotools-utils_src_configure
182 -}
183 -
184 -src_compile() {
185 - autotools-utils_src_compile pkglibdir="${EPREFIX}/usr/$(get_libdir)"
186 - use doc && autotools-utils_src_compile html pdf
187 - use emacs && elisp-compile *.el
188 -}
189 -
190 -src_install() {
191 - if use doc; then
192 - HTML_DOCS=( "${BUILD_DIR}"/doc/pspp{,-dev}.html )
193 - DOCS=( "${BUILD_DIR}"/doc/pspp{,-dev}.pdf )
194 - fi
195 -
196 - autotools-utils_src_install pkglibdir="${EPREFIX}/usr/$(get_libdir)"
197 -
198 - if use examples; then
199 - insinto /usr/share/doc/${PF}
200 - doins -r examples
201 - fi
202 -
203 - if use emacs; then
204 - elisp-install ${PN} *.el *.elc
205 - elisp-site-file-install "${FILESDIR}/${SITEFILE}"
206 - fi
207 -}
208 -
209 -pkg_postinst () {
210 - use emacs && elisp-site-regen
211 -}
212 -
213 -pkg_postrm() {
214 - use emacs && elisp-site-regen
215 -}
216
217 diff --git a/sci-mathematics/pspp/pspp-0.8.3.ebuild b/sci-mathematics/pspp/pspp-0.8.3.ebuild
218 deleted file mode 100644
219 index d240075..00000000
220 --- a/sci-mathematics/pspp/pspp-0.8.3.ebuild
221 +++ /dev/null
222 @@ -1,90 +0,0 @@
223 -# Copyright 1999-2016 Gentoo Foundation
224 -# Distributed under the terms of the GNU General Public License v2
225 -# $Id$
226 -
227 -EAPI=5
228 -
229 -AUTOTOOLS_AUTORECONF=1
230 -
231 -inherit eutils elisp-common autotools-utils multilib
232 -
233 -DESCRIPTION="Program for statistical analysis of sampled data"
234 -HOMEPAGE="https://www.gnu.org/software/pspp/pspp.html"
235 -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
236 -
237 -LICENSE="GPL-3"
238 -SLOT="0/${PV}"
239 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
240 -IUSE="cairo doc emacs examples gtk ncurses nls perl postgres static-libs"
241 -
242 -RDEPEND="
243 - dev-libs/libxml2:2=
244 - sci-libs/gsl:0=
245 - sys-devel/gettext:0=
246 - sys-libs/readline:0=
247 - sys-libs/zlib:0=
248 - virtual/libiconv
249 - cairo? ( x11-libs/cairo:0= )
250 - emacs? ( virtual/emacs )
251 - gtk? (
252 - gnome-base/libglade:2.0
253 - x11-libs/gtk+:2
254 - >=x11-libs/gtksourceview-2.2:2.0 )
255 - ncurses? ( sys-libs/ncurses:0= )
256 - postgres? ( dev-db/postgresql:=[server] )"
257 -DEPEND="${RDEPEND}
258 - virtual/pkgconfig
259 - doc? ( virtual/latex-base )"
260 -
261 -SITEFILE=50${PN}-gentoo.el
262 -
263 -PATCHES=(
264 - "${FILESDIR}"/${PN}-0.8.0-gettext.patch
265 - "${FILESDIR}"/${PN}-0.8.1-underlinking.patch
266 - "${FILESDIR}"/${PN}-0.8.1-oos.patch
267 -)
268 -
269 -src_configure() {
270 - local myeconfargs=(
271 - $(use_enable nls)
272 - $(use_with cairo)
273 - $(use_with gtk gui)
274 - $(use_with ncurses libncurses)
275 - $(use_with perl perl-module)
276 - $(use_with postgres libpq)
277 - )
278 - autotools-utils_src_configure
279 -}
280 -
281 -src_compile() {
282 - autotools-utils_src_compile pkglibdir="${EPREFIX}/usr/$(get_libdir)"
283 - use doc && autotools-utils_src_compile html pdf
284 - use emacs && elisp-compile *.el
285 -}
286 -
287 -src_install() {
288 - if use doc; then
289 - HTML_DOCS=( "${BUILD_DIR}"/doc/pspp{,-dev}.html )
290 - DOCS=( "${BUILD_DIR}"/doc/pspp{,-dev}.pdf )
291 - fi
292 -
293 - autotools-utils_src_install pkglibdir="${EPREFIX}/usr/$(get_libdir)"
294 -
295 - if use examples; then
296 - insinto /usr/share/doc/${PF}
297 - doins -r examples
298 - fi
299 -
300 - if use emacs; then
301 - elisp-install ${PN} *.el *.elc
302 - elisp-site-file-install "${FILESDIR}/${SITEFILE}"
303 - fi
304 -}
305 -
306 -pkg_postinst () {
307 - use emacs && elisp-site-regen
308 -}
309 -
310 -pkg_postrm() {
311 - use emacs && elisp-site-regen
312 -}