gentoo auto-resync : 04:09:2023 - 10:20:54

6 files changed, 41 insertions, 70 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 15feb37b0931..4d2ea20f146a 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/exaile/Manifest b/media-sound/exaile/Manifest
index ac1e244cb4d7..f89c095d0923 100644
--- a/media-sound/exaile/Manifest
+++ b/media-sound/exaile/Manifest
@@ -1,6 +1,4 @@
-DIST exaile-4.1.2.tar.gz 3708188 BLAKE2B 859d77bac62df0843291fdc0de4888079c8f103da3cdf3417d0cd5ba67cf5199a8a1e89d20403efbc6793dfcd7b8333708df74ff535e0912fb02502a13702a0a SHA512 7711f9e062088b02362bbd404f7c61a0f1c128e29e42ce657dc092cac351641f6000846c9da843866bf28ccbd68cf1b07731ba1c9854d52b33c0448e87d0e93b
 DIST exaile-4.1.3.tar.gz 3853508 BLAKE2B 3ce7bbd84dda419b817f0684b2279e29a48b7c221eb3d335f3b3797be4dbbec9158b576337084cdd0d242d79fdf14616c1e0b8b171e3995689f94945aa7385b6 SHA512 16b31331a31f0a2e088f177c8a01ef47603b07fe94cbb19869a4caeaec2da03cacaa07d5b0eb50052645449e07620e2c58f202007108af73e20cf744d70bb556
-EBUILD exaile-4.1.2.ebuild 1614 BLAKE2B 2c3975a97ff6a000e23963bf981d6a299dfedb53af7366580200a5e026e9cf8b62595d67e869519fe42ff00a6046812dcb842002a040015084d8e4e33bf2888e SHA512 5c342d86611fe93523325ee87d86357845098d05d1c10148f8f0e6b572723ff9d0d30cc04c4e9658646949a499f4996f30b092064e33c2fcfdd6dc4e38a22f98
 EBUILD exaile-4.1.3.ebuild 1614 BLAKE2B 2c3975a97ff6a000e23963bf981d6a299dfedb53af7366580200a5e026e9cf8b62595d67e869519fe42ff00a6046812dcb842002a040015084d8e4e33bf2888e SHA512 5c342d86611fe93523325ee87d86357845098d05d1c10148f8f0e6b572723ff9d0d30cc04c4e9658646949a499f4996f30b092064e33c2fcfdd6dc4e38a22f98
 EBUILD exaile-9999.ebuild 1615 BLAKE2B d0c044b90c5bb445b7c84ef9dc3e86b4738680d4624b563011bb1e93fa1ef038bc9e6a6c8035ce9af227c688166257e5291060d8fd6b86a37c591725125b66c2 SHA512 b4c3e5963e4a4f22737a6d07d298a5b027950b990a5b16048f20e098a4ff27b75a7da6756387a687cebbed6640a3fabf9cce82096a1c78fb96d0e97b615fb101
 MISC metadata.xml 466 BLAKE2B 8c2ae9dfde18d1976a3c38a77de336e5f0489879adcdb030c9c6b3cb765e440d8bf908c57b2fe1670b090d90c570b3219201319d81319dda87c92c777c82757e SHA512 5bdedc04863ba9c8632a818d8f7a834687e3474cfe906b0ee82378f6c957ecc9778206f8b7f7abefda5cba06c4c0df930e5e170754fa8c59467dd4f1857be4f8
