sci-mathematics/pspp: Fix underlinking and out-of-source build

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

6 files changed, 82 insertions, 14 deletions

diff --git a/sci-mathematics/pspp/ChangeLog b/sci-mathematics/pspp/ChangeLog
index 8099287dcc81..31733d5309ca 100644
--- a/sci-mathematics/pspp/ChangeLog
+++ b/sci-mathematics/pspp/ChangeLog
@@ -1,6 +1,13 @@
 # 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.25 2013/10/30 16:21:48 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pspp/ChangeLog,v 1.26 2013/10/30 17:36:56 jlec Exp $
+
+*pspp-0.8.1-r1 (30 Oct 2013)
+
+  30 Oct 2013; Justin Lecher <jlec@gentoo.org> pspp-0.8.0.ebuild,
+  -pspp-0.8.1.ebuild, +pspp-0.8.1-r1.ebuild, +files/pspp-0.8.1-oos.patch,
+  +files/pspp-0.8.1-underlinking.patch, metadata.xml:
+  Fix underlinking and out-of-source build
 
 *pspp-0.8.1 (30 Oct 2013)
 
diff --git a/sci-mathematics/pspp/files/pspp-0.8.1-oos.patch b/sci-mathematics/pspp/files/pspp-0.8.1-oos.patch
new file mode 100644
index 000000000000..51612b993abd
--- /dev/null
+++ b/sci-mathematics/pspp/files/pspp-0.8.1-oos.patch
@@ -0,0 +1,28 @@
+ src/ui/gui/automake.mk | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
+index 47a3215..24f5b0b 100644
+--- a/src/ui/gui/automake.mk
++++ b/src/ui/gui/automake.mk
+@@ -333,16 +333,16 @@ PHONY += yelp-check
+ AM_CPPFLAGS += -Isrc
+ 
+ src/ui/gui/pspp.desktop: src/ui/gui/gen-dot-desktop.sh $(POFILES)
+-	POFILES="$(POFILES)" top_builddir="$(top_builddir)" $(SHELL) $< > $@
++	POFILES="$(POFILES)" top_builddir="$(top_builddir)" $(SHELL) $< > ${top_srcdir}/$@
+ 
+ CLEANFILES+=src/ui/gui/pspp.desktop
+ 
+ src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list
+-	echo '#include <config.h>' > $@
+-	$(GLIB_GENMARSHAL) --body --prefix=psppire_marshal $? >> $@
++	echo '#include <config.h>' > ${top_srcdir}/$@
++	$(GLIB_GENMARSHAL) --body --prefix=psppire_marshal $? >> ${top_srcdir}/$@
+ 
+ src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list
+-	$(GLIB_GENMARSHAL) --header --prefix=psppire_marshal $? > $@
++	$(GLIB_GENMARSHAL) --header --prefix=psppire_marshal $? > ${top_srcdir}/$@
+ 
+ desktopdir = $(datadir)/applications
+ desktop_DATA = src/ui/gui/pspp.desktop
diff --git a/sci-mathematics/pspp/files/pspp-0.8.1-underlinking.patch b/sci-mathematics/pspp/files/pspp-0.8.1-underlinking.patch
new file mode 100644
index 000000000000..2c533ee49658
--- /dev/null
+++ b/sci-mathematics/pspp/files/pspp-0.8.1-underlinking.patch
@@ -0,0 +1,29 @@
+ src/automake.mk | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/automake.mk b/src/automake.mk
+index 73ff813..8524000 100644
+--- a/src/automake.mk
++++ b/src/automake.mk
+@@ -20,7 +20,7 @@ src_libpspp_core_la_LIBADD = \
+ 	src/data/libdata.la \
+ 	src/libpspp/liblibpspp.la \
+ 	$(LIBXML2_LIBS) $(PG_LIBS) \
+-	gl/libgl.la
++	gl/libgl.la $(CAIRO_LIBS)
+ 
+ src_libpspp_la_SOURCES = 
+ 
+@@ -28,10 +28,11 @@ src_libpspp_la_CFLAGS = $(GSL_CFLAGS)
+ src_libpspp_la_LDFLAGS = -release $(VERSION)
+ 
+ src_libpspp_la_LIBADD = \
++	src/libpspp-core.la \
+ 	src/language/liblanguage.la \
+ 	src/math/libpspp-math.la \
+ 	src/output/liboutput.la \
+-        $(GSL_LIBS)
++        $(GSL_LIBS) $(CAIRO_LIBS) $(LIBXML2_LIBS)
+ 
+ include $(top_srcdir)/src/math/automake.mk
+ include $(top_srcdir)/src/output/automake.mk
diff --git a/sci-mathematics/pspp/metadata.xml b/sci-mathematics/pspp/metadata.xml
index f2949f6a5894..d62366a4d9b2 100644
--- a/sci-mathematics/pspp/metadata.xml
+++ b/sci-mathematics/pspp/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
-<longdescription lang="en">
+  <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.
diff --git a/sci-mathematics/pspp/pspp-0.8.0.ebuild b/sci-mathematics/pspp/pspp-0.8.0.ebuild
index 5014465ca37a..867a2f0e6a8a 100644
--- a/sci-mathematics/pspp/pspp-0.8.0.ebuild
+++ b/sci-mathematics/pspp/pspp-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.2 2013/09/10 02:40:07 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pspp/pspp-0.8.0.ebuild,v 1.3 2013/10/30 17:36:56 jlec Exp $
 
 EAPI=5
 
@@ -27,7 +27,7 @@ RDEPEND="
 	virtual/libiconv
 	cairo? ( x11-libs/cairo )
 	emacs? ( virtual/emacs )
-	gtk? ( x11-libs/gtk+:2 gnome-base/libglade:2.0 )
+	gtk? ( x11-libs/gtk+:2 gnome-base/libglade:2.0 >=x11-libs/gtksourceview-2.2:2.0 )
 	ncurses? ( sys-libs/ncurses )
 	postgres? ( dev-db/postgresql-server )"
 DEPEND="${RDEPEND}
diff --git a/sci-mathematics/pspp/pspp-0.8.1.ebuild b/sci-mathematics/pspp/pspp-0.8.1-r1.ebuild
index f595323d4024..fb0d545222c7 100644
--- a/sci-mathematics/pspp/pspp-0.8.1.ebuild
+++ b/sci-mathematics/pspp/pspp-0.8.1-r1.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pspp/pspp-0.8.1.ebuild,v 1.1 2013/10/30 16:21:48 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pspp/pspp-0.8.1-r1.ebuild,v 1.1 2013/10/30 17:36:56 jlec Exp $
 
 EAPI=5
 
-AUTOTOOLS_IN_SOURCE_BUILD=1
+AUTOTOOLS_AUTORECONF=1
 
 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"
 
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-3"
 SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cairo doc emacs examples gtk ncurses nls perl postgres static-libs"
 
 RDEPEND="
@@ -26,9 +26,10 @@ RDEPEND="
 	virtual/libiconv
 	cairo? ( x11-libs/cairo )
 	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 )"
 DEPEND="${RDEPEND}
@@ -37,8 +38,11 @@ DEPEND="${RDEPEND}
 
 SITEFILE=50${PN}-gentoo.el
 
-# if autoreconf is needed, might need patch for gettext in
-# https://savannah.gnu.org/bugs/index.php?39708
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.0-gettext.patch
+	"${FILESDIR}"/${P}-underlinking.patch
+	"${FILESDIR}"/${P}-oos.patch
+)
 
 src_configure() {
 	local myeconfargs=(