gentoo auto-resync : 29:10:2022 - 16:01:29

7 files changed, 44 insertions, 31 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 3847eaaf6228..977402761624 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/dssi/Manifest b/media-libs/dssi/Manifest
index 6dc7a03a332d..3953b841918f 100644
--- a/media-libs/dssi/Manifest
+++ b/media-libs/dssi/Manifest
@@ -1,4 +1,4 @@
 AUX dssi-1.1.1-no-werror.patch 313 BLAKE2B 846cc0a13836987dad96ddfbc7c0d40e1f60cf877285b53b9e29da6eac572cb38e1a109b964d98df3d6e179ff4f3d05687ada0bcfde221fa28fd0468be080324 SHA512 04f1562c0aa1b00bdffbc1004b5d6a89781f866efb73128237fcf708e4e30c5c57932ebcbd39b21f56dce50bc286cc53ca20d0fef5d5746dc2ae862b9d0a325b
 DIST dssi-1.1.1.tar.gz 712038 BLAKE2B 426fcbf5eb9024b6b0a4fad34fd8c0e0b18ff8eefdab22902cd929dae86be55d8cdc01e92c0c75c9cf1c6e5918317109b78f8aad4d2db0abafd6d9405eb285e4 SHA512 faf35ae851b889ad17a8ba624c713af8a5f33bb93db8e34842e8b778a0e36c3eab9ab712a40e4ca7ecd96954f3e70504d89a75b3826dd138332085e176c0d34d
-EBUILD dssi-1.1.1-r1.ebuild 950 BLAKE2B 419805633c069de5b91637e6eb7cba10ca9af4ac302adf8cc4b052368ae98f54a1073f37380338d16eb142c015d7d8465dd569af4cde0f25f7c2bd0f09405b02 SHA512 5a3d1bd541661f15208ba29a08865d25aede3c607663f4a99316e43404b522ced56b9da0a1e99ad05ba4c5ae26e74bf21e47731bc0afc9cc724fb351a8cfe9e0
+EBUILD dssi-1.1.1-r2.ebuild 944 BLAKE2B 6f652d89d3009a09c992a65c1866f1aeb2e650ad8d18e03103b8b184355774b05f916ee70f86fd4e93be4ac48ce853cce7ed44990c169935d8dda7b7ec425277 SHA512 842d8fce69e4bf4507b31a0550994e084a38936d49996d98e7f7c2033379589d0c28e8c22e88547536d8c3782b0bc86c3904c3992f6093618760eb70e9273109
 MISC metadata.xml 334 BLAKE2B 0aa15bd5c208b608f5eef96d2f946ffa8d4081639d5cb6de08d92e55ee5ee32ae5bf388a8caa72ec721491dca92bc25ff0e1a778034dc709fbd2292bad8b9700 SHA512 18e413faca22354f4ae8113f752f4a1df3e379a5102fb6efd1da1d1703e8ac597b47120b6ff057500b02423468825a3e6206a9b88bda17a4098f0656bff20417
diff --git a/media-libs/dssi/dssi-1.1.1-r1.ebuild b/media-libs/dssi/dssi-1.1.1-r2.ebuild
index 8332b8f80e88..2cf087a5fb1b 100644
--- a/media-libs/dssi/dssi-1.1.1-r1.ebuild
+++ b/media-libs/dssi/dssi-1.1.1-r2.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit autotools
 
 DESCRIPTION="Plugin API for software instruments with user interfaces"
@@ -11,17 +12,17 @@ SRC_URI="mirror://sourceforge/dssi/${P}.tar.gz"
 LICENSE="BSD LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
 
-RDEPEND="media-libs/alsa-lib
+RDEPEND="
+	media-libs/alsa-lib
 	>=media-libs/liblo-0.12
-	virtual/jack
 	>=media-libs/ladspa-sdk-1.12-r2
 	>=media-libs/libsndfile-1.0.11
