Disabling postgres test, bad server starting

Package-Manager: portage-2.2_rc86/cvs/Linux x86_64

4 files changed, 29 insertions, 91 deletions

diff --git a/sci-mathematics/pspp/Manifest b/sci-mathematics/pspp/Manifest
index 75ed7d37f116..c0a778af77f7 100644
--- a/sci-mathematics/pspp/Manifest
+++ b/sci-mathematics/pspp/Manifest
@@ -1,8 +1,17 @@
+-----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
-DIST pspp-0.6.1.tar.gz 3217033 RMD160 930fc58b77ff50819cd7449147dab5906e872850 SHA1 22f335053a3e1d3861bfc2d87536b9a6fc5a1ae7 SHA256 0d3154ea4f723a354b3b845c938a2320d726baf900b6d2f9bda3d88bcf097e01
+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.1.ebuild 2131 RMD160 08f2ca6dd639a29d9e18eb56b1ac04d4efc2b42e SHA1 374f15aa8a6a3c130dbba4ca983eb003815df3a8 SHA256 cad5be3cb7a383f856dff1b21c649689c214ca85a84346b0cfacbcf0d917b715
-EBUILD pspp-0.6.2.ebuild 2131 RMD160 565e809fa7cc17738a5e123a840d594b80b2e303 SHA1 14da9c3a5954a5c74742683e9388288bd5639e46 SHA256 5f7d4e14be494c25ca7af1175d4cb14e37c84e11b655213800be52b0f9f58b34
+EBUILD pspp-0.6.2.ebuild 2186 RMD160 15bd37adb9f85469173dad74004a05cbb32ef56d SHA1 5a3d821b91a73aeb3821d4d58615ff06911d78d5 SHA256 5dad42f8fd1f54d0395c89313e29a347d0c82a42d682ee49d898ec8b0321fdef
 MISC ChangeLog 2459 RMD160 85dc3131bfbd8b50dfa3a26a61eb4aa540526394 SHA1 d4675e2cf1324604d7ac7ef8e10ba474f6d7439d SHA256 4366c364dfba95bb698ac099810fec34d49419750dad6346ff3f957766aadab9
 MISC metadata.xml 603 RMD160 998f5cb118b3d461022936e556f7fee5894a37ea SHA1 4b355244b8a333e4b6b91abed55c619c41dd4f61 SHA256 699bb5fc8c9db7ef70683c986f3f120d541098edbf7a190f6f7becb13f52d436
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkyi0aMACgkQ1ycZbhPLE2AAYQCdG32/k8I+81sHtB5XUeXmWXLW
+XLsAn2icoxjGTEWK8qlSXg1egR0t2FRd
+=eE57
+-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/pspp/files/pspp-0.6.2-no-test-pgsql.patch b/sci-mathematics/pspp/files/pspp-0.6.2-no-test-pgsql.patch
new file mode 100644
index 000000000000..90a330c9f8ec
--- /dev/null
+++ b/sci-mathematics/pspp/files/pspp-0.6.2-no-test-pgsql.patch
@@ -0,0 +1,15 @@
+--- tests/automake.mk.orig	2010-09-29 06:36:55.000000000 +0100
++++ tests/automake.mk	2010-09-29 06:37:20.000000000 +0100
+@@ -161,9 +161,9 @@
+ dist_TESTS += tests/command/get-data-gnm.sh 
+ endif
+ 
+-if PSQL_SUPPORT
+-dist_TESTS += tests/command/get-data-psql.sh 
+-endif
++#if PSQL_SUPPORT
++#dist_TESTS += tests/command/get-data-psql.sh 
++#endif
+ 
+ nodist_TESTS = \
+ 	tests/libpspp/abt-test \
diff --git a/sci-mathematics/pspp/pspp-0.6.1.ebuild b/sci-mathematics/pspp/pspp-0.6.1.ebuild
deleted file mode 100644
index ec11a92d11fe..000000000000
--- a/sci-mathematics/pspp/pspp-0.6.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2010 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.3 2010/06/17 21:58:57 patrick 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? ( 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
-	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
-	fi
-}
-
-pkg_postinst () {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/pspp/pspp-0.6.2.ebuild b/sci-mathematics/pspp/pspp-0.6.2.ebuild
index 6c4314f27cd5..d6108558621f 100644
--- a/sci-mathematics/pspp/pspp-0.6.2.ebuild
+++ b/sci-mathematics/pspp/pspp-0.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.ebuild,v 1.3 2010/06/17 21:58:57 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pspp/pspp-0.6.2.ebuild,v 1.4 2010/09/29 05:41:18 bicatali Exp $
 
 EAPI=2
 inherit eutils elisp-common autotools
@@ -34,6 +34,7 @@ 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
 	eautoreconf
 }