Version bump

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

8 files changed, 39 insertions, 220 deletions

diff --git a/sci-mathematics/pspp/ChangeLog b/sci-mathematics/pspp/ChangeLog
index 6162e7b97f8a..f3b4ae184617 100644
--- a/sci-mathematics/pspp/ChangeLog
+++ b/sci-mathematics/pspp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-mathematics/pspp
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pspp/ChangeLog,v 1.28 2013/10/31 15:47:52 bicatali Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pspp/ChangeLog,v 1.29 2014/05/28 17:01:25 bicatali Exp $
+
+*pspp-0.8.3 (28 May 2014)
+
+  28 May 2014; Sébastien Fabbro <bicatali@gentoo.org> +pspp-0.8.3.ebuild,
+  -files/pspp-0.6.0-as-needed.patch, -files/pspp-0.6.2-gtk.patch,
+  -files/pspp-0.6.2-no-test-pgsql.patch, -files/pspp-0.8.0-as-needed.patch,
+  -pspp-0.6.2-r1.ebuild, -pspp-0.8.0.ebuild:
+  Version bump
 
   31 Oct 2013; Sébastien Fabbro <bicatali@gentoo.org> pspp-0.8.1-r1.ebuild:
   Install emacs files (broken by out of source building, bug #489938)
diff --git a/sci-mathematics/pspp/Manifest b/sci-mathematics/pspp/Manifest
index 3e8be361cfed..574ec5683ea5 100644
--- a/sci-mathematics/pspp/Manifest
+++ b/sci-mathematics/pspp/Manifest
@@ -2,25 +2,19 @@
 Hash: SHA256
 
 AUX 50pspp-gentoo.el 171 SHA256 92296e81ab389b4c639a67cd015e19d63cf8e40664a95fc568c2c6b6e7608940 SHA512 3e50a08018a0892df4beb400041ec682c94446b4e05ce7d5907ef20eace5426245e684160e85c8629650b8a911e92ef98200638dea1f12d0304fb4e1a8db5883 WHIRLPOOL b6193455db73c4cc90f4548179a77b8a10cbb8a3cdefede9834c4a4e4a9470d6e85474dbd411a8e0015d4b95f6c59574eff4036c7079bd1a1ad1c2c6aee7b482
-AUX pspp-0.6.0-as-needed.patch 380 SHA256 4461de6c4109d85e7ec77d626bb39ac2ece904200412b77202184659bca048fc SHA512 f8096fe3e926aff946039449bc30da94a54e84864ddb851a625a378f651fcd06a3ff6ff2d1464b06951ec3dc8c875fee376e452d911b9aa8a5ab8a9232839a7f WHIRLPOOL d9f51858b0c2ddaed40e3cac807ceba568f08b048b90430b864af032062b33022801873f590b5cc06ce0c3ef3a13d22af6511dec043bcda2af05be52f6f0c234
-AUX pspp-0.6.2-gtk.patch 2166 SHA256 6b983930e4081400b545f20e8109ee5b4137da229b587b56846bca1da4c125ef SHA512 59b017d5c9f38a38e80095289a6235b719cf7053f09b3595936026839afd37c8d75a6aab1442b0056055da3ef144886d1b5394e425c51000feab68d64330efbb WHIRLPOOL a2bd7c42e5b3f363b84cfc0711413ebbb2e11ce0795bfcf44b23e4e72b1b613b279bec252a5414dbb2e5e9f5684fad91c5597dd644075c79c397861b25621900
-AUX pspp-0.6.2-no-test-pgsql.patch 388 SHA256 70de6b53d9d82c478c82e8d44a9c0d2aca451792df92ea23c8931036a61e9512 SHA512 675ac283139bad3561ed7dd37d14fd9ca04ffaee0aef877130715a7427309035d35c19f947839cea8757086ee6106ff1f8d1c6e0c246c0c8c004496c8972c089 WHIRLPOOL 9676a89224528537a5e6f649fb569ce6e7a65c92b4a1c1e1792108cf85188acdb77618e5fd6cfbdaaaac52b216fcd3a8a1908f8258a67f3d6f84c2eead6376da
-AUX pspp-0.8.0-as-needed.patch 279 SHA256 ed0bae25ae7553d85a89340da6ca5b28ed81672aa1bea8a9981bb5d1bc6d0126 SHA512 7568105a4b8aad62139109d48827a7228f92233e7733d947be31e5654610d91b34e3c034090e93ff80f202eb56e7ecb2c4811a0b1b9f2dd2d839836aea660e77 WHIRLPOOL 1bc76807f22a838e58149d84aacabb77dde3767084f6a14b3a4bbb09de926e262fcecb6cdf96a1ab373fba87b3f484c10f1f7a63da7c1e90f21591fb69ba8de1
 AUX pspp-0.8.0-gettext.patch 341 SHA256 729337a7be52fa0d7b6dbb33e27292534594d892e52f07a717b348a2538af73c SHA512 b3ed3055f6c0daf8d9912e21e1355e346e15f3dae71eec6415645dbe6fc3ee88d4ac3a8fd6ff8be36167f247869107c9238140b1eee2c9855bf4026766de5991 WHIRLPOOL 35ce229e878287a37bb5d1c9b6deed09bea997777112597a7b7569c2b81ed900f10fb64177a044e92f6ade0708fd0727ed707f8bf70eb1414a1c5d7c0f081cbb
 AUX pspp-0.8.1-oos.patch 1124 SHA256 f04693390d4c16145dd738b75e6337d69db73099aa8a3b5f10b48b14fd114124 SHA512 ba7c3b48291a3d48d703b5fa3816e8b3257b8f728de4bdfa37b222af989162e59407147548d797a4bcb20e926c14cbecf3f99a7ade404328b70e08f45b3a31b8 WHIRLPOOL 9ec15ef8206646a0e9365a9975c8a6022dc1de1d93fee3b53051234ff34a32d9c531a00961aab36de0ff0422c84ba13225e5fa56f8e80a8672e95ba3d9cc8d31
 AUX pspp-0.8.1-underlinking.patch 815 SHA256 f9988ebc655881bec2cd30db7b889b0fa12aa97bf463be29c4be88692b399c8f SHA512 82a4cc05ca88b3e49fbc36111e547b117b5f94afaa587ab8a5574c7f4429fefb5538eda57ca90785c29558002ed5d38e2cddce03219ab511bd5b90eae800c72f WHIRLPOOL ff3c23f157631a925cad73f2d602e1e7944360f5b58d347bc02deb5eba95ec799c5897963aaaad46afbada68d2dfacecb99bc30720c0223ad0251f3ad73f9199
-DIST pspp-0.6.2.tar.gz 3375748 SHA256 ec9639a3dcd3663b8007e600ab1a56291214334a9bba2e8d8c5a314509826385 SHA512 0dfadb1fc5087ac0b076559902c08870ce1ad0111fdba23231c71954a675c6ba14b26e631b44cc9097a8c54c8530dba45d88165c6b428b47f1a636303989e84a WHIRLPOOL c0c9a6b2ed69059798c6b3710e39b8bfb697bd1693e6d6e6157cee8d173b2d7857ff76eaff7a78afb074e1b8c431dcdd1a5513c28abbbf31e4efe03728d69918
-DIST pspp-0.8.0.tar.gz 5526759 SHA256 f1b11a8d68449e917afa05c2378248935296a4fd5fa6d66dc790b64c5adaa966 SHA512 c95e326c691cabcd12c42eadd8ffbb5ad2c57114ac8c47a86eb1149ad49d10a3ff34347b9fe4a649d5920b9efe4638aaa622977f1ed6ce15009322e5e239aeb7 WHIRLPOOL a3f90a4867d939c589a5da01abea67f17f4cdd0c7bcd0dc02aa49f6818897eebf30042fe2744d0072a990243a41d99452cfbe05e94c16a1213d9a149a63eac57
 DIST pspp-0.8.1.tar.gz 6514528 SHA256 fd48145d2ff77c39f624e26bf3c9a5623c2afaee7c040675b06cb4ce57d31d62 SHA512 2df758b3a2d8eba724d84ce7d77a6c0bbe469a11b86a8eb4227ec12a4957f468e74b3af0f81c953d87403a962937eef2680979a21ceba4fe8b93b55252b84a18 WHIRLPOOL 5be6ebcecffc3d8a7da669ea49028307b784a5b8b5d8a510d0f9e82a3740800966da5390f8abc120b55c9c621850be906f7610f86404b92c994d9a72697d413d
-EBUILD pspp-0.6.2-r1.ebuild 2284 SHA256 bdf8a296a9a4ff6c7dcc736e249dffdd4123ee06cdd671cafbb97c6cc1702a6d SHA512 05c230cbcf8062137f315e3785a8158761eacf82fec6e7522c2787bc4baabe1b6781dcbad8304222f153e0bda3cb383d317fa1daae6c3bf1fa06ae1d92407256 WHIRLPOOL aadca1c4e1061babf3108c954ff9345fed0ceb718b59907bd95470b64becc28ad014684c0591f425f2e096b32c65b8bc9989b16dcfa80cd7a779e16994f90b83
-EBUILD pspp-0.8.0.ebuild 2016 SHA256 32f589ed0a34d8e615b4f08c2fc3aedfcf71277a1eaf92f9c998ee833badefbf SHA512 40fe46743bbdeeeacaeea60743df2d229759a36059d2458a2699b22d3e0faf905f3f3de54098716c24273b17e45c2257aee8fc2472a509579f997a94d215d553 WHIRLPOOL 448b179a19be9fe961d5c811a49f1ecfd8889670936bb7a4d6b095dffa0f56848fc93f11edd239912090948a48a22371240b714a7721bccc6d1ad99eef8d6e32
+DIST pspp-0.8.3.tar.gz 6247760 SHA256 adb8de281098b0d8632a8f2ea2af6514100786cf946f07a3c268d4baff15316f SHA512 7645a2de09ed1d6f1a53900961791b64b9420f457278d19e62ca7dabdb02b01ee78cdab0efddae384dc7deff65f7c5256227538caed89537efa014437937a61c WHIRLPOOL cff5921acce8bb3654ab0d10d63c42af8d5a9745263f423900ee290a30f1748aff023739ba49fabca33517e3deaf3fb0513a5fac7d0cf50170ba4b870d0ededf
 EBUILD pspp-0.8.1-r1.ebuild 2089 SHA256 2c1e697525b1d86bdafba6c9e7ed1daace64861aca25a5f0fc3a52f637d8253b SHA512 3072929d891ffb29eb6e951e361b1f4380bd7dc5502835de5f1676d6f6ca01b8f578671eb81e63b372ced4df6244ef09578c50d02153fd9b455ea723d72ce173 WHIRLPOOL 0279be2c2d9148f73089acbeb550102052893043659d89c42313558821ccd0b057a54dd8965e6284c69d8aa722889e068cd0facdf1937beefbcd10b5f794f7e9
-MISC ChangeLog 5002 SHA256 b2bb7a92e60d7063feec674f43596d129c4fa805ef57a56dc36634f2aa903766 SHA512 2d5ed65c19b6fdba63880bff934ea722c6fd5efb2a9fdac4a3e46e465e4dee845242e4d12b6f498af2bca1f9d52a75dbe50467e6af71575c6f58d3b74932cf06 WHIRLPOOL 5af7600aaee1f96f9e530f5ae9c4e9f427c512f9ac1f69ab6016aaf580381d29af0171dd06ac3250fd737a293cb7930946efe28e2b280821a96a935f7cd6a955
+EBUILD pspp-0.8.3.ebuild 2106 SHA256 2c9bdd58631526c3df1b65e8b38044bc096e568c8bbbae2fed4a85f5c79a1692 SHA512 00fb7068fecb5f9181b73f35e506b05f63769e11190f1fd99f391830e1101867b6c6b1a0aa3862887123d7d5dc8cdc925de957135b7b2cda25a4be91b26ce0db WHIRLPOOL 32187334eb99096e2e136141a0bf00f6e50dbd8e87de8d335f4c960eb59eb71f88519827a1915376ea00346c6d0145d541c97f27d428d3bb84f99ce5b7c8e2db
+MISC ChangeLog 5307 SHA256 991231534327de302707dba8df2c77fcb9c0b10ddab18efeec237c55459d1129 SHA512 e6486694512fcaf0210f28d0ed4c7e9ab84f35e021ca54eefcbbdadfa8a1ff10a52ce40c5c651bb4242efd34fce9ad78424a83e8b78720b931548bcdd081953d WHIRLPOOL 107be6427892016d25b587511fb9cb84c86dad6f558dd0d0c7c3d0e24eac55e851552b339a65c2e9b06dd0123b406c9f6837bfa7ac4df225bec0186e429ae976
 MISC metadata.xml 607 SHA256 6edb6b42de17353fc929b96d74ca5027d09739ae64db9c92fc8ba0f1990c951a SHA512 787f44d8d1badb137eeeea804fbe5c071a26dbbc09bf9b7850368569384c8dde21e25260c44bfd8665c0243e8b5a611ab7eef5271d2ada066f2d280223a2347e WHIRLPOOL 92b8ae37621d6f4b394b4da0414ed993a42adeb804a56424b2774e9164715214c24cde9f150ccd255fb67a142c5435c79dc48064b8abb7e22bb93222435ea37b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlJye6sACgkQ1ycZbhPLE2DJxgCbBd5JQq3CKmz7LhPfMDHbcuN3
-blsAn1B9ivKBk1yc3CMjRWNhS+tne0Cw
-=BmUI
+iEYEAREIAAYFAlOGFmcACgkQ1ycZbhPLE2D6YwCghMosX/3iqViz/Irg4yB2c6km
+i5sAnj6kvMXV0E+fD3FecPJAQ/KSGbo2
+=X7Y7
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/pspp/files/pspp-0.6.0-as-needed.patch b/sci-mathematics/pspp/files/pspp-0.6.0-as-needed.patch
deleted file mode 100644
index 88257292de6a..000000000000
--- a/sci-mathematics/pspp/files/pspp-0.6.0-as-needed.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur pspp-0.6.0/src/ui/terminal/automake.mk pspp-0.6.0.new/src/ui/terminal/automake.mk
---- pspp-0.6.0/src/ui/terminal/automake.mk	2008-05-03 01:59:39.000000000 -0400
-+++ pspp-0.6.0.new/src/ui/terminal/automake.mk	2008-10-28 09:20:50.000000000 -0400
-@@ -37,7 +37,7 @@
- 	$(NCURSES_LIBS) \
- 	$(LIBICONV) \
- 	gl/libgl.la \
--	@LIBINTL@ @LIBREADLINE@
-+	@LIBINTL@ -lreadline
- 
- 
- 
diff --git a/sci-mathematics/pspp/files/pspp-0.6.2-gtk.patch b/sci-mathematics/pspp/files/pspp-0.6.2-gtk.patch
deleted file mode 100644
index 2dbb37c4fb3a..000000000000
--- a/sci-mathematics/pspp/files/pspp-0.6.2-gtk.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- 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/files/pspp-0.6.2-no-test-pgsql.patch b/sci-mathematics/pspp/files/pspp-0.6.2-no-test-pgsql.patch
deleted file mode 100644
index 90a330c9f8ec..000000000000
--- a/sci-mathematics/pspp/files/pspp-0.6.2-no-test-pgsql.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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/files/pspp-0.8.0-as-needed.patch b/sci-mathematics/pspp/files/pspp-0.8.0-as-needed.patch
deleted file mode 100644
index e8d7a2ab675a..000000000000
--- a/sci-mathematics/pspp/files/pspp-0.8.0-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/ui/terminal/automake.mk.orig	2013-08-06 09:28:53.517642699 -0700
-+++ src/ui/terminal/automake.mk	2013-08-06 10:04:37.403409602 -0700
-@@ -24,7 +24,7 @@
- 	src/libpspp-core.la \
- 	$(CAIRO_LIBS) \
- 	$(NCURSES_LIBS) \
--	$(LIBREADLINE) \
-+	$(LTLIBREADLINE) \
- 	$(GSL_LIBS)
- 
- 
diff --git a/sci-mathematics/pspp/pspp-0.6.2-r1.ebuild b/sci-mathematics/pspp/pspp-0.6.2-r1.ebuild
deleted file mode 100644
index 41a87f245c0b..000000000000
--- a/sci-mathematics/pspp/pspp-0.6.2-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2012 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.7 2012/12/30 17:47:06 tomka Exp $
-
-EAPI=4
-inherit eutils elisp-common autotools multilib
-
-DESCRIPTION="Program for statistical analysis of sampled data."
-HOMEPAGE="http://www.gnu.org/software/pspp/pspp.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc emacs examples gtk ncurses nls plotutils postgres static-libs"
-
-RDEPEND="
-	dev-libs/libxml2:2
-	sci-libs/gsl
-	sys-libs/readline
-	sys-devel/gettext
-	sys-libs/zlib
-	virtual/libiconv
-	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}
-	virtual/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 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
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-	if use doc; then
-		dohtml -r doc/pspp{,dev}.html
-		dodoc 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
-}
diff --git a/sci-mathematics/pspp/pspp-0.8.0.ebuild b/sci-mathematics/pspp/pspp-0.8.3.ebuild
index 867a2f0e6a8a..6c406a07e4fc 100644
--- a/sci-mathematics/pspp/pspp-0.8.0.ebuild
+++ b/sci-mathematics/pspp/pspp-0.8.3.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pspp/pspp-0.8.0.ebuild,v 1.3 2013/10/30 17:36:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pspp/pspp-0.8.3.ebuild,v 1.1 2014/05/28 17:01:25 bicatali Exp $
 
 EAPI=5
 
