gentoo auto-resync : 26:12:2022 - 14:07:48

5 files changed, 59 insertions, 66 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 719b425f28b9..b6b2ad55087e 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index 18d86eb3a1bc..2057b1bc9abe 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1,5 +1,7 @@
 AUX din-48-fix-random-constants.patch 667 BLAKE2B 2747a1c60f2f968cd4e173996900d889b9c45f77af6aba035a4fe29ced8882178cc3fbfa925dc2bc02aced071648e008f409ecd9c6b3782838dec5344a8b71f4 SHA512 0805ea12a272276ba1883ab624c96566dbb71168bd9a0e4ecbe6f3373287e7d88d5a897c03e0385acf12a7fc79a4be73f1d66ec699790986cd2c863e6ca251bc
 AUX din-55-makefile.patch 564 BLAKE2B fb483ef0182b5bed5131a2915204c1a564ac31acef1faaa780804a46f3d23717d3af8222702b3d6846fdccf2a7370546d6f586add8a42a3fa2bff130b9c9b9f7 SHA512 e37d9bdec42df1abff6be2ffe80d4b46838d451e015a0d557f387922dddd54718733353e7f5cb198bf4d56b45754a933657a182b8420b81770fc5e2435719b6d
 DIST din-55.tar.gz 3711327 BLAKE2B 2c6ba4a877c512a950fb7c731f20d285019da1c7cd4ab5c7ff8d75e3c25eaa4ea08ca865b37e12fa1cefc1175baaa1c7ce27a44c7fa7c0b6c59b0ccbf6ab7a39 SHA512 432a53e71d1cf96c9ed62694fb23d1264d2e80b34620ebf0f1f33f3d4787cc7358c42038b2a45aa9d3ba9f59828eaaebd521a046fd5a51919a13f1bffad16a22
+DIST din-56.tar.gz 3716779 BLAKE2B 3fc2af445ef5cfa7a3ec56f841e62baf1832573a0ef085855f2f875961e8be24d43881c3394a39dbc5c3524a1d1c0033ac57ffa0b5487cadc1a189f9f49108b4 SHA512 2e3e985abec9f0f097d51fb4cff5e991c5f80091586c0a4c47533c623dc9c13bae6b7f8a3d18bed1fc150e6527482b4ae03a9d1d9c444ae92b88204892ce7e04
 EBUILD din-55.ebuild 1083 BLAKE2B 005a89e65bbcb9dfadd2cb706847700f3408741b72b19417d54d6c77876af4594994999d3a67be207231fac9362d1e68bc6d3f98a04a2325549bce3af81f6aa0 SHA512 ce85c7e29d1fa3d0d3d3fbd7e4410601faea27f7902fbe63abaf0c6983a7c1cae82b3514b17d91541d8d450a1894bbff377c9e9a3e48ecd41056d1bc504c6ca6
+EBUILD din-56.ebuild 1089 BLAKE2B 23e921b1d6ff8397630d8a9e0bc872ff7f7066badab1e516637c9414cd6f52868b824d522ed2b7f19e6ca880d15d4818c83e1ad5b70325cda698980976496c1c SHA512 11281e9a0d94634fed505ed358106580e97589d6e5f1b1499331697adce295c6bdd7dd4df5d101ba63f2617b875437ad6b4daeb6e9fe328dfcfe8e877e3fc6fa
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/media-sound/din/din-56.ebuild b/media-sound/din/din-56.ebuild
new file mode 100644
index 000000000000..b6c0c95c276d
--- /dev/null
+++ b/media-sound/din/din-56.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools edos2unix xdg
+
+DESCRIPTION="a software musical instrument and audio synthesizer"
+HOMEPAGE="https://dinisnoise.org/"
+SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa jack"
+
+RDEPEND="
+	dev-lang/tcl:0=
+	media-libs/libsdl:=
+	virtual/glu
+	virtual/opengl
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="|| ( alsa jack )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-55-makefile.patch"
+	"${FILESDIR}/${PN}-48-fix-random-constants.patch"
+)
+
+src_prepare() {
+	default
+
+	edos2unix pixmaps/${PN}.desktop
+
+	use jack && (sed -i "s/-lasound/-ljack/g" src/Makefile.am || die "Failed to fix jack linking")
+
+	eautoreconf
+}
+
+src_configure() {
+	# Jack takes over alsa.
+	local sound_engine
+
+	use jack && sound_engine="UNIX_JACK" || sound_engine="LINUX_ALSA"
+
+	econf CXXFLAGS="${CXXFLAGS} -D__${sound_engine}__"
+}
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index a144960f6a66..d9bb98d9b5b5 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,7 +1,5 @@
-DIST picard-2.8.3.tar.gz 5098160 BLAKE2B 5f7290de8faee502f3a4984e0080409a31f9971428da635fb79a9f2ec540d71a256584010d747de77c86e85cd58df929e8ddaa09840ebc2c17e5cdbb035c5d68 SHA512 b87e768f0f13e1e306279f71004b5ffaebb2cfc44be23f041d9193432bdc631c4a2b893d72b47109b06c450d6ff4e2b0a70c2a4b0cc5d1608a4481d26526b0e3
 DIST picard-2.8.4.tar.gz 5108177 BLAKE2B 948eea724d725150ccf906c1e375e04be59f762fd6ebdb4660b6b036c87eaab803c8caebfa258efb0931e1610b8b75e9e3b00c0015e5520feca3dceec71683c2 SHA512 c024cf5706fe75648f0d3f9ef9ed3437f632454ab848c463135516d8c819cab52c42e1e9d4e050aeb254f6e08ae8345fbe0f95c0ab35fdc2f79e0c01c56b291c
 DIST picard-2.8.5.tar.gz 5108919 BLAKE2B 0866ece07a64ad1f226fa3d5b88ffca19eaa951e42918631fbe11ed64360f0c586dd0cfbfd33731c125b9db5a85a12263573e0cffdccf9e8e839ad197b5d9e4f SHA512 02bf3ce6b8503e0e4ed9601db4ba31019704d2e09d0abc36026f9cf6a81d748cf62fe0b6c1a2730fa89033d62823f62a40fed1d845abb54c51dd9bb8a0d1bfb4
