Version bump, more complete doc installation, added missing dependencies and fix for crashing GUI, bug #244631

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.25-gentoo-r7 x86_64

4 files changed, 116 insertions, 10 deletions

diff --git a/sci-mathematics/pspp/ChangeLog b/sci-mathematics/pspp/ChangeLog
index 8d2d08e269aa..47d75294fea5 100644
--- a/sci-mathematics/pspp/ChangeLog
+++ b/sci-mathematics/pspp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/pspp
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pspp/ChangeLog,v 1.8 2008/10/28 13:36:24 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pspp/ChangeLog,v 1.9 2008/10/28 16:47:32 bicatali Exp $
+
+*pspp-0.6.1 (28 Oct 2008)
+
+  28 Oct 2008; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml,
+  +pspp-0.6.1.ebuild:
+  Version bump, more complete doc installation, added missing dependencies
+  and fix for crashing GUI, bug #244631
 
   28 Oct 2008; Markus Dittrich <markusle@gentoo.org>
   +files/pspp-0.6.0-as-needed.patch, pspp-0.6.0.ebuild:
diff --git a/sci-mathematics/pspp/Manifest b/sci-mathematics/pspp/Manifest
index 203b1a9a63e3..bfe81ecc3e9e 100644
--- a/sci-mathematics/pspp/Manifest
+++ b/sci-mathematics/pspp/Manifest
@@ -1,9 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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.0-disable-inline.patch 4390 RMD160 08daa6269532ed88ea50556f4e71050d50e94ec1 SHA1 80e643c71fee35deaf8881d76de3f5d307531bbd SHA256 3e8ff92284452805c3663677825b93e3c54970131f1a24a25f821a04e10de602
 DIST pspp-0.4.0.tar.gz 1566807 RMD160 28c52e4ee530c80acf37d7cbea4e45aaefc11f7c SHA1 382c76ccbc62f881e439c38095b1f520b2627706 SHA256 b19403e15848ad0f0b393ed4e52beeb236fd4badfdfa63fe3e680f9cc683ca24
 DIST pspp-0.6.0.tar.gz 2872929 RMD160 889745e4b423845f0d87cdfb38004320475dff49 SHA1 b6a89d758a39c9c53803a8b44d73899e9219e33c SHA256 8c85ada08e2133846efc221d88b6b3abd9a525587b1630b246a1887120d0804e
+DIST pspp-0.6.1.tar.gz 3217033 RMD160 930fc58b77ff50819cd7449147dab5906e872850 SHA1 22f335053a3e1d3861bfc2d87536b9a6fc5a1ae7 SHA256 0d3154ea4f723a354b3b845c938a2320d726baf900b6d2f9bda3d88bcf097e01
 EBUILD pspp-0.4.0.ebuild 1561 RMD160 ae630b5c06d8a71298989324abcf9940a4198a30 SHA1 11e558cbcb64ca0177dd697ed6939fef0eb2a4f3 SHA256 ca99d27287852a124773006228fba4075bcb7214fb107e2fcfaa726554cd6f4a
 EBUILD pspp-0.6.0.ebuild 1873 RMD160 681898adf6e7a396904a9201c0ba3cf8beab76c6 SHA1 8a1dfcd2e14b82ad12cf28a77d7bfbf8da393cb0 SHA256 2bd9599e2faf08e59767f0aa1d27c14229837b652dd8e8ddf255b80a970c016e
