gentoo resync : 20.03.2022

3 files changed, 3 insertions, 78 deletions

diff --git a/media-sound/openmpt123/Manifest b/media-sound/openmpt123/Manifest
index 5d0b119f332c..3c1b245c5907 100644
--- a/media-sound/openmpt123/Manifest
+++ b/media-sound/openmpt123/Manifest
@@ -1,5 +1,3 @@
-DIST libopenmpt-0.5.14+release.autotools.tar.gz 1446898 BLAKE2B ab6ff8db2e19d859fecca882aea3e569b58d96d5055ec0dd42494a7eb38fefa9c8b88f4700d354de71346c71c6d9a96327db1c2b7b48e227928dcba0ce7347d6 SHA512 8897549c18afb57c5bf54f4dd8a1d80983829bca958052d76cda1315ef4a37f4201575817b7cedfe17a44ee79051a52aa35b26a51b554091e92c9d2dcf5924a3
-DIST libopenmpt-0.6.0+release.autotools.tar.gz 1506911 BLAKE2B 44cf8c5f725d2b11409d23e293dca0c151cad17c029da7f70a22366e75baa1b49b763f67d617d84a142efd3933b90344ccca5d881e5c724e2cfe0210170593dc SHA512 8da6cf1f2dbf683c32f45cbf884784360cced5e21f9862c96a1a679bd90b36be9a7cc59accbf82271a804722986cb81e75915f6564aeaaa248ed3e967dfdfb1a
-EBUILD openmpt123-0.5.14.ebuild 1719 BLAKE2B 98f417e228f2ce65d60c3fcb52a34c3044ebacc33de6192b3264cad083c8141411f84f6d323896d5f4ad084f90296b51ff7afb7b84034fc3c81b6a0a6b3c5951 SHA512 6759737ab75659c1725d59d5aa1342f90edba5e9ef01064fb9f5dc17ddc86295a53dd84c3cfe530fc470483cbb93375b2c14d84b2faeae4904706340790ee4c6
-EBUILD openmpt123-0.6.0.ebuild 1719 BLAKE2B 98f417e228f2ce65d60c3fcb52a34c3044ebacc33de6192b3264cad083c8141411f84f6d323896d5f4ad084f90296b51ff7afb7b84034fc3c81b6a0a6b3c5951 SHA512 6759737ab75659c1725d59d5aa1342f90edba5e9ef01064fb9f5dc17ddc86295a53dd84c3cfe530fc470483cbb93375b2c14d84b2faeae4904706340790ee4c6
+DIST libopenmpt-0.6.2+release.autotools.tar.gz 1514140 BLAKE2B 38e8d24352cce92b38ddf8e1f33af7fb72571b88b8f4cbddff626affe2f00bdb73635872d502417e37c68aa0f2254338088bb493b47c688a22d342b3ba54f725 SHA512 a4bbf804d4be72d11216173371ab81703877071cf15e2daaaf59b0eb892d5948072af00bd1ec8c097c23bb3f77bc2c0be6cf853dcf3c7c24aa6109a9f74d0948
+EBUILD openmpt123-0.6.2.ebuild 1719 BLAKE2B 88ee5e279c0edf0757bb1f7c33bb59aa5500e562b2f1181112e233e203081f4b01a4ae8631d3654e44b763d0fecee7c0056c7b640ee3bc297487f75e37ecf32b SHA512 2cf02a52f6932e39818e3727cbc38dd6ccf6dca9aa5924c03d7f17c488eef0e25f15788a2546422d69a40d094a9e4805af78e625e89dae1dd8cea67673ea6d8c
 MISC metadata.xml 328 BLAKE2B 25f8b37a7e7885a50e5b7305c9090033c78b1154214e05060c3407f0d27ac436aa3f0da1dff3a5ba1685bef390f1fe99416893aaf59e002921cc3464ce0d2167 SHA512 6686c75dbfcd5a5f9d6ef4d667916f54388180045471f8eb585c7b0d6e03f5d56c3fc892c97851f7453318309a456bbfd877eb240cbf008b71984009d08a8181
diff --git a/media-sound/openmpt123/openmpt123-0.6.0.ebuild b/media-sound/openmpt123/openmpt123-0.6.0.ebuild
deleted file mode 100644
index 82cbe36ce684..000000000000
--- a/media-sound/openmpt123/openmpt123-0.6.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib
-
-MY_P="libopenmpt-${PV}+release.autotools"
-DESCRIPTION="libopenmpt-based command line player for tracked music files (modules)"
-HOMEPAGE="https://lib.openmpt.org/libopenmpt/"
-SRC_URI="https://lib.openmpt.org/files/libopenmpt/src/${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
-IUSE="flac portaudio pulseaudio sdl sndfile"
-
-RDEPEND="
-	~media-libs/libopenmpt-${PV}
-	flac? ( media-libs/flac )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( >=media-libs/libsdl2-2.0.4 )
-	sndfile? ( media-libs/libsndfile )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Normally libopenmpt is built alongside openmpt123. Avoid the
-	# internal dependency and link it externally.
-	rm -r libopenmpt/ || die
-	sed -i \
-		-e "s:libopenmpt/libopenmpt\.pc::g" \
-		configure || die
-	sed -i \
-		-e "/_${PN}_DEPENDENCIES/s:libopenmpt\.la::g" \
-		-e "/_${PN}_LDADD/s:libopenmpt\.la:-lopenmpt:g" \
-		Makefile.in || die
-}
-
-src_configure() {
-	# A lot of these optional dependencies relate to libopenmpt, which
-	# we package separately, so we disable them here.
-	econf \
-		--disable-static \
-		--enable-openmpt123 \
-		--disable-examples \
-		--disable-tests \
-		--disable-doxygen-doc \
-		--without-zlib \
-		--without-mpg123 \
-		--without-ogg \
-		--without-vorbis \
-		--without-vorbisfile \
-		$(use_with pulseaudio) \
-		$(use_with portaudio) \
-		--without-portaudiocpp \
-		$(use_with sdl sdl2) \
-		$(use_with sndfile) \
-		$(use_with flac)
-}
-
-src_compile() {
-	emake "bin/${PN}$(get_exeext)"
-}
-
-src_install() {
-	dobin "bin/${PN}$(get_exeext)"
-}
diff --git a/media-sound/openmpt123/openmpt123-0.5.14.ebuild b/media-sound/openmpt123/openmpt123-0.6.2.ebuild
index 82cbe36ce684..f9f538ff0464 100644
--- a/media-sound/openmpt123/openmpt123-0.5.14.ebuild
+++ b/media-sound/openmpt123/openmpt123-0.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8