-AUTOTOOLS_IN_SOURCE_BUILD=1
 AUTOTOOLS_AUTORECONF=1
 
 inherit eutils elisp-common autotools-utils multilib
@@ -12,24 +11,27 @@ inherit eutils elisp-common autotools-utils multilib
 DESCRIPTION="Program for statistical analysis of sampled data"
 HOMEPAGE="http://www.gnu.org/software/pspp/pspp.html"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-LICENSE="GPL-3"
 
+LICENSE="GPL-3"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
 IUSE="cairo doc emacs examples gtk ncurses nls perl postgres static-libs"
 
 RDEPEND="
-	dev-libs/libxml2:2
-	sci-libs/gsl
-	sys-devel/gettext
-	sys-libs/readline
-	sys-libs/zlib
+	dev-libs/libxml2:2=
+	sci-libs/gsl:0=
+	sys-devel/gettext:0=
+	sys-libs/readline:0=
+	sys-libs/zlib:0=
 	virtual/libiconv
-	cairo? ( x11-libs/cairo )
+	cairo? ( x11-libs/cairo:0= )
 	emacs? ( virtual/emacs )
-	gtk? ( x11-libs/gtk+:2 gnome-base/libglade:2.0 >=x11-libs/gtksourceview-2.2:2.0 )
+	gtk? (
+			gnome-base/libglade:2.0
+			x11-libs/gtk+:2
+			>=x11-libs/gtksourceview-2.2:2.0 )
 	ncurses? ( sys-libs/ncurses )
