gentoo resync : 09.07.2022

4 files changed, 86 insertions, 36 deletions

diff --git a/sci-mathematics/pspp/Manifest b/sci-mathematics/pspp/Manifest
index cbe4eb647ae5..bab6cfc75870 100644
--- a/sci-mathematics/pspp/Manifest
+++ b/sci-mathematics/pspp/Manifest
@@ -1,7 +1,7 @@
-AUX 50pspp-gentoo.el 171 BLAKE2B 32091c8c9db265cb3c37cae7a718128df3d187e01b6c0685ff929e7dbe1bf92b8759f0920264c786ad250e9c72724fba6ec0b22ee1c39802fc3aaf3b51720665 SHA512 3e50a08018a0892df4beb400041ec682c94446b4e05ce7d5907ef20eace5426245e684160e85c8629650b8a911e92ef98200638dea1f12d0304fb4e1a8db5883
-AUX pspp-1.6.1-drop-which-tests.patch 875 BLAKE2B 99ac5aa25fc26e6f591ea0772bfd168141858c2136295dcd7253dc9a46eb8412110c6fe4c8ff3752bcbb2a43c834724e23fda4fa31c075ef3716cccdc3262680 SHA512 2f9e9049ddd91f8863de52c097a1f35aefa4dc04dc3dc6cf6be8522a97ec56af352edc34123fd4272030b1d865b451accb6fdf8efaab928a8c83cffad7d585e1
 DIST pspp-1.6.0.tar.gz 9553836 BLAKE2B 4c12003838d7f6c3613d76626d88b24f4dac4b6f507db54b03be5f09027472704ae8ee6ce44d8756c7cd1e12a65ab836cb1f7d004220df8da47f47af85c4a771 SHA512 c8b746b9ea802a95f048e377b22d723701c5e532358aa3e4993edcc73046c4823c440dd988833b69b4ea84ac6b02a442db7daac415bef4c1081efddd9857982d
 DIST pspp-1.6.1.tar.gz 9249022 BLAKE2B 306596cd428436df7f97dec627dbad6a089ff0b00b59b8152dac382a091687f4a82afd0ada7c98dea5bbc0369f0e07f1a85dcdbd84a21bfe09cbee9b43b02610 SHA512 29b475393cbe594bc93af681ec9414e56bdd664a29042017025b8f52e4e67eec1bfab638e79313a5a39929873d1d3a29095c33dbcdf40e226cc3e6010bb040a7
+DIST pspp-1.6.2.tar.gz 9249366 BLAKE2B d1a4fb352615be8d5f3af3125d10760648ab16e8d2b42dbf0632de64a5bb5bbe87b9b56661c7f600ea09c6a359e477376d3efb821280023d1825d6eb7b0a299f SHA512 fd8b6b23ae4e4a1a560bf4d20c35e761d84dcde2e220648303303f11e9c17d56285a3d5b3c26e7dad44d52ecc82fdf93fdc51a3533ff907f2ca1f1474922e31f
 EBUILD pspp-1.6.0.ebuild 1682 BLAKE2B 8d60867a775e2edcf50999c14503208138d9c5f19074c7baaf68d4ef18ccb6abfd17360b77e0a582c8664087e5652453f6237f05a6ff53dbfd5673fd218dd3a7 SHA512 63aaca9e0197a9b5e48739f871e186047fde79ab612ed41bd6407d4048906ead5a4214a49ee23e527598a1066ead30835506c23cd1fc1f6baab8d11b40442c12
 EBUILD pspp-1.6.1.ebuild 1868 BLAKE2B 05b596863fd00b004718711ead00d28ae2ef8c5af39286aff656a09509b33e4b4b55daae83d75d03421b27a4dde7cbe17a10a41c09a507e45aeb9a9a38d164ed SHA512 5cf3e9d3d28f56c13d51aa01c292c5c90026f5192b024a9bf890c391a4c2e945ffc5f8fdd310aa14c69dc8788c3d2c6452b4ed30adcc483dd79f300b65eede86
+EBUILD pspp-1.6.2.ebuild 1773 BLAKE2B e0fd3baa3f2b23c5c9b132833f8bfb3eb21e411e77ad7be5d4429cfffb28fae863dc068b828c02b6082c03f27b1f00538c6c9b91b372c21a2e7b77d3276d5d42 SHA512 bc73ff5992c2af6b4b3a039003988a868a7793a15bd7011b06174725ca4cfbe975d81b1ce601f1f06dc7ed31d1a920a9e8beca4219a59397e0f9cc4913d29983
 MISC metadata.xml 712 BLAKE2B 63bb6ce6a7465796361c98191ff057fbc335d5f2494f279a52ed2ebbbafb765364cb5efafe82c5d687f4dba5a162fa9a12b42bd5fe1cd093e39554383564c556 SHA512 4aa1baf360b95156198a0bf18c10db0f5f5d78d7745f5ff29c71cb3871ec810d9f9da3fd3dc9279ff83620bd05afed9b57f18f8483a1b3860cd9e23d32a9e9be
diff --git a/sci-mathematics/pspp/files/50pspp-gentoo.el b/sci-mathematics/pspp/files/50pspp-gentoo.el
deleted file mode 100644
index adac2e8ed1da..000000000000
--- a/sci-mathematics/pspp/files/50pspp-gentoo.el
+++ /dev/null
@@ -1,6 +0,0 @@
-
-;;; pspp site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-(autoload 'pspp-mode "pspp-mode" nil t)
-(add-to-list 'auto-mode-alist '("\\.sps\\'" . pspp-mode))
diff --git a/sci-mathematics/pspp/files/pspp-1.6.1-drop-which-tests.patch b/sci-mathematics/pspp/files/pspp-1.6.1-drop-which-tests.patch
deleted file mode 100644
index 5303df4dc2e6..000000000000
--- a/sci-mathematics/pspp/files/pspp-1.6.1-drop-which-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://git.savannah.gnu.org/cgit/pspp.git/commit/?id=f0ac9253e8b84691cec17fc80422993949a91cc1
-
-From f0ac9253e8b84691cec17fc80422993949a91cc1 Mon Sep 17 00:00:00 2001
-From: Friedrich Beckmann <friedrich.beckmann@gmx.de>
-Date: Sun, 26 Jun 2022 09:07:18 +0200
-Subject: tests/atlocal.in - switched from which to command -v
-
-Sam James reported a possible future build problem due to the
-usage of the "which" command:
-
-https://savannah.gnu.org/bugs/?62675
-
-I replace "which" with "command -v" as proposed. Thanks for your
-support.
-
-Closes: 62675
---- a/tests/atlocal.in
-+++ b/tests/atlocal.in
-@@ -71,7 +71,7 @@ alias pspp='pspp --no-statrc'
- # Avoids error messages during tests if $TERM is set to an unknown terminal.
- TERM=; unset TERM
- 
--pspp_diff=`which diff`
-+pspp_diff=`command -v diff`
- if test X"$RUNNER" = Xwine; then
-     diff () {
-         $pspp_diff -w  "$@"
-cgit v1.1
diff --git a/sci-mathematics/pspp/pspp-1.6.2.ebuild b/sci-mathematics/pspp/pspp-1.6.2.ebuild
new file mode 100644
index 000000000000..ead310f8260b
--- /dev/null
+++ b/sci-mathematics/pspp/pspp-1.6.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 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"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+# Note: can drop test infra + which dep in next release!
+IUSE="doc examples gtk ncurses nls perl postgres test"
+RESTRICT="!test? ( test )"
+
+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 )"
+
+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
+
+	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
+}