gentoo auto-resync : 09:09:2022 - 10:40:04

7 files changed, 19 insertions, 78 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index ac50bc9ecb6d..e0f743d3c6aa 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/dcadec/Manifest b/media-sound/dcadec/Manifest
index a24c8e8eb8f2..c6dd2c77d71b 100644
--- a/media-sound/dcadec/Manifest
+++ b/media-sound/dcadec/Manifest
@@ -1,4 +1,4 @@
 AUX dcadec-0.2.0-respect-CFLAGS.patch 318 BLAKE2B 120690767ace35da6611a6d32ae3e45728f2186268d6e3325aba9c15026e63ac46f7ba134466eae39ccf7d3f6b90a47f7812f444dd68c925cf00b5add2dc7a3d SHA512 12b1e5a2c582b6e026b6e5d6cc5e0faa0caba40f24074c67c7f05776db024ac7661387551e23d38e95a976136c4279547fbf1dd5acd90bb3584e044173264aad
 DIST dcadec-0.2.0.tar.gz 225305 BLAKE2B c68e1931358e18f7a3f7214a3155296dfb58138143a43a801e8fce417d83094ad280caad7dbc1d2c9350f0965248ccedf8e0be10155ebb86d82282ac2f30b634 SHA512 94edcc0b4449882ebeb08f8b39fe44a5302731df2dad3a3e0b0f787fd7c2c3e3992fed95e6f594af516e982cec34b057aab30e6457c098df61f495a487125acb
-EBUILD dcadec-0.2.0.ebuild 1146 BLAKE2B 24853e5af3a05b625d9edbdc884b11f4661bee61053ad9eee23b4c46801841c248d667304e2d4e643ee3b40fe328796318da4b6bdf188423dcef0d2741d57c32 SHA512 96e8e4a761466cce92771b6c42853ab0d52b52c451ddade26f11c92e7e8f7173f90e9a7a51dd3a42531085f3c712a38c19dbb020f68168d04b1684dfa431132e
+EBUILD dcadec-0.2.0-r1.ebuild 937 BLAKE2B ae2d7b09fcf28863a62294eefb93527aa70c0e7d0da1a699dad8b5233bde7269ed1be4fdbd33ab73cf64e274c0f2caf299b1a73da5b06c4972c0f993943312e6 SHA512 920f91a885d47717926f73ff33d8f6de449c29a1b6692397ce21ef8c3afca55e0ca9846d09527ebd83d5d46d75eb0073f9ddb062d4a9f0260fc1b00d9345ed87
 MISC metadata.xml 289 BLAKE2B 4624c65c82c9f7d2bd4378b3331e39339f9401edcb2d9f381d36f28fadd4be51a1ae8116945caf7bfea3b2bb656959c612486b6564d4bf163d40268cf1a83378 SHA512 46f4bb564e422a214235c64bb0fafc14031fddfe30c1e74ed2bff3bc7f08be553925e78dc76fdcfd4c256cff084e74ca7488c6b66a587fcf280aa4ec4c34f111
diff --git a/media-sound/dcadec/dcadec-0.2.0.ebuild b/media-sound/dcadec/dcadec-0.2.0-r1.ebuild
index 68303aac6077..25cacefab500 100644
--- a/media-sound/dcadec/dcadec-0.2.0.ebuild
+++ b/media-sound/dcadec/dcadec-0.2.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit toolchain-funcs multilib-minimal
+inherit toolchain-funcs
 
 DESCRIPTION="DTS Coherent Acoustics decoder with support for HD extensions"
 HOMEPAGE="https://github.com/foo86/dcadec"
@@ -15,30 +15,22 @@ KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 
 PATCHES=( "${FILESDIR}"/${P}-respect-CFLAGS.patch )
 
