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

Package-Manager: portage-2.1.9.43/cvs/Linux x86_64

4 files changed, 157 insertions, 5 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/Manifest b/sci-mathematics/pspp/Manifest
index 3bd1909556a1..8684ba09bd0c 100644
--- a/sci-mathematics/pspp/Manifest
+++ b/sci-mathematics/pspp/Manifest
@@ -3,15 +3,17 @@ Hash: SHA1
 
 AUX 50pspp-gentoo.el 171 RMD160 99882e34577c8209dafcd422e210af596bde5057 SHA1 c611390e4c21388b70d29dbc2a9a6f5eba41d8c2 SHA256 92296e81ab389b4c639a67cd015e19d63cf8e40664a95fc568c2c6b6e7608940
 AUX pspp-0.6.0-as-needed.patch 380 RMD160 320cd0f8d8ba96b0c8dfe8d745a49e45947f6e90 SHA1 2bfd20030a9702c6b2dff5e1f209995db0bd3d0a SHA256 4461de6c4109d85e7ec77d626bb39ac2ece904200412b77202184659bca048fc
+AUX pspp-0.6.2-gtk.patch 2166 RMD160 ddee329ca9f279ee0a245beb6ecdce4b55e1a182 SHA1 e41eb840dd4c64153dc737eac826729f792c7305 SHA256 6b983930e4081400b545f20e8109ee5b4137da229b587b56846bca1da4c125ef
 AUX pspp-0.6.2-no-test-pgsql.patch 388 RMD160 24cdc8ed39c74320f38c939731b4984befc4e121 SHA1 2c86a33c009e4c69975121db20524638059126c3 SHA256 70de6b53d9d82c478c82e8d44a9c0d2aca451792df92ea23c8931036a61e9512
 DIST pspp-0.6.2.tar.gz 3375748 RMD160 97667eb32b23a1bc7d18b7022649bd973ff01424 SHA1 c45f721a7ee82aede2106b77eade5e568c0930da SHA256 ec9639a3dcd3663b8007e600ab1a56291214334a9bba2e8d8c5a314509826385
+EBUILD pspp-0.6.2-r1.ebuild 2257 RMD160 9e7457682cfe74ad36e48383d242f1c28406475a SHA1 a4cb5e6a5edfa0b1207aa4f7da5feaaf3552eafb SHA256 421c464a0c09dcec23757ed6dc8a75049853b2c1561d432fc71e5e13af82e476
 EBUILD pspp-0.6.2.ebuild 2184 RMD160 25929abfcaeeb684bf6ca606bf1bc83fd25e672c SHA1 49a42f0890cf0cb691fb50a5f7fc49a709f40aad SHA256 c26deac522e8e26aa03ec24b4994f0a10624c6a16aa8b2ec4341ec0829b0b575
-MISC ChangeLog 2798 RMD160 fcb60ecdf90275453a8e5b2a65b4f0298e9c7223 SHA1 b5499a5fbdd70d2e243004b268781602973c3abb SHA256 8bc1a5ac2aea2c405a7822bb4fd805ed2ea4dc7b64b6b6d72169918fdf58264d
+MISC ChangeLog 3046 RMD160 ccc728ca3addb41efb4055fea79d4fc8d70d31fb SHA1 9ef3c583cef705264b7c7d33cd6377089308a63b SHA256 e456bbb6f5b7116a935771870fd98689116e3772689c5b77366baee75f595c5f
 MISC metadata.xml 603 RMD160 998f5cb118b3d461022936e556f7fee5894a37ea SHA1 4b355244b8a333e4b6b91abed55c619c41dd4f61 SHA256 699bb5fc8c9db7ef70683c986f3f120d541098edbf7a190f6f7becb13f52d436
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk101VoACgkQgAnW8HDreRbKAgCfRctDqzVB0ZHGVaGpkC0l7X90
-uvYAoLdU+DpdJNCIobNnib70h2xwnb8Z
-=c5+B
+iEYEARECAAYFAk1/2h4ACgkQ1ycZbhPLE2CoMQCfWAwcRoQ6qli5gJr3UTHRb+oe
+gXQAniAQY2Pq0e9zDXDe4g5LS9XVGWA4
+=fP3G
 -----END PGP SIGNATURE-----
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
+}