-	>=media-libs/libsamplerate-0.1.1-r1"
-DEPEND="${RDEPEND}
-	sys-apps/sed
-	virtual/pkgconfig"
+	>=media-libs/libsamplerate-0.1.1-r1
+	virtual/jack
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1.1-no-werror.patch
@@ -41,6 +42,8 @@ src_prepare() {
 
 src_install() {
 	DOCS=( README doc/TODO doc/*.txt )
+
 	default
-	find "${D}" -name '*.la' -delete || die "Pruning failed"
+
+	find "${ED}" -name '*.la' -delete || die "Pruning failed"
 }
diff --git a/media-libs/ftgl/Manifest b/media-libs/ftgl/Manifest
index a1de4750d09b..370e83be4263 100644
--- a/media-libs/ftgl/Manifest
+++ b/media-libs/ftgl/Manifest
@@ -3,5 +3,5 @@ AUX ftgl-2.1.3_rc5-freetype_pkgconfig.patch 263 BLAKE2B 3febbbfce31110345ade9af1
 AUX ftgl-2.1.3_rc5-gentoo.patch 1533 BLAKE2B af20eafea69c5936d7ed101ec1de46c35ab23a12bd4b408808cd8f6b0e354509e7772a7e911f457ad5e80f3baa136eef2181650c8c04d9abdc3efbecfb67efa5 SHA512 46a7657090849635473eaae94a84c3933054cf21d220b2bd5fb366c8fe67cc1c1ee0f60fdc573d951396d9baadb6a77af553490675fd68209533b6ab7f4ba5c6
 AUX ftgl-2.1.3_rc5-underlink.patch 277 BLAKE2B 31ee2c15c3b7a908b9430a200f98d4f01aa006c0ae7cd1fb609bb5f648848eb43926f14f504f883fd840949c108125c1221efb94604810aaa51f8183d09d846b SHA512 6690fa96a81613cdc5874bf29b6bff39eae00edc2d0e3ced2d199b0cfeacfebe4f0bd312d77ce096be89e91a0f031eca800ec705575f1b6f073f7a92a4da85fe
 DIST ftgl-2.1.3-rc5.tar.bz2 707854 BLAKE2B a2d91de57edfeb34dfa0bfc68808570ba698178e656c66b2bcff9df51e7cbe725d6a85ae51ef9910d2152481206419730ab634d1c87e1a1215ddce8cb90cf83f SHA512 9841bdbe7e299dd0ae3bcbef08dc3a8787a863389bf242aa023b1c2442f3ffc8a2c6768a35d093d27e3ad7197c8228a9b15e795a36824424f05bef66b68c89a4
-EBUILD ftgl-2.1.3_rc5.ebuild 1279 BLAKE2B 9480976285750fbacb08221a7a0794bfad41c0a9cc6555083bb84628933ed421f2ebd8c81bed363cd397468622e06abc15b3659025760d05d7d389450d579fff SHA512 4e46c9828be246dca22e1b93dd112aedda43b41e4f85d35d831715831e45813c5a4e2fc48dfffdbbfdf0937bebc89f6fd949c79a04b58755a6994c565bf22447
+EBUILD ftgl-2.1.3_rc5-r1.ebuild 1293 BLAKE2B 45728572a43d72fda047ef0fd94fbdde4014fe94340172f076d578a8136a0a79c9e470cf038f7fab8ea3db358a984ee57b61ff48ea1a3b6f987e353afcfe9f05 SHA512 443c4305db9e2ded5cb171b48031792f14f7d985e132633abe6a47794668fb3eb488e24fa935e203df0c7d5fe24c4ce8acbac1ceefc1b7b00cf8bb261eff190e
 MISC metadata.xml 328 BLAKE2B 176e85d39009b168447e2bb51661a59f9e121fd965fd668c40b32a39126679b94b942a53307cbeb5d7c68eb1acaa433a65e9080e56d50d59b7fec01c7bfbbd44 SHA512 043d076e9f5bce255c55625561cdbbc59720208d9a3b0786ce67e31940905e0b2cdc4f29695bc297667faf13b4d6d5ee350fa80a687406214435f9efeb808ca1
diff --git a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild b/media-libs/ftgl/ftgl-2.1.3_rc5-r1.ebuild
index 22107b5dd36a..7421ddac0cc2 100644
--- a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
+++ b/media-libs/ftgl/ftgl-2.1.3_rc5-r1.ebuild
@@ -1,31 +1,33 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit autotools flag-o-matic
 
 MY_PV="${PV/_/-}"
-MY_PV2="${PV/_/~}"
+MY_PV2="${PV/_/\~}"
 MY_P="${PN}-${MY_PV}"
 MY_P2="${PN}-${MY_PV2}"
 
 DESCRIPTION="library to use arbitrary fonts in OpenGL applications"
 HOMEPAGE="https://sourceforge.net/projects/ftgl/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P2}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
-DEPEND=">=media-libs/freetype-2.0.9
+DEPEND="
+	media-libs/freeglut
+	>=media-libs/freetype-2.0.9
 	virtual/opengl
 	virtual/glu
-	media-libs/freeglut"
-RDEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P2}"
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
@@ -36,6 +38,7 @@ PATCHES=(
 
 src_prepare() {
 	default
+
 	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
 	eautoreconf
 }
@@ -47,7 +50,9 @@ src_configure() {
 
 src_install() {
 	local DOCS=( AUTHORS BUGS ChangeLog NEWS README TODO docs/projects_using_ftgl.txt)
+
 	default
-	rm -r "${ED%/}"/usr/share/doc/ftgl || die
+
+	rm -r "${ED}"/usr/share/doc/ftgl || die
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libmikmod/Manifest b/media-libs/libmikmod/Manifest
index 07e72f558844..a9ef6d572339 100644
--- a/media-libs/libmikmod/Manifest
+++ b/media-libs/libmikmod/Manifest
@@ -1,3 +1,3 @@
 DIST libmikmod-3.3.11.1.tar.gz 1240373 BLAKE2B 9de58eea739f8f7a5c4ff482093974f67a623fd0acd3b65752b0832b1376fb05ca00e7fbd09c242a25fb76d90d662afc3886808fbe6cabb15332f263adba37ad SHA512 f2439e2b691613847cd0787dd4e050116683ce7b05c215b8afecde5c6add819ea6c18e678e258c0a80786bef463f406072de15127f64368f694287a5e8e1a9de
-EBUILD libmikmod-3.3.11.1.ebuild 2146 BLAKE2B 5878ab493eeba16da587677cf27da12806f5ba1ca4f1d1beb4a0449401270d5b524a99a488650ab1405967bbcf5be9a21d417df8e819c450f2c658b3dff6dd97 SHA512 91e568298df78291ce5a23f95a183270bffd9b30b75b8453dd30bd2b808daed49c0d28b7239b25d71242de417eb648589857ec201024f02dbfa43151a1024b30
+EBUILD libmikmod-3.3.11.1-r1.ebuild 2168 BLAKE2B d173989b2af3120be2320447a10bab4bfde62a43e7b07a62ca8022e2a2ada57e53a0cde5726436251d68f29c880c2817d38f73cf1e50f48bd9b42e46afc3c98e SHA512 da872fb9cbe91942e1b4e0e38d4702d6b3093261170d85f8f3ab84c1d2a2100f4999b7f916b7df01d4af0f111e5f5cbd8ff76662a7dbf690b867fc983f451da4
 MISC metadata.xml 330 BLAKE2B f865c47d2fe40d5bb20da22fc2b3a93568b7b3756a424367a2be855b49ea8287af72f5973ccfc8c4c4c7f501c9b9d468539e8d929699acada27e0fee40206bba SHA512 9ef7a547be98060ffb33c04cc09bc2fad66a26b9a71c5602a3627a69c9e9e280573e61239318b689bdfeaa157215672e03ee8838893ea1923b618421c2888111
diff --git a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild b/media-libs/libmikmod/libmikmod-3.3.11.1-r1.ebuild
index bb462fd8cdd0..96b5ee258b0b 100644
--- a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.3.11.1-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit multilib-minimal
+EAPI=8
+
+inherit multilib multilib-minimal
 
 DESCRIPTION="A library to play a wide range of module formats"
 HOMEPAGE="http://mikmod.sourceforge.net/"
@@ -15,23 +16,27 @@ IUSE="+alsa coreaudio cpu_flags_ppc_altivec debug nas openal oss pulseaudio cpu_
 
 REQUIRED_USE="|| ( alsa coreaudio nas openal oss pulseaudio )"
 
-RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[${MULTILIB_USEDEP}] )
+RDEPEND="
+	!${CATEGORY}/${PN}:2
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[${MULTILIB_USEDEP}] )
 	nas? ( >=media-libs/nas-1.9.4:=[${MULTILIB_USEDEP}] )
 	openal? ( >=media-libs/openal-1.15.1-r1[${MULTILIB_USEDEP}] )
 	pulseaudio? ( >=media-sound/pulseaudio-5.0[${MULTILIB_USEDEP}] )
-	!${CATEGORY}/${PN}:2"
+"
 DEPEND="${RDEPEND}
-	sys-apps/texinfo
-	oss? ( virtual/os-headers )"
+	oss? ( virtual/os-headers )
+"
+BDEPEND="sys-apps/texinfo"
 
 MULTILIB_CHOST_TOOLS=(
 	/usr/bin/libmikmod-config
 )
 
 src_prepare() {
+	default
+
 	# USE=debug enables Werror, bug #621688
 	sed -i -e 's/-Werror//' configure || die
-	default
 }
 
 multilib_src_configure() {
@@ -44,8 +49,7 @@ multilib_src_configure() {
 	fi
 
 	# sdl, sdl2: missing multilib supported ebuilds, temporarily disabled, remember to update REQUIRED_USE
-	ECONF_SOURCE=${S} \
-	econf \
+	ECONF_SOURCE=${S} econf \
 		$(use_enable alsa) \
 		$(use_enable nas) \
 		$(use_enable pulseaudio) \
@@ -70,5 +74,6 @@ multilib_src_install_all() {
 	dodoc AUTHORS NEWS README TODO
 	docinto html
 	dodoc docs/*.html
+
 	find "${ED}" -name '*.la' -delete || die
 }