-MISC ChangeLog 1570 RMD160 ed6672dd6e25abab54cceadd471e1f52fc5c1f11 SHA1 84b0f2a26c9973b32c25170dc12ab562e62df318 SHA256 b6dde0ecbb2dadce37e55bea34175dc1592838357cd9c4740f8ce3320dd360ca
-MISC metadata.xml 640 RMD160 bd10b34d9d13a88fd4d6ccda59b639a1131f8663 SHA1 80ea127c3ab4083e65366122c7fa089c9e0c0948 SHA256 e0d565e2178f3d573a230584f89940fb03fdb064e24b9c8722636d2c6f38a860
+EBUILD pspp-0.6.1.ebuild 2137 RMD160 a277df836770c804a81d0e24d79257f0d8ef0f88 SHA1 acb039d6e137b9a22f5821cc43ec7da429a4d3bc SHA256 4e55c46fdf30140e1d5dce4891dc3833cc8d8a239c5bf16d3a660c3601666fb1
+MISC ChangeLog 1804 RMD160 de459778164525166c20f8e489338e6484ee0332 SHA1 5090f11f1a829a0aa4c4d0e0c5f3df8941596b63 SHA256 91eb6b6c7a3710aeba6916d6208eae9e537cb7549fe3cc50a3befd8797d74056
+MISC metadata.xml 669 RMD160 f78d8eecfa8c0c6eeeba128d0e786e2e238428dd SHA1 69025e35fb2ffc6d3f35a3d65eac6a439f009237 SHA256 15beac03ebd2c832c9af62a5b45f5af109582566a8b75737cdf8654c9bb729ca
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkkHQi8ACgkQ1ycZbhPLE2CSHQCfTrjBU4pCtRuMOCCYvt8crN//
+BLgAn11oKOptCJSVTp3FnBuD3bHAaWnV
+=0tNy
+-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/pspp/metadata.xml b/sci-mathematics/pspp/metadata.xml
index 329287f962a1..cf11e8ce1105 100644
--- a/sci-mathematics/pspp/metadata.xml
+++ b/sci-mathematics/pspp/metadata.xml
@@ -3,14 +3,14 @@
 <pkgmetadata>
 <herd>sci-mathematics</herd>
 <longdescription lang="en">
-PSPP is a program for statistical analysis of sampled data. It
-interprets commands in the SPSS language and produces tabular and
-graphical output in ASCII, HTML, or PostScript format.
-PSPP supports a large subset of SPSS's transformation language. Its
-statistical procedure support is limited but growing.	
-PSPP has both text-based and graphical user interfaces.
+  PSPP is a program for statistical analysis of sampled data. It
+  interprets commands in the SPSS language and produces tabular and
+  graphical output in ASCII, HTML, or PostScript format.
+  PSPP supports a large subset of SPSS's transformation language. Its
+  statistical procedure support is limited but growing.	
+  PSPP has both text-based and a GTK+ based graphical user interfaces.
 </longdescription>
 <use>
-  <flag name='psppire'>Enable psppire GUI</flag>
+  <flag name='psppire'>Enable GTK psppire GUI</flag>
 </use>
 </pkgmetadata>
diff --git a/sci-mathematics/pspp/pspp-0.6.1.ebuild b/sci-mathematics/pspp/pspp-0.6.1.ebuild
new file mode 100644
index 000000000000..7a1494c54bec
--- /dev/null
+++ b/sci-mathematics/pspp/pspp-0.6.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pspp/pspp-0.6.1.ebuild,v 1.1 2008/10/28 16:47:32 bicatali Exp $
+
+EAPI=2
+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"
+
+RDEPEND="sci-libs/gsl
+	sys-libs/readline
+	sys-devel/gettext
+	virtual/libiconv
+	sys-libs/zlib
+	dev-libs/libxml2
+	emacs? ( virtual/emacs )
+	gtk? ( >=x11-libs/gtk+-2.12 gnome-base/libglade )
+	ncurses? ( sys-libs/ncurses )
+	plotutils? ( media-libs/plotutils )
+	postgres? ( virtual/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
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-rpath \
+		$(use_enable nls) \
+		$(use_with gtk gui) \
+		$(use_with ncurses libncurses) \
+		$(use_with plotutils libplot) \
+		$(use_with postgres libpq)
+}
+
+src_compile() {
+	emake pkglibdir=/usr/$(get_libdir) || die "emake failed"
+	if use doc; then
+		emake html || die "emake html failed"
+		emake pdf || die "emake pdf failed"
+	fi
+	use emacs && elisp-compile *.el
+}
+
+src_install() {
+	emake pkglibdir=/usr/$(get_libdir) DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS ChangeLog NEWS ONEWS README THANKS TODO
+	insinto /usr/share/doc/${PF}
+	doins -r examples || die
+
+	if use doc; then
+		doins -r doc/pspp.html doc/pspp-dev.html || die
+		doins doc/pspp.pdf doc/pspp-dev.pdf || die
+	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.png
+	fi
+}
+
+pkg_postinst () {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}