-	postgres? ( dev-db/postgresql-server )"
+	postgres? ( dev-db/postgresql-server:= )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( virtual/latex-base )"
@@ -37,13 +39,13 @@ DEPEND="${RDEPEND}
 SITEFILE=50${PN}-gentoo.el
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.0-as-needed.patch
 	"${FILESDIR}"/${PN}-0.8.0-gettext.patch
+	"${FILESDIR}"/${PN}-0.8.1-underlinking.patch
+	"${FILESDIR}"/${PN}-0.8.1-oos.patch
 )
 
 src_configure() {
 	local myeconfargs=(
-		--disable-rpath
 		$(use_enable nls)
 		$(use_with cairo)
 		$(use_with gtk gui)
@@ -56,11 +58,16 @@ src_configure() {
 
 src_compile() {
 	autotools-utils_src_compile pkglibdir="${EPREFIX}/usr/$(get_libdir)"
-	use doc && emake html pdf
+	use doc && autotools-utils_src_compile html pdf
 	use emacs && elisp-compile *.el
 }
 
 src_install() {
+	if use doc; then
+		HTML_DOCS=( "${BUILD_DIR}"/doc/pspp{,-dev}.html )
+		DOCS=( "${BUILD_DIR}"/doc/pspp{,-dev}.pdf )
+	fi
+
 	autotools-utils_src_install pkglibdir="${EPREFIX}/usr/$(get_libdir)"
 
 	if use examples; then
@@ -68,11 +75,6 @@ src_install() {
 		doins -r examples
 	fi
 
-	if use doc; then
-		dohtml -r doc/pspp{,-dev}.html
-		dodoc doc/pspp{,-dev}.pdf
-	fi
-
 	if use emacs; then
 		elisp-install ${PN} *.el *.elc
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"