gentoo resync : 20.03.2022

3 files changed, 8 insertions, 47 deletions

diff --git a/app-emacs/emms/Manifest b/app-emacs/emms/Manifest
index 68d0381d7c7c..3c28cce6b18e 100644
--- a/app-emacs/emms/Manifest
+++ b/app-emacs/emms/Manifest
@@ -1,8 +1,6 @@
 AUX 50emms-gentoo.el 59 BLAKE2B 30539342b0dff0c6508585863470f73fcb2ea8da86819ba144422a775982425965e75617b6e2a83b582c4f00d1d9737b1b6d024d6ec654a014af9748e940a4d3 SHA512 e1dcdf700ec405915ecc67dbca29b89468ab16b413cfa9ae5910481036db4627609939a7142d1d58f4f66464f12af02722750e24b25513a265be66c0943f7c66
-DIST emms-4.4.tar.gz 288922 BLAKE2B d86cd9124f1d92d9d91aa96c45f7fd5e86776ff5f15cfa5e139eb40bc72e673f394b3d5209e64da62d3ab02ef18d6ac690e1d4e4273f3aad9c53b7e5ac4e7839 SHA512 d0aaac80728b542366885916e43c2c50302a5a5d6c9e35ff53a5b46a7185fda19459ea28f0d77929920873d7d9732fa531a4ef50f5052ed4df42cc474d14d0ba
-DIST emms-5.3.tar.gz 315572 BLAKE2B 6a4a59763e9c1c2e7d75bc11832b2ba86b7ba34303c33f6a9591897571393777fd7b544fed5fd9c76b13eedf87ea899d0a1c61390c4803c2700dff64b8321e69 SHA512 0a162f1b5fbf1cc4fcf50606d7ab3155effccd4862d33a4d59374573c571c128726b075ee91e0b364a23d5b08e00b4403a601dfcf0c25eaf594680178cb8e06d
+DIST emms-10.tar.xz 171792 BLAKE2B 33368d62c170d3a3cb024887cc421ed69c0e2fc4c9af8676bb8d056b13981b75e3d4acaca9e0276062ed19060c97e5a62b07d51279dc6bf1e9565c1c2a7f17f6 SHA512 383a8ad2769021969a522125a0d588b3caea82345067d59cf21116e3dfd54a2ec60d9be60b479dfd5f14804b7e5f8f513e64bcae0ff936ea3bb9603074116b7a
 DIST emms-5.4.tar.gz 311583 BLAKE2B fc5a67a0e1e35f9e9d83112e0f98a7489e0aff7ca6a2b4a633b296eb20218ffa798f33754069da9be93fe8725a0438db77e0f8aa25bdf617f45cba954abdf556 SHA512 a274938ace810404a8891c60e8f54fadc60054e2b7f1139941b69b40e8693f2177ec9ecd795517e17a0b7ca3477f2e75a0a844408ad35975a4b69266c466fbff
-EBUILD emms-4.4.ebuild 969 BLAKE2B dac5a1c76e731a2f59f0f2ebe60f9b4fb3d3ee0ec758833493beaa3f3e93708e60c8cb5ea5662c97fa3c323ae22d3f74762a82c9df3abd9c7d5bc978f216cbd8 SHA512 615ada145b969798344b3d620d5a6248535664230256f524f2be3e7eecb9585974c033d83ba4963b4c8b57bf0e0c180a8713582a6588f27b99d57622d912b83a
-EBUILD emms-5.3.ebuild 967 BLAKE2B e0e800ffc51a2f3ba6d162c8845b671ed5878f181e0ccfdd305f03ecf5ccf930a72f79a0a57b03172c2e99a673b1160a8da7b3bb96978841dd324c289ee09f33 SHA512 107410a9bb52216496ae8b0063742026a8cb663c70f64cd698d0e722d54ec402ae0b7292863150f68a6faf9ceb489b579d017aa3736c8593630b01f8113f038b
+EBUILD emms-10.ebuild 1023 BLAKE2B adaf67e221aea90111e669baf3970369ae87ba758231d583d2b13bc7cb4a49432648c4fbcf325334c012882e5d8ac29f21ac93c8972ae1d56912d1e33a179399 SHA512 47fa818148458dc452ae7bcbcce15e7df502f35cdd85cb4260d8d3407fd446d8eb8308d46c2bfae88659b3a53b3ad8d3dc29763228c4f1aa4512d5116672afe2
 EBUILD emms-5.4.ebuild 967 BLAKE2B e0e800ffc51a2f3ba6d162c8845b671ed5878f181e0ccfdd305f03ecf5ccf930a72f79a0a57b03172c2e99a673b1160a8da7b3bb96978841dd324c289ee09f33 SHA512 107410a9bb52216496ae8b0063742026a8cb663c70f64cd698d0e722d54ec402ae0b7292863150f68a6faf9ceb489b579d017aa3736c8593630b01f8113f038b
 MISC metadata.xml 782 BLAKE2B 2b476ef3ee43bd2002ea5615e91c1ee8e7361413d6d2ed325f404a7c66a9f250f99ff43a7bcc6f38dc1827045cbe60139627c2203fb572189fcf88834c9a4926 SHA512 59586a57195f29b6d3749641177a3cb1c2d5f36aae0cca900fce72a9bee6bdf2a17a21f54f26bcc83c1f95b5732dc2037d4f1edcde2e19c185a655647deeb826
diff --git a/app-emacs/emms/emms-5.3.ebuild b/app-emacs/emms/emms-10.ebuild
index 332e0d00a88d..fc6756b89a2c 100644
--- a/app-emacs/emms/emms-5.3.ebuild
+++ b/app-emacs/emms/emms-10.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit elisp toolchain-funcs
 
 DESCRIPTION="The Emacs Multimedia System"
 HOMEPAGE="https://www.gnu.org/software/emms/
 	https://www.emacswiki.org/emacs/EMMS"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+# Taken from https://elpa.gnu.org/packages/${P}.tar
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-3+ FDL-1.1+"
 SLOT="0"
@@ -29,10 +30,10 @@ src_compile() {
 }
 
 src_install() {
-	elisp-install ${PN} lisp/*.{el,elc}
+	elisp-install ${PN} *.el *.elc
 	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	doinfo doc/emms.info*
 	dobin src/emms-print-metadata
 	doman emms-print-metadata.1
-	dodoc AUTHORS ChangeLog NEWS README THANKGNU
+	dodoc AUTHORS NEWS README THANKGNU
 }
diff --git a/app-emacs/emms/emms-4.4.ebuild b/app-emacs/emms/emms-4.4.ebuild
deleted file mode 100644
index 1aacf114f268..000000000000
--- a/app-emacs/emms/emms-4.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp toolchain-funcs
-
-DESCRIPTION="The Emacs Multimedia System"
-HOMEPAGE="https://www.gnu.org/software/emms/
-	https://www.emacswiki.org/emacs/EMMS"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ FDL-1.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-DEPEND="media-libs/taglib"
-RDEPEND="${DEPEND}"
-
-# EMMS can use almost anything for playing media files therefore the dependency
-# possibilities are so broad that we refrain from setting anything explicitly
-# in DEPEND/RDEPEND.
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-		all emms-print-metadata
-}
-
-src_install() {
-	elisp-install ${PN} lisp/*.{el,elc}
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	doinfo doc/emms.info*
-	dobin src/emms-print-metadata
-	doman emms-print-metadata.1
-	dodoc AUTHORS ChangeLog NEWS README THANKGNU
-}