gentoo resync : 25.10.2021

4 files changed, 5 insertions, 52 deletions

diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index dabc070f71d8..696d1b549591 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/ds9-bin/Manifest b/sci-astronomy/ds9-bin/Manifest
index 0f6c2cc23d68..19b664e1cad9 100644
--- a/sci-astronomy/ds9-bin/Manifest
+++ b/sci-astronomy/ds9-bin/Manifest
@@ -1,8 +1,5 @@
-DIST ds9.linux.7.2.tar.gz 11947450 BLAKE2B f6d7530b88aaf412237e1d3d1de4851fd94bf48216a8bd501732d00e0e870ae6d4dd3c8a73c560b854409a9fa42bbea0777d68747d45a9802cebd19a507179cc SHA512 e85029625d981b2a3152dc61fab0ac11ac1bafd64705efc9788a4c3cffb14ddfe1e24635e6e38d0ba26643aa8e5e2f0290f2ecef8949f9eb4065e53af802de85
 DIST ds9.linux.7.4.tar.gz 12066575 BLAKE2B 60f8369679ffe32e573f17ef77ab3b7f9857b530e2d9aa8fecc4f5a3b39cbd74e1fdcb21eb3e96b01febca35722329a02fcfcc2967b30bbe57584e4ea4a2cc40 SHA512 f56b6ca4ff67cd7163bba300500e1fa55a58185a09c0e41a33fd8f33f8aa393e07e58cb1bd48c39f558f0038180ee38129f3ad421743cdadddc3115f00c0cf64
-DIST ds9.linux64.7.2.tar.gz 12683459 BLAKE2B 13319757c2cd709e8887f27bc6f83dd816148807839e914f559848a61b8060568038e0e397d622ae5bbb8c324cce42aa0cf72a76f880a89ad4e085ff1a3298e3 SHA512 af9368d05e94ab43dff9dcc0c791333ccd7865e7666238c46cb216176caeb12188363b45380c97af0cef0d1802ea26acdda7f1562dc168536dd9ddac6d7ebb97
 DIST ds9.linux64.7.4.tar.gz 12555299 BLAKE2B a61eaba1185ff0826fc7bd7af3049768ec93f28e6fa9f331b3964849d0bcbd5500db38141101f5100d8bbdba6dec34f5f6403b0f8655fb6ae5d2058b96ab9d52 SHA512 dee66842b088881cee7dfcacb3cb220a71ef70ca3258afbe7ce7911a930c274fe5fc09487c4e54d2855179c80d940bf2e57a9b8a59ea0909ccc3213c92d81a65
 DIST ds9.png.tar 10240 BLAKE2B 4146672d9f0048668e5e910a4b0b021d8c7dbbe8d142ac15e5724d796bc7a522e38a3497686fdc259ca40f713409d77ad0f7989db5517a5a5e57abf45606b3f0 SHA512 c7d52733c63adcac00de652ac4be7a19e7a6497cf24cc6f7f78f0a9583cc94ce9c81e567af3c34f9124e15ee089abbd735c49b6cf8f2dcf6ea3cce6ed2c7302f
-EBUILD ds9-bin-7.2.ebuild 936 BLAKE2B 73c5528e8218a0bb07db6e8399c21d016bb78a5774f063d078721757fb42877606c1a04deae0ce44d0ba7cd572516b2c8953668ee6f2767d7207483e598737c2 SHA512 e4e28224f00fc126df458a452c4c69558fb1784b52de0a4902a73197c86dd21ec6a412dab0af18939515dac53fd1dbee08974aee9953e59573ea88f226599ee7
-EBUILD ds9-bin-7.4.ebuild 903 BLAKE2B 116de2aebf6ed9b704da382582d23964bf8c0d358947a6dea3f8d0125113aaeb62d57090e452ba5672ff3d5a57d6c83b53d1a0ce1c3f87de17d1498ffac922a8 SHA512 2b6ee40d62753e87d772a7ebafb3425cb180d57ce22fcb6afed61e7f1d75b63e216dacd6e796411d397000159ef15ccef1707f6123d1ae705e4eef485b2cae88
+EBUILD ds9-bin-7.4.ebuild 885 BLAKE2B 713d07eb6fe19979715c01293e5a29be0264c84303fa165d1e1654dd6ba6c2620219463ac12b5bc21d70a7b470c1162a5e1a031f46e0273c68f87b665b6fcb5d SHA512 aa3b69d096bfd560aa38f64092dd922fe83f8c40b70a48348cb30b4cf97e1b543c1f969ca4586e51caa72bde666d95df76426e0247475f971c5c39d06dd1688e
 MISC metadata.xml 1045 BLAKE2B 3ca683d981dfc01c9b74a8d87611396cf221e1b7af93069582b7fe2603fbe7595dc4da7f8d3585909a6b1536d11c37fce525d7fe7982d4efbde2b9b2a7bcc345 SHA512 1a9bfd3467e0bfe1f502cd1d0deb0be935874b639c793400e8a6d394f46f5d1f8fd5c5a9910be13873eb1d91acf609c8e2af1386d12eebb959770139b3ec6597
diff --git a/sci-astronomy/ds9-bin/ds9-bin-7.2.ebuild b/sci-astronomy/ds9-bin/ds9-bin-7.2.ebuild
deleted file mode 100644
index ebd5721f29ef..000000000000
--- a/sci-astronomy/ds9-bin/ds9-bin-7.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Data visualization application for astronomical FITS images"
-HOMEPAGE="http://hea-www.harvard.edu/RD/ds9"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/ds9.png.tar
-	amd64? ( http://hea-www.harvard.edu/RD/ds9/download/linux64/ds9.linux64.${PV}.tar.gz )
-	x86? ( http://hea-www.harvard.edu/RD/ds9/download/linux/ds9.linux.${PV}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-libs/libxml2
-	media-libs/fontconfig
-	media-libs/freetype
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/xpa"
-
-DEPEND=""
-S="${WORKDIR}"
-
-QA_PRESTRIPPED="usr/bin/ds9"
-QA_PREBUILT="usr/bin/ds9"
-
-src_install() {
-	dobin ds9
-	doicon ds9.png
-	make_desktop_entry ds9 "SAOImage DS9" ds9
-}
diff --git a/sci-astronomy/ds9-bin/ds9-bin-7.4.ebuild b/sci-astronomy/ds9-bin/ds9-bin-7.4.ebuild
index 667bb722e777..62ff16918fbc 100644
--- a/sci-astronomy/ds9-bin/ds9-bin-7.4.ebuild
+++ b/sci-astronomy/ds9-bin/ds9-bin-7.4.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit eutils
+inherit desktop
 
 DESCRIPTION="Data visualization application for astronomical FITS images"
 HOMEPAGE="http://ds9.si.edu/site/Home.html"
 SRC_URI="https://dev.gentoo.org/~jlec/distfiles/ds9.png.tar
 	amd64? ( http://ds9.si.edu/download/linux64/ds9.linux64.${PV}.tar.gz )
 	x86? ( http://hea-www.harvard.edu/RD/ds9/download/linux/ds9.linux.${PV}.tar.gz )"
+S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~amd64-linux"
-IUSE=""
 
 RDEPEND="
 	dev-libs/libxml2
@@ -28,9 +28,6 @@ RDEPEND="
 	x11-libs/libXrender
 	x11-libs/xpa"
 
-DEPEND=""
-S="${WORKDIR}"
-
 QA_PRESTRIPPED="usr/bin/ds9"
 QA_PREBUILT="usr/bin/ds9"