gentoo resync : 28.11.2020

3 files changed, 92 insertions, 80 deletions

diff --git a/sci-mathematics/pspp/Manifest b/sci-mathematics/pspp/Manifest
index f64e0971f795..c244d6771bdd 100644
--- a/sci-mathematics/pspp/Manifest
+++ b/sci-mathematics/pspp/Manifest
@@ -7,6 +7,7 @@ AUX pspp-1.2.0-fix-segfaults.patch 1452 BLAKE2B a5760dfc45149526a67829ec38b0d782
 AUX pspp-1.2.0-fix-tests.patch 2217 BLAKE2B 20a2ca51c7bb792ec66281e2c6d10ca1345d5565b62696cf8a40051eacb43456242aa13d566224ee68267650209501d16c87dd57524a4b1386e68c96404159d7 SHA512 742b6acd7611dfce2eab9e246084528e4b80b0ef9f8713f4233f7c8c000c9772c8f62df1ad83cd5adfef2c5fc213fa75f6b2950ce3e9d61786353df034925e74
 AUX pspp-1.2.0-py3.patch 1619 BLAKE2B 5bb9264f5e064860380c79c64641c31f09bb171ff39a188eaab5b8d1fe21a8243b1c72ff77e82447af05db63434a53bfa9cede60f08330cf470c8c70ebfa3cdd SHA512 a7a189fd7e7e0209b50ac655449d59888a5b2bad74b8b76e843916f47c9ca4405362af80fced7291af4b446f070c534f6688662fae6e2f03b2c6e6e0ea18c362
 DIST pspp-1.2.0.tar.gz 7213194 BLAKE2B f468c6e025f996c9f806fb03e94a4497f02b774c509457cc6295bbefe37abc7e2ecf10d2876c8cff9a979d7a4264c7c185e1cec5fd1d5f2f00f1c6eae4da775e SHA512 49eed2b55f10584abba18ff7d2020fd08691bbc1a3c2f332e6d283e32aa84e0abdae6092d17db9c1a539c63d85ecdfcc2dad40c94a06904b8893a1976e5e48d3
+DIST pspp-1.4.1.tar.gz 7848393 BLAKE2B c9232aa3d4905d4be54ae993db6a4b37b3696c748e15c8ba6c46c7e56f9974aefe597f893fdc5431af237ad3923da1ef271db39e4d94725ccf93f0a0df443ef4 SHA512 c664a6c6f4f1826db396ad776d81cadc791e4f661c603a7f164f70f9571a84cfae6fec116356b3f950991245b2b0dc9805e75193a055a242558cda1209e7830f
 EBUILD pspp-1.2.0-r1.ebuild 2307 BLAKE2B 82668363eec7ea88f9b6c7509c50bd52e7fb20ae96bc60fae0fa933789984fc6320a2d3749f526e90e55e98aaeaaae61db1336a054d199d4f9026cae1ffc8759 SHA512 3f7f8bf4864997c0fbdb0ed85c836605e05224672ff9650b79f7118f6f51e8efbaaccbc730f1302d4dfbe5b47f79ecb57349021c3f9fdf30cd5deecd95913b53
-EBUILD pspp-1.2.0.ebuild 1710 BLAKE2B ee6f1612b3ff8719d970517409f092f881df857b8d75499648022b200001dd8271bb97a34b74f95d568cc3e17078abd7994965940eff618454e001f31253fe08 SHA512 9f68f47e4a31e75dcb23c5eed5b1170defb2cf83aaa96900b0d9dfb0b985a7733d939776f07ebed3305778480db44039ad8768f9ccdacd53c5a3c7b702a15dca
+EBUILD pspp-1.4.1.ebuild 1885 BLAKE2B d7f1ddc829dc16f9fc2e123d5a82467dd603e82456c12989a3196369a7a641f2601dd347dbca183c845e07eb09f8c61f9abc413bba87003c4e5cb2ba3d238a57 SHA512 1102b16110162c1ef727adf781debb1bc13f8899fe6e0cc500c9a8d035a6d64fa77d38664eced22b237e4cb41f45fa4835c48701af79603bbeb4234af13aa0e8
 MISC metadata.xml 711 BLAKE2B a8a82a6226fd60e70e8f0c4af6fd1e84545e46d0743f3b13d29c54461bf62ca2b890c718482fee2aa26ca4eb86300b3a11b01e659584942b9bb57ea70ee42882 SHA512 51b64f0c307003cfea98971696f7b26f4770171768a4b90c44f6233696749fe4cce0bf09b0392ad079abff8235fb3680668534cb407df75e6626aab6167ffd34
diff --git a/sci-mathematics/pspp/pspp-1.2.0.ebuild b/sci-mathematics/pspp/pspp-1.2.0.ebuild
deleted file mode 100644
index b0978a19cfa8..000000000000
--- a/sci-mathematics/pspp/pspp-1.2.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils elisp-common ltprune
-
-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"
-IUSE="cairo doc emacs examples gtk ncurses nls perl postgres static-libs"
-
-RDEPEND="
-	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:0=[svg] )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	gtk? (
-			x11-libs/gtk+:3=
-			x11-libs/gtksourceview:3.0=
-			x11-libs/spread-sheet-widget )
-	ncurses? ( sys-libs/ncurses:0= )
-	postgres? ( dev-db/postgresql:=[server] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( virtual/latex-base )"
-
-SITEFILE=50${PN}-gentoo.el
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_with cairo) \
-		$(use_with gtk gui) \
-		$(use_with ncurses libncurses) \
-		$(use_with perl perl-module) \
-		$(use_with postgres libpq)
-}
-
-src_compile() {
-	default
-	use doc && emake html pdf
-	use emacs && elisp-compile *.el
-}
-
-src_install() {
-	default
-	if use doc; then
-		dodoc doc/pspp{,-dev}.pdf
-		insinto /usr/share/doc/${PF}/html
-		dodoc -r doc/pspp{,-dev}.html
-	fi
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-	if use emacs; then
-		elisp-install ${PN} *.el *.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/pspp/pspp-1.4.1.ebuild b/sci-mathematics/pspp/pspp-1.4.1.ebuild
new file mode 100644
index 000000000000..5c58d5dba490
--- /dev/null
+++ b/sci-mathematics/pspp/pspp-1.4.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+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"
+IUSE="cairo doc examples gtk ncurses nls perl postgres test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( cairo )"
+
+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
+	cairo? (
+		x11-libs/cairo[svg]
+		x11-libs/pango
+	)
+	gtk? (
+		x11-libs/gtk+:3
+		x11-libs/gtksourceview:3.0=
+		>=x11-libs/spread-sheet-widget-0.6
+		cairo? ( dev-util/glib-utils )
+	)
+	postgres? ( dev-db/postgresql:=[server] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( virtual/latex-base )
+	test? ( ${PYTHON_DEPS} )"
+
+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"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -i '/appdata$/s/appdata$/metainfo/' Makefile.in || die
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_enable nls) \
+		$(use_with cairo) \
+		$(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
+}