diff --git a/media-sound/exaile/exaile-4.1.2.ebuild b/media-sound/exaile/exaile-4.1.2.ebuild
deleted file mode 100644
index 56167a0672e9..000000000000
--- a/media-sound/exaile/exaile-4.1.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit python-single-r1 xdg
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/exaile/exaile.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV/_/-}/${PN}-${PV/_/}.tar.gz"
-	KEYWORDS="amd64 ~x86"
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-DESCRIPTION="GTK+ based media player aiming to be similar to Amarok"
-HOMEPAGE="https://www.exaile.org/"
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-# IUSE+=cddb if have dev-python/cddb-py
-IUSE="libnotify nls scrobbler"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	nls? (
-		dev-util/intltool
-		sys-devel/gettext
-	)
-"
-RDEPEND="${PYTHON_DEPS}
-	media-libs/gst-plugins-base:1.0
-	media-libs/gst-plugins-good:1.0
-	media-plugins/gst-plugins-meta:1.0
-	x11-libs/gtk+:3[introspection]
-	libnotify? ( x11-libs/libnotify[introspection] )
-	$(python_gen_cond_dep '
-		dev-python/bsddb3[${PYTHON_USEDEP}]
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/gst-python:1.0[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		media-libs/mutagen[${PYTHON_USEDEP}]
-		scrobbler? ( dev-python/pylast[${PYTHON_USEDEP}] )
-	')
-"
-
-RESTRICT="test" #315589
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_compile() {
-	use nls && emake locale
-}
-
-src_install() {
-	emake \
-		PREFIX=/usr \
-		LIBINSTALLDIR=/usr/$(get_libdir) \
-		DESTDIR="${D}" \
-		install$(use nls || echo _no_locale)
-
-	python_optimize "${D}/usr/$(get_libdir)/${PN}"
-	python_optimize "${D}/usr/share/${PN}"
-}
diff --git a/media-sound/sidplay/Manifest b/media-sound/sidplay/Manifest
index 69e7f43f6674..43a8a440e38a 100644
--- a/media-sound/sidplay/Manifest
+++ b/media-sound/sidplay/Manifest
@@ -1,5 +1,7 @@
+AUX sidplay-2.0.9-drop-register-keyword.patch 340 BLAKE2B d9ea331103af96e8044679b9a348393dda9dfb1f055c985c5aa4a75c85729f70d69a3d7f58e8cc2a576d259925b9a8f02d144fa43df7056715b7c090c219039a SHA512 8983fa39da1866ab32094c925f521f7eaeb2a9502dda4c6fe8b28164ffff6dd23e8b96dbccb589b9027391ee135f0e2190bc5594f7a377f2000784b198aa53e2
 AUX sidplay-2.0.9-gcc43.patch 1097 BLAKE2B 38c060522fad4f8e71a0a6eab3bb32d01292b60b9adfa7f7cf6f5cd9708b944d5597ab3ceb34dd9d38f1b07513772f8430035cb29ce8723bc3f87f6e858d21a8 SHA512 4e2c717389e9fa7aa7a459138a42f411342def25fa6f236f64e4c306419402d7d9ece7e9376ad492d7a3fa4db9fee3c9bbffd2d3d13669a0366da990fa8e38c6
 AUX sidplay-2.0.9-gcc44.patch 3726 BLAKE2B 6d775f8a1cfb2e33d1ed9a07f51100c6ceb4da52f25de15ed4be504058b43293916661a94ba768fc898a55898ea5268659cd0548f0e8cd15ee1cf4ea3b519463 SHA512 41f319b4e232d199478d586b8a397493e1cc6a8eaa6b4eb5bec272b520ff8ffa078ac72b3eddf4f2865614bfe1f8e28df5ad3f2699bc74684c476a24b7795f75
 DIST sidplay-2.0.9.tar.gz 362140 BLAKE2B 4b5b5d9aff566f8840c4a1f405f64f1d64b642d32d85eca355a4d97bcd03056456c9b49dedd6eca63d5174893206e90693a2555ff35835f6f037ba964bccaae2 SHA512 38d334b7e649d6043b48705edf3c4cd27d01283b95f42d1b46bb7cf266ca0d5f6fac4a7dfd398578a3278d293342e4d4d09cde8d443d60a8d50e4abbe127afe5
 EBUILD sidplay-2.0.9-r1.ebuild 478 BLAKE2B 996a5fcc8408da6d54baf81d77b9c74e1399df48110dc5aebb4f7a8e56a04f157bbbe53ecf4992873a84401192375be36d40f71a6122bac03102ddac7094292f SHA512 f018e73ab9226dfa8659d68e9e62075f91a245b954698e2ac5078ab623064b9cd4112513dab6ca136506ad9ebcc7829473c7449b7d3483609bf6519b75cdd610
+EBUILD sidplay-2.0.9-r2.ebuild 529 BLAKE2B 45aae70f0658792e4a07927695ca3159035bf39f276e8db1d80e58517d1ea6c020078fcb017332920b0f2bc1bdd15e6085af3b421fd634029246228b9321680b SHA512 84774893aea122b1b4bfe75e21b8f8f790d648065e40dcb2b95b051ee472fea3dd05aaea8bf6c5cf87edd991bf11b4e9a00f0f61bdda04a9994105ccef62254f
 MISC metadata.xml 332 BLAKE2B a47bef57d4111ad776ca4cb88fb84cf66013bad09182b8b6b64ebe79e81038d634db55a4078087fd5462c245134755a772c7d869dd2c851f7b4586d2c5c70e19 SHA512 091eebca8129671d51c99e4e2dbc778147583b0f6d75f171254d94a85756d1ecf103e39236e83d81b066ef45093e32c3b30bb6580bb596dc094bc091b44847d5
diff --git a/media-sound/sidplay/files/sidplay-2.0.9-drop-register-keyword.patch b/media-sound/sidplay/files/sidplay-2.0.9-drop-register-keyword.patch
new file mode 100644
index 000000000000..91c01de93b37
--- /dev/null
+++ b/media-sound/sidplay/files/sidplay-2.0.9-drop-register-keyword.patch
@@ -0,0 +1,16 @@
+Bug; https://bugs.gentoo.org/897796
+--- a/src/keyboard.cpp
++++ b/src/keyboard.cpp
+@@ -129,9 +129,9 @@ static char keytable[] =
+  */
+ static int keyboard_search (char *cmd)
+ {
+-    register char *p;
+-    register char *q;
+-    register int   a;
++    char *p;
++    char *q;
++    int   a;
+ 
+     for (p = keytable, q = cmd;;  p++, q++)
+     {
diff --git a/media-sound/sidplay/sidplay-2.0.9-r2.ebuild b/media-sound/sidplay/sidplay-2.0.9-r2.ebuild
new file mode 100644
index 000000000000..626922677fc9
--- /dev/null
+++ b/media-sound/sidplay/sidplay-2.0.9-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="C64 SID player"
+HOMEPAGE="https://sidplay2.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sidplay2/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE=""
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="media-libs/libsidplay:2"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc43.patch"
+	"${FILESDIR}/${P}-gcc44.patch"
+	"${FILESDIR}/${P}-drop-register-keyword.patch"
+)