update squeezelite for eapi 7

Signed-off-by: Paul Healy <lmiphay@gmail.com>

3 files changed, 8 insertions, 126 deletions

diff --git a/media-sound/squeezelite/Manifest b/media-sound/squeezelite/Manifest
index 08408ff..99fcf26 100644
--- a/media-sound/squeezelite/Manifest
+++ b/media-sound/squeezelite/Manifest
@@ -8,5 +8,4 @@ AUX squeezelite-1.9.4.1182-gentoo-optional-codecs-decode.patch 2205 BLAKE2B 8777
 AUX squeezelite-1.9.4.1182-gentoo-optional-codecs.patch 1789 BLAKE2B 33fa43d44a7c2a612863c317a6244dfe0199e496dea349822991093bece435bfa4c25349f69d263fa53828058693b1b632cd216ca5fe1243a78238457e195174 SHA512 5adc75cf66b07fcee0faf6e9f8d46623ec76ae0c091fad975ab0acbaa25da9648806d7c3cb3e55e9eef8ad5088b8f2d95c70b0d85966316035f7a5711c8a0a43
 AUX squeezelite.conf.d 450 BLAKE2B 5f33c0e97795965ce719999d9fe7d688cf04e2291a4302b21c8e909d07d40dba9210bacdc5041ee1fa482d14362cfdbc3e276d3789e1d1d93456f33509cfe0f7 SHA512 7aa116553cba1d370233db1b9500c73738c54995c739167c1a54a4ddcb3616bec536280f057a2ca5a17b53b4a9ebe4baabb42bfb449eb1d7bff8d18c82a85d3c
 AUX squeezelite.init.d 593 BLAKE2B 7ac5449c3a5b830253c7e7ba619eb8c70f074f0dc67e01dbeaa09917b84b48d7fd1d1418f4cbe17e4b5f167f3bd06c54ab7045ebf6c8c5d38b73341e3a70adfc SHA512 303e48c4446135d2d7c0cdd24176114af543d372bbd7b281ccdd01e9cab7cf670b7aada94310a342c8d24f8ac3987d4aa1a211755a5ddab4a86840c043a89ce8