-EBUILD picard-2.8.3.ebuild 1448 BLAKE2B 4f552c10b87ec6f0b2de583fb47310f134cc312f05dc0b3a3906aad7891d017be4cb175e9bb9bd24278fffd0ec98b6e2a086fb037fec9458b797e775476cdc51 SHA512 2fd18689766a347a81d488e90f8212174e51fe3bd6463349c70c5ea9b8304fc806fc156e10cb6aecc9ea11f851997bdc2a0ff0ed4009feb41604e9ea92b2f12f
 EBUILD picard-2.8.4.ebuild 1448 BLAKE2B 4f552c10b87ec6f0b2de583fb47310f134cc312f05dc0b3a3906aad7891d017be4cb175e9bb9bd24278fffd0ec98b6e2a086fb037fec9458b797e775476cdc51 SHA512 2fd18689766a347a81d488e90f8212174e51fe3bd6463349c70c5ea9b8304fc806fc156e10cb6aecc9ea11f851997bdc2a0ff0ed4009feb41604e9ea92b2f12f
 EBUILD picard-2.8.5.ebuild 1450 BLAKE2B 80a78442f2b442fb7998d31b4799c995b12f0a504174f3c2dad9f8ca4a17b86a71cf1ab668c7a65cf3e995b1c67db4bb58095ab01eb42addd49939f911e20884 SHA512 b58c87fa1f4f971ac5ca759abb8c67b441f9df4fc492e69dc64920c4c09c0d2b12ec93cb7cf644a3444a36823e177b37bf3019e87af144a01c61281d689f0d5f
 EBUILD picard-9999.ebuild 1450 BLAKE2B 80a78442f2b442fb7998d31b4799c995b12f0a504174f3c2dad9f8ca4a17b86a71cf1ab668c7a65cf3e995b1c67db4bb58095ab01eb42addd49939f911e20884 SHA512 b58c87fa1f4f971ac5ca759abb8c67b441f9df4fc492e69dc64920c4c09c0d2b12ec93cb7cf644a3444a36823e177b37bf3019e87af144a01c61281d689f0d5f
diff --git a/media-sound/picard/picard-2.8.3.ebuild b/media-sound/picard/picard-2.8.3.ebuild
deleted file mode 100644
index 848184803ab6..000000000000
--- a/media-sound/picard/picard-2.8.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 xdg
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/metabrainz/picard"
-	inherit git-r3
-else
-	SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-	S="${WORKDIR}/${PN}-release-${PV}"
-fi
-
-DESCRIPTION="Cross-platform music tagger"
-HOMEPAGE="https://picard.musicbrainz.org"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="discid fingerprints nls"
-
-BDEPEND="
-	nls? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/fasteners[${PYTHON_USEDEP}]
-		dev-python/pyjwt[${PYTHON_USEDEP}]
-		dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		media-libs/mutagen[${PYTHON_USEDEP}]
-		discid? ( dev-python/python-discid[${PYTHON_USEDEP}] )
-	')
-	fingerprints? ( media-libs/chromaprint[tools] )
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	local build_args=(
-		--disable-autoupdate
-	)
-	if ! use nls; then
-		build_args+=( --disable-locales )
-	fi
-	distutils-r1_python_compile ${build_args[@]}
-}
-
-python_install() {
-	local install_args=(
-		--disable-autoupdate
-		--skip-build
-	)
-	if ! use nls; then
-		install_args+=( --disable-locales )
-	fi
-	distutils-r1_python_install ${install_args[@]}
-}