gentoo auto-resync : 09:10:2022 - 01:31:00

4 files changed, 4 insertions, 92 deletions

diff --git a/sci-mathematics/pspp/Manifest b/sci-mathematics/pspp/Manifest
index bab6cfc75870..23f6325b7f3c 100644
--- a/sci-mathematics/pspp/Manifest
+++ b/sci-mathematics/pspp/Manifest
@@ -1,7 +1,5 @@
 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
+EBUILD pspp-1.6.0-r1.ebuild 1685 BLAKE2B 8da6d75b249e1592118e0b995b4235e84ee70f074c5ef7b4683bfb6a9550047d9d9e03106f0403e887919096cf1dea2760160e74e43c36b772b39cae92ff6525 SHA512 49c1243651c6d221d76e83369bb8e639897d6c1f606e936b71060c43a08c92075a9a185cb8467b82d36d6e7d7aa182cf620581e20fb4953e8b6753e7bfbaac85
+EBUILD pspp-1.6.2-r1.ebuild 1776 BLAKE2B f345c259579d1c3c84f23204aa3097af7590eb49a56ffe5eb0cff1c4c44b4aa36a3757cb99175238e32970bdd354b141d83d33ac190de4b12b60d2cc41e82921 SHA512 24a6b3f4d6678f2bf19b754daf52d75348df582e21a1a5c89b5610ca2e1d3f63e64747ac353bc891251660b7494a2242e91d65b4fcbe7d3f393572de758ca6fe
 MISC metadata.xml 712 BLAKE2B 63bb6ce6a7465796361c98191ff057fbc335d5f2494f279a52ed2ebbbafb765364cb5efafe82c5d687f4dba5a162fa9a12b42bd5fe1cd093e39554383564c556 SHA512 4aa1baf360b95156198a0bf18c10db0f5f5d78d7745f5ff29c71cb3871ec810d9f9da3fd3dc9279ff83620bd05afed9b57f18f8483a1b3860cd9e23d32a9e9be
diff --git a/sci-mathematics/pspp/pspp-1.6.0.ebuild b/sci-mathematics/pspp/pspp-1.6.0-r1.ebuild
index 886cf3d5f542..e67b3942858f 100644
--- a/sci-mathematics/pspp/pspp-1.6.0.ebuild
+++ b/sci-mathematics/pspp/pspp-1.6.0-r1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	sys-libs/readline:0=
 	sys-libs/zlib
 	virtual/libiconv
-	x11-libs/cairo[svg]
+	x11-libs/cairo[svg(+)]
 	x11-libs/pango
 	gtk? (
 		dev-util/glib-utils
diff --git a/sci-mathematics/pspp/pspp-1.6.1.ebuild b/sci-mathematics/pspp/pspp-1.6.1.ebuild
deleted file mode 100644
index befeed9034a2..000000000000
--- a/sci-mathematics/pspp/pspp-1.6.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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}"
-# which dep for tests: https://savannah.gnu.org/bugs/index.php?62675
-BDEPEND="
-	${PYTHON_DEPS}
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( virtual/latex-base )
-	test? ( sys-apps/which )"
-
-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
-}
diff --git a/sci-mathematics/pspp/pspp-1.6.2.ebuild b/sci-mathematics/pspp/pspp-1.6.2-r1.ebuild
index ead310f8260b..b326f6feb65a 100644
--- a/sci-mathematics/pspp/pspp-1.6.2.ebuild
+++ b/sci-mathematics/pspp/pspp-1.6.2-r1.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	sys-libs/readline:0=
 	sys-libs/zlib
 	virtual/libiconv
-	x11-libs/cairo[svg]
+	x11-libs/cairo[svg(+)]
 	x11-libs/pango
 	gtk? (
 		dev-util/glib-utils