-EBUILD squeezelite-1.9.0.1105.ebuild 2969 BLAKE2B 99512e3fd321cc9b7c23f3be897943c37f78a5a0e111c29a345765ca7236771d0951df9255dc10a883d66b91f0399a4437d29df20ea9806cc7317b7c94153ad8 SHA512 9c9deca4d37fb57b2d0a5888bfacbcc4470a25394315d5da6b1b423edbdb9aa1d4ac723f38b41e22008c4b33ed55f6073aec01efb34f014802811e5903bf470d
-EBUILD squeezelite-1.9.4.1182.ebuild 2969 BLAKE2B 0ef6ff9c25953cc426b856325ccac1a20134e5c589d5f88ed1ecd3567fccec9dd3a01fb44d0ee0328e1cdd87059969e1247da332a256a47b70a62ed1d3cea3ea SHA512 a7a9936d8ef17f7d923b89dba9473b6fb94d2ad9ac306087475a55254a4e17b4bdcd27ae2365f9a2fb720ee2c87ca11bb005f8ce9cd7e9f69f3cbc150318794c
+EBUILD squeezelite-1.9.4.1182.ebuild 2937 BLAKE2B 86d96648c570b37f057a7ac1bf4006b8043c24be24d616f69d65dcf169c37697f0ef595d61a1aec57608eb32c642e9ce05ea3ae0ac206948ca374cb9b0d92434 SHA512 a6416850197a5cdef72adfe2df081be1f9655c38de86b53ae94293c4c5979e9f672d6bf8cce5befceb68caf396214fcc8bad8ec187f394e3b0262edb5bbea487
diff --git a/media-sound/squeezelite/squeezelite-1.9.0.1105.ebuild b/media-sound/squeezelite/squeezelite-1.9.0.1105.ebuild
deleted file mode 100644
index 0f6488a..0000000
--- a/media-sound/squeezelite/squeezelite-1.9.0.1105.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils user flag-o-matic git-r3
-
-DESCRIPTION="Lightweight headless squeezebox client emulator"
-HOMEPAGE="https://github.com/ralph-irving/squeezelite"
-
-EGIT_REPO_URI="https://github.com/ralph-irving/squeezelite.git"
-EGIT_COMMIT="7a8e7fba279922ae8ee1627996d17166ab4c8216"
-# see VERSION #def in squeezelite.h
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="aac dsd ffmpeg flac mad mpg123 pulseaudio resample visexport vorbis"
-
-# ffmpeg provides alac and wma codecs
-DEPEND="media-libs/alsa-lib
-		flac? ( media-libs/flac )
-		ffmpeg? ( media-video/ffmpeg )
-		vorbis? ( media-libs/libvorbis )
-		mad? ( media-libs/libmad )
-		mpg123? ( media-sound/mpg123 )
-		aac? ( media-libs/faad2 )
-		resample? ( media-libs/soxr )
-		visexport? ( media-sound/jivelite )
-		pulseaudio? ( media-plugins/alsa-plugins[pulseaudio] )
-"
-RDEPEND="${DEPEND}
-		 media-sound/alsa-utils"
-
-pkg_setup() {
-	enewgroup squeezelite
-	if use pulseaudio ; then
-		enewuser squeezelite -1 -1 "/dev/null" "squeezelite"
-	else
-		enewuser squeezelite -1 -1 "/dev/null" "squeezelite,audio"
-	fi
-}
-
-src_prepare () {
-	epatch "${FILESDIR}/${P}-gentoo-optional-codecs.patch"
-	epatch "${FILESDIR}/${P}-gentoo-optional-codecs-decode.patch"
-	eapply_user
-}
-
-src_compile() {
-	export OPTS=""
-
-	if use dsd; then
-		OPTS+=" -DDSD"
-		einfo "dsd support enabled via dsd2pcm"
-	fi
-
-	if use ffmpeg; then
-		OPTS+=" -DFFMPEG"
-		einfo "alac and wma support enabled via ffmpeg"
-	fi
-
-	if use resample; then
-		OPTS+=" -DRESAMPLE"
-		einfo "resample support enabled via soxr"
-	fi
-
-	if use visexport; then
-		OPTS+=" -DVISEXPORT"
-		einfo "audio data export to jivelite support enabled"
-	fi
-
-	# Configure other optional codec support; this is added to the original
-	# source via a patch in this ebuild at present.
-	if ! use flac; then
-		append-cflags "-DSL_NO_FLAC"
-		einfo "FLAC support disabled; add 'flac' USE flag if you need it"
-	fi
-	if ! use vorbis; then
-		append-cflags "-DSL_NO_OGG"
-		einfo "Ogg/Vorbis support disabled; add 'vorbis' USE flag if you need it"
-	fi
-	if ! use mad; then
-		append-cflags "-DSL_NO_MAD"
-	fi
-	if ! use mpg123; then
-		append-cflags "-DSL_NO_MPG123"
-	fi
-	if ! use mad && ! use mpg123; then
-		einfo "MP3 support disabled; add 'mad' (recommended)"
-		einfo "  or 'mpg123' USE flag if you need it"
-	fi
-	if ! use aac; then
-		OPTS+=" -DNO_FAAD"
-		einfo "AAC support disabled; add 'aac' USE flag if you need it"
-	fi
-
-	# Build it
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin squeezelite
-	dobin ${FILESDIR}/pasqueezelite
-	dodoc LICENSE.txt
-
-	newconfd "${FILESDIR}/${PN}.conf.d" "${PN}"
-	newinitd "${FILESDIR}/${PN}.init.d" "${PN}"
-}
-
-pkg_postinst() {
-	elog "If you want start Squeezelite automatically on system boot:"
-	elog "  rc-update add squeezelite default"
-	elog "Edit /etc/cond.d/squeezelite to customise -- in particular"
-	elog "you may want to set the audio device to be used."
-}
diff --git a/media-sound/squeezelite/squeezelite-1.9.4.1182.ebuild b/media-sound/squeezelite/squeezelite-1.9.4.1182.ebuild
index 6322209..e0cd107 100644
--- a/media-sound/squeezelite/squeezelite-1.9.4.1182.ebuild
+++ b/media-sound/squeezelite/squeezelite-1.9.4.1182.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit eutils user flag-o-matic git-r3
 
@@ -32,6 +32,11 @@ DEPEND="media-libs/alsa-lib
 RDEPEND="${DEPEND}
 		 media-sound/alsa-utils"
 
+PATCHES=(
+	 "${FILESDIR}/${P}-gentoo-optional-codecs.patch"
+	 "${FILESDIR}/${P}-gentoo-optional-codecs-decode.patch"
+)
+
 pkg_setup() {
 	enewgroup squeezelite
 	if use pulseaudio ; then
@@ -41,12 +46,6 @@ pkg_setup() {
 	fi
 }
 
-src_prepare () {
-	epatch "${FILESDIR}/${P}-gentoo-optional-codecs.patch"
-	epatch "${FILESDIR}/${P}-gentoo-optional-codecs-decode.patch"
-	eapply_user
-}
-
 src_compile() {
 	export OPTS=""