-multilib_src_configure() {
+src_configure() {
 	tc-export AR CC
 
 	# Build shared libs
 	echo 'CONFIG_SHARED=1' >> .config || die
 }
 
-multilib_src_compile() {
-	local target=all
-	multilib_is_native_abi || target=lib
-
+src_compile() {
 	PREFIX="${EPREFIX}"/usr LIBDIR="${EPREFIX}"/usr/$(get_libdir) \
-		emake -f "${S}"/Makefile ${target}
+		emake -f "${S}"/Makefile all
 }
 
-multilib_src_install() {
-	local target=install
-	multilib_is_native_abi || target=install-lib
-
+src_install() {
 	PREFIX="${EPREFIX}"/usr LIBDIR="${EPREFIX}"/usr/$(get_libdir) \
-		emake -f "${S}"/Makefile DESTDIR="${D}" ${target}
-}
+		emake -f "${S}"/Makefile DESTDIR="${D}" install
 
-multilib_src_install_all() {
 	# Rename the executable since it conflicts with libdca.
 	mv "${ED}"/usr/bin/dcadec{,-new} || die
 
diff --git a/media-sound/musepack-tools/Manifest b/media-sound/musepack-tools/Manifest
index 58b7c470801e..36f39f06898b 100644
--- a/media-sound/musepack-tools/Manifest
+++ b/media-sound/musepack-tools/Manifest
@@ -1,5 +1,5 @@
 AUX musepack-tools-465-fno-common.patch 659 BLAKE2B 603213fe4c979b4a79b9a2103117eb63e3b90933119cbefef32c18c3523d24c6f0eca8beea685d1ef6effb3bec82e53004bdaeed2062a2a14f4a1e7bb398fd97 SHA512 239b353380d534f09fb381520eb29b919cb3f69ac51be8a813e67338de928c91c99c249b6a5b27f297cd0a741b7c10e7c61171b4bd42b5016402b52efa00cca0
 AUX musepack-tools-465-gentoo.patch 2982 BLAKE2B 0783de2ac04e77d8ff337e3ed52b09174e6268aaa9a1c2709b65343753880437b42af8fd17fbf1361811bdeb5caed625f78fa8440c7ccbddbdf80b827da3374e SHA512 5eee2985b4a3201e6d93d24e7cd9244d7e7f64208ae80656cdd6932d3adee2403e14e17ede45a83071a5c5bf21aa938e4786267a2c4b3118053c900aa18b2105
 DIST musepack-tools-465.tar.bz2 167612 BLAKE2B 0748cbfaecec396a4bf054aac5a451f16386becae75cdbb63821c28f7b7d378723df180d909eb3b9e0c7eafa79996dbe7aaab251721fd139b81755e7f59249f1 SHA512 ce933376bc127f6f4acc8500e50b6318a6bc5bf8443547fc0e25b4e8e5881fd7a73aff155560ffbc5161b5d7d03522c73bfbc31e14e1531fe511036a0f657d54
-EBUILD musepack-tools-465-r1.ebuild 835 BLAKE2B d10e6696c69e264f3032c0c1592aef3c01ebb980524e1bc31306bf219467b3feffb0401dbf47bdcf074497c6bf2ac4c1115ccdf2465afb1ff9ed6d1720902c30 SHA512 3e3c238f03fb12648659868643a35562868031421c895a57a5fb05684045263dd062adf4267a4c5c0bc8dc8cd2784255357c992c619cedf8dabc94afef290c76
+EBUILD musepack-tools-465-r2.ebuild 790 BLAKE2B b98a91c3ac7960553cf8e90c16492eb16ca13730ea5016fc2a296399b0886b06d615ca28bcb5663d3f071e3db106d119bfeb75059290861a98cde5333576b42e SHA512 156e4cdbfc58446b2eecdd4445b2033ba63f6636eafc74e340cb9938eec4bbe6cd594b2155a7f47743e9d01fdf34e3ba80e44b1add4edddee01580c078990d6f
 MISC metadata.xml 260 BLAKE2B 9945ac40ee60ce67adf51840c3cc2d6d2743dffe4fd2ec965d300c709323f80eb5d35eaeb804414eebb2da1e954ee688067c05093b26499678de524b414ac4ec SHA512 e5b6a2a44cd2a4ea4fb1267eb8f635c079c022853443ad180ca12f2df84492f3ba34db45e4ff5e7e09262a74745f5c0aa04ebccd6f998cf19a6ea2ccd0627701
diff --git a/media-sound/musepack-tools/musepack-tools-465-r1.ebuild b/media-sound/musepack-tools/musepack-tools-465-r2.ebuild
index daea0c16dd93..7aab37cd226c 100644
--- a/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-465-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake-multilib
+inherit cmake
 
 # svn export http://svn.musepack.net/libmpc/trunk musepack-tools-${PV}
 # tar -cjf musepack-tools-${PV}.tar.bz2 musepack-tools-${PV}
@@ -17,11 +17,14 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 
 DEPEND="
-	>=media-libs/libcuefile-${PV}[${MULTILIB_USEDEP}]
-	>=media-libs/libreplaygain-${PV}[${MULTILIB_USEDEP}]"
-RDEPEND="${DEPEND}
+	>=media-libs/libcuefile-${PV}
+	>=media-libs/libreplaygain-${PV}
+"
+RDEPEND="
+	${DEPEND}
 	!media-libs/libmpcdec
-	!media-libs/libmpcdecsv7"
+	!media-libs/libmpcdecsv7
+"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
diff --git a/media-sound/schismtracker/Manifest b/media-sound/schismtracker/Manifest
index 1741480c3228..a249b3974a51 100644
--- a/media-sound/schismtracker/Manifest
+++ b/media-sound/schismtracker/Manifest
@@ -1,7 +1,5 @@
-DIST schismtracker-20220506.tar.gz 1310121 BLAKE2B a9740c2a8909a533523de18c8cd4c4457bdaa8f6198598fb0e73089fdb2c7bac3211024d5d9cb695aa5758710d0fa16a407ce0e150d0a3ef0071522f2937eec1 SHA512 8dacd1fd719c20fdc8ef157d1487202a39d4f36a37560ad62680655addde0ceb78bbce51e4f640d3979c91f6a4dfe4bc006785aa35d45a00206773d41adf9f42
 DIST schismtracker-20220807.tar.gz 1278129 BLAKE2B 86cb727e4b797ffcf87b7a0dee93d364a93f2c73bd66856af5bdf0c8ef72157824d04141a11a884d3d286cecb5fcdf2a24f91fcb3421e6831b5fdde6681b5100 SHA512 36944581ef88ba256764d1acec0f6d38fb83027ebca7bfea7d313693d9e4062bd217ba6c4dee6a262753b186398b89035d371c5428b35c33eaf95e901bd7304d
 DIST schismtracker-20220905.tar.gz 1278816 BLAKE2B 6f461732c99a01c8f4a17afbac61b9b52686cd6c0e58c99f75337b4e33e187b5465f9adf5422ec3a455e9448f1beac845080816001af02cf2afa5740b9f384a7 SHA512 2429e6a3ed6004a0d327ddb8ae7c379fbed4e4d2e2fe87be225fb85c990327fa3008115f9dbdcf08b3691c50411bf5aad04e97264a2f9ef6c05c7cfdc6231bda
-EBUILD schismtracker-20220506.ebuild 1430 BLAKE2B 8c7de70c82a69d2ec57425df0197f13e2a16f01959e86d458f4af586a676975bd9bd81be50b8a190c4be5dd7936790b1221e838ff587ae47354aadd536e24bd7 SHA512 192951e2e5d28c930d7e08fe0056316f0936af63b76f6c41bb095dc353c09869ddebca868db1f07ea2fb46a69d456b244bc5a3285f2143b232884fc21f0ed0a0
 EBUILD schismtracker-20220807.ebuild 1305 BLAKE2B defbd3cca41714e6a2f75392a07c0ef44765ae146e28887f628dd7ab3caebb4b21a502eb8693ddadcfa7904f6b60b695a6bb766b2aaaa281050d0b2b649fdda1 SHA512 b37529e6702b49fd6a4ea7a1332ff4fc898ccf71c4ff1b33e7c2b1153409c8da91bde1489b82fad2d873a9454041ef2c7cd09ce44a69deff5704c3016d1d145a
 EBUILD schismtracker-20220905.ebuild 1307 BLAKE2B e794286cb89c54677bbd384c5d73bfd4de5e61bc98fe1ec22528a573c71e2a0fe21fd54009997c419f6eb7be6a72b9f4a10f5041eca62631d767bd853cb20a55 SHA512 b80613778005b2c4be7e22493a623dde37bfecff94866d8f0fe8edf37323ca1cc23697de6acf4900c7ff6c8153281c12800e9999185c480ecca1b41127e17f38
 MISC metadata.xml 356 BLAKE2B d0dafca63357e3b8b2fd8658b79f4f3e62202273f63dd59fbe1cdd7255a66ac2199854ee1adc870cb5b82ae18c294e65a5504163347920480e851a914dcc1fb6 SHA512 5c0f821a6f33b5a06ea18319e989c38714d2cc06bd2049b4e52fef62fdfe93b2e1a2e2c97c4776ebcd9cc10ecd3039b1f805faf5acc63cd20d60d3b4d05d4e3d
diff --git a/media-sound/schismtracker/schismtracker-20220506.ebuild b/media-sound/schismtracker/schismtracker-20220506.ebuild
deleted file mode 100644
index 3701e3cf3a68..000000000000
--- a/media-sound/schismtracker/schismtracker-20220506.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools desktop xdg
-
-DESCRIPTION="Free implementation of Impulse Tracker, a tool used to create high quality music"
-HOMEPAGE="http://schismtracker.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2 public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/alsa-lib
-	media-libs/libsdl[X]
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXv
-"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	default
-	eautoreconf
-
-	sed -e "/^Categories/ s/Audio/AudioVideo;Audio/" -i sys/fd.org/schism.desktop || die
-
-	# workaround for temporary files (missing directory). Fixes:
-	# sh ./scripts/build-font.sh . font/default-lower.fnt font/default-upper-alt.fnt font/default-upper-itf.fnt font/half-width.fnt >auto/default-font.c
-	# /bin/sh: auto/default-font.c: No such file or directory
-	mkdir auto
-
-	#   sys-devel/binutils[multitarget] provides ${CHOST}-windres
-	#   wine provides /usr/bin/windres
-	# and schismtracker fails to use it properly:
-	# sys/win32/schismres.rc:2:20: fatal error: winver.h: No such file or directory
-	[[ ${CHOST} = *mingw32* ]] || export WINDRES= ac_cv_prog_WINDRES= ac_cv_prog_ac_ct_WINDRES=
-}
-
-src_install() {
-	default
-
-	domenu sys/fd.org/*.desktop
-	doicon icons/schism{,-itf}-icon-128.png
-}