gentoo resync : 20.03.2022

3 files changed, 2 insertions, 83 deletions

diff --git a/media-libs/stk/Manifest b/media-libs/stk/Manifest
index 90451464e123..dd2bc1495722 100644
--- a/media-libs/stk/Manifest
+++ b/media-libs/stk/Manifest
@@ -1,8 +1,6 @@
 AUX stk-4.5.1/010_all_removeForcedFlags.patch 269 BLAKE2B a02fe10d9d3573e063174a096a6a4068b03139ec8b1d1c13097a1309265d53545109ae3a74f81e9b9bb32fefd73b69157037f76f470839b657bfdce10fea3c22 SHA512 7584c52c5e61c1bc8770bd776abe78a43d6a8f6ffcba1f4411c7674766d36220a38051eebd12515fe8d7db2b958d05c38f6940f676ca3aa0041321e81afdd5f4
 AUX stk-4.5.1/020_all_noExamplesOrDemo.patch 1029 BLAKE2B 8ea62554a8a609a1365cbaf42cbfedb8fa257fcd531a01bd014cb41da80c98dbec9f74b9f45b400f2aa6a02dcfb3d58662fea4bf8584e760f5d66827f9760db6 SHA512 546851ad25e842b67a2a441e4e4d27295993a1cfeb659a620a6ebfaeb66c9cfe779c8f1ee506bb93a31bfea9687fbd378a881f11e5ffbe182d1d2b0eb478bbc0
 AUX stk-4.5.1/050_all_cxxflags.patch 306 BLAKE2B 58708b9f0aded3069be8150407d877c97406fe941da895c3e7d7ededeccbbdeeb5dc2c10ef5e1a4b262943cdc147b66605764d58876aeb931e73e86fa8474b72 SHA512 36ecc6f6a03b9df258affd92079d3da06a5506a5e53ddc98934c47401c5b6745de7d0cb82b241c0dffda3d3baea9a32a7462292f1079fffba88425158562fa7f
-DIST stk-4.6.1.tar.gz 2593348 BLAKE2B 2cb269b8fb5732d55a394d5b8842c380b6a3e82e7338e972c6d22baf5ba1edee3f03ed699b9950d4a92a7ae3102bbb54f844ffd728c6478ebfb36328a1b89f2a SHA512 2a22078cdb630f7c014a5ab38070fd6a6d1e9aa719401e3190a040cb06b61003cd3095fe1a8890eff59e4fc42594fe893b4c0a8327175e1701c75de7537e1830
 DIST stk-4.6.2.tar.gz 2618125 BLAKE2B 8673cabbc57c5b520af62def967bf3923a91c7b619bd29faaebaa4e3fa6aabcd9dc43e605663d8062650b105ae60ebefc44a3fa420ef711119861ce03e77f130 SHA512 35a7f559cca5c9b5998528a566ae27bace3cac56cefda7ae54c06179f5002d2906c6ede6274bf06100dd6aa9dc0d1459bb8fca4a2072c686c2abfd493b6f2f3c
-EBUILD stk-4.6.1.ebuild 1362 BLAKE2B 09add9614f9da7e45b8bc6850069ab55d70c7578824ab786ce6e6b84a6698ada3870de4b1af28bf9e2edeb555853bf67bddab480f54de1cf8ad9df35f9c53bc8 SHA512 6d040c30472a90c5f54c6b250a622d25da5d5abbfa99a6c3156181857dc4e66dd842df49a9337ee33374e506cfbc740541ddefa9d5219f178e0648e8ba78b7bd
-EBUILD stk-4.6.2.ebuild 1399 BLAKE2B ff00d9fad3d1ee62ada4ce85e7cb715ed615d1392f4aee34bee467726e08e7d9acc71c12cde971a79818d3858cf0b2d99f7caff5d965289798b7c4f42a068333 SHA512 0b36f4aa61e5869f178204439ebf29d56aa4a7e37f564853de8faff0f46c4fc55901de4c6352466bfc318d427cbe1e53aba9228f60773e3f65029d59289b90b5
+EBUILD stk-4.6.2.ebuild 1398 BLAKE2B da23193395c1c8b2b04eb00c65a1561a1923eccb8c2fe15d8c31b3868ee271f969a8a93166b0844c9b648d9892cebb16ac0bb433fff1917e511becd02fc57cf3 SHA512 e72aeabe3c65fa63a92d8df047b35f534912cf7ac2cd65329a112f73e2fb0651538266436fe6cfd798575a1885983602cef8835d08820a0df09d749487b3a5e1
 MISC metadata.xml 366 BLAKE2B eac66d7663dd4db0dba433e2e6a2715f6e5a41f111ae812ef32f661d03d04379eb8d5c47476ccdfff552d0722df65fd575d749411f7016dd575e17b05072e290 SHA512 0fb8de1d946df0c5e38e81e1a168fea0fdd80f5499b446e21bb68f7ec27046d3d3fae802cfbf3f1d59f8aa93495e742feae04587dabad9fe2ac393ad80bee9ab
diff --git a/media-libs/stk/stk-4.6.1.ebuild b/media-libs/stk/stk-4.6.1.ebuild
deleted file mode 100644
index 7f4e3b6ed7c8..000000000000
--- a/media-libs/stk/stk-4.6.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Synthesis ToolKit in C++"
-HOMEPAGE="https://ccrma.stanford.edu/software/stk/"
-SRC_URI="https://ccrma.stanford.edu/software/stk/release/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa debug doc jack oss static-libs"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.5.1"
-)
-
-HTML_DOCS=(
-	doc/html/.
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	#breaks with --disable-foo...uses as --enable-foo
-	local myconf
-	if use debug; then
-		myconf="${myconf} --enable-debug"
-	fi
-	if use oss; then
-		myconf="${myconf} --with-oss"
-	fi
-	if use alsa; then
-		myconf="${myconf} --with-alsa"
-	fi
-	if use jack; then
-		myconf="${myconf} --with-jack"
-	fi
-
-	econf ${myconf} \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		RAWWAVE_PATH=/usr/share/stk/rawwaves/
-}
-
-src_install() {
-	dodoc README.md
-
-	# install the lib
-	dolib.so src/libstk*
-	use static-libs && dolib.a src/libstk*
-
-	# install headers
-	insinto /usr/include/stk
-	doins include/*.h
-
-	# install rawwaves
-	insinto /usr/share/stk/rawwaves
-	doins rawwaves/*.raw
-
-	# install docs
-	if use doc; then
-		einstalldocs
-	fi
-}
diff --git a/media-libs/stk/stk-4.6.2.ebuild b/media-libs/stk/stk-4.6.2.ebuild
index c8993c4329bb..52b7e39ead65 100644
--- a/media-libs/stk/stk-4.6.2.ebuild
+++ b/media-libs/stk/stk-4.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ccrma.stanford.edu/software/stk/release/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa debug doc jack oss static-libs"
 REQUIRED_USE="|| ( alsa jack oss )"