7 files changed, 7 insertions, 172 deletions
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index bbab7a075c8a..d7d0173b318a 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/pspp/Manifest b/sci-mathematics/pspp/Manifest
index 6f861672177a..f33c226acfbb 100644
--- a/sci-mathematics/pspp/Manifest
+++ b/sci-mathematics/pspp/Manifest
@@ -1,7 +1,4 @@
 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 915c4f9e1f941bed8382b1d7210c8093e7f393628c77f3ec72ac5bcd956e28274b9d355b464af07baa49258266d1603c2fec868e779f3192a064961775b79fa4 SHA512 3a12ab0a5881296aecc211f2191986676bd1ae64cab1838649256ad01c1360026c5fb94c88047eebe8fc139365d93ba12d0e65b165cafb05ddab88727ae2227a
-EBUILD pspp-1.6.2-r1.ebuild 1774 BLAKE2B 26f5347ce54ec651bea929f29c79209516622cfd586a821fa391e2a7bddfbcacfbb86ef15da9b097931959060d65bf5296a8317e014637156514bfc861e0f9ab SHA512 4f2656a9244e5ca982546549b728409af09fbda990b47e98466ba0b8a5bf52a98a50aee44c820080ea18ec3927fa367b47f96cae1fbaa38f71e4803daf272604
-EBUILD pspp-1.6.2-r2.ebuild 1874 BLAKE2B c9bdabe3154c2093d439450db76ff528df4c6caf9de3cad41641750a1f8e21c0c93e8080fbed14630b850a09610cc0ded86e2d184a511b37b42b24e470f42606 SHA512 dc5d44d7b32d9be2f4f282b084e2bc835cb2ba39739f3eaf1892e3113d18520c3eaa8cc10b6545b01e878b8c892eb1df107f55655ddbd1bf64289d0fec052a6f
+EBUILD pspp-1.6.2-r2.ebuild 1873 BLAKE2B c33909cea8c93c332cbab712c1573077c7f6b490070d4b43873bb995aa3cbae549932671292de91f7d178910460e9060519e47b8f652cc9bd4ad4b38abe292f8 SHA512 76e7c1ed174b5b90d63aee987500d491c807c50f0ccfd0b67fdc4192752d6e2110fb0ff9101efa127803321286db2690a19463c255c0fbbd10541bf8e6da3b62
 MISC metadata.xml 789 BLAKE2B 512ff8155a10ed8c1be37ec63067c73c196c5bfe48d9722feaba5305e95703e0cccd247d5d55dd123275f3543632020d3cacedb0416953a547e5e7015d1f759f SHA512 011cf3d266b6d1385791930ce84850e99d5d0b506d9ffb632807a8e825217e94ba02c3cb55b56a6be40fc1e84bfed28b7db7131ce58fe958468d5a44b6734305
diff --git a/sci-mathematics/pspp/pspp-1.6.0-r1.ebuild b/sci-mathematics/pspp/pspp-1.6.0-r1.ebuild
deleted file mode 100644
index 4eb6618546a6..000000000000
--- a/sci-mathematics/pspp/pspp-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..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"
-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 )"
-
-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-r1.ebuild b/sci-mathematics/pspp/pspp-1.6.2-r1.ebuild
deleted file mode 100644
index 0c8dc2aa7ca4..000000000000
--- a/sci-mathematics/pspp/pspp-1.6.2-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..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
-}
diff --git a/sci-mathematics/pspp/pspp-1.6.2-r2.ebuild b/sci-mathematics/pspp/pspp-1.6.2-r2.ebuild
index 997eac8a4074..e12dc7530437 100644
--- a/sci-mathematics/pspp/pspp-1.6.2-r2.ebuild
+++ b/sci-mathematics/pspp/pspp-1.6.2-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+ FDL-1.3+"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples gtk ncurses nls perl postgres"
 
 RDEPEND="
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index 29648303b20d..885674a40ebb 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -3,4 +3,4 @@ DIST singular-4.3.1p1.tar.gz 15090370 BLAKE2B d4e40378b3892b98b1f78c3928c8a40484
 DIST singular-4.3.1p3.tar.gz 14991986 BLAKE2B 0ae2585a362839914d3a134bfe637f6faa34d95f58937f2adcca0c5a35e3218eb36554bae8187f5bb3a423dcac445c836e9bfff2d0d1a19d4e14a4452b84d839 SHA512 f092683f4a92158d82a2e694f284662c6285bac5faaa7d5e5695a84a220012fb8a733b4bbc52820def3037e1596ea4c2ab3846f58a3a3fb19e01bf7595790462
 EBUILD singular-4.3.1_p1.ebuild 2294 BLAKE2B 1147387c35f31d8bef97c67ec8d4596952494c85d8dd0c427981c7d491200fb3eb02658f3f63fde4e8323e1cc0f9ccbb467ae73ba17bbba12a05831b12f35348 SHA512 2d0c8047da3d2940f7ada1f68f314b7499a497dce09d7166f866f62bd67ab315df7bca5e90af07f897839ceb288651dd6be347a1ecceaa8ce6177f9a30df72d9
 EBUILD singular-4.3.1_p3.ebuild 2300 BLAKE2B 8335c3d556cb98834fa9f8f9a5287954b62444a30f3d6e4c5602b425f03d2646fe8fafe922bf41a0e978104e6cf424e4c5afbaf9263758a38b2e7931398a4362 SHA512 2beceeec3f73e1ef4fe470642d170eb4a0dce7d737dfb9453ca7cb1ab0283ab9199cb01a490487580ebb9a4f57f74ccc7c3742ddae6fe776396dee92ab648d3f
-MISC metadata.xml 782 BLAKE2B 7f10704c78b5a55cff9d07ffc3456a57aba4001ffd337dfbbb712e32608446ab9ae8039d14143939ad41710dcc6d4725992db2c80bcd1678397e563fefa929b4 SHA512 3c4904a4a8f63ff073745409caf9a9a68aa5d46861b8e8d77a538716a7a6a099d87137d604e52a3b8ce4ab81b7333f95389cd888ccbabe52017b6e8b1e4a77d0
+MISC metadata.xml 862 BLAKE2B a6e991149cb925158806177b1b4a76da2b747b3273b395c14455993a99f4cf83de141980303a068b9068983b8adf4da884b81e80546a3d2dd162f188dc759385 SHA512 9e40cf7b3841bcf8289f24903e392df2a812b6d815f71da41d95a81bb89f493ab1afcef749ef47960ba683dc3433d2c4488015990806dde0b560ffe3bb6ca545
diff --git a/sci-mathematics/singular/metadata.xml b/sci-mathematics/singular/metadata.xml
index 0deaba87eadc..a2368c6ebc10 100644
--- a/sci-mathematics/singular/metadata.xml
+++ b/sci-mathematics/singular/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+  </maintainer>
+
   <maintainer type="person" proxied="yes">
     <email>frp.bissey@gmail.com</email>
     <name>François Bissey</name>