gentoo auto-resync : 01:01:2023 - 20:22:32

3 files changed, 117 insertions, 0 deletions

diff --git a/sci-mathematics/pspp/Manifest b/sci-mathematics/pspp/Manifest
index 767a4fc1a463..364e75b24feb 100644
--- a/sci-mathematics/pspp/Manifest
+++ b/sci-mathematics/pspp/Manifest
@@ -1,5 +1,7 @@
+AUX pspp-1.6.2-underlinking.patch 980 BLAKE2B 59d7509417526e3428023f2e0f085a9ec806fe4bada8934404e0da3d306860f5826d83b9682151c5c4946bdf914618e3d555c99d60b93e858e56221cbd336c12 SHA512 8773b768dd8336a37c97527ac24311d7006c04c4ea0b71199432dc779b7a16c2b2e6fa786714cb7e359a2e52e806958315644f13199a7f656445d1c17a2b852a
 DIST pspp-1.6.0.tar.gz 9553836 BLAKE2B 4c12003838d7f6c3613d76626d88b24f4dac4b6f507db54b03be5f09027472704ae8ee6ce44d8756c7cd1e12a65ab836cb1f7d004220df8da47f47af85c4a771 SHA512 c8b746b9ea802a95f048e377b22d723701c5e532358aa3e4993edcc73046c4823c440dd988833b69b4ea84ac6b02a442db7daac415bef4c1081efddd9857982d
 DIST pspp-1.6.2.tar.gz 9249366 BLAKE2B d1a4fb352615be8d5f3af3125d10760648ab16e8d2b42dbf0632de64a5bb5bbe87b9b56661c7f600ea09c6a359e477376d3efb821280023d1825d6eb7b0a299f SHA512 fd8b6b23ae4e4a1a560bf4d20c35e761d84dcde2e220648303303f11e9c17d56285a3d5b3c26e7dad44d52ecc82fdf93fdc51a3533ff907f2ca1f1474922e31f
 EBUILD pspp-1.6.0-r1.ebuild 1685 BLAKE2B 8da6d75b249e1592118e0b995b4235e84ee70f074c5ef7b4683bfb6a9550047d9d9e03106f0403e887919096cf1dea2760160e74e43c36b772b39cae92ff6525 SHA512 49c1243651c6d221d76e83369bb8e639897d6c1f606e936b71060c43a08c92075a9a185cb8467b82d36d6e7d7aa182cf620581e20fb4953e8b6753e7bfbaac85
 EBUILD pspp-1.6.2-r1.ebuild 1774 BLAKE2B b647821363614d8918a2d68eda437fe344a1b4d6a971ec9da6755336e556a7f2f9556cedd67d70595ae1332ee39f6bf84f3a7594c0a4a250c2acc047b7c517ee SHA512 177b9afe1a88c0e4d0cfb0e6ea387926b4ad005dcb8490249fc3a477e5b1516a0885e75ead8cd6c1097d505e89c61c5922e73a17a00fe60828895f163f3d806d
+EBUILD pspp-1.6.2-r2.ebuild 1875 BLAKE2B 6b4be2af040b35b48dfa63654a63c68ebea9e4ec5e9510466535ed2c2e6f8dc261dfb53c7bf23af4ab8359826dccae6ad7e96137bc64cc3446b0ab37b8e71b68 SHA512 3ad26c872bc66b3b4c819debd98fbd16db97c55dc76ada98a105b8e71ca18556787a28355231c98044f003625485f36021a7e5559c7a14f469c46b3649d37515
 MISC metadata.xml 789 BLAKE2B 512ff8155a10ed8c1be37ec63067c73c196c5bfe48d9722feaba5305e95703e0cccd247d5d55dd123275f3543632020d3cacedb0416953a547e5e7015d1f759f SHA512 011cf3d266b6d1385791930ce84850e99d5d0b506d9ffb632807a8e825217e94ba02c3cb55b56a6be40fc1e84bfed28b7db7131ce58fe958468d5a44b6734305
diff --git a/sci-mathematics/pspp/files/pspp-1.6.2-underlinking.patch b/sci-mathematics/pspp/files/pspp-1.6.2-underlinking.patch
new file mode 100644
index 000000000000..c4f3672d6716
--- /dev/null
+++ b/sci-mathematics/pspp/files/pspp-1.6.2-underlinking.patch
@@ -0,0 +1,27 @@
+From 27f3d4cf2a92a91c078e54d9e67af441df140edc Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sat, 31 Dec 2022 22:08:11 -0500
+Subject: [PATCH 1/1] Makefile.in: fix underlinking of liboutput.
+
+This library uses cairo/pango, and needs to be linked with $CAIRO_LIBS
+when using --as-needed and a linker that knows what it's doing.
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index d836b65..217798c 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1837,7 +1837,7 @@ am_src_math_libpspp_math_la_OBJECTS = src/math/chart-geometry.lo \
+ 	src/math/wilcoxon-sig.lo
+ src_math_libpspp_math_la_OBJECTS =  \
+ 	$(am_src_math_libpspp_math_la_OBJECTS)
+-src_output_liboutput_la_LIBADD =
++src_output_liboutput_la_LIBADD = $(CAIRO_LIBS)
+ am_src_output_liboutput_la_OBJECTS = src/output/liboutput_la-ascii.lo \
+ 	src/output/liboutput_la-cairo-chart.lo \
+ 	src/output/liboutput_la-cairo-fsm.lo \
+-- 
+2.38.2
+
diff --git a/sci-mathematics/pspp/pspp-1.6.2-r2.ebuild b/sci-mathematics/pspp/pspp-1.6.2-r2.ebuild
new file mode 100644
index 000000000000..c6a645b2be9d
--- /dev/null
+++ b/sci-mathematics/pspp/pspp-1.6.2-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit python-any-r1 xdg
+
+DESCRIPTION="Program for statistical analysis of sampled data"
+HOMEPAGE="https://www.gnu.org/software/pspp/pspp.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+ FDL-1.3+"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples gtk ncurses nls perl postgres"
+
+RDEPEND="
+	dev-libs/libxml2:2
+	sci-libs/gsl:0=
+	sys-devel/gettext
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	sys-libs/zlib
+	virtual/libiconv
+	x11-libs/cairo[svg(+)]
+	x11-libs/pango
+	gtk? (
+		dev-util/glib-utils
+		x11-libs/gtk+:3
+		x11-libs/gtksourceview:4=
+		>=x11-libs/spread-sheet-widget-0.7
+	)
+	postgres? ( dev-db/postgresql:=[server] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( virtual/latex-base )"
+
+PATCHES=( "${FILESDIR}/pspp-1.6.2-underlinking.patch" )
+
+pkg_pretend() {
+	ewarn "Starting with pspp-1.4.0 the pspp-mode emacs package is no longer"
+	ewarn "shipped with pspp itself, and should instead be fetched from ELPA:"
+	ewarn "https://elpa.gnu.org/packages/pspp-mode.html"
+}
+
+src_prepare() {
+	default
+
+	sed -i '/appdata$/s/appdata$/metainfo/' Makefile.in || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with gtk gui) \
+		$(use_with perl perl-module) \
+		$(use_with postgres libpq)
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake html pdf
+		HTML_DOCS=( doc/pspp{,-dev}.html )
+	fi
+}
+
+src_install() {
+	default
+
+	# Mimic the upstream fix for bug 868618. Obsolete when v1.6.3 is
+	# released.
+	rm "${ED}/usr/bin/pspp-dump-sav" || die
+
+	use doc && dodoc doc/pspp{,-dev}.pdf
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	find "${ED}" -name '*.la' -type f -delete || die
+}