Added a patch for GTK (bug #358433) from upstream. Disabled all date tests. Added static-libs flag.

(Portage version: 2.1.9.43/cvs/Linux x86_64)

3 files changed, 151 insertions, 1 deletions

diff --git a/sci-mathematics/pspp/ChangeLog b/sci-mathematics/pspp/ChangeLog
index 1090c3129f73..0c74e389832d 100644
--- a/sci-mathematics/pspp/ChangeLog
+++ b/sci-mathematics/pspp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/pspp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pspp/ChangeLog,v 1.15 2011/03/07 12:53:38 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pspp/ChangeLog,v 1.16 2011/03/15 21:27:31 bicatali Exp $
+
+*pspp-0.6.2-r1 (15 Mar 2011)
+
+  15 Mar 2011; Sébastien Fabbro <bicatali@gentoo.org> +pspp-0.6.2-r1.ebuild,
+  +files/pspp-0.6.2-gtk.patch:
+  Added a patch for GTK (bug #358433) from upstream. Disabled all date tests.
+  Added static-libs flag.
 
   07 Mar 2011; Justin Lecher <jlec@gentoo.org> pspp-0.6.2.ebuild:
   Correct Slots for gtk 3 introduction to tree
diff --git a/sci-mathematics/pspp/files/pspp-0.6.2-gtk.patch b/sci-mathematics/pspp/files/pspp-0.6.2-gtk.patch
new file mode 100644
index 000000000000..2dbb37c4fb3a
--- /dev/null
+++ b/sci-mathematics/pspp/files/pspp-0.6.2-gtk.patch
@@ -0,0 +1,56 @@
+--- a/lib/gtksheet/gtkitementry.c
++++ b/lib/gtksheet/gtkitementry.c
+@@ -145,7 +145,7 @@ static void         gtk_entry_draw_cursor              (GtkEntry       *entry,
+ static PangoLayout *gtk_entry_ensure_layout            (GtkEntry       *entry,
+                                                         gboolean        include_preedit);
+ static void         gtk_entry_queue_draw               (GtkEntry       *entry);
+-static void         gtk_entry_reset_im_context         (GtkEntry       *entry);
++static void         pspp_gtk_entry_reset_im_context    (GtkEntry       *entry);
+ static void         gtk_entry_recompute                (GtkEntry       *entry);
+ static void         gtk_entry_get_cursor_locations     (GtkEntry       *entry,
+							CursorType      type,
+@@ -694,7 +694,7 @@ gtk_entry_real_set_position (GtkEditable *editable,
+   if (position != entry->current_pos ||
+       position != entry->selection_bound)
+     {
+-      gtk_entry_reset_im_context (entry);
++      pspp_gtk_entry_reset_im_context (entry);
+       gtk_entry_set_positions (entry, position, position);
+     }
+ }
+@@ -895,7 +895,7 @@ gtk_entry_move_cursor (GtkEntry       *entry,
+ {
+   gint new_pos = entry->current_pos;
+ 
+-  gtk_entry_reset_im_context (entry);
++  pspp_gtk_entry_reset_im_context (entry);
+ 
+   if (entry->current_pos != entry->selection_bound && !extend_selection)
+     {
+@@ -989,7 +989,7 @@ gtk_entry_insert_at_cursor (GtkEntry    *entry,
+ 
+   if (entry->editable)
+     {
+-      gtk_entry_reset_im_context (entry);
++      pspp_gtk_entry_reset_im_context (entry);
+ 
+       gtk_editable_insert_text (editable, str, -1, &pos);
+       gtk_editable_set_position (editable, pos);
+@@ -1005,7 +1005,7 @@ gtk_entry_delete_from_cursor (GtkEntry       *entry,
+   gint start_pos = entry->current_pos;
+   gint end_pos = entry->current_pos;
+ 
+-  gtk_entry_reset_im_context (entry);
++  pspp_gtk_entry_reset_im_context (entry);
+ 
+   if (!entry->editable)
+     return;
+@@ -1777,7 +1777,7 @@ gtk_entry_queue_draw (GtkEntry *entry)
+ }
+ 
+ static void
+-gtk_entry_reset_im_context (GtkEntry *entry)
++pspp_gtk_entry_reset_im_context (GtkEntry *entry)
+ {
+   if (entry->need_im_reset)
+     {
diff --git a/sci-mathematics/pspp/pspp-0.6.2-r1.ebuild b/sci-mathematics/pspp/pspp-0.6.2-r1.ebuild
new file mode 100644
index 000000000000..1d046dec4555
--- /dev/null
+++ b/sci-mathematics/pspp/pspp-0.6.2-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pspp/pspp-0.6.2-r1.ebuild,v 1.1 2011/03/15 21:27:31 bicatali Exp $
+
+EAPI=4
+inherit eutils elisp-common autotools
+
+DESCRIPTION="Program for statistical analysis of sampled data."
+HOMEPAGE="http://www.gnu.org/software/pspp/pspp.html"
+SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.gz"
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc emacs gtk ncurses nls plotutils postgres static-libs"
+
+RDEPEND="sci-libs/gsl
+	sys-libs/readline
+	sys-devel/gettext
+	virtual/libiconv
+	sys-libs/zlib
+	dev-libs/libxml2:2
+	emacs? ( virtual/emacs )
+	gtk? ( x11-libs/gtk+:2 gnome-base/libglade:2.0 )
+	ncurses? ( sys-libs/ncurses )
+	plotutils? ( media-libs/plotutils )
+	postgres? ( dev-db/postgresql-server )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( virtual/latex-base )"
+
+SITEFILE=50${PN}-gentoo.el
+
+src_prepare() {
+	# this patch is hacky, but should not be needed for 0.7
+	epatch "${FILESDIR}"/${PN}-0.6.0-as-needed.patch
+	epatch "${FILESDIR}"/${PN}-0.6.2-no-test-pgsql.patch
+	epatch "${FILESDIR}"/${PN}-0.6.2-gtk.patch
+	sed -i \
+		-e '/xdate/d' \
+		-e '/datediff/d' \
+		tests/expressions/expressions.sh || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-rpath \
+		$(use_enable nls) \
+		$(use_enable static-libs static) \
+		$(use_with gtk gui) \
+		$(use_with ncurses libncurses) \
+		$(use_with plotutils libplot) \
+		$(use_with postgres libpq)
+}
+
+src_compile() {
+	emake pkglibdir="${EPREFIX}/usr/$(get_libdir)"
+	use doc && emake html && emake pdf
+	use emacs && elisp-compile *.el
+}
+
+src_install() {
+	emake pkglibdir="${EPREFIX}/usr/$(get_libdir)" DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog NEWS ONEWS README THANKS TODO
+	insinto /usr/share/doc/${PF}
+	doins -r examples
+	if use doc; then
+		doins -r doc/pspp.html doc/pspp-dev.html
+		doins doc/pspp.pdf doc/pspp-dev.pdf
+	fi
+	if use emacs; then
+		elisp-install ${PN} *.el *.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+	if use gtk; then
+		doicon src/ui/gui/${PN}icon.png
+		make_desktop_entry psppire psppire ${PN}icon
+	fi
+}
+
+pkg_postinst () {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}